summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:21:51 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:21:51 -0600
commit98cc645c1f966d81484f35a3af2e8fe5fe867734 (patch)
tree9b2c327f886bfda8bade9fda080b9a52a13b21e4
parentf3fe30d32f5d74b063b3ec3031b38c674c7d4a81 (diff)
downloadknutclient-98cc645c1f966d81484f35a3af2e8fe5fe867734.tar.gz
knutclient-98cc645c1f966d81484f35a3af2e8fe5fe867734.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
-rwxr-xr-xsrc/knutdock.cpp2
-rw-r--r--src/knutmessage.cpp2
-rw-r--r--src/knutprintupsvar.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/knutdock.cpp b/src/knutdock.cpp
index 7be9218..0443312 100755
--- a/src/knutdock.cpp
+++ b/src/knutdock.cpp
@@ -61,7 +61,7 @@ KNutDock::KNutDock(KNutVarData::upsInfoDef* activeUpsInfo, KNutVarData::SettingD
clearValues();
- KIconLoader *loader = KGlobal::iconLoader();
+ KIconLoader *loader = TDEGlobal::iconLoader();
m_mainPix = loader->loadIcon ("knutclient",KIcon::Small,16);
// aplications's own icons
diff --git a/src/knutmessage.cpp b/src/knutmessage.cpp
index 1c69e82..c253e5a 100644
--- a/src/knutmessage.cpp
+++ b/src/knutmessage.cpp
@@ -31,7 +31,7 @@ KNutMessage::KNutMessage(const TQString messageText, const typeOfMessage type, c
setCaption("KNutClient");
m_messageTimer = 0;
- KIconLoader *loader = KGlobal::iconLoader();
+ KIconLoader *loader = TDEGlobal::iconLoader();
switch(type) {
case infoMess:
diff --git a/src/knutprintupsvar.cpp b/src/knutprintupsvar.cpp
index ba4bf50..dc776fd 100644
--- a/src/knutprintupsvar.cpp
+++ b/src/knutprintupsvar.cpp
@@ -63,7 +63,7 @@ KNutPrintUpsVar::KNutPrintUpsVar(KNutNet* const upsNet, const bool useDescriptio
countRWVars=myUpsNet->readNumberVars(KNutNet::RWVars);
countIComms=myUpsNet->readNumberComms();
- KIconLoader *loader = KGlobal::iconLoader();
+ KIconLoader *loader = TDEGlobal::iconLoader();
dirPixmap=loader->loadIcon ("folder_open",KIcon::Small,16);
page = plainPage();