Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

5 files changed, 33 insertions, 33 deletions

diff --git a/kgeography/src/boxasker.cpp b/kgeography/src/boxasker.cpp
index b2ca281a..76535874 100644
--- a/kgeography/src/boxasker.cpp
+++ b/kgeography/src/boxasker.cpp
@@ -122,7 +122,7 @@ void boxAsker::init()
 	nextQuestion();
 	
 	p_accept -> disconnect();
-	connect(p_accept, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAnswer()));
+	connect(p_accept, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAnswer()));
 }
 
 #include "boxasker.moc"
diff --git a/kgeography/src/kgeography.cpp b/kgeography/src/kgeography.cpp
index 2aaee1e9..a0dba217 100644
--- a/kgeography/src/kgeography.cpp
+++ b/kgeography/src/kgeography.cpp
@@ -65,16 +65,16 @@ kgeography::kgeography() : TDEMainWindow(), p_firstShow(true), p_mustShowResults
 
 	setCentralWidget(p_bigWidget);
 
-	connect(p_consult, TQT_SIGNAL(clicked()), this, TQT_SLOT(consult()));
-	connect(p_askMap, TQT_SIGNAL(clicked()), this, TQT_SLOT(askMap()));
-	connect(p_askCapitalDivisions, TQT_SIGNAL(clicked()), this, TQT_SLOT(askCapitalDivisions()));
-	connect(p_askDivisionCapitals, TQT_SIGNAL(clicked()), this, TQT_SLOT(askDivisionCapitals()));
-	connect(p_askFlagDivisions, TQT_SIGNAL(clicked()), this, TQT_SLOT(askFlagDivisions()));
-	connect(p_askDivisionFlags, TQT_SIGNAL(clicked()), this, TQT_SLOT(askDivisionFlags()));
-
-	TDEAction *a = KStdAction::open(this, TQT_SLOT(openMap()), actionCollection(), "openMap");
+	connect(p_consult, TQ_SIGNAL(clicked()), this, TQ_SLOT(consult()));
+	connect(p_askMap, TQ_SIGNAL(clicked()), this, TQ_SLOT(askMap()));
+	connect(p_askCapitalDivisions, TQ_SIGNAL(clicked()), this, TQ_SLOT(askCapitalDivisions()));
+	connect(p_askDivisionCapitals, TQ_SIGNAL(clicked()), this, TQ_SLOT(askDivisionCapitals()));
+	connect(p_askFlagDivisions, TQ_SIGNAL(clicked()), this, TQ_SLOT(askFlagDivisions()));
+	connect(p_askDivisionFlags, TQ_SIGNAL(clicked()), this, TQ_SLOT(askDivisionFlags()));
+
+	TDEAction *a = KStdAction::open(this, TQ_SLOT(openMap()), actionCollection(), "openMap");
 	a -> setText(i18n("&Open Map..."));
-	KStdAction::quit(this, TQT_SLOT(close()), actionCollection(), "quit");
+	KStdAction::quit(this, TQ_SLOT(close()), actionCollection(), "quit");
 
 	p_zoom = new TDEToggleAction(i18n("&Zoom"), "zoom-fit-best", 0, 0, 0, actionCollection(), "zoom_select");
 	p_zoom -> setEnabled(false);
@@ -85,7 +85,7 @@ kgeography::kgeography() : TDEMainWindow(), p_firstShow(true), p_mustShowResults
 	p_move = new TDEToggleAction(i18n("&Move"), "move", 0, 0, 0, actionCollection(), "move");
 	p_move -> setEnabled(false);
 
-	new TDEAction(i18n("Disclaimer"), 0, this, TQT_SLOT(disclaimer()), actionCollection(), "disclaimer");
+	new TDEAction(i18n("Disclaimer"), 0, this, TQ_SLOT(disclaimer()), actionCollection(), "disclaimer");
 
 	setupGUI(Keys | ToolBar | Save | Create);
 
@@ -132,7 +132,7 @@ void kgeography::showEvent(TQShowEvent *)
 		}
 		// if anyone can explain why with the slot works and now without
 		// i'll be glad to learn
