diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:20:54 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:20:54 -0600 |
| commit | 3f7edc4861d43739e97822be428197d23d81a979 (patch) | |
| tree | 4874c29af31d9826f14cde3d495e6d5d030dbda4 | |
| parent | 07ab01d735203e0db3391330a7ebb1aed6fa027d (diff) | |
| download | kima-3f7edc4861d43739e97822be428197d23d81a979.tar.gz kima-3f7edc4861d43739e97822be428197d23d81a979.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/kima.cpp | 2 | ||||
| -rw-r--r-- | src/sources/nvidiathermalsrc.cpp | 4 | ||||
| -rw-r--r-- | src/sources/source.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
@@ -18,7 +18,7 @@ Kima 0.7.2: - updated admin directory that supports automake 1.10 - swedish, turkish and indonesian translation added (thanks to Oskar Ellström, Uğur Çetin and Donnie S Bhayangkara) - translation fixes - - processes started by kicker does not exit correctly because of kimas' use of QProcess. KProcess fixes the problem + - processes started by kicker does not exit correctly because of kimas' use of QProcess. TDEProcess fixes the problem Kima 0.7.1: - uptime source added diff --git a/src/kima.cpp b/src/kima.cpp index d07d3e0..aedc1f3 100644 --- a/src/kima.cpp +++ b/src/kima.cpp @@ -74,7 +74,7 @@ extern "C" { KPanelApplet* init( TQWidget* inParent, const TQString& inConfigFile) { - KGlobal::locale()->insertCatalogue("kima"); + TDEGlobal::locale()->insertCatalogue("kima"); return new Kima(inConfigFile, KPanelApplet::Normal, //KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences, KPanelApplet::About | KPanelApplet::Preferences, diff --git a/src/sources/nvidiathermalsrc.cpp b/src/sources/nvidiathermalsrc.cpp index 351a728..1e67e29 100644 --- a/src/sources/nvidiathermalsrc.cpp +++ b/src/sources/nvidiathermalsrc.cpp @@ -73,7 +73,7 @@ std::list<Source*>NVidiaThermalSrc::createInstances(TQWidget* inParent){ << "-n" // don't load config << "-q" << "GPUCoreTemp" << "-q" << "GPUAmbientTemp"; - if(!proc.start(KProcess::Block)) + if(!proc.start(TDEProcess::Block)) return list; // now see what it printed... @@ -144,7 +144,7 @@ void NVidiaThermalSrc::evaluateStdout(){ #ifndef HAVE_NVCONTROL void NVidiaThermalSrc::createProcess() { mProcess = new KProcIO; - connect(mProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(evaluateStdout())); + connect(mProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(evaluateStdout())); *mProcess << "nvidia-settings" << "-n" << "-q" << mID; } diff --git a/src/sources/source.cpp b/src/sources/source.cpp index 18d801c..b3cc680 100644 --- a/src/sources/source.cpp +++ b/src/sources/source.cpp @@ -218,5 +218,5 @@ int Source::celsiusToFahrenheit(int inCelsius) const{ } void Source::realizeWidget(){ - mIsMetric = KGlobal::locale()->measureSystem() == KLocale::Metric; + mIsMetric = TDEGlobal::locale()->measureSystem() == KLocale::Metric; } |