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, 15 insertions, 14 deletions

diff --git a/kchart/csvimportdialog.h b/kchart/csvimportdialog.h
index 19c7eb96..d4a01726 100644
--- a/kchart/csvimportdialog.h
+++ b/kchart/csvimportdialog.h
@@ -21,7 +21,7 @@
 #ifndef CSVIMPORTDIALOG_H
 #define CSVIMPORTDIALOG_H
 
-#include <qstringlist.h>
+#include <tqstringlist.h>
 
 #include <kdialogbase.h>
 
@@ -30,6 +30,7 @@ class DialogUI;
 class CSVImportDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     enum Header
     {
@@ -41,7 +42,7 @@ public:
         POINTNUMBER ///< Number, which decimal symbol is a point/dot
     };
 
-    CSVImportDialog(QWidget* parent, QByteArray& fileArray);
+    CSVImportDialog(TQWidget* tqparent, TQByteArray& fileArray);
     ~CSVImportDialog();
 
     bool     firstRowContainHeaders();
@@ -49,16 +50,16 @@ public:
     int      rows();
     int      cols();
     int      headerType(int col);
-    QString  text(int row, int col);
+    TQString  text(int row, int col);
 
 private:
     void fillTable();
     void fillComboBox();
-    void setText(int row, int col, const QString& text);
+    void setText(int row, int col, const TQString& text);
     void adjustRows(int iRows);
     void adjustCols(int iCols);
     bool checkUpdateRange();
-    QTextCodec* getCodec(void) const;
+    TQTextCodec* getCodec(void) const;
 
     // The real contents of the dialog
     DialogUI  *m_dialog;
@@ -69,23 +70,23 @@ private:
     int        m_startCol;
     int        m_endRow;
     int        m_endCol;
-    QChar      m_textquote;
-    QString    m_delimiter;
+    TQChar      m_textquote;
+    TQString    m_delimiter;
     bool       m_ignoreDups;
-    QByteArray m_fileArray;
-    QTextCodec *m_codec;
-    QStringList m_formatList; ///< List of the column formats
+    TQByteArray m_fileArray;
+    TQTextCodec *m_codec;
+    TQStringList m_formatList; ///< List of the column formats
 
 private slots:
     void returnPressed();
-    void formatChanged( const QString& );
+    void formatChanged( const TQString& );
     void delimiterClicked(int id);
-    void textquoteSelected(const QString& mark);
+    void textquoteSelected(const TQString& mark);
     void currentCellChanged(int, int col);
-    void textChanged ( const QString & );
+    void textChanged ( const TQString & );
     void ignoreDuplicatesChanged( int );
     void updateClicked();
-    void encodingChanged ( const QString & );
+    void encodingChanged ( const TQString & );
 };
 
 #endif