diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 10:49:49 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 10:49:49 -0600 |
| commit | dc5f267664506a312203c26bfe9001a448b0bb0f (patch) | |
| tree | a78c7f15e87303d22b89619db42fc56ad8f4a046 /kate | |
| parent | 98f4a055baf6eb7ea5c3d69d6a3f2162b491e253 (diff) | |
| download | tdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.tar.gz tdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'kate')
| -rw-r--r-- | kate/app/katemainwindow.cpp | 6 | ||||
| -rw-r--r-- | kate/app/katepluginmanager.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp index aa8aaedb9..5ef3c78e8 100644 --- a/kate/app/katemainwindow.cpp +++ b/kate/app/katemainwindow.cpp @@ -602,9 +602,9 @@ void KateMainWindow::mSlotFixOpenWithMenu() KMimeType::Ptr mime = KMimeType::findByURL( m_viewManager->activeView()->getDoc()->url() ); //kdDebug(13001)<<"13000"<<"url: "<<m_viewManager->activeView()->getDoc()->url().prettyURL()<<"mime type: "<<mime->name()<<endl; // some checking goes here... - KTrader::OfferList offers = KTrader::self()->query(mime->name(), "Type == 'Application'"); + TDETrader::OfferList offers = TDETrader::self()->query(mime->name(), "Type == 'Application'"); // for each one, insert a menu item... - for(KTrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it) { + for(TDETrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it) { if ((*it)->name() == "Kate") continue; documentOpenWith->popupMenu()->insertItem( SmallIcon( (*it)->icon() ), (*it)->name() ); } @@ -629,7 +629,7 @@ void KateMainWindow::slotOpenWithMenuAction(int idx) TQString qry = TQString("((Type == 'Application') and (Name == '%1'))").arg( appname.latin1() ); KMimeType::Ptr mime = KMimeType::findByURL( m_viewManager->activeView()->getDoc()->url() ); - KTrader::OfferList offers = KTrader::self()->query(mime->name(), qry); + TDETrader::OfferList offers = TDETrader::self()->query(mime->name(), qry); if (!offers.isEmpty()) { KService::Ptr app = offers.first(); diff --git a/kate/app/katepluginmanager.cpp b/kate/app/katepluginmanager.cpp index 4fe15d4f4..8f6fae52c 100644 --- a/kate/app/katepluginmanager.cpp +++ b/kate/app/katepluginmanager.cpp @@ -57,9 +57,9 @@ KatePluginManager *KatePluginManager::self() void KatePluginManager::setupPluginList () { - TQValueList<KService::Ptr> traderList= KTrader::self()->query("Kate/Plugin", "(not ('Kate/ProjectPlugin' in ServiceTypes)) and (not ('Kate/InitPlugin' in ServiceTypes))"); + TQValueList<KService::Ptr> traderList= TDETrader::self()->query("Kate/Plugin", "(not ('Kate/ProjectPlugin' in ServiceTypes)) and (not ('Kate/InitPlugin' in ServiceTypes))"); - for(KTrader::OfferList::Iterator it(traderList.begin()); it != traderList.end(); ++it) + for(TDETrader::OfferList::Iterator it(traderList.begin()); it != traderList.end(); ++it) { KService::Ptr ptr = (*it); |