diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 10:45:57 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 10:45:57 -0600 |
commit | 7143a99b4f885d13f7ab57bca4156900cabb34b8 (patch) | |
tree | 361ba4a71d3d955c3014a77e6cc79475efcd2acb /src/svnfrontend/svnactions.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/svnactions.cpp')
-rw-r--r-- | src/svnfrontend/svnactions.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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; |