TDE
/
tdeaccessibility
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdeaccessibility
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KLock and KTrader to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent 98259239ef
commit 722a076e84
16 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File

4
ksayit/src/fxpluginhandler.cpp
Unescape View File

@ -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();

2
kttsd/compat/interfaces/kspeech/kspeech.h
Unescape View File

@ -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.

2
kttsd/filters/main.cpp
Unescape View File

@ -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"))
{

2
kttsd/filters/sbd/sbdconf.cpp
Unescape View File

@ -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 )

2
kttsd/filters/stringreplacer/stringreplacerconf.cpp
Unescape View File

@ -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();

2
kttsd/filters/talkerchooser/talkerchooserconf.cpp
Unescape View File

@ -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&)),

22
kttsd/kcmkttsmgr/kcmkttsmgr.cpp
Unescape View File

@ -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)

4
kttsd/kcmkttsmgr/kcmkttsmgr.h
Unescape View File

@ -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.
*/

8
kttsd/kttsd/filtermgr.cpp
Unescape View File

@ -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();

2
kttsd/kttsd/filtermgr.h
Unescape View File

@ -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.

2
kttsd/kttsd/speaker.cpp
Unescape View File

@ -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)

4
kttsd/kttsd/talkermgr.cpp
Unescape View File

@ -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)

2
kttsd/libkttsd/selecttalkerdlg.cpp
Unescape View File

@ -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());

8
kttsd/libkttsd/talkercode.cpp
Unescape View File

@ -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)

4
kttsd/libkttsd/talkercode.h
Unescape View File

@ -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.
*/

2
kttsd/libkttsd/testplayer.cpp
Unescape View File

@ -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)

Write Preview
Loading…
Cancel
Save