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/tippercanoe | |
| 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/tippercanoe')
| -rw-r--r-- | noatun-plugins/tippercanoe/synaescope.cpp | 12 | ||||
| -rw-r--r-- | noatun-plugins/tippercanoe/synaescope.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/noatun-plugins/tippercanoe/synaescope.cpp b/noatun-plugins/tippercanoe/synaescope.cpp index 9a0fb1b..9435408 100644 --- a/noatun-plugins/tippercanoe/synaescope.cpp +++ b/noatun-plugins/tippercanoe/synaescope.cpp @@ -21,7 +21,7 @@ extern "C" Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("tippecanoe"); + TDEGlobal::locale()->insertCatalogue("tippecanoe"); return new SynaeScope(); } @@ -45,20 +45,20 @@ SynaeScope::SynaeScope() SynaeScope::~SynaeScope() { - connect(&process, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(processExited(KProcess *))); + connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(processExited(TDEProcess *))); napp->pluginMenuRemove(pluginMenuItem); } void SynaeScope::init() { - connect(&process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(read(KProcess *, char *, int))); + connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(read(TDEProcess *, char *, int))); pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Tippecanoe"), TQT_TQOBJECT(this), TQT_SLOT(toggle(void))); process << KStandardDirs::findExe("noatuntippecanoe.bin"); // 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 noatuntippecanoe.bin. Check your installation.")); unload(); @@ -79,7 +79,7 @@ void SynaeScope::scopeEvent(float *left, float *right, int size) } } -void SynaeScope::read(KProcess *, char *buf, int) +void SynaeScope::read(TDEProcess *, char *buf, int) { TQString num = TQString::fromLatin1(buf); num = num.left(num.find(TQRegExp("\\s"))); @@ -87,7 +87,7 @@ void SynaeScope::read(KProcess *, char *buf, int) embed->embed(id); } -void SynaeScope::processExited(KProcess *) +void SynaeScope::processExited(TDEProcess *) { unload(); } diff --git a/noatun-plugins/tippercanoe/synaescope.h b/noatun-plugins/tippercanoe/synaescope.h index e1e6ef0..5270f9b 100644 --- a/noatun-plugins/tippercanoe/synaescope.h +++ b/noatun-plugins/tippercanoe/synaescope.h @@ -28,9 +28,9 @@ public: void init(); private slots: - void processExited(KProcess *); + void processExited(TDEProcess *); void toggle(void); - void read(KProcess *, char *, int); + void read(TDEProcess *, char *, int); protected: virtual void scopeEvent(float *left, float *right, int bands); @@ -38,7 +38,7 @@ protected: private: char *mBuffer; static const int bufferSize=512; - KProcess process; + TDEProcess process; int pluginMenuItem; QXEmbed *embed; WId id; |