TDE
/
kmyfirewall
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kmyfirewall
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KLock and KTrader to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent c95876511a
commit 3bae8aff20
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File

20
kmyfirewall/core/kmfpluginfactory.cpp
Unescape View File

@ -83,8 +83,8 @@ KParts::ReadWritePart* KMFPluginFactory::KMFMainView( KParts::MainWindow* parent
TQValueList<KMFCompilerInterface*>* KMFPluginFactory::CompilersForInstaller( const TQString& osName ) {
TQValueList<KMFCompilerInterface*> *list = new TQValueList<KMFCompilerInterface*>();
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<KMFCompilerInterface*>* KMFPluginFactory::CompilersForInstaller( con
TQPtrList<KMFRuleOptionEditInterface>* KMFPluginFactory::KMFRuleOptionEditors( TQObject *parent ){
TQPtrList<KMFRuleOptionEditInterface> *list = new TQPtrList<KMFRuleOptionEditInterface>;
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() <<endl;
@ -132,10 +132,10 @@ TQPtrList<KMFRuleOptionEditInterface>* KMFPluginFactory::KMFRuleOptionEditors( T
TQPtrList<KMFRuleTargetOptionEditInterface>* KMFPluginFactory::KMFRuleTargetOptionEditors( TQObject *parent ) {
TQPtrList<KMFRuleTargetOptionEditInterface> *list = new TQPtrList<KMFRuleTargetOptionEditInterface>;
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() <<endl;
@ -157,10 +157,10 @@ TQPtrList<KMFRuleTargetOptionEditInterface>* 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("<qt><b>Could not find a matching compiler plugin.</b></qt>") );
kdDebug() << "NO MATCHING PLUGIN FOUND" << endl;

10
kmyfirewall/kmfconfigdialog.cpp
Unescape View File

@ -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() <<endl;
}
KTrader::OfferList offers4 = KTrader::self()->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);

4
kmyfirewall/kmfwidgets/kmfhostwidget.cpp
Unescape View File

@ -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;
}

Write Preview
Loading…
Cancel
Save