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

This reverts commit 6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3.

11 files changed, 81 insertions, 81 deletions

diff --git a/kbruch/src/exercisecompare.cpp b/kbruch/src/exercisecompare.cpp
index f74bd0a9..c00c6dd0 100644
--- a/kbruch/src/exercisecompare.cpp
+++ b/kbruch/src/exercisecompare.cpp
@@ -24,7 +24,7 @@
 
 /* these includes are needed for TQt support */
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
@@ -129,7 +129,7 @@ ExerciseCompare::ExerciseCompare(TQWidget * parent, const char * name):
 	// that the user can start typing without moving the focus
 	m_signButton->setFocus();
 
-	// show the whole layout
+	// show the whole tqlayout
 	baseWidget->show();
 
 	// add tooltip and qwhatsthis help to the widget
@@ -301,9 +301,9 @@ void ExerciseCompare::slotSignButtonClicked()
 {
 	// in RTL desktops, we still need to allign the
 	// execise to the left. On TQt4, you can set the direction
-	// of the layout to LTR (instead of inherit), but on TQt3
+	// of the tqlayout to LTR (instead of inherit), but on TQt3
 	// the only way of fixing it is inserting the widgets in reversed
-	// order to the layout.
+	// order to the tqlayout.
 	// 
 	// But... as an ugly hack, we can also display the "other" operation
 	// thats damm ugly, but will work as well :)
diff --git a/kbruch/src/exerciseconvert.cpp b/kbruch/src/exerciseconvert.cpp
index 3535eeae..0c97688a 100644
--- a/kbruch/src/exerciseconvert.cpp
+++ b/kbruch/src/exerciseconvert.cpp
@@ -26,7 +26,7 @@
 
 /* these includes are needed for TQt support */
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
@@ -120,9 +120,9 @@ ExerciseConvert::ExerciseConvert(TQWidget * parent, const char * name):
 
 	// in RTL desktops, we still need to allign the
 	// execise to the left. On TQt4, you can set the direction
-	// of the layout to LTR (instead of inherit), but on TQt3
+	// of the tqlayout to LTR (instead of inherit), but on TQt3
 	// the only way of fixing it is inserting the widgets in reversed
-	// order to the layout.
+	// order to the tqlayout.
 	//
 	// if you need help with this feel free to contact me - Diego <elcuco@kde.org> )
 	// This should fix parts of bug #116831
@@ -163,7 +163,7 @@ ExerciseConvert::ExerciseConvert(TQWidget * parent, const char * name):
 	// that the user can start typing without moving the focus
 	numer_edit->setFocus();
 
-	// show the whole layout
+	// show the whole tqlayout
 	baseWidget->show();
 
 	// add tooltip and qwhatsthis help to the widget
diff --git a/kbruch/src/exercisefactorize.cpp b/kbruch/src/exercisefactorize.cpp
index d9b5f9d3..aa12a766 100644
--- a/kbruch/src/exercisefactorize.cpp
+++ b/kbruch/src/exercisefactorize.cpp
@@ -26,7 +26,7 @@
 
 /* these includes are needed for TQt support */
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
@@ -64,40 +64,40 @@ ExerciseFactorize::ExerciseFactorize(TQWidget * parent, const char * name):
 
 	Form1Layout = new TQVBoxLayout( this, 11, 6, "Form1Layout"); 
 
-	layout9 = new TQVBoxLayout( 0, 0, 6, "layout9"); 
+	tqlayout9 = new TQVBoxLayout( 0, 0, 6, "tqlayout9"); 
 	
 	// The following method fix the problem in
 	// bug  #116831, reverse order in RTL desktops.
 	// Amit Ramon amit.ramon@kdemail.net
-	layout4 = createFactorsLayout();
-	layout9->addLayout(layout4);
+	tqlayout4 = createFactorsLayout();
+	tqlayout9->addLayout(tqlayout4);
 	
 	spacer2 = new TQSpacerItem( 20, 21, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-	layout9->addItem( spacer2 );
+	tqlayout9->addItem( spacer2 );
 	
-	layout2 = new TQVBoxLayout( 0, 0, 6, "layout2"); 
+	tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2"); 
 	
 	// The following method fix the problem in
 	// bug  #116831, reverse order in RTL desktops.
 	// Amit Ramon amit.ramon@kdemail.net
-	layout1 = createButtonsLayout();
-	layout2->addLayout(layout1);
+	tqlayout1 = createButtonsLayout();
+	tqlayout2->addLayout(tqlayout1);
 
 	m_removeLastFactorButton = new TQPushButton( this, "m_removeLastFactorButton" );
-	layout2->addWidget( m_removeLastFactorButton );
-	layout9->addLayout( layout2 );
+	tqlayout2->addWidget( m_removeLastFactorButton );
+	tqlayout9->addLayout( tqlayout2 );
 
 	spacer4 = new TQSpacerItem( 20, 21, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-	layout9->addItem( spacer4 );
+	tqlayout9->addItem( spacer4 );
 	
-	layout7 = new TQHBoxLayout( 0, 0, 6, "layout7"); 
+	tqlayout7 = new TQHBoxLayout( 0, 0, 6, "tqlayout7"); 
 	spacer3 = new TQSpacerItem( 361, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-	layout7->addItem( spacer3 );
+	tqlayout7->addItem( spacer3 );
 	
 	m_checkButton = new TQPushButton( this, "m_checkButton" );
-	layout7->addWidget( m_checkButton );
-	layout9->addLayout( layout7 );
-	Form1Layout->addLayout( layout9 );
+	tqlayout7->addWidget( m_checkButton );
+	tqlayout9->addLayout( tqlayout7 );
+	Form1Layout->addLayout( tqlayout9 );
 
 	// the current task
 	TQString tmp_str;
@@ -228,16 +228,16 @@ void ExerciseFactorize::update()
 
 //
 // The following method was added to fix
-// bug #116831 (reverse layout in RTL desktops)
+// bug #116831 (reverse tqlayout in RTL desktops)
 // Amit Ramon amit.ramon@kdemail.net
 //
 
-/** Create the layout that hold the exercise widgets
+/** Create the tqlayout that hold the exercise widgets
  */
 TQHBoxLayout* ExerciseFactorize::createFactorsLayout()
 {
   // first create all widgets
-  TQHBoxLayout* layout = new TQHBoxLayout( 0, 0, 6, "layout4"); 
+  TQHBoxLayout* tqlayout = new TQHBoxLayout( 0, 0, 6, "tqlayout4"); 
   
   m_taskLabel = new TQLabel( this, "m_taskLabel" );
 
@@ -258,46 +258,46 @@ TQHBoxLayout* ExerciseFactorize::createFactorsLayout()
   spacer1 =  new TQSpacerItem( 25, 20, TQSizePolicy::Expanding,
 				    TQSizePolicy::Minimum );
 
-  // now add the widgets to the layout.
+  // now add the widgets to the tqlayout.
   // if we are in a RTL desktop, add them
   // in a reverse order
   if (TQApplication::reverseLayout())
     {
-      layout->addItem( spacer1 );
-      layout->addWidget( result_label );
-      layout->addWidget( m_factorsWidget );
-      layout->addWidget( m_factorsEnteredEdit );
-      layout->addWidget( m_equalSignLabel );
-      layout->addWidget( m_taskLabel );
+      tqlayout->addItem( spacer1 );
+      tqlayout->addWidget( result_label );
+      tqlayout->addWidget( m_factorsWidget );
+      tqlayout->addWidget( m_factorsEnteredEdit );
+      tqlayout->addWidget( m_equalSignLabel );
+      tqlayout->addWidget( m_taskLabel );
     }
   else
     {
-      layout->addWidget( m_taskLabel );
-      layout->addWidget( m_equalSignLabel );
-      layout->addWidget( m_factorsEnteredEdit );
-      layout->addWidget( m_factorsWidget );
-      layout->addWidget( result_label );
-      layout->addItem( spacer1 );
+      tqlayout->addWidget( m_taskLabel );
+      tqlayout->addWidget( m_equalSignLabel );
+      tqlayout->addWidget( m_factorsEnteredEdit );
+      tqlayout->addWidget( m_factorsWidget );
+      tqlayout->addWidget( result_label );
+      tqlayout->addItem( spacer1 );
     }
   
-  return layout;
+  return tqlayout;
 }
 
 
 //
 // The following method was added to fix
-// bug #116831 (reverse layout in RTL desktops)
+// bug #116831 (reverse tqlayout in RTL desktops)
 // Amit Ramon amit.ramon@kdemail.net
 //
 
-/** Create the layout that hold the exercise widgets
+/** Create the tqlayout that hold the exercise widgets
  */
 TQGridLayout* ExerciseFactorize::createButtonsLayout()
 {
   const int _COLS = 4; // number of buttons in each row
   const int _ROWS = 2; // number of rows
 
-  TQGridLayout* layout = new TQGridLayout( 0, 1, 1, 0, 6, "layout1"); 
+  TQGridLayout* tqlayout = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout1"); 
 	
   // first row buttons
   m_factor2Button = new TQPushButton( this, "m_factor2Button" );
@@ -348,12 +348,12 @@ TQGridLayout* ExerciseFactorize::createButtonsLayout()
       
       for (int col = 0; col < _COLS; col++)
 	{
-	  layout->addWidget(buttons[row][buttonIdx], row, col );
+	  tqlayout->addWidget(buttons[row][buttonIdx], row, col );
 	  buttonIdx += step;
 	}
     }
   
-  return layout;
+  return tqlayout;
 }
 
 
diff --git a/kbruch/src/exercisefactorize.h b/kbruch/src/exercisefactorize.h
index c5ded345..8a6f5c2c 100644
--- a/kbruch/src/exercisefactorize.h
+++ b/kbruch/src/exercisefactorize.h
@@ -116,14 +116,14 @@ private:
 
 	//
 	// the following two methods were added to fix
-	// bug #116831 (reverse layout in RTL desktops)
+	// bug #116831 (reverse tqlayout in RTL desktops)
 	// Amit Ramon amit.ramon@kdemail.net
 	//
 
-	/** create the factor widgets layout */
+	/** create the factor widgets tqlayout */
 	TQHBoxLayout* createFactorsLayout();
 
-	/** create the (answer) buttons layout */
+	/** create the (answer) buttons tqlayout */
 	TQGridLayout* createButtonsLayout();
 	
 
@@ -136,14 +136,14 @@ private:
 
 protected:
 	TQVBoxLayout* Form1Layout;
-	TQVBoxLayout* layout9;
+	TQVBoxLayout* tqlayout9;
 	TQSpacerItem* spacer4;
-	TQHBoxLayout* layout4;
+	TQHBoxLayout* tqlayout4;
 	TQSpacerItem* spacer1;
 	TQSpacerItem* spacer2;
-	TQVBoxLayout* layout2;
-	TQGridLayout* layout1;
-	TQHBoxLayout* layout7;
+	TQVBoxLayout* tqlayout2;
+	TQGridLayout* tqlayout1;
+	TQHBoxLayout* tqlayout7;
 	TQSpacerItem* spacer3;
 
 private slots:
diff --git a/kbruch/src/fractionbasewidget.cpp b/kbruch/src/fractionbasewidget.cpp
index c1fec755..b8dbfacd 100644
--- a/kbruch/src/fractionbasewidget.cpp
+++ b/kbruch/src/fractionbasewidget.cpp
@@ -161,7 +161,7 @@ void FractionBaseWidget::setColorAndFont()
 	/* set font */
 	m_font = SettingsClass::taskFont();
 
-	// repaint
+	// tqrepaint
 	update();
 
 	return;
diff --git a/kbruch/src/mainqtwidget.cpp b/kbruch/src/mainqtwidget.cpp
index f04fc17a..ed0836c8 100644
--- a/kbruch/src/mainqtwidget.cpp
+++ b/kbruch/src/mainqtwidget.cpp
@@ -109,7 +109,7 @@ MainQtWidget::MainQtWidget()
 
 #if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3)
 #else
-	resize(TQSize(TQMAX(toolBar()->sizeHint().width(), sizeHint().width()), sizeHint().height()));
+	resize(TQSize(TQMAX(toolBar()->tqsizeHint().width(), tqsizeHint().width()), tqsizeHint().height()));
 #endif
 	// now show the last exercise
 	m_exercises->showPage(SettingsClass::activeExercise());
@@ -243,7 +243,7 @@ void MainQtWidget::setupActions()
 	
 #if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3)
 	if (!initialGeometrySet())
-		resize( TQSize(725, 330).expandedTo(minimumSizeHint()));
+		resize( TQSize(725, 330).expandedTo(tqminimumSizeHint()));
 	setupGUI(ToolBar | Keys | StatusBar | Create);
 	setAutoSaveSettings();
 #endif
diff --git a/kbruch/src/ratio.h b/kbruch/src/ratio.h
index f0b69d92..c9ee687a 100644
--- a/kbruch/src/ratio.h
+++ b/kbruch/src/ratio.h
@@ -18,7 +18,7 @@
 #ifndef RATIO_H
 #define RATIO_H
 
-#include <textstream.h>
+#include <tqtextstream.h>
 
 /** Represents a ratio
  *  This class represents 1 ratio. There are several functions provided to
diff --git a/kbruch/src/statisticsview.cpp b/kbruch/src/statisticsview.cpp
index 8e6db5d6..6c73b2b8 100644
--- a/kbruch/src/statisticsview.cpp
+++ b/kbruch/src/statisticsview.cpp
@@ -20,7 +20,7 @@
 
 /* the includes are needed for TQt support */
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
@@ -48,17 +48,17 @@ StatisticsView::StatisticsView(TQWidget * parent, const char * name):
 	/* set the caption of the window */
 	//	setCaption(i18n("Statistics"));
 
-	/* add a layout as a base */
-	layout1 = new TQVBoxLayout(this);
-	layout1->setSpacing(6);
-	layout1->setMargin(6);
+	/* add a tqlayout as a base */
+	tqlayout1 = new TQVBoxLayout(this);
+	tqlayout1->setSpacing(6);
+	tqlayout1->setMargin(6);
 
 	/* now add a v-spacer */
 	TQSpacerItem * v_spacer = new TQSpacerItem(1, 1);
-	layout1->addItem(v_spacer);
+	tqlayout1->addItem(v_spacer);
 
 	/* create a grid to show the labels */
-	labelGrid = new TQGridLayout(layout1, 3, 2);
+	labelGrid = new TQGridLayout(tqlayout1, 3, 2);
 
 	/* add 6 labels to the grid */
 	info1Label = new TQLabel(this);
@@ -112,10 +112,10 @@ StatisticsView::StatisticsView(TQWidget * parent, const char * name):
 
 	/* now add a v-spacer */
 	v_spacer = new TQSpacerItem(1, 1);
-	layout1->addItem(v_spacer);
+	tqlayout1->addItem(v_spacer);
 
 	/* the Reset button */
-	buttonLayout = new TQHBoxLayout(layout1);
+	buttonLayout = new TQHBoxLayout(tqlayout1);
 	resetBtn = new TQPushButton(i18n("&Reset"), this);
 	TQObject::connect(resetBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetStatistics()));
 	buttonLayout->addWidget(resetBtn);
@@ -150,14 +150,14 @@ void StatisticsView::addCorrect()
 {
 	++m_count;
 	++m_correct;
-	(void) calc(); /* repaint the statistics */
+	(void) calc(); /* tqrepaint the statistics */
 }
 
 /* called, if a task was solved wrong */
 void StatisticsView::addWrong()
 {
 	++m_count;
-	(void) calc(); /* repaint the statistics */
+	(void) calc(); /* tqrepaint the statistics */
 }
 
 
@@ -169,7 +169,7 @@ void StatisticsView::calc()
 	TQString new_text;
 	TQString number;
 
-	new_text = TQString("<b>%1</b>").arg(m_count);
+	new_text = TQString("<b>%1</b>").tqarg(m_count);
 	result1Label->setText(new_text);
 
 	/* we have to be careful with division by 0 */
@@ -179,11 +179,11 @@ void StatisticsView::calc()
 		result3Label->setText("- (- %)");
 	} else {
 		/* set the correct label */
-		new_text = TQString("%1 (%2 %)").arg(m_correct).arg(int(double(m_correct) / m_count * 100));
+		new_text = TQString("%1 (%2 %)").tqarg(m_correct).tqarg(int(double(m_correct) / m_count * 100));
 		result2Label->setText(new_text);
 
 		/* set the incorrect label */
-		new_text = TQString("%1 (%2 %)").arg(m_count - m_correct).arg(int(double(m_count - m_correct) / m_count * 100));
+		new_text = TQString("%1 (%2 %)").tqarg(m_count - m_correct).tqarg(int(double(m_count - m_correct) / m_count * 100));
 		result3Label->setText(new_text);
 	}
 }
