Rename a number of old tq methods that are no longer tq specific

3 files changed, 18 insertions, 18 deletions

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 @@
         </property>
         <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout13</cstring>
+                <cstring>layout13</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -62,7 +62,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -87,7 +87,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout15</cstring>
+                <cstring>layout15</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -95,7 +95,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout14</cstring>
+                        <cstring>layout14</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -150,7 +150,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>tqlayout17</cstring>
+                <cstring>layout17</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -158,7 +158,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout28</cstring>
+                        <cstring>layout28</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -166,7 +166,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout27</cstring>
+                                <cstring>layout27</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -189,7 +189,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout28</cstring>
+                                <cstring>layout28</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -212,7 +212,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout29</cstring>
+                                <cstring>layout29</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -249,7 +249,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout16</cstring>
+                        <cstring>layout16</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -273,7 +273,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>100</height>
@@ -348,7 +348,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout20</cstring>
+                        <cstring>layout20</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -358,7 +358,7 @@
                             <property name="name">
                                 <cstring>pixmapAlarmStation</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -378,7 +378,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>150</width>
                                     <height>20</height>
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();