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, 22 insertions, 21 deletions

diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.h b/kexi/plugins/queries/kexiquerydesignerguieditor.h
index 03acb7f6..587e60a6 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.h
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.h
@@ -18,11 +18,11 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef KEXIQUERYDESIGNERGUIEDITOR_H
-#define KEXIQUERYDESIGNERGUIEDITOR_H
+#ifndef KEXITQUERYDESIGNERGUIEDITOR_H
+#define KEXITQUERYDESIGNERGUIEDITOR_H
 
-#include <qguardedptr.h>
-#include <qsplitter.h>
+#include <tqguardedptr.h>
+#include <tqsplitter.h>
 
 #include <kexiviewbase.h>
 #include "kexiquerypart.h"
@@ -59,16 +59,17 @@ namespace KexiDB
 class KexiQueryDesignerGuiEditor : public KexiViewBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		KexiQueryDesignerGuiEditor(KexiMainWindow *mainWin, QWidget *parent, const char *name = 0);
+		KexiQueryDesignerGuiEditor(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0);
 		virtual ~KexiQueryDesignerGuiEditor();
 
 //		KexiDB::QuerySchema	*schema();
 
 		KexiRelationWidget *relationView() const;
 
-		virtual QSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 	public slots:
 		virtual void setFocus();
@@ -76,7 +77,7 @@ class KexiQueryDesignerGuiEditor : public KexiViewBase
 	protected:
 		void initTableColumns(); //!< Called just once.
 		void initTableRows(); //!< Called to have all rows empty.
-//unused		void addRow(const QString &tbl, const QString &field);
+//unused		void addRow(const TQString &tbl, const TQString &field);
 //		void			restore();
 		virtual tristate beforeSwitchTo(int mode, bool &dontStore);
 		virtual tristate afterSwitchFrom(int mode);
@@ -93,32 +94,32 @@ class KexiQueryDesignerGuiEditor : public KexiViewBase
 		virtual KoProperty::Set *propertySet();
 
 		KoProperty::Set* createPropertySet( int row,
-			const QString& tableName, const QString& fieldName, bool newOne = false );
+			const TQString& tableName, const TQString& fieldName, bool newOne = false );
 
 		/*! Builds query schema out of information provided by gui.
 		 The schema is stored in temp->query member.
 		 \a errMsg is optional error message returned.
 		 \return true on proper schema creation. */
-		bool buildSchema(QString *errMsg = 0);
+		bool buildSchema(TQString *errMsg = 0);
 
 		KexiQueryPart::TempData * tempData() const;
 
 		/*! Helper: allocates and initializes new table view's row. Doesn't insert it, just returns. 
 		 \a tableName and \a fieldName shoudl be provided. 
 		 \a visible flag sets value for "Visible" column. */
-		KexiTableItem* createNewRow(const QString& tableName, const QString& fieldName,
+		KexiTableItem* createNewRow(const TQString& tableName, const TQString& fieldName,
 			bool visible) const;
 
-		KexiDB::BaseExpr* parseExpressionString(const QString& fullString, int& token,
+		KexiDB::BaseExpr* parseExpressionString(const TQString& fullString, int& token,
 			bool allowRelationalOperator);
 
-		QCString generateUniqueAlias() const;
+		TQCString generateUniqueAlias() const;
 		void updatePropertiesVisibility(KoProperty::Set& buf);
 
 	protected slots:
-		void slotDragOverTableRow(KexiTableItem *item, int row, QDragMoveEvent* e);
+		void slotDragOverTableRow(KexiTableItem *item, int row, TQDragMoveEvent* e);
 		void slotDroppedAtRow(KexiTableItem *item, int row,
-			QDropEvent *ev, KexiTableItem*& newItem);
+			TQDropEvent *ev, KexiTableItem*& newItem);
 		//! Reaction on appending a new item after deleting one
 		void slotNewItemAppendedForAfterDeletingInSpreadSheetMode();
 		void slotTableAdded(KexiDB::TableSchema &t);
@@ -126,17 +127,17 @@ class KexiQueryDesignerGuiEditor : public KexiViewBase
 
 		//! Called before cell change in tableview.
 		void slotBeforeCellChanged(KexiTableItem *item, int colnum,
-			QVariant& newValue, KexiDB::ResultInfo* result);
+			TQVariant& newValue, KexiDB::ResultInfo* result);
 
-		void slotRowInserted(KexiTableItem* item, uint row, bool repaint);
+		void slotRowInserted(KexiTableItem* item, uint row, bool tqrepaint);
 		void slotTablePositionChanged(KexiRelationViewTableContainer*);
 		void slotAboutConnectionRemove(KexiRelationViewConnection*);
-		void slotTableFieldDoubleClicked( KexiDB::TableSchema* table, const QString& fieldName );
+		void slotTableFieldDoubleClicked( KexiDB::TableSchema* table, const TQString& fieldName );
 
-		/*! Loads layout of relation GUI diagram. */
+		/*! Loads tqlayout of relation GUI diagram. */
 		bool loadLayout();
 
-		/*! Stores layout of relation GUI diagram. */
+		/*! Stores tqlayout of relation GUI diagram. */
 		bool storeLayout();
 
 		void showTablesForQuery(KexiDB::QuerySchema *query);
@@ -154,10 +155,10 @@ class KexiQueryDesignerGuiEditor : public KexiViewBase
 
 		void slotPropertyChanged(KoProperty::Set& list, KoProperty::Property& property);
 
-//		void slotObjectCreated(const QCString &mime, const QCString& name);
+//		void slotObjectCreated(const TQCString &mime, const TQCString& name);
 		void slotNewItemStored(KexiPart::Item&);
 		void slotItemRemoved(const KexiPart::Item& item);
-		void slotItemRenamed(const KexiPart::Item& item, const QCString& oldName);
+		void slotItemRenamed(const KexiPart::Item& item, const TQCString& oldName);
 
 	private:
 		class Private;