summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mathemagics/keypad.cpp42
-rw-r--r--mathemagics/mathemagics.cpp110
-rw-r--r--mathemagics/optiondialog.cpp4
-rw-r--r--mathemagics/stacklevel.cpp4
4 files changed, 80 insertions, 80 deletions
diff --git a/mathemagics/keypad.cpp b/mathemagics/keypad.cpp
index 261e1df..c9019c9 100644
--- a/mathemagics/keypad.cpp
+++ b/mathemagics/keypad.cpp
@@ -14,7 +14,7 @@ CharButton::CharButton(const TQString &text, TQWidget *parent, const char *name)
setAutoRepeat(true);
setAccel(text);
m_text = text;
- connect(this, SIGNAL(clicked()), this, SLOT(emitClicked()));
+ connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(emitClicked()));
}
void CharButton::emitClicked()
@@ -28,7 +28,7 @@ MathKeypad::MathKeypad(TQWidget *parent, const char *name)
TQVBoxLayout *vlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
TQPushButton *focusButton = new TQPushButton(i18n("Press to Focus Keypad"), this);
- connect(focusButton, SIGNAL(clicked()), this, SLOT(setFocus()));
+ connect(focusButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(setFocus()));
vlayout->addWidget(focusButton);
TQGridLayout *midBox = new TQGridLayout(vlayout, 5, 4, KDialog::spacingHint());
@@ -37,89 +37,89 @@ MathKeypad::MathKeypad(TQWidget *parent, const char *name)
EnterButton->setAccel(Key_Enter);
TQWhatsThis::add(EnterButton, i18n("Enter expression onto stack"));
midBox->addMultiCellWidget(EnterButton, 0, 0, 0, 1);
- connect(EnterButton, SIGNAL(clicked()), this, SIGNAL(enter()));
+ connect(EnterButton, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(enter()));
TQPushButton *EEXButton = new TQPushButton("&EEX", this);
TQWhatsThis::add(EEXButton, i18n("Enters an E into line edit. When evaluated, the number directly before the E (no space on either side of the E) is multiplied by 10 raised to the number directly after the E. Only in Decimal mode."));
midBox->addWidget(EEXButton, 0, 2);
- connect(EEXButton, SIGNAL(clicked()), this, SIGNAL(eex()));
+ connect(EEXButton, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(eex()));
TQPushButton *BackSpaceButton = new TQPushButton("<-", this);
TQToolTip::add(BackSpaceButton, i18n("Inversed: Clear"));
BackSpaceButton->setAutoRepeat(true);
BackSpaceButton->setAccel(Key_Backspace);
midBox->addWidget(BackSpaceButton, 0, 3);
- connect(BackSpaceButton, SIGNAL(clicked()), this, SIGNAL(backspace()));
+ connect(BackSpaceButton, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(backspace()));
CharButton *PeriodButton = new CharButton(".", this);
PeriodButton->setAccel(Key_Period);
- connect(PeriodButton, SIGNAL(clicked(const TQString &)), this, SIGNAL(insertChar(const TQString &)));
+ connect(PeriodButton, TQ_SIGNAL(clicked(const TQString &)), this, TQ_SIGNAL(insertChar(const TQString &)));
midBox->addWidget(PeriodButton, 4, 2);
CharButton *SpaceButton = new CharButton(" ", this);
SpaceButton->setText(i18n("Spc"));
SpaceButton->setAccel(Key_Space);
- connect(SpaceButton, SIGNAL(clicked(const TQString &)), this, SIGNAL(insertChar(const TQString &)));
+ connect(SpaceButton, TQ_SIGNAL(clicked(const TQString &)), this, TQ_SIGNAL(insertChar(const TQString &)));
midBox->addWidget(SpaceButton, 4, 1);
CharButton *KP0Button = new CharButton(TQString::number(0), this);
- connect(KP0Button, SIGNAL(clicked(const TQString &)), this, SIGNAL(insertChar(const TQString &)));
+ connect(KP0Button, TQ_SIGNAL(clicked(const TQString &)), this, TQ_SIGNAL(insertChar(const TQString &)));
midBox->addWidget(KP0Button, 4, 0);
CharButton *KP1Button = new CharButton(TQString::number(1), this);
- connect(KP1Button, SIGNAL(clicked(const TQString &)), this, SIGNAL(insertChar(const TQString &)));
+ connect(KP1Button, TQ_SIGNAL(clicked(const TQString &)), this, TQ_SIGNAL(insertChar(const TQString &)));
midBox->addWidget(KP1Button, 3, 0);
CharButton *KP2Button = new CharButton(TQString::number(2), this);
- connect(KP2Button, SIGNAL(clicked(const TQString &)), this, SIGNAL(insertChar(const TQString &)));
+ connect(KP2Button, TQ_SIGNAL(clicked(const TQString &)), this, TQ_SIGNAL(insertChar(const TQString &)));
midBox->addWidget(KP2Button, 3, 1);
CharButton *KP3Button = new CharButton(TQString::number(3), this);
- connect(KP3Button, SIGNAL(clicked(const TQString &)), this, SIGNAL(insertChar(const TQString &)));
+ connect(KP3Button, TQ_SIGNAL(clicked(const TQString &)), this, TQ_SIGNAL(insertChar(const TQString &)));
midBox->addWidget(KP3Button, 3, 2);
CharButton *KP4Button = new CharButton(TQString::number(4), this);
- connect(KP4Button, SIGNAL(clicked(const TQString &)), this, SIGNAL(insertChar(const TQString &)));
+ connect(KP4Button, TQ_SIGNAL(clicked(const TQString &)), this, TQ_SIGNAL(insertChar(const TQString &)));
midBox->addWidget(KP4Button, 2, 0);
CharButton *KP5Button = new CharButton(TQString::number(5), this);
- connect(KP5Button, SIGNAL(clicked(const TQString &)), this, SIGNAL(insertChar(const TQString &)));
+ connect(KP5Button, TQ_SIGNAL(clicked(const TQString &)), this, TQ_SIGNAL(insertChar(const TQString &)));
midBox->addWidget(KP5Button, 2, 1);
CharButton *KP6Button = new CharButton(TQString::number(6), this);
- connect(KP6Button, SIGNAL(clicked(const TQString &)), this, SIGNAL(insertChar(const TQString &)));
+ connect(KP6Button, TQ_SIGNAL(clicked(const TQString &)), this, TQ_SIGNAL(insertChar(const TQString &)));
midBox->addWidget(KP6Button, 2, 2);
CharButton *KP7Button = new CharButton(TQString::number(7), this);
- connect(KP7Button, SIGNAL(clicked(const TQString &)), this, SIGNAL(insertChar(const TQString &)));
+ connect(KP7Button, TQ_SIGNAL(clicked(const TQString &)), this, TQ_SIGNAL(insertChar(const TQString &)));
midBox->addWidget(KP7Button, 1, 0);
CharButton *KP8Button = new CharButton(TQString::number(8), this);
- connect(KP8Button, SIGNAL(clicked(const TQString &)), this, SIGNAL(insertChar(const TQString &)));
+ connect(KP8Button, TQ_SIGNAL(clicked(const TQString &)), this, TQ_SIGNAL(insertChar(const TQString &)));
midBox->addWidget(KP8Button, 1, 1);
CharButton *KP9Button = new CharButton(TQString::number(9), this);
- connect(KP9Button, SIGNAL(clicked(const TQString &)), this, SIGNAL(insertChar(const TQString &)));
+ connect(KP9Button, TQ_SIGNAL(clicked(const TQString &)), this, TQ_SIGNAL(insertChar(const TQString &)));
midBox->addWidget(KP9Button, 1, 2);
TQPushButton *DivideButton = new TQPushButton("/", this);
DivideButton->setAccel(Key_Slash);
- connect(DivideButton, SIGNAL(clicked()), this, SIGNAL(divide()));
+ connect(DivideButton, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(divide()));
midBox->addWidget(DivideButton, 1, 3);
TQPushButton *MultiplyButton = new TQPushButton("*", this);
MultiplyButton->setAccel(Key_Asterisk);
- connect(MultiplyButton, SIGNAL(clicked()), this, SIGNAL(multiply()));
+ connect(MultiplyButton, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(multiply()));
midBox->addWidget(MultiplyButton, 2, 3);
TQPushButton *SubtractionButton = new TQPushButton("-", this);
SubtractionButton->setAccel(Key_Minus);
- connect(SubtractionButton, SIGNAL(clicked()), this, SIGNAL(subtract()));
+ connect(SubtractionButton, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(subtract()));
midBox->addWidget(SubtractionButton, 3, 3);
TQPushButton *AdditionButton = new TQPushButton("+", this);
AdditionButton->setAccel(Key_Plus);
- connect(AdditionButton, SIGNAL(clicked()), this, SIGNAL(add()));
+ connect(AdditionButton, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(add()));
midBox->addWidget(AdditionButton, 4, 3);
setCaption(i18n("Keypad") + " - Mathemagics");
diff --git a/mathemagics/mathemagics.cpp b/mathemagics/mathemagics.cpp
index 73877a9..db83b76 100644
--- a/mathemagics/mathemagics.cpp
+++ b/mathemagics/mathemagics.cpp
@@ -66,24 +66,24 @@ Mathemagics::Mathemagics(TQWidget *parent, const char *name, WFlags f)
bigBox = new TQVBoxLayout(boxParent, KDialog::marginHint(), KDialog::spacingHint());
- LineEdit = new EditAction(i18n("Values"), 0, this, SLOT(slotEnter()), actionCollection(), "lineedit");
+ LineEdit = new EditAction(i18n("Values"), 0, this, TQ_SLOT(slotEnter()), actionCollection(), "lineedit");
HistoryBox = new ComboAction(i18n("History"), 0, 0, 0, actionCollection(), "history");
keypadAct = new TDEToggleAction(i18n("Show Keypad"), "Ctrl+K", 0, 0, actionCollection(), "keypad");
- connect(keypadAct, SIGNAL(toggled(bool)), SLOT(toggleKeypad(bool)));
+ connect(keypadAct, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleKeypad(bool)));
keypad = new MathKeypad(dummy, "Keypad");
topLayout->addWidget(keypad);
- connect(keypad, SIGNAL(closing()), this, SLOT(keypadClosing()));
- connect(keypad, SIGNAL(insertChar(const TQString &)), this, SLOT(insertChar(const TQString &)));
- connect(keypad, SIGNAL(add()), this, SLOT(slotAdd()));
- connect(keypad, SIGNAL(subtract()), this, SLOT(slotSubtract()));
- connect(keypad, SIGNAL(multiply()), this, SLOT(slotMultiply()));
- connect(keypad, SIGNAL(divide()), this, SLOT(slotDivide()));
- connect(keypad, SIGNAL(enter()), this, SLOT(slotEnter()));
- connect(keypad, SIGNAL(backspace()), this, SLOT(slotKeypadBackspace()));
- connect(keypad, SIGNAL(eex()), this, SLOT(slotEEX()));
+ connect(keypad, TQ_SIGNAL(closing()), this, TQ_SLOT(keypadClosing()));
+ connect(keypad, TQ_SIGNAL(insertChar(const TQString &)), this, TQ_SLOT(insertChar(const TQString &)));
+ connect(keypad, TQ_SIGNAL(add()), this, TQ_SLOT(slotAdd()));
+ connect(keypad, TQ_SIGNAL(subtract()), this, TQ_SLOT(slotSubtract()));
+ connect(keypad, TQ_SIGNAL(multiply()), this, TQ_SLOT(slotMultiply()));
+ connect(keypad, TQ_SIGNAL(divide()), this, TQ_SLOT(slotDivide()));
+ connect(keypad, TQ_SIGNAL(enter()), this, TQ_SLOT(slotEnter()));
+ connect(keypad, TQ_SIGNAL(backspace()), this, TQ_SLOT(slotKeypadBackspace()));
+ connect(keypad, TQ_SIGNAL(eex()), this, TQ_SLOT(slotEEX()));
keypad->hide();
TQStringList options(i18n("Degrees"));
@@ -106,45 +106,45 @@ Mathemagics::Mathemagics(TQWidget *parent, const char *name, WFlags f)
formulae->setItems(defaultFormulae);
formulae->setCurrentItem(-1);
- (void) KStdAction::quit(this, SLOT(close()), actionCollection());
- (void) KStdAction::open(this, SLOT(slotOpen()), actionCollection());
+ (void) KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
+ (void) KStdAction::open(this, TQ_SLOT(slotOpen()), actionCollection());
- (void) KStdAction::preferences(this, SLOT(slotConfigure()), actionCollection());
- (void) KStdAction::undo(this, SLOT(slotRestoreStack()), actionCollection())->setText(i18n("Restore stack levels"));
+ (void) KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actionCollection());
+ (void) KStdAction::undo(this, TQ_SLOT(slotRestoreStack()), actionCollection())->setText(i18n("Restore stack levels"));
- (void) KStdAction::configureToolbars(this, SLOT(configureToolBars()), actionCollection());
- (void) KStdAction::keyBindings(this, SLOT(keyBindings()), actionCollection());
+ (void) KStdAction::configureToolbars(this, TQ_SLOT(configureToolBars()), actionCollection());
+ (void) KStdAction::keyBindings(this, TQ_SLOT(keyBindings()), actionCollection());
- (void) new TDEAction(i18n("+/-"), "Alt+-", this, SLOT(slotNegative()), actionCollection(), "+/-");
- (void) new TDEAction("x!", "Alt+!", this, SLOT(slotFactorial()), actionCollection(), "factorial");
- (void) new TDEAction("1/x", "Alt+i", this, SLOT(slotInverse()), actionCollection(), "1/x");
- (void) new TDEAction("10^x", 0, this, SLOT(slotRaiseTen()), actionCollection(), "10^x");
- (void) new TDEAction("e^x", "Alt+E", this, SLOT(slotRaiseE()), actionCollection(), "e^x");
- (void) new TDEAction("Mod", "Alt+M", this, SLOT(slotModulo()), actionCollection(), "modulo");
- (void) new TDEAction("Ln", "Alt+L", this, SLOT(slotLn()), actionCollection(), "ln");
- (void) new TDEAction("%", "Alt+%", this, SLOT(slotPercent()), actionCollection(), "percent");
- (void) new TDEAction("Sqrt", "Alt+R", this, SLOT(slotSqrt()), actionCollection(), "sqrt");
- (void) new TDEAction("x^2", "Alt+Shift+S", this, SLOT(slotSquared()), actionCollection(), "x^2");
- (void) new TDEAction("y^x", "Alt+^", this, SLOT(slotPower()), actionCollection(), "y^x");
+ (void) new TDEAction(i18n("+/-"), "Alt+-", this, TQ_SLOT(slotNegative()), actionCollection(), "+/-");
+ (void) new TDEAction("x!", "Alt+!", this, TQ_SLOT(slotFactorial()), actionCollection(), "factorial");
+ (void) new TDEAction("1/x", "Alt+i", this, TQ_SLOT(slotInverse()), actionCollection(), "1/x");
+ (void) new TDEAction("10^x", 0, this, TQ_SLOT(slotRaiseTen()), actionCollection(), "10^x");
+ (void) new TDEAction("e^x", "Alt+E", this, TQ_SLOT(slotRaiseE()), actionCollection(), "e^x");
+ (void) new TDEAction("Mod", "Alt+M", this, TQ_SLOT(slotModulo()), actionCollection(), "modulo");
+ (void) new TDEAction("Ln", "Alt+L", this, TQ_SLOT(slotLn()), actionCollection(), "ln");
+ (void) new TDEAction("%", "Alt+%", this, TQ_SLOT(slotPercent()), actionCollection(), "percent");
+ (void) new TDEAction("Sqrt", "Alt+R", this, TQ_SLOT(slotSqrt()), actionCollection(), "sqrt");
+ (void) new TDEAction("x^2", "Alt+Shift+S", this, TQ_SLOT(slotSquared()), actionCollection(), "x^2");
+ (void) new TDEAction("y^x", "Alt+^", this, TQ_SLOT(slotPower()), actionCollection(), "y^x");
InvButton = new TDEToggleAction("Inv", "Ctrl+I", 0, 0, actionCollection(), "inverse");
HypButton = new TDEToggleAction("Hyp", "Ctrl+H", 0, 0, actionCollection(), "hyperbolic");
// bitwise
- (void) new TDEAction(i18n("And"), "Alt+A", this, SLOT(slotAnd()), actionCollection(), "bitwise_and");
- (void) new TDEAction(i18n("Or"), "Alt+O", this, SLOT(slotOr()), actionCollection(), "bitwise_or");
- (void) new TDEAction(i18n("XOr"), "Alt+X", this, SLOT(slotXOr()), actionCollection(), "bitwise_xor");
- (void) new TDEAction(i18n("Left Shift"), "back", 0, this, SLOT(slotLsh()), actionCollection(), "bitwise_lsh");
- (void) new TDEAction(i18n("Right Shift"), "forward", 0, this, SLOT(slotRsh()), actionCollection(), "bitwise_rsh");
+ (void) new TDEAction(i18n("And"), "Alt+A", this, TQ_SLOT(slotAnd()), actionCollection(), "bitwise_and");
+ (void) new TDEAction(i18n("Or"), "Alt+O", this, TQ_SLOT(slotOr()), actionCollection(), "bitwise_or");
+ (void) new TDEAction(i18n("XOr"), "Alt+X", this, TQ_SLOT(slotXOr()), actionCollection(), "bitwise_xor");
+ (void) new TDEAction(i18n("Left Shift"), "back", 0, this, TQ_SLOT(slotLsh()), actionCollection(), "bitwise_lsh");
+ (void) new TDEAction(i18n("Right Shift"), "forward", 0, this, TQ_SLOT(slotRsh()), actionCollection(), "bitwise_rsh");
// trig
- (void) new TDEAction("Sin", "Alt+S", this, SLOT(slotSine()), actionCollection(), "sin");
- (void) new TDEAction("Cos", "Alt+C", this, SLOT(slotCosine()), actionCollection(), "cos");
- (void) new TDEAction("Tan", "Alt+T", this, SLOT(slotTangent()), actionCollection(), "tan");
+ (void) new TDEAction("Sin", "Alt+S", this, TQ_SLOT(slotSine()), actionCollection(), "sin");
+ (void) new TDEAction("Cos", "Alt+C", this, TQ_SLOT(slotCosine()), actionCollection(), "cos");
+ (void) new TDEAction("Tan", "Alt+T", this, TQ_SLOT(slotTangent()), actionCollection(), "tan");
// edit
- (void) new TDEAction(i18n("&Revert Stack Changes"), 0, this, SLOT(slotRevert()), actionCollection(), "revert");
- (void) new TDEAction(i18n("&Drop"), 0, this, SLOT(slotDrop()), actionCollection(), "drop");
+ (void) new TDEAction(i18n("&Revert Stack Changes"), 0, this, TQ_SLOT(slotRevert()), actionCollection(), "revert");
+ (void) new TDEAction(i18n("&Drop"), 0, this, TQ_SLOT(slotDrop()), actionCollection(), "drop");
setStandardToolBarMenuEnabled(true);
statusBar();
@@ -154,14 +154,14 @@ Mathemagics::Mathemagics(TQWidget *parent, const char *name, WFlags f)
applyMainWindowSettings(TDEGlobal::config(), "TopLevelWindow");
// signals and slots connections
- connect(baseGroup, SIGNAL(activated(int)), this, SLOT(slotBaseChanged(int)));
- connect(angGroup, SIGNAL(activated(int)), this, SLOT(slotAngleChanged(int)));
+ connect(baseGroup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotBaseChanged(int)));
+ connect(angGroup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotAngleChanged(int)));
- connect(formulae, SIGNAL(activated(const TQString &)), this, SLOT(runFormula(const TQString &)));
+ connect(formulae, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(runFormula(const TQString &)));
- connect(HistoryBox->combo(), SIGNAL(activated(const TQString&)), this, SLOT(slotPushHighlighted(const TQString&)));
+ connect(HistoryBox->combo(), TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(slotPushHighlighted(const TQString&)));
- connect(LineEdit->edit(), SIGNAL(backspacePressed()), this, SLOT(slotBackspace()));
+ connect(LineEdit->edit(), TQ_SIGNAL(backspacePressed()), this, TQ_SLOT(slotBackspace()));
pi = asin(1L) * 2L;
variables["pi"] = pi;
@@ -270,7 +270,7 @@ void Mathemagics::updateStack()
level->edit()->setText(format(*Stack->at(i - 1)));
}
- TQTimer::singleShot(100, this, SLOT(scrollToBottom()));
+ TQTimer::singleShot(100, this, TQ_SLOT(scrollToBottom()));
}
void Mathemagics::enter()
@@ -1091,9 +1091,9 @@ void Mathemagics::slotConfigure()
if (optionDialog == 0)
return;
- connect(optionDialog, SIGNAL(hidden()),this,SLOT(slotConfigureHide()));
- connect(optionDialog, SIGNAL(valueChanged()), this, SLOT(slotUpdateConfiguration()));
- connect(optionDialog, SIGNAL(clearHistory()), this, SLOT(clearHistory()));
+ connect(optionDialog, TQ_SIGNAL(hidden()),this,TQ_SLOT(slotConfigureHide()));
+ connect(optionDialog, TQ_SIGNAL(valueChanged()), this, TQ_SLOT(slotUpdateConfiguration()));
+ connect(optionDialog, TQ_SIGNAL(clearHistory()), this, TQ_SLOT(clearHistory()));
}
optionDialog->show();
@@ -1101,7 +1101,7 @@ void Mathemagics::slotConfigure()
void Mathemagics::slotConfigureHide()
{
- TQTimer::singleShot(0, this, SLOT(slotConfigureDestroy()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotConfigureDestroy()));
}
void Mathemagics::slotConfigureDestroy()
@@ -1153,8 +1153,8 @@ void Mathemagics::recreateStackLevels()
for (int i = numStackLevels; i > 0; --i)
{
StackLevel *level = new StackLevel(i, boxParent);
- connect(level, SIGNAL(buttonPressed(int)), this, SLOT(slotRoll(int)));
- connect(level, SIGNAL(returnPressed(int)), this, SLOT(slotUpdateStackLevel(int)));
+ connect(level, TQ_SIGNAL(buttonPressed(int)), this, TQ_SLOT(slotRoll(int)));
+ connect(level, TQ_SIGNAL(returnPressed(int)), this, TQ_SLOT(slotUpdateStackLevel(int)));
bigBox->addWidget(level);
stackLevels.prepend(level);
@@ -1853,7 +1853,7 @@ void Mathemagics::configureToolBars()
saveMainWindowSettings(TDEGlobal::config(), "TopLevelWindow");
KEditToolbar dlg(actionCollection());
- connect(&dlg, SIGNAL(newToolbarConfig()), SLOT(newToolBarConfig()));
+ connect(&dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(newToolBarConfig()));
if (dlg.exec())
createGUI();
@@ -1885,10 +1885,10 @@ int EditAction::plug(TQWidget *w, int index)
KParanoidLine *comboBox = new KParanoidLine(toolBar, "search edit");
toolBar->insertWidget(id, 70, comboBox, index);
if (m_receiver)
- connect(comboBox, SIGNAL(returnPressed()), m_receiver, m_member);
+ connect(comboBox, TQ_SIGNAL(returnPressed()), m_receiver, m_member);
addContainer(toolBar, id);
- connect(toolBar, SIGNAL(destroyed()), this, SLOT(slotDestroyed()));
+ connect(toolBar, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()));
toolBar->setItemAutoSized(id, true);
m_combo = comboBox;
emit plugged();
@@ -1946,10 +1946,10 @@ int ComboAction::plug(TQWidget *w, int index)
TQComboBox *comboBox = new TQComboBox(toolBar, "search edit");
toolBar->insertWidget(id, 70, comboBox, index);
if (m_receiver)
- connect(comboBox, SIGNAL(returnPressed()), m_receiver, m_member);
+ connect(comboBox, TQ_SIGNAL(returnPressed()), m_receiver, m_member);
addContainer(toolBar, id);
- connect(toolBar, SIGNAL(destroyed()), this, SLOT(slotDestroyed()));
+ connect(toolBar, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()));
toolBar->setItemAutoSized(id, true);
m_combo = comboBox;
emit plugged();
diff --git a/mathemagics/optiondialog.cpp b/mathemagics/optiondialog.cpp
index fd20f65..aac715e 100644
--- a/mathemagics/optiondialog.cpp
+++ b/mathemagics/optiondialog.cpp
@@ -51,7 +51,7 @@ ConfigureDialog::ConfigureDialog(TQWidget *parent, char *name, bool modal)
hBox->addWidget(HistDepthBox);
ClearHistoryButton = new TQPushButton(i18n("C&lear History"), HistoryPage);
- connect(ClearHistoryButton, SIGNAL(clicked()), this, SIGNAL(clearHistory()));
+ connect(ClearHistoryButton, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(clearHistory()));
histBox->addWidget(ClearHistoryButton);
histBox->addStretch();
@@ -68,7 +68,7 @@ ConfigureDialog::ConfigureDialog(TQWidget *parent, char *name, bool modal)
DelDrops = new TQCheckBox(i18n("&Backspace drops on line-entry"), StackPage);
stackBox->addWidget(DelDrops);
- connect(this, SIGNAL(cancelClicked()), this, SLOT(readConfig()));
+ connect(this, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(readConfig()));
readConfig();
}
diff --git a/mathemagics/stacklevel.cpp b/mathemagics/stacklevel.cpp
index ea96617..39f1229 100644
--- a/mathemagics/stacklevel.cpp
+++ b/mathemagics/stacklevel.cpp
@@ -18,13 +18,13 @@ StackLevel::StackLevel(int id, TQWidget *parent, const char *name)
m_edit = new TQLineEdit(this);
TQToolTip::add(m_edit, i18n("Stack level %1").arg(TQString::number(id)));
- connect(m_edit, SIGNAL(returnPressed()), this, SLOT(emitEdit()));
+ connect(m_edit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(emitEdit()));
m_button = new TQPushButton(this);
TQWhatsThis::add(m_button, i18n("Roll from stack level %1").arg(TQString::number(id)));
TQToolTip::add(m_button, i18n("Roll\nShifted: Roll down"));
m_button->setText(TQString::number(id));
- connect(m_button, SIGNAL(clicked()), this, SLOT(emitButton()));
+ connect(m_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(emitButton()));
}
void StackLevel::emitButton()