Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit bf280726d5d22f33d33e4f9e771220c725249407.

1 files changed, 22 insertions, 22 deletions

diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp
index d03ac31..34f4fb3 100644
--- a/kcalc/kcalc.cpp
+++ b/kcalc/kcalc.cpp
@@ -31,7 +31,7 @@
 #include <tqbuttongroup.h>
 #include <tqfont.h>
 #include <tqhbuttongroup.h>
-#include <layout.h>
+#include <tqlayout.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->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false);
+	BaseChooseGroup->tqsetSizePolicy(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 layout
+	// button tqlayout
 	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 layout
+	// small button tqlayout
 	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 layout
+	// large button tqlayout
 	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 layout
+	// top tqlayout
 	topLayout->addWidget(pbAngleChoose);
 	topLayout->addWidget(BaseChooseGroup);
 	topLayout->addStretch();
@@ -381,7 +381,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
 	updateGeometry();
 
 	adjustSize();
-	setFixedSize(sizeHint());
+	setFixedSize(tqsizeHint());
 
 	UpdateDisplay(true);
 
@@ -457,7 +457,7 @@ actionCollection());
 
 void KCalculator::setupStatusbar(void)
 {
-	// Status bar contents
+	// tqStatus 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 layout
+	// large button tqlayout
 	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().
-                pixelMetric(TQStyle::PM_ButtonMargin, (tmp_widget))*2;
+                tqpixelMetric(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))->minimumSize().height();
+    int h1 = (NumButtonGroup->find(0x0F))->tqminimumSize().height();
     int h2 = static_cast<int>( (static_cast<float>(h1) + 4.0) / 5.0 );
     s.setWidth(mLargePage->fontMetrics().width("MMM") +
                TQApplication::tqstyle().
-               pixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2);
+               tqpixelMetric(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))->minimumSize().height();
+    h1 = (NumButtonGroup->find(0x0F))->tqminimumSize().height();
     h2 = (int)((((float)h1 + 4.0) / 5.0));
     s.setWidth(mLargePage->fontMetrics().width("MMM") +
                TQApplication::tqstyle().
-               pixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2);
+               tqpixelMetric(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(sizeHint());
+	setFixedSize(tqsizeHint());
 	KCalcSettings::setShowStat(toggled);
 }
 
@@ -1985,7 +1985,7 @@ void KCalculator::slotScientificshow(bool toggled)
 		calc_display->setStatusText(2, TQString());
 	}
 	adjustSize();
-	setFixedSize(sizeHint());
+	setFixedSize(tqsizeHint());
 	KCalcSettings::setShowScientific(toggled);
 }
 
@@ -2026,7 +2026,7 @@ void KCalculator::slotLogicshow(bool toggled)
 			(NumButtonGroup->find(i))->hide();
 	}
 	adjustSize();
-	setFixedSize(sizeHint());
+	setFixedSize(tqsizeHint());
 	KCalcSettings::setShowLogic(toggled);
 }
 
@@ -2052,7 +2052,7 @@ void KCalculator::slotConstantsShow(bool toggled)
 		pbConstant[5]->hide();
 	}
 	adjustSize();
-	setFixedSize(sizeHint());
+	setFixedSize(tqsizeHint());
 	KCalcSettings::setShowConstants(toggled);
 }
 
@@ -2108,7 +2108,7 @@ void KCalculator::updateSettings()
 	calc_display->changeSettings();
 
 	updateGeometry();
-	resize(minimumSize());
+	resize(tqminimumSize());
 
 	//
 	// 1999-10-31 Espen Sand: Don't ask me why ;)
@@ -2139,7 +2139,7 @@ void KCalculator::set_colors()
 
 	calc_display->changeSettings();
 
-	TQColor bg = palette().active().background();
+	TQColor bg = tqpalette().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, palette().active().background());
+			  TQPalette pal(c, tqpalette().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, palette().active().background());
+			TQPalette pal(c, tqpalette().active().background());
 
 			for(KCalcButton *p = list->first(); p; p=list->next())
 				p->setPalette(pal);