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

diff --git a/lib/koproperty/editors/sizeedit.cpp b/lib/koproperty/editors/sizeedit.cpp
index e8a0c339..db8fb44f 100644
--- a/lib/koproperty/editors/sizeedit.cpp
+++ b/lib/koproperty/editors/sizeedit.cpp
@@ -21,10 +21,10 @@
 #include "sizeedit.h"
 #include "editoritem.h"
 
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpainter.h>
-#include <qtooltip.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpainter.h>
+#include <tqtooltip.h>
 
 #include <kactivelabel.h>
 #include <klocale.h>
@@ -34,16 +34,16 @@
 
 using namespace KoProperty;
 
-SizeEdit::SizeEdit(Property *property, QWidget *parent, const char *name)
- : Widget(property, parent, name)
+SizeEdit::SizeEdit(Property *property, TQWidget *tqparent, const char *name)
+ : Widget(property, tqparent, name)
 {
 	setHasBorders(false);
 	m_edit = new KActiveLabel(this);
-	m_edit->setFocusPolicy(NoFocus);
+	m_edit->setFocusPolicy(TQ_NoFocus);
 //	m_edit->setIndent(KPROPEDITOR_ITEM_MARGIN);
-	m_edit->setPaletteBackgroundColor(palette().active().base());
-//	m_edit->setBackgroundMode(Qt::PaletteBase);
-//	m_edit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+	m_edit->setPaletteBackgroundColor(tqpalette().active().base());
+//	m_edit->setBackgroundMode(TQt::PaletteBase);
+//	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	setEditor(m_edit);
 //	setFocusWidget(m_edit);
@@ -52,34 +52,34 @@ SizeEdit::SizeEdit(Property *property, QWidget *parent, const char *name)
 SizeEdit::~SizeEdit()
 {}
 
-QVariant
+TQVariant
 SizeEdit::value() const
 {
 	return m_value;
 }
 
 void
-SizeEdit::setValue(const QVariant &value, bool emitChange)
+SizeEdit::setValue(const TQVariant &value, bool emitChange)
 {
 	m_value = value;
 	m_edit->selectAll(false);
-	m_edit->setText(QString(SIZEEDIT_MASK).arg(value.toSize().width()).arg(value.toSize().height()));
-	QToolTip::add(this, QString("%1 x %2").arg(value.toSize().width()).arg(value.toSize().height()));
+	m_edit->setText(TQString(SIZEEDIT_MASK).tqarg(value.toSize().width()).tqarg(value.toSize().height()));
+	TQToolTip::add(this, TQString("%1 x %2").tqarg(value.toSize().width()).tqarg(value.toSize().height()));
 
 	if (emitChange)
 		emit valueChanged(this);
 }
 
 void
-SizeEdit::drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value)
+SizeEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value)
 {
-	QRect rect(r);
+	TQRect rect(r);
 	rect.setBottom(r.bottom()+1);
 	Widget::drawViewer(p, cg, rect, 
-		QString(SIZEEDIT_MASK).arg(value.toSize().width()).arg(value.toSize().height()));
+		TQString(SIZEEDIT_MASK).tqarg(value.toSize().width()).tqarg(value.toSize().height()));
 //	p->eraseRect(r);
-//	p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine,
-//		QString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height()));
+//	p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine,
+//		TQString("[ %1, %2 ]").tqarg(value.toSize().width()).tqarg(value.toSize().height()));
 }
 
 void