Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 07ab01d735
commit 3f7edc4861

@ -18,7 +18,7 @@ Kima 0.7.2:
- updated admin directory that supports automake 1.10 - 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) - swedish, turkish and indonesian translation added (thanks to Oskar Ellström, Uğur Çetin and Donnie S Bhayangkara)
- translation fixes - 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: Kima 0.7.1:
- uptime source added - uptime source added

@ -74,7 +74,7 @@
extern "C" { extern "C" {
KPanelApplet* init( TQWidget* inParent, const TQString& inConfigFile) { KPanelApplet* init( TQWidget* inParent, const TQString& inConfigFile) {
KGlobal::locale()->insertCatalogue("kima"); TDEGlobal::locale()->insertCatalogue("kima");
return new Kima(inConfigFile, KPanelApplet::Normal, return new Kima(inConfigFile, KPanelApplet::Normal,
//KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences, //KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences,
KPanelApplet::About | KPanelApplet::Preferences, KPanelApplet::About | KPanelApplet::Preferences,

@ -73,7 +73,7 @@ std::list<Source*>NVidiaThermalSrc::createInstances(TQWidget* inParent){
<< "-n" // don't load config << "-n" // don't load config
<< "-q" << "GPUCoreTemp" << "-q" << "GPUCoreTemp"
<< "-q" << "GPUAmbientTemp"; << "-q" << "GPUAmbientTemp";
if(!proc.start(KProcess::Block)) if(!proc.start(TDEProcess::Block))
return list; return list;
// now see what it printed... // now see what it printed...
@ -144,7 +144,7 @@ void NVidiaThermalSrc::evaluateStdout(){
#ifndef HAVE_NVCONTROL #ifndef HAVE_NVCONTROL
void NVidiaThermalSrc::createProcess() { void NVidiaThermalSrc::createProcess() {
mProcess = new KProcIO; 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" *mProcess << "nvidia-settings" << "-n"
<< "-q" << mID; << "-q" << mID;
} }

@ -218,5 +218,5 @@ int Source::celsiusToFahrenheit(int inCelsius) const{
} }
void Source::realizeWidget(){ void Source::realizeWidget(){
mIsMetric = KGlobal::locale()->measureSystem() == KLocale::Metric; mIsMetric = TDEGlobal::locale()->measureSystem() == KLocale::Metric;
} }

Loading…
Cancel
Save