summaryrefslogtreecommitdiffstats
path: root/kicker/applets/clock
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kicker/applets/clock
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kicker/applets/clock')
-rw-r--r--kicker/applets/clock/clock.cpp20
-rw-r--r--kicker/applets/clock/clock.h8
-rw-r--r--kicker/applets/clock/zone.cpp2
-rw-r--r--kicker/applets/clock/zone.h6
4 files changed, 18 insertions, 18 deletions
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index b29d52f19..35dccf148 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -68,11 +68,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// Settings
-KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent,
+TDEConfigDialogSingle::TDEConfigDialogSingle(Zone *zone, TQWidget *parent,
const char *name, Prefs * prefs,
KDialogBase::DialogType dialogType,
bool modal) :
- KConfigDialog(parent, name, prefs, dialogType,
+ TDEConfigDialog(parent, name, prefs, dialogType,
KDialogBase::Default | KDialogBase::Ok |
KDialogBase::Apply | KDialogBase::Cancel,
KDialogBase::Ok,
@@ -126,19 +126,19 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent,
addPage(settings, i18n("General"), TQString::fromLatin1("package_settings"));
}
-void KConfigDialogSingle::updateSettings()
+void TDEConfigDialogSingle::updateSettings()
{
settings->OkApply();
}
-void KConfigDialogSingle::updateWidgets()
+void TDEConfigDialogSingle::updateWidgets()
{
selectPage( _prefs->type() );
}
-void KConfigDialogSingle::updateWidgetsDefault()
+void TDEConfigDialogSingle::updateWidgetsDefault()
{
- KConfigSkeletonItem *item = _prefs->findItem("Type");
+ TDEConfigSkeletonItem *item = _prefs->findItem("Type");
item->swapDefault();
selectPage( _prefs->type() );
item->swapDefault();
@@ -147,13 +147,13 @@ void KConfigDialogSingle::updateWidgetsDefault()
TQTimer::singleShot(0, this, TQT_SLOT(dateToggled()));
}
-void KConfigDialogSingle::selectPage(int p)
+void TDEConfigDialogSingle::selectPage(int p)
{
settings->widgetStack->raiseWidget( p );
dateToggled();
}
-void KConfigDialogSingle::dateToggled()
+void TDEConfigDialogSingle::dateToggled()
{
bool showDate;
switch( settings->kcfg_Type->currentItem() )
@@ -1151,11 +1151,11 @@ void ClockApplet::preferences()
void ClockApplet::preferences(bool timezone)
{
- KConfigDialogSingle *dialog = dynamic_cast<KConfigDialogSingle*>(KConfigDialog::exists(configFileName));
+ TDEConfigDialogSingle *dialog = dynamic_cast<TDEConfigDialogSingle*>(TDEConfigDialog::exists(configFileName));
if (!dialog)
{
- dialog = new KConfigDialogSingle(zone, this, configFileName, _prefs, KDialogBase::Swallow);
+ dialog = new TDEConfigDialogSingle(zone, this, configFileName, _prefs, KDialogBase::Swallow);
connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotReconfigure()));
}
diff --git a/kicker/applets/clock/clock.h b/kicker/applets/clock/clock.h
index c5295d87b..9a80c24b6 100644
--- a/kicker/applets/clock/clock.h
+++ b/kicker/applets/clock/clock.h
@@ -52,7 +52,7 @@ class KPopupMenu;
class Prefs;
class ClockApplet;
-namespace KIO
+namespace TDEIO
{
class Job;
}
@@ -61,7 +61,7 @@ class DigitalWidget;
class AnalogWidget;
class FuzzyWidget;
class ClockApplet;
-class KConfigDialogManager;
+class TDEConfigDialogManager;
class SettingsWidgetImp;
class SettingsWidgetImp : public SettingsWidget
@@ -82,12 +82,12 @@ class SettingsWidgetImp : public SettingsWidget
Zone *zone;
};
-class KConfigDialogSingle : public KConfigDialog
+class TDEConfigDialogSingle : public TDEConfigDialog
{
Q_OBJECT
public:
- KConfigDialogSingle(Zone *zone,
+ TDEConfigDialogSingle(Zone *zone,
TQWidget *parent=0,
const char *name=0,
Prefs *prefs=0,
diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp
index 320d84b4c..bf007c933 100644
--- a/kicker/applets/clock/zone.cpp
+++ b/kicker/applets/clock/zone.cpp
@@ -41,7 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <time.h>
#include <stdlib.h> // for getenv()
-Zone::Zone(KConfig* conf):
+Zone::Zone(TDEConfig* conf):
config(conf),
_zoneIndex(0)
{
diff --git a/kicker/applets/clock/zone.h b/kicker/applets/clock/zone.h
index db34188bd..caaa112f9 100644
--- a/kicker/applets/clock/zone.h
+++ b/kicker/applets/clock/zone.h
@@ -27,13 +27,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <ktimezones.h>
#include <tqstringlist.h>
-class KConfig;
+class TDEConfig;
class KListView;
class Zone {
public:
- Zone(KConfig* conf);
+ Zone(TDEConfig* conf);
~Zone();
void writeSettings();
@@ -54,7 +54,7 @@ public:
protected:
KTimezones m_zoneDb;
TQStringList _remotezonelist;
- KConfig *config;
+ TDEConfig *config;
TQString _defaultTZ;
unsigned int _zoneIndex;
};