summaryrefslogtreecommitdiffstats
path: root/ksysguard
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:06 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:06 -0600
commite4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch)
tree8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /ksysguard
parentd41050ea3f6904e5156d35f664346b816b9e4d12 (diff)
downloadtdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip
tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'ksysguard')
-rw-r--r--ksysguard/gui/SensorDisplayLib/ProcessController.h2
-rw-r--r--ksysguard/gui/ksysguard.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.h b/ksysguard/gui/SensorDisplayLib/ProcessController.h
index 4e2bba0..69445b9 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessController.h
+++ b/ksysguard/gui/SensorDisplayLib/ProcessController.h
@@ -40,7 +40,7 @@ class TQComboBox;
class KPushButton;
class KListViewSearchLineWidget;
-extern KApplication* Kapp;
+extern TDEApplication* Kapp;
/**
* This widget implements a process list page. Besides the process
diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc
index 8a137d9..2dbe1bb 100644
--- a/ksysguard/gui/ksysguard.cc
+++ b/ksysguard/gui/ksysguard.cc
@@ -571,9 +571,9 @@ int main( int argc, char** argv )
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options );
- KApplication::disableAutoDcopRegistration();
+ TDEApplication::disableAutoDcopRegistration();
// initialize KDE application
- KApplication *app = new KApplication;
+ TDEApplication *app = new TDEApplication;
KSGRD::SensorMgr = new KSGRD::SensorManager();
KSGRD::Style = new KSGRD::StyleEngine();