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, 43 insertions, 43 deletions

diff --git a/kexi/widget/utils/kexirecordmarker.cpp b/kexi/widget/utils/kexirecordmarker.cpp
index d434fcaf6..654f3be7b 100644
--- a/kexi/widget/utils/kexirecordmarker.cpp
+++ b/kexi/widget/utils/kexirecordmarker.cpp
@@ -22,20 +22,20 @@
 
 #include "kexirecordmarker.h"
 
-#include <qcolor.h>
-#include <qstyle.h>
-#include <qpixmap.h>
-#include <qpainter.h>
-#include <qimage.h>
-#include <qapplication.h>
+#include <tqcolor.h>
+#include <tqstyle.h>
+#include <tqpixmap.h>
+#include <tqpainter.h>
+#include <tqimage.h>
+#include <tqapplication.h>
 
 #include <kdebug.h>
 #include <kstaticdeleter.h>
 
 #include <kexiutils/utils.h>
 
-static KStaticDeleter<QImage> KexiRecordMarker_pen_deleter, KexiRecordMarker_plus_deleter;
-QImage* KexiRecordMarker_pen = 0, *KexiRecordMarker_plus = 0;
+static KStaticDeleter<TQImage> KexiRecordMarker_pen_deleter, KexiRecordMarker_plus_deleter;
+TQImage* KexiRecordMarker_pen = 0, *KexiRecordMarker_plus = 0;
 
 static const unsigned char img_pen_data[] = {
     0x00,0x00,0x03,0x30,0x78,0x9c,0xfb,0xff,0xff,0x3f,0xc3,0x7f,0x32,0x30,
@@ -56,7 +56,7 @@ static struct EmbedImage {
     const unsigned char *data;
     ulong compressed;
     int numColors;
-    const QRgb *colorTable;
+    const TQRgb *colorTable;
     bool alpha;
     const char *name;
 } embed_image[] = {
@@ -64,14 +64,14 @@ static struct EmbedImage {
     { 10, 10, 32, (const unsigned char*)img_pen_data, 50, 0, 0, true, "tableview_plus.png" }
 };
 
-QImage* getImg(const unsigned char* data, int id)
+TQImage* getImg(const unsigned char* data, int id)
 {
-	QByteArray baunzip;
-	baunzip = qUncompress( data, embed_image[id].compressed );
-	QImage *img = new QImage( QImage((uchar*)baunzip.data(),
+	TQByteArray baunzip;
+	baunzip = tqUncompress( data, embed_image[id].compressed );
+	TQImage *img = new TQImage( TQImage((uchar*)baunzip.data(),
 			embed_image[id].width, embed_image[id].height,
-			embed_image[id].depth, (QRgb*)embed_image[id].colorTable,
-			embed_image[id].numColors, QImage::BigEndian
+			embed_image[id].depth, (TQRgb*)embed_image[id].colorTable,
+			embed_image[id].numColors, TQImage::BigEndian
 	).copy() );
 	if ( embed_image[id].alpha )
 		img->setAlphaBuffer(true);
@@ -100,7 +100,7 @@ public:
 	 , highlightedRow(-1)
 	 , editRow(-1)
 	 , rows(0)
-	 , selectionBackgroundColor(qApp->palette().active().highlight())
+	 , selectionBackgroundColor(tqApp->tqpalette().active().highlight())
 	 , showInsertRow(true)
 	{
 	}
@@ -110,14 +110,14 @@ public:
 	int highlightedRow;
 	int editRow;
 	int rows;
-	QColor selectionBackgroundColor;
+	TQColor selectionBackgroundColor;
 	bool showInsertRow : 1;
 };
 
 //----------------------------------------------------------------
 
-KexiRecordMarker::KexiRecordMarker(QWidget *parent, const char* name)
- : QWidget(parent, name)
+KexiRecordMarker::KexiRecordMarker(TQWidget *tqparent, const char* name)
+ : TQWidget(tqparent, name)
  , d( new Private() )
 {
 	initRecordMarkerImages();
@@ -128,13 +128,13 @@ KexiRecordMarker::~KexiRecordMarker()
 	delete d;
 }
 
-QImage* KexiRecordMarker::penImage()
+TQImage* KexiRecordMarker::penImage()
 {
 	initRecordMarkerImages();
 	return KexiRecordMarker_pen;
 }
 
-QImage* KexiRecordMarker::plusImage()
+TQImage* KexiRecordMarker::plusImage()
 {
 	initRecordMarkerImages();
 	return KexiRecordMarker_plus;
@@ -178,36 +178,36 @@ int KexiRecordMarker::rows() const
 		return d->rows;
 }
 
-void KexiRecordMarker::paintEvent(QPaintEvent *e)
+void KexiRecordMarker::paintEvent(TQPaintEvent *e)
 {
-	QPainter p(this);
-	QRect r(e->rect());
+	TQPainter p(this);
+	TQRect r(e->rect());
 
 	int first = (r.top()    + d->offset) / d->rowHeight;
 	int last  = (r.bottom() + d->offset) / d->rowHeight;
 	if(last > (d->rows-1+(d->showInsertRow?1:0)))
 		last = d->rows-1+(d->showInsertRow?1:0);
 
-	QColorGroup selectedColorGroup(colorGroup());
-	selectedColorGroup.setColor( QColorGroup::Button, 
-		KexiUtils::blendedColors( selectedColorGroup.color(QColorGroup::Background), 
+	TQColorGroup selectedColorGroup(tqcolorGroup());
+	selectedColorGroup.setColor( TQColorGroup::Button, 
+		KexiUtils::blendedColors( selectedColorGroup.color(TQColorGroup::Background), 
 			d->selectionBackgroundColor, 2, 1) );
-	selectedColorGroup.setColor( QColorGroup::Background, 
-		selectedColorGroup.color(QColorGroup::Button) ); //set background color as well (e.g. for thinkeramik)
-	QColorGroup highlightedColorGroup(colorGroup());
-	highlightedColorGroup.setColor( QColorGroup::Button, 
-		KexiUtils::blendedColors( highlightedColorGroup.color(QColorGroup::Background), 
+	selectedColorGroup.setColor( TQColorGroup::Background, 
+		selectedColorGroup.color(TQColorGroup::Button) ); //set background color as well (e.g. for thinkeramik)
+	TQColorGroup highlightedColorGroup(tqcolorGroup());
+	highlightedColorGroup.setColor( TQColorGroup::Button, 
+		KexiUtils::blendedColors( highlightedColorGroup.color(TQColorGroup::Background), 
 			d->selectionBackgroundColor, 4, 1) );
-	highlightedColorGroup.setColor( QColorGroup::Background, 
-		highlightedColorGroup.color(QColorGroup::Button) ); //set background color as well (e.g. for thinkeramik)
+	highlightedColorGroup.setColor( TQColorGroup::Background, 
+		highlightedColorGroup.color(TQColorGroup::Button) ); //set background color as well (e.g. for thinkeramik)
 	for(int i=first; i <= last; i++)
 	{
 		int y = ((d->rowHeight * i)-d->offset);
-		QRect r(0, y, width(), d->rowHeight);
+		TQRect r(0, y, width(), d->rowHeight);
 		p.drawRect(r);
-		style().drawPrimitive( QStyle::PE_HeaderSection, &p, r,
-			(d->currentRow == i) ? selectedColorGroup : (d->highlightedRow == i ? highlightedColorGroup : colorGroup()), 
-			QStyle::Style_Raised | (isEnabled() ? QStyle::Style_Enabled : 0));
+		tqstyle().tqdrawPrimitive( TQStyle::PE_HeaderSection, &p, r,
+			(d->currentRow == i) ? selectedColorGroup : (d->highlightedRow == i ? highlightedColorGroup : tqcolorGroup()), 
+			TQStyle::Style_Raised | (isEnabled() ? TQStyle::Style_Enabled : 0));
 	}
 	if (d->editRow!=-1 && d->editRow >= first && d->editRow <= (last/*+1 for insert row*/)) {
 		//show pen when editing
@@ -220,9 +220,9 @@ void KexiRecordMarker::paintEvent(QPaintEvent *e)
 		&& (!d->showInsertRow || (d->showInsertRow && d->currentRow < last)))/*don't display marker for 'insert' row*/ 
 	{
 		//show marker
-		p.setBrush(colorGroup().foreground());
-		p.setPen(QPen(Qt::NoPen));
-		QPointArray points(3);
+		p.setBrush(tqcolorGroup().foreground());
+		p.setPen(TQPen(TQt::NoPen));
+		TQPointArray points(3);
 		int ofs = d->rowHeight / 4;
 		int ofs2 = (width() - ofs) / 2 -1;
 		int pos = ((d->rowHeight*d->currentRow)-d->offset)-ofs/2+2;
@@ -294,12 +294,12 @@ void KexiRecordMarker::showInsertRow(bool show)
 	update();
 }
 
-void KexiRecordMarker::setSelectionBackgroundColor(const QColor &color)
+void KexiRecordMarker::setSelectionBackgroundColor(const TQColor &color)
 {
 	d->selectionBackgroundColor = color;
 }
 
-QColor KexiRecordMarker::selectionBackgroundColor() const
+TQColor KexiRecordMarker::selectionBackgroundColor() const
 {
 	return d->selectionBackgroundColor;
 }