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/kdenetwork@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

19 files changed, 25 insertions, 25 deletions

diff --git a/ksirc/FilterRuleWidget.ui b/ksirc/FilterRuleWidget.ui
index ab845cdd..e24b283c 100644
--- a/ksirc/FilterRuleWidget.ui
+++ b/ksirc/FilterRuleWidget.ui
@@ -235,5 +235,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/ksirc/KSOpenkSirc/open_ksircData.ui b/ksirc/KSOpenkSirc/open_ksircData.ui
index df4ae7c6..0bc3374d 100644
--- a/ksirc/KSOpenkSirc/open_ksircData.ui
+++ b/ksirc/KSOpenkSirc/open_ksircData.ui
@@ -333,5 +333,5 @@
 <Q_SLOTS>
     <slot access="protected">passwordChanged(const QString &amp;)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/ksirc/KSPrefs/page_autoconnectbase.ui b/ksirc/KSPrefs/page_autoconnectbase.ui
index 815598ba..0287b3c5 100644
--- a/ksirc/KSPrefs/page_autoconnectbase.ui
+++ b/ksirc/KSPrefs/page_autoconnectbase.ui
@@ -382,7 +382,7 @@
     <slot>kcl_clicked(TQListViewItem *)</slot>
     <slot>kvl_clicked(TQListViewItem*)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/ksirc/KSPrefs/page_colorsbase.ui b/ksirc/KSPrefs/page_colorsbase.ui
index cffcc4cc..9c14536f 100644
--- a/ksirc/KSPrefs/page_colorsbase.ui
+++ b/ksirc/KSPrefs/page_colorsbase.ui
@@ -1059,5 +1059,5 @@
     <slot>coloursSetEnable()</slot>
     <slot>changed()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/ksirc/KSPrefs/page_generalbase.ui b/ksirc/KSPrefs/page_generalbase.ui
index d4dec93b..e5811a1a 100644
--- a/ksirc/KSPrefs/page_generalbase.ui
+++ b/ksirc/KSPrefs/page_generalbase.ui
@@ -536,5 +536,5 @@
     <slot access="protected">showWallpaperPixmap(const QString &amp;)</slot>
     <slot>changed()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/ksirc/KSPrefs/page_irccolorsbase.ui b/ksirc/KSPrefs/page_irccolorsbase.ui
index 7b7e31b9..b83b9b05 100644
--- a/ksirc/KSPrefs/page_irccolorsbase.ui
+++ b/ksirc/KSPrefs/page_irccolorsbase.ui
@@ -1253,7 +1253,7 @@
     <slot>chanaged()</slot>
     <slot>changed()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/ksirc/KSPrefs/page_looknfeelbase.ui b/ksirc/KSPrefs/page_looknfeelbase.ui
index ba4ea3f4..49688ab9 100644
--- a/ksirc/KSPrefs/page_looknfeelbase.ui
+++ b/ksirc/KSPrefs/page_looknfeelbase.ui
@@ -314,7 +314,7 @@
     <slot access="protected">showWallpaperPixmap(const QString &amp;)</slot>
     <slot>changed()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/ksirc/KSPrefs/page_rmbmenubase.ui b/ksirc/KSPrefs/page_rmbmenubase.ui
index abeb6169..09fbef0d 100644
--- a/ksirc/KSPrefs/page_rmbmenubase.ui
+++ b/ksirc/KSPrefs/page_rmbmenubase.ui
@@ -248,5 +248,5 @@
 <includes>
     <include location="global" impldecl="in declaration">kseparator.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/ksirc/KSPrefs/page_servchanbase.ui b/ksirc/KSPrefs/page_servchanbase.ui
index 59ad646f..c677949a 100644
--- a/ksirc/KSPrefs/page_servchanbase.ui
+++ b/ksirc/KSPrefs/page_servchanbase.ui
@@ -168,5 +168,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/ksirc/KSPrefs/page_shortcutsbase.ui b/ksirc/KSPrefs/page_shortcutsbase.ui
index c570f73f..1c40bdca 100644
--- a/ksirc/KSPrefs/page_shortcutsbase.ui
+++ b/ksirc/KSPrefs/page_shortcutsbase.ui
@@ -53,5 +53,5 @@
     <slot access="protected">showWallpaperPixmap(const QString &amp;)</slot>
     <slot>changed()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/ksirc/KSPrefs/page_startupbase.ui b/ksirc/KSPrefs/page_startupbase.ui
index 125b0934..42dfefeb 100644
--- a/ksirc/KSPrefs/page_startupbase.ui
+++ b/ksirc/KSPrefs/page_startupbase.ui
@@ -187,7 +187,7 @@
     <slot>changed()</slot>
     <slot>server_changed()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>keditlistbox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/ksirc/dccManagerbase.ui b/ksirc/dccManagerbase.ui
index bd1939ce..b3b070b4 100644
--- a/ksirc/dccManagerbase.ui
+++ b/ksirc/dccManagerbase.ui
@@ -190,7 +190,7 @@
     <slot>kpbAbort_clicked()</slot>
     <slot>kpbNew_clicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/ksirc/dccNewbase.ui b/ksirc/dccNewbase.ui
