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, 26 insertions, 25 deletions

diff --git a/kpresenter/KPrEffectDia.h b/kpresenter/KPrEffectDia.h
index 7f59af0c..af0f4d00 100644
--- a/kpresenter/KPrEffectDia.h
+++ b/kpresenter/KPrEffectDia.h
@@ -22,55 +22,56 @@
 #define EFFECTDIA_H
 
 #include <kdialogbase.h>
-#include <qptrlist.h>
+#include <tqptrlist.h>
 
 class KPrView;
-class QWidget;
-class QComboBox;
-class QLabel;
-class QPushButton;
-class QCheckBox;
-class QBoxLayout;
-class QResizeEvent;
-class QLineEdit;
+class TQWidget;
+class TQComboBox;
+class TQLabel;
+class TQPushButton;
+class TQCheckBox;
+class TQBoxLayout;
+class TQResizeEvent;
+class TQLineEdit;
 class KPrObject;
 class KIntNumInput;
 class KURLRequester;
 class KPrSoundPlayer;
-class QSpinBox;
+class TQSpinBox;
 
 class KPrEffectDia : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KPrEffectDia( QWidget* parent, const char*, const QPtrList<KPrObject> &_objs,
+    KPrEffectDia( TQWidget* tqparent, const char*, const TQPtrList<KPrObject> &_objs,
                KPrView* );
 
     ~KPrEffectDia();
 
 protected:
-    void resizeEvent( QResizeEvent *e );
+    void resizeEvent( TQResizeEvent *e );
 
-    QString getSoundFileFilter() const;
+    TQString getSoundFileFilter() const;
 
-    QComboBox *cEffect, *cEffect2, *cDisappear, *cAppearSpeed, *cDisappearSpeed;
-    QLabel *lEffect, *lEffect2, *lAppear, *lDisappear, *lDEffect, * lAppearSpeed, *lDisappearSpeed;
-    QSpinBox *eAppearStep,*eDisappearStep;
-    QCheckBox *disappear;
-    QBoxLayout *topLayout;
+    TQComboBox *cEffect, *cEffect2, *cDisappear, *cAppearSpeed, *cDisappearSpeed;
+    TQLabel *lEffect, *lEffect2, *lAppear, *lDisappear, *lDEffect, * lAppearSpeed, *lDisappearSpeed;
+    TQSpinBox *eAppearStep,*eDisappearStep;
+    TQCheckBox *disappear;
+    TQBoxLayout *topLayout;
     KIntNumInput *timerOfAppear, *timerOfDisappear;
 
-    QCheckBox *appearSoundEffect, *disappearSoundEffect;
-    QLabel *lSoundEffect1, *lSoundEffect2;
+    TQCheckBox *appearSoundEffect, *disappearSoundEffect;
+    TQLabel *lSoundEffect1, *lSoundEffect2;
     KURLRequester *requester1, *requester2;
-    QPushButton *buttonTestPlaySoundEffect1, *buttonTestStopSoundEffect1;
-    QPushButton *buttonTestPlaySoundEffect2, *buttonTestStopSoundEffect2;
+    TQPushButton *buttonTestPlaySoundEffect1, *buttonTestStopSoundEffect1;
+    TQPushButton *buttonTestPlaySoundEffect2, *buttonTestStopSoundEffect2;
 
     KPrSoundPlayer *soundPlayer1, *soundPlayer2;
 
     KPrView *view;
-    QPtrList<KPrObject> objs;
+    TQPtrList<KPrObject> objs;
 
 public slots:
     void slotEffectDiaOk();
@@ -82,8 +83,8 @@ protected slots:
     void appearSoundEffectChanged();
     void disappearSoundEffectChanged();
     void slotRequesterClicked( KURLRequester * );
-    void slotAppearFileChanged( const QString& );
-    void slotDisappearFileChanged( const QString& );
+    void slotAppearFileChanged( const TQString& );
+    void slotDisappearFileChanged( const TQString& );
     void playSound1();
     void playSound2();
     void stopSound1();