summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:44:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:44:01 -0600
commitcbee2148d97ecbb4add07263eca856ff793d9e3d (patch)
tree680c19dc85bebabe5e6beaca8c382b3002e641bc
parentee20b8ce03534b9e5a92a459e5d8abbaaf7360d2 (diff)
downloadkrusader-cbee2148d97ecbb4add07263eca856ff793d9e3d.tar.gz
krusader-cbee2148d97ecbb4add07263eca856ff793d9e3d.zip
Rename KLock and KTrader to avoid conflicts with KDE4
-rw-r--r--krusader/KViewer/krviewer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/krusader/KViewer/krviewer.cpp b/krusader/KViewer/krviewer.cpp
index f79864f..be444ee 100644
--- a/krusader/KViewer/krviewer.cpp
+++ b/krusader/KViewer/krviewer.cpp
@@ -552,11 +552,11 @@ void KrViewer::updateActions( PanelViewerBase * pvb ) {
bool KrViewer::editGeneric( TQString mimetype, KURL _url ) {
KParts::ReadWritePart * kedit_part = 0L;
KLibFactory *factory = 0;
- KTrader::OfferList offers = KTrader::self() ->query( mimetype );
+ TDETrader::OfferList offers = TDETrader::self() ->query( mimetype );
// in theory, we only care about the first one.. but let's try all
// offers just in case the first can't be loaded for some reason
- KTrader::OfferList::Iterator it( offers.begin() );
+ TDETrader::OfferList::Iterator it( offers.begin() );
for ( ; it != offers.end(); ++it ) {
KService::Ptr ptr = ( *it );
// we now know that our offer can handle mimetype and is a part.