diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:28:24 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:28:24 -0600 |
commit | 20de04ce44f63fb911103d7870d39d2782d14cda (patch) | |
tree | bddd13cef2fae98892caf538dc64b5357732c517 /kicker-applets/kbinaryclock | |
parent | 4c097708c4cc24f3b8e4c21f14644f5715767d47 (diff) | |
download | tdeaddons-20de04ce44f63fb911103d7870d39d2782d14cda.tar.gz tdeaddons-20de04ce44f63fb911103d7870d39d2782d14cda.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kicker-applets/kbinaryclock')
-rw-r--r-- | kicker-applets/kbinaryclock/kbinaryclock.cpp | 8 | ||||
-rw-r--r-- | kicker-applets/kbinaryclock/kbinaryclock.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp index 2e84474..c19aff5 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.cpp +++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp @@ -48,8 +48,8 @@ extern "C" } } -KConfigDialogImp::KConfigDialogImp( TQWidget *parent, const char *name, KConfigSkeleton *prefs, KDialogBase::DialogType dialogType, KDialogBase::ButtonCode defaultButton, bool modal) : - KConfigDialog(parent, name, prefs, dialogType,(KDialogBase::ButtonCode) (KDialogBase::Default | KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel ), defaultButton, modal) +TDEConfigDialogImp::TDEConfigDialogImp( TQWidget *parent, const char *name, TDEConfigSkeleton *prefs, KDialogBase::DialogType dialogType, KDialogBase::ButtonCode defaultButton, bool modal) : + TDEConfigDialog(parent, name, prefs, dialogType,(KDialogBase::ButtonCode) (KDialogBase::Default | KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel ), defaultButton, modal) { // As a temporary mesure until the kicker applet's app name is set to the // applets name so KDialogBase gets the right info. @@ -213,10 +213,10 @@ void KBinaryClock::loadSettings(){ * Show Settings dialog. */ void KBinaryClock::preferences(){ - if(KConfigDialog::showDialog("settings")) + if(TDEConfigDialog::showDialog("settings")) return; - KConfigDialogImp *dialog = new KConfigDialogImp(this, "settings", prefs, KDialogBase::Swallow); + TDEConfigDialogImp *dialog = new TDEConfigDialogImp(this, "settings", prefs, KDialogBase::Swallow); connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(loadSettings())); dialog->show(); dialog->settings->updatePreview(); diff --git a/kicker-applets/kbinaryclock/kbinaryclock.h b/kicker-applets/kbinaryclock/kbinaryclock.h index e5e28aa..e816056 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.h +++ b/kicker-applets/kbinaryclock/kbinaryclock.h @@ -48,10 +48,10 @@ public slots: }; -class KConfigDialogImp : public KConfigDialog { +class TDEConfigDialogImp : public TDEConfigDialog { public: - KConfigDialogImp(TQWidget *parent, const char *name, - KConfigSkeleton *prefs, + TDEConfigDialogImp(TQWidget *parent, const char *name, + TDEConfigSkeleton *prefs, KDialogBase::DialogType dialogType = KDialogBase::IconList, KDialogBase::ButtonCode defaultButton = Ok, bool modal=false); |