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, 13 insertions, 12 deletions

diff --git a/kexi/plugins/tables/kexitabledesignerview_p.h b/kexi/plugins/tables/kexitabledesignerview_p.h
index f5650e74..8f647548 100644
--- a/kexi/plugins/tables/kexitabledesignerview_p.h
+++ b/kexi/plugins/tables/kexitabledesignerview_p.h
@@ -37,11 +37,11 @@ class KexiDataAwarePropertySet;
 class CommandGroup : public KMacroCommand
 {
 	public:
-		CommandGroup( const QString & name )
+		CommandGroup( const TQString & name )
 			: KMacroCommand(name)
 		{}
 		virtual ~CommandGroup() {} 
-		const QPtrList<KCommand>& commands() const { return m_commands; }
+		const TQPtrList<KCommand>& commands() const { return m_commands; }
 };
 
 /*! @internal
@@ -50,10 +50,11 @@ class CommandGroup : public KMacroCommand
 class CommandHistory : public KCommandHistory
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
 		CommandHistory(KActionCollection *actionCollection, bool withMenus = true);
 
-		const QPtrList<KCommand>& commands() const { return m_commandsToUndo; }
+		const TQPtrList<KCommand>& commands() const { return m_commandsToUndo; }
 
 		void addCommand(KCommand *command, bool execute = true);
 
@@ -64,7 +65,7 @@ class CommandHistory : public KCommandHistory
 		virtual void redo();
 
 	protected:
-		QPtrList<KCommand> m_commandsToUndo, m_commandsToRedo;
+		TQPtrList<KCommand> m_commandsToUndo, m_commandsToRedo;
 };
 
 //----------------------------------------------
@@ -96,17 +97,17 @@ class KexiTableDesignerViewPrivate
 
 		 addHistoryCommand_in_slotPropertyChanged_enabled is then set back to the original state.
 		 */
-		void setPropertyValueIfNeeded( const KoProperty::Set& set, const QCString& propertyName, 
-			const QVariant& newValue, CommandGroup* commandGroup, 
+		void setPropertyValueIfNeeded( const KoProperty::Set& set, const TQCString& propertyName, 
+			const TQVariant& newValue, CommandGroup* commandGroup, 
 			bool forceAddCommand = false, bool rememberOldValue = true,
-			QStringList* const slist = 0, QStringList* const nlist = 0);
+			TQStringList* const slist = 0, TQStringList* const nlist = 0);
 
 		/*! Like above but allows to specify \a oldValue. */
 		void setPropertyValueIfNeeded( 
-			const KoProperty::Set& set, const QCString& propertyName, 
-			const QVariant& newValue, const QVariant& oldValue, CommandGroup* commandGroup, 
+			const KoProperty::Set& set, const TQCString& propertyName, 
+			const TQVariant& newValue, const TQVariant& oldValue, CommandGroup* commandGroup, 
 			bool forceAddCommand = false, bool rememberOldValue = true,
-			QStringList* const slist = 0, QStringList* const nlist = 0);
+			TQStringList* const slist = 0, TQStringList* const nlist = 0);
 
 		/*! @internal
 		 Used in updatePropertiesVisibility().
@@ -123,7 +124,7 @@ class KexiTableDesignerViewPrivate
 		 \a emptyTable is set to true if the table designed contains no rows.
 		 If \a skipWarning is true, no warning about data loss is appended (useful when 
 		 only non-physical altering actions will be performed). */
-		QString messageForSavingChanges(bool &emptyTable, bool skipWarning = false);
+		TQString messageForSavingChanges(bool &emptyTable, bool skipWarning = false);
 
 		/*! Updates icon in the first column, depending on property set \a set.
 		 For example, when "rowSource" and "rowSourceType" propertiesa are not empty, 
@@ -185,7 +186,7 @@ class KexiTableDesignerViewPrivate
 
 		//! A cache used in KexiTableDesignerView::buildField() to quickly identify 
 		//! properties internal to the designer
-		QAsciiDict<char> internalPropertyNames;
+		TQAsciiDict<char> internalPropertyNames;
 };
 
 #endif