From 4603b024aed86c023b63a01b65ce7e3d534c0bb7 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 21 Dec 2023 11:50:27 +0900 Subject: Replace various '#define' strings - part 6 Signed-off-by: Michele Calgaro (cherry picked from commit dba312132e8a2e0cbcbb157876b8c135130880fa) --- kteatime/toplevel.cpp | 12 ++++++------ kweather/main.cpp | 2 +- kweather/sidebarwidget.cpp | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kteatime/toplevel.cpp b/kteatime/toplevel.cpp index df943d8..b7ecb46 100644 --- a/kteatime/toplevel.cpp +++ b/kteatime/toplevel.cpp @@ -118,13 +118,13 @@ TopLevel::TopLevel() : KSystemTray() startAct = new TDEAction(i18n("&Start"), "1rightarrow", 0, - TQT_TQOBJECT(this), TQT_SLOT(start()), actionCollection(), "start"); + this, TQT_SLOT(start()), actionCollection(), "start"); stopAct = new TDEAction(i18n("Sto&p"), "cancel", 0, - TQT_TQOBJECT(this), TQT_SLOT(stop()), actionCollection(), "stop"); + this, TQT_SLOT(stop()), actionCollection(), "stop"); confAct = new TDEAction(i18n("&Configure..."), "configure", 0, - TQT_TQOBJECT(this), TQT_SLOT(config()), actionCollection(), "configure"); + this, TQT_SLOT(config()), actionCollection(), "configure"); anonAct = new TDEAction(i18n("&Anonymous..."), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(anonymous()), actionCollection(), "anonymous"); + this, TQT_SLOT(anonymous()), actionCollection(), "anonymous"); // TDEAction *quitAct = actionCollection()->action("file_quit"); // create app menu (displayed on right-click) @@ -452,7 +452,7 @@ void TopLevel::start() } // else both are already defined by dialog handler - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); startTimer(1000); // 1000ms = 1s (sufficient resolution) running = true; @@ -466,7 +466,7 @@ void TopLevel::start() /* menu-slot: "stop" selected in menu */ void TopLevel::stop() { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); running = false; ready = false; diff --git a/kweather/main.cpp b/kweather/main.cpp index 5c8d494..595e653 100644 --- a/kweather/main.cpp +++ b/kweather/main.cpp @@ -29,7 +29,7 @@ int main (int argc, char *argv[]) // This app is started automatically, no need for session management app.disableSessionManagement(); kdDebug() << "starting dcopservice " << endl; - new WeatherService(TQT_TQOBJECT(&app), "WeatherService"); + new WeatherService(&app, "WeatherService"); return app.exec(); } diff --git a/kweather/sidebarwidget.cpp b/kweather/sidebarwidget.cpp index 7c9a6e7..1afe45a 100644 --- a/kweather/sidebarwidget.cpp +++ b/kweather/sidebarwidget.cpp @@ -45,9 +45,9 @@ sidebarwidget::sidebarwidget(TQWidget* parent, const char* name) toolbar->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Minimum); TDEAction *refresh = new TDEAction( i18n("Refresh"), SmallIcon("view-refresh"), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotRefresh()), this, "refresh" ); + 0, this, TQT_SLOT(slotRefresh()), this, "refresh" ); TDEAction *prefs = new TDEAction( i18n("Settings"), SmallIcon("configure"), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), this, "preferences" ); + 0, this, TQT_SLOT(slotConfigure()), this, "preferences" ); refresh->plug(toolbar); prefs->plug(toolbar); -- cgit v1.2.1