summaryrefslogtreecommitdiffstats
path: root/ark
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:53:12 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:53:12 -0600
commit53904b41cf005abbae3d468532db9adc2b04a9b4 (patch)
tree34b9ac08a2bbe66bfe0e3a1a7887752724c1c8da /ark
parentd730c4aa3d702fe2cb6ba30affe74b105ae51527 (diff)
downloadtdeutils-53904b41cf005abbae3d468532db9adc2b04a9b4.tar.gz
tdeutils-53904b41cf005abbae3d468532db9adc2b04a9b4.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'ark')
-rw-r--r--ark/arkwidget.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp
index 6a4ddae..33aa57f 100644
--- a/ark/arkwidget.cpp
+++ b/ark/arkwidget.cpp
@@ -2276,9 +2276,9 @@ void ArkWidget::showSettings(){
dialog->addPage(new Addition(0, "Addition"), i18n("Addition"), "ark_addfile", i18n("File Addition Settings"));
dialog->addPage(new Extraction(0, "Extraction"), i18n("Extraction"), "ark_extract", i18n("Extraction Settings"));
- KTrader::OfferList offers;
+ TDETrader::OfferList offers;
- offers = KTrader::self()->query( "KonqPopupMenu/Plugin", "Library == 'libarkplugin'" );
+ offers = TDETrader::self()->query( "KonqPopupMenu/Plugin", "Library == 'libarkplugin'" );
if ( offers.isEmpty() )
genPage->kcfg_KonquerorIntegration->setEnabled( false );