diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:52:27 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:52:27 -0600 |
| commit | b440a9c608596cd88efdb3bfa4661c5e37efbe4b (patch) | |
| tree | 83fe0c80cbb2bbcfefac383520869fe3a64e88f1 /kontact/src | |
| parent | 6dea9442526e5ebacf313ad387c7dff4b87a53bf (diff) | |
| download | tdepim-b440a9c608596cd88efdb3bfa4661c5e37efbe4b.tar.gz tdepim-b440a9c608596cd88efdb3bfa4661c5e37efbe4b.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'kontact/src')
| -rw-r--r-- | kontact/src/kcmkontact.cpp | 2 | ||||
| -rw-r--r-- | kontact/src/main.cpp | 2 | ||||
| -rw-r--r-- | kontact/src/mainwindow.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
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" ); |