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

diff --git a/lib/koproperty/editors/cursoredit.cpp b/lib/koproperty/editors/cursoredit.cpp
index a0b3227c..efcc0e44 100644
--- a/lib/koproperty/editors/cursoredit.cpp
+++ b/lib/koproperty/editors/cursoredit.cpp
@@ -20,9 +20,9 @@
 
 #include "cursoredit.h"
 
-#include <qmap.h>
-#include <qvariant.h>
-#include <qcursor.h>
+#include <tqmap.h>
+#include <tqvariant.h>
+#include <tqcursor.h>
 
 #include <klocale.h>
 #include <kdebug.h>
@@ -31,68 +31,68 @@
 
 using namespace KoProperty;
 
-//QMap<QString, QVariant> *CursorEdit::m_spValues = 0;
+//TQMap<TQString, TQVariant> *CursorEdit::m_spValues = 0;
 Property::ListData *m_cursorListData = 0;
 
 
-CursorEdit::CursorEdit(Property *property, QWidget *parent, const char *name)
-: ComboBox(property, parent, name)
+CursorEdit::CursorEdit(Property *property, TQWidget *tqparent, const char *name)
+: ComboBox(property, tqparent, name)
 {
 	/*
 	if(!m_spValues) {
-		m_spValues = new QMap<QString, QVariant>();
-		(*m_spValues)[i18n("Arrow")] = Qt::ArrowCursor;
-		(*m_spValues)[i18n("Up Arrow")] = Qt::UpArrowCursor;
-		(*m_spValues)[i18n("Cross")] = Qt::CrossCursor;
-		(*m_spValues)[i18n("Waiting")] = Qt::WaitCursor;
-		(*m_spValues)[i18n("iBeam")] = Qt::IbeamCursor;
-		(*m_spValues)[i18n("Size Vertical")] = Qt::SizeVerCursor;
-		(*m_spValues)[i18n("Size Horizontal")] = Qt::SizeHorCursor;
-		(*m_spValues)[i18n("Size Slash")] = Qt::SizeBDiagCursor;
-		(*m_spValues)[i18n("Size Backslash")] = Qt::SizeFDiagCursor;
-		(*m_spValues)[i18n("Size All")] = Qt::SizeAllCursor;
-		(*m_spValues)[i18n("Blank")] = Qt::BlankCursor;
-		(*m_spValues)[i18n("Split Vertical")] = Qt::SplitVCursor;
-		(*m_spValues)[i18n("Split Horizontal")] = Qt::SplitHCursor;
-		(*m_spValues)[i18n("Pointing Hand")] = Qt::PointingHandCursor;
-		(*m_spValues)[i18n("Forbidden")] = Qt::ForbiddenCursor;
-		(*m_spValues)[i18n("What's this")] = Qt::WhatsThisCursor;
+		m_spValues = new TQMap<TQString, TQVariant>();
+		(*m_spValues)[i18n("Arrow")] = TQt::ArrowCursor;
+		(*m_spValues)[i18n("Up Arrow")] = TQt::UpArrowCursor;
+		(*m_spValues)[i18n("Cross")] = TQt::CrossCursor;
+		(*m_spValues)[i18n("Waiting")] = TQt::WaitCursor;
+		(*m_spValues)[i18n("iBeam")] = TQt::IbeamCursor;
+		(*m_spValues)[i18n("SizeQt::Vertical")] = TQt::SizeVerCursor;
+		(*m_spValues)[i18n("SizeQt::Horizontal")] = TQt::SizeHorCursor;
+		(*m_spValues)[i18n("Size Slash")] = TQt::SizeBDiagCursor;
+		(*m_spValues)[i18n("Size Backslash")] = TQt::SizeFDiagCursor;
+		(*m_spValues)[i18n("Size All")] = TQt::SizeAllCursor;
+		(*m_spValues)[i18n("Blank")] = TQt::BlankCursor;
+		(*m_spValues)[i18n("SplitQt::Vertical")] = TQt::SplitVCursor;
+		(*m_spValues)[i18n("SplitQt::Horizontal")] = TQt::SplitHCursor;
+		(*m_spValues)[i18n("Pointing Hand")] = TQt::PointingHandCursor;
+		(*m_spValues)[i18n("Forbidden")] = TQt::ForbiddenCursor;
+		(*m_spValues)[i18n("What's this")] = TQt::WhatsThisCursor;
 	}*/
 
 //! @todo NOT THREAD-SAFE
 	if (!m_cursorListData) {
-		QValueList<QVariant> keys;
+		TQValueList<TQVariant> keys;
 		keys 
-			<< Qt::BlankCursor
-			<< Qt::ArrowCursor
-			<< Qt::UpArrowCursor
-			<< Qt::CrossCursor
-			<< Qt::WaitCursor
-			<< Qt::IbeamCursor
-			<< Qt::SizeVerCursor
-			<< Qt::SizeHorCursor
-			<< Qt::SizeBDiagCursor
-			<< Qt::SizeFDiagCursor
-			<< Qt::SizeAllCursor
-			<< Qt::SplitVCursor
-			<< Qt::SplitHCursor
-			<< Qt::PointingHandCursor
-			<< Qt::ForbiddenCursor
-			<< Qt::WhatsThisCursor;
-		QStringList strings;
+			<< TQt::BlankCursor
+			<< TQt::ArrowCursor
+			<< TQt::UpArrowCursor
+			<< TQt::CrossCursor
+			<< TQt::WaitCursor
+			<< TQt::IbeamCursor
+			<< TQt::SizeVerCursor
+			<< TQt::SizeHorCursor
+			<< TQt::SizeBDiagCursor
+			<< TQt::SizeFDiagCursor
+			<< TQt::SizeAllCursor
+			<< TQt::SplitVCursor
+			<< TQt::SplitHCursor
+			<< TQt::PointingHandCursor
+			<< TQt::ForbiddenCursor
+			<< TQt::WhatsThisCursor;
+		TQStringList strings;
 		strings << i18n("Mouse Cursor Shape", "No Cursor")
 			<< i18n("Mouse Cursor Shape", "Arrow")
 			<< i18n("Mouse Cursor Shape", "Up Arrow")
 			<< i18n("Mouse Cursor Shape", "Cross")
 			<< i18n("Mouse Cursor Shape", "Waiting")
 			<< i18n("Mouse Cursor Shape", "I")
-			<< i18n("Mouse Cursor Shape", "Size Vertical")
-			<< i18n("Mouse Cursor Shape", "Size Horizontal")
+			<< i18n("Mouse Cursor Shape", "SizeQt::Vertical")
+			<< i18n("Mouse Cursor Shape", "SizeQt::Horizontal")
 			<< i18n("Mouse Cursor Shape", "Size Slash")
 			<< i18n("Mouse Cursor Shape", "Size Backslash")
 			<< i18n("Mouse Cursor Shape", "Size All")
-			<< i18n("Mouse Cursor Shape", "Split Vertical")
-			<< i18n("Mouse Cursor Shape", "Split Horizontal")
+			<< i18n("Mouse Cursor Shape", "SplitQt::Vertical")
+			<< i18n("Mouse Cursor Shape", "SplitQt::Horizontal")
 			<< i18n("Mouse Cursor Shape", "Pointing Hand")
 			<< i18n("Mouse Cursor Shape", "Forbidden")
 			<< i18n("Mouse Cursor Shape", "What's This?");
@@ -109,22 +109,22 @@ CursorEdit::~CursorEdit()
 	m_cursorListData = 0;
 }
 
-QVariant
+TQVariant
 CursorEdit::value() const
 {
-	return QCursor(ComboBox::value().toInt());
+	return TQCursor(ComboBox::value().toInt());
 }
 
 void
-CursorEdit::setValue(const QVariant &value, bool emitChange)
+CursorEdit::setValue(const TQVariant &value, bool emitChange)
 {
-	ComboBox::setValue(value.toCursor().shape(), emitChange);
+	ComboBox::setValue(value.toCursor().tqshape(), emitChange);
 }
 
 void
-CursorEdit::drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value)
+CursorEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value)
 {
-	ComboBox::drawViewer(p, cg, r, value.toCursor().shape());
+	ComboBox::drawViewer(p, cg, r, value.toCursor().tqshape());
 }
 
 void