rename the following methods:

tqparent parent
tqmask mask


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

10 files changed, 31 insertions, 31 deletions

diff --git a/kugar/lib/inputmask.cpp b/kugar/lib/inputmask.cpp
index 6fb49220..923323cb 100644
--- a/kugar/lib/inputmask.cpp
+++ b/kugar/lib/inputmask.cpp
@@ -17,12 +17,12 @@
 namespace Kugar
 {
 
-InputMask::InputMask( TQObject *tqparent, const char *name )
-        : TQObject( tqparent, name ),
+InputMask::InputMask( TQObject *parent, const char *name )
+        : TQObject( parent, name ),
         m_text( TQString() ),
         m_maxLength( 32767 ),
         m_blank( ' ' ),
-        m_tqmask( TQString() ),
+        m_mask( TQString() ),
         m_maskData( 0L )
 {}
 
@@ -31,14 +31,14 @@ InputMask::~InputMask()
     delete [] m_maskData;
 }
 
-TQString InputMask::tqmask() const
+TQString InputMask::mask() const
 {
-    return ( m_maskData ? m_tqmask + ';' + m_blank : TQString() );
+    return ( m_maskData ? m_mask + ';' + m_blank : TQString() );
 }
 
-void InputMask::setMask( const TQString &tqmask )
+void InputMask::setMask( const TQString &mask )
 {
-    parseInputMask( tqmask );
+    parseInputMask( mask );
 }
 
 TQString InputMask::formatText( const TQString &txt )
@@ -59,7 +59,7 @@ void InputMask::parseInputMask( const TQString &maskFields )
         return ;
     }
 
-    m_tqmask = maskFields.section( ';', 0, 0 );
+    m_mask = maskFields.section( ';', 0, 0 );
     m_blank = maskFields.section( ';', 1, 1 ).at( 0 );
     if ( m_blank.isNull() )
         m_blank = ' ';
@@ -68,10 +68,10 @@ void InputMask::parseInputMask( const TQString &maskFields )
     m_maxLength = 0;
     TQChar c = 0;
     uint i;
