summaryrefslogtreecommitdiffstats
path: root/src/sources
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:20:54 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:20:54 -0600
commit3f7edc4861d43739e97822be428197d23d81a979 (patch)
tree4874c29af31d9826f14cde3d495e6d5d030dbda4 /src/sources
parent07ab01d735203e0db3391330a7ebb1aed6fa027d (diff)
downloadkima-3f7edc4861d43739e97822be428197d23d81a979.tar.gz
kima-3f7edc4861d43739e97822be428197d23d81a979.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/sources')
-rw-r--r--src/sources/nvidiathermalsrc.cpp4
-rw-r--r--src/sources/source.cpp2
2 files changed, 3 insertions, 3 deletions
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;
}