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

5 files changed, 16 insertions, 16 deletions

diff --git a/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui b/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui
index 4a1b81f..ba3b204 100644
--- a/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui
+++ b/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui
@@ -141,7 +141,7 @@
                     <property name="text">
                         <string>If you let KPilot sync the handheld's custom fields as custom fields on the PC, you can change the values here. Note, however, that for all other settings the values entered here will have no effect.</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -193,7 +193,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>41</width>
                             <height>20</height>
@@ -210,7 +210,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>31</width>
                             <height>20</height>
@@ -225,7 +225,7 @@
                         <string>These values indicate the state of the record for KPilot, and connect an entry on the handheld with an entry on the PC.
 Do NOT change these values: doing so will almost certainly result in data loss when you next do a sync.</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -263,7 +263,7 @@ Do NOT change these values: doing so will almost certainly result in data loss w
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>210</height>
diff --git a/conduits/abbrowserconduit/abbrowser-conduit.cc b/conduits/abbrowserconduit/abbrowser-conduit.cc
index 59dc242..0c7b6f0 100644
--- a/conduits/abbrowserconduit/abbrowser-conduit.cc
+++ b/conduits/abbrowserconduit/abbrowser-conduit.cc
@@ -34,7 +34,7 @@
 #include "options.h"
 
 #include <tqtimer.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqfile.h>
 #include <tqregexp.h>
 
@@ -291,7 +291,7 @@ bool AbbrowserConduit::_loadAddressBook()
 				emit logError(i18n("You chose to sync with the file \"%1\", which "
 							"cannot be opened. Please make sure to supply a "
 							"valid file name in the conduit's configuration dialog. "
-							"Aborting the conduit.").tqarg(AbbrowserSettings::fileName()));
+							"Aborting the conduit.").arg(AbbrowserSettings::fileName()));
 				KIO::NetAccess::removeTempFile(fABookFile);
 				stopTickle();
 				return false;
@@ -395,7 +395,7 @@ bool AbbrowserConduit::_saveAddressBook()
 			if(!KIO::NetAccess::upload(fABookFile, AbbrowserSettings::fileName(), 0L)) {
 				emit logError(i18n("An error occurred while uploading \"%1\". You can try to upload "
 					"the temporary local file \"%2\" manually")
-					.tqarg(AbbrowserSettings::fileName()).tqarg(fABookFile));
+					.arg(AbbrowserSettings::fileName()).arg(fABookFile));
 			}
 			else {
 				KIO::NetAccess::removeTempFile(fABookFile);
diff --git a/conduits/abbrowserconduit/kaddressbookConduit.ui b/conduits/abbrowserconduit/kaddressbookConduit.ui
index d2b42b7..e942d8e 100644
--- a/conduits/abbrowserconduit/kaddressbookConduit.ui
+++ b/conduits/abbrowserconduit/kaddressbookConduit.ui
@@ -51,7 +51,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>50</height>
@@ -225,7 +225,7 @@
                                 <property name="text">
                                     <string>&lt;p&gt;Select the default action if an event was modified on both sides here. &lt;/p&gt;</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>WordBreak|AlignJustify|AlignVCenter</set>
                                 </property>
                             </widget>
@@ -241,7 +241,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>41</height>
@@ -402,7 +402,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>0</width>
                                 <height>20</height>
@@ -710,7 +710,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>31</width>
                                 <height>30</height>
diff --git a/conduits/abbrowserconduit/resolutionDialog.cc b/conduits/abbrowserconduit/resolutionDialog.cc
index 34e1fb4..89b18f4 100644
--- a/conduits/abbrowserconduit/resolutionDialog.cc
+++ b/conduits/abbrowserconduit/resolutionDialog.cc
@@ -159,7 +159,7 @@ void ResolutionCheckListItem::setCaption(TQString caption)
 
 void ResolutionCheckListItem::updateText()
 {
-	TQString newText(i18n("Entries in the resolution dialog. First the name of the field, then the entry from the Handheld or PC after the colon", "%1: %2").tqarg(fCaption).tqarg(fText));
+	TQString newText(i18n("Entries in the resolution dialog. First the name of the field, then the entry from the Handheld or PC after the colon", "%1: %2").arg(fCaption).arg(fText));
 	newText.replace(TQRegExp(CSL1("\n")),
 		i18n("Denoting newlines in Address entries. No need to translate", " | "));
 	setText(0, newText);
diff --git a/conduits/abbrowserconduit/resolutionDialog_base.ui b/conduits/abbrowserconduit/resolutionDialog_base.ui
index c76ca26..b756a41 100644
--- a/conduits/abbrowserconduit/resolutionDialog_base.ui
+++ b/conduits/abbrowserconduit/resolutionDialog_base.ui
@@ -26,7 +26,7 @@
             <property name="text">
                 <string>The following record was edited both on the handheld and on the PC. Please choose which values shall be synced:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -62,7 +62,7 @@
             <property name="text">
                 <string>Line breaks in any of the entries are denoted by a " | " (without the quotes).</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>