diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/iccconfig | |
| parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
| download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/iccconfig')
| -rw-r--r-- | kcontrol/iccconfig/iccconfig.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/iccconfig/iccconfig.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp index 56af11adc..c65699489 100644 --- a/kcontrol/iccconfig/iccconfig.cpp +++ b/kcontrol/iccconfig/iccconfig.cpp @@ -61,7 +61,7 @@ KSimpleConfig *systemconfig; /**** KICCConfig ****/ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &) - : KCModule(KICCCFactory::instance(), parent, name), iccFileArray(NULL) + : TDECModule(KICCCFactory::instance(), parent, name), iccFileArray(NULL) { TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); diff --git a/kcontrol/iccconfig/iccconfig.h b/kcontrol/iccconfig/iccconfig.h index d113e5d84..74fe1b49d 100644 --- a/kcontrol/iccconfig/iccconfig.h +++ b/kcontrol/iccconfig/iccconfig.h @@ -31,11 +31,11 @@ #include "iccconfigbase.h" -class KConfig; +class TDEConfig; class KPopupMenu; class KListViewItem; -class KICCConfig : public KCModule, public DCOPObject +class KICCConfig : public TDECModule, public DCOPObject { K_DCOP Q_OBJECT @@ -59,7 +59,7 @@ public: private: - KConfig *config; + TDEConfig *config; bool _ok; Display *randr_display; ScreenInfo *randr_screen_info; |