From 3bae8aff2037d60bf3191819c692cbebab37d08f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 10:41:15 -0600 Subject: [PATCH] Rename KLock and KTrader to avoid conflicts with KDE4 --- kmyfirewall/core/kmfpluginfactory.cpp | 20 ++++++++++---------- kmyfirewall/kmfconfigdialog.cpp | 10 +++++----- kmyfirewall/kmfwidgets/kmfhostwidget.cpp | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/kmyfirewall/core/kmfpluginfactory.cpp b/kmyfirewall/core/kmfpluginfactory.cpp index 81491aa..09f4675 100644 --- a/kmyfirewall/core/kmfpluginfactory.cpp +++ b/kmyfirewall/core/kmfpluginfactory.cpp @@ -83,8 +83,8 @@ KParts::ReadWritePart* KMFPluginFactory::KMFMainView( KParts::MainWindow* parent TQValueList* KMFPluginFactory::CompilersForInstaller( const TQString& osName ) { TQValueList *list = new TQValueList(); kdDebug() << "Query: KMyFirewall/Compiler [X-KMyFirewall-Platform] == '" << osName.lower() << "'" << endl; - KTrader::OfferList offers = KTrader::self()->query( "KMyFirewall/Compiler", "[X-KMyFirewall-Platform] == '" + osName.lower() + "'"); - KTrader::OfferList::iterator it; + TDETrader::OfferList offers = TDETrader::self()->query( "KMyFirewall/Compiler", "[X-KMyFirewall-Platform] == '" + osName.lower() + "'"); + TDETrader::OfferList::iterator it; if ( offers.empty() ) { kdDebug() << "NO MATCHING PLUGIN FOUND - KMyFirewall/Compiler" << endl; } @@ -107,10 +107,10 @@ TQValueList* KMFPluginFactory::CompilersForInstaller( con TQPtrList* KMFPluginFactory::KMFRuleOptionEditors( TQObject *parent ){ TQPtrList *list = new TQPtrList; - KTrader::OfferList offers = KTrader::self()->query( "KMyFirewall/RuleOptionEdit"); + TDETrader::OfferList offers = TDETrader::self()->query( "KMyFirewall/RuleOptionEdit"); kdDebug() << "Query performed" << endl; - KTrader::OfferList::iterator it; + TDETrader::OfferList::iterator it; for ( it = offers.begin(); it != offers.end(); ++it ) { KService::Ptr ptr = *it; kdDebug() << "Found KMFRuleOptionEdit Plugin: " << ptr->name() << "\nLibrary: "<< ptr->library().local8Bit().data() <* KMFPluginFactory::KMFRuleOptionEditors( T TQPtrList* KMFPluginFactory::KMFRuleTargetOptionEditors( TQObject *parent ) { TQPtrList *list = new TQPtrList; - KTrader::OfferList offers = KTrader::self()->query( "KMyFirewall/RuleTargetOptionEdit"); + TDETrader::OfferList offers = TDETrader::self()->query( "KMyFirewall/RuleTargetOptionEdit"); kdDebug() << "Query performed" << endl; - KTrader::OfferList::iterator it; + TDETrader::OfferList::iterator it; for ( it = offers.begin(); it != offers.end(); ++it ) { KService::Ptr ptr = *it; kdDebug() << "Found KMFRuleTargetOptionEdit Plugin: " << ptr->name() << "\nLibrary: "<< ptr->library().local8Bit().data() <* KMFPluginFactory::KMFRuleTargetOpti KMFInstallerInterface* KMFPluginFactory::KMFInstaller( KMFTarget* target ) { - KTrader::OfferList offers = KTrader::self()->query( "KMyFirewall/Installer", " [X-KMyFirewall-Platform] == '"+ target->config()->oS().lower() +"'" ); + TDETrader::OfferList offers = TDETrader::self()->query( "KMyFirewall/Installer", " [X-KMyFirewall-Platform] == '"+ target->config()->oS().lower() +"'" ); kdDebug() << "Query performed" << endl; KService::Ptr ptr = offers.first(); - KTrader::OfferList::iterator it; + TDETrader::OfferList::iterator it; if ( offers.empty() ) { kdDebug() << "NO MATCHING PLUGIN FOUND" << endl; return 0; @@ -189,10 +189,10 @@ KMFInstallerInterface* KMFPluginFactory::KMFInstaller( KMFTarget* target ) { KMFCompilerInterface* KMFPluginFactory::KMFCompiler( KMFTarget* target ) { kdDebug() << "KMFCompilerInterface* KMFGenericDoc::compiler()" << endl; kdDebug() << "Start query" << endl; - KTrader::OfferList offers = KTrader::self()->query( "KMyFirewall/Compiler", "[X-KMyFirewall-Language] == '" + target->config()->backend().lower() +"' and [X-KMyFirewall-Platform] == '" + target->config()->oS().lower() + "'" ); + TDETrader::OfferList offers = TDETrader::self()->query( "KMyFirewall/Compiler", "[X-KMyFirewall-Language] == '" + target->config()->backend().lower() +"' and [X-KMyFirewall-Platform] == '" + target->config()->oS().lower() + "'" ); kdDebug() << "Query performed" << endl; KService::Ptr ptr = offers.first(); - KTrader::OfferList::iterator it; + TDETrader::OfferList::iterator it; if ( offers.empty() ) { KMessageBox::error(0, i18n("Could not find a matching compiler plugin.") ); kdDebug() << "NO MATCHING PLUGIN FOUND" << endl; diff --git a/kmyfirewall/kmfconfigdialog.cpp b/kmyfirewall/kmfconfigdialog.cpp index 3cf7346..83c57d8 100644 --- a/kmyfirewall/kmfconfigdialog.cpp +++ b/kmyfirewall/kmfconfigdialog.cpp @@ -295,9 +295,9 @@ void KMFConfigDialog::checkPlugins() { item_targetoptioneditors->setOpen( true ); // kdDebug() << "Start query" << endl; - KTrader::OfferList offers = KTrader::self()->query( "KMyFirewall/Installer"); + TDETrader::OfferList offers = TDETrader::self()->query( "KMyFirewall/Installer"); // kdDebug() << "Query performed for KMyFirewall/Installer" << endl; - KTrader::OfferList::iterator it; + TDETrader::OfferList::iterator it; if ( offers.empty() ) { KListViewItem *item = new KListViewItem( item_installers, 0,0); item->setText(0, i18n("No installer plugins found!") ); @@ -311,7 +311,7 @@ void KMFConfigDialog::checkPlugins() { item->setText(2, ptr->library().local8Bit().data() ); } - KTrader::OfferList offers2 = KTrader::self()->query( "KMyFirewall/Compiler" ); + TDETrader::OfferList offers2 = TDETrader::self()->query( "KMyFirewall/Compiler" ); // kdDebug() << "Query performed for KMyFirewall/Compiler" << endl; if ( offers2.empty() ) { KListViewItem *item = new KListViewItem( item_compilers, 0,0); @@ -341,7 +341,7 @@ void KMFConfigDialog::checkPlugins() { - KTrader::OfferList offers3 = KTrader::self()->query( "KMyFirewall/RuleOptionEdit" ); + TDETrader::OfferList offers3 = TDETrader::self()->query( "KMyFirewall/RuleOptionEdit" ); // kdDebug() << "Query performed for KMyFirewall/RuleOptionEdit" << endl; if ( offers3.empty() ) { KListViewItem *item = new KListViewItem( item_optioneditors, 0,0); @@ -358,7 +358,7 @@ void KMFConfigDialog::checkPlugins() { // kdDebug() << "Found Plugin: " << ptr->name() << "\nLibrary: "<< ptr->library().local8Bit().data() <query( "KMyFirewall/RuleTargetOptionEdit" ); + TDETrader::OfferList offers4 = TDETrader::self()->query( "KMyFirewall/RuleTargetOptionEdit" ); // kdDebug() << "Query performed for KMyFirewall/RuleTargetOptionEdit" << endl; if ( offers4.empty() ) { KListViewItem *item = new KListViewItem( item_targetoptioneditors, 0,0); diff --git a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp index 84ed475..b7d7961 100644 --- a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp +++ b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp @@ -90,9 +90,9 @@ void KMFHostWidget::InitGUI() { // kdDebug() << "Start query" << endl; - KTrader::OfferList offers = KTrader::self()->query( "KMyFirewall/Compiler"); + TDETrader::OfferList offers = TDETrader::self()->query( "KMyFirewall/Compiler"); // kdDebug() << "Query performed for KMyFirewall/Installer" << endl; - KTrader::OfferList::iterator it; + TDETrader::OfferList::iterator it; if ( offers.empty() ) { kdDebug() << "ERROR: NO MATCHING PLUGIN FOUND" << endl; }