-    for ( i = 0; i < m_tqmask.length(); i++ )
+    for ( i = 0; i < m_mask.length(); i++ )
     {
-        c = m_tqmask.at( i );
-        if ( i > 0 && m_tqmask.at( i - 1 ) == '\\' )
+        c = m_mask.at( i );
+        if ( i > 0 && m_mask.at( i - 1 ) == '\\' )
         {
             m_maxLength++;
             continue;
@@ -91,9 +91,9 @@ void InputMask::parseInputMask( const TQString &maskFields )
     bool s;
     bool escape = FALSE;
     int index = 0;
-    for ( i = 0; i < m_tqmask.length(); i++ )
+    for ( i = 0; i < m_mask.length(); i++ )
     {
-        c = m_tqmask.at( i );
+        c = m_mask.at( i );
         if ( escape )
         {
             s = TRUE;
@@ -153,9 +153,9 @@ void InputMask::parseInputMask( const TQString &maskFields )
     }
 }
 
-bool InputMask::isValidInput( TQChar key, TQChar tqmask ) const
+bool InputMask::isValidInput( TQChar key, TQChar mask ) const
 {
-    switch ( tqmask )
+    switch ( mask )
     {
     case 'A':
         if ( key.isLetter() && key != m_blank )
diff --git a/kugar/lib/inputmask.h b/kugar/lib/inputmask.h
index 93889a16..f1f0886f 100644
--- a/kugar/lib/inputmask.h
+++ b/kugar/lib/inputmask.h
@@ -25,18 +25,18 @@ class InputMask : public TQObject
     Q_OBJECT
   TQ_OBJECT
 public:
-    InputMask( TQObject *tqparent = 0, const char *name = 0 );
+    InputMask( TQObject *parent = 0, const char *name = 0 );
 
     ~InputMask();
 
-    TQString tqmask() const;
-    void setMask( const TQString &tqmask );
+    TQString mask() const;
+    void setMask( const TQString &mask );
 
     TQString formatText( const TQString &txt );
 
 private:
     void parseInputMask( const TQString &maskFields );
-    bool isValidInput( TQChar key, TQChar tqmask ) const;
+    bool isValidInput( TQChar key, TQChar mask ) 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;
@@ -46,11 +46,11 @@ private:
     TQString m_text;
     int m_maxLength;
     TQChar m_blank;
-    TQString m_tqmask;
+    TQString m_mask;
     struct MaskInputData
     {
         enum Casemode { NoCaseMode, Upper, Lower };
-        TQChar maskChar; // either the separator char or the inputtqmask
+        TQChar maskChar; // either the separator char or the inputmask
         bool separator;
         Casemode caseMode;
     };
diff --git a/kugar/lib/mfieldobject.cpp b/kugar/lib/mfieldobject.cpp
index 7f7b994a..3444d5b7 100644
--- a/kugar/lib/mfieldobject.cpp
+++ b/kugar/lib/mfieldobject.cpp
@@ -140,7 +140,7 @@ void MFieldObject::setText( const TQString txt )
 
 TQString MFieldObject::getInputMask() const
 {
-    return m_inputMask->tqmask();
+    return m_inputMask->mask();
 }
 
 void MFieldObject::setInputMask( const TQString &inputMask )
diff --git a/kugar/lib/mfieldobject.h b/kugar/lib/mfieldobject.h
index d04fca39..aa62a12f 100644
--- a/kugar/lib/mfieldobject.h
+++ b/kugar/lib/mfieldobject.h
@@ -55,7 +55,7 @@ protected:
     TQColor saveColor;
     /** Field's comma flag */
     int comma;
-    /** Input tqmask */
+    /** Input mask */
     TQString inputMask;
 
 public:
diff --git a/kugar/lib/mpagecollection.cpp b/kugar/lib/mpagecollection.cpp
index 22618656..60aa0f5e 100644
--- a/kugar/lib/mpagecollection.cpp
+++ b/kugar/lib/mpagecollection.cpp
@@ -15,7 +15,7 @@ namespace Kugar
 {
 
 /** Constructor */
-MPageCollection::MPageCollection( TQObject *tqparent ) : TQObject( tqparent )
+MPageCollection::MPageCollection( TQObject *parent ) : TQObject( parent )
 {
     // Set page list to AutoDelete
     pages.setAutoDelete( true );
diff --git a/kugar/lib/mpagecollection.h b/kugar/lib/mpagecollection.h
index c4b78cee..a5de1e66 100644
--- a/kugar/lib/mpagecollection.h
+++ b/kugar/lib/mpagecollection.h
@@ -26,7 +26,7 @@ class MPageCollection : public TQObject
 
 public:
     /** Constructor */
-    MPageCollection( TQObject *tqparent );
+    MPageCollection( TQObject *parent );
     /** Copy constructor */
     MPageCollection( const MPageCollection& mPageCollection );
     /** Assignment operator */
diff --git a/kugar/lib/mpagedisplay.cpp b/kugar/lib/mpagedisplay.cpp
index 75ff2999..12eac741 100644
--- a/kugar/lib/mpagedisplay.cpp
+++ b/kugar/lib/mpagedisplay.cpp
@@ -12,7 +12,7 @@ namespace Kugar
 {
 
 /** Constructor */
-MPageDisplay::MPageDisplay( TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name )
+MPageDisplay::MPageDisplay( TQWidget *parent, const char *name ) : TQWidget( parent, name )
 {
     buffer.resize( 1, 1 );
 }
diff --git a/kugar/lib/mpagedisplay.h b/kugar/lib/mpagedisplay.h
index db4f7f74..65a419d5 100644
--- a/kugar/lib/mpagedisplay.h
+++ b/kugar/lib/mpagedisplay.h
@@ -28,7 +28,7 @@ class MPageDisplay : public TQWidget
   TQ_OBJECT
 public:
     /** Constructor */
-    MPageDisplay( TQWidget *tqparent = 0, const char *name = 0 );
+    MPageDisplay( TQWidget *parent = 0, const char *name = 0 );
     /** Destructor */
     virtual ~MPageDisplay();
 
diff --git a/kugar/lib/mreportviewer.cpp b/kugar/lib/mreportviewer.cpp
index c0e91656..a3fd9ab5 100644
--- a/kugar/lib/mreportviewer.cpp
+++ b/kugar/lib/mreportviewer.cpp
@@ -19,14 +19,14 @@ namespace Kugar
 {
 
 /** Constructor */
-MReportViewer::MReportViewer( MReportEngine *engine, TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ), progress( 0 )
+MReportViewer::MReportViewer( MReportEngine *engine, TQWidget *parent, const char *name ) : TQWidget( parent, name ), progress( 0 )
 {
     rptEngine = engine;
     rptEngine->addRef();
     init();
 }
 
-MReportViewer::MReportViewer( TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ), progress( 0 )
+MReportViewer::MReportViewer( TQWidget *parent, const char *name ) : TQWidget( parent, name ), progress( 0 )
 {
     // Create the scrollview
     rptEngine = new MReportEngine();
diff --git a/kugar/lib/mreportviewer.h b/kugar/lib/mreportviewer.h
index 4927f28d..599e22db 100644
--- a/kugar/lib/mreportviewer.h
+++ b/kugar/lib/mreportviewer.h
@@ -44,8 +44,8 @@ class KUGAR_EXPORT MReportViewer : public TQWidget
   TQ_OBJECT
 
 public:
-    MReportViewer( TQWidget *tqparent = 0, const char *name = 0 );
-    MReportViewer( MReportEngine* engine, TQWidget *tqparent = 0, const char *name = 0 );
+    MReportViewer( TQWidget *parent = 0, const char *name = 0 );
+    MReportViewer( MReportEngine* engine, TQWidget *parent = 0, const char *name = 0 );
     virtual ~MReportViewer();
 
     bool setReportData( const TQString & );