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, 28 insertions, 27 deletions

diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.h b/kexi/plugins/importexport/csv/kexicsvwidgets.h
index f128b658..7a163ee0 100644
--- a/kexi/plugins/importexport/csv/kexicsvwidgets.h
+++ b/kexi/plugins/importexport/csv/kexicsvwidgets.h
@@ -20,82 +20,83 @@
 #ifndef KEXI_CSVWIDGETS_H
 #define KEXI_CSVWIDGETS_H
 
-#include <qvaluevector.h>
+#include <tqvaluevector.h>
 #include <kcombobox.h>
 
 class KLineEdit;
 class KActiveLabel;
-class QLabel;
+class TQLabel;
 
-#define KEXICSV_DEFAULT_FILE_TEXT_QUOTE "\""
-#define KEXICSV_DEFAULT_CLIPBOARD_TEXT_QUOTE ""
+#define KEXICSV_DEFAULT_FILE_TEXT_TQUOTE "\""
+#define KEXICSV_DEFAULT_CLIPBOARD_TEXT_TQUOTE ""
 #define KEXICSV_DEFAULT_FILE_DELIMITER ","
 #define KEXICSV_DEFAULT_CLIPBOARD_DELIMITER "\t"
 #define KEXICSV_DEFAULT_FILE_DELIMITER_INDEX 0
 
 //! \return a list of mimetypes usable for handling CSV format handling
-QStringList csvMimeTypes();
+TQStringList csvMimeTypes();
 
 /*! @short A helper widget showing a short text information with an icon.
  See ctor for details.
  Used by CSV import and export dialogs. */
-class KexiCSVInfoLabel : public QWidget
+class KexiCSVInfoLabel : public TQWidget
 {
 	public:
 		/* Sets up a new info label \a labelText label with text like "Preview of data from file:".
 		 setFileName() can be used to display filename and setCommentAfterFileName() to display 
 		 additional comment.
 
-		 The widget's layout can look like this:
+		 The widget's tqlayout can look like this:
 
 		 \pre [icon] [labeltext] [filename] [comment]
 		*/
-		KexiCSVInfoLabel( const QString& labelText, QWidget* parent );
+		KexiCSVInfoLabel( const TQString& labelText, TQWidget* tqparent );
 
-		void setFileName( const QString& fileName );
-		void setLabelText( const QString& text );
-		void setCommentText( const QString& text );
+		void setFileName( const TQString& fileName );
+		void setLabelText( const TQString& text );
+		void setCommentText( const TQString& text );
 //		void setIconForFileName();
 
 		//! sets icon pixmap to \a iconName. Used wher setIconForFilename was false in ctor.
-		void setIcon(const QString& iconName);
+		void setIcon(const TQString& iconName);
 
-		QLabel* leftLabel() const { return m_leftLabel; }
+		TQLabel* leftLabel() const { return m_leftLabel; }
 		KActiveLabel* fileNameLabel() const { return m_fnameLbl; }
 		KActiveLabel* commentLabel() const { return m_commentLbl; }
-		QFrame* separator() const { return m_separator; }
+		TQFrame* separator() const { return m_separator; }
 
 	protected:
-		QLabel *m_leftLabel, *m_iconLbl;
+		TQLabel *m_leftLabel, *m_iconLbl;
 		KActiveLabel *m_fnameLbl, *m_commentLbl;
-		QFrame* m_separator;
+		TQFrame* m_separator;
 };
 
 //! @short A combo box widget providing a list of possible delimiters
 //! Used by CSV import and export dialogs
-class KexiCSVDelimiterWidget : public QWidget
+class KexiCSVDelimiterWidget : public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		KexiCSVDelimiterWidget( bool lineEditOnBottom, QWidget * parent = 0 );
+		KexiCSVDelimiterWidget( bool lineEditOnBottom, TQWidget * tqparent = 0 );
 
-		QString delimiter() const { return m_delimiter; }
-		void setDelimiter(const QString& delimiter);
+		TQString delimiter() const { return m_delimiter; }
+		void setDelimiter(const TQString& delimiter);
 
 	signals:
-		void delimiterChanged(const QString& delimiter);
+		void delimiterChanged(const TQString& delimiter);
 
 	protected slots:
 		//! only called when a delimiter was set by user directly
 		void slotDelimiterChanged(int idx);
 		void slotDelimiterChangedInternal(int idx);
-		void slotDelimiterLineEditTextChanged( const QString & );
+		void slotDelimiterLineEditTextChanged( const TQString & );
 		void slotDelimiterLineEditReturnPressed();
 
 	protected:
-		QString m_delimiter;
-		QValueVector<QString> m_availableDelimiters;
+		TQString m_delimiter;
+		TQValueVector<TQString> m_availableDelimiters;
 		KComboBox* m_combo;
 		KLineEdit* m_delimiterEdit;
 };
@@ -105,12 +106,12 @@ class KexiCSVDelimiterWidget : public QWidget
 class KexiCSVTextQuoteComboBox : public KComboBox
 {
 	public:
-		KexiCSVTextQuoteComboBox( QWidget * parent = 0 );
+		KexiCSVTextQuoteComboBox( TQWidget * tqparent = 0 );
 
-		QString textQuote() const;
+		TQString textQuote() const;
 
 		//! Sets text quote. Only available are: ", ', and empty string.
-		void setTextQuote(const QString& textQuote);
+		void setTextQuote(const TQString& textQuote);
 };
 
 #endif