From 495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 20:16:47 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kicker/applets/clock/analog.ui | 16 ++++---- kicker/applets/clock/clock.cpp | 80 ++++++++++++++++++++-------------------- kicker/applets/clock/clock.h | 4 +- kicker/applets/clock/digital.ui | 14 +++---- kicker/applets/clock/fuzzy.ui | 14 +++---- kicker/applets/clock/settings.ui | 22 +++++------ kicker/applets/clock/zone.cpp | 2 +- 7 files changed, 76 insertions(+), 76 deletions(-) (limited to 'kicker/applets/clock') diff --git a/kicker/applets/clock/analog.ui b/kicker/applets/clock/analog.ui index 4a20312ec..db20618b1 100644 --- a/kicker/applets/clock/analog.ui +++ b/kicker/applets/clock/analog.ui @@ -4,7 +4,7 @@ AnalogWidget - + 0 0 @@ -75,7 +75,7 @@ Expanding - + 40 20 @@ -97,7 +97,7 @@ - layout9 + tqlayout9 @@ -149,7 +149,7 @@ Expanding - + 16 20 @@ -241,7 +241,7 @@ Expanding - + 310 20 @@ -269,7 +269,7 @@ Expanding - + 20 50 @@ -334,8 +334,8 @@ kdialog.h kfontrequester.h - - + + kcolorbutton.h kcolorbutton.h diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index 26f1ae4c0..096b0301b 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -134,7 +134,7 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent, connect(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()); } @@ -837,8 +837,8 @@ void FuzzyClock::drawContents(TQPainter *p) // 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.at(0).upper())); } } else if (_prefs->fuzzyness() == 3) { newTimeStr = dayTime[_time.hour() / 3]; @@ -902,8 +902,8 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions, _disableCalendar(false), _clock(0), _timer(new TQTimer(this, "ClockApplet::_timer")), - m_layoutTimer(new TQTimer(this, "m_layoutTimer")), - m_layoutDelay(0), + m_tqlayoutTimer(new TQTimer(this, "m_tqlayoutTimer")), + m_tqlayoutDelay(0), m_followBackgroundSetting(true), m_dateFollowBackgroundSetting(true), TZoffset(0), @@ -919,16 +919,16 @@ 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 - connect(m_layoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fixupLayout())); + connect(m_tqlayoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fixupLayout())); connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdate())); connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(globalPaletteChange())); @@ -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,10 +1127,10 @@ int ClockApplet::heightForWidth(int w) const // display on panel that is too narrow and then they made it wider const_cast(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 + // if we're too wide to fit, tqreplace the first non-digit from the end with a space int p = dateStr.findRev(TQRegExp("[^0-9]")); if (p > 0) { @@ -1138,13 +1138,13 @@ int ClockApplet::heightForWidth(int w) const } } - 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); @@ -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) { @@ -1552,7 +1552,7 @@ void ClockApplet::aboutToShowContextMenu() menu->insertTitle( SmallIcon( "clock" ), i18n( "Clock" ) ); KLocale *loc = KGlobal::locale(); - TQDateTime dt = TQDateTime::currentDateTime(); + TQDateTime dt = TQDateTime::tqcurrentDateTime(); dt = dt.addSecs(TZoffset); KPopupMenu *copyMenu = new KPopupMenu( menu ); @@ -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); @@ -1626,7 +1626,7 @@ TQTime ClockApplet::clockGetTime() TQDate ClockApplet::clockGetDate() { - return TQDateTime::currentDateTime().addSecs(TZoffset).date(); + return 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() @@ -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.find('/') + 1).tqreplace("_", " ")); _date->setShown(true); } else @@ -1727,8 +1727,8 @@ void ClockApplet::updateDateLabel(bool reLayout) _calendar->setDate(_lastDate); } - m_layoutTimer->stop(); - m_layoutTimer->start(m_layoutDelay, true); + m_tqlayoutTimer->stop(); + m_tqlayoutTimer->start(m_tqlayoutDelay, true); } } @@ -1748,7 +1748,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data) if (!activeZone.isEmpty()) { activeZone = i18n(activeZone.utf8()); - data.subtext.append("
").append(activeZone.mid(activeZone.find('/') + 1).replace("_", " ")); + data.subtext.append("
").append(activeZone.mid(activeZone.find('/') + 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.find('/') + 1).tqreplace("_", " "); data.message += " " + _time + "
" + _date; } else @@ -1782,7 +1782,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data) } else { - data.subtext += "" + m_zone.mid(m_zone.find('/') + 1).replace("_", " ") + ""; + data.subtext += "" + m_zone.mid(m_zone.find('/') + 1).tqreplace("_", " ") + ""; } data.subtext += " " + _time + ", " + _date + "
"; } @@ -1798,7 +1798,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data) void ClockApplet::fixupLayout() { - m_layoutDelay = 0; + m_tqlayoutDelay = 0; // ensure we have the right widget line up in horizontal mode // when we are showing date beside the clock @@ -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(TQDateTime::tqcurrentDateTime().addSecs(m_clock->TZoffset)); } else { @@ -1863,7 +1863,7 @@ void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ ) tipText += "\n" + i18n("Showing time for %1").arg(i18n(m_clock->timezones()->zone().utf8()), false); } - tip(m_clock->geometry(), tipText); + tip(m_clock->tqgeometry(), tipText); } //************************************************************ diff --git a/kicker/applets/clock/clock.h b/kicker/applets/clock/clock.h index 144fb50c6..753598e18 100644 --- a/kicker/applets/clock/clock.h +++ b/kicker/applets/clock/clock.h @@ -326,8 +326,8 @@ class ClockApplet : public KPanelApplet, public KickerTip::Client, public DCOPOb TQLabel *_dayOfWeek; TQDate _lastDate; TQTimer *_timer; - TQTimer *m_layoutTimer; - int m_layoutDelay; + TQTimer *m_tqlayoutTimer; + int m_tqlayoutDelay; bool m_followBackgroundSetting; bool m_dateFollowBackgroundSetting; int TZoffset; diff --git a/kicker/applets/clock/digital.ui b/kicker/applets/clock/digital.ui index 256bca99b..f63b783c1 100644 --- a/kicker/applets/clock/digital.ui +++ b/kicker/applets/clock/digital.ui @@ -4,7 +4,7 @@ DigitalWidget - + 0 0 @@ -83,7 +83,7 @@ Expanding - + 20 20 @@ -116,7 +116,7 @@ - layout14 + tqlayout14 @@ -193,7 +193,7 @@ Expanding - + 110 20 @@ -226,7 +226,7 @@ Expanding - + 20 20 @@ -295,8 +295,8 @@ kcfg_DigitalLCDStyle_stateChanged( int ) - - + + kcolorbutton.h kcolorbutton.h diff --git a/kicker/applets/clock/fuzzy.ui b/kicker/applets/clock/fuzzy.ui index 04e910340..e67bf0c7a 100644 --- a/kicker/applets/clock/fuzzy.ui +++ b/kicker/applets/clock/fuzzy.ui @@ -4,7 +4,7 @@ FuzzyWidget - + 0 0 @@ -79,7 +79,7 @@ Expanding - + 40 20 @@ -109,7 +109,7 @@ Expanding - + 20 30 @@ -126,7 +126,7 @@ - layout11 + tqlayout11 @@ -153,7 +153,7 @@ Expanding - + 51 20 @@ -277,8 +277,8 @@ kdialog.h kfontrequester.h - - + + kcolorbutton.h kcolorbutton.h diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui index 215aa5433..02baca77b 100644 --- a/kicker/applets/clock/settings.ui +++ b/kicker/applets/clock/settings.ui @@ -4,7 +4,7 @@ SettingsWidget - + 0 0 @@ -36,7 +36,7 @@ - layout14 + tqlayout14 @@ -102,7 +102,7 @@ Expanding - + 20 20 @@ -188,7 +188,7 @@ Expanding - + 20 20 @@ -284,7 +284,7 @@ Expanding - + 230 20 @@ -306,7 +306,7 @@ Expanding - + 20 20 @@ -371,7 +371,7 @@ Expanding - + 343 20 @@ -380,7 +380,7 @@ - layout2 + tqlayout2 @@ -421,7 +421,7 @@ Expanding - + 20 100 @@ -501,8 +501,8 @@ configureType() - - + + kcolorbutton.h kcolorbutton.h diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp index 320d84b4c..b44ba0de5 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]); -- cgit v1.2.1