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

12 files changed, 34 insertions, 34 deletions

diff --git a/lib/kofficeui/KoCommandHistory.h b/lib/kofficeui/KoCommandHistory.h
index 08de0e45..34fd1b50 100644
--- a/lib/kofficeui/KoCommandHistory.h
+++ b/lib/kofficeui/KoCommandHistory.h
@@ -85,7 +85,7 @@ public:
 
     /**
      * Erases all the undo/redo history.
-     * Use this when reloading the data, for instance, since this tqinvalidates
+     * Use this when reloading the data, for instance, since this invalidates
      * all the commands.
      */
     void clear();
diff --git a/lib/kofficeui/KoContextCelp.h b/lib/kofficeui/KoContextCelp.h
index 36c51366..b21eba5b 100644
--- a/lib/kofficeui/KoContextCelp.h
+++ b/lib/kofficeui/KoContextCelp.h
@@ -220,7 +220,7 @@ class KOFFICEUI_EXPORT KoContextHelpAction : public KToggleAction
   TQ_OBJECT
 
 	public:
-		KoContextHelpAction( KActionCollection* tqparentCollection, TQWidget* tqparent = 0 );
+		KoContextHelpAction( KActionCollection* parentCollection, TQWidget* tqparent = 0 );
 		virtual ~KoContextHelpAction();
 
 	public slots:
diff --git a/lib/kofficeui/KoGeneralPropertyUi.ui b/lib/kofficeui/KoGeneralPropertyUi.ui
index c3191b46..688688c2 100644
--- a/lib/kofficeui/KoGeneralPropertyUi.ui
+++ b/lib/kofficeui/KoGeneralPropertyUi.ui
@@ -189,5 +189,5 @@
         <data format="PNG" length="1008">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b749444154388db59541681d551486bf49aef55c4965061b98815a5e20a5790b912c0d66d12c0381361004219bae0a45041111a92d28086a4110eaa68a8bd8b8a97121348b96b810cca6988281111a9c27446720afcc8516efa94e3b2e665e6244832e3c70b8cce5f2cf77cffc734e50d735830882600818060c3004046d1e14759b8f800a7858d7f5a360207cfe8df34f7627ba679d7367f27e7ea27425168bc71fb896ae24bd936eaddf5a5fa6e213e02ef0c00c48af5dbd76364a7837390e9d4a5b98128c0025d608e0f7f6d97b4eefc8389f8617d66f3a0b7c0894a63d395cf48b33d1d390f5bf40ef65f84ab116fcefe00a212f1441b04760ec38882854a0801c866854015e00aeee1203a6ec97273c0ebd57e02b873d1c926dc0daaab271ab400c68a5880989c785d98588a9698fd0ec872302e83120fa33f150ee7226517c95636dc8b73794e52b0e2a08432119174420ef29bd2de5a3b7338ac598f9451069c4dbb0c0a18170608d05147b58c83660a5159d3d1573720e92c482f1a846acad7a56ae3856967ac4719799d316314a53188681606820ec2b0f08dec3f5af1c5a29b3a762e6cf4094286a72dc8ee5fa9725b30b112fbe148211969772b4bfcf7e01100c88b1c682297145447a3b230c1b5291e68aee7ec2e5f74bb24d47b903e75e4b58bfe1c87e50d2d423b2dfdc03627ce5b146c88b120c241d884641519c8bb8fc564ebae99050989a8e60a4a43b19a295926f8356ff20dcd41804814a0947da8fb29370f99d926cb3b157382224472112c08018412b90bf20ef2306b047001392f61455cbda4ddf908e08f1d1905eafe0d2c59c742322cf14ad94b18e853d5734fedd4f5cd23d0e9d8e50f494b555cffc6244b9a34c9d8c4862b874117a5b05e75fced1fb8e380ee94e425e1c50631010657641d04a59b9e2585b2d39f74ac2e4b4a733e979f5cd84380e71fd022a989a0b199bd8e7e3bf23f6500953d3506cc7ac2cf558fe00d66f38bacf846020cf4a5c5f9bdaa2a4df28e96d4b2842ebe37dc275d92fdb7f5f11607e5188e32e2b9fe7a49b4a7abbd79cae203c1232733ae4bbaf95fcbe43ab88a2bf2b5a03f5ae707a27dd4a331997a821110333739ea9e98434f5e4db8d68d2b17427616c02d2390b5502a624fb1e805f8087401dd4754d100416c3ebcf3d2f17a2a4b194aa3270bdb4af17d37633da9b19c139483794bc505cc155e063e047da46ff18700c780ff889bda9f06ff367e033e034f02c303a201ea2e94a11f054bb5ada86c2c151b7d7f73413e02e50ee8ea620080cf038f0442b7a88ff36f37e6bc57f051e04ffd730fd03ef8bd61b5b2ca6900000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/lib/kofficeui/KoPageLayoutColumns.h b/lib/kofficeui/KoPageLayoutColumns.h
