summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ksayit/src/fxpluginhandler.cpp4
-rw-r--r--kttsd/compat/interfaces/kspeech/kspeech.h2
-rw-r--r--kttsd/filters/main.cpp2
-rw-r--r--kttsd/filters/sbd/sbdconf.cpp2
-rw-r--r--kttsd/filters/stringreplacer/stringreplacerconf.cpp2
-rw-r--r--kttsd/filters/talkerchooser/talkerchooserconf.cpp2
-rw-r--r--kttsd/kcmkttsmgr/kcmkttsmgr.cpp22
-rw-r--r--kttsd/kcmkttsmgr/kcmkttsmgr.h4
-rw-r--r--kttsd/kttsd/filtermgr.cpp8
-rw-r--r--kttsd/kttsd/filtermgr.h2
-rw-r--r--kttsd/kttsd/speaker.cpp2
-rw-r--r--kttsd/kttsd/talkermgr.cpp4
-rw-r--r--kttsd/libkttsd/selecttalkerdlg.cpp2
-rw-r--r--kttsd/libkttsd/talkercode.cpp8
-rw-r--r--kttsd/libkttsd/talkercode.h4
-rw-r--r--kttsd/libkttsd/testplayer.cpp2
16 files changed, 36 insertions, 36 deletions
diff --git a/ksayit/src/fxpluginhandler.cpp b/ksayit/src/fxpluginhandler.cpp
index 55c87e7..c5a8b26 100644
--- a/ksayit/src/fxpluginhandler.cpp
+++ b/ksayit/src/fxpluginhandler.cpp
@@ -56,12 +56,12 @@ void FXPluginHandler::searchPlugins()
sRegistered.clear();
m_mapPluginList.clear();
- KTrader::OfferList offers = KTrader::self()->query("KSayIt/FXPlugin");
+ TDETrader::OfferList offers = TDETrader::self()->query("KSayIt/FXPlugin");
KLibFactory *factory = NULL;
TQString library = TQString();
TQString name = TQString();
- KTrader::OfferList::Iterator it=offers.begin();
+ TDETrader::OfferList::Iterator it=offers.begin();
for ( ;it!=offers.end(); ++it ){
KService::Ptr ptr = (*it);
library = ptr->library();
diff --git a/kttsd/compat/interfaces/kspeech/kspeech.h b/kttsd/compat/interfaces/kspeech/kspeech.h
index 263e0c5..f86d5e7 100644
--- a/kttsd/compat/interfaces/kspeech/kspeech.h
+++ b/kttsd/compat/interfaces/kspeech/kspeech.h
@@ -227,7 +227,7 @@
* If you want to detect if KTTSD is installed without starting it, use this code.
*
@verbatim
- KTrader::OfferList offers = KTrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'");
+ TDETrader::OfferList offers = TDETrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'");
if (offers.count() > 0)
{
// KTTSD is installed.
diff --git a/kttsd/filters/main.cpp b/kttsd/filters/main.cpp
index 2a4f134..5bd9f65 100644
--- a/kttsd/filters/main.cpp
+++ b/kttsd/filters/main.cpp
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
- KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin");
+ TDETrader::OfferList offers = TDETrader::self()->query("KTTSD/FilterPlugin");
if (args->isSet("list"))
{
diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp
index 97afb3f..5b1fb6d 100644
--- a/kttsd/filters/sbd/sbdconf.cpp
+++ b/kttsd/filters/sbd/sbdconf.cpp
@@ -69,7 +69,7 @@ SbdConf::SbdConf( TQWidget *parent, const char *name, const TQStringList& /*args
layout->addWidget(m_widget);
// Determine if tdeutils Regular Expression Editor is installed.
- m_reEditorInstalled = !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
+ m_reEditorInstalled = !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
m_widget->reButton->setEnabled( m_reEditorInstalled );
if ( m_reEditorInstalled )
diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp
index dbf6dc1..95e4f51 100644
--- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp
+++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp
@@ -100,7 +100,7 @@ StringReplacerConf::StringReplacerConf( TQWidget *parent, const char *name, cons
this, TQT_SLOT(configChanged()));
// Determine if tdeutils Regular Expression Editor is installed.
- m_reEditorInstalled = !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
+ m_reEditorInstalled = !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
// Set up defaults.
defaults();
diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.cpp b/kttsd/filters/talkerchooser/talkerchooserconf.cpp
index cdc2eb1..90cc4a3 100644
--- a/kttsd/filters/talkerchooser/talkerchooserconf.cpp
+++ b/kttsd/filters/talkerchooser/talkerchooserconf.cpp
@@ -62,7 +62,7 @@ TalkerChooserConf::TalkerChooserConf( TQWidget *parent, const char *name, const
layout->addWidget(m_widget);
// Determine if tdeutils Regular Expression Editor is installed.
- m_reEditorInstalled = !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
+ m_reEditorInstalled = !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
m_widget->reEditorButton->setEnabled(m_reEditorInstalled);
connect(m_widget->nameLineEdit, TQT_SIGNAL(textChanged(const TQString&)),
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
index 941477a..ff7f1f2 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
+++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
@@ -524,7 +524,7 @@ void KCMKttsMgr::load()
}
// Query for all the KCMKTTSD SynthPlugins and store the list in offers.
- KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin");
+ TDETrader::OfferList offers = TDETrader::self()->query("KTTSD/SynthPlugin");
// Iterate thru the possible plug ins getting their language support codes.
for(unsigned int i=0; i < offers.count() ; ++i)
@@ -623,7 +623,7 @@ void KCMKttsMgr::load()
// Add at least one unchecked instance of each available filter plugin if there is
// not already at least one instance and the filter can autoconfig itself.
- offers = KTrader::self()->query("KTTSD/FilterPlugin");
+ offers = TDETrader::self()->query("KTTSD/FilterPlugin");
for (unsigned int i=0; i < offers.count() ; ++i)
{
TQString filterPlugInName = offers[i]->name();
@@ -1099,7 +1099,7 @@ PlugInConf* KCMKttsMgr::loadTalkerPlugin(const TQString& name)
// kdDebug() << "KCMKttsMgr::loadPlugin: Running"<< endl;
// Find the plugin.
- KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin",
+ TDETrader::OfferList offers = TDETrader::self()->query("KTTSD/SynthPlugin",
TQString("DesktopEntryName == '%1'").arg(name));
if (offers.count() == 1)
@@ -1128,7 +1128,7 @@ PlugInConf* KCMKttsMgr::loadTalkerPlugin(const TQString& name)
}
}
// The plug in was not found (unexpected behaviour, returns null).
- kdDebug() << "KCMKttsMgr::loadTalkerPlugin: KTrader did not return an offer for plugin "
+ kdDebug() << "KCMKttsMgr::loadTalkerPlugin: TDETrader did not return an offer for plugin "
<< name << endl;
return NULL;
}
@@ -1143,7 +1143,7 @@ KttsFilterConf* KCMKttsMgr::loadFilterPlugin(const TQString& plugInName)
// kdDebug() << "KCMKttsMgr::loadPlugin: 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(plugInName));
if (offers.count() == 1)
@@ -1174,7 +1174,7 @@ KttsFilterConf* KCMKttsMgr::loadFilterPlugin(const TQString& plugInName)
}
}
// The plug in was not found (unexpected behaviour, returns null).
- kdDebug() << "KCMKttsMgr::loadFilterPlugin: KTrader did not return an offer for plugin " << plugInName << endl;
+ kdDebug() << "KCMKttsMgr::loadFilterPlugin: TDETrader did not return an offer for plugin " << plugInName << endl;
return NULL;
}
@@ -1406,7 +1406,7 @@ void KCMKttsMgr::addFilter( bool sbd)
item = item->nextSibling();
}
// Append those available plugins not yet in the list at all.
- KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin");
+ TDETrader::OfferList offers = TDETrader::self()->query("KTTSD/FilterPlugin");
for (unsigned int i=0; i < offers.count() ; ++i)
{
TQString filterPlugInName = offers[i]->name();
@@ -2198,7 +2198,7 @@ void KCMKttsMgr::slotFiltersList_stateChanged()
}
/**
- * 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.
@@ -2206,21 +2206,21 @@ void KCMKttsMgr::slotFiltersList_stateChanged()
TQString KCMKttsMgr::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();
}
/**
- * Uses KTrader to convert a DesktopEntryName into a translated Filter Plugin Name.
+ * Uses TDETrader to convert a DesktopEntryName into a translated Filter Plugin Name.
* @param desktopEntryName The DesktopEntryName.
* @return The translated Name of the plugin, from Name= line in .desktop file.
*/
TQString KCMKttsMgr::FilterDesktopEntryNameToName(const TQString& desktopEntryName)
{
if (desktopEntryName.isEmpty()) return TQString();
- 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)
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.h b/kttsd/kcmkttsmgr/kcmkttsmgr.h
index fc0276b..e95dc9c 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgr.h
+++ b/kttsd/kcmkttsmgr/kcmkttsmgr.h
@@ -283,7 +283,7 @@ class KCMKttsMgr :
int countFilterPlugins(const TQString& filterPlugInName);
/**
- * 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.
@@ -291,7 +291,7 @@ class KCMKttsMgr :
TQString FilterNameToDesktopEntryName(const TQString& name);
/**
- * Uses KTrader to convert a DesktopEntryName into a translated Filter Plugin Name.
+ * Uses TDETrader to convert a DesktopEntryName into a translated Filter Plugin Name.
* @param desktopEntryName The DesktopEntryName.
* @return The translated Name of the plugin, from Name= line in .desktop file.
*/
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)
diff --git a/kttsd/libkttsd/selecttalkerdlg.cpp b/kttsd/libkttsd/selecttalkerdlg.cpp
index 973c9ff..0a63269 100644
--- a/kttsd/libkttsd/selecttalkerdlg.cpp
+++ b/kttsd/libkttsd/selecttalkerdlg.cpp
@@ -88,7 +88,7 @@ SelectTalkerDlg::SelectTalkerDlg(
cb = m_widget->synthComboBox;
cb->insertItem( TQString() );
- KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin");
+ TDETrader::OfferList offers = TDETrader::self()->query("KTTSD/SynthPlugin");
for(unsigned int i=0; i < offers.count() ; ++i)
cb->insertItem(offers[i]->name());
diff --git a/kttsd/libkttsd/talkercode.cpp b/kttsd/libkttsd/talkercode.cpp
index 25b674e..5ae1afa 100644
--- a/kttsd/libkttsd/talkercode.cpp
+++ b/kttsd/libkttsd/talkercode.cpp
@@ -484,7 +484,7 @@ void TalkerCode::parseTalkerCode(const TQString &talkerCode)
}
/**
-* Uses KTrader to convert a translated Synth Plugin Name to DesktopEntryName.
+* Uses TDETrader to convert a translated Synth 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.
@@ -492,21 +492,21 @@ void TalkerCode::parseTalkerCode(const TQString &talkerCode)
/*static*/ TQString TalkerCode::TalkerNameToDesktopEntryName(const TQString& name)
{
if (name.isEmpty()) return TQString();
- KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin");
+ TDETrader::OfferList offers = TDETrader::self()->query("KTTSD/SynthPlugin");
for (uint ndx = 0; ndx < offers.count(); ++ndx)
if (offers[ndx]->name() == name) return offers[ndx]->desktopEntryName();
return TQString();
}
/**
-* Uses KTrader to convert a DesktopEntryName into a translated Synth Plugin Name.
+* Uses TDETrader to convert a DesktopEntryName into a translated Synth Plugin Name.
* @param desktopEntryName The DesktopEntryName.
* @return The translated Name of the plugin, from Name= line in .desktop file.
*/
/*static*/ TQString TalkerCode::TalkerDesktopEntryNameToName(const TQString& desktopEntryName)
{
if (desktopEntryName.isEmpty()) return TQString();
- KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin",
+ TDETrader::OfferList offers = TDETrader::self()->query("KTTSD/SynthPlugin",
TQString("DesktopEntryName == '%1'").arg(desktopEntryName));
if (offers.count() == 1)
diff --git a/kttsd/libkttsd/talkercode.h b/kttsd/libkttsd/talkercode.h
index f8cbc16..fe6830b 100644
--- a/kttsd/libkttsd/talkercode.h
+++ b/kttsd/libkttsd/talkercode.h
@@ -164,7 +164,7 @@ class KDE_EXPORT TalkerCode
static TQString stripPrefer( const TQString& code, bool& preferred);
/**
- * Uses KTrader to convert a translated Synth Plugin Name to DesktopEntryName.
+ * Uses TDETrader to convert a translated Synth 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.
@@ -172,7 +172,7 @@ class KDE_EXPORT TalkerCode
static TQString TalkerNameToDesktopEntryName(const TQString& name);
/**
- * Uses KTrader to convert a DesktopEntryName into a translated Synth Plugin Name.
+ * Uses TDETrader to convert a DesktopEntryName into a translated Synth Plugin Name.
* @param desktopEntryName The DesktopEntryName.
* @return The translated Name of the plugin, from Name= line in .desktop file.
*/
diff --git a/kttsd/libkttsd/testplayer.cpp b/kttsd/libkttsd/testplayer.cpp
index 836b615..1df1c7b 100644
--- a/kttsd/libkttsd/testplayer.cpp
+++ b/kttsd/libkttsd/testplayer.cpp
@@ -161,7 +161,7 @@ Player* TestPlayer::createPlayerObject(int playerOption)
break;
}
}
- KTrader::OfferList offers = KTrader::self()->query(
+ TDETrader::OfferList offers = TDETrader::self()->query(
"KTTSD/AudioPlugin", TQString("DesktopEntryName == '%1'").arg(plugInName));
if(offers.count() == 1)
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 19:22:49 +0000