index 06e90b46..661ed5f5 100644
--- a/ksirc/dccNewbase.ui
+++ b/ksirc/dccNewbase.ui
@@ -227,7 +227,7 @@
     <slot>sendClicked()</slot>
     <slot>fileClicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>alistbox.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/ksirc/displayMgrMDI.cpp b/ksirc/displayMgrMDI.cpp
index ba169e4f..4e6020e9 100644
--- a/ksirc/displayMgrMDI.cpp
+++ b/ksirc/displayMgrMDI.cpp
@@ -196,9 +196,9 @@ void DisplayMgrMDI::reparentReq()
 
 
         s = o;
-        while(s->tqparentWidget()){
+        while(s->parentWidget()){
             kdDebug(5008) << "Got a: " << s->className() << endl;
-            s = s->tqparentWidget();
+            s = s->parentWidget();
             if(s->inherits("KMainWindow"))
                 break;
 
diff --git a/ksirc/kstextview.cpp b/ksirc/kstextview.cpp
index 8b2e5e45..b12f8864 100644
--- a/ksirc/kstextview.cpp
+++ b/ksirc/kstextview.cpp
@@ -1114,12 +1114,12 @@ void TextLine::clearSelection()
         i->setSelectiontqStatus( Item::NoSelection );
 }
 
-void TextLine::appendItem( Item *i, int tqlayoutUpdatePolicy )
+void TextLine::appendItem( Item *i, int layoutUpdatePolicy )
 {
     m_items.append( i );
     i->setLine(this);
 
-    if ( tqlayoutUpdatePolicy == UpdateMaxHeight )
+    if ( layoutUpdatePolicy == UpdateMaxHeight )
         m_maxHeight = kMax( m_maxHeight, i->height() );
 }
 
diff --git a/ksirc/kstextview.h b/ksirc/kstextview.h
index f8bf755f..b523d274 100644
--- a/ksirc/kstextview.h
+++ b/ksirc/kstextview.h
@@ -323,7 +323,7 @@ public:
     void clearSelection();
 
     // transfers ownership
-    void appendItem( Item *i, int tqlayoutUpdatePolicy = NoUpdate );
+    void appendItem( Item *i, int layoutUpdatePolicy = NoUpdate );
 
     bool isEmpty() const { return m_items.isEmpty(); }
 
diff --git a/ksirc/puke/HOWTO-PUKE.pod b/ksirc/puke/HOWTO-PUKE.pod
index 9a09acd4..2a6bc799 100644
--- a/ksirc/puke/HOWTO-PUKE.pod
+++ b/ksirc/puke/HOWTO-PUKE.pod
@@ -188,7 +188,7 @@ Both these functions should be overriden and return your widget type,
 and set your widget.  For setWidget you should connect required
 Q_SIGNALS and eventFilters you are using.
 
-Make sure to call the tqparents setWidget in setWidget so it can connect 
+Make sure to call the parents setWidget in setWidget so it can connect 
 filters etc.  
 
 BEWARE: You might get the widget into setWidget being null (from the
@@ -222,7 +222,7 @@ Call the destructor as such:
 delete widget();
 setWidget(0);
 
-This will clear the widget from now and all tqparents and delete it.
+This will clear the widget from now and all parents and delete it.
 you never want it deleted twice. (deleting 0 won't hurt)
 
 =head2 2.2 The Perl code
diff --git a/ksirc/puke/controller.cpp b/ksirc/puke/controller.cpp
index faa5cf23..a4e13f3c 100644
--- a/ksirc/puke/controller.cpp
+++ b/ksirc/puke/controller.cpp
@@ -711,7 +711,7 @@ void PukeController::closefd(int fd)
     PObject *po = 0x0;
     while(it.current()){
       /*
-       * Delete all the tqlayouts first
+       * Delete all the layouts first
        *
        */
       if(it.current()->type == POBJECT_LAYOUT){
diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp
index 7fc945db..c525ec65 100644
--- a/ksirc/servercontroller.cpp
+++ b/ksirc/servercontroller.cpp
@@ -762,14 +762,14 @@ void servercontroller::WindowSelected(TQListViewItem *item)
     if ( !item )
 	return;
 
-  TQListViewItem *tqparent_server = item->tqparent();
-  if(!tqparent_server)
+  TQListViewItem *parent_server = item->tqparent();
+  if(!parent_server)
     return;
 
-  TQString txt = TQString(tqparent_server->text(0)) + "_" + item->text(0) + "_toplevel";
+  TQString txt = TQString(parent_server->text(0)) + "_" + item->text(0) + "_toplevel";
   TQWidget *obj = dynamic_cast<TQWidget *>( objFinder::tqfind(txt.utf8(), "KSircTopLevel"));
   if(obj == 0x0){
-    txt =TQString(tqparent_server->text(0)) + "_!" + item->text(0) + "_toplevel";
+    txt =TQString(parent_server->text(0)) + "_!" + item->text(0) + "_toplevel";
     obj = dynamic_cast<TQWidget *>( objFinder::tqfind(txt.utf8(), "KSircTopLevel"));
   }