diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:40:51 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:40:51 -0600 |
commit | 4c097708c4cc24f3b8e4c21f14644f5715767d47 (patch) | |
tree | e8ca4b1d3a3b3de0d18e5f144dcef9b36f830b84 /noatun-plugins | |
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')
28 files changed, 99 insertions, 99 deletions
diff --git a/noatun-plugins/alarm/wakeup.cpp b/noatun-plugins/alarm/wakeup.cpp index 28ae6c3..9bcffc8 100644 --- a/noatun-plugins/alarm/wakeup.cpp +++ b/noatun-plugins/alarm/wakeup.cpp @@ -41,7 +41,7 @@ extern "C" Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("wakeup"); + TDEGlobal::locale()->insertCatalogue("wakeup"); return new Wakeup(); } @@ -67,7 +67,7 @@ Wakeup::~Wakeup() void Wakeup::update() { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Noatun Alarm"); hour[0]=config->readNumEntry("Hour1",7); @@ -287,7 +287,7 @@ void WakeupPrefs::slotViewFrame(int state) void WakeupPrefs::save() { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Noatun Alarm"); config->writeEntry("Monday",monday->isChecked()); config->writeEntry("Tuesday",tuesday->isChecked()); @@ -325,36 +325,36 @@ void WakeupPrefs::save() void WakeupPrefs::load() { - KGlobal::config()->setGroup("Noatun Alarm"); - monday->setChecked(KGlobal::config()->readBoolEntry("Monday",false)); - tuesday->setChecked(KGlobal::config()->readBoolEntry("Tuesday",false)); - wednesday->setChecked(KGlobal::config()->readBoolEntry("Wednesday",false)); - thursday->setChecked(KGlobal::config()->readBoolEntry("Thursday",false)); - friday->setChecked(KGlobal::config()->readBoolEntry("Friday",false)); - saturday->setChecked(KGlobal::config()->readBoolEntry("Saturday",false)); - sunday->setChecked(KGlobal::config()->readBoolEntry("Sunday",false)); - - hour1->setValue(KGlobal::config()->readNumEntry("Hour1",7)); - minute1->setValue(KGlobal::config()->readNumEntry("Minute1",0)); - hour2->setValue(KGlobal::config()->readNumEntry("Hour2",7)); - minute2->setValue(KGlobal::config()->readNumEntry("Minute2",0)); - hour3->setValue(KGlobal::config()->readNumEntry("Hour3",7)); - minute3->setValue(KGlobal::config()->readNumEntry("Minute3",0)); - hour4->setValue(KGlobal::config()->readNumEntry("Hour4",7)); - minute4->setValue(KGlobal::config()->readNumEntry("Minute4",0)); - hour5->setValue(KGlobal::config()->readNumEntry("Hour5",7)); - minute5->setValue(KGlobal::config()->readNumEntry("Minute5",0)); - hour6->setValue(KGlobal::config()->readNumEntry("Hour6",7)); - minute6->setValue(KGlobal::config()->readNumEntry("Minute6",0)); - hour7->setValue(KGlobal::config()->readNumEntry("Hour7",7)); - minute7->setValue(KGlobal::config()->readNumEntry("Minute7",0)); + TDEGlobal::config()->setGroup("Noatun Alarm"); + monday->setChecked(TDEGlobal::config()->readBoolEntry("Monday",false)); + tuesday->setChecked(TDEGlobal::config()->readBoolEntry("Tuesday",false)); + wednesday->setChecked(TDEGlobal::config()->readBoolEntry("Wednesday",false)); + thursday->setChecked(TDEGlobal::config()->readBoolEntry("Thursday",false)); + friday->setChecked(TDEGlobal::config()->readBoolEntry("Friday",false)); + saturday->setChecked(TDEGlobal::config()->readBoolEntry("Saturday",false)); + sunday->setChecked(TDEGlobal::config()->readBoolEntry("Sunday",false)); + + hour1->setValue(TDEGlobal::config()->readNumEntry("Hour1",7)); + minute1->setValue(TDEGlobal::config()->readNumEntry("Minute1",0)); + hour2->setValue(TDEGlobal::config()->readNumEntry("Hour2",7)); + minute2->setValue(TDEGlobal::config()->readNumEntry("Minute2",0)); + hour3->setValue(TDEGlobal::config()->readNumEntry("Hour3",7)); + minute3->setValue(TDEGlobal::config()->readNumEntry("Minute3",0)); + hour4->setValue(TDEGlobal::config()->readNumEntry("Hour4",7)); + minute4->setValue(TDEGlobal::config()->readNumEntry("Minute4",0)); + hour5->setValue(TDEGlobal::config()->readNumEntry("Hour5",7)); + minute5->setValue(TDEGlobal::config()->readNumEntry("Minute5",0)); + hour6->setValue(TDEGlobal::config()->readNumEntry("Hour6",7)); + minute6->setValue(TDEGlobal::config()->readNumEntry("Minute6",0)); + hour7->setValue(TDEGlobal::config()->readNumEntry("Hour7",7)); + minute7->setValue(TDEGlobal::config()->readNumEntry("Minute7",0)); - TQString volend(KGlobal::config()->readEntry("VolumeEnd","80%")); + TQString volend(TDEGlobal::config()->readEntry("VolumeEnd","80%")); volend.truncate(volend.length()-1); volEndValue->setValue(volend.toInt()); - switch (KGlobal::config()->readNumEntry("ModeAlarm",0)) + switch (TDEGlobal::config()->readNumEntry("ModeAlarm",0)) { case 0: alarmmode->setChecked(true); diff --git a/noatun-plugins/alsaplayer/alsaplayerui.cpp b/noatun-plugins/alsaplayer/alsaplayerui.cpp index 1620b78..0cd21a8 100644 --- a/noatun-plugins/alsaplayer/alsaplayerui.cpp +++ b/noatun-plugins/alsaplayer/alsaplayerui.cpp @@ -27,7 +27,7 @@ extern "C" { Plugin * create_plugin() { - KGlobal::locale()->insertCatalogue("alsaplayerui"); + TDEGlobal::locale()->insertCatalogue("alsaplayerui"); return new AlsaPlayer; } } diff --git a/noatun-plugins/alsaplayer/configmodule.cpp b/noatun-plugins/alsaplayer/configmodule.cpp index 6fd02f8..9271616 100644 --- a/noatun-plugins/alsaplayer/configmodule.cpp +++ b/noatun-plugins/alsaplayer/configmodule.cpp @@ -53,7 +53,7 @@ AlsaPlayerConfigModule::AlsaPlayerConfigModule(TQObject * parent) void AlsaPlayerConfigModule::save() { - KConfig * c(KGlobal::config()); + KConfig * c(TDEGlobal::config()); c->setGroup("AlsaPlayerInterface"); c->writeEntry("ScrollTitle", scroll_->isChecked()); c->sync(); @@ -63,7 +63,7 @@ AlsaPlayerConfigModule::save() void AlsaPlayerConfigModule::reopen() { - KConfig * c(KGlobal::config()); + KConfig * c(TDEGlobal::config()); c->setGroup("AlsaPlayerInterface"); scroll_->setChecked(c->readBoolEntry("ScrollTitle", true)); } diff --git a/noatun-plugins/charlatan/charlatanui.cpp b/noatun-plugins/charlatan/charlatanui.cpp index a2a9bec..36113ff 100644 --- a/noatun-plugins/charlatan/charlatanui.cpp +++ b/noatun-plugins/charlatan/charlatanui.cpp @@ -27,7 +27,7 @@ extern "C" { Plugin * create_plugin() { - KGlobal::locale()->insertCatalogue("charlatanui"); + TDEGlobal::locale()->insertCatalogue("charlatanui"); return new Charlatan; } } diff --git a/noatun-plugins/charlatan/configmodule.cpp b/noatun-plugins/charlatan/configmodule.cpp index 3624e0b..08056ae 100644 --- a/noatun-plugins/charlatan/configmodule.cpp +++ b/noatun-plugins/charlatan/configmodule.cpp @@ -53,7 +53,7 @@ CharlatanConfigModule::CharlatanConfigModule(TQObject * parent) void CharlatanConfigModule::save() { - KConfig * c(KGlobal::config()); + KConfig * c(TDEGlobal::config()); c->setGroup("CharlatanInterface"); c->writeEntry("ScrollTitle", scroll_->isChecked()); c->sync(); @@ -63,7 +63,7 @@ CharlatanConfigModule::save() void CharlatanConfigModule::reopen() { - KConfig * c(KGlobal::config()); + KConfig * c(TDEGlobal::config()); c->setGroup("CharlatanInterface"); scroll_->setChecked(c->readBoolEntry("ScrollTitle", true)); } diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp index 7f7a41f..b708f02 100644 --- a/noatun-plugins/charlatan/userinterface.cpp +++ b/noatun-plugins/charlatan/userinterface.cpp @@ -394,7 +394,7 @@ void Charlatan::slotTimeout() void Charlatan::loadConfig() { - KConfig * c(KGlobal::config()); + KConfig * c(TDEGlobal::config()); c->setGroup("CharlatanInterface"); titleLabel_->setScroll(c->readBoolEntry("ScrollTitle", true)); } diff --git a/noatun-plugins/dub/dub/dubconfigmodule.cpp b/noatun-plugins/dub/dub/dubconfigmodule.cpp index 581bbf2..970e9ad 100644 --- a/noatun-plugins/dub/dub/dubconfigmodule.cpp +++ b/noatun-plugins/dub/dub/dubconfigmodule.cpp @@ -47,7 +47,7 @@ DubConfigModule::~DubConfigModule() void DubConfigModule::save(void) { - KConfig* config(KGlobal::config()); + KConfig* config(TDEGlobal::config()); config->setGroup("DubPlaylist"); mediaDirectory = prefs->mediaDirectory->url(); @@ -81,7 +81,7 @@ void DubConfigModule::save(void) void DubConfigModule::reopen(void) { kdDebug(90010) << "dubconfig: reopen" << endl; - KConfig* config(KGlobal::config()); + KConfig* config(TDEGlobal::config()); config->setGroup("DubPlaylist"); mediaDirectory = config->readPathEntry("MediaDirectory", "~/"); kdDebug(90010) << "dub: media home is " << mediaDirectory << endl; diff --git a/noatun-plugins/dub/dub/dubplaylist.cpp b/noatun-plugins/dub/dub/dubplaylist.cpp index 6803214..e7e1bef 100644 --- a/noatun-plugins/dub/dub/dubplaylist.cpp +++ b/noatun-plugins/dub/dub/dubplaylist.cpp @@ -26,7 +26,7 @@ // plugin interface extern "C" Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("dub"); + TDEGlobal::locale()->insertCatalogue("dub"); DubPlaylist* dub = new DubPlaylist; return dub; } diff --git a/noatun-plugins/ffrs/ffrs.cpp b/noatun-plugins/ffrs/ffrs.cpp index 9e73104..706ade4 100644 --- a/noatun-plugins/ffrs/ffrs.cpp +++ b/noatun-plugins/ffrs/ffrs.cpp @@ -16,7 +16,7 @@ extern "C" Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("ffrs"); + TDEGlobal::locale()->insertCatalogue("ffrs"); return new FFRS(); } diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp index 1ce874c..1f94dcd 100644 --- a/noatun-plugins/lyrics/cmodule.cpp +++ b/noatun-plugins/lyrics/cmodule.cpp @@ -178,7 +178,7 @@ void LyricsCModule::queryChanged( const TQString &query ) { void LyricsCModule::save() { - KConfig *conf = KGlobal::config(); + KConfig *conf = TDEGlobal::config(); conf->setGroup( "Lyrics" ); TQStringList queryList, nameList; TQValueVector<SearchProvider>::iterator it; @@ -197,7 +197,7 @@ void LyricsCModule::save() { void LyricsCModule::reopen() { TQStringList queryList, nameList; - KConfig *conf = KGlobal::config(); + KConfig *conf = TDEGlobal::config(); mProviders.clear(); providersBox->clear(); kdDebug(90020) << "config read" << endl; diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp index 30d7703..9fa4921 100644 --- a/noatun-plugins/lyrics/lyrics.cpp +++ b/noatun-plugins/lyrics/lyrics.cpp @@ -16,7 +16,7 @@ extern "C" { Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("lyrics"); + TDEGlobal::locale()->insertCatalogue("lyrics"); return new Lyrics(); } } @@ -69,7 +69,7 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false) setAutoSaveSettings("Lyrics"); /* Load configuration */ - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Lyrics"); follow_act->setChecked(config->readBoolEntry("follow", true)); /* Create config object */ @@ -245,7 +245,7 @@ void Lyrics::openURLRequest( const KURL &url, const KParts::URLArgs & ) Lyrics::~Lyrics() { /* Save configurations */ - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Lyrics"); config->writeEntry("follow", follow_act->isChecked()); // Force saving, as closeEvent is probably never called diff --git a/noatun-plugins/nexscope/noatunplugin.cpp b/noatun-plugins/nexscope/noatunplugin.cpp index e0b3d28..a279d48 100644 --- a/noatun-plugins/nexscope/noatunplugin.cpp +++ b/noatun-plugins/nexscope/noatunplugin.cpp @@ -10,7 +10,7 @@ extern "C" { Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("nexscope"); + TDEGlobal::locale()->insertCatalogue("nexscope"); return new NexPlugin(); } } @@ -18,7 +18,7 @@ Plugin *create_plugin() NexPlugin::NexPlugin() { - connect(&process, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(processExited(KProcess *))); + connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(processExited(TDEProcess *))); } NexPlugin::~NexPlugin() @@ -32,7 +32,7 @@ void NexPlugin::init() // 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 noatunNex. Check your installation.")); unload(); @@ -40,7 +40,7 @@ void NexPlugin::init() } -void NexPlugin::processExited(KProcess *) +void NexPlugin::processExited(TDEProcess *) { unload(); } diff --git a/noatun-plugins/nexscope/noatunplugin.h b/noatun-plugins/nexscope/noatunplugin.h index ad3e6e1..56cc21b 100644 --- a/noatun-plugins/nexscope/noatunplugin.h +++ b/noatun-plugins/nexscope/noatunplugin.h @@ -16,10 +16,10 @@ public: void init(); private slots: - void processExited(KProcess *); + void processExited(TDEProcess *); private: - KProcess process; + TDEProcess process; }; diff --git a/noatun-plugins/oblique/kdatacollection.cpp b/noatun-plugins/oblique/kdatacollection.cpp index aacb765..ec3485e 100644 --- a/noatun-plugins/oblique/kdatacollection.cpp +++ b/noatun-plugins/oblique/kdatacollection.cpp @@ -57,7 +57,7 @@ KDataCollection::KDataCollection(KConfig *config, const TQString &dir) KDataCollection::KDataCollection(const TQString &dir) { - init(KGlobal::config(), "KDataCollection", dir, "appdata", dir); + init(TDEGlobal::config(), "KDataCollection", dir, "appdata", dir); } void KDataCollection::init( @@ -78,7 +78,7 @@ TQStringList KDataCollection::names() const // these are the entries I have TQStringList n = g.readListEntry(mEntry); - TQStringList fs = KGlobal::dirs()->findAllResources(mDatadir, mDir+"/*", false, true); + TQStringList fs = TDEGlobal::dirs()->findAllResources(mDatadir, mDir+"/*", false, true); TQStringList total; for (TQStringList::Iterator i(fs.begin()); i != fs.end(); ++i) @@ -126,9 +126,9 @@ TQString KDataCollection::file(const TQString &name, bool create) TQString KDataCollection::saveFile(const TQString &name, bool create) { - if (!KGlobal::dirs()->isRestrictedResource(mDatadir, mDir+"/"+name)) + if (!TDEGlobal::dirs()->isRestrictedResource(mDatadir, mDir+"/"+name)) { - TQString s = KGlobal::dirs()->saveLocation(mDatadir, mDir, create); + TQString s = TDEGlobal::dirs()->saveLocation(mDatadir, mDir, create); if (s.length() && create) { diff --git a/noatun-plugins/oblique/kdatacollection.h b/noatun-plugins/oblique/kdatacollection.h index 15cb98e..6230ddb 100644 --- a/noatun-plugins/oblique/kdatacollection.h +++ b/noatun-plugins/oblique/kdatacollection.h @@ -94,7 +94,7 @@ public: KDataCollection(KConfig *config, const TQString &dir); /** - * constructor. the KConfig is assumed to be KGlobal::config() + * constructor. the KConfig is assumed to be TDEGlobal::config() * * otherwise the same as the previous function **/ diff --git a/noatun-plugins/oblique/oblique.cpp b/noatun-plugins/oblique/oblique.cpp index 234833a..4b2b543 100644 --- a/noatun-plugins/oblique/oblique.cpp +++ b/noatun-plugins/oblique/oblique.cpp @@ -30,7 +30,7 @@ Oblique::Oblique() mView = 0; mAdder = 0; - KConfigGroup g(KGlobal::config(), "oblique"); + KConfigGroup g(TDEGlobal::config(), "oblique"); mBase = new Base(::locate("data", "noatun/")+"/oblique-list"); diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp index 0087b99..b8909a1 100644 --- a/noatun-plugins/oblique/tree.cpp +++ b/noatun-plugins/oblique/tree.cpp @@ -478,7 +478,7 @@ Tree::Tree(Oblique *oblique, TQWidget *parent) mSlice = oblique->base()->defaultSlice(); - KConfigGroup g(KGlobal::config(), "oblique"); + KConfigGroup g(TDEGlobal::config(), "oblique"); mFileOfQuery = g.readEntry("schema", "standard"); if (!setSchema(mFileOfQuery)) { diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp index 073873c..15b15e5 100644 --- a/noatun-plugins/oblique/view.cpp +++ b/noatun-plugins/oblique/view.cpp @@ -89,10 +89,10 @@ View::View(Oblique *oblique) KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection()); - applyMainWindowSettings(KGlobal::config(), "Oblique View"); + applyMainWindowSettings(TDEGlobal::config(), "Oblique View"); createGUI("obliqueui.rc"); - KConfigGroup g(KGlobal::config(), "oblique"); + KConfigGroup g(TDEGlobal::config(), "oblique"); TQStringList tabids = g.readListEntry("tabids"); for (TQStringList::Iterator i(tabids.begin()); i != tabids.end(); ++i) @@ -142,14 +142,14 @@ View::~View() tabids.append(t); } - KConfigGroup g(KGlobal::config(), "oblique"); + KConfigGroup g(TDEGlobal::config(), "oblique"); g.writeEntry("tabids", tabids); g.sync(); } void View::configureToolBars() { - saveMainWindowSettings(KGlobal::config(), "Oblique View"); + saveMainWindowSettings(TDEGlobal::config(), "Oblique View"); KEditToolbar dlg(actionCollection(), "obliqueui.rc"); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolBarConfig())); dlg.exec(); @@ -158,7 +158,7 @@ void View::configureToolBars() void View::newToolBarConfig() { createGUI("obliqueui.rc"); - applyMainWindowSettings(KGlobal::config(), "Oblique View"); + applyMainWindowSettings(TDEGlobal::config(), "Oblique View"); } void View::closeEvent(TQCloseEvent*) diff --git a/noatun-plugins/pitchablespeed/pitchablespeed.cpp b/noatun-plugins/pitchablespeed/pitchablespeed.cpp index 17d8e51..385ce53 100644 --- a/noatun-plugins/pitchablespeed/pitchablespeed.cpp +++ b/noatun-plugins/pitchablespeed/pitchablespeed.cpp @@ -27,7 +27,7 @@ extern "C" { Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("pitchablespeed"); + TDEGlobal::locale()->insertCatalogue("pitchablespeed"); return new PitchableSpeed(); } } diff --git a/noatun-plugins/synaescope/cmodule.cpp b/noatun-plugins/synaescope/cmodule.cpp index 5b881fd..5d64685 100644 --- a/noatun-plugins/synaescope/cmodule.cpp +++ b/noatun-plugins/synaescope/cmodule.cpp @@ -62,7 +62,7 @@ void SynaePrefs::save() if(!changed) return; - KConfig *c = KGlobal::config(); + KConfig *c = TDEGlobal::config(); c->setGroup("Synaescope"); c->writeEntry("xResolution", xRes->value()); c->writeEntry("yResolution", yRes->value()); @@ -73,7 +73,7 @@ void SynaePrefs::save() void SynaePrefs::reopen() { // kdDebug(66666) << k_funcinfo << endl; - KConfig *c = KGlobal::config(); + KConfig *c = TDEGlobal::config(); c->setGroup("Synaescope"); xRes->setValue(c->readNumEntry("xResolution", 320)); diff --git a/noatun-plugins/synaescope/synaescope.cpp b/noatun-plugins/synaescope/synaescope.cpp index 16a6a2e..a401704 100644 --- a/noatun-plugins/synaescope/synaescope.cpp +++ b/noatun-plugins/synaescope/synaescope.cpp @@ -17,7 +17,7 @@ extern "C" { Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("synaescope"); + TDEGlobal::locale()->insertCatalogue("synaescope"); return new SynaeScope(); } } @@ -26,12 +26,12 @@ SynaeScope::SynaeScope() : Plugin(), scopeExePath(0) { kdDebug(66666) << k_funcinfo << endl; restarting=false; - connect(&process, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(processExited(KProcess *))); - connect(&process, TQT_SIGNAL(receivedStdout(KProcess *,char *,int)), - this, TQT_SLOT(receivedStdout(KProcess *,char *,int))); - connect(&process, TQT_SIGNAL(receivedStderr(KProcess *,char *,int)), - this, TQT_SLOT(receivedStderr(KProcess *,char *,int))); + connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(processExited(TDEProcess *))); + connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)), + this, TQT_SLOT(receivedStdout(TDEProcess *,char *,int))); + connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *,char *,int)), + this, TQT_SLOT(receivedStderr(TDEProcess *,char *,int))); } SynaeScope::~SynaeScope() @@ -63,7 +63,7 @@ void SynaeScope::init() void SynaeScope::runScope() { kdDebug(66666) << k_funcinfo << endl; - 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 noatunsynaescope. Check your installation.")); unload(); @@ -81,7 +81,7 @@ void SynaeScope::readConfig() process.kill(); } -void SynaeScope::processExited(KProcess *) +void SynaeScope::processExited(TDEProcess *) { kdDebug(66666) << k_funcinfo << endl; if(restarting) @@ -95,13 +95,13 @@ void SynaeScope::processExited(KProcess *) } } -void SynaeScope::receivedStdout(KProcess *, char *buf, int len) +void SynaeScope::receivedStdout(TDEProcess *, char *buf, int len) { TQCString debugString(buf,len); kdDebug(66666) << k_funcinfo << debugString << endl; } -void SynaeScope::receivedStderr(KProcess *, char *buf, int len) +void SynaeScope::receivedStderr(TDEProcess *, char *buf, int len) { TQCString debugString(buf,len); kdDebug(66666) << k_funcinfo << debugString << endl; diff --git a/noatun-plugins/synaescope/synaescope.h b/noatun-plugins/synaescope/synaescope.h index 2579151..e62fbe0 100644 --- a/noatun-plugins/synaescope/synaescope.h +++ b/noatun-plugins/synaescope/synaescope.h @@ -12,7 +12,7 @@ #include <kprocess.h> class SynaePrefs; -class KProcess; +class TDEProcess; class SynaeScope : public TQObject, public Plugin { @@ -27,13 +27,13 @@ public: void runScope(); private slots: - void processExited(KProcess *); + void processExited(TDEProcess *); void readConfig(); - void receivedStdout(KProcess *, char *buf, int len); - void receivedStderr(KProcess *, char *buf, int len); + void receivedStdout(TDEProcess *, char *buf, int len); + void receivedStderr(TDEProcess *, char *buf, int len); private: - KProcess process; + TDEProcess process; TQString scopeExePath; bool restarting; SynaePrefs *mPrefs; 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; 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 diff --git a/noatun-plugins/wavecapture/wavecapture.cpp b/noatun-plugins/wavecapture/wavecapture.cpp index 0667951..b20ec1e 100644 --- a/noatun-plugins/wavecapture/wavecapture.cpp +++ b/noatun-plugins/wavecapture/wavecapture.cpp @@ -44,7 +44,7 @@ extern "C" { Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("wavecapture"); + TDEGlobal::locale()->insertCatalogue("wavecapture"); return new WaveCapture(); } } |