TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


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

1 files changed, 33 insertions, 33 deletions

diff --git a/karbon/widgets/vsmallpreview.cc b/karbon/widgets/vsmallpreview.cc
index 7766f6e92..ab1b9261a 100644
--- a/karbon/widgets/vsmallpreview.cc
+++ b/karbon/widgets/vsmallpreview.cc
@@ -19,11 +19,11 @@
 */
 
 /* vsmallpreview.cc */
-#include <qcolor.h>
-#include <qframe.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpixmap.h>
+#include <tqcolor.h>
+#include <tqframe.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpixmap.h>
 
 #include <klocale.h>
 #include <KoPoint.h>
@@ -39,24 +39,24 @@
 
 #define FRAMEWIDTH		40
 
-VSmallPreview::VSmallPreview( QWidget* parent, const char* name )
-	: QWidget( parent, name )
+VSmallPreview::VSmallPreview( TQWidget* tqparent, const char* name )
+	: TQWidget( tqparent, name )
 {
-	/* Create widget layout */
-	QHBoxLayout *layout = new QHBoxLayout( this, 4 );
-	m_strokeLabel = new QLabel( i18n( "Stroke: None" ), this );
-	layout->addWidget( m_strokeLabel );
-	m_strokeFrame = new QFrame( this );
+	/* Create widget tqlayout */
+	TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 4 );
+	m_strokeLabel = new TQLabel( i18n( "Stroke: None" ), this );
+	tqlayout->addWidget( m_strokeLabel );
+	m_strokeFrame = new TQFrame( this );
 	m_strokeFrame->setFixedWidth ( FRAMEWIDTH );
-	m_strokeFrame->setFrameStyle( QFrame::GroupBoxPanel | QFrame::Plain );
-	layout->addWidget( m_strokeFrame );
-	m_fillLabel = new QLabel( i18n( "Fill: None" ), this );
-	layout->addWidget( m_fillLabel );
-	m_fillFrame = new QFrame( this );
+	m_strokeFrame->setFrameStyle( TQFrame::GroupBoxPanel | TQFrame::Plain );
+	tqlayout->addWidget( m_strokeFrame );
+	m_fillLabel = new TQLabel( i18n( "Fill: None" ), this );
+	tqlayout->addWidget( m_fillLabel );
+	m_fillFrame = new TQFrame( this );
 	m_fillFrame->setFixedWidth ( FRAMEWIDTH );
-	m_fillFrame->setFrameStyle( QFrame::GroupBoxPanel | QFrame::Plain );
-	layout->addWidget( m_fillFrame );
-	layout->activate();
+	m_fillFrame->setFrameStyle( TQFrame::GroupBoxPanel | TQFrame::Plain );
+	tqlayout->addWidget( m_fillFrame );
+	tqlayout->activate();
 
 	m_fill = VFill();
 	m_stroke = VStroke();
@@ -83,7 +83,7 @@ VSmallPreview::update( const VStroke &s, const VFill &f )
 }
 
 void
-VSmallPreview::paintEvent( QPaintEvent* /*event*/ )
+VSmallPreview::paintEvent( TQPaintEvent* /*event*/ )
 {
 	drawStroke( m_stroke );
 	drawFill( m_fill );
@@ -95,13 +95,13 @@ VSmallPreview::drawFill( const VFill &f )
 	VFill fill;
 	VStroke stroke;
 	
-	QPixmap m_pixmap;
+	TQPixmap m_pixmap;
 	m_pixmap.resize( m_fillFrame->width(), m_fillFrame->height() );
-	VKoPainter* m_painter = new VKoPainter( &m_pixmap, m_fillFrame->width(), m_fillFrame->height() );
+	VKoPainter* m_painter = new VKoPainter( TQT_TQPAINTDEVICE(&m_pixmap), m_fillFrame->width(), m_fillFrame->height() );
 
 	m_painter->begin();
-	m_painter->setPen( Qt::NoPen );
-	fill.setColor( Qt::white );
+	m_painter->setPen( TQt::NoPen );
+	fill.setColor( TQt::white );
 	m_painter->setBrush( fill );
 	m_painter->drawRect( KoRect( 0, 0, m_fillFrame->width(), m_fillFrame->height() ) );
 
@@ -157,10 +157,10 @@ VSmallPreview::drawFill( const VFill &f )
 		default: //None or unknown
 		{
 			m_fillLabel->setText( i18n( "Fill: None") );
-			fill.setColor( Qt::white );
+			fill.setColor( TQt::white );
 			m_painter->setBrush( fill );
 			m_painter->drawRect( KoRect( 0, 0, m_fillFrame->width(), m_fillFrame->height() ) );
-			stroke.setColor( Qt::red );
+			stroke.setColor( TQt::red );
 			stroke.setLineWidth( 2.0 );
 			m_painter->setPen( stroke );
 			m_painter->newPath();
@@ -190,13 +190,13 @@ VSmallPreview::drawStroke( const VStroke &s )
 	VFill fill;
 	VStroke stroke;
 
-	QPixmap m_pixmap;
+	TQPixmap m_pixmap;
 	m_pixmap.resize( m_fillFrame->width(), m_fillFrame->height() );
-	VKoPainter* m_painter = new VKoPainter( &m_pixmap, m_fillFrame->width(), m_fillFrame->height() );
+	VKoPainter* m_painter = new VKoPainter( TQT_TQPAINTDEVICE(&m_pixmap), m_fillFrame->width(), m_fillFrame->height() );
 
 	m_painter->begin();
-	m_painter->setPen( Qt::NoPen );
-	fill.setColor( Qt::white );
+	m_painter->setPen( TQt::NoPen );
+	fill.setColor( TQt::white );
 	m_painter->setBrush( fill );
 	m_painter->drawRect( KoRect( 0, 0, m_strokeFrame->width(), m_strokeFrame->height() ) );
 	
@@ -251,10 +251,10 @@ VSmallPreview::drawStroke( const VStroke &s )
 		default: //None or unknown
 		{
 			m_strokeLabel->setText( i18n( "Stroke: None") );
-			fill.setColor( Qt::white );
+			fill.setColor( TQt::white );
 			m_painter->setBrush( fill );
 			m_painter->drawRect( KoRect( 0, 0, m_strokeFrame->width(), m_strokeFrame->height() ) );
-			stroke.setColor( Qt::red );
+			stroke.setColor( TQt::red );
 			stroke.setLineWidth( 2.0 );
 			m_painter->setPen( stroke );
 			m_painter->newPath();