-		TQTimer::singleShot(0, this, TQT_SLOT(resizeMainWindow()));
+		TQTimer::singleShot(0, this, TQ_SLOT(resizeMainWindow()));
 // 		resizeMainWindow();
 		
 		p_firstShow = false;
@@ -269,13 +269,13 @@ void kgeography::putAskWidget()
 {
 	p_bigWidget -> setStretchFactor(p_askWidget, 1);
 	p_askWidget -> show();
-	connect(p_askWidget, TQT_SIGNAL(setZoomActionChecked(bool)), p_zoom, TQT_SLOT(setChecked(bool)));
-	connect(p_zoom, TQT_SIGNAL(toggled(bool)), p_askWidget, TQT_SLOT(setZoom(bool)));
-	connect(p_zoomOriginal, TQT_SIGNAL(activated()), p_askWidget, TQT_SLOT(setOriginalZoom()));
-	connect(p_askWidget, TQT_SIGNAL(setMoveActionEnabled(bool)), p_move, TQT_SLOT(setEnabled(bool)));
-	connect(p_askWidget, TQT_SIGNAL(setMoveActionChecked(bool)), p_move, TQT_SLOT(setChecked(bool)));
-	connect(p_move, TQT_SIGNAL(toggled(bool)), p_askWidget, TQT_SLOT(setMovement(bool)));
-	connect(p_askWidget, TQT_SIGNAL(questionsEnded()), this, TQT_SLOT(showResultsDialog()));
+	connect(p_askWidget, TQ_SIGNAL(setZoomActionChecked(bool)), p_zoom, TQ_SLOT(setChecked(bool)));
+	connect(p_zoom, TQ_SIGNAL(toggled(bool)), p_askWidget, TQ_SLOT(setZoom(bool)));
+	connect(p_zoomOriginal, TQ_SIGNAL(activated()), p_askWidget, TQ_SLOT(setOriginalZoom()));
+	connect(p_askWidget, TQ_SIGNAL(setMoveActionEnabled(bool)), p_move, TQ_SLOT(setEnabled(bool)));
+	connect(p_askWidget, TQ_SIGNAL(setMoveActionChecked(bool)), p_move, TQ_SLOT(setChecked(bool)));
+	connect(p_move, TQ_SIGNAL(toggled(bool)), p_askWidget, TQ_SLOT(setMovement(bool)));
+	connect(p_askWidget, TQ_SIGNAL(questionsEnded()), this, TQ_SLOT(showResultsDialog()));
 }
 
 void kgeography::setMap(KGmap *m)
diff --git a/kgeography/src/mapasker.cpp b/kgeography/src/mapasker.cpp
index c9ea4c78..0422aaea 100644
--- a/kgeography/src/mapasker.cpp
+++ b/kgeography/src/mapasker.cpp
@@ -37,17 +37,17 @@ mapAsker::mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint cou
 
 	p_shouldClearPopup = false;
 
