diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:53:50 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:53:50 -0600 |
| commit | 9930e16dde86b7de9b792613d826f4f8648b9768 (patch) | |
| tree | 1b32d0c97a13f5f8804b905642a7ae13f22ec836 | |
| parent | 5193962621f44b83c1064e234fb8c8e94fd12749 (diff) | |
| download | tdewebdev-9930e16dde86b7de9b792613d826f4f8648b9768.tar.gz tdewebdev-9930e16dde86b7de9b792613d826f4f8648b9768.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
| -rw-r--r-- | quanta/components/debugger/debuggermanager.cpp | 4 | ||||
| -rw-r--r-- | quanta/project/project.cpp | 4 | ||||
| -rw-r--r-- | quanta/project/projectprivate.cpp | 4 | ||||
| -rw-r--r-- | quanta/treeviews/basetreeview.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp index 9583db91..e9b9573a 100644 --- a/quanta/components/debugger/debuggermanager.cpp +++ b/quanta/components/debugger/debuggermanager.cpp @@ -88,8 +88,8 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU if(!projectname.isEmpty()) { - KTrader::OfferList offers = KTrader::self()->query("Quanta/Debugger"); - KTrader::OfferList::ConstIterator iterDbg; + TDETrader::OfferList offers = TDETrader::self()->query("Quanta/Debugger"); + TDETrader::OfferList::ConstIterator iterDbg; for(iterDbg = offers.begin(); iterDbg != offers.end(); ++iterDbg) { KService::Ptr service = *iterDbg; diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp index 560b4e7e..d3786e3b 100644 --- a/quanta/project/project.cpp +++ b/quanta/project/project.cpp @@ -484,8 +484,8 @@ void Project::slotOptions() // Debuggers Combo - KTrader::OfferList offers = KTrader::self()->query("Quanta/Debugger"); - KTrader::OfferList::ConstIterator iterDbg; + TDETrader::OfferList offers = TDETrader::self()->query("Quanta/Debugger"); + TDETrader::OfferList::ConstIterator iterDbg; optionsPage.comboDebuggerClient->clear(); optionsPage.comboDebuggerClient->insertItem(i18n("No Debugger")); int idxDbg = 0; diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp index 305831ab..7e676e2b 100644 --- a/quanta/project/projectprivate.cpp +++ b/quanta/project/projectprivate.cpp @@ -1494,8 +1494,8 @@ void ProjectPrivate::slotAddDirectory() void ProjectPrivate::slotDebuggerOptions() { // Debuggers Combo - KTrader::OfferList offers = KTrader::self()->query("Quanta/Debugger"); - KTrader::OfferList::ConstIterator iterDbg; + TDETrader::OfferList offers = TDETrader::self()->query("Quanta/Debugger"); + TDETrader::OfferList::ConstIterator iterDbg; for(iterDbg = offers.begin(); iterDbg != offers.end(); ++iterDbg) { KService::Ptr service = *iterDbg; diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp index b2d774fc..1b1b3e7a 100644 --- a/quanta/treeviews/basetreeview.cpp +++ b/quanta/treeviews/basetreeview.cpp @@ -593,7 +593,7 @@ void BaseTreeView::insertOpenWithMenu(KPopupMenu *menu, int position) m_openWithActions.clear(); KURL urlToOpen = currentURL(); TQString mimeType = KMimeType::findByURL(urlToOpen, 0, true, true)->name(); - KTrader::OfferList offers = KTrader::self()->query(mimeType, "Type == 'Application'"); + TDETrader::OfferList offers = TDETrader::self()->query(mimeType, "Type == 'Application'"); TQDict<QuantaPlugin> plugins = QuantaPluginInterface::ref()->plugins(); m_pluginIds.clear(); @@ -602,7 +602,7 @@ void BaseTreeView::insertOpenWithMenu(KPopupMenu *menu, int position) m_openWithMenu = new KPopupMenu(this); if (offers.count() > 0) { - KTrader::OfferList::Iterator it; + TDETrader::OfferList::Iterator it; for (it = offers.begin(); it != offers.end(); ++it) { KAction *action = new KAction((*it)->name(), (*it)->icon(), 0, 0, TQFile::encodeName((*it)->desktopEntryPath()).data()); |