diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 10:53:12 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 10:53:12 -0600 |
| commit | 53904b41cf005abbae3d468532db9adc2b04a9b4 (patch) | |
| tree | 34b9ac08a2bbe66bfe0e3a1a7887752724c1c8da | |
| parent | d730c4aa3d702fe2cb6ba30affe74b105ae51527 (diff) | |
| download | tdeutils-53904b41cf005abbae3d468532db9adc2b04a9b4.tar.gz tdeutils-53904b41cf005abbae3d468532db9adc2b04a9b4.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
| -rw-r--r-- | ark/arkwidget.cpp | 4 | ||||
| -rw-r--r-- | kgpg/keyinfowidget.cpp | 2 | ||||
| -rw-r--r-- | kgpg/listkeys.cpp | 2 |
3 files changed, 4 insertions, 4 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 ); diff --git a/kgpg/keyinfowidget.cpp b/kgpg/keyinfowidget.cpp index d3a8b2d..ba7b641 100644 --- a/kgpg/keyinfowidget.cpp +++ b/kgpg/keyinfowidget.cpp @@ -342,7 +342,7 @@ void KgpgKeyInfo::finishphotoreadprocess(KProcIO *p) void KgpgKeyInfo::openPhoto() { - KTrader::OfferList offers = KTrader::self()->query("image/jpeg", "Type == 'Application'"); + TDETrader::OfferList offers = TDETrader::self()->query("image/jpeg", "Type == 'Application'"); KService::Ptr ptr = offers.first(); //KMessageBox::sorry(0,ptr->desktopEntryName()); KProcIO *p=new KProcIO(); diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp index 3d5b20b..6a9979c 100644 --- a/kgpg/listkeys.cpp +++ b/kgpg/listkeys.cpp @@ -1606,7 +1606,7 @@ void listKeys::showKeyInfo(TQString keyID) void listKeys::slotShowPhoto() { - KTrader::OfferList offers = KTrader::self()->query("image/jpeg", "Type == 'Application'"); + TDETrader::OfferList offers = TDETrader::self()->query("image/jpeg", "Type == 'Application'"); KService::Ptr ptr = offers.first(); //KMessageBox::sorry(0,ptr->desktopEntryName()); KProcIO *p=new KProcIO(TQTextCodec::codecForLocale()); |