From 75112ed8e227f656f98523b7ffdad5422d9a6f11 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 19 Dec 2011 11:52:34 -0600
Subject: Remove additional unneeded tq method conversions

---
 kicker-applets/kbinaryclock/kbinaryclock.cpp | 24 ++++++++++++------------
 kicker-applets/kbinaryclock/settings.ui      |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'kicker-applets/kbinaryclock')

diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp
index 6acd08b..f46b4a0 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.cpp
+++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp
@@ -68,7 +68,7 @@ SettingsImp::SettingsImp(TQWidget* parent, const char* name, WFlags fl): Setting
  * Update the preview
  */
 void SettingsImp::updatePreview(){
-	int tqshape = Shape_Circular->isChecked() ? Prefs::EnumShape::Circular : Prefs::EnumShape::Rectangular;
+	int shape = Shape_Circular->isChecked() ? Prefs::EnumShape::Circular : Prefs::EnumShape::Rectangular;
 	int look = KLed::Raised;
 	look = Look_Flat->isChecked() ? Prefs::EnumLook::Flat : look;
 	look = Look_Sunken->isChecked() ? Prefs::EnumLook::Sunken : look;
@@ -84,12 +84,12 @@ void SettingsImp::updatePreview(){
 	kLed5->setBackgroundColor(backgroundColor);
 	kLed6->setBackgroundColor(backgroundColor);
 
-	kLed1->setShape((KLed::Shape)tqshape);
-	kLed2->setShape((KLed::Shape)tqshape);
-	kLed3->setShape((KLed::Shape)tqshape);
-	kLed4->setShape((KLed::Shape)tqshape);
-	kLed5->setShape((KLed::Shape)tqshape);
-	kLed6->setShape((KLed::Shape)tqshape);
+	kLed1->setShape((KLed::Shape)shape);
+	kLed2->setShape((KLed::Shape)shape);
+	kLed3->setShape((KLed::Shape)shape);
+	kLed4->setShape((KLed::Shape)shape);
+	kLed5->setShape((KLed::Shape)shape);
+	kLed6->setShape((KLed::Shape)shape);
 
 	kLed1->setColor(color);
 	kLed2->setColor(color);
@@ -173,7 +173,7 @@ void KBinaryClock::resizeEvent( TQResizeEvent *e ) {
  * Load the settings for the clock.
  */
 void KBinaryClock::loadSettings(){
-	int tqshape = prefs->shape();
+	int shape = prefs->shape();
 	int look = prefs->look();
 	TQColor color = prefs->color();
 
@@ -197,7 +197,7 @@ void KBinaryClock::loadSettings(){
 	}
 	for(int i=0; i < 4; i++){
 		for(int j=0; j < ledWidth;j++){
-			ledMatrix[j][i]->setShape((KLed::Shape)tqshape);
+			ledMatrix[j][i]->setShape((KLed::Shape)shape);
 			ledMatrix[j][i]->setColor(color);
 			ledMatrix[j][i]->setLook((KLed::Look)look);
 			ledMatrix[j][i]->setDarkFactor(darkFactor);
@@ -329,8 +329,8 @@ void KBinaryClock::openContextMenu() {
 		proc << locate("exe", "tdesu");
 		proc << "--nonewdcop";
 		proc << TQString("%1 clock --lang %2")
-				.tqarg(locate("exe", "kcmshell"))
-				.tqarg(KGlobal::locale()->language());
+				.arg(locate("exe", "kcmshell"))
+				.arg(KGlobal::locale()->language());
 		proc.start(KProcess::DontCare);
 		break;
 	case 104:
@@ -405,7 +405,7 @@ ClockAppletToolTip::ClockAppletToolTip( KBinaryClock *clock ) : TQToolTip( clock
 
 void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ )
 {
-	tip(m_clock->tqgeometry(), KGlobal::locale()->formatDate(TQDateTime::currentDateTime().date(), false));
+	tip(m_clock->geometry(), 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 2ebb466..7f21dec 100644
--- a/kicker-applets/kbinaryclock/settings.ui
+++ b/kicker-applets/kbinaryclock/settings.ui
@@ -110,7 +110,7 @@
                     <property name="text">
                         <string>Dark</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
-- 
cgit v1.2.1