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, 9 insertions, 8 deletions

diff --git a/kexi/formeditor/connectiondialog.h b/kexi/formeditor/connectiondialog.h
index 3e6ac07b..4f1a9a28 100644
--- a/kexi/formeditor/connectiondialog.h
+++ b/kexi/formeditor/connectiondialog.h
@@ -21,15 +21,15 @@
 #ifndef FORMCONNECTIONDIALOG_H
 #define FORMCONNECTIONDIALOG_H
 
-#include <qintdict.h>
+#include <tqintdict.h>
 #include <kdialogbase.h>
 
 namespace KexiDB {
 	class ResultInfo;
 }
 
-class QLabel;
-class QButton;
+class TQLabel;
+class TQButton;
 class KexiTableView;
 class KexiTableViewData;
 class KexiTableItem;
@@ -46,9 +46,10 @@ class Connection;
 class KFORMEDITOR_EXPORT ConnectionDialog : public KDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		ConnectionDialog(QWidget *parent);
+		ConnectionDialog(TQWidget *tqparent);
 		~ConnectionDialog() {;}
 
 		/*! Displays as modal dialog, to edit connections in Form::connectionBuffer(). */
@@ -59,7 +60,7 @@ class KFORMEDITOR_EXPORT ConnectionDialog : public KDialogBase
 		void setStatusOk(KexiTableItem *item = 0);
 		/*! Used when connection is wrong. Displays a message in details widget and changes icon in 'OK?' column. \a msg is
 		  the message explaining what's wrong. */
-		void setStatusError(const QString &msg, KexiTableItem *item = 0);
+		void setStatusError(const TQString &msg, KexiTableItem *item = 0);
 		//! Inits table data, columns, etc.
 		void initTable();
 		/*! Updates the widget list (shown in receiver and sender columns). Then fill in the table with the connections in m_buffer. */
@@ -71,7 +72,7 @@ class KFORMEDITOR_EXPORT ConnectionDialog : public KDialogBase
 
 	protected slots:
 		/*! Slot called when the user modifies a cell. Signal and/or slot cells are cleared if necessary (not valid anymore). */
-		void slotCellChanged(KexiTableItem*, int, QVariant&, KexiDB::ResultInfo*);
+		void slotCellChanged(KexiTableItem*, int, TQVariant&, KexiDB::ResultInfo*);
 		/*! This function checks if the connection represented by KexiTableItem \a item is valid. It checks if all args (sender, receiver, signal and slot)
 		 are given, and then if signal/slot args are compatible (should be always true, as we don't show non-compatible slots). It calls \ref setStatusOk()
 		 or \ref setStatusError() following the result of checks. */
@@ -105,8 +106,8 @@ class KFORMEDITOR_EXPORT ConnectionDialog : public KDialogBase
 		KexiTableView  *m_table;
 		KexiTableViewData  *m_data;
 		KexiTableViewData *m_widgetsColumnData, *m_slotsColumnData, *m_signalsColumnData;
-		QLabel  *m_pixmapLabel, *m_textLabel;
-		QIntDict<QButton>  m_buttons;  //! dict of button (for disabling them)
+		TQLabel  *m_pixmapLabel, *m_textLabel;
+		TQIntDict<TQButton>  m_buttons;  //! dict of button (for disabling them)
 };
 
 }