diff --git a/kbruch/src/statisticsview.h b/kbruch/src/statisticsview.h
index c95eec0e..9b2821b8 100644
--- a/kbruch/src/statisticsview.h
+++ b/kbruch/src/statisticsview.h
@@ -66,7 +66,7 @@ private:
 
 	TQPushButton * resetBtn;
 	TQHBoxLayout * buttonLayout;
-	TQVBoxLayout * layout1;
+	TQVBoxLayout * tqlayout1;
 	TQGridLayout * labelGrid;
 	TQLabel * result1Label;
 	TQLabel * result2Label;
diff --git a/kbruch/src/taskview.cpp b/kbruch/src/taskview.cpp
index 9c1b1ace..2cb4f8ec 100644
--- a/kbruch/src/taskview.cpp
+++ b/kbruch/src/taskview.cpp
@@ -26,7 +26,7 @@
 
 /* these includes are needed for TQt support */
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
@@ -114,9 +114,9 @@ TaskView::TaskView(TQWidget * parent, const char * name,	bool padd_sub,
 	// --- that is the end of the horizontal line ---
 	// in RTL desktops, we still need to allign the
 	// execise to the left. On TQt4, you can set the direction
-	// of the layout to LTR (instead of inherit), but on TQt3
+	// of the tqlayout to LTR (instead of inherit), but on TQt3
 	// the only way of fixing it is inserting the widgets in reversed
-	// order to the layout.
+	// order to the tqlayout.
 	//
 	// if you need help with this feel free to contact me - Diego <elcuco@kde.org> )
 	// This should fix parts of bug #116831
@@ -158,10 +158,10 @@ TaskView::TaskView(TQWidget * parent, const char * name,	bool padd_sub,
 	// that the user can start typing without moving the focus
 	numer_edit->setFocus();
 
-	// show the whole layout
+	// show the whole tqlayout
 	baseWidget->show();
 
-	// show the whole layout
+	// show the whole tqlayout
 	m_taskWidget->show();
 	m_resultWidget->hide();
 
diff --git a/kbruch/src/taskvieweroptionsbase.ui b/kbruch/src/taskvieweroptionsbase.ui
index 66f45d15..8938ac96 100644
--- a/kbruch/src/taskvieweroptionsbase.ui
+++ b/kbruch/src/taskvieweroptionsbase.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -42,7 +42,7 @@
                 </widget>
                 <widget class="TQGroupBox">
                     <property name="name">
-                        <cstring>colorGroupBox</cstring>
+                        <cstring>tqcolorGroupBox</cstring>
                     </property>
                     <property name="sizePolicy">
                         <sizepolicy>
@@ -57,7 +57,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout7</cstring>
+                            <cstring>tqlayout7</cstring>
                         </property>
                         <property name="geometry">
                             <rect>