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

10 files changed, 37 insertions, 37 deletions

diff --git a/kchart/csvimportdialogui.ui b/kchart/csvimportdialogui.ui
index 1c28e67e0..a061c0cc2 100644
--- a/kchart/csvimportdialogui.ui
+++ b/kchart/csvimportdialogui.ui
@@ -595,7 +595,7 @@
         </widget>
     </widget>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kchart/kchartBackgroundPixmapConfigPage.cc b/kchart/kchartBackgroundPixmapConfigPage.cc
index 3d653c311..825bca947 100644
--- a/kchart/kchartBackgroundPixmapConfigPage.cc
+++ b/kchart/kchartBackgroundPixmapConfigPage.cc
@@ -161,13 +161,13 @@ KChartBackgroundPixmapConfigPage::KChartBackgroundPixmapConfigPage( KChartParams
                            "be used as a background tile. If the image is "
                            "larger then the selected area, you will only see "
                            "the upper left part of it." ) );
-    TQButtonGroup* tqalignmentBG;
-    tqalignmentBG = new TQButtonGroup( right, "GroupBox_Alignment" );
-    tqalignmentBG->setFrameStyle( TQFrame::NoFrame );
-    tqalignmentBG->insert( stretchedRB );
-    tqalignmentBG->insert( scaledRB );
-    tqalignmentBG->insert( centeredRB );
-    tqalignmentBG->insert( tiledRB );
+    TQButtonGroup* alignmentBG;
+    alignmentBG = new TQButtonGroup( right, "GroupBox_Alignment" );
+    alignmentBG->setFrameStyle( TQFrame::NoFrame );
+    alignmentBG->insert( stretchedRB );
+    alignmentBG->insert( scaledRB );
+    alignmentBG->insert( centeredRB );
+    alignmentBG->insert( tiledRB );
 
     intensitySB->hide(); //the property doesn't work atm
 }
diff --git a/kchart/kchart_factory.cc b/kchart/kchart_factory.cc
index a9324f244..576be3bd2 100644
--- a/kchart/kchart_factory.cc
+++ b/kchart/kchart_factory.cc
@@ -37,7 +37,7 @@ KChartFactory::~KChartFactory()
 }
 
 
