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, 34 insertions, 32 deletions

diff --git a/kpresenter/KPrMSPresentationSetup.h b/kpresenter/KPrMSPresentationSetup.h
index 7bceb412..c4ce5190 100644
--- a/kpresenter/KPrMSPresentationSetup.h
+++ b/kpresenter/KPrMSPresentationSetup.h
@@ -25,8 +25,8 @@
 
 #include <kwizard.h>
 
-#include <qdialog.h>
-#include <qvaluelist.h>
+#include <tqdialog.h>
+#include <tqvaluelist.h>
 
 
 class KPrDocument;
@@ -39,15 +39,15 @@ class KIntNumInput;
 class KLineEdit;
 class KComboBox;
 
-class QVBox;
-class QHBox;
+class TQVBox;
+class TQHBox;
 
-class QListViewItem;
-class QCloseEvent;
+class TQListViewItem;
+class TQCloseEvent;
 class KProgress;
-class QLabel;
-class QGroupBox;
-class QVBoxLayout;
+class TQLabel;
+class TQGroupBox;
+class TQVBoxLayout;
 
 class KPrMSPresentation
 {
@@ -56,24 +56,24 @@ public:
     KPrMSPresentation( KPrDocument *_doc, KPrView *_view );
     KPrMSPresentation( const KPrMSPresentation &msPres );
 
-    void setTitle( const QString &_title )
+    void setTitle( const TQString &_title )
         { title = _title; }
-    void setBackColour( const QColor &_backColour )
+    void setBackColour( const TQColor &_backColour )
         { backColour = _backColour; }
-    void setTextColour( const QColor &_textColour )
+    void setTextColour( const TQColor &_textColour )
         { textColour = _textColour; }
-    void setPath( const QString &_path )
+    void setPath( const TQString &_path )
         { path = _path; }
 
-    QString getTitle() const { return title; }
-    QColor getBackColour() const { return backColour; }
-    QColor getTextColour() const { return textColour; }
-    QString getPath() const { return path; }
+    TQString getTitle() const { return title; }
+    TQColor getBackColour() const { return backColour; }
+    TQColor getTextColour() const { return textColour; }
+    TQString getPath() const { return path; }
 
     struct SlideInfo {
         int pageNumber; /* 0-based */
     };
-    QValueList<SlideInfo> getSlideInfos() const { return slideInfos; }
+    TQValueList<SlideInfo> getSlideInfos() const { return slideInfos; }
 
     int initSteps() const { return 7; }
     int slidesSteps() { return slideInfos.count(); }
@@ -89,17 +89,18 @@ protected:
     KPrDocument *doc;
     KPrView *view;
 
-    QString title;
-    QValueList<SlideInfo> slideInfos;
-    QColor backColour, textColour;
-    QString path;
-    QString slidePath; // directory relative to path, containing slides 
+    TQString title;
+    TQValueList<SlideInfo> slideInfos;
+    TQColor backColour, textColour;
+    TQString path;
+    TQString slidePath; // directory relative to path, containing slides 
 
 };
 
-class KPrMSPresentationSetup : public QDialog
+class KPrMSPresentationSetup : public TQDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_view );
@@ -114,20 +115,21 @@ protected:
 
     KLineEdit *title;
     KColorButton *textColour, *backColour;
-    QGroupBox *colourGroup;
-    QVBoxLayout *mainLayout;
+    TQGroupBox *colourGroup;
+    TQVBoxLayout *mainLayout;
     KURLRequester *path;
 
 protected slots:
-    void slotChoosePath(const QString &);
+    void slotChoosePath(const TQString &);
     virtual void finish();
     virtual void helpMe();
     void showColourGroup(bool on);
 };
 
-class KPrMSPresentationCreateDialog : public QDialog
+class KPrMSPresentationCreateDialog : public TQDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     KPrMSPresentationCreateDialog( KPrDocument *_doc, KPrView *_view, const KPrMSPresentation &_msPres );
@@ -143,16 +145,16 @@ public:
 
 protected:
     void setupGUI();
-    void resizeEvent( QResizeEvent *e );
+    void resizeEvent( TQResizeEvent *e );
 
     KPrView *view;
     KPrDocument *doc;
     KPrMSPresentation msPres;
 
     KProgress *progressBar;
-    QLabel *step1, *step2, *step3;
-    QPushButton *bDone;
-    QVBox *back;
+    TQLabel *step1, *step2, *step3;
+    TQPushButton *bDone;
+    TQVBox *back;
 
 };
 #endif