From 0669339d48f65fc18388faefe54b239591d4705f Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 18 Dec 2011 18:28:11 -0600
Subject: Rename old tq methods that no longer need a unique name (cherry
 picked from commit b88830e9111dc4375bc1461c3f7b3e7b3e73f733)

---
 kicker-applets/kbinaryclock/kbinaryclock.cpp | 10 +++++-----
 kicker-applets/kbinaryclock/settings.ui      | 22 +++++++++++-----------
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'kicker-applets/kbinaryclock')

diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp
index 2aaec6e..1e08d2f 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.cpp
+++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp
@@ -290,7 +290,7 @@ void KBinaryClock::openContextMenu() {
 		menu->insertTitle( SmallIcon( "clock" ), i18n( "KBinaryClock" ) );
 
 		KLocale *loc = KGlobal::locale();
-		TQDateTime dt = TQDateTime::tqcurrentDateTime();
+		TQDateTime dt = TQDateTime::currentDateTime();
 
 		KPopupMenu *copyMenu = new KPopupMenu( menu );
 		copyMenu->insertItem(loc->formatDateTime(dt), 201);
@@ -361,15 +361,15 @@ void KBinaryClock::toggleCalendar()
 	if (_calendar || _disableCalendar){
 		return;
 	}
-	_calendar = new DatePicker(this, TQDateTime::tqcurrentDateTime().date());
+	_calendar = new DatePicker(this, TQDateTime::currentDateTime().date());
 	connect( _calendar, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotCalendarDeleted() ));
 
 	// some extra spacing is included if aligned on a desktop edge
 	TQPoint c = mapToGlobal(TQPoint(0,0));
 
-	int w = _calendar->tqsizeHint().width() + 28;
+	int w = _calendar->sizeHint().width() + 28;
 															// Added 28 px. to size poperly as said in API
-	int h = _calendar->tqsizeHint().height();
+	int h = _calendar->sizeHint().height();
 
 	switch (position()) {
 	case KPanelApplet::pLeft:	c.setX(c.x()+width()+2);	break;
@@ -405,7 +405,7 @@ ClockAppletToolTip::ClockAppletToolTip( KBinaryClock *clock ) : TQToolTip( clock
 
 void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ )
 {
-	tip(m_clock->tqgeometry(), KGlobal::locale()->formatDate(TQDateTime::tqcurrentDateTime().date(), false));
+	tip(m_clock->tqgeometry(), KGlobal::locale()->formatDate(TQDateTime::currentDateTime().date(), false));
 }
 
 #include "kbinaryclock.moc"
diff --git a/kicker-applets/kbinaryclock/settings.ui b/kicker-applets/kbinaryclock/settings.ui
index 321f913..2ebb466 100644
--- a/kicker-applets/kbinaryclock/settings.ui
+++ b/kicker-applets/kbinaryclock/settings.ui
@@ -96,7 +96,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>21</width>
                             <height>20</height>
@@ -169,7 +169,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -287,7 +287,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -332,7 +332,7 @@
                                     <property name="name">
                                         <cstring>kLed1</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -346,7 +346,7 @@
                                     <property name="name">
                                         <cstring>kLed2</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -357,7 +357,7 @@
                                     <property name="name">
                                         <cstring>kLed4</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -368,7 +368,7 @@
                                     <property name="name">
                                         <cstring>kLed3</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -382,7 +382,7 @@
                                     <property name="name">
                                         <cstring>kLed6</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -396,7 +396,7 @@
                                     <property name="name">
                                         <cstring>kLed5</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -415,7 +415,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>20</height>
@@ -434,7 +434,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>84</height>
-- 
cgit v1.2.1