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

diff --git a/kexi/plugins/tables/kexitabledesignercommands.cpp b/kexi/plugins/tables/kexitabledesignercommands.cpp
index ccbb181a..298363c4 100644
--- a/kexi/plugins/tables/kexitabledesignercommands.cpp
+++ b/kexi/plugins/tables/kexitabledesignercommands.cpp
@@ -16,12 +16,12 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
 */
-#include <qdom.h>
-#include <qwidget.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qsplitter.h>
-#include <qmetaobject.h>
+#include <tqdom.h>
+#include <tqwidget.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqsplitter.h>
+#include <tqmetaobject.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -49,7 +49,7 @@ Command::~Command()
 //--------------------------------------------------------
 
 ChangeFieldPropertyCommand::ChangeFieldPropertyCommand( KexiTableDesignerView* view,
-	const KoProperty::Set& set, const QCString& propertyName, const QVariant& oldValue, const QVariant& newValue,
+	const KoProperty::Set& set, const TQCString& propertyName, const TQVariant& oldValue, const TQVariant& newValue,
 	KoProperty::Property::ListData* const oldListData, KoProperty::Property::ListData* const newListData)
  : Command(view)
  , m_alterTableAction(
@@ -69,27 +69,27 @@ ChangeFieldPropertyCommand::~ChangeFieldPropertyCommand()
 	delete m_listData;
 }
 
-QString ChangeFieldPropertyCommand::name() const
+TQString ChangeFieldPropertyCommand::name() const
 {
 	return i18n("Change \"%1\" property for table field from \"%2\" to \"%3\"")
-		.arg(m_alterTableAction.propertyName()).arg(m_oldValue.toString())
-		.arg(m_alterTableAction.newValue().toString());
+		.tqarg(m_alterTableAction.propertyName()).tqarg(m_oldValue.toString())
+		.tqarg(m_alterTableAction.newValue().toString());
 }
 
-QString ChangeFieldPropertyCommand::debugString()
+TQString ChangeFieldPropertyCommand::debugString()
 {
-	QString s( name() );
+	TQString s( name() );
 	if (m_oldListData || m_listData)
-		s += QString("\nAnd list data from [%1]\n  to [%2]")
-			.arg( m_oldListData ? 
-				QString("%1 -> %2")
-				.arg(m_oldListData->keysAsStringList().join(",")).arg(m_oldListData->names.join(","))
-				: QString("<NONE>"))
-			.arg( m_listData ?
-				QString("%1 -> %2")
-				.arg(m_listData->keysAsStringList().join(",")).arg(m_listData->names.join(","))
-				: QString("<NONE>"));
-	return s + QString(" (UID=%1)").arg(m_alterTableAction.uid());
+		s += TQString("\nAnd list data from [%1]\n  to [%2]")
+			.tqarg( m_oldListData ? 
+				TQString("%1 -> %2")
+				.tqarg(m_oldListData->keysAsStringList().join(",")).tqarg(m_oldListData->names.join(","))
+				: TQString("<NONE>"))
+			.tqarg( m_listData ?
+				TQString("%1 -> %2")
+				.tqarg(m_listData->keysAsStringList().join(",")).tqarg(m_listData->names.join(","))
+				: TQString("<NONE>"));
+	return s + TQString(" (UID=%1)").tqarg(m_alterTableAction.uid());
 }
 
 void ChangeFieldPropertyCommand::execute()
