From f21aaec952493cb5688c73de6e82a569ddbd7fb2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:36:20 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- lanbrowsing/kcmlisa/kcmkiolan.cpp | 2 +- lanbrowsing/kcmlisa/kcmkiolan.h | 4 ++-- lanbrowsing/kcmlisa/kcmlisa.cpp | 2 +- lanbrowsing/kcmlisa/kcmlisa.h | 4 ++-- lanbrowsing/kcmlisa/kcmreslisa.cpp | 2 +- lanbrowsing/kcmlisa/kcmreslisa.h | 6 +++--- lanbrowsing/kcmlisa/main.cpp | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) (limited to 'lanbrowsing/kcmlisa') diff --git a/lanbrowsing/kcmlisa/kcmkiolan.cpp b/lanbrowsing/kcmlisa/kcmkiolan.cpp index 558b6f62..fa3188fc 100644 --- a/lanbrowsing/kcmlisa/kcmkiolan.cpp +++ b/lanbrowsing/kcmlisa/kcmkiolan.cpp @@ -32,7 +32,7 @@ #include IOSlaveSettings::IOSlaveSettings(const TQString& config, TQWidget *parent) -:KCModule(parent) +:TDECModule(parent) ,m_config(config,false,true) { TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); diff --git a/lanbrowsing/kcmlisa/kcmkiolan.h b/lanbrowsing/kcmlisa/kcmkiolan.h index 6c5ef911..eacea6da 100644 --- a/lanbrowsing/kcmlisa/kcmkiolan.h +++ b/lanbrowsing/kcmlisa/kcmkiolan.h @@ -28,7 +28,7 @@ class TQCheckBox; class TQLineEdit; -class IOSlaveSettings:public KCModule +class IOSlaveSettings:public TDECModule { Q_OBJECT @@ -40,7 +40,7 @@ class IOSlaveSettings:public KCModule signals: void changed(); protected: - KConfig m_config; + TDEConfig m_config; TQCheckBox *m_shortHostnames; TQCheckBox *m_rlanSidebar; PortSettingsBar *m_ftpSettings; diff --git a/lanbrowsing/kcmlisa/kcmlisa.cpp b/lanbrowsing/kcmlisa/kcmlisa.cpp index c5892395..b73e8507 100644 --- a/lanbrowsing/kcmlisa/kcmlisa.cpp +++ b/lanbrowsing/kcmlisa/kcmlisa.cpp @@ -49,7 +49,7 @@ #include LisaSettings::LisaSettings(const TQString& config, TQWidget *parent) -: KCModule(parent, "kcmlanbrowser") +: TDECModule(parent, "kcmlanbrowser") ,m_config(config,false,true) ,m_wizard(0) ,m_configFilename(config) diff --git a/lanbrowsing/kcmlisa/kcmlisa.h b/lanbrowsing/kcmlisa/kcmlisa.h index 51815906..5a39d09a 100644 --- a/lanbrowsing/kcmlisa/kcmlisa.h +++ b/lanbrowsing/kcmlisa/kcmlisa.h @@ -34,7 +34,7 @@ class KRestrictedLine; class KEditListBox; class SetupWizard; -class LisaSettings:public KCModule +class LisaSettings:public TDECModule { Q_OBJECT @@ -51,7 +51,7 @@ class LisaSettings:public KCModule void saveDone(TDEProcess *); // called after the tdesud returns (on save) void suggestSettings(); protected: - KConfig m_config; + TDEConfig m_config; TQPushButton *m_autoSetup; TQCheckBox *m_useNmblookup; TQCheckBox *m_sendPings; diff --git a/lanbrowsing/kcmlisa/kcmreslisa.cpp b/lanbrowsing/kcmlisa/kcmreslisa.cpp index fcaf104c..6b946608 100644 --- a/lanbrowsing/kcmlisa/kcmreslisa.cpp +++ b/lanbrowsing/kcmlisa/kcmreslisa.cpp @@ -37,7 +37,7 @@ #include ResLisaSettings::ResLisaSettings(const TQString& config, TQWidget *parent) -: KCModule(parent) +: TDECModule(parent) ,m_config(config,false,true) ,m_kiolanConfig("kio_lanrc",false,true) ,m_advancedSettingsButton(0) diff --git a/lanbrowsing/kcmlisa/kcmreslisa.h b/lanbrowsing/kcmlisa/kcmreslisa.h index 1db4ec69..af7a6fd4 100644 --- a/lanbrowsing/kcmlisa/kcmreslisa.h +++ b/lanbrowsing/kcmlisa/kcmreslisa.h @@ -32,7 +32,7 @@ class KEditListBox; class KDialogBase; class KRestrictedLine; -class ResLisaSettings:public KCModule +class ResLisaSettings:public TDECModule { Q_OBJECT @@ -46,8 +46,8 @@ class ResLisaSettings:public KCModule protected slots: void suggestSettings(); protected: - KConfig m_config; - KConfig m_kiolanConfig; + TDEConfig m_config; + TDEConfig m_kiolanConfig; TQPushButton* m_advancedSettingsButton; TQPushButton* m_suggestSettings; TQCheckBox* m_useNmblookup; diff --git a/lanbrowsing/kcmlisa/main.cpp b/lanbrowsing/kcmlisa/main.cpp index 00d03e52..03d5d045 100644 --- a/lanbrowsing/kcmlisa/main.cpp +++ b/lanbrowsing/kcmlisa/main.cpp @@ -33,15 +33,15 @@ extern "C" { - KDE_EXPORT KCModule *create_lisa(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_lisa(TQWidget *parent, const char *) { return new LisaSettings("/etc/lisarc", parent); } - KDE_EXPORT KCModule *create_reslisa(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_reslisa(TQWidget *parent, const char *) { return new ResLisaSettings(TQDir::homeDirPath()+"/.reslisarc", parent); } - KDE_EXPORT KCModule *create_kiolan(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_kiolan(TQWidget *parent, const char *) { return new IOSlaveSettings("kio_lanrc", parent); } -- cgit v1.2.1