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

This reverts commit c2637a0da6d9a1c8626ca39f8451ab3b7cda487a.

14 files changed, 41 insertions, 41 deletions

diff --git a/kcoloredit/colorselector.cpp b/kcoloredit/colorselector.cpp
index 117259ab..acf1fd06 100644
--- a/kcoloredit/colorselector.cpp
+++ b/kcoloredit/colorselector.cpp
@@ -17,7 +17,7 @@
 
 #include <math.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 /* #include <tqtabwidget.h> */
 #include <tqradiobutton.h>
 #include <tqlabel.h>
@@ -53,7 +53,7 @@ ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(par
 	topLayout->addWidget(gradientSelection, 10);
 	KSeparator* hLine = new KSeparator(KSeparator::HLine, this);
 	topLayout->addWidget(hLine);
-	TQHBoxLayout* layout = new TQHBoxLayout();
+	TQHBoxLayout* tqlayout = new TQHBoxLayout();
 	TextEditSelection* textEditSelection = new TextEditSelection(this);
 	connect(textEditSelection, TQT_SIGNAL( valueChanged(Color*) ), TQT_SLOT( slotSetColor(Color*) ));
 	connect(this, TQT_SIGNAL( valueChanged(Color*) ), textEditSelection, TQT_SLOT( slotSetValue(Color*) ));
@@ -88,17 +88,17 @@ ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(par
 	colorChangeLayout->addStretch(10);
 	colorChangeLayout->addWidget(colorChangeSliderWidget);
 	colorChangeLayout->addStretch(10);
-	layout->addLayout(colorChangeLayout, 10);
+	tqlayout->addLayout(colorChangeLayout, 10);
 	m_color.setComponents(RGB_MAX_COMPONENT_VALUE, RGB_MAX_COMPONENT_VALUE, RGB_MAX_COMPONENT_VALUE);
 	slotColorReplace();
 	KSeparator* vLine = new KSeparator(KSeparator::VLine, this);
-	layout->addWidget(vLine);
-	layout->addWidget(textEditSelection, 1);
+	tqlayout->addWidget(vLine);
+	tqlayout->addWidget(textEditSelection, 1);
 	colorPatch = new KColorPatch(this);
 	connect(colorPatch, TQT_SIGNAL( colorChanged(const TQColor&) ), TQT_SLOT( slotSetColor(const TQColor&) ));
 	colorPatch->setMinimumSize(80, 64);
-	layout->addWidget(colorPatch, 10);
-	topLayout->addLayout(layout);
+	tqlayout->addWidget(colorPatch, 10);
+	topLayout->addLayout(tqlayout);
 }
 ColorSelector::~ColorSelector() {
 }
diff --git a/kcoloredit/gradientselection.cpp b/kcoloredit/gradientselection.cpp
index 749c5464..fd1b7a87 100644
--- a/kcoloredit/gradientselection.cpp
+++ b/kcoloredit/gradientselection.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqframe.h>
 #include <tqradiobutton.h>
 #include <tqcolor.h>
@@ -26,13 +26,13 @@
 
 GradientSelection::GradientSelection(TQWidget *parent, const char *name ) : TQWidget(parent,name) {
 	TQGridLayout* topLayout = new TQGridLayout(this, 2, 2, 0);
-	TQHBoxLayout* layout = new TQHBoxLayout(0);
-	layout->setMargin(3);
+	TQHBoxLayout* tqlayout = new TQHBoxLayout(0);
+	tqlayout->setMargin(3);
 	xyColorSelector = new KXYColorSelector(this);
 	connect(xyColorSelector, TQT_SIGNAL( valueChanged(int, int) ),
 		TQT_SLOT( slotXyColorSelectorPosChanged(int, int) ));
-	layout->addWidget(xyColorSelector);
-	topLayout->addLayout(layout, 0, 0);
+	tqlayout->addWidget(xyColorSelector);
+	topLayout->addLayout(tqlayout, 0, 0);
 	topLayout->setRowStretch(0, 10);
 	topLayout->setRowStretch(1, 0);
 	TQVBoxLayout* xyColorSelectorLayout = new TQVBoxLayout();
diff --git a/kcoloredit/kcoloredit.h b/kcoloredit/kcoloredit.h
index 675cddb0..e09fd415 100644
--- a/kcoloredit/kcoloredit.h
+++ b/kcoloredit/kcoloredit.h
@@ -74,7 +74,7 @@ class KColorEditApp : public KMainWindow
     KColorEditDoc *document() const;
 
   protected:
-    /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration
+    /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration
      * file
      */
     void saveOptions();
diff --git a/kcoloredit/kcoloreditdoc.cpp b/kcoloredit/kcoloreditdoc.cpp
index f4c2f1e9..0669380b 100644
--- a/kcoloredit/kcoloreditdoc.cpp
+++ b/kcoloredit/kcoloreditdoc.cpp
@@ -19,7 +19,7 @@
 #include <tqdir.h>
 #include <tqfileinfo.h>
 #include <tqwidget.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 // include files for KDE
 #include <klocale.h>
@@ -235,7 +235,7 @@ void KColorEditDoc::copyToClipboard(Palette& palette) {
 	TQString text;
 	TQTextOStream stream(&text);
 	palette.save(stream, 0, false);
-	KApplication::clipboard()->setText(text);
+	KApplication::tqclipboard()->setText(text);
 
     emit clipboardChanged();
 }
@@ -260,7 +260,7 @@ void KColorEditDoc::paste() {
 	Palette palettePaste;
 	TQString text;
 	TQTextIStream stream(&text);
-	text = KApplication::clipboard()->text();
+	text = KApplication::tqclipboard()->text();
 	if(palettePaste.load( stream, false )) {
 		m_paletteHistory.paste(paletteCursorPos(), palettePaste);
 		setPaletteSelection(paletteCursorPos(), paletteCursorPos() +
diff --git a/kcoloredit/kcoloreditview.cpp b/kcoloredit/kcoloreditview.cpp
index 89b84e6f..32e61a06 100644
--- a/kcoloredit/kcoloreditview.cpp
+++ b/kcoloredit/kcoloreditview.cpp
@@ -17,7 +17,7 @@
 
 // include files for TQt
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqvgroupbox.h>
 #include <tqlineedit.h>
@@ -43,7 +43,7 @@ KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter(
 	TQVBoxLayout* paletteLayout = new TQVBoxLayout(paletteViewArea);
 	paletteView = new PaletteView(16, 16, 2, this, paletteViewArea);
 	paletteLayout->addWidget(paletteView, 10);
-	TQHBoxLayout* layout = new TQHBoxLayout();
+	TQHBoxLayout* tqlayout = new TQHBoxLayout();
 	TQVBoxLayout* addColorLayout = new TQVBoxLayout(4);
 	addColorLayout->setMargin(8);
 	TQHBoxLayout* buttonsLayout = new TQHBoxLayout(4);
@@ -70,7 +70,7 @@ KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter(
 	//	paletteView, TQT_SLOT( slotCursorFollowsChosenColor(bool) ));
 	//cursorFollowsChosenColor->toggle();
 	paletteView->slotCursorFollowsChosenColor(true);
-	layout->addLayout(addColorLayout, 0);
+	tqlayout->addLayout(addColorLayout, 0);
 	TQVGroupBox* colorAtCursorFrame = new TQVGroupBox(i18n("Color at Cursor"), paletteViewArea);
 	TQWidget* colorAtCursorFrameArea = new TQWidget(colorAtCursorFrame);
 	TQVBoxLayout* colorAtCursorLayout = new TQVBoxLayout(colorAtCursorFrameArea, 4);
@@ -127,10 +127,10 @@ KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter(
 	colorAtCursorRgbStringLayout->addWidget(colorAtCursorRgbStringValueLabel);
 	colorAtCursorRgbStringLayout->addStretch();
 	colorAtCursorLayout->addLayout(colorAtCursorRgbStringLayout);
-	layout->addWidget(colorAtCursorFrame, 10);
-	layout->addSpacing(8);
+	tqlayout->addWidget(colorAtCursorFrame, 10);
+	tqlayout->addSpacing(8);
 	paletteLayout->addSpacing(4);
-	paletteLayout->addLayout(layout);
+	paletteLayout->addLayout(tqlayout);
 	paletteLayout->addSpacing(4);
 	inColorNameChanging = false;
 	doNotUpdateColorLabels = false;
diff --git a/kcoloredit/kxycolorselector.cpp b/kcoloredit/kxycolorselector.cpp
index e6c0e6ef..68df676d 100644
--- a/kcoloredit/kxycolorselector.cpp
+++ b/kcoloredit/kxycolorselector.cpp
@@ -42,7 +42,7 @@ void KXYColorSelector::setType(const int type) {
 
 void KXYColorSelector::updateContents() {
 	drawPalette(&pixmap);
-	repaint();
+	tqrepaint();
 }
 
 void KXYColorSelector::resizeEvent(TQResizeEvent*) {
diff --git a/kcoloredit/kzcolorselector.cpp b/kcoloredit/kzcolorselector.cpp
index bb4a3c23..c705cad0 100644
--- a/kcoloredit/kzcolorselector.cpp
+++ b/kcoloredit/kzcolorselector.cpp
@@ -53,7 +53,7 @@ void KZColorSelector::setType(const int type) {
 
 void KZColorSelector::updateContents() {
 	drawPalette(&pixmap);
-	repaint(false);
+	tqrepaint(false);
 }
 
 void KZColorSelector::resizeEvent(TQResizeEvent*) {
diff --git a/kcoloredit/loadpalettedlg.cpp b/kcoloredit/loadpalettedlg.cpp
index d7ac54aa..23def4d5 100644
--- a/kcoloredit/loadpalettedlg.cpp
+++ b/kcoloredit/loadpalettedlg.cpp
@@ -17,7 +17,7 @@
 
 #include <string.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/kcoloredit/palette.cpp b/kcoloredit/palette.cpp
index 5745d824..42758b41 100644
--- a/kcoloredit/palette.cpp
+++ b/kcoloredit/palette.cpp
@@ -17,7 +17,7 @@
 
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqregexp.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/kcoloredit/palette.h b/kcoloredit/palette.h
index ccba9a6f..a363ada4 100644
--- a/kcoloredit/palette.h
+++ b/kcoloredit/palette.h
@@ -19,7 +19,7 @@
 #define PALETTE_H
 
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfile.h>
 
 #include "color.h"
diff --git a/kcoloredit/paletteview.cpp b/kcoloredit/paletteview.cpp
index 7d932c4f..52e8b4be 100644
--- a/kcoloredit/paletteview.cpp
+++ b/kcoloredit/paletteview.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include "kcoloreditview.h"
 #include "paletteview.h"
diff --git a/kcoloredit/paletteviewscrolledarea.cpp b/kcoloredit/paletteviewscrolledarea.cpp
index 23bd280c..63cb3f9b 100644
--- a/kcoloredit/paletteviewscrolledarea.cpp
+++ b/kcoloredit/paletteviewscrolledarea.cpp
@@ -19,7 +19,7 @@
 #include <tqptrlist.h>
 #include <tqcolor.h>
 #include <tqcursor.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
 #include <tqpen.h>
@@ -77,7 +77,7 @@ void PaletteViewScrolledArea::redraw() {
 }
 
 void PaletteViewScrolledArea::repaintPalette() {
-	repaint(false);
+	tqrepaint(false);
 }
 
 void PaletteViewScrolledArea::checkSelectionAutoScroll(const int mousePosY) {
@@ -220,7 +220,7 @@ void PaletteViewScrolledArea::paintEvent(TQPaintEvent* /*event*/) {
 	setCellsSizes();
 	TQPixmap pixmap(size());
 	TQPainter painter;
-	painter.begin(TQT_TQPAINTDEVICE(&pixmap), this);
+	painter.tqbegin(TQT_TQPAINTDEVICE(&pixmap), this);
 	TQFontMetrics fontMetrics = painter.fontMetrics();
 	int maxLineWidth;
 	if(viewColorNames) {
@@ -249,12 +249,12 @@ void PaletteViewScrolledArea::paintEvent(TQPaintEvent* /*event*/) {
 	int lastRow = (posY + height() - 1 + rowHeight - 1)/rowHeight;
 	if(viewColorNames)
 		painter.fillRect(0, 0, rowWidth, height(),
-        TQBrush( TQFrame::palette().active().base() ));
-	TQBrush normalBackgroundBrush(TQFrame::palette().active().background());
-	TQBrush selectedBackgroundBrush(TQFrame::palette().active().highlight());
+        TQBrush( TQFrame::tqpalette().active().base() ));
+	TQBrush normalBackgroundBrush(TQFrame::tqpalette().active().background());
+	TQBrush selectedBackgroundBrush(TQFrame::tqpalette().active().highlight());
 	TQBrush foregroundBrush;
-	TQBrush cursorBrush(TQFrame::palette().active().foreground());
-	TQPen backgroundPen(TQFrame::palette().active().foreground());
+	TQBrush cursorBrush(TQFrame::tqpalette().active().foreground());
+	TQPen backgroundPen(TQFrame::tqpalette().active().foreground());
 	int min = selectionMin();
 	int max = selectionMax();
 	int fontAscent = fontMetrics.ascent();
diff --git a/kcoloredit/texteditselection.cpp b/kcoloredit/texteditselection.cpp
index d32e054e..1b49ec6a 100644
--- a/kcoloredit/texteditselection.cpp
+++ b/kcoloredit/texteditselection.cpp
@@ -59,14 +59,14 @@ TextEditSelection::~TextEditSelection(){
 }
 
 void TextEditSelection::addComponent(const int index, TQLineEdit* lineEdit, const int maxValue,
-	const TQString& labelString, const int row, const int column, TQGridLayout* layout) {
+	const TQString& labelString, const int row, const int column, TQGridLayout* tqlayout) {
 	TQLabel* label = new TQLabel(labelString, this);
 	lineEdit->setValidator(new TQIntValidator( 0, maxValue, TQT_TQOBJECT(lineEdit) ));
 	lineEditTable[index] = lineEdit;
 	lineEdit->setMinimumWidth(lineEdit->fontMetrics().width( TQString("8888") ));
 	lineEdit->setMaximumWidth(lineEdit->fontMetrics().width( TQString("8888888") ));
-	layout->addWidget(label, row, column*3);
-	layout->addWidget(lineEdit, row, column*3 + 1);
+	tqlayout->addWidget(label, row, column*3);
+	tqlayout->addWidget(lineEdit, row, column*3 + 1);
 }
 
 void TextEditSelection::setRgbString(const int red, const int green, const int blue) {
diff --git a/kcoloredit/texteditselection.h b/kcoloredit/texteditselection.h
index 776b81f3..e0ef91f5 100644
--- a/kcoloredit/texteditselection.h
+++ b/kcoloredit/texteditselection.h
@@ -20,7 +20,7 @@
 
 #include <tqwidget.h>
 #include <tqlineedit.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include "color.h"
 
@@ -48,7 +48,7 @@ public slots:
 protected:
 	/** Adds a component line edit */
 	void addComponent(const int index, TQLineEdit* lineEdit, const int maxValue, const TQString& labelString,
-		const int row, const int column, TQGridLayout* layout);
+		const int row, const int column, TQGridLayout* tqlayout);
 	/** sets RGB string in rgbStringLineEdit */
 	void setRgbString(const int red, const int green, const int blue);