Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/12/head
Michele Calgaro 10 months ago
parent 722c0f8f07
commit c57b89d561
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -85,7 +85,7 @@ void KCPULoad::setupCustomActions() {
actSMP = new IconToggleAction(i18n("Enable S&MP"), "smp", actSMP = new IconToggleAction(i18n("Enable S&MP"), "smp",
i18n("S&MP Enabled"), "smpon", 0, coll, "smp"); i18n("S&MP Enabled"), "smpon", 0, coll, "smp");
actSMP->setChecked(bVal); actSMP->setChecked(bVal);
connect(actSMP, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setSMP(bool))); connect(actSMP, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setSMP(bool)));
} }
} }

@ -48,8 +48,8 @@ SpeedDialog::SpeedDialog(int defaultSpeed, TQWidget* parent) :
speedStr.setNum(defaultSpeed); speedStr.setNum(defaultSpeed);
speedBox->setCurrentText(speedStr); speedBox->setCurrentText(speedStr);
connect(speedBox, TQT_SIGNAL(textChanged(const TQString&)), connect(speedBox, TQ_SIGNAL(textChanged(const TQString&)),
this, TQT_SLOT(updateSpeed(const TQString&))); this, TQ_SLOT(updateSpeed(const TQString&)));
} }
int SpeedDialog::getSpeed() const { int SpeedDialog::getSpeed() const {

@ -55,7 +55,7 @@ void StatPopup::Reading::Init(int which, StatPopup* popup)
color = popup->defaultDockColor(which); color = popup->defaultDockColor(which);
color = popup->config->readColorEntry(colorid, &color); color = popup->config->readColorEntry(colorid, &color);
actColor = new TDEAction(i18n("Color (%1)...").arg(popup->dockName(which)), actColor = new TDEAction(i18n("Color (%1)...").arg(popup->dockName(which)),
"color", 0, popup, TQT_SLOT(selectColor()), popup->coll, colorid); "color", 0, popup, TQ_SLOT(selectColor()), popup->coll, colorid);
} }
@ -84,7 +84,7 @@ StatPopup::StatPopup(bool useSupportSplit, TQWidget *parent, const char *name) :
// Set up a timer for our periodic updates. // Set up a timer for our periodic updates.
timer = new TQTimer(this); timer = new TQTimer(this);
connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(takeReading())); connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(takeReading()));
} }
StatPopup::~StatPopup() { StatPopup::~StatPopup() {
@ -334,51 +334,51 @@ void StatPopup::setupActions() {
bVal = config->readBoolEntry("Active", true); bVal = config->readBoolEntry("Active", true);
actActive = new TDEToggleAction(i18n("&Active"), 0, coll, "active"); actActive = new TDEToggleAction(i18n("&Active"), 0, coll, "active");
actActive->setChecked(bVal); 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, 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); speed = config->readNumEntry("Speed", DEFAULT_SPEED);
actSpeed = new TDEAction(i18n("&Speed..."), "speedarrow", 0, actSpeed = new TDEAction(i18n("&Speed..."), "speedarrow", 0,
this, TQT_SLOT(selectSpeed()), coll, "speed"); this, TQ_SLOT(selectSpeed()), coll, "speed");
if (supportSplit) { if (supportSplit) {
bVal = config->readBoolEntry("Split", true); bVal = config->readBoolEntry("Split", true);
actSplit = new IconToggleAction(i18n("Sp&lit Graph"), "split", actSplit = new IconToggleAction(i18n("Sp&lit Graph"), "split",
i18n("Graph Sp&litting Enabled"), "spliton", 0, coll, "split"); i18n("Graph Sp&litting Enabled"), "spliton", 0, coll, "split");
actSplit->setChecked(bVal); 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)));
} }
fillStyle = config->readNumEntry("StyleID", StatDock::fillShaded); fillStyle = config->readNumEntry("StyleID", StatDock::fillShaded);
actFillLines = new IconToggleAction(i18n("&Lines"), "lines", "lineson", 0, actFillLines = new IconToggleAction(i18n("&Lines"), "lines", "lineson", 0,
this, TQT_SLOT(setFillLines()), coll, "filllines"); this, TQ_SLOT(setFillLines()), coll, "filllines");
actFillLines->setChecked(fillStyle == StatDock::fillLines); actFillLines->setChecked(fillStyle == StatDock::fillLines);
actFillBars = new IconToggleAction(i18n("&Bars"), "bars", "barson", 0, actFillBars = new IconToggleAction(i18n("&Bars"), "bars", "barson", 0,
this, TQT_SLOT(setFillBars()), coll, "fillbars"); this, TQ_SLOT(setFillBars()), coll, "fillbars");
actFillBars->setChecked(fillStyle == StatDock::fillBars); actFillBars->setChecked(fillStyle == StatDock::fillBars);
actFillShaded = new IconToggleAction(i18n("&Shaded"), "shaded", "shadedon", actFillShaded = new IconToggleAction(i18n("&Shaded"), "shaded", "shadedon",
0, this, TQT_SLOT(setFillShaded()), coll, "fillshaded"); 0, this, TQ_SLOT(setFillShaded()), coll, "fillshaded");
actFillShaded->setChecked(fillStyle == StatDock::fillShaded); actFillShaded->setChecked(fillStyle == StatDock::fillShaded);
bVal = config->readBoolEntry("Soft", false); bVal = config->readBoolEntry("Soft", false);
actSoft = new IconToggleAction(i18n("So&ft Curves"), "soft", actSoft = new IconToggleAction(i18n("So&ft Curves"), "soft",
i18n("So&ft Curves Enabled"), "softon", 0, coll, "soft"); i18n("So&ft Curves Enabled"), "softon", 0, coll, "soft");
actSoft->setChecked(bVal); 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); bVal = config->readBoolEntry("Labelled", true);
actLabelled= new IconToggleAction(i18n("Show &Labels"), "labels", actLabelled= new IconToggleAction(i18n("Show &Labels"), "labels",
i18n("&Labels Enabled"), "labelson", 0, coll, "labelled"); i18n("&Labels Enabled"), "labelson", 0, coll, "labelled");
actLabelled->setChecked(bVal); 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); bVal = config->readBoolEntry("Grid", true);
actGrid = new IconToggleAction(i18n("Show &Grid"), "grid", actGrid = new IconToggleAction(i18n("Show &Grid"), "grid",
i18n("&Grid Enabled"), "gridon", 0, coll, "grid"); i18n("&Grid Enabled"), "gridon", 0, coll, "grid");
actGrid->setChecked(bVal); 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)));
setupCustomActions(); setupCustomActions();
} }

Loading…
Cancel
Save