diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:45:57 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:45:57 -0600 |
commit | 7143a99b4f885d13f7ab57bca4156900cabb34b8 (patch) | |
tree | 361ba4a71d3d955c3014a77e6cc79475efcd2acb /src/svnfrontend/tdesvnfilelist.cpp | |
parent | 9d57d1051db465d7838ab294e5a8a22fa1a87cee (diff) | |
download | tdesvn-7143a99b4f885d13f7ab57bca4156900cabb34b8.tar.gz tdesvn-7143a99b4f885d13f7ab57bca4156900cabb34b8.zip |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'src/svnfrontend/tdesvnfilelist.cpp')
-rw-r--r-- | src/svnfrontend/tdesvnfilelist.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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; |