Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpilot@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

29 files changed, 41 insertions, 41 deletions

diff --git a/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui b/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui
index 63f6897..4a1b81f 100644
--- a/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui
+++ b/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui
@@ -272,5 +272,5 @@ Do NOT change these values: doing so will almost certainly result in data loss w
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/conduits/abbrowserconduit/kaddressbookConduit.ui b/conduits/abbrowserconduit/kaddressbookConduit.ui
index 81e5202..d2b42b7 100644
--- a/conduits/abbrowserconduit/kaddressbookConduit.ui
+++ b/conduits/abbrowserconduit/kaddressbookConduit.ui
@@ -737,7 +737,7 @@
     <tabstop>fAddress</tabstop>
     <tabstop>fFax</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/conduits/abbrowserconduit/resolutionDialog_base.ui b/conduits/abbrowserconduit/resolutionDialog_base.ui
index 5f5442f..c76ca26 100644
--- a/conduits/abbrowserconduit/resolutionDialog_base.ui
+++ b/conduits/abbrowserconduit/resolutionDialog_base.ui
@@ -125,5 +125,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/conduits/docconduit/doc-setupdialog.ui b/conduits/docconduit/doc-setupdialog.ui
index c2fc82b..e59025e 100644
--- a/conduits/docconduit/doc-setupdialog.ui
+++ b/conduits/docconduit/doc-setupdialog.ui
@@ -548,7 +548,7 @@
     <tabstop>tabWidget</tabstop>
     <tabstop>RadioButton1</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/conduits/docconduit/kpalmdoc_dlgbase.ui b/conduits/docconduit/kpalmdoc_dlgbase.ui
index 2b5b581..9b92d8d 100644
--- a/conduits/docconduit/kpalmdoc_dlgbase.ui
+++ b/conduits/docconduit/kpalmdoc_dlgbase.ui
@@ -426,7 +426,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/conduits/knotes/setup_base.ui b/conduits/knotes/setup_base.ui
index b2007b8..15d902f 100644
--- a/conduits/knotes/setup_base.ui
+++ b/conduits/knotes/setup_base.ui
@@ -84,5 +84,5 @@
     </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/conduits/malconduit/mal-setup_dialog.ui b/conduits/malconduit/mal-setup_dialog.ui
index 2bc4c5e..ff78fd3 100644
--- a/conduits/malconduit/mal-setup_dialog.ui
+++ b/conduits/malconduit/mal-setup_dialog.ui
@@ -626,7 +626,7 @@
 <tabstops>
     <tabstop>tabWidget</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">knuminput.h</include>
diff --git a/conduits/memofileconduit/setup_base.ui b/conduits/memofileconduit/setup_base.ui
index 606bf5e..d3bf795 100644
--- a/conduits/memofileconduit/setup_base.ui
+++ b/conduits/memofileconduit/setup_base.ui
@@ -32,9 +32,9 @@ the Memofile-conduit settings.</comment>
     <property name="caption">
         <string>Memofile Conduit Options</string>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
-    <property name="tqlayoutSpacing" stdset="0">
+    <property name="layoutSpacing" stdset="0">
     </property>
     <grid>
         <property name="name">
@@ -58,7 +58,7 @@ the Memofile-conduit settings.</comment>
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqlayoutMargin" stdset="0">
+            <property name="layoutMargin" stdset="0">
             </property>
             <widget class="TQWidget">
                 <property name="name">
@@ -134,7 +134,7 @@ the Memofile-conduit settings.</comment>
 <tabstops>
     <tabstop>tabWidget</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/conduits/notepadconduit/notepad-setup.ui b/conduits/notepadconduit/notepad-setup.ui
index d7fd026..02aec75 100644
--- a/conduits/notepadconduit/notepad-setup.ui
+++ b/conduits/notepadconduit/notepad-setup.ui
@@ -70,7 +70,7 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/conduits/null/setup_base.ui b/conduits/null/setup_base.ui
index ed7d234..f64d05c 100644
--- a/conduits/null/setup_base.ui
+++ b/conduits/null/setup_base.ui
@@ -32,9 +32,9 @@ the Null-conduit settings.</comment>
     <property name="caption">
         <string>Null-Conduit Options</string>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
-    <property name="tqlayoutSpacing" stdset="0">
+    <property name="layoutSpacing" stdset="0">
     </property>
     <grid>
         <property name="name">
@@ -58,7 +58,7 @@ the Null-conduit settings.</comment>
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqlayoutMargin" stdset="0">
+            <property name="layoutMargin" stdset="0">
             </property>
             <widget class="TQWidget">
                 <property name="name">
