Replace various '#define' strings - part 6

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

@ -32,7 +32,7 @@ ScaleDialog::ScaleDialog(int defaultScale, const TQString &title,
scaleStr.setNum(defaultScale); scaleStr.setNum(defaultScale);
KLineEdit* scaleBox = new KLineEdit(scaleStr, page); KLineEdit* scaleBox = new KLineEdit(scaleStr, page);
TQIntValidator* val = new TQIntValidator(TQT_TQOBJECT(this)); TQIntValidator* val = new TQIntValidator(this);
val->setBottom(1); val->setBottom(1);
scaleBox->setValidator(val); scaleBox->setValidator(val);

@ -35,7 +35,7 @@ SpeedDialog::SpeedDialog(int defaultSpeed, TQWidget* parent) :
KComboBox* speedBox = new KComboBox(true, page); KComboBox* speedBox = new KComboBox(true, page);
TQIntValidator* val = new TQIntValidator(TQT_TQOBJECT(this)); TQIntValidator* val = new TQIntValidator(this);
val->setBottom(1); val->setBottom(1);
speedBox->setValidator(val); speedBox->setValidator(val);

@ -61,7 +61,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()), TQT_TQOBJECT(this), TQT_SLOT(takeReading())); connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(takeReading()));
} }
StatPopup::~StatPopup() { StatPopup::~StatPopup() {
@ -344,30 +344,30 @@ 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)), TQT_TQOBJECT(this), TQT_SLOT(setActive(bool))); connect(actActive, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setActive(bool)));
actClearHistory = new TDEAction(i18n("&Clear"), "edit-delete", 0, actClearHistory = new TDEAction(i18n("&Clear"), "edit-delete", 0,
TQT_TQOBJECT(this), TQT_SLOT(clearHistory()), coll, "clear"); this, TQT_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,
TQT_TQOBJECT(this), TQT_SLOT(selectSpeed()), coll, "speed"); this, TQT_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)), TQT_TQOBJECT(this), TQT_SLOT(setSplit(bool))); connect(actSplit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setSplit(bool)));
} }
iVal = config->readNumEntry("StyleID", StatDock::fillShaded); iVal = config->readNumEntry("StyleID", StatDock::fillShaded);
actFillLines = new IconToggleAction(i18n("&Lines"), "lines", "lineson", 0, actFillLines = new IconToggleAction(i18n("&Lines"), "lines", "lineson", 0,
TQT_TQOBJECT(this), TQT_SLOT(setFillLines()), coll, "filllines"); this, TQT_SLOT(setFillLines()), coll, "filllines");
actFillBars = new IconToggleAction(i18n("&Bars"), "bars", "barson", 0, actFillBars = new IconToggleAction(i18n("&Bars"), "bars", "barson", 0,
TQT_TQOBJECT(this), TQT_SLOT(setFillBars()), coll, "fillbars"); this, TQT_SLOT(setFillBars()), coll, "fillbars");
actFillShaded = new IconToggleAction(i18n("&Shaded"), "shaded", "shadedon", actFillShaded = new IconToggleAction(i18n("&Shaded"), "shaded", "shadedon",
0, TQT_TQOBJECT(this), TQT_SLOT(setFillShaded()), coll, "fillshaded"); 0, this, TQT_SLOT(setFillShaded()), coll, "fillshaded");
if (iVal == StatDock::fillLines) if (iVal == StatDock::fillLines)
setFillLines(); setFillLines();
else if (iVal == StatDock::fillBars) else if (iVal == StatDock::fillBars)
@ -379,30 +379,30 @@ void StatPopup::setupActions() {
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)), TQT_TQOBJECT(this), TQT_SLOT(setSoft(bool))); connect(actSoft, TQT_SIGNAL(toggled(bool)), this, TQT_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)), TQT_TQOBJECT(this), TQT_SLOT(setLabelled(bool))); connect(actLabelled, TQT_SIGNAL(toggled(bool)), this, TQT_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)), TQT_TQOBJECT(this), TQT_SLOT(setGrid(bool))); connect(actGrid, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setGrid(bool)));
color[0] = defaultDockColor(0); color[0] = defaultDockColor(0);
color[0] = config->readColorEntry("Color0", color); color[0] = config->readColorEntry("Color0", color);
actColor0 = new TDEAction(TQString(i18n("Color (%1)...")).arg(dockName(0)), actColor0 = new TDEAction(TQString(i18n("Color (%1)...")).arg(dockName(0)),
"color0", 0, TQT_TQOBJECT(this), TQT_SLOT(selectColor0()), coll, "color0"); "color0", 0, this, TQT_SLOT(selectColor0()), coll, "color0");
actColor0->setEnabled(false); actColor0->setEnabled(false);
color[1] = defaultDockColor(1); color[1] = defaultDockColor(1);
color[1] = config->readColorEntry("Color1", color + 1); color[1] = config->readColorEntry("Color1", color + 1);
actColor1 = new TDEAction(TQString(i18n("Color (%1)...")).arg(dockName(1)), actColor1 = new TDEAction(TQString(i18n("Color (%1)...")).arg(dockName(1)),
"color1", 0, TQT_TQOBJECT(this), TQT_SLOT(selectColor1()), coll, "color1"); "color1", 0, this, TQT_SLOT(selectColor1()), coll, "color1");
actColor1->setEnabled(false); actColor1->setEnabled(false);
setupCustomActions(); setupCustomActions();

Loading…
Cancel
Save