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

8 files changed, 53 insertions, 53 deletions

diff --git a/kcalc/colors.ui b/kcalc/colors.ui
index 6aae3bc..af64057 100644
--- a/kcalc/colors.ui
+++ b/kcalc/colors.ui
@@ -62,7 +62,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>110</width>
                             <height>20</height>
@@ -179,7 +179,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>41</width>
                             <height>20</height>
@@ -255,7 +255,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
diff --git a/kcalc/constants.ui b/kcalc/constants.ui
index efe888c..8bebd01 100644
--- a/kcalc/constants.ui
+++ b/kcalc/constants.ui
@@ -59,7 +59,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>70</width>
                                     <height>21</height>
@@ -84,7 +84,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>80</width>
                                     <height>21</height>
@@ -130,7 +130,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>70</width>
                                     <height>21</height>
@@ -155,7 +155,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>80</width>
                                     <height>21</height>
@@ -201,7 +201,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>70</width>
                                     <height>21</height>
@@ -226,7 +226,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>80</width>
                                     <height>21</height>
@@ -272,7 +272,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>70</width>
                                     <height>21</height>
@@ -297,7 +297,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>80</width>
                                     <height>21</height>
@@ -343,7 +343,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>70</width>
                                     <height>21</height>
@@ -368,7 +368,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>80</width>
                                     <height>21</height>
@@ -414,7 +414,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>70</width>
                                     <height>21</height>
@@ -439,7 +439,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>80</width>
                                     <height>21</height>
@@ -468,7 +468,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/kcalc/general.ui b/kcalc/general.ui
index 3b922b8..bd04b29 100644
--- a/kcalc/general.ui
+++ b/kcalc/general.ui
@@ -73,7 +73,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>21</width>
                             <height>20</height>
@@ -101,7 +101,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>101</width>
                             <height>20</height>
@@ -165,7 +165,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>31</height>
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);
diff --git a/kcalc/kcalc.kcfg b/kcalc/kcalc.kcfg
index b54de8f..26cdbf1 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->tqpalette().active().background();</code>
+      <code>QColor defaultButtonColor = kapp->palette().active().background();</code>
       <default code="true">defaultButtonColor</default>
     </entry>
     <entry name="FunctionButtonsColor" type="Color">
diff --git a/kcalc/kcalc_button.cpp b/kcalc/kcalc_button.cpp
index 277e5bd..dd62821 100644
--- a/kcalc/kcalc_button.cpp
+++ b/kcalc/kcalc_button.cpp
@@ -118,7 +118,7 @@ void KCalcButton::paintLabel(TQPainter *paint)
 {
   if (_mode[_mode_flags].is_label_richtext) {
     TQSimpleRichText _text(_label, font());
-    _text.draw(paint, width()/2-_text.width()/2, 0, tqchildrenRegion(), tqcolorGroup());
+    _text.draw(paint, width()/2-_text.width()/2, 0, childrenRegion(), colorGroup());
   } else {
     KPushButton::drawButtonLabel(paint);
   }
diff --git a/kcalc/kcalcdisplay.cpp b/kcalc/kcalcdisplay.cpp
index 83e0924..b711256 100644
--- a/kcalc/kcalcdisplay.cpp
+++ b/kcalc/kcalcdisplay.cpp
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqpainter.h>
 #include <tqregexp.h>
 
@@ -46,10 +46,10 @@ KCalcDisplay::KCalcDisplay(TQWidget *parent, const char *name)
    selection_timer(new TQTimer)
 {
 	setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
-	tqsetAlignment(AlignRight | AlignVCenter);
+	setAlignment(AlignRight | AlignVCenter);
 	setFocus();
 	setFocusPolicy(TQ_StrongFocus);
-	tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false);
+	setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false);
 
 	connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDisplaySelected()));
 
@@ -105,13 +105,13 @@ void KCalcDisplay::slotCopy(void)
 	TQString txt = TQLabel::text();
 	if (_num_base == NB_HEX)
 		txt.prepend( "0x" );
-	(TQApplication::tqclipboard())->setText(txt, TQClipboard::Clipboard);
-	(TQApplication::tqclipboard())->setText(txt, TQClipboard::Selection);
+	(TQApplication::clipboard())->setText(txt, TQClipboard::Clipboard);
+	(TQApplication::clipboard())->setText(txt, TQClipboard::Selection);
 }
 
 void KCalcDisplay::slotPaste(bool bClipboard)
 {
-	TQString tmp_str = (TQApplication::tqclipboard())->text(bClipboard ? TQClipboard::Clipboard : TQClipboard::Selection);
+	TQString tmp_str = (TQApplication::clipboard())->text(bClipboard ? TQClipboard::Clipboard : TQClipboard::Selection);
 
 	if (tmp_str.isNull())
 	{
@@ -123,7 +123,7 @@ void KCalcDisplay::slotPaste(bool bClipboard)
 
 	tmp_str = tmp_str.stripWhiteSpace();
 
-	if (tmp_str.tqstartsWith("0x", false))
+	if (tmp_str.startsWith("0x", false))
 	  tmp_num_base = NB_HEX;
 
 	if (tmp_num_base != NB_DECIMAL)
@@ -598,11 +598,11 @@ void KCalcDisplay::drawContents(TQPainter *p)
 
 // Return the TQLabel's normal size hint vertically expanded
 // by half the font height to make room for the status texts
-TQSize KCalcDisplay::tqsizeHint() const
+TQSize KCalcDisplay::sizeHint() const
 {
 	TQFont f(font());
 	f.setPointSize(TQMAX((f.pointSize() / 2), 7));
 	TQFontMetrics fm(f);
-	return TQLabel::tqsizeHint() + TQSize(0, fm.height());
+	return TQLabel::sizeHint() + TQSize(0, fm.height());
 }
 
diff --git a/kcalc/kcalcdisplay.h b/kcalc/kcalcdisplay.h
index d12ba2f..338e721 100644
--- a/kcalc/kcalcdisplay.h
+++ b/kcalc/kcalcdisplay.h
@@ -110,7 +110,7 @@ public:
 	TQString text() const;
 	bool updateDisplay(void);
 	void setStatusText(uint i, const TQString& text);
-	virtual TQSize tqsizeHint() const;
+	virtual TQSize sizeHint() const;
 private:
 	bool _beep;
 	bool _groupdigits;