Rename a number of old tq methods that are no longer tq specific

10 files changed, 19 insertions, 19 deletions

diff --git a/lib/kopainter/koColorChooser.cc b/lib/kopainter/koColorChooser.cc
index e2406a79..dc70b921 100644
--- a/lib/kopainter/koColorChooser.cc
+++ b/lib/kopainter/koColorChooser.cc
@@ -21,7 +21,7 @@
 #include "koColorChooser.h"
 
 #include <tqcolor.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqspinbox.h>
 #include <tqtabwidget.h>
 
diff --git a/lib/kopainter/koColorSlider.cc b/lib/kopainter/koColorSlider.cc
index 6c1f8230..6e7c0239 100644
--- a/lib/kopainter/koColorSlider.cc
+++ b/lib/kopainter/koColorSlider.cc
@@ -60,14 +60,14 @@ void KoColorFrame::slotSetColor1(const TQColor &c)
   mC1 = c;
   mColorChanged = true;
   mPixChanged = true;
-  tqrepaint();
+  repaint();
 }
 
 void KoColorFrame::slotSetColor2(const TQColor &c)
 {
   mC2 = c;
   mColorChanged = true;
-  tqrepaint();
+  repaint();
 }
 
 void KoColorFrame::drawContents(TQPainter *p)
diff --git a/lib/kopainter/koFrameButton.cc b/lib/kopainter/koFrameButton.cc
index c87fe230..d5f2dada 100644
--- a/lib/kopainter/koFrameButton.cc
+++ b/lib/kopainter/koFrameButton.cc
@@ -37,7 +37,7 @@ TQLabel(parent, name)
   setFrameStyle(Panel | Raised);
   setLineWidth(1);
   setText(text);
-  tqsetAlignment(AlignHCenter | AlignVCenter);
+  setAlignment(AlignHCenter | AlignVCenter);
   mActive = false;
   mToggle = false;
 }
diff --git a/lib/kopainter/koIconChooser.cc b/lib/kopainter/koIconChooser.cc
index 4604bbbd..6d122592 100644
--- a/lib/kopainter/koIconChooser.cc
+++ b/lib/kopainter/koIconChooser.cc
@@ -26,7 +26,7 @@
 #include <tqcursor.h>
 #include <tqapplication.h>
 #include <tqhbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kdebug.h>
 
 KoPixmapWidget::KoPixmapWidget(const TQPixmap &aPixmap, TQWidget *parent, const char *name):
@@ -166,7 +166,7 @@ void KoIconChooser::setCurrentItem(KoIconItem *item)
     mCurRow = index / mNCols;
     mCurCol = index % mNCols;
 
-    // tqrepaint the old and the new item
+    // repaint the old and the new item
     repaintCell(oldRow, oldCol);
     repaintCell(mCurRow, mCurCol);
 
@@ -446,7 +446,7 @@ KoPatternChooser::KoPatternChooser( const TQPtrList<KoIconItem> &list, TQWidget
 	for( itr.toFirst(); itr.current(); ++itr )
 		chooser->addItem( itr.current() );
 
-	TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 1, -1, "main tqlayout" );
+	TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 1, -1, "main layout" );
 	mainLayout->addWidget( chooser, 10 );
 }
 
diff --git a/lib/kopainter/ko_cmyk_widget.cc b/lib/kopainter/ko_cmyk_widget.cc
index 1eb9eece..01c71d84 100644
--- a/lib/kopainter/ko_cmyk_widget.cc
+++ b/lib/kopainter/ko_cmyk_widget.cc
@@ -22,7 +22,7 @@
 
 #include "ko_cmyk_widget.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
