From 5fb78f4b68672906005b059e7e5066c702bc5c90 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:32:31 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- .../timecontrol/timecontrol-configuration-ui.ui | 28 +++++++++++----------- .../timecontrol/timecontrol-configuration.cpp | 2 +- kradio3/plugins/timecontrol/timecontrol.cpp | 6 ++--- 3 files changed, 18 insertions(+), 18 deletions(-) (limited to 'kradio3/plugins/timecontrol') diff --git a/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui b/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui index 15ecc20..e592ea1 100644 --- a/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui +++ b/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui @@ -18,7 +18,7 @@ - tqlayout13 + layout13 @@ -62,7 +62,7 @@ Expanding - + 40 20 @@ -87,7 +87,7 @@ - tqlayout15 + layout15 @@ -95,7 +95,7 @@ - tqlayout14 + layout14 @@ -150,7 +150,7 @@ - tqlayout17 + layout17 @@ -158,7 +158,7 @@ - tqlayout28 + layout28 @@ -166,7 +166,7 @@ - tqlayout27 + layout27 @@ -189,7 +189,7 @@ - tqlayout28 + layout28 @@ -212,7 +212,7 @@ - tqlayout29 + layout29 @@ -249,7 +249,7 @@ - tqlayout16 + layout16 @@ -273,7 +273,7 @@ Expanding - + 20 100 @@ -348,7 +348,7 @@ - tqlayout20 + layout20 @@ -358,7 +358,7 @@ pixmapAlarmStation - + 20 20 @@ -378,7 +378,7 @@ Expanding - + 150 20 diff --git a/kradio3/plugins/timecontrol/timecontrol-configuration.cpp b/kradio3/plugins/timecontrol/timecontrol-configuration.cpp index 31ec3db..c72aa5e 100644 --- a/kradio3/plugins/timecontrol/timecontrol-configuration.cpp +++ b/kradio3/plugins/timecontrol/timecontrol-configuration.cpp @@ -371,7 +371,7 @@ void TimeControlConfiguration::slotAlarmSelectChanged(int idx) void TimeControlConfiguration::slotNewAlarm() { - TQDateTime dt(TQDateTime::tqcurrentDateTime()); + TQDateTime dt(TQDateTime::currentDateTime()); Alarm a(dt, false, false); alarms.push_back(a); listAlarms->insertItem(a.alarmTime().toString()); diff --git a/kradio3/plugins/timecontrol/timecontrol.cpp b/kradio3/plugins/timecontrol/timecontrol.cpp index 276e602..e5f99cf 100644 --- a/kradio3/plugins/timecontrol/timecontrol.cpp +++ b/kradio3/plugins/timecontrol/timecontrol.cpp @@ -102,7 +102,7 @@ bool TimeControl::setCountdownSeconds(int n) bool TimeControl::startCountdown() { - m_countdownEnd = TQDateTime::tqcurrentDateTime().addSecs(m_countdownSeconds); + m_countdownEnd = TQDateTime::currentDateTime().addSecs(m_countdownSeconds); m_countdownTimer.start(m_countdownSeconds * 1000, true); notifyCountdownStarted(getCountdownEnd()); @@ -134,7 +134,7 @@ TQDateTime TimeControl::getNextAlarmTime() const const Alarm *TimeControl::getNextAlarm () const { - TQDateTime now = TQDateTime::tqcurrentDateTime(), + TQDateTime now = TQDateTime::currentDateTime(), next; const Alarm *retval = NULL; @@ -180,7 +180,7 @@ void TimeControl::slotQTimerAlarmTimeout() notifyAlarm(*m_waitingFor); } - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); Alarm const *n = getNextAlarm(); TQDateTime na = getNextAlarmTime(); -- cgit v1.2.1