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

---
 kmobile/devices/gnokii/gnokii_mobile.cpp |  4 ++--
 kmobile/devices/gnokii/gnokiiconfigui.ui |  6 +++---
 kmobile/kmobile_selectiondialog.ui       |  2 +-
 kmobile/kmobileclient.cpp                |  2 +-
 kmobile/kmobiledevice.h                  | 12 ++++++------
 5 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'kmobile')

diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp
index bd35ddf8b..c4f31579b 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.cpp
+++ b/kmobile/devices/gnokii/gnokii_mobile.cpp
@@ -282,7 +282,7 @@ static gn_error read_phone_memstat( gn_memory_type memtype, gn_memory_status *me
 	memset(memstat, 0, sizeof(*memstat));
 	memstat->memory_type = memtype;
 	data.memory_status = memstat;
-	error = gn_sm_functions(GN_OP_GetMemorytqStatus, &data, &state);
+	error = gn_sm_functions(GN_OP_GetMemoryStatus, &data, &state);
 	GNOKII_CHECK_ERROR(error);
 	if (error != GN_ERR_NONE) {
 		switch (memtype) {
@@ -403,7 +403,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt
   // evaluate timestamp (ignore timezone)
   TQDateTime datetime;
   if (entry.date.year<1998)
-	datetime = TQDateTime::tqcurrentDateTime();
+	datetime = TQDateTime::currentDateTime();
   else
 	datetime = TQDateTime( TQDate(entry.date.year, entry.date.month, entry.date.day), 
 			  TQTime(entry.date.hour, entry.date.minute, entry.date.second) );
diff --git a/kmobile/devices/gnokii/gnokiiconfigui.ui b/kmobile/devices/gnokii/gnokiiconfigui.ui
index d550eb9a2..255b6fb67 100644
--- a/kmobile/devices/gnokii/gnokiiconfigui.ui
+++ b/kmobile/devices/gnokii/gnokiiconfigui.ui
@@ -66,7 +66,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -140,7 +140,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>140</height>
@@ -199,7 +199,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>41</width>
                                     <height>0</height>
diff --git a/kmobile/kmobile_selectiondialog.ui b/kmobile/kmobile_selectiondialog.ui
index 7088a6ff0..621ec83df 100644
--- a/kmobile/kmobile_selectiondialog.ui
+++ b/kmobile/kmobile_selectiondialog.ui
@@ -86,7 +86,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>181</width>
                             <height>41</height>
diff --git a/kmobile/kmobileclient.cpp b/kmobile/kmobileclient.cpp
index f587ee2c7..948bd91be 100644
--- a/kmobile/kmobileclient.cpp
+++ b/kmobile/kmobileclient.cpp
@@ -126,7 +126,7 @@ TQStringList KMobileClient::tqdeviceNames()
 {
   if (!isKMobileAvailable())
 	return TQStringList();
-  RETURN_TYPE( "tqdeviceNames()", TQString::tqfromLatin1(""), TQStringList );
+  RETURN_TYPE( "tqdeviceNames()", TQString::fromLatin1(""), TQStringList );
 }
 
 void KMobileClient::removeDevice( TQString tqdeviceName )
diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h
index 5cf19092d..d5d21200c 100644
--- a/kmobile/kmobiledevice.h
+++ b/kmobile/kmobiledevice.h
@@ -352,10 +352,10 @@ signals:
      * KIO::AuthInfo authInfo;
      * if ( openPassDlg( authInfo ) )
      * {
-     *    kdDebug() << TQString::tqfromLatin1("User: ")
+     *    kdDebug() << TQString::fromLatin1("User: ")
      *              << authInfo.username << endl;
-     *    kdDebug() << TQString::tqfromLatin1("Password: ")
-     *              << TQString::tqfromLatin1("Not displayed here!") << endl;
+     *    kdDebug() << TQString::fromLatin1("Password: ")
+     *              << TQString::fromLatin1("Not displayed here!") << endl;
      * }
      * </pre>
      *
@@ -369,10 +369,10 @@ signals:
      * TQString errorMsg = "You entered an incorrect password.";
      * if ( openPassDlg( authInfo, errorMsg ) )
      * {
-     *    kdDebug() << TQString::tqfromLatin1("User: ")
+     *    kdDebug() << TQString::fromLatin1("User: ")
      *              << authInfo.username << endl;
-     *    kdDebug() << TQString::tqfromLatin1("Password: ")
-     *              << TQString::tqfromLatin1("Not displayed here!") << endl;
+     *    kdDebug() << TQString::fromLatin1("Password: ")
+     *              << TQString::fromLatin1("Not displayed here!") << endl;
      * }
      * </pre>
      *
-- 
cgit v1.2.1