-KParts::Part* KChartFactory::createPartObject( TQWidget *tqparentWidget,
+KParts::Part* KChartFactory::createPartObject( TQWidget *parentWidget,
 					       const char *widgetName,
 					       TQObject* tqparent,
 					       const char* name,
@@ -46,7 +46,7 @@ KParts::Part* KChartFactory::createPartObject( TQWidget *tqparentWidget,
 {
     bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
 
-    KChartPart *part = new KChartPart( tqparentWidget, widgetName, tqparent, name,
+    KChartPart *part = new KChartPart( parentWidget, widgetName, tqparent, name,
 				       !bWantKoDocument );
 
     if ( !bWantKoDocument )
diff --git a/kchart/kchart_part.cc b/kchart/kchart_part.cc
index 483c7e220..a2728b6ba 100644
--- a/kchart/kchart_part.cc
+++ b/kchart/kchart_part.cc
@@ -50,12 +50,12 @@ using namespace std;
 namespace KChart
 {
 
-KChartPart::KChartPart( TQWidget *tqparentWidget, const char *widgetName,
+KChartPart::KChartPart( TQWidget *parentWidget, const char *widgetName,
 			TQObject* tqparent, const char* name,
 			bool singleViewMode )
-  : KoChart::Part( tqparentWidget, widgetName, tqparent, name, singleViewMode ),
+  : KoChart::Part( parentWidget, widgetName, tqparent, name, singleViewMode ),
     m_params( 0 ),
-    m_parentWidget( tqparentWidget ),
+    m_parentWidget( parentWidget ),
     m_rowLabels(), m_colLabels()
 {
     kdDebug(35001) << "Constructor started!" << endl;
@@ -102,7 +102,7 @@ KChartPart::~KChartPart()
 
 // Reimplement KoDocument::initDoc()
 
-bool KChartPart::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
+bool KChartPart::initDoc(InitDocFlags flags, TQWidget* parentWidget)
 {
     // Initialize the parameter set for this chart document
 #if 0
@@ -140,7 +140,7 @@ bool KChartPart::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
 	dlgtype = KoTemplateChooseDia::Everything;
     ret = KoTemplateChooseDia::choose( KChartFactory::global(), f,
                                        dlgtype, "kchart_template",
-				       tqparentWidget );
+				       parentWidget );
 
     if ( ret == KoTemplateChooseDia::File ) {
 	KURL url( f );
diff --git a/kchart/kchart_part.h b/kchart/kchart_part.h
index effafa066..343a97f18 100644
--- a/kchart/kchart_part.h
+++ b/kchart/kchart_part.h
@@ -26,14 +26,14 @@ class KCHART_EXPORT KChartPart : public KoChart::Part
   TQ_OBJECT
 
 public:
-    KChartPart( TQWidget *tqparentWidget = 0, const char *widgetName = 0,
+    KChartPart( TQWidget *parentWidget = 0, const char *widgetName = 0,
 		TQObject* tqparent = 0, const char* name = 0,
 		bool singleViewMode = false );
     ~KChartPart();
 
     // Methods inherited from KoDocument:
 
-    virtual bool  initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0);
+    virtual bool  initDoc(InitDocFlags flags, TQWidget* parentWidget=0);
 
     virtual void  paintContent( TQPainter& painter, const TQRect& rect,
 				bool transparent = false,
diff --git a/kchart/kdchart/KDChartCustomBox.h b/kchart/kdchart/KDChartCustomBox.h
index e57110a59..17b47822d 100644
--- a/kchart/kdchart/KDChartCustomBox.h
+++ b/kchart/kdchart/KDChartCustomBox.h
@@ -216,7 +216,7 @@ public:
                       uint data3rd = 0,
                       uint deltaAlign = KDCHART_AlignAuto,
                       bool deltaScaleGlobal = true,
-                      int tqparentAxis = -1 )
+                      int parentAxis = -1 )
         : _rotation( 0 ),
           _fontSize( fontSize ),
           _fontScaleGlobal( fontScaleGlobal ),
@@ -235,7 +235,7 @@ public:
           _deltaAlign( deltaAlign ),
           _deltaScaleGlobal( deltaScaleGlobal ),
           _anchorBeingCalculated( false ),
-          _parentAxisArea(  tqparentAxis )
+          _parentAxisArea(  parentAxis )
     {
         _content.deepCopy( &content );
     }
@@ -338,7 +338,7 @@ public:
                       uint data3rd = 0,
                       uint deltaAlign = KDCHART_AlignAuto,
                       bool deltaScaleGlobal = true,
-                      int tqparentAxis = -1 )
+                      int parentAxis = -1 )
         : _rotation( rotation ),
           _fontSize( fontSize ),
           _fontScaleGlobal( fontScaleGlobal ),
@@ -357,7 +357,7 @@ public:
           _deltaAlign( deltaAlign ),
           _deltaScaleGlobal( deltaScaleGlobal ),
           _anchorBeingCalculated( false ),
-          _parentAxisArea(  tqparentAxis )
+          _parentAxisArea(  parentAxis )
     {
         _content.deepCopy( &content );
     }
@@ -974,13 +974,13 @@ protected:
         return _anchorBeingCalculated;
     }
 
-    void setParentAxisArea( int tqparentAxis ) const
+    void setParentAxisArea( int parentAxis ) const
     {
         KDChartCustomBox* that = const_cast<KDChartCustomBox*>(this);
-        that->_parentAxisArea = tqparentAxis;
+        that->_parentAxisArea = parentAxis;
     }
 
-    int tqparentAxisArea() const
+    int parentAxisArea() const
     {
         return _parentAxisArea;
     }
diff --git a/kchart/kdchart/KDChartEnums.h b/kchart/kdchart/KDChartEnums.h
index c506b39ad..82956e8cd 100644
--- a/kchart/kdchart/KDChartEnums.h
+++ b/kchart/kdchart/KDChartEnums.h
@@ -77,7 +77,7 @@ public:
       \param type the text tqlayout policy to convert
       \return the string representation of the text tqlayout policy enum
       */
-    static TQString tqlayoutPolicyToString( TextLayoutPolicy type ) {
+    static TQString layoutPolicyToString( TextLayoutPolicy type ) {
         switch( type ) {
             case LayoutJustOverwrite:
                 return "JustOverwrite";
diff --git a/kchart/kdchart/KDChartPainter.cpp b/kchart/kdchart/KDChartPainter.cpp
index f68b8ffed..987857aa6 100644
--- a/kchart/kdchart/KDChartPainter.cpp
+++ b/kchart/kdchart/KDChartPainter.cpp
@@ -1140,13 +1140,13 @@ TQRect KDChartPainter::calculateAreaRect( bool & allCustomBoxes,
                                                              break;
 
         default: {
-                     uint tqmaskBASE = KDChartEnums::AreaBASEMask & area;
-                     pos = area - tqmaskBASE;
-                     if ( KDChartEnums::AreaAxisBASE == tqmaskBASE ) {
+                     uint maskBASE = KDChartEnums::AreaBASEMask & area;
+                     pos = area - maskBASE;
+                     if ( KDChartEnums::AreaAxisBASE == maskBASE ) {
                          rect = params()->axisParams( pos ).axisTrueAreaRect();
-                     } else if ( KDChartEnums::AreaHdFtBASE == tqmaskBASE ) {
+                     } else if ( KDChartEnums::AreaHdFtBASE == maskBASE ) {
                          rect = params()->headerFooterRect( pos );
-                     } else if ( KDChartEnums::AreaCustomBoxesBASE == tqmaskBASE ) {
+                     } else if ( KDChartEnums::AreaCustomBoxesBASE == maskBASE ) {
                          const KDChartCustomBox * box = params()->customBox( pos );
                          if( box ) {
                              rect = box->trueRect( calculateAnchor( *box, regions ),
@@ -2011,10 +2011,10 @@ void KDChartPainter::calculateAllAxesRects(
              for( idx = 0; idx <= params()->maxCustomBoxIdx(); ++idx ) {
                  const KDChartCustomBox * box = params()->customBox( idx );
                  if (  box )
-                     if ( box->tqparentAxisArea() == KDChartAxisParams::AxisPosBottom
-                          || box->tqparentAxisArea() == KDChartAxisParams::AxisPosLeft
-                          || box->tqparentAxisArea() == KDChartAxisParams::AxisPosTop
-                          || box->tqparentAxisArea() == KDChartAxisParams::AxisPosRight )
+                     if ( box->parentAxisArea() == KDChartAxisParams::AxisPosBottom
+                          || box->parentAxisArea() == KDChartAxisParams::AxisPosLeft
+                          || box->parentAxisArea() == KDChartAxisParams::AxisPosTop
+                          || box->parentAxisArea() == KDChartAxisParams::AxisPosRight )
                       boxSize = box->trueRect(TQPoint( 0,0 ), _areaWidthP1000, _areaHeightP1000 ).height();
              }
 
diff --git a/kchart/kdchart/KDChartParams.cpp b/kchart/kdchart/KDChartParams.cpp
index 4c7bd8711..7306cfe0c 100644
--- a/kchart/kdchart/KDChartParams.cpp
+++ b/kchart/kdchart/KDChartParams.cpp
@@ -1041,7 +1041,7 @@ calculation of appropriate rotation for each data value.  Rotation
 will be performed around the internal <b>tqalignment point</b> of the
 text -- specified by \c negativeAlign (or \c positiveAlign, resp.).
 
-\param tqlayoutPolicy The way to handle too narrow space conflicts:
+\param layoutPolicy The way to handle too narrow space conflicts:
 what to do if a data text covers a neighboring data text (or a
         neighboring data area, resp.).
 
diff --git a/kchart/kdchart/KDChartParams_io.cpp b/kchart/kdchart/KDChartParams_io.cpp
index 0006451d6..3a3d637d3 100644
--- a/kchart/kdchart/KDChartParams_io.cpp
+++ b/kchart/kdchart/KDChartParams_io.cpp
@@ -923,7 +923,7 @@ TQDomDocument KDChartParams::saveXML( bool withPI ) const
 
         KDXML::createStringNode( doc, dataValuesSettings1Element,
                 "LayoutPolicy",
-                KDChartEnums::tqlayoutPolicyToString( _printDataValuesSettings._dataValuesLayoutPolicy ) );
+                KDChartEnums::layoutPolicyToString( _printDataValuesSettings._dataValuesLayoutPolicy ) );
 
         KDXML::createBoolNode( doc, dataValuesSettings1Element, "ShowInfinite",
                                _printDataValuesSettings._dataValuesShowInfinite );
@@ -983,7 +983,7 @@ TQDomDocument KDChartParams::saveXML( bool withPI ) const
 
         KDXML::createStringNode( doc, dataValuesSettings2Element,
                 "LayoutPolicy",
-                KDChartEnums::tqlayoutPolicyToString( _printDataValuesSettings2._dataValuesLayoutPolicy ) );
+                KDChartEnums::layoutPolicyToString( _printDataValuesSettings2._dataValuesLayoutPolicy ) );
 
         KDXML::createBoolNode( doc, dataValuesSettings2Element, "ShowInfinite",
                                _printDataValuesSettings2._dataValuesShowInfinite );