@@ -124,5 +124,5 @@ the Null-conduit settings.</comment>
 <tabstops>
     <tabstop>tabWidget</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/conduits/popmail/setup-dialog.ui b/conduits/popmail/setup-dialog.ui
index e82f4ad..38b0c27 100644
--- a/conduits/popmail/setup-dialog.ui
+++ b/conduits/popmail/setup-dialog.ui
@@ -132,7 +132,7 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
diff --git a/conduits/recordconduit/setup_base.ui b/conduits/recordconduit/setup_base.ui
index 389219b..3608371 100644
--- a/conduits/recordconduit/setup_base.ui
+++ b/conduits/recordconduit/setup_base.ui
@@ -32,9 +32,9 @@ the Record-conduit settings.</comment>
     <property name="caption">
         <string>Null-Conduit Options</string>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
-    <property name="tqlayoutSpacing" stdset="0">
+    <property name="layoutSpacing" stdset="0">
     </property>
     <grid>
         <property name="name">
@@ -58,7 +58,7 @@ the Record-conduit settings.</comment>
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqlayoutMargin" stdset="0">
+            <property name="layoutMargin" stdset="0">
             </property>
             <widget class="TQWidget">
                 <property name="name">
@@ -154,5 +154,5 @@ the Record-conduit settings.</comment>
 <tabstops>
     <tabstop>tabWidget</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/conduits/sysinfoconduit/sysinfo-setup_dialog.ui b/conduits/sysinfoconduit/sysinfo-setup_dialog.ui
index 6b8e2b9..7e5fbc1 100644
--- a/conduits/sysinfoconduit/sysinfo-setup_dialog.ui
+++ b/conduits/sysinfoconduit/sysinfo-setup_dialog.ui
@@ -205,7 +205,7 @@
 <tabstops>
     <tabstop>tabWidget</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/conduits/timeconduit/time-setup_dialog.ui b/conduits/timeconduit/time-setup_dialog.ui
index 2b3dbba..135f41c 100644
--- a/conduits/timeconduit/time-setup_dialog.ui
+++ b/conduits/timeconduit/time-setup_dialog.ui
@@ -118,5 +118,5 @@
 <tabstops>
     <tabstop>tabWidget</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/conduits/vcalconduit/korganizerConduit.ui b/conduits/vcalconduit/korganizerConduit.ui
index b6cefab..52904b4 100644
--- a/conduits/vcalconduit/korganizerConduit.ui
+++ b/conduits/vcalconduit/korganizerConduit.ui
@@ -30,9 +30,9 @@
     <property name="caption">
         <string>Calendar-Conduit Options</string>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
-    <property name="tqlayoutSpacing" stdset="0">
+    <property name="layoutSpacing" stdset="0">
     </property>
     <grid>
         <property name="name">
@@ -56,7 +56,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqlayoutMargin" stdset="0">
+            <property name="layoutMargin" stdset="0">
             </property>
             <widget class="TQWidget">
                 <property name="name">
@@ -266,7 +266,7 @@ be saved in the calendar on the PC.</string>
 <tabstops>
     <tabstop>tabWidget</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/kpilot/dbFlagsEditor_base.ui b/kpilot/dbFlagsEditor_base.ui
index 3083b2e..6ea18ca 100644
--- a/kpilot/dbFlagsEditor_base.ui
+++ b/kpilot/dbFlagsEditor_base.ui
@@ -372,5 +372,5 @@
     <include location="local" impldecl="in implementation">dbFlagsEditor_base.ui.h</include>
     <include location="system" impldecl="in implementation">kdatewidget.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kpilot/dbRecordEditor_base.ui b/kpilot/dbRecordEditor_base.ui
index e5922cf..5ff400c 100644
--- a/kpilot/dbRecordEditor_base.ui
+++ b/kpilot/dbRecordEditor_base.ui
@@ -147,5 +147,5 @@
 <includes>
     <include location="local" impldecl="in implementation">dbRecordEditor_base.ui.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kpilot/dbSelection_base.ui b/kpilot/dbSelection_base.ui
index 5bb29c4..df28a2c 100644
--- a/kpilot/dbSelection_base.ui
+++ b/kpilot/dbSelection_base.ui
@@ -70,7 +70,7 @@
         <slot>animateClick()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includes>
 	<include location="system" impldecl="in implementation">klistview.h</include>
 	<include location="system" impldecl="in implementation">kpushbutton.h</include>
