Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 files changed, 59 insertions, 59 deletions

diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index f351d3f2c..41d775ba5 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -160,8 +160,8 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	gbWidgetStyle->layout()->setMargin( KDialog::marginHint() );
 	gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() );
 
-	gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->layout() );
-	gbWidgetStyleLayout->setAlignment( Qt::AlignTop );
+	gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->tqlayout() );
+	gbWidgetStyleLayout->tqsetAlignment( Qt::AlignTop );
 	hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" );
 
 	cbStyle = new KComboBox( gbWidgetStyle, "cbStyle" );
@@ -169,14 +169,14 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	hbLayout->addWidget( cbStyle );
 
 	pbConfigStyle = new TQPushButton( i18n("Con&figure..."), gbWidgetStyle );
-	pbConfigStyle->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum );
+	pbConfigStyle->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum );
 	pbConfigStyle->setEnabled( FALSE );
 	hbLayout->addWidget( pbConfigStyle );
 
 	gbWidgetStyleLayout->addLayout( hbLayout );
 
 	lblStyleDesc = new TQLabel( gbWidgetStyle );
-	lblStyleDesc->setTextFormat(Qt::RichText);
+	lblStyleDesc->setTextFormat(TQt::RichText);
 	gbWidgetStyleLayout->addWidget( lblStyleDesc );
 
 	cbIconsOnButtons = new TQCheckBox( i18n("Sho&w icons on buttons"), gbWidgetStyle );
@@ -187,13 +187,13 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	gbWidgetStyleLayout->addWidget( cbTearOffHandles );
 	cbTearOffHandles->hide(); // reenable when the corresponding Qt method is virtual and properly reimplemented
 
-    TQGroupBox *gbPreview = new TQGroupBox( i18n( "Preview" ), page1 );
-	gbPreview->setColumnLayout( 0, Vertical );
+	TQGroupBox *gbPreview = new TQGroupBox( i18n( "Preview" ), page1 );
+	gbPreview->setColumnLayout( 0, Qt::Vertical );
 	gbPreview->layout()->setMargin( 0 );
 	gbPreview->layout()->setSpacing( KDialog::spacingHint() );
 	gbPreview->setFlat( true );
 	stylePreview = new StylePreview( gbPreview );
-	gbPreview->layout()->add( stylePreview );
+	gbPreview->tqlayout()->add( stylePreview );
 
 	page1Layout->addWidget( gbWidgetStyle );
 	page1Layout->addWidget( gbPreview );
@@ -294,16 +294,16 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	box1->setSpacing( KDialog::spacingHint() );
 	box1->setMargin( 0 );
 	TQLabel* lbl = new TQLabel( i18n("0%"), box1 );
-	lbl->setAlignment( AlignLeft );
+	lbl->tqsetAlignment( AlignLeft );
 	lbl = new TQLabel( i18n("50%"), box1 );
-	lbl->setAlignment( AlignHCenter );
+	lbl->tqsetAlignment( AlignHCenter );
 	lbl = new TQLabel( i18n("100%"), box1 );
-	lbl->setAlignment( AlignRight );
+	lbl->tqsetAlignment( AlignRight );
 
 	lblMenuEffectType = new TQLabel( comboMenuEffectType, i18n("Menu trans&lucency type:"), menuContainer );
-	lblMenuEffectType->setAlignment( AlignBottom | AlignLeft );
+	lblMenuEffectType->tqsetAlignment( AlignBottom | AlignLeft );
 	lblMenuOpacity    = new TQLabel( slOpacity, i18n("Menu &opacity:"), menuContainer );
-	lblMenuOpacity->setAlignment( AlignBottom | AlignLeft );
+	lblMenuOpacity->tqsetAlignment( AlignBottom | AlignLeft );
 
 	menuContainerLayout->addWidget( lblMenuEffectType, 0, 0 );
 	menuContainerLayout->addWidget( comboMenuEffectType, 1, 0 );
