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, 17 insertions, 16 deletions

diff --git a/kexi/main/startup/KexiStartupFileDialog.h b/kexi/main/startup/KexiStartupFileDialog.h
index 87ebf7f4..12fc3ef4 100644
--- a/kexi/main/startup/KexiStartupFileDialog.h
+++ b/kexi/main/startup/KexiStartupFileDialog.h
@@ -22,7 +22,7 @@
 
 #include <kfiledialog.h>
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 # include "KexiStartupFileDialogBase_win.h"
 #else
   typedef KFileDialog KexiStartupFileDialogBase;
@@ -33,6 +33,7 @@
 class KEXIMAIN_EXPORT KexiStartupFileDialog : public KexiStartupFileDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 	
 public:
 	/*! Dialog mode:
@@ -49,43 +50,43 @@ public:
 	};
 	
 	KexiStartupFileDialog(
-		const QString& startDirOrVariable, int mode, QWidget *parent=0, const char *name=0);
+		const TQString& startDirOrVariable, int mode, TQWidget *tqparent=0, const char *name=0);
 
 	virtual ~KexiStartupFileDialog();
 
 	/*! Helper. Displays "The file %1 already exists. Do you want to overwrite it?" yes/no message box.
-	 \a parent is used as a parent of the KMessageBox.
+	 \a tqparent is used as a tqparent of the KMessageBox.
 	 \return true if \a filePath file does not exists or user has agreed on overwriting,
 	 false in user do not want to overwrite. */
-	static bool askForOverwriting(const QString& filePath, QWidget *parent = 0);
+	static bool askForOverwriting(const TQString& filePath, TQWidget *tqparent = 0);
 
 	void setMode(int mode);
 
-	QStringList additionalFilters() const;
+	TQStringList additionalFilters() const;
 
 	//! Sets additional filters list, e.g. "text/x-csv"
-	void setAdditionalFilters(const QStringList &mimeTypes);
+	void setAdditionalFilters(const TQStringList &mimeTypes);
 
-	QStringList excludedFilters() const;
+	TQStringList excludedFilters() const;
 
 	//! Excludes filters list
-	void setExcludedFilters(const QStringList &mimeTypes);
+	void setExcludedFilters(const TQStringList &mimeTypes);
 
 //	KURL currentURL();
-	QString currentFileName();
+	TQString currentFileName();
 
-//#ifndef Q_WS_WIN
+//#ifndef TQ_WS_WIN
 //	KURLComboBox *locationWidget() const;
 //#endif
 	//! just sets locationWidget()->setCurrentText(fn)
 	//! (and something similar on win32)
-	void setLocationText(const QString& fn);
+	void setLocationText(const TQString& fn);
 
 	//! Sets default extension which will be added after accepting
 	//! if user didn't provided one. This method is usable when there is 
 	//! more than one filter so there is no rule what extension should be selected
 	//! (by default first one is selected).
-	void setDefaultExtension(const QString& ext) { m_defaultExtension = ext; }
+	void setDefaultExtension(const TQString& ext) { m_defaultExtension = ext; }
 	
 	/*! \return true if the current URL meets requies constraints 
 	 (i.e. exists or doesn't exist);
@@ -97,7 +98,7 @@ public:
 	 This is true by default. */
 	void setConfirmOverwrites(bool set) { m_confirmOverwrites = set; }
 
-	virtual bool eventFilter ( QObject * watched, QEvent * e );
+	virtual bool eventFilter ( TQObject * watched, TQEvent * e );
 
 public slots:
 	virtual void show();
@@ -120,10 +121,10 @@ private:
 	void updateFilters();
 
 //	KURL m_lastUrl;
-	QString m_lastFileName;
+	TQString m_lastFileName;
 	int m_mode;
-	QStringList m_additionalMimeTypes, m_excludedMimeTypes;
-	QString m_defaultExtension;
+	TQStringList m_additionalMimeTypes, m_excludedMimeTypes;
+	TQString m_defaultExtension;
 	bool m_confirmOverwrites : 1;
 	bool m_filtersUpdated : 1;
 };