diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:48:30 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:48:30 -0600 |
commit | 722a076e84b860a947f4c68417db82526b03b1a1 (patch) | |
tree | 8ca2eba8079acf41f8f7809fbcdd597326c0a914 /kttsd/kttsd | |
parent | 98259239efc400e2e736f065f6790567df818c2e (diff) | |
download | tdeaccessibility-722a076e84b860a947f4c68417db82526b03b1a1.tar.gz tdeaccessibility-722a076e84b860a947f4c68417db82526b03b1a1.zip |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'kttsd/kttsd')
-rw-r--r-- | kttsd/kttsd/filtermgr.cpp | 8 | ||||
-rw-r--r-- | kttsd/kttsd/filtermgr.h | 2 | ||||
-rw-r--r-- | kttsd/kttsd/speaker.cpp | 2 | ||||
-rw-r--r-- | kttsd/kttsd/talkermgr.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/kttsd/kttsd/filtermgr.cpp b/kttsd/kttsd/filtermgr.cpp index 36dd822..25c34eb 100644 --- a/kttsd/kttsd/filtermgr.cpp +++ b/kttsd/kttsd/filtermgr.cpp @@ -351,7 +351,7 @@ KttsFilterProc* FilterMgr::loadFilterPlugin(const TQString& desktopEntryName) // kdDebug() << "FilterMgr::loadFilterPlugin: Running"<< endl; // Find the plugin. - KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin", + TDETrader::OfferList offers = TDETrader::self()->query("KTTSD/FilterPlugin", TQString("DesktopEntryName == '%1'").arg(desktopEntryName)); if (offers.count() == 1) @@ -383,13 +383,13 @@ KttsFilterProc* FilterMgr::loadFilterPlugin(const TQString& desktopEntryName) } } // The plug in was not found (unexpected behaviour, returns null). - kdDebug() << "FilterMgr::loadFilterPlugin: KTrader did not return an offer for plugin " + kdDebug() << "FilterMgr::loadFilterPlugin: TDETrader did not return an offer for plugin " << desktopEntryName << endl; return NULL; } /** - * Uses KTrader to convert a translated Filter Plugin Name to DesktopEntryName. + * Uses TDETrader to convert a translated Filter Plugin Name to DesktopEntryName. * @param name The translated plugin name. From Name= line in .desktop file. * @return DesktopEntryName. The name of the .desktop file (less .desktop). * TQString() if not found. @@ -397,7 +397,7 @@ KttsFilterProc* FilterMgr::loadFilterPlugin(const TQString& desktopEntryName) TQString FilterMgr::FilterNameToDesktopEntryName(const TQString& name) { if (name.isEmpty()) return TQString(); - KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin"); + TDETrader::OfferList offers = TDETrader::self()->query("KTTSD/FilterPlugin"); for (uint ndx = 0; ndx < offers.count(); ++ndx) if (offers[ndx]->name() == name) return offers[ndx]->desktopEntryName(); return TQString(); diff --git a/kttsd/kttsd/filtermgr.h b/kttsd/kttsd/filtermgr.h index d4adc78..dea2482 100644 --- a/kttsd/kttsd/filtermgr.h +++ b/kttsd/kttsd/filtermgr.h @@ -165,7 +165,7 @@ class FilterMgr : public KttsFilterProc KttsFilterProc* loadFilterPlugin(const TQString& plugInName); // Finishes up with current filter (if any) and goes on to the next filter. void nextFilter(); - // Uses KTrader to convert a translated Filter Plugin Name to DesktopEntryName. + // Uses TDETrader to convert a translated Filter Plugin Name to DesktopEntryName. // @param name The translated plugin name. From Name= line in .desktop file. // @return DesktopEntryName. The name of the .desktop file (less .desktop). // TQString() if not found. diff --git a/kttsd/kttsd/speaker.cpp b/kttsd/kttsd/speaker.cpp index 1ba1f46..f56e803 100644 --- a/kttsd/kttsd/speaker.cpp +++ b/kttsd/kttsd/speaker.cpp @@ -1540,7 +1540,7 @@ Player* Speaker::createPlayerObject() break; } } - KTrader::OfferList offers = KTrader::self()->query( + TDETrader::OfferList offers = TDETrader::self()->query( "KTTSD/AudioPlugin", TQString("DesktopEntryName == '%1'").arg(plugInName)); if(offers.count() == 1) diff --git a/kttsd/kttsd/talkermgr.cpp b/kttsd/kttsd/talkermgr.cpp index 6821888..37830a3 100644 --- a/kttsd/kttsd/talkermgr.cpp +++ b/kttsd/kttsd/talkermgr.cpp @@ -106,7 +106,7 @@ int TalkerMgr::loadPlugIns(TDEConfig* config) talkerCode = TalkerCode::normalizeTalkerCode(talkerCode, fullLanguageCode); // Find the KTTSD SynthPlugin. - KTrader::OfferList offers = KTrader::self()->query( + TDETrader::OfferList offers = TDETrader::self()->query( "KTTSD/SynthPlugin", TQString("DesktopEntryName == '%1'").arg(desktopEntryName)); if(offers.count() > 1){ @@ -318,7 +318,7 @@ bool TalkerMgr::autoconfigureTalker(const TQString& langCode, TDEConfig* config) TQString talkerID = TQString::number(lastTalkerID + 1); // Query for all the KTTSD SynthPlugins. - KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin"); + TDETrader::OfferList offers = TDETrader::self()->query("KTTSD/SynthPlugin"); // Iterate thru the possible plug ins. for(unsigned int i=0; i < offers.count() ; ++i) |