From 2e22b541919dbbc71e124540e0c68b6633bfc49c Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 5 Jan 2024 10:34:30 +0900 Subject: [PATCH] Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- knetload/devicedialog.cpp | 4 ++-- knetload/knetload.cpp | 6 +++--- knetload/scaledialog.cpp | 4 ++-- knetload/speeddialog.cpp | 4 ++-- knetload/statpopup.cpp | 26 +++++++++++++------------- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/knetload/devicedialog.cpp b/knetload/devicedialog.cpp index 5e1dde9..fc986e5 100644 --- a/knetload/devicedialog.cpp +++ b/knetload/devicedialog.cpp @@ -91,8 +91,8 @@ DeviceDialog::DeviceDialog(const TQString& defaultDevice, TQWidget* parent) : #endif deviceBox->setCurrentText(defaultDevice); - connect(deviceBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(updateDevice(const TQString&))); + connect(deviceBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(updateDevice(const TQString&))); } const TQString& DeviceDialog::getDevice() const { diff --git a/knetload/knetload.cpp b/knetload/knetload.cpp index 7b363c9..34ea69c 100644 --- a/knetload/knetload.cpp +++ b/knetload/knetload.cpp @@ -254,7 +254,7 @@ void KNetLoad::insertCustomItems(TDEPopupMenu* menu) { stockDevice[i], i); deviceMenu->insertItem(SmallIcon("devother"), i18n("Other...")); updateDeviceMenu(deviceMenu); - connect(deviceMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setDevice(int))); + connect(deviceMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setDevice(int))); menu->insertItem(SmallIcon("devselect"), i18n("&Device"), deviceMenu); // Scale menus. The menu item IDs are the scales themselves (in bits @@ -274,7 +274,7 @@ void KNetLoad::insertCustomItems(TDEPopupMenu* menu) { scaleInMenu->insertItem(i18n("10MBit/s"), 10000000); scaleInMenu->insertItem(i18n("Other...")); updateScaleInMenu(scaleInMenu); - connect(scaleInMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setScaleIn(int))); + connect(scaleInMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setScaleIn(int))); menu->insertItem(SmallIcon("scalein"), i18n("&Scale (In)"), scaleInMenu); TDEPopupMenu* scaleOutMenu = new TDEPopupMenu(menu); @@ -294,7 +294,7 @@ void KNetLoad::insertCustomItems(TDEPopupMenu* menu) { scaleOutMenu->insertSeparator(); scaleOutMenu->insertItem(i18n("Same as for in"), 0); updateScaleOutMenu(scaleOutMenu); - connect(scaleOutMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setScaleOut(int))); + connect(scaleOutMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setScaleOut(int))); menu->insertItem(SmallIcon("scaleout"), i18n("&Scale (Out)"), scaleOutMenu); // The final separator. diff --git a/knetload/scaledialog.cpp b/knetload/scaledialog.cpp index 3532521..cb26307 100644 --- a/knetload/scaledialog.cpp +++ b/knetload/scaledialog.cpp @@ -36,8 +36,8 @@ ScaleDialog::ScaleDialog(int defaultScale, const TQString &title, val->setBottom(1); scaleBox->setValidator(val); - connect(scaleBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(updateScale(const TQString&))); + connect(scaleBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(updateScale(const TQString&))); } int ScaleDialog::getScale() const { diff --git a/knetload/speeddialog.cpp b/knetload/speeddialog.cpp index cdf0fcb..4d37ef7 100644 --- a/knetload/speeddialog.cpp +++ b/knetload/speeddialog.cpp @@ -48,8 +48,8 @@ SpeedDialog::SpeedDialog(int defaultSpeed, TQWidget* parent) : speedStr.setNum(defaultSpeed); speedBox->setCurrentText(speedStr); - connect(speedBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(updateSpeed(const TQString&))); + connect(speedBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(updateSpeed(const TQString&))); } int SpeedDialog::getSpeed() const { diff --git a/knetload/statpopup.cpp b/knetload/statpopup.cpp index 3233dd3..4ee0769 100644 --- a/knetload/statpopup.cpp +++ b/knetload/statpopup.cpp @@ -61,7 +61,7 @@ StatPopup::StatPopup(bool useSupportSplit, TQWidget *parent, const char *name) : // Set up a timer for our periodic updates. timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(takeReading())); + connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(takeReading())); } StatPopup::~StatPopup() { @@ -344,30 +344,30 @@ void StatPopup::setupActions() { bVal = config->readBoolEntry("Active", true); actActive = new TDEToggleAction(i18n("&Active"), 0, coll, "active"); actActive->setChecked(bVal); - connect(actActive, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setActive(bool))); + connect(actActive, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setActive(bool))); actClearHistory = new TDEAction(i18n("&Clear"), "edit-delete", 0, - this, TQT_SLOT(clearHistory()), coll, "clear"); + this, TQ_SLOT(clearHistory()), coll, "clear"); speed = config->readNumEntry("Speed", DEFAULT_SPEED); actSpeed = new TDEAction(i18n("&Speed..."), "speedarrow", 0, - this, TQT_SLOT(selectSpeed()), coll, "speed"); + this, TQ_SLOT(selectSpeed()), coll, "speed"); if (supportSplit) { bVal = config->readBoolEntry("Split", true); actSplit = new IconToggleAction(i18n("Sp&lit Graph"), "split", i18n("Graph Sp&litting Enabled"), "spliton", 0, coll, "split"); actSplit->setChecked(bVal); - connect(actSplit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setSplit(bool))); + connect(actSplit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setSplit(bool))); } iVal = config->readNumEntry("StyleID", StatDock::fillShaded); actFillLines = new IconToggleAction(i18n("&Lines"), "lines", "lineson", 0, - this, TQT_SLOT(setFillLines()), coll, "filllines"); + this, TQ_SLOT(setFillLines()), coll, "filllines"); actFillBars = new IconToggleAction(i18n("&Bars"), "bars", "barson", 0, - this, TQT_SLOT(setFillBars()), coll, "fillbars"); + this, TQ_SLOT(setFillBars()), coll, "fillbars"); actFillShaded = new IconToggleAction(i18n("&Shaded"), "shaded", "shadedon", - 0, this, TQT_SLOT(setFillShaded()), coll, "fillshaded"); + 0, this, TQ_SLOT(setFillShaded()), coll, "fillshaded"); if (iVal == StatDock::fillLines) setFillLines(); else if (iVal == StatDock::fillBars) @@ -379,30 +379,30 @@ void StatPopup::setupActions() { actSoft = new IconToggleAction(i18n("So&ft Curves"), "soft", i18n("So&ft Curves Enabled"), "softon", 0, coll, "soft"); actSoft->setChecked(bVal); - connect(actSoft, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setSoft(bool))); + connect(actSoft, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setSoft(bool))); bVal = config->readBoolEntry("Labelled", true); actLabelled= new IconToggleAction(i18n("Show &Labels"), "labels", i18n("&Labels Enabled"), "labelson", 0, coll, "labelled"); actLabelled->setChecked(bVal); - connect(actLabelled, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setLabelled(bool))); + connect(actLabelled, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setLabelled(bool))); bVal = config->readBoolEntry("Grid", true); actGrid = new IconToggleAction(i18n("Show &Grid"), "grid", i18n("&Grid Enabled"), "gridon", 0, coll, "grid"); actGrid->setChecked(bVal); - connect(actGrid, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setGrid(bool))); + connect(actGrid, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setGrid(bool))); color[0] = defaultDockColor(0); color[0] = config->readColorEntry("Color0", color); actColor0 = new TDEAction(TQString(i18n("Color (%1)...")).arg(dockName(0)), - "color0", 0, this, TQT_SLOT(selectColor0()), coll, "color0"); + "color0", 0, this, TQ_SLOT(selectColor0()), coll, "color0"); actColor0->setEnabled(false); color[1] = defaultDockColor(1); color[1] = config->readColorEntry("Color1", color + 1); actColor1 = new TDEAction(TQString(i18n("Color (%1)...")).arg(dockName(1)), - "color1", 0, this, TQT_SLOT(selectColor1()), coll, "color1"); + "color1", 0, this, TQ_SLOT(selectColor1()), coll, "color1"); actColor1->setEnabled(false); setupCustomActions();