diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:28:32 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:28:32 -0600 |
commit | 555ea1c7f342582df2985a7c02e880174877526e (patch) | |
tree | eeab8a68eb4f5b0689daada659450ffadc7f428b /knetworkconf | |
parent | 5f444a9ea966b68991cef44d2711378ef9ff406d (diff) | |
download | tdeadmin-555ea1c7f342582df2985a7c02e880174877526e.tar.gz tdeadmin-555ea1c7f342582df2985a7c02e880174877526e.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'knetworkconf')
-rw-r--r-- | knetworkconf/knetworkconf/knetworkconfmodule.cpp | 6 | ||||
-rw-r--r-- | knetworkconf/knetworkconf/knetworkconfmodule.h | 2 | ||||
-rw-r--r-- | knetworkconf/knetworkconf/main.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.cpp b/knetworkconf/knetworkconf/knetworkconfmodule.cpp index 6fe99f9..2d269e6 100644 --- a/knetworkconf/knetworkconf/knetworkconfmodule.cpp +++ b/knetworkconf/knetworkconf/knetworkconfmodule.cpp @@ -24,7 +24,7 @@ KNetworkConfModule::KNetworkConfModule(TQWidget* parent, const char *name/*, TQStringList list*/) - : KCModule(parent,name) + : TDECModule(parent,name) { TQVBoxLayout *top = new TQVBoxLayout(this); @@ -40,7 +40,7 @@ KNetworkConfModule::KNetworkConfModule(TQWidget* parent, const char *name/*, TQS } connect(conf,TQT_SIGNAL(networkStateChanged(bool)),TQT_SLOT(configChanged(bool))); - setButtons(KCModule::Apply|KCModule::Help); + setButtons(TDECModule::Apply|TDECModule::Help); } KNetworkConfModule::~KNetworkConfModule() @@ -66,7 +66,7 @@ void KNetworkConfModule::save() /* int KNetworkConfModule::buttons() { - return KCModule::Ok|KCModule::Apply|KCModule::Help; + return TDECModule::Ok|TDECModule::Apply|TDECModule::Help; } */ bool KNetworkConfModule::useRootOnlyMsg() const diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.h b/knetworkconf/knetworkconf/knetworkconfmodule.h index c1f9e49..fd245f6 100644 --- a/knetworkconf/knetworkconf/knetworkconfmodule.h +++ b/knetworkconf/knetworkconf/knetworkconfmodule.h @@ -22,7 +22,7 @@ #include <kaboutdata.h> #include <kcmodule.h> -class KNetworkConfModule : public KCModule +class KNetworkConfModule : public TDECModule { Q_OBJECT diff --git a/knetworkconf/knetworkconf/main.cpp b/knetworkconf/knetworkconf/main.cpp index 8af3252..710d977 100644 --- a/knetworkconf/knetworkconf/main.cpp +++ b/knetworkconf/knetworkconf/main.cpp @@ -40,7 +40,7 @@ K_EXPORT_COMPONENT_FACTORY( knetworkconfmodule, KDEDFactory( "kcm_knetworkconfmo extern "C" { - KDE_EXPORT KCModule *create_knetworkconfmodule(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_knetworkconfmodule(TQWidget *parent, const char *name) { TDEGlobal::locale()->insertCatalogue("knetworkconf"); return new KNetworkConfModule(parent, name); |