From 20de04ce44f63fb911103d7870d39d2782d14cda Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:28:24 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kicker-applets/kbinaryclock/kbinaryclock.cpp | 8 ++++---- kicker-applets/kbinaryclock/kbinaryclock.h | 6 +++--- kicker-applets/kolourpicker/kolourpicker.cpp | 6 +++--- kicker-applets/ktimemon/timemon.cc | 6 +++--- kicker-applets/math/mathapplet.cpp | 4 ++-- kicker-applets/mediacontrol/configfrontend.cpp | 4 ++-- kicker-applets/mediacontrol/configfrontend.h | 4 ++-- kicker-applets/mediacontrol/mediacontrolconfig.h | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) (limited to 'kicker-applets') 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); diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp index 58dc30c..52f1f40 100644 --- a/kicker-applets/kolourpicker/kolourpicker.cpp +++ b/kicker-applets/kolourpicker/kolourpicker.cpp @@ -71,7 +71,7 @@ KolourPicker::KolourPicker(const TQString& configFile, Type type, about->addAuthor("Malte Starostik", I18N_NOOP("Original Author"), "malte@kde.org"); m_instance = new TDEInstance(about); - KConfig *conf = config(); + TDEConfig *conf = config(); conf->setGroup("General"); TQStringList history = conf->readListEntry("History"); for (TQStringList::ConstIterator it = history.begin(); it != history.end(); ++it) @@ -151,7 +151,7 @@ void KolourPicker::slotHistory() m_history.clear(); m_historyButton->setEnabled(false); arrangeButtons(); - KConfig *conf = config(); + TDEConfig *conf = config(); conf->setGroup("General"); conf->writeEntry("History", TQStringList()); conf->sync(); @@ -190,7 +190,7 @@ void KolourPicker::mouseReleaseEvent(TQMouseEvent *e) { history.append((*it).name()); } - KConfig *conf = config(); + TDEConfig *conf = config(); conf->setGroup("General"); conf->writeEntry("History", history); conf->sync(); diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc index ef32118..3f32558 100644 --- a/kicker-applets/ktimemon/timemon.cc +++ b/kicker-applets/ktimemon/timemon.cc @@ -198,7 +198,7 @@ KTimeMon::KTimeMon(const TQString& configFile, Type type, int actions, mouseAction[1] = NOTHING; mouseAction[2] = MENU; - KConfig* conf = config(); + TDEConfig* conf = config(); conf->setGroup("Parameters"); interval = conf->readUnsignedNumEntry("Interval", 500); autoScale = conf->readBoolEntry("AutoScale", true); @@ -305,7 +305,7 @@ void KTimeMon::cont() // Dump the current configuration entries to the data base. void KTimeMon::writeConfiguration() { - KConfig* conf = config(); + TDEConfig* conf = config(); conf->setGroup("Interface"); conf->writeEntry("KernelColour", kernelColour); conf->writeEntry("UserColour", userColour); @@ -369,7 +369,7 @@ void KTimeMon::orientation() { vertical = !vertical; - KConfig* conf = config(); + TDEConfig* conf = config(); conf->setGroup("Interface"); conf->writeEntry("Vertical", vertical); diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp index 7051e68..9efce39 100644 --- a/kicker-applets/math/mathapplet.cpp +++ b/kicker-applets/math/mathapplet.cpp @@ -90,7 +90,7 @@ MathApplet::MathApplet(const TQString& configFile, Type type, int actions, initContextMenu(); useDegrees(); - KConfig *c = config(); + TDEConfig *c = config(); c->setGroup("General"); @@ -120,7 +120,7 @@ void MathApplet::initContextMenu() MathApplet::~MathApplet() { - KConfig *c = config(); + TDEConfig *c = config(); c->setGroup("General"); // save history and completion list diff --git a/kicker-applets/mediacontrol/configfrontend.cpp b/kicker-applets/mediacontrol/configfrontend.cpp index 971d4d5..7bebd50 100644 --- a/kicker-applets/mediacontrol/configfrontend.cpp +++ b/kicker-applets/mediacontrol/configfrontend.cpp @@ -23,7 +23,7 @@ ConfigFrontend::ConfigFrontend() : TQObject(0, 0) { - _config = new KConfig(TQString(), true, false); + _config = new TDEConfig(TQString(), true, false); _ownConfig = true; } @@ -35,7 +35,7 @@ ConfigFrontend::~ConfigFrontend() } } -ConfigFrontend::ConfigFrontend(KConfig *config) : TQObject(0, 0) +ConfigFrontend::ConfigFrontend(TDEConfig *config) : TQObject(0, 0) { _config = config; _config->setGroup("MediaControl"); diff --git a/kicker-applets/mediacontrol/configfrontend.h b/kicker-applets/mediacontrol/configfrontend.h index 9a4727f..30d0166 100644 --- a/kicker-applets/mediacontrol/configfrontend.h +++ b/kicker-applets/mediacontrol/configfrontend.h @@ -30,7 +30,7 @@ class ConfigFrontend : public TQObject public: ConfigFrontend(); - ConfigFrontend(KConfig *); + ConfigFrontend(TDEConfig *); virtual ~ConfigFrontend(); uint mouseWheelSpeed() const; @@ -46,7 +46,7 @@ class ConfigFrontend : public TQObject void reparseConfiguration() { _config->reparseConfiguration(); } private: - KConfig *_config; + TDEConfig *_config; bool _ownConfig:1; }; diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.h b/kicker-applets/mediacontrol/mediacontrolconfig.h index aad3c61..0d020c1 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfig.h +++ b/kicker-applets/mediacontrol/mediacontrolconfig.h @@ -23,7 +23,7 @@ class MediaControlConfigWidget; class ConfigFrontend; -class KConfig; +class TDEConfig; class MediaControlConfig: public KDialogBase { -- cgit v1.2.1