From 5446eb7150897a6fb453a7246d7d09ddd8d2bc69 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 20 Dec 2023 22:30:18 +0900 Subject: Replace various '#define' strings - part 6 Signed-off-by: Michele Calgaro (cherry picked from commit cf40f006901966bdf86163dbe5d1c7cb55f099ec) --- kgeography/src/kgeography.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'kgeography') diff --git a/kgeography/src/kgeography.cpp b/kgeography/src/kgeography.cpp index c3970a3e..2aaee1e9 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()), TQT_TQOBJECT(this), TQT_SLOT(consult())); - connect(p_askMap, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askMap())); - connect(p_askCapitalDivisions, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askCapitalDivisions())); - connect(p_askDivisionCapitals, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askDivisionCapitals())); - connect(p_askFlagDivisions, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askFlagDivisions())); - connect(p_askDivisionFlags, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askDivisionFlags())); - - TDEAction *a = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(openMap()), actionCollection(), "openMap"); + 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"); a -> setText(i18n("&Open Map...")); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "quit"); + KStdAction::quit(this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(disclaimer()), actionCollection(), "disclaimer"); + new TDEAction(i18n("Disclaimer"), 0, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(resizeMainWindow())); + TQTimer::singleShot(0, this, TQT_SLOT(resizeMainWindow())); // resizeMainWindow(); p_firstShow = false; @@ -275,7 +275,7 @@ void kgeography::putAskWidget() 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()), TQT_TQOBJECT(this), TQT_SLOT(showResultsDialog())); + connect(p_askWidget, TQT_SIGNAL(questionsEnded()), this, TQT_SLOT(showResultsDialog())); } void kgeography::setMap(KGmap *m) -- cgit v1.2.1