From 632b7d40cf87562965abb5c7dffc1bae509bad2c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 19 Dec 2011 11:59:52 -0600
Subject: Remove additional unneeded tq method conversions (cherry picked from
 commit 7ea89afa119615e547323a7a482ea7fef8e67029)

---
 kmilo/asus/asus.cpp                            | 2 +-
 kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui | 8 ++++----
 kmilo/kmilo_kvaio/kvaio.cpp                    | 4 ++--
 kmilo/kmilod/defaultskin.cpp                   | 2 +-
 kmilo/kmilod/defaultwidget.ui                  | 4 ++--
 kmilo/powerbook2/pb_monitor.cpp                | 2 +-
 kmilo/thinkpad/kcmthinkpad/main.cpp            | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'kmilo')

diff --git a/kmilo/asus/asus.cpp b/kmilo/asus/asus.cpp
index a83235d..1af8780 100644
--- a/kmilo/asus/asus.cpp
+++ b/kmilo/asus/asus.cpp
@@ -183,7 +183,7 @@ bool AsusMonitor::readProc(asus_state_struct* asus_state)
 
 int AsusMonitor::readProcEntry(const TQString &name)
 {
-	TQFile f(TQString("/proc/acpi/asus/%1").tqarg(name).local8Bit());
+	TQFile f(TQString("/proc/acpi/asus/%1").arg(name).local8Bit());
 
 	if (f.open(IO_ReadOnly))
 	{
diff --git a/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui b/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui
index c9ad68b..27778ef 100644
--- a/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui
+++ b/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui
@@ -71,7 +71,7 @@
                             <property name="text">
                                 <string>Remaining battery capacity:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -109,7 +109,7 @@
                             <property name="text">
                                 <string>AC</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignLeft</set>
                             </property>
                         </widget>
@@ -150,7 +150,7 @@
                             <property name="text">
                                 <string>Bat 1</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignLeft</set>
                             </property>
                         </widget>
@@ -186,7 +186,7 @@
                             <property name="text">
                                 <string>Bat 2</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignLeft</set>
                             </property>
                         </widget>
diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp
index ff97087..437d188 100644
--- a/kmilo/kmilo_kvaio/kvaio.cpp
+++ b/kmilo/kmilo_kvaio/kvaio.cpp
@@ -397,7 +397,7 @@ bool KVaio::showBatteryStatus ( bool force )
 	    case 3:
 	    case 2:
 	    case 1:
-		stream << i18n("Caution: Battery is Almost Empty (%1% remaining).").tqarg(remaining);
+		stream << i18n("Caution: Battery is Almost Empty (%1% remaining).").arg(remaining);
 		break;
 	    case 0:
 		stream << i18n("Alert: Battery is Empty!");
@@ -406,7 +406,7 @@ bool KVaio::showBatteryStatus ( bool force )
                 stream << i18n("No Battery Inserted.");
                 break;
 	    default:
-		stream << i18n("Remaining Battery Capacity: %1%").tqarg( remaining );
+		stream << i18n("Remaining Battery Capacity: %1%").arg( remaining );
 	};
 
 	// show a message if the battery status changed by more then 10% or on startup
diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp
index d8659aa..ccf1730 100644
--- a/kmilo/kmilod/defaultskin.cpp
+++ b/kmilo/kmilod/defaultskin.cpp
@@ -100,7 +100,7 @@ void DefaultSkin::show() {
 #if KDE_IS_VERSION(3,1,90)
 	TQRect r =  KGlobalSettings::splashScreenDesktopGeometry();
 #else
-	TQRect r = TQApplication::desktop()->tqgeometry();
+	TQRect r = TQApplication::desktop()->geometry();
 #endif
 	//	_label->resize(_label->minimumSizeHint());
 	//	_widget->resize(_label->minimumSizeHint());
diff --git a/kmilo/kmilod/defaultwidget.ui b/kmilo/kmilod/defaultwidget.ui
index c987ed3..77bc3f3 100644
--- a/kmilo/kmilod/defaultwidget.ui
+++ b/kmilo/kmilod/defaultwidget.ui
@@ -33,7 +33,7 @@ Released under the terms of the GNU GPL.</comment>
                         <property name="text">
                             <string></string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
@@ -57,7 +57,7 @@ Released under the terms of the GNU GPL.</comment>
                         <property name="text">
                             <string></string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
diff --git a/kmilo/powerbook2/pb_monitor.cpp b/kmilo/powerbook2/pb_monitor.cpp
index cf3b927..313a32d 100644
--- a/kmilo/powerbook2/pb_monitor.cpp
+++ b/kmilo/powerbook2/pb_monitor.cpp
@@ -98,7 +98,7 @@ Monitor::DisplayType PowerBookMonitor::poll()
 			{
 				rc = Monitor::Tap;
 				TQString marg =  tpmodes[ tag->data & 3 ];
-				m_message = i18n( "Operating mode set to: %1." ).tqarg( marg );
+				m_message = i18n( "Operating mode set to: %1." ).arg( marg );
 			}
 			break;
 		default:
diff --git a/kmilo/thinkpad/kcmthinkpad/main.cpp b/kmilo/thinkpad/kcmthinkpad/main.cpp
index 7ad2b08..2d51778 100644
--- a/kmilo/thinkpad/kcmthinkpad/main.cpp
+++ b/kmilo/thinkpad/kcmthinkpad/main.cpp
@@ -116,7 +116,7 @@ KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const T
 							  "R30/R31 models and to use a custom volume "
 							  "change step, set the nvram device to world "
 							  "writeable: <em>chmod 666 "
-							  "/dev/nvram</em>").tqarg(m_nvramFile));
+							  "/dev/nvram</em>").arg(m_nvramFile));
 #endif
 	} else {
 		m_KCMThinkpadGeneral->tlOff->setText(i18n("Thinkpad Buttons KMilo Plugin Ready For Configuration"));
-- 
cgit v1.2.3