diff --git a/src/svnfrontend/opencontextmenu.cpp b/src/svnfrontend/opencontextmenu.cpp index 10a561f..d063e46 100644 --- a/src/svnfrontend/opencontextmenu.cpp +++ b/src/svnfrontend/opencontextmenu.cpp @@ -22,7 +22,7 @@ #include #include -OpenContextmenu::OpenContextmenu(const KURL&aPath,const KTrader::OfferList&aList,TQWidget* parent, const char* name) +OpenContextmenu::OpenContextmenu(const KURL&aPath,const TDETrader::OfferList&aList,TQWidget* parent, const char* name) : TQPopupMenu(parent, name),m_Path(aPath),m_List(aList) { setup(); @@ -35,7 +35,7 @@ OpenContextmenu::~OpenContextmenu() void OpenContextmenu::setup() { m_mapPopup.clear(); - KTrader::OfferList::ConstIterator it = m_List.begin(); + TDETrader::OfferList::ConstIterator it = m_List.begin(); int id = 1; KAction*act; for( ; it != m_List.end(); ++it ) { diff --git a/src/svnfrontend/opencontextmenu.h b/src/svnfrontend/opencontextmenu.h index f0a077d..5d4c707 100644 --- a/src/svnfrontend/opencontextmenu.h +++ b/src/svnfrontend/opencontextmenu.h @@ -34,11 +34,11 @@ class OpenContextmenu : public TQPopupMenu Q_OBJECT public: - OpenContextmenu(const KURL&,const KTrader::OfferList&,TQWidget* parent, const char* name); + OpenContextmenu(const KURL&,const TDETrader::OfferList&,TQWidget* parent, const char* name); virtual ~OpenContextmenu(); protected: KURL m_Path; - KTrader::OfferList m_List; + TDETrader::OfferList m_List; TQMap m_mapPopup; void setup(); diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp index ab64aa2..a0b883a 100644 --- a/src/svnfrontend/svnactions.cpp +++ b/src/svnfrontend/svnactions.cpp @@ -577,11 +577,11 @@ void SvnActions::slotMakeCat(const svn::Revision&start, const TQString&what, con EMIT_FINISHED; KMimeType::Ptr mptr; mptr = KMimeType::findByFileContent(content.name()); - KTrader::OfferList offers = KTrader::self()->query(mptr->name(), "Type == 'Application' or (exist Exec)"); + TDETrader::OfferList offers = TDETrader::self()->query(mptr->name(), "Type == 'Application' or (exist Exec)"); if (offers.count()==0 || offers.first()->exec().isEmpty()) { - offers = KTrader::self()->query(mptr->name(), "Type == 'Application'"); + offers = TDETrader::self()->query(mptr->name(), "Type == 'Application'"); } - KTrader::OfferList::ConstIterator it = offers.begin(); + TDETrader::OfferList::ConstIterator it = offers.begin(); for( ; it != offers.end(); ++it ) { if ((*it)->noDisplay()) continue; diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp index 4d6a301..2e14855 100644 --- a/src/svnfrontend/tdesvnfilelist.cpp +++ b/src/svnfrontend/tdesvnfilelist.cpp @@ -1091,7 +1091,7 @@ void tdesvnfilelist::slotItemDoubleClicked(TQListViewItem*item) if ( feditor.compare("default") == 0 ) { KURL::List lst; lst.append(fki->kdeName(rev)); - KTrader::OfferList li = offersList(fki,true); + TDETrader::OfferList li = offersList(fki,true); if (li.count()==0||li.first()->exec().isEmpty()) { li = offersList(fki); } @@ -1424,9 +1424,9 @@ bool tdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down) return dispchanged; } -KTrader::OfferList tdesvnfilelist::offersList(SvnItem*item,bool execOnly) +TDETrader::OfferList tdesvnfilelist::offersList(SvnItem*item,bool execOnly) { - KTrader::OfferList offers; + TDETrader::OfferList offers; if (!item) { return offers; } @@ -1436,7 +1436,7 @@ KTrader::OfferList tdesvnfilelist::offersList(SvnItem*item,bool execOnly) } else { constraint = "Type == 'Application'"; } - offers = KTrader::self()->query(item->mimeType()->name(), constraint); + offers = TDETrader::self()->query(item->mimeType()->name(), constraint); return offers; } @@ -1489,7 +1489,7 @@ void tdesvnfilelist::slotContextMenuRequested(TQListViewItem */* _item */, const return; } - KTrader::OfferList offers; + TDETrader::OfferList offers; OpenContextmenu*me=0; KAction*temp = 0; diff --git a/src/svnfrontend/tdesvnfilelist.h b/src/svnfrontend/tdesvnfilelist.h index 7de4d08..529bcb2 100644 --- a/src/svnfrontend/tdesvnfilelist.h +++ b/src/svnfrontend/tdesvnfilelist.h @@ -131,7 +131,7 @@ protected: virtual void leaveEvent(TQEvent*e); virtual void rescanIconsRec(FileListViewItem*_parent=0,bool checkNewer=false,bool no_update=false); - KTrader::OfferList offersList(SvnItem*item,bool execOnly=false); + TDETrader::OfferList offersList(SvnItem*item,bool execOnly=false); private: KdesvnFileListPrivate*m_pList;