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, 11 insertions, 10 deletions

diff --git a/kexi/main/startup/KexiConnSelector.h b/kexi/main/startup/KexiConnSelector.h
index a52dd8ae..2f4a9fe9 100644
--- a/kexi/main/startup/KexiConnSelector.h
+++ b/kexi/main/startup/KexiConnSelector.h
@@ -27,16 +27,16 @@
 #include <kdialogbase.h>
 #include <klistview.h>
 
-#include <qguardedptr.h>
+#include <tqguardedptr.h>
 
 class KexiConnSelectorBase;
 
 //! helper class
-class ConnectionDataLVItem : public QListViewItem
+class ConnectionDataLVItem : public TQListViewItem
 {
 	public:
 		ConnectionDataLVItem(KexiDB::ConnectionData *data, 
-			const KexiDB::Driver::Info& info, QListView *list);
+			const KexiDB::Driver::Info& info, TQListView *list);
 		~ConnectionDataLVItem();
 
 		void update(const KexiDB::Driver::Info& info);
@@ -52,9 +52,10 @@ class KexiConnSelectorWidgetPrivate;
 
 /*! Widget that allows to select a database connection (without choosing database itself)
 */
-class KEXIMAIN_EXPORT KexiConnSelectorWidget : public QWidget
+class KEXIMAIN_EXPORT KexiConnSelectorWidget : public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
 		enum ConnType { FileBased=1, ServerBased=2 };
@@ -65,8 +66,8 @@ class KEXIMAIN_EXPORT KexiConnSelectorWidget : public QWidget
 		 (it can also contain a configuration variable name with ":" prefix as described 
 		 in KRecentDirs documentation). */
 		KexiConnSelectorWidget( KexiDBConnectionSet& conn_set, 
-			const QString& startDirOrVariable, 
-			QWidget* parent = 0, const char* name = 0 );
+			const TQString& startDirOrVariable, 
+			TQWidget* tqparent = 0, const char* name = 0 );
 
 		virtual ~KexiConnSelectorWidget();
 		
@@ -86,16 +87,16 @@ class KEXIMAIN_EXPORT KexiConnSelectorWidget : public QWidget
 		 has been selected.
 		 @see selectedConnectionType()
 		*/
-		QString selectedFileName();
+		TQString selectedFileName();
 
 		/*! Sets selected filename to \a fileName. 
 		 Only works when selectedConnectionType()==FileBased. */
-		void setSelectedFileName(const QString& fileName);
+		void setSelectedFileName(const TQString& fileName);
 
 //		//! Usable when we want to do other things for "back" button
 //		void disconnectShowSimpleConnButton();
 
-		QListView* connectionsList() const;
+		TQListView* connectionsList() const;
 		
 		KexiConnSelectorBase *m_remote;
 //		KexiOpenExistingFile *m_file;
@@ -125,7 +126,7 @@ class KEXIMAIN_EXPORT KexiConnSelectorWidget : public QWidget
 		void hideConnectonIcon();
 
 	protected slots:
-		void slotConnectionItemExecuted(QListViewItem *item);
+		void slotConnectionItemExecuted(TQListViewItem *item);
 		void slotRemoteAddBtnClicked();
 		void slotRemoteEditBtnClicked();
 		void slotRemoteRemoveBtnClicked();