Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 69e4de2f4cee257151ca13b207dc677b2d958fed)

6 files changed, 39 insertions, 39 deletions

diff --git a/kbruch/src/exercisecompare.cpp b/kbruch/src/exercisecompare.cpp
index b98d5c78..b5a94b84 100644
--- a/kbruch/src/exercisecompare.cpp
+++ b/kbruch/src/exercisecompare.cpp
@@ -86,7 +86,7 @@ ExerciseCompare::ExerciseCompare(TQWidget * parent, const char * name):
 
 	m_signButtonState = lessThen;
 	taskLineHBoxLayout->addWidget(m_signButton);
-	TQObject::connect(m_signButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSignButtonClicked()));
+	TQObject::connect(m_signButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSignButtonClicked()));
 	TQToolTip::add(m_signButton, i18n("Click on this button to change the comparison sign."));
 
 	// spacer
@@ -124,7 +124,7 @@ ExerciseCompare::ExerciseCompare(TQWidget * parent, const char * name):
 	m_checkButton->setDefault(true); // is the default button of the dialog
 	TQToolTip::add(m_checkButton, i18n("Click on this button to check your result."));
 	lowerHBox->addWidget(m_checkButton, 1, TQt::AlignRight);
-	TQObject::connect(m_checkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckButtonClicked()));
+	TQObject::connect(m_checkButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCheckButtonClicked()));
 
 	// that the user can start typing without moving the focus
 	m_signButton->setFocus();
diff --git a/kbruch/src/exerciseconvert.cpp b/kbruch/src/exerciseconvert.cpp
index ec7db1e7..2e3fb808 100644
--- a/kbruch/src/exerciseconvert.cpp
+++ b/kbruch/src/exerciseconvert.cpp
@@ -158,7 +158,7 @@ ExerciseConvert::ExerciseConvert(TQWidget * parent, const char * name):
 	m_checkButton->setDefault(true); // is the default button of the dialog
 	TQToolTip::add(m_checkButton, i18n("Click on this button to check your result. The button will not work if you have not entered a result yet."));
 	lowerHBox->addWidget(m_checkButton, 1, TQt::AlignRight);
-	TQObject::connect(m_checkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckButtonClicked()));
+	TQObject::connect(m_checkButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCheckButtonClicked()));
 
 	// that the user can start typing without moving the focus
 	numer_edit->setFocus();
diff --git a/kbruch/src/exercisefactorize.cpp b/kbruch/src/exercisefactorize.cpp
index e971e12f..8eb43a9a 100644
--- a/kbruch/src/exercisefactorize.cpp
+++ b/kbruch/src/exercisefactorize.cpp
@@ -126,14 +126,14 @@ ExerciseFactorize::ExerciseFactorize(TQWidget * parent, const char * name):
 	m_factor13Button->setText( i18n( "13" ) );
 	m_factor17Button->setText( i18n( "17" ) );
 	m_factor19Button->setText( i18n( "19" ) );
-	TQObject::connect(m_factor2Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor2ButtonClicked()));
-	TQObject::connect(m_factor3Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor3ButtonClicked()));
-	TQObject::connect(m_factor5Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor5ButtonClicked()));
-	TQObject::connect(m_factor7Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor7ButtonClicked()));
-	TQObject::connect(m_factor11Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor11ButtonClicked()));
-	TQObject::connect(m_factor13Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor13ButtonClicked()));
-	TQObject::connect(m_factor17Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor17ButtonClicked()));
-	TQObject::connect(m_factor19Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor19ButtonClicked()));
+	TQObject::connect(m_factor2Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor2ButtonClicked()));
+	TQObject::connect(m_factor3Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor3ButtonClicked()));
+	TQObject::connect(m_factor5Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor5ButtonClicked()));
+	TQObject::connect(m_factor7Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor7ButtonClicked()));
+	TQObject::connect(m_factor11Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor11ButtonClicked()));
+	TQObject::connect(m_factor13Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor13ButtonClicked()));
+	TQObject::connect(m_factor17Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor17ButtonClicked()));
+	TQObject::connect(m_factor19Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor19ButtonClicked()));
 
 	// add tooltips to the factor buttons
 	TQToolTip::add(m_factor2Button, i18n("Add prime factor 2."));
@@ -148,13 +148,13 @@ ExerciseFactorize::ExerciseFactorize(TQWidget * parent, const char * name):
 	// the remove last factor button
 	m_removeLastFactorButton->setText( i18n( "&Remove Last Factor" ) );
 	m_removeLastFactorButton->setEnabled(false);