-	connect(p_mapWidget, TQT_SIGNAL(clicked(TQRgb, const TQPoint&)), this, TQT_SLOT(handleMapClick(TQRgb, const TQPoint&)));
-	connect(p_mapWidget, TQT_SIGNAL(setMoveActionChecked(bool)), this, TQT_SIGNAL(setMoveActionChecked(bool)));
-	connect(p_mapWidget, TQT_SIGNAL(setZoomActionChecked(bool)), this, TQT_SIGNAL(setZoomActionChecked(bool)));
-	connect(p_mapWidget, TQT_SIGNAL(setMoveActionEnabled(bool)), this, TQT_SIGNAL(setMoveActionEnabled(bool)));
-	connect(p_mapWidget, TQT_SIGNAL(setMoveActionEnabled(bool)), this, TQT_SLOT(showScrollBars(bool)));
-	connect(p_mapWidget, TQT_SIGNAL(updatePosition(int, int)), this, TQT_SLOT(setScrollBarsPosition(int, int)));
-	connect(p_mapWidget, TQT_SIGNAL(updateVisibleSize(int, int)), this, TQT_SLOT(setScrollBarsVisibleSize(int, int)));
-	connect(p_mapWidget, TQT_SIGNAL(updateMaximumSize(int, int)), this, TQT_SLOT(setScrollBarsMaximumSize(int, int)));
-
-	connect(p_hsb, TQT_SIGNAL(valueChanged(int)), p_mapWidget, TQT_SLOT(updateHPosition(int)));
-	connect(p_vsb, TQT_SIGNAL(valueChanged(int)), p_mapWidget, TQT_SLOT(updateVPosition(int)));
+	connect(p_mapWidget, TQ_SIGNAL(clicked(TQRgb, const TQPoint&)), this, TQ_SLOT(handleMapClick(TQRgb, const TQPoint&)));
+	connect(p_mapWidget, TQ_SIGNAL(setMoveActionChecked(bool)), this, TQ_SIGNAL(setMoveActionChecked(bool)));
+	connect(p_mapWidget, TQ_SIGNAL(setZoomActionChecked(bool)), this, TQ_SIGNAL(setZoomActionChecked(bool)));
+	connect(p_mapWidget, TQ_SIGNAL(setMoveActionEnabled(bool)), this, TQ_SIGNAL(setMoveActionEnabled(bool)));
+	connect(p_mapWidget, TQ_SIGNAL(setMoveActionEnabled(bool)), this, TQ_SLOT(showScrollBars(bool)));
+	connect(p_mapWidget, TQ_SIGNAL(updatePosition(int, int)), this, TQ_SLOT(setScrollBarsPosition(int, int)));
+	connect(p_mapWidget, TQ_SIGNAL(updateVisibleSize(int, int)), this, TQ_SLOT(setScrollBarsVisibleSize(int, int)));
+	connect(p_mapWidget, TQ_SIGNAL(updateMaximumSize(int, int)), this, TQ_SLOT(setScrollBarsMaximumSize(int, int)));
+
+	connect(p_hsb, TQ_SIGNAL(valueChanged(int)), p_mapWidget, TQ_SLOT(updateHPosition(int)));
+	connect(p_vsb, TQ_SIGNAL(valueChanged(int)), p_mapWidget, TQ_SLOT(updateVPosition(int)));
 
 	if (asker)
 	{
diff --git a/kgeography/src/mapchooser.cpp b/kgeography/src/mapchooser.cpp
index 5f921501..e2c6a640 100644
--- a/kgeography/src/mapchooser.cpp
+++ b/kgeography/src/mapchooser.cpp
@@ -56,8 +56,8 @@ mapChooser::mapChooser(TQWidget *parent) : KDialogBase(parent, 0, true, i18n("Ch
 	p_image = new TQWidget(mapArea);
 	mapLay -> addWidget(p_image, 1, 1);
 	
-	connect(p_listBox, TQT_SIGNAL(highlighted(const TQString&)), this, TQT_SLOT(putImage(const TQString&)));
-	connect(p_listBox, TQT_SIGNAL(selected(int)), this, TQT_SLOT(slotOk()));
+	connect(p_listBox, TQ_SIGNAL(highlighted(const TQString&)), this, TQ_SLOT(putImage(const TQString&)));
+	connect(p_listBox, TQ_SIGNAL(selected(int)), this, TQ_SLOT(slotOk()));
 	
 	setMainWidget(mainHB);
 	
diff --git a/kgeography/src/popupmanager.cpp b/kgeography/src/popupmanager.cpp
index 1a457f81..5c86adeb 100644
--- a/kgeography/src/popupmanager.cpp
+++ b/kgeography/src/popupmanager.cpp
@@ -61,7 +61,7 @@ void popupManager::init(const TQPoint &p)
 	else y = maxY;
 	p_mp -> move(x, y);
 	p_mp -> show();
-	connect(p_mp, TQT_SIGNAL(deleteMe()), this, TQT_SLOT(clear()));
+	connect(p_mp, TQ_SIGNAL(deleteMe()), this, TQ_SLOT(clear()));
 }
 
 #include "popupmanager.moc"