index 016eb767..09bad9d5 100644
--- a/lib/kofficeui/KoPageLayoutColumns.h
+++ b/lib/kofficeui/KoPageLayoutColumns.h
@@ -19,8 +19,8 @@
 
 // Description: Page Layout Dialog (sources)
 
-#ifndef kopagetqlayoutcolumns_h
-#define kopagetqlayoutcolumns_h
+#ifndef kopagelayoutcolumns_h
+#define kopagelayoutcolumns_h
 
 #include <KoUnit.h>
 #include <KoPageLayout.h>
diff --git a/lib/kofficeui/KoPageLayoutColumnsBase.ui b/lib/kofficeui/KoPageLayoutColumnsBase.ui
index 780bc792..325fe45e 100644
--- a/lib/kofficeui/KoPageLayoutColumnsBase.ui
+++ b/lib/kofficeui/KoPageLayoutColumnsBase.ui
@@ -95,5 +95,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/lib/kofficeui/KoPageLayoutHeader.h b/lib/kofficeui/KoPageLayoutHeader.h
index f1f9664f..da97f34c 100644
--- a/lib/kofficeui/KoPageLayoutHeader.h
+++ b/lib/kofficeui/KoPageLayoutHeader.h
@@ -16,8 +16,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef kopagetqlayoutheader_h
-#define kopagetqlayoutheader_h
+#ifndef kopagelayoutheader_h
+#define kopagelayoutheader_h
 
 #include <KoUnit.h>
 #include <KoPageLayout.h>
diff --git a/lib/kofficeui/KoPageLayoutHeaderBase.ui b/lib/kofficeui/KoPageLayoutHeaderBase.ui
index 4488c6f4..b3bd7978 100644
--- a/lib/kofficeui/KoPageLayoutHeaderBase.ui
+++ b/lib/kofficeui/KoPageLayoutHeaderBase.ui
@@ -217,5 +217,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/lib/kofficeui/KoPageLayoutSize.h b/lib/kofficeui/KoPageLayoutSize.h
index aa5f23bd..f1f4f358 100644
--- a/lib/kofficeui/KoPageLayoutSize.h
+++ b/lib/kofficeui/KoPageLayoutSize.h
@@ -17,8 +17,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef kopagetqlayoutsize_h
-#define kopagetqlayoutsize_h
+#ifndef kopagelayoutsize_h
+#define kopagelayoutsize_h
 
 #include <tqgroupbox.h>
 #include <KoGlobal.h>
diff --git a/lib/kofficeui/KoTabBar.cpp b/lib/kofficeui/KoTabBar.cpp
index 002f3ebe..b2e7c94b 100644
--- a/lib/kofficeui/KoTabBar.cpp
+++ b/lib/kofficeui/KoTabBar.cpp
@@ -91,10 +91,10 @@ public:
     bool autoScroll;
 
     // calculate the bounding rectangle for each visible tab
-    void tqlayoutTabs();
+    void layoutTabs();
 
     // reposition scroll buttons
-    void tqlayoutButtons();
+    void layoutButtons();
 
     // find a tab whose bounding rectangle contains the pos
     // return -1 if no such tab is found
@@ -176,7 +176,7 @@ static const char * arrow_right_xpm[] = {
 "          "};
 
 
-void KoTabBarPrivate::tqlayoutTabs()
+void KoTabBarPrivate::layoutTabs()
 {
     tabRects.clear();
 
@@ -308,7 +308,7 @@ void KoTabBarPrivate::drawMoveMarker( TQPainter& painter, int x, int y )
     painter.setBrush( oldBrush );
 }
 
-void KoTabBarPrivate::tqlayoutButtons()
+void KoTabBarPrivate::layoutButtons()
 {
     int bw = tabbar->height();
     int w = tabbar->width();
@@ -375,7 +375,7 @@ KoTabBar::KoTabBar( TQWidget* tqparent, const char* name )
     d->scrollForwardButton = new TQToolButton( this );
     connect( d->scrollForwardButton, TQT_SIGNAL( clicked() ),
       this, TQT_SLOT( scrollForward() ) );
-    d->tqlayoutButtons();
+    d->layoutButtons();
     d->updateButtons();
 }
 
@@ -437,8 +437,8 @@ void KoTabBar::setReverseLayout( bool reverse )
     if( reverse != d->reverseLayout )
     {
         d->reverseLayout = reverse;
-        d->tqlayoutTabs();
-        d->tqlayoutButtons();
+        d->layoutTabs();
+        d->layoutButtons();
         d->updateButtons();
         update();
     }
