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

diff --git a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
index 82e61b83b..f2546a440 100644
--- a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
@@ -20,43 +20,43 @@
 
 #include "kexidbtimeedit.h"
 
-#include <qtoolbutton.h>
-#include <qlayout.h>
-#include <qpainter.h>
+#include <tqtoolbutton.h>
+#include <tqlayout.h>
+#include <tqpainter.h>
 
 #include <kpopupmenu.h>
 #include <kdatepicker.h>
 #include <kdatetbl.h>
 #include <kexiutils/utils.h>
 
-KexiDBTimeEdit::KexiDBTimeEdit(const QTime &time, QWidget *parent, const char *name)
- : QTimeEdit(time, parent, name), KexiFormDataItemInterface()
+KexiDBTimeEdit::KexiDBTimeEdit(const TQTime &time, TQWidget *tqparent, const char *name)
+ : TQTimeEdit(time, tqparent, name), KexiFormDataItemInterface()
 {
 	m_invalidState = false;
 	setAutoAdvance(true);
 	m_cleared = false;
 
-#ifdef QDateTimeEditor_HACK
-	m_dte_time = KexiUtils::findFirstChild<QDateTimeEditor>(this, "QDateTimeEditor");
+#ifdef TQDateTimeEditor_HACK
+	m_dte_time = KexiUtils::findFirstChild<TQDateTimeEditor>(this, "TQDateTimeEditor");
 #else
 	m_dte_time = 0;
 #endif
 
-	connect(this, SIGNAL(valueChanged(const QTime&)), this, SLOT(slotValueChanged(const QTime&)));
+	connect(this, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SLOT(slotValueChanged(const TQTime&)));
 }
 
 KexiDBTimeEdit::~KexiDBTimeEdit()
 {
 }
 
-void KexiDBTimeEdit::setInvalidState( const QString&)
+void KexiDBTimeEdit::setInvalidState( const TQString&)
 {
 	setEnabled(false);
 	setReadOnly(true);
 	m_invalidState = true;
 //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ?
 	if (focusPolicy() & TabFocus)
-		setFocusPolicy(QWidget::ClickFocus);
+		setFocusPolicy(TQ_ClickFocus);
 }
 
 void
@@ -65,20 +65,20 @@ KexiDBTimeEdit::setEnabled(bool enabled)
 	 // prevent the user from reenabling the widget when it is in invalid state
 	if(enabled && m_invalidState)
 		return;
-	QTimeEdit::setEnabled(enabled);
+	TQTimeEdit::setEnabled(enabled);
 }
 
-void KexiDBTimeEdit::setValueInternal(const QVariant &add, bool removeOld)
+void KexiDBTimeEdit::setValueInternal(const TQVariant &add, bool removeOld)
 {
 	m_cleared = !m_origValue.isValid();
 
 	int setNumberOnFocus = -1;
-	QTime t;
-	QString addString(add.toString());
+	TQTime t;
+	TQString addString(add.toString());
 	if (removeOld) {
 		if (!addString.isEmpty() && addString[0].latin1()>='0' && addString[0].latin1() <='9') {
 			setNumberOnFocus = addString[0].latin1()-'0';
-			t = QTime(setNumberOnFocus, 0, 0);
+			t = TQTime(setNumberOnFocus, 0, 0);
 		}
 	}
 	else
@@ -87,11 +87,11 @@ void KexiDBTimeEdit::setValueInternal(const QVariant &add, bool removeOld)
 	setTime(t);
 }
 
-QVariant
+TQVariant
 KexiDBTimeEdit::value()
 {
-	//QDateTime - a hack needed because QVariant(QTime) has broken isNull()
-	return QVariant(QDateTime( m_cleared ? QDate() : QDate(0,1,2)/*nevermind*/, time()));
+	//TQDateTime - a hack needed because TQVariant(TQTime) has broken isNull()
+	return TQVariant(TQDateTime( m_cleared ? TQDate() : TQDate(0,1,2)/*nevermind*/, time()));
 }
 
 bool KexiDBTimeEdit::valueIsNull()
@@ -116,7 +116,7 @@ void KexiDBTimeEdit::setReadOnly(bool set)
 	m_readOnly = set;
 }
 
-QWidget*
+TQWidget*
 KexiDBTimeEdit::widget()
 {
 	return this;
@@ -124,7 +124,7 @@ KexiDBTimeEdit::widget()
 
 bool KexiDBTimeEdit::cursorAtStart()
 {
-#ifdef QDateTimeEditor_HACK
+#ifdef TQDateTimeEditor_HACK
 	return m_dte_time && hasFocus() && m_dte_time->focusSection()==0;
 #else
 	return false;
@@ -133,7 +133,7 @@ bool KexiDBTimeEdit::cursorAtStart()
 
 bool KexiDBTimeEdit::cursorAtEnd()
 {
-#ifdef QDateTimeEditor_HACK
+#ifdef TQDateTimeEditor_HACK
 	return m_dte_time && hasFocus()
 		&& m_dte_time->focusSection()==int(m_dte_time->sectionCount()-1);
 #else
@@ -143,12 +143,12 @@ bool KexiDBTimeEdit::cursorAtEnd()
 
 void KexiDBTimeEdit::clear()
 {
-	setTime(QTime());
+	setTime(TQTime());
 	m_cleared = true;
 }
 
 void
-KexiDBTimeEdit::slotValueChanged(const QTime&)
+KexiDBTimeEdit::slotValueChanged(const TQTime&)
 {
 	m_cleared = false;
 }