@@ -642,7 +642,7 @@ void KCMStyle::save()
 
 	if (m_bEffectsDirty) {
 		KIPC::sendMessageAll(KIPC::SettingsChanged);
-		kapp->dcopClient()->send("kwin*", "", "reconfigure()", "");
+		kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString(""));
 	}
         //update kicker to re-used tooltips kicker parameter otherwise, it overwritted
         //by style tooltips parameters.
@@ -659,7 +659,7 @@ void KCMStyle::save()
 
 bool KCMStyle::findStyle( const TQString& str, int& combobox_item )
 {
-	StyleEntry* se   = styleEntries.find(str.lower());
+	StyleEntry* se   = styleEntries.tqfind(str.lower());
 
 	TQString     name = se ? se->name : str;
 
@@ -754,7 +754,7 @@ void KCMStyle::loadStyle( KConfig& config )
 	{
 		TQString id = (*it).lower();
 		// Find the entry.
-		if ( (entry = styleEntries.find(id)) != 0 )
+		if ( (entry = styleEntries.tqfind(id)) != 0 )
 		{
 			// Do not add hidden entries
 			if (entry->hidden)
@@ -795,9 +795,9 @@ void KCMStyle::loadStyle( KConfig& config )
 		item = i;
 		if ( id == cfgStyle )	// ExactMatch
 			break;
-		else if ( id.contains( cfgStyle ) )
+		else if ( id.tqcontains( cfgStyle ) )
 			break;
-		else if ( id.contains( TQApplication::style().className() ) )
+		else if ( id.tqcontains( TQApplication::tqstyle().className() ) )
 			break;
 		item = 0;
 	}
@@ -823,7 +823,7 @@ void KCMStyle::styleChanged()
 void KCMStyle::switchStyle(const TQString& styleName, bool force)
 {
 	// Don't flicker the preview if the same style is chosen in the cb
-	if (!force && appliedStyle && appliedStyle->name() == styleName) 
+	if (!force && appliedStyle && TQT_TQOBJECT(appliedStyle)->name() == styleName) 
 		return;
          
 	// Create an instance of the new style...
@@ -837,13 +837,13 @@ void KCMStyle::switchStyle(const TQString& styleName, bool force)
 	setStyleRecursive( stylePreview, style );
 
 	// this flickers, but reliably draws the widgets correctly.
-	stylePreview->resize( stylePreview->sizeHint() );
+	stylePreview->resize( stylePreview->tqsizeHint() );
 
 	delete appliedStyle;
 	appliedStyle = style;
 
 	// Set the correct style description
-	StyleEntry* entry = styleEntries.find( styleName );
+	StyleEntry* entry = styleEntries.tqfind( styleName );
 	TQString desc;
 	desc = i18n("Description: %1").arg( entry ? entry->desc : i18n("No description available.") );
 	lblStyleDesc->setText( desc );
@@ -863,12 +863,12 @@ void KCMStyle::setStyleRecursive(TQWidget* w, TQStyle* s)
 	w->setStyle(s);
 
 	// Recursively update all children.
-	const TQObjectList *children = w->children();
-	if (!children)
+	const TQObjectList children = w->childrenListObject();
+	if (children.isEmpty())
 		return;
 
 	// Apply the style to each child widget.
-	TQPtrListIterator<TQObject> childit(*children);
+	TQPtrListIterator<TQObject> childit(children);
 	TQObject *child;
 	while ((child = childit.current()) != 0)
 	{
diff --git a/kcontrol/style/keramik/keramikconf.h b/kcontrol/style/keramik/keramikconf.h
index de1c58dfd..6de7edb10 100644
--- a/kcontrol/style/keramik/keramikconf.h
+++ b/kcontrol/style/keramik/keramikconf.h
@@ -26,7 +26,7 @@ DEALINGS IN THE SOFTWARE.
 
 class TQCheckBox;
 
-class KeramikStyleConfig: public QWidget
+class KeramikStyleConfig: public TQWidget
 {
 	Q_OBJECT
 public:
diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp
index 112f2c241..51d5aad5f 100644
--- a/kcontrol/style/menupreview.cpp
+++ b/kcontrol/style/menupreview.cpp
@@ -30,11 +30,11 @@
 
 
 MenuPreview::MenuPreview( TQWidget* parent, int opacity, PreviewMode pvm )
-	: TQWidget( parent, 0, WStyle_Customize | WRepaintNoErase ),
+	: TQWidget( parent, 0, (WFlags)(WStyle_Customize | WRepaintNoErase) ),
 	pixBackground(NULL), pixOverlay(NULL), pixBlended(NULL)
 {
 	setFixedSize(150, 150);
-	setFocusPolicy( NoFocus );
+	setFocusPolicy( TQ_NoFocus );
 
 	mode = pvm;
 	if (opacity < 0)   opacity = 0;
@@ -68,7 +68,7 @@ void MenuPreview::createPixmaps()
 	if (pixBlended)
 		pixBlended->resize( w, h );
 	
-	TQColorGroup cg = colorGroup();
+	TQColorGroup cg = tqcolorGroup();
 	TQColor c1 = cg.background();
 	TQColor c2 = cg.mid();
 
@@ -96,7 +96,7 @@ void MenuPreview::createPixmaps()
 
 void MenuPreview::blendPixmaps()
 {
-	// Rebuild pixmaps, and repaint
+	// Rebuild pixmaps, and tqrepaint
 	if (pixBlended && pixBackground) 
 	{
 		if (mode == Blend && pixOverlay) {
@@ -105,7 +105,7 @@ void MenuPreview::blendPixmaps()
 			KImageEffect::blend(src, dst, menuOpacity);
 			pixBlended->convertFromImage( dst );
 		} else if (mode == Tint) {
-			TQColor clr = colorGroup().button();
+			TQColor clr = tqcolorGroup().button();
 			TQImage dst = pixBackground->convertToImage();
 			KImageEffect::blend(clr, dst, menuOpacity);
 			pixBlended->convertFromImage( dst );
@@ -121,7 +121,7 @@ void MenuPreview::setOpacity( int opacity )
 	if ((int)(menuOpacity*100) != opacity) {
 		menuOpacity = opacity/100.0;
 		blendPixmaps();
-		repaint( false );
+		tqrepaint( false );
 	}
 }
 
@@ -130,14 +130,14 @@ void MenuPreview::setPreviewMode( PreviewMode pvm )
 	if (mode != pvm) {
 		mode = pvm;
 		blendPixmaps();
-		repaint( false );
+		tqrepaint( false );
 	}
 }
 
 void MenuPreview::paintEvent( TQPaintEvent* /* pe */ )
 {
 	// Paint the frame and blended pixmap
-	TQColorGroup cg = colorGroup();
+	TQColorGroup cg = tqcolorGroup();
 	int x2 = width()-1;
 	int y2 = height()-1;
 
diff --git a/kcontrol/style/menupreview.h b/kcontrol/style/menupreview.h
index ad22e77af..e82b88f18 100644
--- a/kcontrol/style/menupreview.h
+++ b/kcontrol/style/menupreview.h
@@ -24,7 +24,7 @@
 
 class KPixmap;
 
-class MenuPreview : public QWidget
+class MenuPreview : public TQWidget
 {
 	Q_OBJECT
 
diff --git a/kcontrol/style/stylepreview.ui b/kcontrol/style/stylepreview.ui
index fbb4929f2..d438c0ad8 100644
--- a/kcontrol/style/stylepreview.ui
+++ b/kcontrol/style/stylepreview.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>StylePreview</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>StylePreview</cstring>
     </property>
@@ -29,14 +29,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QTabWidget" row="0" column="0">
+        <widget class="TQTabWidget" row="0" column="0">
             <property name="name">
                 <cstring>TabWidget2</cstring>
             </property>
@@ -51,7 +51,7 @@
             <property name="margin">
                 <number>2</number>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -62,7 +62,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QButtonGroup" row="0" column="0" rowspan="4" colspan="1">
+                    <widget class="TQButtonGroup" row="0" column="0" rowspan="4" colspan="1">
                         <property name="name">
                             <cstring>ButtonGroup1</cstring>
                         </property>
@@ -73,7 +73,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>RadioButton1</cstring>
                                 </property>
@@ -84,7 +84,7 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>RadioButton2</cstring>
                                 </property>
@@ -106,7 +106,7 @@
                                     <enum>Horizontal</enum>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>CheckBox1</cstring>
                                 </property>
@@ -122,7 +122,7 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QScrollBar" row="0" column="2" rowspan="4" colspan="1">
+                    <widget class="TQScrollBar" row="0" column="2" rowspan="4" colspan="1">
                         <property name="name">
                             <cstring>ScrollBar1</cstring>
                         </property>
@@ -133,7 +133,7 @@
                             <enum>Vertical</enum>
                         </property>
                     </widget>
-                    <widget class="QComboBox" row="3" column="1">
+                    <widget class="TQComboBox" row="3" column="1">
                         <item>
                             <property name="text">
                                 <string>Combobox</string>
@@ -143,7 +143,7 @@
                             <cstring>ComboBox1</cstring>
                         </property>
                     </widget>
-                    <widget class="QProgressBar" row="0" column="1">
+                    <widget class="TQProgressBar" row="0" column="1">
                         <property name="name">
                             <cstring>ProgressBar1</cstring>
                         </property>
@@ -151,7 +151,7 @@
                             <number>70</number>
                         </property>
                     </widget>
-                    <widget class="QSlider" row="1" column="1">
+                    <widget class="TQSlider" row="1" column="1">
                         <property name="name">
                             <cstring>Slider1</cstring>
                         </property>
@@ -159,7 +159,7 @@
                             <enum>Horizontal</enum>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="2" column="1">
+                    <widget class="TQLayoutWidget" row="2" column="1">
                         <property name="name">
                             <cstring>layout3</cstring>
                         </property>
@@ -177,14 +177,14 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>40</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QSpinBox">
+                            <widget class="TQSpinBox">
                                 <property name="name">
                                     <cstring>SpinBox1</cstring>
                                 </property>
@@ -196,13 +196,13 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
                                     </size>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>200</width>
                                         <height>32767</height>
@@ -212,7 +212,7 @@
                                     <number>999999</number>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>PushButton1</cstring>
                                 </property>
@@ -224,13 +224,13 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
                                     </size>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>200</width>
                                         <height>32767</height>
@@ -250,7 +250,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>30</width>
                                         <height>20</height>
@@ -261,7 +261,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -276,10 +276,10 @@
     <include location="local" impldecl="in implementation">kdialog.h</include>
     <include location="local" impldecl="in implementation">stylepreview.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
-    <slot returnType="bool">eventFilter( QObject *, QEvent * ev )</slot>
-</slots>
+    <slot returnType="bool">eventFilter( TQObject *, TQEvent * ev )</slot>
+</Q_SLOTS>
 <layoutdefaults spacing="6" margin="10"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/style/stylepreview.ui.h b/kcontrol/style/stylepreview.ui.h
index 076197955..9f5188afe 100644
--- a/kcontrol/style/stylepreview.ui.h
+++ b/kcontrol/style/stylepreview.ui.h
@@ -40,7 +40,7 @@ void StylePreview::init()
     {
         ++it;
         obj->installEventFilter(this);
-        ((TQWidget*)obj)->setFocusPolicy(NoFocus);
+        ((TQWidget*)obj)->setFocusPolicy(TQ_NoFocus);
     }
     delete l;
 }