diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:40:51 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:40:51 -0600 |
commit | 4c097708c4cc24f3b8e4c21f14644f5715767d47 (patch) | |
tree | e8ca4b1d3a3b3de0d18e5f144dcef9b36f830b84 /noatun-plugins/tyler | |
parent | 0642ee50634d90e255c6f45194f6a47dc1157cde (diff) | |
download | tdeaddons-4c097708c4cc24f3b8e4c21f14644f5715767d47.tar.gz tdeaddons-4c097708c4cc24f3b8e4c21f14644f5715767d47.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'noatun-plugins/tyler')
-rw-r--r-- | noatun-plugins/tyler/file.cpp | 4 | ||||
-rw-r--r-- | noatun-plugins/tyler/tyler.cpp | 8 | ||||
-rw-r--r-- | noatun-plugins/tyler/tyler.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/noatun-plugins/tyler/file.cpp b/noatun-plugins/tyler/file.cpp index c641bc0..cd61992 100644 --- a/noatun-plugins/tyler/file.cpp +++ b/noatun-plugins/tyler/file.cpp @@ -28,14 +28,14 @@ extern "C" static TQString getDataPath(void) { - KStandardDirs &dirs = *KGlobal::dirs(); + KStandardDirs &dirs = *TDEGlobal::dirs(); return dirs.findResource("data", "noatun/tylerstates"); } static TQString getSavePath(void) { - KStandardDirs &dirs = *KGlobal::dirs(); + KStandardDirs &dirs = *TDEGlobal::dirs(); return dirs.saveLocation("data", "noatun/") + "tylerstates"; } diff --git a/noatun-plugins/tyler/tyler.cpp b/noatun-plugins/tyler/tyler.cpp index ad00cac..39be621 100644 --- a/noatun-plugins/tyler/tyler.cpp +++ b/noatun-plugins/tyler/tyler.cpp @@ -14,7 +14,7 @@ extern "C" Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("tyler"); + TDEGlobal::locale()->insertCatalogue("tyler"); return new Tyler(); } @@ -37,11 +37,11 @@ Tyler::~Tyler() void Tyler::init() { process << KStandardDirs::findExe("noatuntyler.bin"); - connect(&process, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(processExited(KProcess *))); + connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(processExited(TDEProcess *))); // Note that process.start() will fail if findExe fails, so there's no real need // for two separate checks. - if(!process.start(KProcess::NotifyOnExit, (KProcess::Communication)(KProcess::Stdin | KProcess::Stdout))) + if(!process.start(TDEProcess::NotifyOnExit, (TDEProcess::Communication)(TDEProcess::Stdin | TDEProcess::Stdout))) { KMessageBox::error(0, i18n("Unable to start noatuntyler.bin. Check your installation.")); unload(); @@ -64,7 +64,7 @@ void Tyler::scopeEvent(float *left, float *right, int size) } } -void Tyler::processExited(KProcess *) +void Tyler::processExited(TDEProcess *) { unload(); } diff --git a/noatun-plugins/tyler/tyler.h b/noatun-plugins/tyler/tyler.h index 08b5bb2..2ae1ac9 100644 --- a/noatun-plugins/tyler/tyler.h +++ b/noatun-plugins/tyler/tyler.h @@ -21,7 +21,7 @@ public: void init(); private slots: - void processExited(KProcess *); + void processExited(TDEProcess *); protected: virtual void scopeEvent(float *left, float *right, int bands); @@ -29,7 +29,7 @@ protected: private: char *mBuffer; static const int bufferSize; - KProcess process; + TDEProcess process; }; #endif |