-	TQObject::connect(m_removeLastFactorButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveLastFactorButtonClicked()));
+	TQObject::connect(m_removeLastFactorButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveLastFactorButtonClicked()));
 	TQToolTip::add(m_removeLastFactorButton, i18n("Removes the last entered prime factor."));
 
 	// the check task button
 	m_checkButton->setText( i18n( "&Check Task" ) );
 	TQToolTip::add(m_checkButton, i18n("Click on this button to check your result. The button will not work if you have not entered a result yet."));
-	TQObject::connect(m_checkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckButtonClicked()));
+	TQObject::connect(m_checkButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCheckButtonClicked()));
 	m_checkButton->setDefault(true); // is the default button of the dialog
 
 	// that the user can start choosing the prime factors
diff --git a/kbruch/src/mainqtwidget.cpp b/kbruch/src/mainqtwidget.cpp
index fa4fb400..97d73264 100644
--- a/kbruch/src/mainqtwidget.cpp
+++ b/kbruch/src/mainqtwidget.cpp
@@ -94,18 +94,18 @@ MainQtWidget::MainQtWidget()
 	splitter->setResizeMode(m_statview, TQSplitter::FollowSizeHint);
 
 	// we must change the status of the menubar before another page is shown
-	TQObject::connect(m_exercises, TQT_SIGNAL(aboutToShowPage(TQWidget *)), this, TQT_SLOT(slotAboutToShowPage(TQWidget *)));
+	TQObject::connect(m_exercises, TQ_SIGNAL(aboutToShowPage(TQWidget *)), this, TQ_SLOT(slotAboutToShowPage(TQWidget *)));
 
 	// connect signals of the exercises and StatisticView, so that StatisticView
 	// gets informed about how the user solved a given task (wrong or correct)
-	TQObject::connect(m_taskview, TQT_SIGNAL(signalTaskSolvedCorrect()), m_statview, TQT_SLOT(addCorrect()));
-	TQObject::connect(m_taskview, TQT_SIGNAL(signalTaskSolvedWrong()), m_statview, TQT_SLOT(addWrong()));
-	TQObject::connect(m_exerciseCompare, TQT_SIGNAL(signalExerciseSolvedCorrect()), m_statview, TQT_SLOT(addCorrect()));
-	TQObject::connect(m_exerciseCompare, TQT_SIGNAL(signalExerciseSolvedWrong()), m_statview, TQT_SLOT(addWrong()));
-	TQObject::connect(m_exerciseConvert, TQT_SIGNAL(signalExerciseSolvedCorrect()), m_statview, TQT_SLOT(addCorrect()));
-	TQObject::connect(m_exerciseConvert, TQT_SIGNAL(signalExerciseSolvedWrong()), m_statview, TQT_SLOT(addWrong()));
-	TQObject::connect(m_exerciseFactorize, TQT_SIGNAL(signalExerciseSolvedCorrect()), m_statview, TQT_SLOT(addCorrect()));
-	TQObject::connect(m_exerciseFactorize, TQT_SIGNAL(signalExerciseSolvedWrong()), m_statview, TQT_SLOT(addWrong()));
+	TQObject::connect(m_taskview, TQ_SIGNAL(signalTaskSolvedCorrect()), m_statview, TQ_SLOT(addCorrect()));
+	TQObject::connect(m_taskview, TQ_SIGNAL(signalTaskSolvedWrong()), m_statview, TQ_SLOT(addWrong()));
+	TQObject::connect(m_exerciseCompare, TQ_SIGNAL(signalExerciseSolvedCorrect()), m_statview, TQ_SLOT(addCorrect()));
+	TQObject::connect(m_exerciseCompare, TQ_SIGNAL(signalExerciseSolvedWrong()), m_statview, TQ_SLOT(addWrong()));
+	TQObject::connect(m_exerciseConvert, TQ_SIGNAL(signalExerciseSolvedCorrect()), m_statview, TQ_SLOT(addCorrect()));
+	TQObject::connect(m_exerciseConvert, TQ_SIGNAL(signalExerciseSolvedWrong()), m_statview, TQ_SLOT(addWrong()));
+	TQObject::connect(m_exerciseFactorize, TQ_SIGNAL(signalExerciseSolvedCorrect()), m_statview, TQ_SLOT(addCorrect()));
+	TQObject::connect(m_exerciseFactorize, TQ_SIGNAL(signalExerciseSolvedWrong()), m_statview, TQ_SLOT(addWrong()));
 
 #if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3)
 #else
