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, 19 insertions, 18 deletions

diff --git a/kexi/widget/relations/kexirelationwidget.h b/kexi/widget/relations/kexirelationwidget.h
index 3beb0b34..869dbf11 100644
--- a/kexi/widget/relations/kexirelationwidget.h
+++ b/kexi/widget/relations/kexirelationwidget.h
@@ -21,7 +21,7 @@
 #ifndef KEXIRELATIONWIDGET_H
 #define KEXIRELATIONWIDGET_H
 
-//#include <qwidget.h>
+//#include <tqwidget.h>
 //#include "kexiactionproxy.h"
 #include "kexiviewbase.h"
 #include "kexirelationview.h"
@@ -30,7 +30,7 @@ class KComboBox;
 class KPushButton;
 class KPopupMenu;
 class KAction;
-class QListViewItem;
+class TQListViewItem;
 
 class KexiMainWindow;
 
@@ -44,40 +44,41 @@ namespace KexiDB
 class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		KexiRelationWidget(KexiMainWindow *win, QWidget *parent, const char *name=0);
+		KexiRelationWidget(KexiMainWindow *win, TQWidget *tqparent, const char *name=0);
 		virtual ~KexiRelationWidget();
 
 		//! \return a dictionary of added tables
 		TablesDict* tables() const;
-		KexiRelationViewTableContainer* table(const QString& name) const;
+		KexiRelationViewTableContainer* table(const TQString& name) const;
 		const ConnectionList* connections() const;
 
 //		KexiRelationView	*relationView() const { return m_relationView; }
-		void addTable(const QString& t);
+		void addTable(const TQString& t);
 
 //		void openTable(KexiDB::TableSchema* table, bool designMode);
 
-		virtual QSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 		/*! Used to add newly created object information to the combo box. */
-		void objectCreated(const QCString &mime, const QCString& name);
-		void objectDeleted(const QCString &mime, const QCString& name);
-		void objectRenamed(const QCString &mime, const QCString& name, const QCString& newName);
+		void objectCreated(const TQCString &mime, const TQCString& name);
+		void objectDeleted(const TQCString &mime, const TQCString& name);
+		void objectRenamed(const TQCString &mime, const TQCString& name, const TQCString& newName);
 
 	signals:
 		void tableAdded(KexiDB::TableSchema& t);
 		void tableHidden(KexiDB::TableSchema& t);
 		void tablePositionChanged(KexiRelationViewTableContainer*);
 		void aboutConnectionRemove(KexiRelationViewConnection*);
-		void tableFieldDoubleClicked( KexiDB::TableSchema* table, const QString& fieldName );
+		void tableFieldDoubleClicked( KexiDB::TableSchema* table, const TQString& fieldName );
 	
 	public slots:
 		/*! Adds a table \a t to the area. This changes only visual representation.
-		 If \a rect is valid, table widget rgeometry will be initialized.
+		 If \a rect is valid, table widget rtqgeometry will be initialized.
 		 */
-		void addTable(KexiDB::TableSchema *t, const QRect &rect = QRect());
+		void addTable(KexiDB::TableSchema *t, const TQRect &rect = TQRect());
 
 		//! Adds a connection \a con to the area. This changes only visual representation.
 		void addConnection(const SourceConnection& conn);
@@ -98,23 +99,23 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase
 		void tableViewGotFocus();
 		void connectionViewGotFocus();
 		void emptyAreaGotFocus();
-		void tableContextMenuRequest(const QPoint& pos);
-		void connectionContextMenuRequest(const QPoint& pos);
-		void emptyAreaContextMenuRequest( const QPoint& pos );
+		void tableContextMenuRequest(const TQPoint& pos);
+		void connectionContextMenuRequest(const TQPoint& pos);
+		void emptyAreaContextMenuRequest( const TQPoint& pos );
 		void openSelectedTable();
 		void designSelectedTable();
 		void slotTableHidden(KexiDB::TableSchema &table);
 		void aboutToShowPopupMenu();
-		void slotTableFieldDoubleClicked(QListViewItem *i,const QPoint&,int);
+		void slotTableFieldDoubleClicked(TQListViewItem *i,const TQPoint&,int);
 
 	protected:
 		/*! executes popup menu at \a pos, or, 
 		 if \a pos not specified: at center of selected table view (if any selected),
 		 or at center point of the relations view. */
-		void executePopup( QPoint pos = QPoint(-1,-1) );
+		void executePopup( TQPoint pos = TQPoint(-1,-1) );
 
 		//! Invalidates all actions availability.
-		void invalidateActions();
+		void tqinvalidateActions();
 
 		//! Fills table's combo box with all available table names.
 		void fillTablesCombo();