aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar wodim2016-01-01 17:24:05 +0100
committerGravatar wodim2016-01-01 17:24:05 +0100
commit0dab52d5c1f52db9a8dd3a140d5d43716aa7ca9a (patch)
treeda34889e25ec4658452722fb3c946acc305421f4
parentShow the name of the current Qt theme in the About dialog. (diff)
downloadKVIrc-0dab52d5c1f52db9a8dd3a140d5d43716aa7ca9a.tar.gz
KVIrc-0dab52d5c1f52db9a8dd3a140d5d43716aa7ca9a.tar.bz2
KVIrc-0dab52d5c1f52db9a8dd3a140d5d43716aa7ca9a.zip
Rename KviOsInfo to KviRuntimeInfo, which makes more sense.
-rw-r--r--doc/TODO-docs4
-rw-r--r--src/kvilib/CMakeLists.txt2
-rw-r--r--src/kvilib/ext/KviRuntimeInfo.cpp (renamed from src/kvilib/ext/KviOsInfo.cpp)6
-rw-r--r--src/kvilib/ext/KviRuntimeInfo.h (renamed from src/kvilib/ext/KviOsInfo.h)4
-rw-r--r--src/kvirc/sparser/KviIrcServerParser_ctcp.cpp6
-rw-r--r--src/modules/about/AboutDialog.cpp14
-rw-r--r--src/modules/system/libkvisystem.cpp16
7 files changed, 26 insertions, 26 deletions
diff --git a/doc/TODO-docs b/doc/TODO-docs
index 596a387ef..29f7e9c44 100644
--- a/doc/TODO-docs
+++ b/doc/TODO-docs
@@ -94,8 +94,8 @@
KviOggTheoraEncoder.cpp
KviOggTheoraEncoder.h
KviOggTheoraGeometry.h
- KviOsInfo.cpp
- KviOsInfo.h
+ KviRuntimeInfo.cpp
+ KviRuntimeInfo.h
KviParameterList.cpp
KviParameterList.h
KviPixmap.cpp
diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt
index a41f10475..2ecb54888 100644
--- a/src/kvilib/CMakeLists.txt
+++ b/src/kvilib/CMakeLists.txt
@@ -31,7 +31,6 @@ set(kvilib_SRCS
ext/KviMediaManager.cpp
ext/KviMiscUtils.cpp
ext/KviMessageTypeSettings.cpp
- ext/KviOsInfo.cpp
ext/KviPixmap.cpp
ext/KviPixmapUtils.cpp
ext/KviAnimatedPixmap.cpp
@@ -45,6 +44,7 @@ set(kvilib_SRCS
ext/KviRegisteredUserDataBase.cpp
ext/KviRegisteredUserGroup.cpp
ext/KviRegisteredUserMask.cpp
+ ext/KviRuntimeInfo.cpp
ext/KviSharedFile.cpp
ext/KviSharedFilesManager.cpp
ext/KviStringConversion.cpp
diff --git a/src/kvilib/ext/KviOsInfo.cpp b/src/kvilib/ext/KviRuntimeInfo.cpp
index ddbdc8ed0..1df3f8d48 100644
--- a/src/kvilib/ext/KviOsInfo.cpp
+++ b/src/kvilib/ext/KviRuntimeInfo.cpp
@@ -1,6 +1,6 @@
//=============================================================================
//
-// File : KviOsInfo.cpp
+// File : KviRuntimeInfo.cpp
// Creation date : Thu Jan 19 2006 13:50:11 GMT by Alexey Uzhva
//
// This file is part of the KVIrc IRC client distribution
@@ -23,7 +23,7 @@
//=============================================================================
-#include "KviOsInfo.h"
+#include "KviRuntimeInfo.h"
#include "KviLocale.h"
#include "KviQString.h"
@@ -634,7 +634,7 @@ static QString queryWinInfo(QueryInfo info)
#endif
-namespace KviOsInfo
+namespace KviRuntimeInfo
{
QString type()
{
diff --git a/src/kvilib/ext/KviOsInfo.h b/src/kvilib/ext/KviRuntimeInfo.h
index 958b03255..2a4ed2e7e 100644
--- a/src/kvilib/ext/KviOsInfo.h
+++ b/src/kvilib/ext/KviRuntimeInfo.h
@@ -3,7 +3,7 @@
//=============================================================================
//
-// File : KviOsInfo.h
+// File : KviRuntimeInfo.h
// Creation date : Thu Jan 19 2006 13:50:11 GMT by Alexey Uzhva
//
// This file is part of the KVIrc IRC client distribution
@@ -29,7 +29,7 @@
#include <QString>
-namespace KviOsInfo
+namespace KviRuntimeInfo
{
extern KVILIB_API QString type();
extern KVILIB_API QString name();
diff --git a/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
index 69f3d860a..290a326f6 100644
--- a/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
@@ -27,7 +27,7 @@
// FIXME: #warning "CTCP AVATARREQ or QUERYAVATAR"
#include "KviControlCodes.h"
-#include "KviOsInfo.h"
+#include "KviRuntimeInfo.h"
#include "KviApplication.h"
#include "KviIrcServerParser.h"
#include "KviWindow.h"
@@ -1163,9 +1163,9 @@ void KviIrcServerParser::parseCtcpRequestVersion(KviCtcpMessage *msg)
szVersion += " '" KVI_RELEASE_NAME "' " KVI_SOURCES_DATE " - build ";
szVersion += KviBuildInfo::buildDate();
#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
- szVersion.append(QString(" - %1").arg(KviOsInfo::version()));
+ szVersion.append(QString(" - %1").arg(KviRuntimeInfo::version()));
#else
- szVersion.append(QString(" - %1 (%2)").arg(KviOsInfo::name(), KviOsInfo::release()));
+ szVersion.append(QString(" - %1 (%2)").arg(KviRuntimeInfo::name(), KviRuntimeInfo::release()));
#endif
//szVersion.append(QString(" - QT Version: %1 - %2").arg(qVersion(), __tr2qs("http://www.kvirc.net/")));
if(!KVI_OPTION_STRING(KviOption_stringCtcpVersionPostfix).isEmpty())
diff --git a/src/modules/about/AboutDialog.cpp b/src/modules/about/AboutDialog.cpp
index 525e7795c..312e03436 100644
--- a/src/modules/about/AboutDialog.cpp
+++ b/src/modules/about/AboutDialog.cpp
@@ -31,7 +31,7 @@
#include "KviFileUtils.h"
#include "kvi_sourcesdate.h"
#include "KviBuildInfo.h"
-#include "KviOsInfo.h"
+#include "KviRuntimeInfo.h"
#include <QTextEdit>
#include <QWidget>
@@ -123,27 +123,27 @@ AboutDialog::AboutDialog()
infoString += ":</b><br>";
infoString += __tr2qs_ctx("System name","about");
infoString += ": ";
- infoString += KviOsInfo::name();
+ infoString += KviRuntimeInfo::name();
#ifndef COMPILE_ON_MAC
infoString += " ";
- infoString += KviOsInfo::release();
+ infoString += KviRuntimeInfo::release();
#endif
infoString += "<br>";
infoString += __tr2qs_ctx("System version","about");
infoString += ": ";
- infoString += KviOsInfo::version();
+ infoString += KviRuntimeInfo::version();
infoString += "<br>";
infoString += __tr2qs_ctx("Architecture","about");
infoString += ": ";
- infoString += KviOsInfo::machine();
+ infoString += KviRuntimeInfo::machine();
infoString += "<br>";
infoString += __tr2qs_ctx("Qt version","about");
infoString += ": ";
- infoString += KviOsInfo::qtVersion();
+ infoString += KviRuntimeInfo::qtVersion();
infoString += "<br>";
infoString += __tr2qs_ctx("Qt theme","about");
infoString += ": ";
- infoString += KviOsInfo::qtTheme();
+ infoString += KviRuntimeInfo::qtTheme();
infoString += "<br><br>";
infoString += "<b>";
infoString += __tr2qs_ctx("Build Info","about");
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
index 09541a148..b162b6820 100644
--- a/src/modules/system/libkvisystem.cpp
+++ b/src/modules/system/libkvisystem.cpp
@@ -32,7 +32,7 @@
#include "KviLocale.h"
#include "KviApplication.h"
#include "KviEnvironment.h"
-#include "KviOsInfo.h"
+#include "KviRuntimeInfo.h"
#include "KviModuleManager.h"
#include "KviByteOrder.h"
@@ -75,7 +75,7 @@ PluginManager * g_pPluginManager;
static bool system_kvs_fnc_ostype(KviKvsModuleFunctionCall * c)
{
- c->returnValue()->setString(KviOsInfo::type());
+ c->returnValue()->setString(KviRuntimeInfo::type());
return true;
}
/*
@@ -96,7 +96,7 @@ static bool system_kvs_fnc_ostype(KviKvsModuleFunctionCall * c)
static bool system_kvs_fnc_osname(KviKvsModuleFunctionCall *c)
{
- c->returnValue()->setString(KviOsInfo::name());
+ c->returnValue()->setString(KviRuntimeInfo::name());
return true;
}
@@ -118,7 +118,7 @@ static bool system_kvs_fnc_osname(KviKvsModuleFunctionCall *c)
static bool system_kvs_fnc_osversion(KviKvsModuleFunctionCall *c)
{
// no params to process
- c->returnValue()->setString(KviOsInfo::version());
+ c->returnValue()->setString(KviRuntimeInfo::version());
return true;
}
@@ -139,7 +139,7 @@ static bool system_kvs_fnc_osversion(KviKvsModuleFunctionCall *c)
static bool system_kvs_fnc_osrelease(KviKvsModuleFunctionCall *c)
{
// no params to process
- c->returnValue()->setString(KviOsInfo::release());
+ c->returnValue()->setString(KviRuntimeInfo::release());
return true;
}
@@ -160,7 +160,7 @@ static bool system_kvs_fnc_osrelease(KviKvsModuleFunctionCall *c)
static bool system_kvs_fnc_osmachine(KviKvsModuleFunctionCall *c)
{
// no params to process
- c->returnValue()->setString(KviOsInfo::machine());
+ c->returnValue()->setString(KviRuntimeInfo::machine());
return true;
}
@@ -181,7 +181,7 @@ static bool system_kvs_fnc_osmachine(KviKvsModuleFunctionCall *c)
static bool system_kvs_fnc_osnodename(KviKvsModuleFunctionCall *c)
{
// no params to process
- c->returnValue()->setString(KviOsInfo::nodename());
+ c->returnValue()->setString(KviRuntimeInfo::nodename());
return true;
}
@@ -401,7 +401,7 @@ static bool system_kvs_fnc_checkModule(KviKvsModuleFunctionCall *c)
static bool system_kvs_fnc_hostname(KviKvsModuleFunctionCall *c)
{
// no params to process
- c->returnValue()->setString(KviOsInfo::hostname());
+ c->returnValue()->setString(KviRuntimeInfo::hostname());
return true;
}