@@ -155,19 +155,19 @@ void MainQtWidget::setupActions()
 {
 	// new task action
 	m_NewTaskAction = new TDEAction(i18n("&New"), "document-new", TDEStdAccel::shortcut(TDEStdAccel::New),
-				      this, TQT_SLOT(NewTask()),
+				      this, TQ_SLOT(NewTask()),
 				      actionCollection(), "NewTask");
 
 	// quit action
-	KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+	KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
 
 	//
-	KStdAction::preferences(this,  TQT_SLOT( slotPrefs() ), actionCollection());
+	KStdAction::preferences(this,  TQ_SLOT( slotPrefs() ), actionCollection());
 
 	// a label just describing the Number of terms ComboBox
 	m_NrOfTermsLabel = new TQLabel(i18n("Terms:"), 0, "tde toolbar widget");
 	m_NrOfTermsLabelAction = new KWidgetAction(m_NrOfTermsLabel, i18n("Terms:"), ALT+Key_E,
-						   this, TQT_SLOT(NrOfTermsBoxSlot()),
+						   this, TQ_SLOT(NrOfTermsBoxSlot()),
 						   actionCollection(), "NrOfTermsLabelAction");
 
 	// the ComboBox holding possible values for term number
@@ -179,15 +179,15 @@ void MainQtWidget::setupActions()
 	m_NrOfTermsBox->setCurrentItem(m_nrRatios - 2);
 	TQToolTip::add( m_NrOfTermsBox, i18n( "The number of terms you want" ) );
 	TQWhatsThis::add( m_NrOfTermsBox, i18n( "Choose the number of terms (2, 3, 4 or 5) you want for calculating fractions." ) );
-	m_NrOfTermsBoxAction = new KWidgetAction(m_NrOfTermsBox, i18n("Number of Terms"), ALT+Key_E, this, TQT_SLOT(NrOfTermsBoxSlot()), actionCollection(), "NrOfTermsBoxAction");
+	m_NrOfTermsBoxAction = new KWidgetAction(m_NrOfTermsBox, i18n("Number of Terms"), ALT+Key_E, this, TQ_SLOT(NrOfTermsBoxSlot()), actionCollection(), "NrOfTermsBoxAction");
 
 	// now connect the ComboBox's signal textChanged() to the slot function
-	TQObject::connect(m_NrOfTermsBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(NrOfTermsBoxSlot()));
+	TQObject::connect(m_NrOfTermsBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(NrOfTermsBoxSlot()));
 
 	// a label just describing the max. main denominator ComboBox
 	m_MaxMainDenominatorLabel = new TQLabel(i18n("Max. main denominator:"), 0, "tde toolbar widget");
 	m_MaxMainDenominatorLabelAction = new KWidgetAction(m_MaxMainDenominatorLabel, i18n("Max. main denominator:"), ALT+Key_D,
-							    this, TQT_SLOT(MaxMainDenominatorBoxSlot()),
+							    this, TQ_SLOT(MaxMainDenominatorBoxSlot()),
 							    actionCollection(), "MaxMainDenominatorLabelAction");
 
 	// the ComboBox holding possible values for the max. main denominator
@@ -209,16 +209,16 @@ void MainQtWidget::setupActions()
 		case 50 : m_MaxMainDenominatorBox->setCurrentItem(3);
 					 break;
 	}
-	m_MaxMainDenominatorBoxAction = new KWidgetAction(m_MaxMainDenominatorBox, i18n("Maximal Main Denominator"), ALT+Key_D, this, TQT_SLOT(MaxMainDenominatorBoxSlot()), actionCollection(), "MaxMainDenominatorBoxAction");
+	m_MaxMainDenominatorBoxAction = new KWidgetAction(m_MaxMainDenominatorBox, i18n("Maximal Main Denominator"), ALT+Key_D, this, TQ_SLOT(MaxMainDenominatorBoxSlot()), actionCollection(), "MaxMainDenominatorBoxAction");
 
 	// now connect the ComboBox's signal textChanged() to the slot function
