summaryrefslogtreecommitdiffstats
path: root/kontact
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:52:27 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:52:27 -0600
commitb440a9c608596cd88efdb3bfa4661c5e37efbe4b (patch)
tree83fe0c80cbb2bbcfefac383520869fe3a64e88f1 /kontact
parent6dea9442526e5ebacf313ad387c7dff4b87a53bf (diff)
downloadtdepim-b440a9c608596cd88efdb3bfa4661c5e37efbe4b.tar.gz
tdepim-b440a9c608596cd88efdb3bfa4661c5e37efbe4b.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'kontact')
-rw-r--r--kontact/TODO2
-rw-r--r--kontact/Thoughts2
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.cpp2
-rw-r--r--kontact/src/kcmkontact.cpp2
-rw-r--r--kontact/src/main.cpp2
-rw-r--r--kontact/src/mainwindow.cpp2
6 files changed, 6 insertions, 6 deletions
diff --git a/kontact/TODO b/kontact/TODO
index 7b39e0730..a24083c30 100644
--- a/kontact/TODO
+++ b/kontact/TODO
@@ -5,7 +5,7 @@ UNTIL KDE 3.2
* Unified Identity handling (Name, Mail address, SMTP, use KMIdentity TDEPIM wide?)
Currently this is dublicated in at least KMail, KNode and KOrganizer
* Molularize KOrganizer and KMail Settings and turn them into kcm's
- * Think about extending the kcm idea and add a framework to locate kcm's for apps via KTrader
+ * Think about extending the kcm idea and add a framework to locate kcm's for apps via TDETrader
- same for unified credits
- find a solution for a setup wizard
- replace Splash class with QSplashScreen (done)
diff --git a/kontact/Thoughts b/kontact/Thoughts
index 1fb22c9c7..2fd493fcd 100644
--- a/kontact/Thoughts
+++ b/kontact/Thoughts
@@ -172,7 +172,7 @@ MiB: And don't forget KNotesIface loadKNotes() :-)
h: That doesn't sound extendable ;)
h: So if I would like to add a 'New ShortMessage' part we would have to extend
-h: that library... better use KTrader and some sort of a common framework
+h: that library... better use TDETrader and some sort of a common framework
h: and Mib's comments shows that problem!
d: That's what KDCOPServiceStarter is for :)
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index 43f18f22a..91f33d3fc 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -118,7 +118,7 @@ KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name )
void KCMKontactSummary::load()
{
- KTrader::OfferList offers = KTrader::self()->query(
+ TDETrader::OfferList offers = TDETrader::self()->query(
TQString::fromLatin1( "Kontact/Plugin" ),
TQString( "[X-TDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index 96101ec00..2d9daffd9 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -113,7 +113,7 @@ PluginSelection::~PluginSelection()
void PluginSelection::readConfig()
{
- const KTrader::OfferList offers = KTrader::self()->query(
+ const TDETrader::OfferList offers = TDETrader::self()->query(
TQString::fromLatin1( "Kontact/Plugin" ),
TQString( "[X-TDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
index 71fb5e1b1..17b4710a7 100644
--- a/kontact/src/main.cpp
+++ b/kontact/src/main.cpp
@@ -75,7 +75,7 @@ class KontactApp : public KUniqueApplication {
static void listPlugins()
{
TDEInstance instance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options
- KTrader::OfferList offers = KTrader::self()->query(
+ TDETrader::OfferList offers = TDETrader::self()->query(
TQString::fromLatin1( "Kontact/Plugin" ),
TQString( "[X-TDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
for ( KService::List::Iterator it = offers.begin(); it != offers.end(); ++it ) {
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index ec1e6b0bb..180b087b3 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -123,7 +123,7 @@ void MainWindow::initGUI()
connect( helpMenu, TQT_SIGNAL( showAboutApplication() ),
TQT_SLOT( showAboutDialog() ) );
- KTrader::OfferList offers = KTrader::self()->query(
+ TDETrader::OfferList offers = TDETrader::self()->query(
TQString::fromLatin1( "Kontact/Plugin" ),
TQString( "[X-TDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
mPluginInfos = KPluginInfo::fromServices( offers, Prefs::self()->config(), "Plugins" );