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

2 files changed, 15 insertions, 15 deletions

diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp
index ceb399648..e0b33cf1b 100644
--- a/kcontrol/input/xcursor/previewwidget.cpp
+++ b/kcontrol/input/xcursor/previewwidget.cpp
@@ -303,7 +303,7 @@ void PreviewWidget::setTheme( const TQString &theme )
 	current = -1;
 	setFixedSize( ( maxWidth + cursorSpacing ) * numCursors, kMax( maxHeight, minHeight ) );
 	setUpdatesEnabled( true );
-	repaint( false );
+	tqrepaint( false );
 }
 
 
@@ -311,7 +311,7 @@ void PreviewWidget::paintEvent( TQPaintEvent * )
 {
 	TQPixmap buffer( size() );
 	TQPainter p( &buffer );
-	p.fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) );
+	p.fillRect( rect(), tqcolorGroup().brush( TQColorGroup::Background ) );
 	Picture dest;
 
 	if ( !qt_has_xft || !qt_use_xrender ) {
diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp
index 7caf18c3f..27438a4d2 100644
--- a/kcontrol/input/xcursor/themepage.cpp
+++ b/kcontrol/input/xcursor/themepage.cpp
@@ -122,7 +122,7 @@ ThemePage::ThemePage( TQWidget* parent, const char* name )
 		( !icons.exists() && !TQFileInfo( TQDir::homeDirPath() ).isWritable() ) )
 		installButton->setEnabled( false );
 
-	if ( !themeDirs.contains( path ) )
+	if ( !themeDirs.tqcontains( path ) )
 		installButton->setEnabled( false );
 
 	selectionChanged( listview->currentItem() );
@@ -395,7 +395,7 @@ const TQStringList ThemePage::getThemeBaseDirs() const
 	TQString path = XcursorLibraryPath();
 #endif
 	// Expand all occurences of ~ to the home dir
-	path.replace( "~/", TQDir::homeDirPath() + '/' );
+	path.tqreplace( "~/", TQDir::homeDirPath() + '/' );
 	return TQStringList::split( ':', path );
 }
 
@@ -414,7 +414,7 @@ bool ThemePage::isCursorTheme( const TQString &theme, const int depth ) const
 			continue;
 
 		const TQStringList subdirs( dir.entryList( TQDir::Dirs ) );
-		if ( subdirs.contains( theme ) )
+		if ( subdirs.tqcontains( theme ) )
 		{
 			const TQString path       = *it + '/' + theme;
 			const TQString indexfile  = path + "/index.theme";
@@ -585,7 +585,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample )
 		image.setAlphaBuffer( true );
 
 		// Clear the image
-		Q_UINT32 *dst = reinterpret_cast<Q_UINT32*>( image.bits() );
+		TQ_UINT32 *dst = reinterpret_cast<TQ_UINT32*>( image.bits() );
 		for ( int i = 0; i < image.width() * image.height(); i++ )
 			dst[i] = 0;
 
@@ -593,26 +593,26 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample )
 		TQPoint dstOffset( (image.width() - r.width()) / 2, (image.height() - r.height()) / 2 );
 		TQPoint srcOffset( r.topLeft() );
 
-		dst = reinterpret_cast<Q_UINT32*>( image.scanLine(dstOffset.y()) ) + dstOffset.x();
-		src = reinterpret_cast<Q_UINT32*>( xcur->pixels ) + srcOffset.y() * xcur->width + srcOffset.x();
+		dst = reinterpret_cast<TQ_UINT32*>( image.scanLine(dstOffset.y()) ) + dstOffset.x();
+		src = reinterpret_cast<TQ_UINT32*>( xcur->pixels ) + srcOffset.y() * xcur->width + srcOffset.x();
 
 		// Copy the XcursorImage into the TQImage, converting it from premultiplied
 		// to non-premultiplied alpha and cropping it if needed.
 		for ( int y = 0; y < r.height(); y++ )
 		{
 			for ( int x = 0; x < r.width(); x++, dst++, src++ ) {
-				const Q_UINT32 pixel = *src;
+				const TQ_UINT32 pixel = *src;
 
-				const Q_UINT8 a = qAlpha( pixel );
-				const Q_UINT8 r = qRed( pixel );
-				const Q_UINT8 g = qGreen( pixel );
-				const Q_UINT8 b = qBlue( pixel );
+				const TQ_UINT8 a = tqAlpha( pixel );
+				const TQ_UINT8 r = tqRed( pixel );
+				const TQ_UINT8 g = tqGreen( pixel );
+				const TQ_UINT8 b = tqBlue( pixel );
 
 				if ( !a || a == 255 ) {
 					*dst = pixel;
 				} else {
 					float alpha = a / 255.0;
-					*dst = qRgba( int(r / alpha), int(g / alpha), int(b / alpha), a );
+					*dst = tqRgba( int(r / alpha), int(g / alpha), int(b / alpha), a );
 				}
 			}
 			dst += ( image.width() - r.width() );
@@ -630,7 +630,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample )
 		TQImage image( iconSize, iconSize, 32 );
 		image.setAlphaBuffer( true );
 
-		Q_UINT32 *data = reinterpret_cast< Q_UINT32* >( image.bits() );
+		TQ_UINT32 *data = reinterpret_cast< TQ_UINT32* >( image.bits() );
 		for ( int i = 0; i < image.width() * image.height(); i++ )
 			data[ i ] = 0;