Rename KLock and KTrader to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 5193962621
commit 9930e16dde

@ -88,8 +88,8 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU
if(!projectname.isEmpty()) if(!projectname.isEmpty())
{ {
KTrader::OfferList offers = KTrader::self()->query("Quanta/Debugger"); TDETrader::OfferList offers = TDETrader::self()->query("Quanta/Debugger");
KTrader::OfferList::ConstIterator iterDbg; TDETrader::OfferList::ConstIterator iterDbg;
for(iterDbg = offers.begin(); iterDbg != offers.end(); ++iterDbg) for(iterDbg = offers.begin(); iterDbg != offers.end(); ++iterDbg)
{ {
KService::Ptr service = *iterDbg; KService::Ptr service = *iterDbg;

@ -484,8 +484,8 @@ void Project::slotOptions()
// Debuggers Combo // Debuggers Combo
KTrader::OfferList offers = KTrader::self()->query("Quanta/Debugger"); TDETrader::OfferList offers = TDETrader::self()->query("Quanta/Debugger");
KTrader::OfferList::ConstIterator iterDbg; TDETrader::OfferList::ConstIterator iterDbg;
optionsPage.comboDebuggerClient->clear(); optionsPage.comboDebuggerClient->clear();
optionsPage.comboDebuggerClient->insertItem(i18n("No Debugger")); optionsPage.comboDebuggerClient->insertItem(i18n("No Debugger"));
int idxDbg = 0; int idxDbg = 0;

@ -1494,8 +1494,8 @@ void ProjectPrivate::slotAddDirectory()
void ProjectPrivate::slotDebuggerOptions() void ProjectPrivate::slotDebuggerOptions()
{ {
// Debuggers Combo // Debuggers Combo
KTrader::OfferList offers = KTrader::self()->query("Quanta/Debugger"); TDETrader::OfferList offers = TDETrader::self()->query("Quanta/Debugger");
KTrader::OfferList::ConstIterator iterDbg; TDETrader::OfferList::ConstIterator iterDbg;
for(iterDbg = offers.begin(); iterDbg != offers.end(); ++iterDbg) for(iterDbg = offers.begin(); iterDbg != offers.end(); ++iterDbg)
{ {
KService::Ptr service = *iterDbg; KService::Ptr service = *iterDbg;

@ -593,7 +593,7 @@ void BaseTreeView::insertOpenWithMenu(KPopupMenu *menu, int position)
m_openWithActions.clear(); m_openWithActions.clear();
KURL urlToOpen = currentURL(); KURL urlToOpen = currentURL();
TQString mimeType = KMimeType::findByURL(urlToOpen, 0, true, true)->name(); 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(); TQDict<QuantaPlugin> plugins = QuantaPluginInterface::ref()->plugins();
m_pluginIds.clear(); m_pluginIds.clear();
@ -602,7 +602,7 @@ void BaseTreeView::insertOpenWithMenu(KPopupMenu *menu, int position)
m_openWithMenu = new KPopupMenu(this); m_openWithMenu = new KPopupMenu(this);
if (offers.count() > 0) if (offers.count() > 0)
{ {
KTrader::OfferList::Iterator it; TDETrader::OfferList::Iterator it;
for (it = offers.begin(); it != offers.end(); ++it) for (it = offers.begin(); it != offers.end(); ++it)
{ {
KAction *action = new KAction((*it)->name(), (*it)->icon(), 0, 0, TQFile::encodeName((*it)->desktopEntryPath()).data()); KAction *action = new KAction((*it)->name(), (*it)->icon(), 0, 0, TQFile::encodeName((*it)->desktopEntryPath()).data());

Loading…
Cancel
Save