diff --git a/kpilot/hotSync.cc b/kpilot/hotSync.cc
index a6d4cc4..b8b7356 100644
--- a/kpilot/hotSync.cc
+++ b/kpilot/hotSync.cc
@@ -1081,7 +1081,7 @@ void RestoreAction::setDirectory( const TQString &path )
 
 	if (openConduit() < 0)
 	{
-		WARNINGKPILOT << "Restore aptqparently canceled." << endl;
+		WARNINGKPILOT << "Restore apparently canceled." << endl;
 		logMessage(i18n("Restore incomplete."));
 		fActiontqStatus = Done;
 		emit syncDone(this);
diff --git a/kpilot/kpilotConfigDialog_backup.ui b/kpilot/kpilotConfigDialog_backup.ui
index c9144bc..1a59aef 100644
--- a/kpilot/kpilotConfigDialog_backup.ui
+++ b/kpilot/kpilotConfigDialog_backup.ui
@@ -203,5 +203,5 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kpilot/kpilotConfigDialog_device.ui b/kpilot/kpilotConfigDialog_device.ui
index cf86146..29a4fe8 100644
--- a/kpilot/kpilotConfigDialog_device.ui
+++ b/kpilot/kpilotConfigDialog_device.ui
@@ -185,5 +185,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="0"/>
+<layoutdefaults spacing="6" margin="0"/>
 </UI>
diff --git a/kpilot/kpilotConfigDialog_startup.ui b/kpilot/kpilotConfigDialog_startup.ui
index 1c77f5f..984689d 100644
--- a/kpilot/kpilotConfigDialog_startup.ui
+++ b/kpilot/kpilotConfigDialog_startup.ui
@@ -114,5 +114,5 @@ KPilot's settings.</comment>
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kpilot/kpilotConfigDialog_sync.ui b/kpilot/kpilotConfigDialog_sync.ui
index 52478ca..0afc66d 100644
--- a/kpilot/kpilotConfigDialog_sync.ui
+++ b/kpilot/kpilotConfigDialog_sync.ui
@@ -167,5 +167,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kpilot/kpilotConfigDialog_viewers.ui b/kpilot/kpilotConfigDialog_viewers.ui
index 32cdf89..8f70950 100644
--- a/kpilot/kpilotConfigDialog_viewers.ui
+++ b/kpilot/kpilotConfigDialog_viewers.ui
@@ -145,5 +145,5 @@ KPilot's settings.</comment>
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kpilot/kpilotConfigWizard_app.ui b/kpilot/kpilotConfigWizard_app.ui
index 061b107..d774df1 100644
--- a/kpilot/kpilotConfigWizard_app.ui
+++ b/kpilot/kpilotConfigWizard_app.ui
@@ -108,5 +108,5 @@ Press "Finish" to setup KPilot according to the settings in this configuration W
 <tabstops>
     <tabstop>radioButton6</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kpilot/kpilotConfigWizard_user.ui b/kpilot/kpilotConfigWizard_user.ui
index 3386f28..0bb6744 100644
--- a/kpilot/kpilotConfigWizard_user.ui
+++ b/kpilot/kpilotConfigWizard_user.ui
@@ -164,5 +164,5 @@ Network: This has not been tested by any of the KPilot developers themselves (ha
     <tabstop>fProbeButton</tabstop>
     <tabstop>fPilotRunningPermanently</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kpilot/todoEditor_base.ui b/kpilot/todoEditor_base.ui
index 8e6f0d6..fbe6a1c 100644
--- a/kpilot/todoEditor_base.ui
+++ b/kpilot/todoEditor_base.ui
@@ -173,7 +173,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="system" impldecl="in implementation">kdatewidget.h</include>
 </includes>
diff --git a/lib/pilotAddress.h b/lib/pilotAddress.h
index f5c2bcb..40b5630 100644
--- a/lib/pilotAddress.h
+++ b/lib/pilotAddress.h
@@ -182,7 +182,7 @@ public:
  * - phone[6] = Pager
  * - phone[7] = Mobile
  *
- * Aptqparently, this order is kept for all languages, just with localized
+ * Apparently, this order is kept for all languages, just with localized
  * strings.  The implementation of the internal methods will assume
  * this order is kept. In other languages, main can replaced with
  * Corporation.
diff --git a/lib/plugin.h b/lib/plugin.h
index 817d753..59322ac 100644
--- a/lib/plugin.h
+++ b/lib/plugin.h
@@ -69,7 +69,7 @@ namespace Pilot
 *
 * NB. The reason that this is a TQObject which needs to create a
 * separate widget - instead of a TQWidget subclass - has to do with
-* tqlayouting. If you make the widget with designer then the easiest
+* layouting. If you make the widget with designer then the easiest
 * thing to do is to use a grid tqlayout there. Making ConduitConfigBase
 * a TQWidget subclass would require an additional tqlayout here, which
 * seems a little foolish.