-	TQObject::connect(m_MaxMainDenominatorBox, TQT_SIGNAL(activated(int)),
-			 this, TQT_SLOT(MaxMainDenominatorBoxSlot()));
+	TQObject::connect(m_MaxMainDenominatorBox, TQ_SIGNAL(activated(int)),
+			 this, TQ_SLOT(MaxMainDenominatorBoxSlot()));
 
 	// a label just describing the operation ComboBox
 	m_OperationLabel = new TQLabel(i18n("Operations:"), 0, "tde toolbar widget");
 	m_OperationLabelAction = new KWidgetAction(m_OperationLabel, i18n("Operations:"), ALT+Key_O,
-						   this, TQT_SLOT(OperationBoxSlot()),
+						   this, TQ_SLOT(OperationBoxSlot()),
 						   actionCollection(), "OperationLabelAction");
 
 	// the ComboBox holding possible combinations for operations
@@ -236,10 +236,10 @@ void MainQtWidget::setupActions()
 	}
 	TQToolTip::add( m_OperationBox, i18n( "The operations you want" ) );
 	TQWhatsThis::add( m_OperationBox, i18n( "Choose the type of operations you want for calculating fractions: Addition/Substraction, Multiplication/Division or All Operations Mixed. If you choose All Operations Mixed, the program will randomly choose addition, substraction, multiplication and/or division." ) );
-	m_OperationBoxAction = new KWidgetAction(m_OperationBox, i18n("Operations:"), ALT+Key_O, this, TQT_SLOT(OperationBoxSlot()), actionCollection(), "OperationBoxAction");
+	m_OperationBoxAction = new KWidgetAction(m_OperationBox, i18n("Operations:"), ALT+Key_O, this, TQ_SLOT(OperationBoxSlot()), actionCollection(), "OperationBoxAction");
 
 	// now connect the ComboBox's signal textChanged() to the slot function
-	TQObject::connect(m_OperationBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(OperationBoxSlot()));
+	TQObject::connect(m_OperationBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(OperationBoxSlot()));
 	
 #if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3)
 	if (!initialGeometrySet())
@@ -428,12 +428,12 @@ void MainQtWidget::slotPrefs()
 
 	// User edited the configuration - update your local copies of the 
 	// configuration data 
-	connect(configDialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotApplySettings()) ); 
+	connect(configDialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotApplySettings()) ); 
  
 	configDialog->show();
 /*
 	SettingsDialog * dlg = new SettingsDialog(this);
-	connect(dlg, TQT_SIGNAL(configChanged()), this, TQT_SLOT(slotApplySettings()));
+	connect(dlg, TQ_SIGNAL(configChanged()), this, TQ_SLOT(slotApplySettings()));
 
 	dlg->exec();
 
diff --git a/kbruch/src/statisticsview.cpp b/kbruch/src/statisticsview.cpp
index f60b0787..6ac23ca5 100644
--- a/kbruch/src/statisticsview.cpp
+++ b/kbruch/src/statisticsview.cpp
@@ -117,7 +117,7 @@ StatisticsView::StatisticsView(TQWidget * parent, const char * name):
 	/* the Reset button */
 	buttonLayout = new TQHBoxLayout(layout1);
 	resetBtn = new TQPushButton(i18n("&Reset"), this);
-	TQObject::connect(resetBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetStatistics()));
+	TQObject::connect(resetBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(resetStatistics()));
 	buttonLayout->addWidget(resetBtn);
 	TQToolTip::add(resetBtn, i18n("Press the button to reset the statistics."));
 	TQSpacerItem* spacer = new TQSpacerItem(0,0);
diff --git a/kbruch/src/taskview.cpp b/kbruch/src/taskview.cpp
index 1c0b1a25..d1b05b01 100644
--- a/kbruch/src/taskview.cpp
+++ b/kbruch/src/taskview.cpp
@@ -153,7 +153,7 @@ TaskView::TaskView(TQWidget * parent, const char * name,	bool padd_sub,
 	m_checkButton->setDefault(true); // is the default button of the dialog
 	TQToolTip::add(m_checkButton, i18n("Click on this button to check your result. The button will not work if you have not entered a result yet."));
 	lowerHBox->addWidget(m_checkButton, 1, TQt::AlignRight);
-	TQObject::connect(m_checkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckButtonClicked()));
+	TQObject::connect(m_checkButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCheckButtonClicked()));
 
 	// that the user can start typing without moving the focus
 	numer_edit->setFocus();