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

14 files changed, 70 insertions, 70 deletions

diff --git a/kugar/kudesigner/kudesigner_doc.cpp b/kugar/kudesigner/kudesigner_doc.cpp
index 0f554866..aa5cec46 100644
--- a/kugar/kudesigner/kudesigner_doc.cpp
+++ b/kugar/kudesigner/kudesigner_doc.cpp
@@ -41,8 +41,8 @@
 
 #include "kudesigner_view.h"
 
-KudesignerDoc::KudesignerDoc( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
-        : KoDocument( tqparentWidget, widgetName, tqparent, name, singleViewMode ), m_plugin( 0 ), m_propPos( DockRight ), m_modified( false )
+KudesignerDoc::KudesignerDoc( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
+        : KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode ), m_plugin( 0 ), m_propPos( DockRight ), m_modified( false )
 {
     setInstance( KudesignerFactory::global(), false );
     setTemplateType("kudesigner_template");
@@ -66,7 +66,7 @@ void KudesignerDoc::addCommand( KCommand *cmd )
     /*    history->addCommand(cmd);*/
 }
 
-bool KudesignerDoc::initDoc( InitDocFlags flags, TQWidget* tqparentWidget )
+bool KudesignerDoc::initDoc( InitDocFlags flags, TQWidget* parentWidget )
 {
     // If nothing is loaded, do initialize here
     bool ok = FALSE;
@@ -82,7 +82,7 @@ bool KudesignerDoc::initDoc( InitDocFlags flags, TQWidget* tqparentWidget )
 
     KoTemplateChooseDia::ReturnType ret = KoTemplateChooseDia::choose(
                                               KudesignerFactory::global(), file,
-                                              dlgtype, "kudesigner_template", tqparentWidget );
+                                              dlgtype, "kudesigner_template", parentWidget );
     if ( ret == KoTemplateChooseDia::Template )
     {
         resetURL();
diff --git a/kugar/kudesigner/kudesigner_doc.h b/kugar/kudesigner/kudesigner_doc.h
index 318876d2..659b3e1c 100644
--- a/kugar/kudesigner/kudesigner_doc.h
+++ b/kugar/kudesigner/kudesigner_doc.h
@@ -39,13 +39,13 @@ class KudesignerDoc: public KoDocument
     Q_OBJECT
   TQ_OBJECT
 public:
-    KudesignerDoc( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
+    KudesignerDoc( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
 
     ~KudesignerDoc();
 
     virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 );
 
-    virtual bool initDoc( InitDocFlags flags, TQWidget* tqparentWidget );
+    virtual bool initDoc( InitDocFlags flags, TQWidget* parentWidget );
 
     virtual bool loadOasis( const TQDomDocument&, KoOasisStyles&, const TQDomDocument&, KoStore* );
     virtual bool saveOasis( KoStore*, KoXmlWriter* );
diff --git a/kugar/kudesigner/kudesigner_factory.cpp b/kugar/kudesigner/kudesigner_factory.cpp
index 2c90d1d8..f8712f03 100644
--- a/kugar/kudesigner/kudesigner_factory.cpp
+++ b/kugar/kudesigner/kudesigner_factory.cpp
@@ -43,13 +43,13 @@ KudesignerFactory::~KudesignerFactory()
     s_global = 0L;
 }
 
-KParts::Part* KudesignerFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & data )
+KParts::Part* KudesignerFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & data )
 {
     // If classname is "KoDocument", our host is a koffice application
     // otherwise, the host wants us as a simple part, so switch to readonly and single view.
     bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
-    // tqparentWidget and widgetName are used by KoDocument for the "readonly+singleView" case.
-    KudesignerDoc *part = new KudesignerDoc( tqparentWidget, widgetName, tqparent, name, !bWantKoDocument );
+    // parentWidget and widgetName are used by KoDocument for the "readonly+singleView" case.
+    KudesignerDoc *part = new KudesignerDoc( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
 
     if ( !bWantKoDocument )
         part->setReadWrite( false );
diff --git a/kugar/kudesigner/kudesigner_factory.h b/kugar/kudesigner/kudesigner_factory.h
index 82eb7bb8..fd8956f6 100644
--- a/kugar/kudesigner/kudesigner_factory.h
+++ b/kugar/kudesigner/kudesigner_factory.h
@@ -33,7 +33,7 @@ public:
     KudesignerFactory( TQObject* tqparent = 0, const char* name = 0 );
     ~KudesignerFactory();
 
-    virtual KParts::Part *createPartObject( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
+    virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
 
     static KInstance* global();
 
diff --git a/kugar/kudesigner_lib/line.cpp b/kugar/kudesigner_lib/line.cpp
index caff18a1..fb5a56d5 100644
--- a/kugar/kudesigner_lib/line.cpp
+++ b/kugar/kudesigner_lib/line.cpp
@@ -113,7 +113,7 @@ void Line::setSection( Band *section )
 {
     props[ "X1" ].setValue( ( int ) ( x() - section->x() ) );
     props[ "Y1" ].setValue( ( int ) ( y() - section->y() ) );
-    tqparentSection = section;
+    parentSection = section;
 }
 
 void Line::updateGeomProps()
diff --git a/kugar/kudesigner_lib/reportitem.cpp b/kugar/kudesigner_lib/reportitem.cpp
index c986c970..78446a9e 100644
--- a/kugar/kudesigner_lib/reportitem.cpp
+++ b/kugar/kudesigner_lib/reportitem.cpp
@@ -88,19 +88,19 @@ void ReportItem::updateGeomProps()
 
 Band *ReportItem::section()
 {
-    return tqparentSection;
+    return parentSection;
 }
 
 void ReportItem::setSection( Band *section )
 {
     props[ "X" ].setValue( ( int ) ( x() - section->x() ) );
     props[ "Y" ].setValue( ( int ) ( y() - section->y() ) );
-    tqparentSection = section;
+    parentSection = section;
 }
 
 void ReportItem::setSectionUndestructive( Band *section )
 {
-    tqparentSection = section;
+    parentSection = section;
 }
 
 TQString ReportItem::getXml()
diff --git a/kugar/kudesigner_lib/reportitem.h b/kugar/kudesigner_lib/reportitem.h
index 5d10545c..47c5838c 100644
--- a/kugar/kudesigner_lib/reportitem.h
+++ b/kugar/kudesigner_lib/reportitem.h
@@ -37,7 +37,7 @@ public:
             : Box( x, y, width, height, canvas )
     {
         setZ( 20 );
-        tqparentSection = 0;
+        parentSection = 0;
     }
     virtual int rtti() const
     {
@@ -74,7 +74,7 @@ public:
 
 protected:
     friend class View;
-    Band *tqparentSection;
+    Band *parentSection;
 };
 
 }
diff --git a/kugar/kudesigner_lib/view.cpp b/kugar/kudesigner_lib/view.cpp
index a74bbd61..6c5c4404 100644
--- a/kugar/kudesigner_lib/view.cpp
+++ b/kugar/kudesigner_lib/view.cpp
@@ -474,10 +474,10 @@ void View::contentsMouseMoveEvent( TQMouseEvent* e )
     {
         double newXPos = moving->x() + p.x() - moving_start.x();
         double newYPos = moving->y() + p.y() - moving_start.y();
-        fixMinValues( newYPos, moving->tqparentSection->y(), moving_offsetY );
-        fixMinValues( newXPos, moving->tqparentSection->x(), moving_offsetX );
-        fixMaxValues( newYPos, moving->height(), moving->tqparentSection->y() + moving->tqparentSection->height(), moving_offsetY );
-        fixMaxValues( newXPos, moving->width(), moving->tqparentSection->x() + moving->tqparentSection->width(), moving_offsetX );
+        fixMinValues( newYPos, moving->parentSection->y(), moving_offsetY );
+        fixMinValues( newXPos, moving->parentSection->x(), moving_offsetX );
+        fixMaxValues( newYPos, moving->height(), moving->parentSection->y() + moving->parentSection->height(), moving_offsetY );
+        fixMaxValues( newXPos, moving->width(), moving->parentSection->x() + moving->parentSection->width(), moving_offsetX );
 
         double sx = newXPos;
         double sy = newYPos;
diff --git a/kugar/lib/inputmask.cpp b/kugar/lib/inputmask.cpp
index 08d67b26..8194a211 100644
--- a/kugar/lib/inputmask.cpp
+++ b/kugar/lib/inputmask.cpp
@@ -23,17 +23,17 @@ InputMask::InputMask( TQObject *tqparent, const char *name )
         m_maxLength( 32767 ),
         m_blank( ' ' ),
         m_tqmask( TQString() ),
-        m_tqmaskData( 0L )
+        m_maskData( 0L )
 {}
 
 InputMask::~InputMask()
 {
-    delete [] m_tqmaskData;
+    delete [] m_maskData;
 }
 
 TQString InputMask::tqmask() const
 {
-    return ( m_tqmaskData ? m_tqmask + ';' + m_blank : TQString() );
+    return ( m_maskData ? m_tqmask + ';' + m_blank : TQString() );
 }
 
 void InputMask::setMask( const TQString &tqmask )
@@ -43,28 +43,28 @@ void InputMask::setMask( const TQString &tqmask )
 
 TQString InputMask::formatText( const TQString &txt )
 {
-    return tqmaskString( 0, txt, true );
+    return maskString( 0, txt, true );
 }
 
-void InputMask::parseInputMask( const TQString &tqmaskFields )
+void InputMask::parseInputMask( const TQString &maskFields )
 {
-    if ( tqmaskFields.isEmpty() || tqmaskFields.section( ';', 0, 0 ).isEmpty() )
+    if ( maskFields.isEmpty() || maskFields.section( ';', 0, 0 ).isEmpty() )
     {
-        if ( m_tqmaskData )
+        if ( m_maskData )
         {
-            delete [] m_tqmaskData;
-            m_tqmaskData = 0;
+            delete [] m_maskData;
+            m_maskData = 0;
             m_maxLength = 32767;
         }
         return ;
     }
 
-    m_tqmask = tqmaskFields.section( ';', 0, 0 );
-    m_blank = tqmaskFields.section( ';', 1, 1 ).at( 0 );
+    m_tqmask = maskFields.section( ';', 0, 0 );
+    m_blank = maskFields.section( ';', 1, 1 ).at( 0 );
     if ( m_blank.isNull() )
         m_blank = ' ';
 
-    // calculate m_maxLength / m_tqmaskData length
+    // calculate m_maxLength / m_maskData length
     m_maxLength = 0;
     TQChar c = 0;
     uint i;
@@ -83,8 +83,8 @@ void InputMask::parseInputMask( const TQString &tqmaskFields )
             m_maxLength++;
     }
 
-    delete [] m_tqmaskData;
-    m_tqmaskData = new MaskInputData[ m_maxLength ];
+    delete [] m_maskData;
+    m_maskData = new MaskInputData[ m_maxLength ];
 
     MaskInputData::Casemode m = MaskInputData::NoCaseMode;
     c = 0;
@@ -97,9 +97,9 @@ void InputMask::parseInputMask( const TQString &tqmaskFields )
         if ( escape )
         {
             s = TRUE;
-            m_tqmaskData[ index ].tqmaskChar = c;
-            m_tqmaskData[ index ].separator = s;
-            m_tqmaskData[ index ].caseMode = m;
+            m_maskData[ index ].maskChar = c;
+            m_maskData[ index ].separator = s;
+            m_maskData[ index ].caseMode = m;
             index++;
             escape = FALSE;
         }
@@ -144,9 +144,9 @@ void InputMask::parseInputMask( const TQString &tqmaskFields )
 
             if ( !escape )
             {
-                m_tqmaskData[ index ].tqmaskChar = c;
-                m_tqmaskData[ index ].separator = s;
-                m_tqmaskData[ index ].caseMode = m;
+                m_maskData[ index ].maskChar = c;
+                m_maskData[ index ].separator = s;
+                m_maskData[ index ].caseMode = m;
                 index++;
             }
         }
@@ -207,7 +207,7 @@ bool InputMask::isValidInput( TQChar key, TQChar tqmask ) const
     return FALSE;
 }
 
-TQString InputMask::tqmaskString( uint pos, const TQString &str, bool clear ) const
+TQString InputMask::maskString( uint pos, const TQString &str, bool clear ) const
 {
     if ( pos >= ( uint ) m_maxLength )
         return TQString::tqfromLatin1( "" );
@@ -222,18 +222,18 @@ TQString InputMask::tqmaskString( uint pos, const TQString &str, bool clear ) co
     {
         if ( strIndex < str.length() )
         {
-            if ( m_tqmaskData[ i ].separator )
+            if ( m_maskData[ i ].separator )
             {
-                s += m_tqmaskData[ i ].tqmaskChar;
-                if ( str[ ( int ) strIndex ] == m_tqmaskData[ i ].tqmaskChar )
+                s += m_maskData[ i ].maskChar;
+                if ( str[ ( int ) strIndex ] == m_maskData[ i ].maskChar )
                     strIndex++;
                 ++i;
             }
             else
             {
-                if ( isValidInput( str[ ( int ) strIndex ], m_tqmaskData[ i ].tqmaskChar ) )
+                if ( isValidInput( str[ ( int ) strIndex ], m_maskData[ i ].maskChar ) )
                 {
-                    switch ( m_tqmaskData[ i ].caseMode )
+                    switch ( m_maskData[ i ].caseMode )
                     {
                     case MaskInputData::Upper:
                         s += str[ ( int ) strIndex ].upper();
@@ -252,7 +252,7 @@ TQString InputMask::tqmaskString( uint pos, const TQString &str, bool clear ) co
                     int n = findInMask( i, TRUE, TRUE, str[ ( int ) strIndex ] );
                     if ( n != -1 )
                     {
-                        if ( str.length() != 1 || i == 0 || ( i > 0 && ( !m_tqmaskData[ i - 1 ].separator || m_tqmaskData[ i - 1 ].tqmaskChar != str[ ( int ) strIndex ] ) ) )
+                        if ( str.length() != 1 || i == 0 || ( i > 0 && ( !m_maskData[ i - 1 ].separator || m_maskData[ i - 1 ].maskChar != str[ ( int ) strIndex ] ) ) )
                         {
                             s += fill.mid( i, n - i + 1 );
                             i = n + 1; // update i to tqfind + 1
@@ -265,7 +265,7 @@ TQString InputMask::tqmaskString( uint pos, const TQString &str, bool clear ) co
                         if ( n != -1 )
                         {
                             s += fill.mid( i, n - i );
-                            switch ( m_tqmaskData[ n ].caseMode )
+                            switch ( m_maskData[ n ].caseMode )
                             {
                             case MaskInputData::Upper:
                                 s += str[ ( int ) strIndex ].upper();
@@ -298,8 +298,8 @@ TQString InputMask::clearString( uint pos, uint len ) const
     TQString s;
     int end = TQMIN( ( uint ) m_maxLength, pos + len );
     for ( int i = pos; i < end; i++ )
-        if ( m_tqmaskData[ i ].separator )
-            s += m_tqmaskData[ i ].tqmaskChar;
+        if ( m_maskData[ i ].separator )
+            s += m_maskData[ i ].maskChar;
         else
             s += m_blank;
 
@@ -308,14 +308,14 @@ TQString InputMask::clearString( uint pos, uint len ) const
 
 TQString InputMask::stripString( const TQString &str ) const
 {
-    if ( !m_tqmaskData )
+    if ( !m_maskData )
         return str;
 
     TQString s;
     int end = TQMIN( m_maxLength, ( int ) str.length() );
     for ( int i = 0; i < end; i++ )
-        if ( m_tqmaskData[ i ].separator )
-            s += m_tqmaskData[ i ].tqmaskChar;
+        if ( m_maskData[ i ].separator )
+            s += m_maskData[ i ].maskChar;
         else
             if ( str[ i ] != m_blank )
                 s += str[ i ];
@@ -336,16 +336,16 @@ int InputMask::findInMask( int pos, bool forward, bool findSeparator, TQChar sea
     {
         if ( findSeparator )
         {
-            if ( m_tqmaskData[ i ].separator && m_tqmaskData[ i ].tqmaskChar == searchChar )
+            if ( m_maskData[ i ].separator && m_maskData[ i ].maskChar == searchChar )
                 return i;
         }
         else
         {
-            if ( !m_tqmaskData[ i ].separator )
+            if ( !m_maskData[ i ].separator )
             {
                 if ( searchChar.isNull() )
                     return i;
-                else if ( isValidInput( searchChar, m_tqmaskData[ i ].tqmaskChar ) )
+                else if ( isValidInput( searchChar, m_maskData[ i ].maskChar ) )
                     return i;
             }
         }
diff --git a/kugar/lib/inputmask.h b/kugar/lib/inputmask.h
index 98d5c717..93889a16 100644
--- a/kugar/lib/inputmask.h
+++ b/kugar/lib/inputmask.h
@@ -35,9 +35,9 @@ public:
     TQString formatText( const TQString &txt );
 
 private:
-    void parseInputMask( const TQString &tqmaskFields );
+    void parseInputMask( const TQString &maskFields );
     bool isValidInput( TQChar key, TQChar tqmask ) const;
-    TQString tqmaskString( uint pos, const TQString &str, bool clear = FALSE ) const;
+    TQString maskString( uint pos, const TQString &str, bool clear = FALSE ) const;
     TQString clearString( uint pos, uint len ) const;
     TQString stripString( const TQString &str ) const;
     int findInMask( int pos, bool forward, bool findSeparator, TQChar searchChar = TQChar() ) const;
@@ -50,11 +50,11 @@ private:
     struct MaskInputData
     {
         enum Casemode { NoCaseMode, Upper, Lower };
-        TQChar tqmaskChar; // either the separator char or the inputtqmask
+        TQChar maskChar; // either the separator char or the inputtqmask
         bool separator;
         Casemode caseMode;
     };
-    MaskInputData *m_tqmaskData;
+    MaskInputData *m_maskData;
 };
 
 }
diff --git a/kugar/part/kugar_factory.cpp b/kugar/part/kugar_factory.cpp
index 69d16f21..cc7631e3 100644
--- a/kugar/part/kugar_factory.cpp
+++ b/kugar/part/kugar_factory.cpp
@@ -65,7 +65,7 @@ KAboutData *KugarFactory::aboutData()
 
 // Create a new part.
 
-KParts::Part* KugarFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+KParts::Part* KugarFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
         TQObject* tqparent, const char* name, const char* classname, const TQStringList & data )
 {
     TQString forcedUserTemplate;
@@ -77,15 +77,15 @@ KParts::Part* KugarFactory::createPartObject( TQWidget *tqparentWidget, const ch
     }
 
     bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
-    // tqparentWidget and widgetName are used by KoDocument for the "readonly+singleView" case.
-    KugarPart *part = new KugarPart( tqparentWidget, widgetName, tqparent, name, !bWantKoDocument );
+    // parentWidget and widgetName are used by KoDocument for the "readonly+singleView" case.
+    KugarPart *part = new KugarPart( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
 
     //  if ( !bWantKoDocument )
     part->setReadWrite( false );
 
     part->setForcedUserTemplate( forcedUserTemplate );
     return part;
-    //return ( new KugarPart(tqparentWidget,name,forcedUserTemplate));
+    //return ( new KugarPart(parentWidget,name,forcedUserTemplate));
 }
 
 
diff --git a/kugar/part/kugar_factory.h b/kugar/part/kugar_factory.h
index 1acb2920..390b21df 100644
--- a/kugar/part/kugar_factory.h
+++ b/kugar/part/kugar_factory.h
@@ -21,7 +21,7 @@ public:
     KugarFactory( TQObject* tqparent = 0, const char* name = 0 );
     ~KugarFactory();
 
-    virtual KParts::Part *createPartObject( TQWidget *tqparentWidget = 0, const char *widgetName = 0,
+    virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0,
                                             TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument",
                                             const TQStringList &args = TQStringList() );
 
diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp
index fa6644e2..06395a75 100644
--- a/kugar/part/kugar_part.cpp
+++ b/kugar/part/kugar_part.cpp
@@ -30,9 +30,9 @@
 
 #include <KoFilterManager.h>
 
-KugarPart::KugarPart( TQWidget *tqparentWidget, const char *widgetName, 
+KugarPart::KugarPart( TQWidget *parentWidget, const char *widgetName, 
                       TQObject* tqparent, const char* name, bool singleViewMode ) 
-    : KoDocument( tqparentWidget, widgetName, tqparent, name, singleViewMode ),
+    : KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode ),
     m_templateOk( false )
 {
     setInstance( KugarFactory::global(), false );
@@ -107,7 +107,7 @@ bool KugarPart::loadXML( TQIODevice *file, const TQDomDocument & /*doc*/ )
     return ok;
 }
 
-bool KugarPart::initDoc( InitDocFlags /*flags*/, TQWidget* /*tqparentWidget*/ )
+bool KugarPart::initDoc( InitDocFlags /*flags*/, TQWidget* /*parentWidget*/ )
 {
     TQString filename;
     bool ok = false;
diff --git a/kugar/part/kugar_part.h b/kugar/part/kugar_part.h
index cc778bf8..e489ceb0 100644
--- a/kugar/part/kugar_part.h
+++ b/kugar/part/kugar_part.h
@@ -20,12 +20,12 @@ class KugarPart: public KoDocument
   TQ_OBJECT
 
 public:
-    KugarPart( TQWidget *tqparentWidget = 0, const char *widgetName = 0, 
+    KugarPart( TQWidget *parentWidget = 0, const char *widgetName = 0, 
                TQObject* tqparent = 0,
                const char* name = 0, bool singleViewMode = false );
     virtual ~KugarPart();
 
-    virtual bool initDoc( InitDocFlags flags, TQWidget* tqparentWidget = 0 );
+    virtual bool initDoc( InitDocFlags flags, TQWidget* parentWidget = 0 );
 
     virtual bool loadOasis( const TQDomDocument&, KoOasisStyles&, 
                             const TQDomDocument&, KoStore* );