summaryrefslogtreecommitdiffstats
path: root/interfaces
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 10:51:32 -0600
committerTimothy Pearson <[email protected]>2013-02-01 10:51:32 -0600
commit0c9d97065a3d6ceb12d687555a1a33d90db96238 (patch)
tree4305105967fc03b06139b57871d5ab6d2360e75b /interfaces
parent59d153016be1e09cb31cdb18bef0a649acfc6292 (diff)
downloadtdelibs-0c9d97065a3d6ceb12d687555a1a33d90db96238.tar.gz
tdelibs-0c9d97065a3d6ceb12d687555a1a33d90db96238.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'interfaces')
-rw-r--r--interfaces/kregexpeditor/kregexpeditorinterface.h2
-rw-r--r--interfaces/kspeech/kspeech.h2
-rw-r--r--interfaces/tdetexteditor/editorchooser.cpp6
3 files changed, 5 insertions, 5 deletions
diff --git a/interfaces/kregexpeditor/kregexpeditorinterface.h b/interfaces/kregexpeditor/kregexpeditorinterface.h
index 3c96d8d93..4124849d6 100644
--- a/interfaces/kregexpeditor/kregexpeditorinterface.h
+++ b/interfaces/kregexpeditor/kregexpeditorinterface.h
@@ -15,7 +15,7 @@
* To check if kregexpeditor in tdeutils is installed and available use this line:
*
* \code
- * bool installed=!KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
+ * bool installed=!TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
* \endcode
*
* The following is a template for what you need to do to create an instance of the
diff --git a/interfaces/kspeech/kspeech.h b/interfaces/kspeech/kspeech.h
index d24683517..4fe3e7c9a 100644
--- a/interfaces/kspeech/kspeech.h
+++ b/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/interfaces/tdetexteditor/editorchooser.cpp b/interfaces/tdetexteditor/editorchooser.cpp
index ce493018d..331e64bbb 100644
--- a/interfaces/tdetexteditor/editorchooser.cpp
+++ b/interfaces/tdetexteditor/editorchooser.cpp
@@ -46,14 +46,14 @@ EditorChooser::EditorChooser(TQWidget *parent,const char *name) :
grid->addWidget( d->chooser, 0, 0);
- KTrader::OfferList offers = KTrader::self()->query("text/plain", "'KTextEditor/Document' in ServiceTypes");
+ TDETrader::OfferList offers = TDETrader::self()->query("text/plain", "'KTextEditor/Document' in ServiceTypes");
TDEConfig *config=new TDEConfig("default_components");
config->setGroup("KTextEditor");
TQString editor = config->readPathEntry("embeddedEditor");
if (editor.isEmpty()) editor="katepart";
- for (KTrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it)
+ for (TDETrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it)
{
if ((*it)->desktopEntryName().contains(editor))
{
@@ -62,7 +62,7 @@ EditorChooser::EditorChooser(TQWidget *parent,const char *name) :
}
}
- for (KTrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it)
+ for (TDETrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it)
{
d->chooser->editorCombo->insertItem((*it)->name());
d->elements.append((*it)->desktopEntryName());