summaryrefslogtreecommitdiffstats
path: root/kicker/applets/clock
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
commit8155225c9be993acc0512956416d195edfef4eb9 (patch)
treede4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kicker/applets/clock
parent364641b8e0279758d236af39abd138d379328a19 (diff)
downloadtdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz
tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/applets/clock')
-rw-r--r--kicker/applets/clock/analog.ui36
-rw-r--r--kicker/applets/clock/clock.cpp136
-rw-r--r--kicker/applets/clock/clock.h2
-rw-r--r--kicker/applets/clock/clockapplet.kcfg24
-rw-r--r--kicker/applets/clock/datepicker.cpp4
-rw-r--r--kicker/applets/clock/datepicker.h2
-rw-r--r--kicker/applets/clock/digital.ui32
-rw-r--r--kicker/applets/clock/fuzzy.ui36
-rw-r--r--kicker/applets/clock/settings.ui58
-rw-r--r--kicker/applets/clock/zone.cpp6
10 files changed, 168 insertions, 168 deletions
diff --git a/kicker/applets/clock/analog.ui b/kicker/applets/clock/analog.ui
index 4a20312ec..ea0135ceb 100644
--- a/kicker/applets/clock/analog.ui
+++ b/kicker/applets/clock/analog.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>AnalogWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>AnalogWidget</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>ButtonGroup2_3_2</cstring>
</property>
@@ -30,7 +30,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_AnalogShowDate</cstring>
</property>
@@ -38,7 +38,7 @@
<string>Dat&amp;e</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_AnalogShowSeconds</cstring>
</property>
@@ -49,7 +49,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_AnalogShowDayOfWeek</cstring>
</property>
@@ -57,7 +57,7 @@
<string>Da&amp;y of week</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_AnalogShowFrame</cstring>
</property>
@@ -75,7 +75,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -84,7 +84,7 @@
</spacer>
</hbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox1</cstring>
</property>
@@ -95,7 +95,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
+ <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>layout9</cstring>
</property>
@@ -125,7 +125,7 @@
<string></string>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>foregroundAnalogLabel</cstring>
</property>
@@ -149,14 +149,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>backgroundAnalogLabel</cstring>
</property>
@@ -181,7 +181,7 @@
<string></string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>shadowAnalogLabel</cstring>
</property>
@@ -197,7 +197,7 @@
</widget>
</grid>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>TextLabel1_3</cstring>
</property>
@@ -208,7 +208,7 @@
<cstring>kcfg_AnalogAntialias</cstring>
</property>
</widget>
- <widget class="QComboBox" row="0" column="1">
+ <widget class="TQComboBox" row="0" column="1">
<item>
<property name="text">
<string>None</string>
@@ -241,14 +241,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>310</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3">
+ <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>kcfg_AnalogLCDStyle</cstring>
</property>
@@ -269,7 +269,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>50</height>
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 26f1ae4c0..072bd6161 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -95,46 +95,46 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent,
setIcon(SmallIcon("date"));
settings = new SettingsWidgetImp(prefs, zone, 0, "General");
- connect(settings->kcfg_Type, TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int)));
+ connect(TQT_TQOBJECT(settings->kcfg_Type), TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int)));
- settings->kcfg_PlainBackgroundColor->setDefaultColor(KApplication::palette().active().background());
- settings->kcfg_DateBackgroundColor->setDefaultColor(KApplication::palette().active().background());
+ settings->kcfg_PlainBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background());
+ settings->kcfg_DateBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background());
// Digital
digitalPage = new DigitalWidget(0, "DigitalClock");
settings->widgetStack->addWidget(digitalPage, 1);
- digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(KApplication::palette().active().background());
+ digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background());
// Analog
analogPage = new AnalogWidget(0, "AnalogClock");
settings->widgetStack->addWidget(analogPage, 2);
- analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(KApplication::palette().active().background());
+ analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background());
// Fuzzy
fuzzyPage = new FuzzyWidget(0, "FuzzyClock");
settings->widgetStack->addWidget(fuzzyPage, 3);
- fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(KApplication::palette().active().background());
+ fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background());
- connect(settings->kcfg_PlainShowDate, TQT_SIGNAL(toggled(bool)),
+ connect(TQT_TQOBJECT(settings->kcfg_PlainShowDate), TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled()));
- connect(settings->kcfg_PlainShowDayOfWeek, TQT_SIGNAL(toggled(bool)),
+ connect(TQT_TQOBJECT(settings->kcfg_PlainShowDayOfWeek), TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled()));
- connect(digitalPage->kcfg_DigitalShowDate, TQT_SIGNAL(toggled(bool)),
+ connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDate), TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled()));
- connect(digitalPage->kcfg_DigitalShowDayOfWeek, TQT_SIGNAL(toggled(bool)),
+ connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDayOfWeek), TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled()));
- connect(digitalPage->kcfg_DigitalShowDate, TQT_SIGNAL(toggled(bool)),
+ connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDate), TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled()));
- connect(analogPage->kcfg_AnalogShowDate, TQT_SIGNAL(toggled(bool)),
+ connect(TQT_TQOBJECT(analogPage->kcfg_AnalogShowDate), TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled()));
- connect(analogPage->kcfg_AnalogShowDayOfWeek, TQT_SIGNAL(toggled(bool)),
+ connect(TQT_TQOBJECT(analogPage->kcfg_AnalogShowDayOfWeek), TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled()));
- connect(fuzzyPage->kcfg_FuzzyShowDate, TQT_SIGNAL(toggled(bool)),
+ connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDate), TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled()));
- connect(fuzzyPage->kcfg_FuzzyShowDayOfWeek, TQT_SIGNAL(toggled(bool)),
+ connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDayOfWeek), TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled()));
- addPage(settings, i18n("General"), TQString::fromLatin1("package_settings"));
+ addPage(settings, i18n("General"), TQString::tqfromLatin1("package_settings"));
}
void KConfigDialogSingle::updateSettings()
@@ -253,7 +253,7 @@ void PlainClock::updateClock()
void PlainClock::loadSettings()
{
setFrameStyle(_prefs->plainShowFrame() ? Panel | Sunken : NoFrame);
- setAlignment(AlignVCenter | AlignHCenter | SingleLine);
+ tqsetAlignment(AlignVCenter | AlignHCenter | SingleLine);
setFont(_prefs->plainFont());
}
@@ -397,7 +397,7 @@ void DigitalClock::paintEvent(TQPaintEvent*)
p.drawTiledPixmap(0, 0, width(), height(), lcdPattern);
}
else if (_prefs->digitalBackgroundColor() !=
- KApplication::palette().active().background())
+ KApplication::tqpalette().active().background())
{
p.fillRect(0, 0, width(), height(), _prefs->digitalBackgroundColor());
}
@@ -564,7 +564,7 @@ void AnalogClock::paintEvent( TQPaintEvent * )
paint.drawTiledPixmap(0, 0, spWidth, spHeight, lcdPattern);
}
- else if (_prefs->analogBackgroundColor() != KApplication::palette().active().background())
+ else if (_prefs->analogBackgroundColor() != KApplication::tqpalette().active().background())
{
_spPx->fill(_prefs->analogBackgroundColor());
}
@@ -817,9 +817,9 @@ void FuzzyClock::drawContents(TQPainter *p)
}
newTimeStr = normalFuzzy[sector];
- int phStart = newTimeStr.find("%");
+ int phStart = newTimeStr.tqfind("%");
if (phStart >= 0) { // protect yourself from translations
- int phLength = newTimeStr.find(" ", phStart) - phStart;
+ int phLength = newTimeStr.tqfind(" ", phStart) - phStart;
// larrosa: we want the exact length, in case the translation needs it,
// in other case, we would cut off the end of the translation.
@@ -832,13 +832,13 @@ void FuzzyClock::drawContents(TQPainter *p)
realHour = 12 - ((_time.hour() + deltaHour) % 12 + 1);
if (realHour==0) {
newTimeStr = normalFuzzyOne[sector];
- phStart = newTimeStr.find("%");
+ phStart = newTimeStr.tqfind("%");
// larrosa: Note that length is the same,
// so we only have to update phStart
}
if (phStart >= 0)
- newTimeStr.replace(phStart, phLength, hourNames[realHour]);
- newTimeStr.replace(0, 1, TQString(newTimeStr.at(0).upper()));
+ newTimeStr.tqreplace(phStart, phLength, hourNames[realHour]);
+ newTimeStr.tqreplace(0, 1, TQString(newTimeStr.tqat(0).upper()));
}
} else if (_prefs->fuzzyness() == 3) {
newTimeStr = dayTime[_time.hour() / 3];
@@ -865,7 +865,7 @@ void FuzzyClock::drawContents(TQPainter *p)
TQRect tr;
- if (_applet->getOrientation() == Vertical)
+ if (_applet->getOrientation() == Qt::Vertical)
{
p->rotate(90);
tr = TQRect(4, -2, height() - 8, -(width()) + 2);
@@ -919,12 +919,12 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions,
setBackgroundOrigin(AncestorOrigin);
_dayOfWeek = new TQLabel(this);
- _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter | WordBreak);
+ _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak);
_dayOfWeek->setBackgroundOrigin(AncestorOrigin);
_dayOfWeek->installEventFilter(this); // catch mouse clicks
_date = new TQLabel(this);
- _date->setAlignment(AlignVCenter | AlignHCenter | WordBreak);
+ _date->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak);
_date->setBackgroundOrigin(AncestorOrigin);
_date->installEventFilter(this); // catch mouse clicks
@@ -991,18 +991,18 @@ int ClockApplet::widthForHeight(int h) const
bool mustShowDate = showDate || (zone->zoneIndex() != 0);
if (mustShowDate)
{
- _date->setAlignment(AlignVCenter | AlignHCenter);
+ _date->tqsetAlignment(AlignVCenter | AlignHCenter);
if (!dateToSide)
{
- shareDateHeight = _date->sizeHint().height();
+ shareDateHeight = _date->tqsizeHint().height();
}
}
if (showDayOfWeek)
{
- _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter);
+ _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter);
if (!dateToSide)
{
- shareDayOfWeekHeight = _dayOfWeek->sizeHint().height();
+ shareDayOfWeekHeight = _dayOfWeek->tqsizeHint().height();
}
}
@@ -1018,8 +1018,8 @@ int ClockApplet::widthForHeight(int h) const
}
else
{
- int dateWidth = mustShowDate ? _date->sizeHint().width() + 4 : 0;
- int dayOfWeekWidth = showDayOfWeek ? _dayOfWeek->sizeHint().width() + 4 : 0;
+ int dateWidth = mustShowDate ? _date->tqsizeHint().width() + 4 : 0;
+ int dayOfWeekWidth = showDayOfWeek ? _dayOfWeek->tqsizeHint().width() + 4 : 0;
if (dateToSide)
{
@@ -1075,13 +1075,13 @@ int ClockApplet::widthForHeight(int h) const
_clock->widget()->move(0, 0);
if (showDayOfWeek)
{
- _dayOfWeek->setFixedSize(w, _dayOfWeek->sizeHint().height());
+ _dayOfWeek->setFixedSize(w, _dayOfWeek->tqsizeHint().height());
_dayOfWeek->move(0, _clock->widget()->height());
}
if (mustShowDate)
{
- _date->setFixedSize(w, _date->sizeHint().height());
+ _date->setFixedSize(w, _date->tqsizeHint().height());
_date->move(0, _clock->widget()->height() + shareDayOfWeekHeight);
}
}
@@ -1105,16 +1105,16 @@ int ClockApplet::heightForWidth(int w) const
// add 4 pixels in height for each of date+dayOfWeek, if visible
if (showDayOfWeek)
{
- if (_dayOfWeek->minimumSizeHint().width() > w)
+ if (_dayOfWeek->tqminimumSizeHint().width() > w)
{
- _dayOfWeek->setAlignment(AlignVCenter | WordBreak);
+ _dayOfWeek->tqsetAlignment(AlignVCenter | WordBreak);
}
else
{
- _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter | WordBreak);
+ _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak);
}
- _dayOfWeek->setFixedSize(w, _dayOfWeek->minimumSizeHint().height());
+ _dayOfWeek->setFixedSize(w, _dayOfWeek->tqminimumSizeHint().height());
_dayOfWeek->move(0, clockHeight);
clockHeight += _dayOfWeek->height();
@@ -1127,24 +1127,24 @@ int ClockApplet::heightForWidth(int w) const
// display on panel that is too narrow and then they made it wider
const_cast<ClockApplet*>(this)->updateDateLabel(false);
- if (_date->minimumSizeHint().width() > w)
+ if (_date->tqminimumSizeHint().width() > w)
{
TQString dateStr = _date->text();
// if we're too wide to fit, replace the first non-digit from the end with a space
- int p = dateStr.findRev(TQRegExp("[^0-9]"));
+ int p = dateStr.tqfindRev(TQRegExp("[^0-9]"));
if (p > 0)
{
_date->setText(dateStr.insert(p, '\n'));
}
}
- if (_date->minimumSizeHint().width() > w)
+ if (_date->tqminimumSizeHint().width() > w)
{
- _date->setAlignment(AlignVCenter | WordBreak);
+ _date->tqsetAlignment(AlignVCenter | WordBreak);
}
else
{
- _date->setAlignment(AlignVCenter | AlignHCenter | WordBreak);
+ _date->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak);
}
_date->setFixedSize(w, _date->heightForWidth(w));
_date->move(0, clockHeight);
@@ -1180,7 +1180,7 @@ void ClockApplet::preferences(bool timezone)
void ClockApplet::updateFollowBackground()
{
- TQColor globalBgroundColor = KApplication::palette().active().background();
+ TQColor globalBgroundColor = KApplication::tqpalette().active().background();
TQColor bgColor;
switch (_prefs->type())
@@ -1283,7 +1283,7 @@ void ClockApplet::reconfigure()
_clock->widget()->installEventFilter(this); // catch mouse clicks
_clock->widget()->show();
- _clock->forceUpdate(); /* force repaint */
+ _clock->forceUpdate(); /* force tqrepaint */
if (showDayOfWeek)
{
@@ -1317,7 +1317,7 @@ void ClockApplet::setTimerTo60()
void ClockApplet::setBackground()
{
- TQColor globalBgroundColor = KApplication::palette().active().background();
+ TQColor globalBgroundColor = KApplication::tqpalette().active().background();
TQColor fgColor, bgColor;
if (!_clock)
@@ -1382,7 +1382,7 @@ void ClockApplet::globalPaletteChange()
if (!m_dateFollowBackgroundSetting && !m_followBackgroundSetting)
return;
- TQColor globalBgroundColor = KApplication::palette().active().background();
+ TQColor globalBgroundColor = KApplication::tqpalette().active().background();
if (m_dateFollowBackgroundSetting)
_prefs->setDateBackgroundColor(globalBgroundColor);
@@ -1552,15 +1552,15 @@ void ClockApplet::aboutToShowContextMenu()
menu->insertTitle( SmallIcon( "clock" ), i18n( "Clock" ) );
KLocale *loc = KGlobal::locale();
- TQDateTime dt = TQDateTime::currentDateTime();
- dt = dt.addSecs(TZoffset);
+ TQDateTime dt = TQDateTime::tqcurrentDateTime();
+ dt = TQT_TQDATETIME_OBJECT(dt.addSecs(TZoffset));
KPopupMenu *copyMenu = new KPopupMenu( menu );
copyMenu->insertItem(loc->formatDateTime(dt), 201);
- copyMenu->insertItem(loc->formatDate(dt.date()), 202);
- copyMenu->insertItem(loc->formatDate(dt.date(), true), 203);
- copyMenu->insertItem(loc->formatTime(dt.time()), 204);
- copyMenu->insertItem(loc->formatTime(dt.time(), true), 205);
+ copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date())), 202);
+ copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date()), true), 203);
+ copyMenu->insertItem(loc->formatTime(TQT_TQTIME_OBJECT(dt.time())), 204);
+ copyMenu->insertItem(loc->formatTime(TQT_TQTIME_OBJECT(dt.time()), true), 205);
copyMenu->insertItem(dt.date().toString(), 206);
copyMenu->insertItem(dt.time().toString(), 207);
copyMenu->insertItem(dt.toString(), 208);
@@ -1579,7 +1579,7 @@ void ClockApplet::aboutToShowContextMenu()
}
else
{
- zoneMenu->insertItem(i18n(zone->zone(i).utf8()).replace("_", " "), 500 + i);
+ zoneMenu->insertItem(i18n(zone->zone(i).utf8()).tqreplace("_", " "), 500 + i);
}
}
zoneMenu->setItemChecked(500 + zone->zoneIndex(),true);
@@ -1621,12 +1621,12 @@ void ClockApplet::slotCopyMenuActivated( int id )
TQTime ClockApplet::clockGetTime()
{
- return TQTime::currentTime().addSecs(TZoffset);
+ return TQT_TQTIME_OBJECT(TQTime::currentTime().addSecs(TZoffset));
}
TQDate ClockApplet::clockGetDate()
{
- return TQDateTime::currentDateTime().addSecs(TZoffset).date();
+ return TQT_TQDATE_OBJECT(TQDateTime::tqcurrentDateTime().addSecs(TZoffset).date());
}
void ClockApplet::showZone(int z)
@@ -1634,7 +1634,7 @@ void ClockApplet::showZone(int z)
zone->setZone(z);
TZoffset = zone->calc_TZ_offset( zone->zone() );
updateDateLabel();
- _clock->forceUpdate(); /* force repaint */
+ _clock->forceUpdate(); /* force tqrepaint */
}
void ClockApplet::nextZone()
@@ -1653,13 +1653,13 @@ void ClockApplet::mousePressEvent(TQMouseEvent *ev)
{
switch (ev->button())
{
- case TQMouseEvent::LeftButton:
+ case Qt::LeftButton:
toggleCalendar();
break;
- case TQMouseEvent::RightButton:
+ case Qt::RightButton:
openContextMenu();
break;
- case TQMouseEvent::MidButton:
+ case Qt::MidButton:
nextZone();
TQToolTip::remove(_clock->widget());
break;
@@ -1686,10 +1686,10 @@ void ClockApplet::wheelEvent(TQWheelEvent* e)
// catch the mouse clicks of our child widgets
bool ClockApplet::eventFilter( TQObject *o, TQEvent *e )
{
- if (( o == _clock->widget() || o == _date || o == _dayOfWeek) &&
+ if (( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_clock->widget()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_date) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_dayOfWeek)) &&
e->type() == TQEvent::MouseButtonPress )
{
- mousePressEvent(static_cast<TQMouseEvent*>(e) );
+ mousePressEvent(TQT_TQMOUSEEVENT(e) );
return true;
}
@@ -1710,7 +1710,7 @@ void ClockApplet::updateDateLabel(bool reLayout)
if (zone->zoneIndex() != 0)
{
TQString zone_s = i18n(zone->zone().utf8());
- _date->setText(zone_s.mid(zone_s.find('/') + 1).replace("_", " "));
+ _date->setText(zone_s.mid(zone_s.tqfind('/') + 1).tqreplace("_", " "));
_date->setShown(true);
}
else
@@ -1748,7 +1748,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
if (!activeZone.isEmpty())
{
activeZone = i18n(activeZone.utf8());
- data.subtext.append("<br>").append(activeZone.mid(activeZone.find('/') + 1).replace("_", " "));
+ data.subtext.append("<br>").append(activeZone.mid(activeZone.tqfind('/') + 1).tqreplace("_", " "));
}
}
else
@@ -1771,7 +1771,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
if (activeIndex == i)
{
- data.message = m_zone.mid(m_zone.find('/') + 1).replace("_", " ");
+ data.message = m_zone.mid(m_zone.tqfind('/') + 1).tqreplace("_", " ");
data.message += " " + _time + "<br>" + _date;
}
else
@@ -1782,7 +1782,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
}
else
{
- data.subtext += "<b>" + m_zone.mid(m_zone.find('/') + 1).replace("_", " ") + "</b>";
+ data.subtext += "<b>" + m_zone.mid(m_zone.tqfind('/') + 1).tqreplace("_", " ") + "</b>";
}
data.subtext += " " + _time + ", " + _date + "<br>";
}
@@ -1851,7 +1851,7 @@ void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ )
(m_clock->type() == Prefs::EnumType::Analog) )
{
// show full time (incl. hour) as tooltip for Fuzzy clock
- tipText = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset));
+ tipText = KGlobal::locale()->formatDateTime(TQT_TQDATETIME_OBJECT(TQDateTime::tqcurrentDateTime().addSecs(m_clock->TZoffset)));
}
else
{
diff --git a/kicker/applets/clock/clock.h b/kicker/applets/clock/clock.h
index 144fb50c6..498ce4b9d 100644
--- a/kicker/applets/clock/clock.h
+++ b/kicker/applets/clock/clock.h
@@ -246,7 +246,7 @@ class FuzzyClock : public TQFrame, public ClockWidget
bool alreadyDrawing;
};
-class ClockAppletToolTip : public QToolTip
+class ClockAppletToolTip : public TQToolTip
{
public:
ClockAppletToolTip( ClockApplet* clock );
diff --git a/kicker/applets/clock/clockapplet.kcfg b/kicker/applets/clock/clockapplet.kcfg
index fb38d6583..ed375d03a 100644
--- a/kicker/applets/clock/clockapplet.kcfg
+++ b/kicker/applets/clock/clockapplet.kcfg
@@ -20,11 +20,11 @@
<group name="Date">
<entry name="DateForegroundColor" type="Color" key="Foreground_Color">
<label>Foreground color.</label>
- <default code="true">KApplication::palette().active().text()</default>
+ <default code="true">KApplication::tqpalette().active().text()</default>
</entry>
<entry name="DateBackgroundColor" type="Color" key="Background_Color">
<label>Foreground color.</label>
- <default code="true">KApplication::palette().active().background()</default>
+ <default code="true">KApplication::tqpalette().active().background()</default>
</entry>
<entry name="DateFont" type="Font" key="Font">
<label>Font for the clock.</label>
@@ -63,11 +63,11 @@ defFont.setBold(true);
</entry>
<entry name="PlainForegroundColor" type="Color" key="Foreground_Color">
<label>Foreground color.</label>
- <default code="true">KApplication::palette().active().text()</default>
+ <default code="true">KApplication::tqpalette().active().text()</default>
</entry>
<entry name="PlainBackgroundColor" type="Color" key="Background_Color">
<label>Background color.</label>
- <default code="true">KApplication::palette().active().background()</default>
+ <default code="true">KApplication::tqpalette().active().background()</default>
</entry>
</group>
<group name="Digital">
@@ -89,15 +89,15 @@ defFont.setBold(true);
</entry>
<entry name="DigitalForegroundColor" type="Color" key="Foreground_Color">
<label>Foreground color.</label>
- <default code="true">KApplication::palette().active().text()</default>
+ <default code="true">KApplication::tqpalette().active().text()</default>
</entry>
<entry name="DigitalBackgroundColor" type="Color" key="Background_Color">
<label>Background color.</label>
- <default code="true">KApplication::palette().active().background()</default>
+ <default code="true">KApplication::tqpalette().active().background()</default>
</entry>
<entry name="DigitalShadowColor" type="Color" key="Shadow_Color">
<label>Shadow color.</label>
- <default code="true">KApplication::palette().active().mid()</default>
+ <default code="true">KApplication::tqpalette().active().mid()</default>
</entry>
<entry name="DigitalBlink" type="Bool" key="Blink">
<label>Blink</label>
@@ -127,15 +127,15 @@ defFont.setBold(true);
</entry>
<entry name="AnalogForegroundColor" type="Color" key="Foreground_Color">
<label>Foreground color.</label>
- <default code="true">KApplication::palette().active().text()</default>
+ <default code="true">KApplication::tqpalette().active().text()</default>
</entry>
<entry name="AnalogBackgroundColor" type="Color" key="Background_Color">
<label>Background color.</label>
- <default code="true">KApplication::palette().active().background()</default>
+ <default code="true">KApplication::tqpalette().active().background()</default>
</entry>
<entry name="AnalogShadowColor" type="Color" key="Shadow_Color">
<label>Shadow color.</label>
- <default code="true">KApplication::palette().active().mid()</default>
+ <default code="true">KApplication::tqpalette().active().mid()</default>
</entry>
<entry name="AnalogLCDStyle" type="Bool" key="LCD_Style">
<label>LCD Style</label>
@@ -168,11 +168,11 @@ defFont=KGlobalSettings::generalFont();
</entry>
<entry name="FuzzyForegroundColor" type="Color" key="Foreground_Color">
<label>Foreground color.</label>
- <default code="true">KApplication::palette().active().text()</default>
+ <default code="true">KApplication::tqpalette().active().text()</default>
</entry>
<entry name="FuzzyBackgroundColor" type="Color" key="Background_Color">
<label>Background color.</label>
- <default code="true">KApplication::palette().active().background()</default>
+ <default code="true">KApplication::tqpalette().active().background()</default>
</entry>
<entry name="Fuzzyness" type="Int">
<label>Fuzzyness</label>
diff --git a/kicker/applets/clock/datepicker.cpp b/kicker/applets/clock/datepicker.cpp
index 3864db556..3f5d5b4ed 100644
--- a/kicker/applets/clock/datepicker.cpp
+++ b/kicker/applets/clock/datepicker.cpp
@@ -33,9 +33,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
DatePicker::DatePicker(TQWidget *parent, const TQDate& date, Prefs* _prefs)
: TQVBox( parent, 0,
_prefs->calendarFullWindow()
- ? (WType_TopLevel | WDestructiveClose |
+ ? (WFlags)(WType_TopLevel | WDestructiveClose |
WStyle_StaysOnTop)
- : (WStyle_Customize | WStyle_NoBorder |
+ : (WFlags)(WStyle_Customize | WStyle_NoBorder |
WType_TopLevel | WDestructiveClose |
WStyle_StaysOnTop) ),
prefs(_prefs)
diff --git a/kicker/applets/clock/datepicker.h b/kicker/applets/clock/datepicker.h
index f2e8a3397..60ca765f7 100644
--- a/kicker/applets/clock/datepicker.h
+++ b/kicker/applets/clock/datepicker.h
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
class KDatePicker;
class Prefs;
-class DatePicker : public QVBox
+class DatePicker : public TQVBox
{
public:
DatePicker(TQWidget*, const TQDate&, Prefs* _prefs);
diff --git a/kicker/applets/clock/digital.ui b/kicker/applets/clock/digital.ui
index 256bca99b..ab90a6438 100644
--- a/kicker/applets/clock/digital.ui
+++ b/kicker/applets/clock/digital.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>DigitalWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>DigitalWidget</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>ButtonGroup2_3</cstring>
</property>
@@ -30,7 +30,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_DigitalShowDate</cstring>
</property>
@@ -41,7 +41,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_DigitalShowSeconds</cstring>
</property>
@@ -49,7 +49,7 @@
<string>Seco&amp;nds</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_DigitalShowDayOfWeek</cstring>
</property>
@@ -57,7 +57,7 @@
<string>Da&amp;y of week</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_DigitalBlink</cstring>
</property>
@@ -65,7 +65,7 @@
<string>Blin&amp;king dots</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_DigitalShowFrame</cstring>
</property>
@@ -83,7 +83,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -92,7 +92,7 @@
</spacer>
</hbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox1</cstring>
</property>
@@ -103,7 +103,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_DigitalLCDStyle</cstring>
</property>
@@ -114,7 +114,7 @@
<bool>false</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout14</cstring>
</property>
@@ -122,7 +122,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>Foreground_ColorL</cstring>
</property>
@@ -147,7 +147,7 @@
<string></string>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>backgroundDigitalLabel</cstring>
</property>
@@ -193,14 +193,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>110</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>Shadow_ColorL</cstring>
</property>
@@ -226,7 +226,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kicker/applets/clock/fuzzy.ui b/kicker/applets/clock/fuzzy.ui
index 04e910340..ebe6af9fc 100644
--- a/kicker/applets/clock/fuzzy.ui
+++ b/kicker/applets/clock/fuzzy.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>FuzzyWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>FuzzyWidget</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>GroupBox1</cstring>
</property>
@@ -42,7 +42,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_FuzzyShowDate</cstring>
</property>
@@ -53,7 +53,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_FuzzyShowDayOfWeek</cstring>
</property>
@@ -61,7 +61,7 @@
<string>Da&amp;y of week</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_FuzzyShowFrame</cstring>
</property>
@@ -79,7 +79,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -88,7 +88,7 @@
</spacer>
</hbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox2</cstring>
</property>
@@ -109,14 +109,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>30</height>
</size>
</property>
</spacer>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -124,7 +124,7 @@
<string>Font:</string>
</property>
</widget>
- <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
+ <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>layout11</cstring>
</property>
@@ -132,7 +132,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>TextLabel1_2_3_4_3</cstring>
</property>
@@ -153,14 +153,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>51</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>TextLabel1_4_3_2</cstring>
</property>
@@ -189,7 +189,7 @@
</widget>
</grid>
</widget>
- <widget class="QLayoutWidget" row="0" column="2">
+ <widget class="TQLayoutWidget" row="0" column="2">
<property name="name">
<cstring>Layout7_3</cstring>
</property>
@@ -197,7 +197,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>TextLabel4_3</cstring>
</property>
@@ -205,7 +205,7 @@
<string>Low</string>
</property>
</widget>
- <widget class="QSlider">
+ <widget class="TQSlider">
<property name="name">
<cstring>kcfg_Fuzzyness</cstring>
</property>
@@ -231,7 +231,7 @@
<number>1</number>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>TextLabel5_3</cstring>
</property>
@@ -241,7 +241,7 @@
</widget>
</hbox>
</widget>
- <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>TextLabel3_3</cstring>
</property>
diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui
index 215aa5433..53e9c80cd 100644
--- a/kicker/applets/clock/settings.ui
+++ b/kicker/applets/clock/settings.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>SettingsWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>SettingsWidget</cstring>
</property>
@@ -19,11 +19,11 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QTabWidget">
+ <widget class="TQTabWidget">
<property name="name">
<cstring>tabs</cstring>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -34,7 +34,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout14</cstring>
</property>
@@ -42,7 +42,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>TextLabel1</cstring>
</property>
@@ -59,7 +59,7 @@
<cstring>clockCombo</cstring>
</property>
</widget>
- <widget class="QComboBox">
+ <widget class="TQComboBox">
<item>
<property name="text">
<string>Plain Clock</string>
@@ -102,7 +102,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -111,14 +111,14 @@
</spacer>
</hbox>
</widget>
- <widget class="QWidgetStack">
+ <widget class="TQWidgetStack">
<property name="name">
<cstring>widgetStack</cstring>
</property>
<property name="lineWidth">
<number>0</number>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -132,7 +132,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>ButtonGroup2_3_2_2</cstring>
</property>
@@ -143,7 +143,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_PlainShowDate</cstring>
</property>
@@ -154,7 +154,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_PlainShowSeconds</cstring>
</property>
@@ -162,7 +162,7 @@
<string>&amp;Seconds</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_PlainShowDayOfWeek</cstring>
</property>
@@ -170,7 +170,7 @@
<string>Da&amp;y of week</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_PlainShowFrame</cstring>
</property>
@@ -188,7 +188,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -197,7 +197,7 @@
</spacer>
</hbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox2</cstring>
</property>
@@ -208,7 +208,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>TextLabel1_3_3_2</cstring>
</property>
@@ -224,7 +224,7 @@
<string>Font:</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>TextLabel1_2_3_4_3_2</cstring>
</property>
@@ -260,7 +260,7 @@
<string></string>
</property>
</widget>
- <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>TextLabel1_4_3_2_2</cstring>
</property>
@@ -284,7 +284,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>230</width>
<height>20</height>
@@ -306,7 +306,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -318,7 +318,7 @@
</vbox>
</widget>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>dateBox</cstring>
</property>
@@ -337,7 +337,7 @@
<string></string>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1_3</cstring>
</property>
@@ -353,7 +353,7 @@
<string></string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -371,14 +371,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>343</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
+ <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>layout2</cstring>
</property>
@@ -386,7 +386,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel4</cstring>
</property>
@@ -421,7 +421,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>100</height>
@@ -430,7 +430,7 @@
</spacer>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp
index 320d84b4c..48cce1ccb 100644
--- a/kicker/applets/clock/zone.cpp
+++ b/kicker/applets/clock/zone.cpp
@@ -105,7 +105,7 @@ void Zone::readZoneList(KListView *listView )
if (!comment.isEmpty())
comment = i18n(comment.utf8());
- const TQStringList KontCity = TQStringList::split("/", i18n(tzName.utf8()).replace("_", " "));
+ const TQStringList KontCity = TQStringList::split("/", i18n(tzName.utf8()).tqreplace("_", " "));
TQListViewItem* Kontinent = KontinentMap[KontCity[0]];
if (!Kontinent) {
KontinentMap[KontCity[0]] = new TQListViewItem(listView, KontCity[0]);
@@ -117,7 +117,7 @@ void Zone::readZoneList(KListView *listView )
li->setText(1, comment);
li->setText(2, tzName); /* store complete path in ListView */
- if (_remotezonelist.findIndex(tzName) != -1)
+ if (_remotezonelist.tqfindIndex(tzName) != -1)
li->setOn(true);
// locate the flag from /l10n/%1/flag.png
@@ -151,7 +151,7 @@ void Zone::getSelectedZonelist(KListView *listView)
root = root->nextSibling();
continue;
}
- root = root->parent();
+ root = root->tqparent();
if (root)
root = root->nextSibling();
}