@@ -505,7 +505,7 @@ void KoTabBar::scrollBack()
     d->firstTab--;
     if( d->firstTab < 1 ) d->firstTab = 1;
 
-    d->tqlayoutTabs();
+    d->layoutTabs();
     d->updateButtons();
     update();
 }
@@ -519,7 +519,7 @@ void KoTabBar::scrollForward()
     if( d->firstTab > (int)d->tabs.count() )
         d->firstTab = d->tabs.count();
 
-    d->tqlayoutTabs();
+    d->layoutTabs();
     d->updateButtons();
     update();
 }
@@ -530,7 +530,7 @@ void KoTabBar::scrollFirst()
         return;
 
     d->firstTab = 1;
-    d->tqlayoutTabs();
+    d->layoutTabs();
     d->updateButtons();
     update();
 }
@@ -540,7 +540,7 @@ void KoTabBar::scrollLast()
     if ( !canScrollForward() )
         return;
 
-    d->tqlayoutTabs();
+    d->layoutTabs();
 
     if( !d->reverseLayout )
     {
@@ -561,11 +561,11 @@ void KoTabBar::scrollLast()
             int x = d->tabRects[ d->tabRects.count()-1 ].x();
             if( x > 0 ) break;
             d->firstTab++;
-            d->tqlayoutTabs();
+            d->layoutTabs();
         }
     }
 
-    d->tqlayoutTabs();
+    d->layoutTabs();
     d->updateButtons();
     update();
 }
@@ -669,7 +669,7 @@ void KoTabBar::paintEvent( TQPaintEvent* )
     if( !d->reverseLayout )
         painter.translate( 5, 0 );
 
-    d->tqlayoutTabs();
+    d->layoutTabs();
     d->updateButtons();
     
     // draw first all non-active, visible tabs
@@ -717,7 +717,7 @@ void KoTabBar::paintEvent( TQPaintEvent* )
 
 void KoTabBar::resizeEvent( TQResizeEvent* )
 {
-    d->tqlayoutButtons();
+    d->layoutButtons();
     d->updateButtons();
     update();
 }
@@ -751,7 +751,7 @@ void KoTabBar::mousePressEvent( TQMouseEvent* ev )
         return;
     }
 
-    d->tqlayoutTabs();
+    d->layoutTabs();
 
     TQPoint pos = ev->pos();
     if( !d->reverseLayout ) pos = pos - TQPoint( d->offset,0 );
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index 566a3722..4b5b1b4d 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -309,8 +309,8 @@ void KoColorPanel::mousePressEvent( TQMouseEvent* e )
 
 void KoColorPanel::mouseReleaseEvent( TQMouseEvent* )
 {
-    if ( isVisible() && tqparentWidget() && tqparentWidget()->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
-        tqparentWidget()->close();
+    if ( isVisible() && parentWidget() && parentWidget()->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
+        parentWidget()->close();
     emit colorSelected( mapToColor( m_pressedPos ) );
 }
 
@@ -425,8 +425,8 @@ void KoColorPanel::keyPressEvent( TQKeyEvent* e )
             e->ignore();
     }
     else if ( e->key() == TQt::Key_Return ) {
-        if ( isVisible() && tqparentWidget() && tqparentWidget()->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
-            tqparentWidget()->close();
+        if ( isVisible() && parentWidget() && parentWidget()->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
+            parentWidget()->close();
         emit colorSelected( mapToColor( m_focusPosition ) );
     }
     updateFocusPosition( newPos );
diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp
index a0f514e2..2a9b383e 100644
--- a/lib/kofficeui/kcoloractions.cpp
+++ b/lib/kofficeui/kcoloractions.cpp
@@ -246,8 +246,8 @@ int KSelectColorAction::plug( TQWidget* w, int index )
         {
             /* ###### CHECK: We're not allowed to specify the instance in iconSet()
             KInstance *instance;
-            if ( tqparentCollection() )
-                instance = tqparentCollection()->instance();
+            if ( parentCollection() )
+                instance = parentCollection()->instance();
             else
                 instance = KGlobal::instance();
             */
diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp
index e8040496..d3def7c9 100644
--- a/lib/kofficeui/tktoolbarbutton.cpp
+++ b/lib/kofficeui/tktoolbarbutton.cpp
@@ -332,7 +332,7 @@ bool TKToolBarButton::eventFilter(TQObject *o, TQEvent *ev)
       case TQEvent::Hide:
         on(false);
         setDown(false);
-        if ( !tqgeometry().tqcontains(tqparentWidget()->mapFromGlobal(TQCursor::pos())) )
+        if ( !tqgeometry().tqcontains(parentWidget()->mapFromGlobal(TQCursor::pos())) )
           leaveEvent(0L);
         return false;
         break;