diff options
Diffstat (limited to 'kcalc')
| -rw-r--r-- | kcalc/dlabel.cpp | 4 | ||||
| -rw-r--r-- | kcalc/dlabel.h | 2 | ||||
| -rw-r--r-- | kcalc/kcalc.cpp | 524 | ||||
| -rw-r--r-- | kcalc/kcalc.h | 2 | ||||
| -rw-r--r-- | kcalc/kcalc.kcfg | 2 | ||||
| -rw-r--r-- | kcalc/kcalc_button.h | 4 | ||||
| -rw-r--r-- | kcalc/kcalc_const_button.cpp | 4 | ||||
| -rw-r--r-- | kcalc/kcalc_const_button.h | 2 | ||||
| -rw-r--r-- | kcalc/kcalc_const_menu.cpp | 10 | ||||
| -rw-r--r-- | kcalc/kcalc_const_menu.h | 2 | ||||
| -rw-r--r-- | kcalc/kcalcdisplay.cpp | 16 | ||||
| -rw-r--r-- | kcalc/kcalcdisplay.h | 2 |
12 files changed, 287 insertions, 287 deletions
diff --git a/kcalc/dlabel.cpp b/kcalc/dlabel.cpp index f478b99..e5a3bc1 100644 --- a/kcalc/dlabel.cpp +++ b/kcalc/dlabel.cpp @@ -40,8 +40,8 @@ DispLogic::DispLogic(TQWidget *parent, const char *name, { KNumber::setDefaultFloatOutput(true); KNumber::setDefaultFractionalInput(true); - _back = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(history_back()), coll); - _forward = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(history_forward()), coll); + _back = KStdAction::undo(this, TQ_SLOT(history_back()), coll); + _forward = KStdAction::redo(this, TQ_SLOT(history_forward()), coll); _forward->setEnabled(false); _back->setEnabled(false); diff --git a/kcalc/dlabel.h b/kcalc/dlabel.h index fe226b5..bf54b22 100644 --- a/kcalc/dlabel.h +++ b/kcalc/dlabel.h @@ -37,7 +37,7 @@ class TDEActionCollection; class DispLogic : public KCalcDisplay { -Q_OBJECT +TQ_OBJECT public: diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp index 3b186fd..130bf43 100644 --- a/kcalc/kcalc.cpp +++ b/kcalc/kcalc.cpp @@ -89,7 +89,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) TDEAcceleratorManager::setNoAccel( central ); // Detect color change - connect(kapp,TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(set_colors())); + connect(kapp,TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(set_colors())); calc_display = new DispLogic(central, "display", actionCollection()); @@ -105,7 +105,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) // Create Button to select BaseMode BaseChooseGroup = new TQHButtonGroup(i18n("Base"), central); - connect(BaseChooseGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotBaseSelected(int))); + connect(BaseChooseGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotBaseSelected(int))); BaseChooseGroup->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false); @@ -138,7 +138,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) angle_menu->insertItem(i18n("Gradians"), 2); angle_menu->setCheckable(true); - connect(angle_menu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotAngleSelected(int))); + connect(angle_menu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotAngleSelected(int))); pbAngleChoose->setPopup(angle_menu); @@ -146,9 +146,9 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) pbInv = new KCalcButton("Inv", central, "Inverse-Button", i18n("Inverse mode")); pbInv->setAccel(Key_I); - connect(pbInv, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotInvtoggled(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbInv, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbInv, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotInvtoggled(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbInv, TQ_SLOT(slotSetAccelDisplayMode(bool))); pbInv->setToggleButton(true); // @@ -170,25 +170,25 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) pbMod->addMode(ModeNormal, "Mod", i18n("Modulo")); pbMod->addMode(ModeInverse, "IntDiv", i18n("Integer division")); pbMod->setAccel(Key_Colon); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - pbMod, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbMod, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbMod, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotModclicked(void))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + pbMod, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbMod, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbMod, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotModclicked(void))); pbReci = new KCalcButton(mSmallPage, "Reciprocal-Button"); pbReci->addMode(ModeNormal, "1/x", i18n("Reciprocal")); pbReci->setAccel(Key_R); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbReci, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbReci, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotReciclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbReci, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbReci, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotReciclicked(void))); pbFactorial = new KCalcButton(mSmallPage, "Factorial-Button"); pbFactorial->addMode(ModeNormal, "x!", i18n("Factorial")); pbFactorial->setAccel(Key_Exclam); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbFactorial, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbFactorial, TQT_SIGNAL(clicked(void)),TQT_SLOT(slotFactorialclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbFactorial, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbFactorial, TQ_SIGNAL(clicked(void)),TQ_SLOT(slotFactorialclicked(void))); // Representation of x^2 is moved to the function // changeRepresentation() that paints the letters When @@ -197,20 +197,20 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) pbSquare = new KCalcButton(mSmallPage, "Square-Button"); pbSquare->addMode(ModeNormal, "x<sup>2</sup>", i18n("Square"), true); pbSquare->addMode(ModeInverse, "x<sup>3</sup>", i18n("Third power"), true); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbSquare, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - pbSquare, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(pbSquare, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotSquareclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbSquare, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + pbSquare, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(pbSquare, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotSquareclicked(void))); pbRoot = new KSquareButton(mSmallPage, "Square-Button"); pbRoot->addMode(ModeNormal, "sqrt(x)", i18n("Square root")); pbRoot->addMode(ModeInverse, "sqrt[3](x)", i18n("Cube root")); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbRoot, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - pbRoot, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(pbRoot, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotRootclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbRoot, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + pbRoot, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(pbRoot, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotRootclicked(void))); // Representation of x^y is moved to the function @@ -219,12 +219,12 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) pbPower = new KCalcButton(mSmallPage, "Power-Button"); pbPower->addMode(ModeNormal, "x<sup>y</sup>", i18n("x to the power of y"), true); pbPower->addMode(ModeInverse, "x<sup>1/y</sup>", i18n("x to the power of 1/y"), true); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbPower, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - pbPower, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbPower, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + pbPower, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); pbPower->setAccel(Key_AsciiCircum); - connect(pbPower, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotPowerclicked(void))); + connect(pbPower, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotPowerclicked(void))); // @@ -369,8 +369,8 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) // Show the result in the app's caption in taskbar (wishlist - bug #52858) if (KCalcSettings::captionResult() == true) connect(calc_display, - TQT_SIGNAL(changedText(const TQString &)), - TQT_SLOT(setCaption(const TQString &))); + TQ_SIGNAL(changedText(const TQString &)), + TQ_SLOT(setCaption(const TQString &))); calc_display->changeSettings(); set_precision(); @@ -409,48 +409,48 @@ KCalculator::~KCalculator() void KCalculator::setupMainActions(void) { // file menu - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); // edit menu - KStdAction::cut(TQT_TQOBJECT(calc_display), TQT_SLOT(slotCut()), actionCollection()); - KStdAction::copy(TQT_TQOBJECT(calc_display), TQT_SLOT(slotCopy()), actionCollection()); - KStdAction::paste(TQT_TQOBJECT(calc_display), TQT_SLOT(slotPaste()), actionCollection()); + KStdAction::cut(calc_display, TQ_SLOT(slotCut()), actionCollection()); + KStdAction::copy(calc_display, TQ_SLOT(slotCopy()), actionCollection()); + KStdAction::paste(calc_display, TQ_SLOT(slotPaste()), actionCollection()); // settings menu actionStatshow = new TDEToggleAction(i18n("&Statistic Buttons"), 0, actionCollection(), "show_stat"); actionStatshow->setChecked(true); - connect(actionStatshow, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotStatshow(bool))); + connect(actionStatshow, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotStatshow(bool))); actionScientificshow = new TDEToggleAction(i18n("Science/&Engineering Buttons"), 0, actionCollection(), "show_science"); actionScientificshow->setChecked(true); - connect(actionScientificshow, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotScientificshow(bool))); + connect(actionScientificshow, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotScientificshow(bool))); actionLogicshow = new TDEToggleAction(i18n("&Logic Buttons"), 0, actionCollection(), "show_logic"); actionLogicshow->setChecked(true); - connect(actionLogicshow, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotLogicshow(bool))); + connect(actionLogicshow, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotLogicshow(bool))); actionConstantsShow = new TDEToggleAction(i18n("&Constants Buttons"), 0, actionCollection(), "show_constants"); actionConstantsShow->setChecked(true); - connect(actionConstantsShow, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotConstantsShow(bool))); + connect(actionConstantsShow, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotConstantsShow(bool))); - (void) new TDEAction(i18n("&Show All"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowAll()), + (void) new TDEAction(i18n("&Show All"), 0, this, TQ_SLOT(slotShowAll()), actionCollection(), "show_all"); - (void) new TDEAction(i18n("&Hide All"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotHideAll()), + (void) new TDEAction(i18n("&Hide All"), 0, this, TQ_SLOT(slotHideAll()), actionCollection(), "hide_all"); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(showSettings()), actionCollection()); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); } @@ -481,128 +481,128 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *parent) KCalcButton *tmp_pb; NumButtonGroup = new TQButtonGroup(0, "Num-Button-Group"); - connect(NumButtonGroup, TQT_SIGNAL(clicked(int)), - TQT_SLOT(slotNumberclicked(int))); + connect(NumButtonGroup, TQ_SIGNAL(clicked(int)), + TQ_SLOT(slotNumberclicked(int))); tmp_pb = new KCalcButton("0", thisPage, "0-Button"); tmp_pb->setAccel(Key_0); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 0); tmp_pb = new KCalcButton("1", thisPage, "1-Button"); tmp_pb->setAccel(Key_1); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 1); tmp_pb = new KCalcButton("2", thisPage, "2-Button"); tmp_pb->setAccel(Key_2); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 2); tmp_pb = new KCalcButton("3", thisPage, "3-Button"); tmp_pb->setAccel(Key_3); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 3); tmp_pb = new KCalcButton("4", thisPage, "4-Button"); tmp_pb->setAccel(Key_4); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 4); tmp_pb = new KCalcButton("5", thisPage, "5-Button"); tmp_pb->setAccel(Key_5); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 5); tmp_pb = new KCalcButton("6", thisPage, "6-Button"); tmp_pb->setAccel(Key_6); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 6); tmp_pb = new KCalcButton("7", thisPage, "7-Button"); tmp_pb->setAccel(Key_7); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 7); tmp_pb = new KCalcButton("8", thisPage, "8-Button"); tmp_pb->setAccel(Key_8); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 8); tmp_pb = new KCalcButton("9", thisPage, "9-Button"); tmp_pb->setAccel(Key_9); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 9); pbEE = new KCalcButton(thisPage, "EE-Button"); pbEE->addMode(ModeNormal, "x<small>" "\xb7" "10</small><sup>y</sup>", i18n("Exponent"), true); pbEE->setAccel(Key_E); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbEE, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbEE, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotEEclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbEE, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbEE, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotEEclicked(void))); pbParenClose = new KCalcButton(")", mLargePage, "ParenClose-Button"); pbParenClose->setAccel(Key_ParenRight); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbParenClose, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbParenClose,TQT_SIGNAL(clicked(void)),TQT_SLOT(slotParenCloseclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbParenClose, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbParenClose,TQ_SIGNAL(clicked(void)),TQ_SLOT(slotParenCloseclicked(void))); pbX = new KCalcButton("X", thisPage, "Multiply-Button", i18n("Multiplication")); pbX->setAccel(Key_multiply); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbX, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbX, TQ_SLOT(slotSetAccelDisplayMode(bool))); accel()->insert("Pressed '*'", i18n("Pressed Multiplication-Button"), - 0, Key_Asterisk, TQT_TQOBJECT(pbX), TQT_SLOT(animateClick())); - connect(pbX, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotXclicked(void))); + 0, Key_Asterisk, pbX, TQ_SLOT(animateClick())); + connect(pbX, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotXclicked(void))); pbDivision = new KCalcButton("/", thisPage, "Division-Button", i18n("Division")); pbDivision->setAccel(Key_Slash); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbDivision, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbDivision, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotDivisionclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbDivision, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbDivision, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotDivisionclicked(void))); pbPlus = new KCalcButton("+", thisPage, "Plus-Button", i18n("Addition")); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbPlus, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbPlus, TQ_SLOT(slotSetAccelDisplayMode(bool))); pbPlus->setAccel(Key_Plus); - connect(pbPlus, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotPlusclicked(void))); + connect(pbPlus, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotPlusclicked(void))); pbMinus = new KCalcButton("-", thisPage, "Minus-Button", i18n("Subtraction")); pbMinus->setAccel(Key_Minus); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbMinus, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbMinus, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotMinusclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbMinus, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbMinus, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotMinusclicked(void))); pbPeriod = new KCalcButton(TDEGlobal::locale()->decimalSymbol(), thisPage, "Period-Button", i18n("Decimal point")); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - TQT_TQOBJECT(pbPeriod), TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbPeriod, TQ_SLOT(slotSetAccelDisplayMode(bool))); accel()->insert("Decimal Point (Period)", i18n("Pressed Decimal Point"), - 0, Key_Period, TQT_TQOBJECT(pbPeriod), TQT_SLOT(animateClick())); + 0, Key_Period, pbPeriod, TQ_SLOT(animateClick())); accel()->insert("Decimal Point (Comma)", i18n("Pressed Decimal Point"), - 0, Key_Comma, TQT_TQOBJECT(pbPeriod), TQT_SLOT(animateClick())); - connect(TQT_TQOBJECT(pbPeriod), TQT_SIGNAL(clicked(void)), TQT_SLOT(slotPeriodclicked(void))); + 0, Key_Comma, pbPeriod, TQ_SLOT(animateClick())); + connect(pbPeriod, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotPeriodclicked(void))); pbEqual = new KCalcButton("=", thisPage, "Equal-Button", i18n("Result")); pbEqual->setAccel(Key_Enter); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - TQT_TQOBJECT(pbEqual), TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbEqual, TQ_SLOT(slotSetAccelDisplayMode(bool))); accel()->insert("Entered Equal", i18n("Pressed Equal-Button"), - 0, Key_Equal, TQT_TQOBJECT(pbEqual), TQT_SLOT(animateClick())); + 0, Key_Equal, pbEqual, TQ_SLOT(animateClick())); accel()->insert("Entered Return", i18n("Pressed Equal-Button"), - 0, Key_Return, TQT_TQOBJECT(pbEqual), TQT_SLOT(animateClick())); - connect(TQT_TQOBJECT(pbEqual), TQT_SIGNAL(clicked(void)), TQT_SLOT(slotEqualclicked(void))); + 0, Key_Return, pbEqual, TQ_SLOT(animateClick())); + connect(pbEqual, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotEqualclicked(void))); TQGridLayout *thisLayout = new TQGridLayout(thisPage, 5, 4, 0, @@ -641,101 +641,101 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *parent) pbMemRecall = new KCalcButton("MR", mLargePage, "MemRecall-Button", i18n("Memory recall")); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbMemRecall, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbMemRecall, TQT_SIGNAL(clicked(void)), - TQT_SLOT(slotMemRecallclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbMemRecall, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbMemRecall, TQ_SIGNAL(clicked(void)), + TQ_SLOT(slotMemRecallclicked(void))); pbMemRecall->setDisabled(true); // At start, there is nothing in memory pbMemPlusMinus = new KCalcButton(mLargePage, "MPlusMinus-Button"); pbMemPlusMinus->addMode(ModeNormal, "M+", i18n("Add display to memory")); pbMemPlusMinus->addMode(ModeInverse, "M-", i18n("Subtract from memory")); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - pbMemPlusMinus, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbMemPlusMinus, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbMemPlusMinus,TQT_SIGNAL(clicked(void)), - TQT_SLOT(slotMemPlusMinusclicked(void))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + pbMemPlusMinus, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbMemPlusMinus, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbMemPlusMinus,TQ_SIGNAL(clicked(void)), + TQ_SLOT(slotMemPlusMinusclicked(void))); pbMemStore = new KCalcButton("MS", mLargePage, "MemStore-Button", i18n("Memory store")); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbMemStore, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbMemStore, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotMemStoreclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbMemStore, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbMemStore, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotMemStoreclicked(void))); pbMC = new KCalcButton("MC", mLargePage, "MemClear-Button", i18n("Clear memory")); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbMC, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbMC, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotMCclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbMC, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbMC, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotMCclicked(void))); pbClear = new KCalcButton("C", mLargePage, "Clear-Button", i18n("Clear")); pbClear->setAccel(Key_Prior); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - TQT_TQOBJECT(pbClear), TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbClear, TQ_SLOT(slotSetAccelDisplayMode(bool))); accel()->insert("Entered 'ESC'", i18n("Pressed ESC-Button"), 0, - Key_Escape, TQT_TQOBJECT(pbClear), TQT_SLOT(animateClick())); - connect(TQT_TQOBJECT(pbClear), TQT_SIGNAL(clicked(void)), TQT_SLOT(slotClearclicked(void))); + Key_Escape, pbClear, TQ_SLOT(animateClick())); + connect(pbClear, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotClearclicked(void))); pbAC = new KCalcButton("AC", mLargePage, "AC-Button", i18n("Clear all")); pbAC->setAccel(Key_Delete); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbAC, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbAC, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotACclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbAC, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbAC, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotACclicked(void))); pbParenOpen = new KCalcButton("(", mLargePage, "ParenOpen-Button"); pbParenOpen->setAccel(Key_ParenLeft); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbParenOpen, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbParenOpen, TQT_SIGNAL(clicked(void)),TQT_SLOT(slotParenOpenclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbParenOpen, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbParenOpen, TQ_SIGNAL(clicked(void)),TQ_SLOT(slotParenOpenclicked(void))); pbPercent = new KCalcButton("%", mLargePage, "Percent-Button", i18n("Percent")); pbPercent->setAccel(Key_Percent); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbPercent, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbPercent, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotPercentclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbPercent, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbPercent, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotPercentclicked(void))); pbPlusMinus = new KCalcButton("\xb1", mLargePage, "Sign-Button", i18n("Change sign")); pbPlusMinus->setAccel(Key_Backslash); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbPlusMinus, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbPlusMinus, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotPlusMinusclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbPlusMinus, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbPlusMinus, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotPlusMinusclicked(void))); tmp_pb = new KCalcButton("A", mSmallPage, "A-Button"); tmp_pb->setAccel(Key_A); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 0xA); tmp_pb = new KCalcButton("B", mSmallPage, "B-Button"); tmp_pb->setAccel(Key_B); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 0xB); tmp_pb = new KCalcButton("C", mSmallPage, "C-Button"); tmp_pb->setAccel(Key_C); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 0xC); tmp_pb = new KCalcButton("D", mSmallPage, "D-Button"); tmp_pb->setAccel(Key_D); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 0xD); tmp_pb = new KCalcButton("E", mSmallPage, "E-Button"); tmp_pb->setAccel(Key_E); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 0xE); tmp_pb = new KCalcButton("F", mSmallPage, "F-Button"); tmp_pb->setAccel(Key_F); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 0xF); return thisPage; @@ -750,48 +750,48 @@ void KCalculator::setupLogicKeys(TQWidget *parent) tmp_pb = new KCalcButton("AND", parent, "AND-Button", i18n("Bitwise AND")); pbLogic.insert("AND", tmp_pb); tmp_pb->setAccel(Key_Ampersand); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotANDclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotANDclicked(void))); tmp_pb = new KCalcButton("OR", parent, "OR-Button", i18n("Bitwise OR")); pbLogic.insert("OR", tmp_pb); tmp_pb->setAccel(Key_Bar); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotORclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotORclicked(void))); tmp_pb = new KCalcButton("XOR", parent, "XOR-Button", i18n("Bitwise XOR")); pbLogic.insert("XOR", tmp_pb); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotXORclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotXORclicked(void))); tmp_pb = new KCalcButton("Cmp", parent, "One-Complement-Button", i18n("One's complement")); pbLogic.insert("One-Complement", tmp_pb); tmp_pb->setAccel(Key_AsciiTilde); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotNegateclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotNegateclicked(void))); tmp_pb = new KCalcButton("Lsh", parent, "LeftBitShift-Button", i18n("Left bit shift")); tmp_pb->setAccel(Key_Less); pbLogic.insert("LeftShift", tmp_pb); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), - TQT_SLOT(slotLeftShiftclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), + TQ_SLOT(slotLeftShiftclicked(void))); tmp_pb = new KCalcButton("Rsh", parent, "RightBitShift-Button", i18n("Right bit shift")); tmp_pb->setAccel(Key_Greater); pbLogic.insert("RightShift", tmp_pb); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), - TQT_SLOT(slotRightShiftclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), + TQ_SLOT(slotRightShiftclicked(void))); } void KCalculator::setupScientificKeys(TQWidget *parent) @@ -803,9 +803,9 @@ void KCalculator::setupScientificKeys(TQWidget *parent) tmp_pb = new KCalcButton("Hyp", parent, "Hyp-Button", i18n("Hyperbolic mode")); pbScientific.insert("HypMode", tmp_pb); tmp_pb->setAccel(Key_H); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotHyptoggled(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotHyptoggled(bool))); tmp_pb->setToggleButton(true); tmp_pb = new KCalcButton(parent, "Sin-Button"); @@ -816,11 +816,11 @@ void KCalculator::setupScientificKeys(TQWidget *parent) tmp_pb->addMode(ButtonModeFlags(ModeInverse | ModeHyperbolic), "Asinh", i18n("Inverse hyperbolic sine")); tmp_pb->setAccel(Key_S); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotSinclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotSinclicked(void))); tmp_pb = new KCalcButton(parent, "Cos-Button"); pbScientific.insert("Cosine", tmp_pb); @@ -830,11 +830,11 @@ void KCalculator::setupScientificKeys(TQWidget *parent) tmp_pb->addMode(ButtonModeFlags(ModeInverse | ModeHyperbolic), "Acosh", i18n("Inverse hyperbolic cosine")); tmp_pb->setAccel(Key_C); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotCosclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotCosclicked(void))); tmp_pb = new KCalcButton(parent, "Tan-Button"); pbScientific.insert("Tangent", tmp_pb); @@ -844,11 +844,11 @@ void KCalculator::setupScientificKeys(TQWidget *parent) tmp_pb->addMode(ButtonModeFlags(ModeInverse | ModeHyperbolic), "Atanh", i18n("Inverse hyperbolic tangent")); tmp_pb->setAccel(Key_T); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)),TQT_SLOT(slotTanclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)),TQ_SLOT(slotTanclicked(void))); tmp_pb = new KCalcButton(parent, "Ln-Button"); tmp_pb->addMode(ModeNormal, "Ln", i18n("Natural log")); @@ -856,11 +856,11 @@ void KCalculator::setupScientificKeys(TQWidget *parent) true); pbScientific.insert("LogNatural", tmp_pb); tmp_pb->setAccel(Key_N); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotLnclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotLnclicked(void))); tmp_pb = new KCalcButton(parent, "Log-Button"); tmp_pb->addMode(ModeNormal, "Log", i18n("Logarithm to base 10")); @@ -868,11 +868,11 @@ void KCalculator::setupScientificKeys(TQWidget *parent) true); pbScientific.insert("Log10", tmp_pb); tmp_pb->setAccel(Key_L); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotLogclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotLogclicked(void))); } @@ -888,20 +888,20 @@ void KCalculator::setupStatisticKeys(TQWidget *parent) + "x", i18n("Sum of all data items")); pbStat.insert("NumData", tmp_pb); mStatButtonList.append(tmp_pb); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatNumclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotStatNumclicked(void))); tmp_pb = new KCalcButton(parent, "Stat.Median-Button"); tmp_pb->addMode(ModeNormal, "Med", i18n("Median")); pbStat.insert("Median", tmp_pb); mStatButtonList.append(tmp_pb); TQToolTip::add(tmp_pb, i18n("Median")); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatMedianclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotStatMedianclicked(void))); tmp_pb = new KCalcButton(parent, "Stat.Mean-Button"); tmp_pb->addMode(ModeNormal, "Mea", i18n("Mean")); @@ -910,11 +910,11 @@ void KCalculator::setupStatisticKeys(TQWidget *parent) i18n("Sum of all data items squared"), true); pbStat.insert("Mean", tmp_pb); mStatButtonList.append(tmp_pb); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatMeanclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotStatMeanclicked(void))); tmp_pb = new KCalcButton(parent, "Stat.StandardDeviation-Button"); tmp_pb->addMode(ModeNormal, TQString::fromUtf8("σ",-1) + "<sub>N-1</sub>", @@ -923,30 +923,30 @@ void KCalculator::setupStatisticKeys(TQWidget *parent) i18n("Standard deviation"), true); pbStat.insert("StandardDeviation", tmp_pb); mStatButtonList.append(tmp_pb); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatStdDevclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotStatStdDevclicked(void))); tmp_pb = new KCalcButton(parent, "Stat.DataInput-Button"); tmp_pb->addMode(ModeNormal, "Dat", i18n("Enter data")); tmp_pb->addMode(ModeInverse, "CDat", i18n("Delete last data item")); pbStat.insert("InputData", tmp_pb); mStatButtonList.append(tmp_pb); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatDataInputclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotStatDataInputclicked(void))); tmp_pb = new KCalcButton(parent, "Stat.ClearData-Button"); tmp_pb->addMode(ModeNormal, "CSt", i18n("Clear data store")); pbStat.insert("ClearData", tmp_pb); mStatButtonList.append(tmp_pb); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatClearDataclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotStatClearDataclicked(void))); } void KCalculator::setupConstantsKeys(TQWidget *parent) @@ -954,62 +954,62 @@ void KCalculator::setupConstantsKeys(TQWidget *parent) TQ_CHECK_PTR(parent); ConstButtonGroup = new TQButtonGroup(0, "Const-Button-Group"); - connect(ConstButtonGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotConstclicked(int))); + connect(ConstButtonGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotConstclicked(int))); KCalcConstButton *tmp_pb; tmp_pb = new KCalcConstButton(parent, 0, "C1"); tmp_pb->setAccel(ALT + Key_1); pbConstant[0] = tmp_pb; - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); ConstButtonGroup->insert(tmp_pb, 0); tmp_pb = new KCalcConstButton(parent, 1, "C2"); tmp_pb->setAccel(ALT + Key_2); pbConstant[1] = tmp_pb; - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); ConstButtonGroup->insert(tmp_pb, 1); tmp_pb = new KCalcConstButton(parent, 2, "C3"); tmp_pb->setAccel(ALT + Key_3); pbConstant[2] = tmp_pb; - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); ConstButtonGroup->insert(tmp_pb, 2); tmp_pb = new KCalcConstButton(parent, 3, "C4"); tmp_pb->setAccel(ALT + Key_4); pbConstant[3] = tmp_pb; - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); ConstButtonGroup->insert(tmp_pb, 3); tmp_pb = new KCalcConstButton(parent, 4, "C5"); tmp_pb->setAccel(ALT + Key_5); pbConstant[4] = tmp_pb; - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); ConstButtonGroup->insert(tmp_pb, 4); tmp_pb = new KCalcConstButton(parent, 5, "C6"); tmp_pb->setAccel(ALT + Key_6); pbConstant[5] = tmp_pb; - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); ConstButtonGroup->insert(tmp_pb, 5); changeButtonNames(); @@ -1017,8 +1017,8 @@ void KCalculator::setupConstantsKeys(TQWidget *parent) // add menu with scientific constants KCalcConstMenu *tmp_menu = new KCalcConstMenu(this); menuBar()->insertItem(i18n("&Constants"), tmp_menu, -1, 2); - connect(tmp_menu, TQT_SIGNAL(activated(int)), this, - TQT_SLOT(slotConstantToDisplay(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), this, + TQ_SLOT(slotConstantToDisplay(int))); } void KCalculator::slotConstantToDisplay(int constant) @@ -1843,40 +1843,40 @@ void KCalculator::showSettings() tmp_const = constant; KCalcConstMenu *tmp_menu = new KCalcConstMenu(this); - connect(tmp_menu, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChooseScientificConst0(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChooseScientificConst0(int))); (constant->kPushButton0)->setPopup(tmp_menu); tmp_menu = new KCalcConstMenu(this); - connect(tmp_menu, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChooseScientificConst1(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChooseScientificConst1(int))); (constant->kPushButton1)->setPopup(tmp_menu); tmp_menu = new KCalcConstMenu(this); - connect(tmp_menu, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChooseScientificConst2(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChooseScientificConst2(int))); (constant->kPushButton2)->setPopup(tmp_menu); tmp_menu = new KCalcConstMenu(this); - connect(tmp_menu, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChooseScientificConst3(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChooseScientificConst3(int))); (constant->kPushButton3)->setPopup(tmp_menu); tmp_menu = new KCalcConstMenu(this); - connect(tmp_menu, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChooseScientificConst4(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChooseScientificConst4(int))); (constant->kPushButton4)->setPopup(tmp_menu); tmp_menu = new KCalcConstMenu(this); - connect(tmp_menu, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChooseScientificConst5(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChooseScientificConst5(int))); (constant->kPushButton5)->setPopup(tmp_menu); dialog->addPage(constant, i18n("Constants"), "constants"); // When the user clicks OK or Apply we want to update our settings. - connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_SLOT(updateSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), TQ_SLOT(updateSettings())); // Display the dialog. dialog->show(); @@ -2093,13 +2093,13 @@ void KCalculator::updateSettings() set_colors(); set_precision(); // Show the result in the app's caption in taskbar (wishlist - bug #52858) - disconnect(calc_display, TQT_SIGNAL(changedText(const TQString &)), + disconnect(calc_display, TQ_SIGNAL(changedText(const TQString &)), this, 0); if (KCalcSettings::captionResult()) { connect(calc_display, - TQT_SIGNAL(changedText(const TQString &)), - TQT_SLOT(setCaption(const TQString &))); + TQ_SIGNAL(changedText(const TQString &)), + TQ_SLOT(setCaption(const TQString &))); } else { diff --git a/kcalc/kcalc.h b/kcalc/kcalc.h index e596d9e..ab857db 100644 --- a/kcalc/kcalc.h +++ b/kcalc/kcalc.h @@ -60,7 +60,7 @@ class Constants; class KCalculator : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcalc/kcalc.kcfg b/kcalc/kcalc.kcfg index 2192df3..f098654 100644 --- a/kcalc/kcalc.kcfg +++ b/kcalc/kcalc.kcfg @@ -18,7 +18,7 @@ </entry> <entry name="NumberButtonsColor" type="Color"> <label>The color of number buttons.</label> - <code>QColor defaultButtonColor = kapp->palette().active().background();</code> + <code>TQColor defaultButtonColor = kapp->palette().active().background();</code> <default code="true">defaultButtonColor</default> </entry> <entry name="FunctionButtonsColor" type="Color"> diff --git a/kcalc/kcalc_button.h b/kcalc/kcalc_button.h index a5b26be..ac7aa0f 100644 --- a/kcalc/kcalc_button.h +++ b/kcalc/kcalc_button.h @@ -60,7 +60,7 @@ public: class KCalcButton : public KPushButton { -Q_OBJECT +TQ_OBJECT public: @@ -89,7 +89,7 @@ protected: class KSquareButton : public KCalcButton { -Q_OBJECT +TQ_OBJECT public: diff --git a/kcalc/kcalc_const_button.cpp b/kcalc/kcalc_const_button.cpp index fa137f5..1db27b9 100644 --- a/kcalc/kcalc_const_button.cpp +++ b/kcalc/kcalc_const_button.cpp @@ -74,8 +74,8 @@ void KCalcConstButton::initPopupMenu(void) _popup->insertItem(i18n("Set Name"), 0); _popup->insertItem(i18n("Choose From List"), tmp_menu, 1); - connect(_popup, TQT_SIGNAL(activated(int)), TQT_SLOT(slotConfigureButton(int))); - connect(tmp_menu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChooseScientificConst(int))); + connect(_popup, TQ_SIGNAL(activated(int)), TQ_SLOT(slotConfigureButton(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChooseScientificConst(int))); KContextMenuManager::insert(this, _popup); } diff --git a/kcalc/kcalc_const_button.h b/kcalc/kcalc_const_button.h index 0658571..88e73e1 100644 --- a/kcalc/kcalc_const_button.h +++ b/kcalc/kcalc_const_button.h @@ -30,7 +30,7 @@ class KCalcConstButton : public KCalcButton { -Q_OBJECT +TQ_OBJECT public: diff --git a/kcalc/kcalc_const_menu.cpp b/kcalc/kcalc_const_menu.cpp index 23790cb..6d74928 100644 --- a/kcalc/kcalc_const_menu.cpp +++ b/kcalc/kcalc_const_menu.cpp @@ -64,11 +64,11 @@ KCalcConstMenu::KCalcConstMenu(TQWidget * parent, const char * name) insertItem(i18n("Thermodynamics"), thermo_menu); insertItem(i18n("Gravitation"), gravitation_menu); - connect(math_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPassActivate(int))); - connect(em_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPassActivate(int))); - connect(nuclear_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPassActivate(int))); - connect(thermo_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPassActivate(int))); - connect(gravitation_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPassActivate(int))); + connect(math_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPassActivate(int))); + connect(em_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPassActivate(int))); + connect(nuclear_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPassActivate(int))); + connect(thermo_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPassActivate(int))); + connect(gravitation_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPassActivate(int))); for (int i = 0; i<NUM_CONST; i++) { diff --git a/kcalc/kcalc_const_menu.h b/kcalc/kcalc_const_menu.h index 2718ed9..1cb6ba3 100644 --- a/kcalc/kcalc_const_menu.h +++ b/kcalc/kcalc_const_menu.h @@ -38,7 +38,7 @@ struct science_constant{ class KCalcConstMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcalc/kcalcdisplay.cpp b/kcalc/kcalcdisplay.cpp index 8ad1350..ecb0827 100644 --- a/kcalc/kcalcdisplay.cpp +++ b/kcalc/kcalcdisplay.cpp @@ -48,13 +48,13 @@ KCalcDisplay::KCalcDisplay(TQWidget *parent, const char *name) setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); setAlignment(AlignRight | AlignVCenter); setFocus(); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false); - connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDisplaySelected())); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDisplaySelected())); - connect(selection_timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotSelectionTimedOut())); + connect(selection_timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotSelectionTimedOut())); sendEvent(EventReset); } @@ -150,7 +150,7 @@ void KCalcDisplay::slotPaste(bool bClipboard) void KCalcDisplay::slotDisplaySelected(void) { - if(_button == Qt::LeftButton) { + if(_button == TQt::LeftButton) { if(_lit) { slotCopy(); selection_timer->start(100); @@ -182,11 +182,11 @@ void KCalcDisplay::invertColors() void KCalcDisplay::mousePressEvent(TQMouseEvent *e) { - if(e->button() == Qt::LeftButton) { + if(e->button() == TQt::LeftButton) { _lit = !_lit; - _button = Qt::LeftButton; + _button = TQt::LeftButton; } else { - _button = Qt::MidButton; + _button = TQt::MidButton; } emit clicked(); diff --git a/kcalc/kcalcdisplay.h b/kcalc/kcalcdisplay.h index 92dc83a..99e3abd 100644 --- a/kcalc/kcalcdisplay.h +++ b/kcalc/kcalcdisplay.h @@ -78,7 +78,7 @@ enum NumBase { class KCalcDisplay : public TQLabel { -Q_OBJECT +TQ_OBJECT public: |