summaryrefslogtreecommitdiffstats
path: root/kcalc/kcalc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kcalc/kcalc.cpp')
-rw-r--r--kcalc/kcalc.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp
index 34f4fb3..d03ac31 100644
--- a/kcalc/kcalc.cpp
+++ b/kcalc/kcalc.cpp
@@ -31,7 +31,7 @@
#include <tqbuttongroup.h>
#include <tqfont.h>
#include <tqhbuttongroup.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqobjectlist.h>
#include <tqradiobutton.h>
#include <tqspinbox.h>
@@ -106,7 +106,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)));
- BaseChooseGroup->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false);
+ BaseChooseGroup->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false);
pbBaseChoose[0] = new TQRadioButton(i18n("He&x"), BaseChooseGroup,
@@ -246,14 +246,14 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
mainLayout->addLayout(topLayout);
mainLayout->addLayout(btnLayout);
- // button tqlayout
+ // button layout
btnLayout->addWidget(mSmallPage, 0, AlignTop);
btnLayout->addSpacing(2*mInternalSpacing);
btnLayout->addWidget(mNumericPage, 0, AlignTop);
btnLayout->addSpacing(2*mInternalSpacing);
btnLayout->addWidget(mLargePage, 0, AlignTop);
- // small button tqlayout
+ // small button layout
smallBtnLayout->addWidget(pbStat["NumData"], 0, 0);
smallBtnLayout->addWidget(pbScientific["HypMode"], 0, 1);
smallBtnLayout->addWidget(pbLogic["AND"], 0, 2);
@@ -303,7 +303,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
smallBtnLayout->setRowStretch(4, 0);
smallBtnLayout->setRowStretch(5, 0);
- // large button tqlayout
+ // large button layout
largeBtnLayout->addWidget(pbClear, 0, 0);
largeBtnLayout->addWidget(pbAC, 0, 1);
@@ -319,7 +319,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
largeBtnLayout->addWidget(pbPercent, 4, 0);
largeBtnLayout->addWidget(pbPlusMinus, 4, 1);
- // top tqlayout
+ // top layout
topLayout->addWidget(pbAngleChoose);
topLayout->addWidget(BaseChooseGroup);
topLayout->addStretch();
@@ -381,7 +381,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
updateGeometry();
adjustSize();
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
UpdateDisplay(true);
@@ -457,7 +457,7 @@ actionCollection());
void KCalculator::setupStatusbar(void)
{
- // tqStatus bar contents
+ // Status bar contents
statusBar()->insertFixedItem(" NORM ", 0, true);
statusBar()->setItemAlignment(0, AlignCenter);
@@ -608,7 +608,7 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *parent)
TQGridLayout *thisLayout = new TQGridLayout(thisPage, 5, 4, 0,
mInternalSpacing);
- // large button tqlayout
+ // large button layout
thisLayout->addWidget(pbEE, 0, 0);
thisLayout->addWidget(pbDivision, 0, 1);
thisLayout->addWidget(pbX, 0, 2);
@@ -1050,7 +1050,7 @@ void KCalculator::updateGeometry(void)
{
TQWidget *tmp_widget = dynamic_cast<TQWidget *>(o);
margin = TQApplication::tqstyle().
- tqpixelMetric(TQStyle::PM_ButtonMargin, (tmp_widget))*2;
+ pixelMetric(TQStyle::PM_ButtonMargin, (tmp_widget))*2;
tmp_widget->setFixedSize(s.width()+margin, s.height()+margin);
//tmp_widget->setMinimumSize(s.width()+margin, s.height()+margin);
tmp_widget->installEventFilter( this );
@@ -1060,11 +1060,11 @@ void KCalculator::updateGeometry(void)
l = mLargePage->childrenListObject();
- int h1 = (NumButtonGroup->find(0x0F))->tqminimumSize().height();
+ int h1 = (NumButtonGroup->find(0x0F))->minimumSize().height();
int h2 = static_cast<int>( (static_cast<float>(h1) + 4.0) / 5.0 );
s.setWidth(mLargePage->fontMetrics().width("MMM") +
TQApplication::tqstyle().
- tqpixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2);
+ pixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2);
s.setHeight(h1 + h2);
for(uint i = 0; i < l.count(); i++)
@@ -1087,11 +1087,11 @@ void KCalculator::updateGeometry(void)
l = mNumericPage->childrenListObject(); // silence please
- h1 = (NumButtonGroup->find(0x0F))->tqminimumSize().height();
+ h1 = (NumButtonGroup->find(0x0F))->minimumSize().height();
h2 = (int)((((float)h1 + 4.0) / 5.0));
s.setWidth(mLargePage->fontMetrics().width("MMM") +
TQApplication::tqstyle().
- tqpixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2);
+ pixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2);
s.setHeight(h1 + h2);
for(uint i = 0; i < l.count(); i++)
@@ -1950,7 +1950,7 @@ void KCalculator::slotStatshow(bool toggled)
pbStat["ClearData"]->hide();
}
adjustSize();
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
KCalcSettings::setShowStat(toggled);
}
@@ -1985,7 +1985,7 @@ void KCalculator::slotScientificshow(bool toggled)
calc_display->setStatusText(2, TQString());
}
adjustSize();
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
KCalcSettings::setShowScientific(toggled);
}
@@ -2026,7 +2026,7 @@ void KCalculator::slotLogicshow(bool toggled)
(NumButtonGroup->find(i))->hide();
}
adjustSize();
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
KCalcSettings::setShowLogic(toggled);
}
@@ -2052,7 +2052,7 @@ void KCalculator::slotConstantsShow(bool toggled)
pbConstant[5]->hide();
}
adjustSize();
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
KCalcSettings::setShowConstants(toggled);
}
@@ -2108,7 +2108,7 @@ void KCalculator::updateSettings()
calc_display->changeSettings();
updateGeometry();
- resize(tqminimumSize());
+ resize(minimumSize());
//
// 1999-10-31 Espen Sand: Don't ask me why ;)
@@ -2139,7 +2139,7 @@ void KCalculator::set_colors()
calc_display->changeSettings();
- TQColor bg = tqpalette().active().background();
+ TQColor bg = palette().active().background();
TQPalette numPal(KCalcSettings::numberButtonsColor(), bg);
for(int i=0; i<10; i++)
@@ -2212,7 +2212,7 @@ bool KCalculator::eventFilter(TQObject *o, TQEvent *e)
if((num_but = NumButtonGroup->id((KCalcButton*)o))
!= -1)
{
- TQPalette pal(c, tqpalette().active().background());
+ TQPalette pal(c, palette().active().background());
// Was it hex-button or normal digit??
if (num_but <10)
@@ -2243,7 +2243,7 @@ bool KCalculator::eventFilter(TQObject *o, TQEvent *e)
else
return false;
- TQPalette pal(c, tqpalette().active().background());
+ TQPalette pal(c, palette().active().background());
for(KCalcButton *p = list->first(); p; p=list->next())
p->setPalette(pal);
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 11:48:17 +0000