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

diff --git a/kexi/widget/kexidbconnectionwidget.h b/kexi/widget/kexidbconnectionwidget.h
index dd8559e5..72c49c89 100644
--- a/kexi/widget/kexidbconnectionwidget.h
+++ b/kexi/widget/kexidbconnectionwidget.h
@@ -36,20 +36,21 @@ class KexiDBConnectionTabWidget;
 class KEXIEXTWIDGETS_EXPORT KexiDBConnectionWidget : public KexiDBConnectionWidgetBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		KexiDBConnectionWidget( QWidget* parent = 0, const char* name = 0 );
+		KexiDBConnectionWidget( TQWidget* tqparent = 0, const char* name = 0 );
 		virtual ~KexiDBConnectionWidget();
 
 		/*! Sets project data \a data.
 		 \a shortcutFileName is only used to check if the file is writable 
 		 (if no, "save changes" button will be disabled). */
-		void setData(const KexiProjectData& data, const QString& shortcutFileName = QString::null);
+		void setData(const KexiProjectData& data, const TQString& shortcutFileName = TQString());
 
 		/*! Sets connection data \a data.
 		 \a shortcutFileName is only used to check if the file is writable 
 		 (if no, "save changes" button will be disabled). */
-		void setData(const KexiDB::ConnectionData& data, const QString& shortcutFileName = QString::null);
+		void setData(const KexiDB::ConnectionData& data, const TQString& shortcutFileName = TQString());
 
 		KexiProjectData data();
 
@@ -77,7 +78,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDBConnectionWidget : public KexiDBConnectionWidg
 
 	protected:
 		void setDataInternal(const KexiProjectData& data, bool connectionOnly, 
-			const QString& shortcutFileName);
+			const TQString& shortcutFileName);
 
 		KexiProjectData m_data;
 		KexiDBDriverComboBox *m_driversCombo;
@@ -91,16 +92,17 @@ class KEXIEXTWIDGETS_EXPORT KexiDBConnectionWidget : public KexiDBConnectionWidg
 class KEXIEXTWIDGETS_EXPORT KexiDBConnectionTabWidget : public KTabWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		KexiDBConnectionTabWidget( QWidget* parent = 0, const char* name = 0 );
+		KexiDBConnectionTabWidget( TQWidget* tqparent = 0, const char* name = 0 );
 		virtual ~KexiDBConnectionTabWidget();
 
 		/*! Sets connection data \a data.
 		 \a shortcutFileName is only used to check if the file is writable 
 		 (if no, "save changes" button will be disabled). */
-		void setData(const KexiProjectData& data, const QString& shortcutFileName = QString::null);
-		void setData(const KexiDB::ConnectionData& data, const QString& shortcutFileName = QString::null);
+		void setData(const KexiProjectData& data, const TQString& shortcutFileName = TQString());
+		void setData(const KexiDB::ConnectionData& data, const TQString& shortcutFileName = TQString());
 		KexiProjectData currentProjectData();
 
 		//! \return true if 'save password' option is selected
@@ -123,6 +125,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDBConnectionTabWidget : public KTabWidget
 class KEXIEXTWIDGETS_EXPORT KexiDBConnectionDialog : public KDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
 		/*! Creates a new connection dialog for project data \a data.
@@ -134,7 +137,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDBConnectionDialog : public KDialogBase
 		 If \a shortcutFileName is empty, the button will be hidden. 
 		 \a acceptButtonGuiItem allows to override default "Open" button's appearance. */
 		KexiDBConnectionDialog(const KexiProjectData& data, 
-			const QString& shortcutFileName = QString::null, 
+			const TQString& shortcutFileName = TQString(), 
 			const KGuiItem& acceptButtonGuiItem = KGuiItem(""));
 
 		/*! Creates a new connection dialog for connection data \a data.
@@ -144,7 +147,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDBConnectionDialog : public KDialogBase
 		 The shortcut file is in .KEXIC format. 
 		 See above constructor for more details. */
 		KexiDBConnectionDialog(const KexiDB::ConnectionData& data, 
-			const QString& shortcutFileName = QString::null,
+			const TQString& shortcutFileName = TQString(),
 			const KGuiItem& acceptButtonGuiItem = KGuiItem(""));
 
 		~KexiDBConnectionDialog();