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

diff --git a/kpresenter/KPrBackDia.h b/kpresenter/KPrBackDia.h
index 433edb5e..36ae92f5 100644
--- a/kpresenter/KPrBackDia.h
+++ b/kpresenter/KPrBackDia.h
@@ -22,8 +22,8 @@
 #define BACKDIA_H
 
 #include <kdialogbase.h>
-#include <qframe.h>
-#include <qdatetime.h>
+#include <tqframe.h>
+#include <tqdatetime.h>
 
 #include "global.h"
 #include "KPrBackground.h"
@@ -31,23 +31,24 @@
 #include <KoBrush.h>
 #include <KoPicture.h>
 
-class QLabel;
-class QComboBox;
+class TQLabel;
+class TQComboBox;
 class KColorButton;
-class QSlider;
+class TQSlider;
 class KPrBackGround;
-class QCheckBox;
-class QTabWidget;
+class TQCheckBox;
+class TQTabWidget;
 class KPrPage;
 class KURLRequester;
 
 
-class KPrBackPreview : public QFrame
+class KPrBackPreview : public TQFrame
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KPrBackPreview( QWidget *parent, KPrPage *page );
+    KPrBackPreview( TQWidget *tqparent, KPrPage *page );
     virtual ~KPrBackPreview();
 
     KPrBackGround *backGround() const {
@@ -55,7 +56,7 @@ public:
     }
 
 protected:
-    virtual void drawContents( QPainter *p );
+    virtual void drawContents( TQPainter *p );
 
 private:
     KPrBackGround *back;
@@ -65,11 +66,12 @@ private:
 class KPrBackDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KPrBackDialog( QWidget* parent, const char* name,
-             BackType backType, const QColor &backColor1,
-             const QColor &backColor2, BCType _bcType,
+    KPrBackDialog( TQWidget* tqparent, const char* name,
+             BackType backType, const TQColor &backColor1,
+             const TQColor &backColor2, BCType _bcType,
              const KoPicture &backPic,
              BackView backPicView, bool _unbalanced,
              int _xfactor, int _yfactor, KPrPage *_page  );
@@ -78,9 +80,9 @@ public:
     bool useMasterBackground() const;
 
 protected:
-    void showEvent( QShowEvent *e );
-    QColor getBackColor1() const;
-    QColor getBackColor2() const;
+    void showEvent( TQShowEvent *e );
+    TQColor getBackColor1() const;
+    TQColor getBackColor2() const;
     BCType getBackColorType() const;
     BackType getBackType() const;
     KoPicture getBackPicture() const { return m_picture; }
@@ -89,23 +91,23 @@ protected:
     int getBackXFactor() const;
     int getBackYFactor() const;
 private:
-    QLabel *picPreview;
-    QCheckBox *unbalanced;
-    QComboBox *cType, *backCombo, *picView;
-    QLabel *picChooseLabel;
+    TQLabel *picPreview;
+    TQCheckBox *unbalanced;
+    TQComboBox *cType, *backCombo, *picView;
+    TQLabel *picChooseLabel;
     KURLRequester *picChoose;
     KColorButton *color1Choose, *color2Choose;
-    QSlider *xfactor, *yfactor;
+    TQSlider *xfactor, *yfactor;
     KPrBackPreview *preview;
     bool picChanged, lockUpdate;
-    QLabel *labXFactor, *labYFactor;
-    QTabWidget *tabWidget;
-    QCheckBox *m_useMasterBackground;
+    TQLabel *labXFactor, *labYFactor;
+    TQTabWidget *tabWidget;
+    TQCheckBox *m_useMasterBackground;
 
     bool oldUseMasterBackground;
     BackType oldBackType;
-    QColor oldBackColor1;
-    QColor oldBackColor2;
+    TQColor oldBackColor1;
+    TQColor oldBackColor2;
     BCType oldBcType;
     BackView oldBackPicView;
     bool oldUnbalanced;
@@ -117,7 +119,7 @@ private:
 
 private slots:
     void aboutToSelectPic();
-    void afterSelectPic( const QString & );
+    void afterSelectPic( const TQString & );
     void updateConfiguration();
 
     void Ok() { emit backOk( this, false ); }