From cc74f360bb40da3d79f58048f8e8611804980aa6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:30:47 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kcontrol/ebrowsing/filteropts.cpp | 2 +- kcontrol/ebrowsing/filteropts.h | 2 +- kcontrol/ebrowsing/main.cpp | 14 +++++++------- kcontrol/ebrowsing/main.h | 4 ++-- kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp | 6 +++--- kcontrol/ebrowsing/plugins/ikws/ikwsopts.h | 2 +- kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp | 2 +- kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp | 2 +- kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h | 2 +- kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp | 4 ++-- kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) (limited to 'kcontrol/ebrowsing') diff --git a/kcontrol/ebrowsing/filteropts.cpp b/kcontrol/ebrowsing/filteropts.cpp index a9c7801d6..d2f0f66f8 100644 --- a/kcontrol/ebrowsing/filteropts.cpp +++ b/kcontrol/ebrowsing/filteropts.cpp @@ -30,7 +30,7 @@ #include "filteropts.h" FilterOptions::FilterOptions(TQWidget *parent, const char *name) - :KCModule(parent, name) + :TDECModule(parent, name) { TQGridLayout *lay = new TQGridLayout(this, 1, 1, 10, 5); diff --git a/kcontrol/ebrowsing/filteropts.h b/kcontrol/ebrowsing/filteropts.h index c8338c031..144525e9b 100644 --- a/kcontrol/ebrowsing/filteropts.h +++ b/kcontrol/ebrowsing/filteropts.h @@ -27,7 +27,7 @@ class TQListBox; -class FilterOptions : public KCModule +class FilterOptions : public TDECModule { Q_OBJECT diff --git a/kcontrol/ebrowsing/main.cpp b/kcontrol/ebrowsing/main.cpp index 7e259a26b..9eeec46e1 100644 --- a/kcontrol/ebrowsing/main.cpp +++ b/kcontrol/ebrowsing/main.cpp @@ -41,7 +41,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kurifilt, KURIFactory("kcmkurifilt") ) class FilterOptions; KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQStringList &) - :KCModule(KURIFactory::instance(), parent, name) + :TDECModule(KURIFactory::instance(), parent, name) { filter = KURIFilter::self(); @@ -66,11 +66,11 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS modules.setAutoDelete(true); - TQMap helper; + TQMap helper; TQPtrListIterator it = filter->pluginsIterator(); for (; it.current(); ++it) { - KCModule *module = it.current()->configModule(this, 0); + TDECModule *module = it.current()->configModule(this, 0); if (module) { modules.append(module); @@ -83,7 +83,7 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS { TQTabWidget *tab = new TQTabWidget(this); - TQMapIterator it2; + TQMapIterator it2; for (it2 = helper.begin(); it2 != helper.end(); ++it2) { tab->addTab(it2.data(), it2.key()); @@ -103,7 +103,7 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS void KURIFilterModule::load() { - TQPtrListIterator it(modules); + TQPtrListIterator it(modules); for (; it.current(); ++it) { it.current()->load(); @@ -112,7 +112,7 @@ void KURIFilterModule::load() void KURIFilterModule::save() { - TQPtrListIterator it(modules); + TQPtrListIterator it(modules); for (; it.current(); ++it) { it.current()->save(); @@ -121,7 +121,7 @@ void KURIFilterModule::save() void KURIFilterModule::defaults() { - TQPtrListIterator it(modules); + TQPtrListIterator it(modules); for (; it.current(); ++it) { it.current()->defaults(); diff --git a/kcontrol/ebrowsing/main.h b/kcontrol/ebrowsing/main.h index 8508b0a0b..94780c995 100644 --- a/kcontrol/ebrowsing/main.h +++ b/kcontrol/ebrowsing/main.h @@ -29,7 +29,7 @@ class KURIFilter; -class KURIFilterModule : public KCModule { +class KURIFilterModule : public TDECModule { Q_OBJECT public: @@ -45,7 +45,7 @@ private: TQWidget *widget; FilterOptions *opts; - TQPtrList modules; + TQPtrList modules; }; #endif diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp index 2c04835c9..3073250f7 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp @@ -76,7 +76,7 @@ private: }; FilterOptions::FilterOptions(TDEInstance *instance, TQWidget *parent, const char *name) - :KCModule(instance, parent, name) + :TDECModule(instance, parent, name) { TQVBoxLayout *mainLayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint()); @@ -114,7 +114,7 @@ void FilterOptions::load( bool useDefaults ) // Clear state first. m_dlg->lvSearchProviders->clear(); - KConfig config( KURISearchFilterEngine::self()->name() + "rc", false, false ); + TDEConfig config( KURISearchFilterEngine::self()->name() + "rc", false, false ); config.setReadDefaults( useDefaults ); @@ -207,7 +207,7 @@ void FilterOptions::setDelimiter (char sep) void FilterOptions::save() { - KConfig config( KURISearchFilterEngine::self()->name() + "rc", false, false ); + TDEConfig config( KURISearchFilterEngine::self()->name() + "rc", false, false ); config.setGroup("General"); config.writeEntry("EnableWebShortcuts", m_dlg->cbEnableShortcuts->isChecked()); diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h index 6352dfea5..2150e4883 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h @@ -30,7 +30,7 @@ class FilterOptionsUI; class SearchProvider; class SearchProviderItem; -class FilterOptions : public KCModule +class FilterOptions : public TDECModule { Q_OBJECT diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp index f46b5c8ac..c57d3e080 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp @@ -521,7 +521,7 @@ void KURISearchFilterEngine::loadConfig() PIDDBG << "Keywords Engine: Loading config..." << endl; // Load the config. - KConfig config( name() + "rc", false, false ); + TDEConfig config( name() + "rc", false, false ); config.setGroup( "General" ); m_cKeywordDelimiter = config.readNumEntry("KeywordDelimiter", ':'); diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp index 8f56a0538..a8c8dbda9 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp @@ -77,7 +77,7 @@ bool KURISearchFilter::filterURI( KURIFilterData &data ) const return false; } -KCModule *KURISearchFilter::configModule(TQWidget *parent, const char *) const +TDECModule *KURISearchFilter::configModule(TQWidget *parent, const char *) const { return new FilterOptions( KURISearchFilterFactory::instance(), parent, "kcmkurifilt"); } diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h index 7ad52849b..f72d38340 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h +++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h @@ -39,7 +39,7 @@ public: ~KURISearchFilter(); virtual bool filterURI( KURIFilterData& ) const; - virtual KCModule *configModule(TQWidget *parent = 0, const char *name = 0) const; + virtual TDECModule *configModule(TQWidget *parent = 0, const char *name = 0) const; virtual TQString configName() const; k_dcop: diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp index 7e077ecb0..c394de693 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp +++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp @@ -533,7 +533,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const return false; } -KCModule* KShortURIFilter::configModule( TQWidget*, const char* ) const +TDECModule* KShortURIFilter::configModule( TQWidget*, const char* ) const { return 0; //new KShortURIOptions( parent, name ); } @@ -545,7 +545,7 @@ TQString KShortURIFilter::configName() const void KShortURIFilter::configure() { - KConfig config( name() + QFL1("rc"), false, false ); + TDEConfig config( name() + QFL1("rc"), false, false ); m_bVerbose = config.readBoolEntry( "Verbose", false ); if ( m_bVerbose ) diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h index db5f9027d..33ba20cad 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h +++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h @@ -84,7 +84,7 @@ public: * * @return the config module */ - virtual KCModule* configModule( TQWidget*, const char* ) const; + virtual TDECModule* configModule( TQWidget*, const char* ) const; public: k_dcop: -- cgit v1.2.1