@@ -41,7 +41,7 @@
 KoCMYKWidget::KoCMYKWidget(TQWidget *parent, const char *name) : super(parent, name)
 {
     m_ColorButton = new KDualColorButton(this);
-    m_ColorButton ->  setFixedSize(m_ColorButton->tqsizeHint());
+    m_ColorButton ->  setFixedSize(m_ColorButton->sizeHint());
     TQGridLayout *mGrid = new TQGridLayout(this, 4, 5, 5, 2);
 
     /* setup color sliders */
diff --git a/lib/kopainter/ko_color_wheel.cc b/lib/kopainter/ko_color_wheel.cc
index 0c268849..f309125c 100644
--- a/lib/kopainter/ko_color_wheel.cc
+++ b/lib/kopainter/ko_color_wheel.cc
@@ -49,7 +49,7 @@ void KoColorWheel::drawWheel( TQPixmap *pixmap )
     TQPoint center(size/2, size/2);
 
     TQImage image( size, size, 32 );
-    image.fill(tqcolorGroup ().background().pixel());
+    image.fill(colorGroup ().background().pixel());
 
     TQColor col;
     int a, b, h, s;
diff --git a/lib/kopainter/ko_gray_widget.cc b/lib/kopainter/ko_gray_widget.cc
index e40031b5..fb59947e 100644
--- a/lib/kopainter/ko_gray_widget.cc
+++ b/lib/kopainter/ko_gray_widget.cc
@@ -19,7 +19,7 @@
 
 #include "ko_gray_widget.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
@@ -36,7 +36,7 @@ KoGrayWidget::KoGrayWidget(TQWidget *parent, const char *name) : super(parent, n
     m_ColorButton = new KDualColorButton(this);
     Q_CHECK_PTR(m_ColorButton);
 
-    m_ColorButton ->  setFixedSize(m_ColorButton->tqsizeHint());
+    m_ColorButton ->  setFixedSize(m_ColorButton->sizeHint());
     TQGridLayout *mGrid = new TQGridLayout(this, 3, 5, 5, 2);
 
     /* setup color sliders */
diff --git a/lib/kopainter/ko_hsv_widget.cc b/lib/kopainter/ko_hsv_widget.cc
index c870248a..840c0b2d 100644
--- a/lib/kopainter/ko_hsv_widget.cc
+++ b/lib/kopainter/ko_hsv_widget.cc
@@ -21,7 +21,7 @@
 #include "ko_color_wheel.h"
 
 #include <kselect.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
@@ -37,7 +37,7 @@
 KoHSVWidget::KoHSVWidget(TQWidget *parent, const char *name) : super(parent, name)
 {
     m_ColorButton = new KDualColorButton(this);
-    m_ColorButton ->  setFixedSize(m_ColorButton->tqsizeHint());
+    m_ColorButton ->  setFixedSize(m_ColorButton->sizeHint());
 
     TQGridLayout *mGrid = new TQGridLayout(this, 5, 7, 5, 2);
     m_colorwheel = new KoColorWheel(this);
@@ -96,7 +96,7 @@ KoHSVWidget::KoHSVWidget(TQWidget *parent, const char *name) : super(parent, nam
     connect(mSIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSChanged(int)));
     connect(mVIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotVChanged(int)));
 
-    //setFixedSize(mGrid -> tqminimumSize());
+    //setFixedSize(mGrid -> minimumSize());
     m_autovalue = true; // So on the initial selection of h or v, s gets set to 255.
 
     update(TQt::black, TQt::white);
@@ -236,7 +236,7 @@ void KoHSVWidget::update(const KoColor & fgColor, const KoColor & bgColor)
     mSIn->blockSignals(false);
     mVIn->blockSignals(false);
     m_VSelector->blockSignals(false);
-    m_VSelector->tqrepaint(false);
+    m_VSelector->repaint(false);
     m_colorwheel->blockSignals(false);
 }
 
diff --git a/lib/kopainter/ko_rgb_widget.cc b/lib/kopainter/ko_rgb_widget.cc
index 5eaef38e..1eadfc96 100644
--- a/lib/kopainter/ko_rgb_widget.cc
+++ b/lib/kopainter/ko_rgb_widget.cc
@@ -21,7 +21,7 @@
 
 #include "ko_rgb_widget.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
@@ -38,7 +38,7 @@
 KoRGBWidget::KoRGBWidget(TQWidget *parent, const char *name) : super(parent, name)
 {
     m_ColorButton = new KDualColorButton(this);
-    m_ColorButton ->  setFixedSize(m_ColorButton->tqsizeHint());
+    m_ColorButton ->  setFixedSize(m_ColorButton->sizeHint());
     TQGridLayout *mGrid = new TQGridLayout(this, 3, 5, 5, 2);
 
     /* setup color sliders */
diff --git a/lib/kopainter/kogradientmanager.cc b/lib/kopainter/kogradientmanager.cc
index c95a5671..a2265d59 100644
--- a/lib/kopainter/kogradientmanager.cc
+++ b/lib/kopainter/kogradientmanager.cc
@@ -21,7 +21,7 @@
 
 #include "svgnamedcolors.h"
 
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqcstring.h>
 
 #include <kdebug.h>