From 628043be55ddd2f534411d028e4f68c8fe4eaabb Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 18 Dec 2011 18:29:23 -0600
Subject: Rename old tq methods that no longer need a unique name

---
 kcontrol/style/kcmstyle.cpp    | 16 ++++++++--------
 kcontrol/style/menupreview.cpp |  6 +++---
 kcontrol/style/stylepreview.ui | 14 +++++++-------
 3 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'kcontrol/style')

diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index ecfd6fea9..a35a8cdc5 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -161,7 +161,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() );
 
 	gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->tqlayout() );
-	gbWidgetStyleLayout->tqsetAlignment( Qt::AlignTop );
+	gbWidgetStyleLayout->setAlignment( Qt::AlignTop );
 	hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" );
 
 	cbStyle = new KComboBox( gbWidgetStyle, "cbStyle" );
@@ -169,7 +169,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	hbLayout->addWidget( cbStyle );
 
 	pbConfigStyle = new TQPushButton( i18n("Con&figure..."), gbWidgetStyle );
-	pbConfigStyle->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum );
+	pbConfigStyle->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum );
 	pbConfigStyle->setEnabled( FALSE );
 	hbLayout->addWidget( pbConfigStyle );
 
@@ -296,16 +296,16 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	box1->setSpacing( KDialog::spacingHint() );
 	box1->setMargin( 0 );
 	TQLabel* lbl = new TQLabel( i18n("0%"), box1 );
-	lbl->tqsetAlignment( AlignLeft );
+	lbl->setAlignment( AlignLeft );
 	lbl = new TQLabel( i18n("50%"), box1 );
-	lbl->tqsetAlignment( AlignHCenter );
+	lbl->setAlignment( AlignHCenter );
 	lbl = new TQLabel( i18n("100%"), box1 );
-	lbl->tqsetAlignment( AlignRight );
+	lbl->setAlignment( AlignRight );
 
 	lblMenuEffectType = new TQLabel( comboMenuEffectType, i18n("Menu trans&lucency type:"), menuContainer );
-	lblMenuEffectType->tqsetAlignment( AlignBottom | AlignLeft );
+	lblMenuEffectType->setAlignment( AlignBottom | AlignLeft );
 	lblMenuOpacity    = new TQLabel( slOpacity, i18n("Menu &opacity:"), menuContainer );
-	lblMenuOpacity->tqsetAlignment( AlignBottom | AlignLeft );
+	lblMenuOpacity->setAlignment( AlignBottom | AlignLeft );
 
 	menuContainerLayout->addWidget( lblMenuEffectType, 0, 0 );
 	menuContainerLayout->addWidget( comboMenuEffectType, 1, 0 );
@@ -844,7 +844,7 @@ void KCMStyle::switchStyle(const TQString& styleName, bool force)
 	setStyleRecursive( stylePreview, style );
 
 	// this flickers, but reliably draws the widgets correctly.
-	stylePreview->resize( stylePreview->tqsizeHint() );
+	stylePreview->resize( stylePreview->sizeHint() );
 
 	delete appliedStyle;
 	appliedStyle = style;
diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp
index 51d5aad5f..84e951523 100644
--- a/kcontrol/style/menupreview.cpp
+++ b/kcontrol/style/menupreview.cpp
@@ -68,7 +68,7 @@ void MenuPreview::createPixmaps()
 	if (pixBlended)
 		pixBlended->resize( w, h );
 	
-	TQColorGroup cg = tqcolorGroup();
+	TQColorGroup cg = colorGroup();
 	TQColor c1 = cg.background();
 	TQColor c2 = cg.mid();
 
@@ -105,7 +105,7 @@ void MenuPreview::blendPixmaps()
 			KImageEffect::blend(src, dst, menuOpacity);
 			pixBlended->convertFromImage( dst );
 		} else if (mode == Tint) {
-			TQColor clr = tqcolorGroup().button();
+			TQColor clr = colorGroup().button();
 			TQImage dst = pixBackground->convertToImage();
 			KImageEffect::blend(clr, dst, menuOpacity);
 			pixBlended->convertFromImage( dst );
@@ -137,7 +137,7 @@ void MenuPreview::setPreviewMode( PreviewMode pvm )
 void MenuPreview::paintEvent( TQPaintEvent* /* pe */ )
 {
 	// Paint the frame and blended pixmap
-	TQColorGroup cg = tqcolorGroup();
+	TQColorGroup cg = colorGroup();
 	int x2 = width()-1;
 	int y2 = height()-1;
 
diff --git a/kcontrol/style/stylepreview.ui b/kcontrol/style/stylepreview.ui
index d438c0ad8..ed6d2e43a 100644
--- a/kcontrol/style/stylepreview.ui
+++ b/kcontrol/style/stylepreview.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
@@ -177,7 +177,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>40</width>
                                         <height>20</height>
@@ -196,13 +196,13 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
                                     </size>
                                 </property>
-                                <property name="tqmaximumSize">
+                                <property name="maximumSize">
                                     <size>
                                         <width>200</width>
                                         <height>32767</height>
@@ -224,13 +224,13 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
                                     </size>
                                 </property>
-                                <property name="tqmaximumSize">
+                                <property name="maximumSize">
                                     <size>
                                         <width>200</width>
                                         <height>32767</height>
@@ -250,7 +250,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>30</width>
                                         <height>20</height>
-- 
cgit v1.2.3