@@ -121,7 +121,7 @@ KexiDB::AlterTableHandler::ActionBase* ChangeFieldPropertyCommand::createAction(
 RemoveFieldCommand::RemoveFieldCommand( KexiTableDesignerView* view, int fieldIndex, 
 	const KoProperty::Set* set)
  : Command(view)
- , m_alterTableAction( set ? (*set)["name"].value().toString() : QString::null, 
+ , m_alterTableAction( set ? (*set)["name"].value().toString() : TQString(), 
 	set ? (*set)["uid"].value().toInt() : -1 )
  , m_set( set ? new KoProperty::Set(*set /*deep copy*/) : 0 )
  , m_fieldIndex(fieldIndex)
@@ -133,12 +133,12 @@ RemoveFieldCommand::~RemoveFieldCommand()
 	delete m_set;
 }
 
-QString RemoveFieldCommand::name() const
+TQString RemoveFieldCommand::name() const
 {
 	if (m_set)
-		return i18n("Remove table field \"%1\"").arg(m_alterTableAction.fieldName());
+		return i18n("Remove table field \"%1\"").tqarg(m_alterTableAction.fieldName());
 
-	return QString("Remove empty row at position %1").arg(m_fieldIndex);
+	return TQString("Remove empty row at position %1").tqarg(m_fieldIndex);
 }
 
 void RemoveFieldCommand::execute()
@@ -154,14 +154,14 @@ void RemoveFieldCommand::unexecute()
 		m_view->insertField( m_fieldIndex, *m_set );
 }
 
-QString RemoveFieldCommand::debugString()
+TQString RemoveFieldCommand::debugString()
 {
 	if (!m_set)
 		return name();
 
-	return name() + "\nAT ROW " + QString::number(m_fieldIndex)
+	return name() + "\nAT ROW " + TQString::number(m_fieldIndex)
 		+ ", FIELD: " + (*m_set)["caption"].value().toString()
-		+ QString(" (UID=%1)").arg(m_alterTableAction.uid());
+		+ TQString(" (UID=%1)").tqarg(m_alterTableAction.uid());
 }
 
 KexiDB::AlterTableHandler::ActionBase* RemoveFieldCommand::createAction()
@@ -190,9 +190,9 @@ InsertFieldCommand::~InsertFieldCommand()
 	delete m_alterTableAction;
 }
 
-QString InsertFieldCommand::name() const
+TQString InsertFieldCommand::name() const
 {
-	return i18n("Insert table field \"%1\"").arg(m_set["caption"].value().toString());
+	return i18n("Insert table field \"%1\"").tqarg(m_set["caption"].value().toString());
 }
 
 void InsertFieldCommand::execute()
@@ -213,7 +213,7 @@ KexiDB::AlterTableHandler::ActionBase* InsertFieldCommand::createAction()
 //--------------------------------------------------------
 
 ChangePropertyVisibilityCommand::ChangePropertyVisibilityCommand( KexiTableDesignerView* view,
-	const KoProperty::Set& set, const QCString& propertyName, bool visible)
+	const KoProperty::Set& set, const TQCString& propertyName, bool visible)
  : Command(view)
  , m_alterTableAction(set.property("name").value().toString(), propertyName, visible, set["uid"].value().toInt())
 // , m_fieldUID(set["uid"].value().toInt())
@@ -226,12 +226,12 @@ ChangePropertyVisibilityCommand::~ChangePropertyVisibilityCommand()
 {
 }
 
-QString ChangePropertyVisibilityCommand::name() const
+TQString ChangePropertyVisibilityCommand::name() const
 {
-	return QString("[internal] Change \"%1\" visibility from \"%2\" to \"%3\"")
-		.arg(m_alterTableAction.propertyName())
-		.arg(m_oldVisibility ? "true" : "false")
-		.arg(m_alterTableAction.newValue().toBool() ? "true" : "false");
+	return TQString("[internal] Change \"%1\" visibility from \"%2\" to \"%3\"")
+		.tqarg(m_alterTableAction.propertyName())
+		.tqarg(m_oldVisibility ? "true" : "false")
+		.tqarg(m_alterTableAction.newValue().toBool() ? "true" : "false");
 }
 
 void ChangePropertyVisibilityCommand::execute()
@@ -263,9 +263,9 @@ InsertEmptyRowCommand::~InsertEmptyRowCommand()
 {
 }
 
-QString InsertEmptyRowCommand::name() const
+TQString InsertEmptyRowCommand::name() const
 {
-	return QString("Insert empty row at position %1").arg(m_row);
+	return TQString("Insert empty row at position %1").tqarg(m_row);
 }
 
 void InsertEmptyRowCommand::execute()