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, 31 deletions

diff --git a/kpresenter/KPrSideBar.h b/kpresenter/KPrSideBar.h
index b11b8d5a..b1d7eeb3 100644
--- a/kpresenter/KPrSideBar.h
+++ b/kpresenter/KPrSideBar.h
@@ -21,19 +21,19 @@
 #ifndef SIDEBAR_H
 #define SIDEBAR_H
 
-#include <qrect.h>
-#include <qstringlist.h>
-#include <qtabwidget.h>
-#include <qvalidator.h>
+#include <tqrect.h>
+#include <tqstringlist.h>
+#include <tqtabwidget.h>
+#include <tqvalidator.h>
 
 #include <kiconview.h>
 #include <klistview.h>
 
-class QListViewItem;
+class TQListViewItem;
 class KPrDocument;
 class KPrView;
-class QDropEvent;
-class QPopupMenu;
+class TQDropEvent;
+class TQPopupMenu;
 class KPrOutline;
 class OutlineSlideItem;
 class KPrThumbBar;
@@ -41,15 +41,15 @@ class ThumbToolTip;
 class KPrPage;
 
 
-class KPrRenamePageValidator : public QValidator
+class KPrRenamePageValidator : public TQValidator
 {
   public:
-    KPrRenamePageValidator( const QStringList & list=QStringList() )
-        : QValidator( 0, 0 ), mStringList( list ) {}
-    virtual State validate( QString & input, int & pos ) const;
+    KPrRenamePageValidator( const TQStringList & list=TQStringList() )
+        : TQValidator( 0, 0 ), mStringList( list ) {}
+    virtual State validate( TQString & input, int & pos ) const;
 
   protected:
-    QStringList mStringList;
+    TQStringList mStringList;
 };
 
 class KPrSideBarBase
@@ -66,9 +66,10 @@ protected:
 class KPrThumbBar : public KIconView, public KPrSideBarBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KPrThumbBar(QWidget *parent, KPrDocument *d, KPrView *v);
+    KPrThumbBar(TQWidget *tqparent, KPrDocument *d, KPrView *v);
     ~KPrThumbBar();
     void setCurrentPage( int pg );
     void updateItem( int pagenr, bool sticky = false );
@@ -76,7 +77,7 @@ public:
     void moveItem( int oldPos, int newPos );
     void removeItem( int pos );
     void refreshItems ( bool offset = false );
-    QRect tip(const QPoint &pos, QString &title);
+    TQRect tip(const TQPoint &pos, TQString &title);
 
     bool uptodate;
 
@@ -87,12 +88,12 @@ public slots:
     void rebuildItems();
 
 private slots:
-    void itemClicked(QIconViewItem *i);
+    void itemClicked(TQIconViewItem *i);
     void slotContentsMoving(int x, int y);
     void slotRefreshItems();
 
 private:
-    QPixmap getSlideThumb(int slideNr) const;
+    TQPixmap getSlideThumb(int slideNr) const;
 
     ThumbToolTip *m_thumbTip;
     int m_offsetX;
@@ -102,24 +103,25 @@ private:
 class KPrOutline: public KListView, public KPrSideBarBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KPrOutline( QWidget *parent, KPrDocument *d, KPrView *v );
+    KPrOutline( TQWidget *tqparent, KPrDocument *d, KPrView *v );
     ~KPrOutline();
     void setCurrentPage( int pg );
-    QSize sizeHint() const { return QSize( 145, KListView::sizeHint().height() ); }
+    TQSize tqsizeHint() const { return TQSize( 145, KListView::tqsizeHint().height() ); }
     void updateItem( int pagenr, bool sticky = false);
     void addItem( int pos );
     void moveItem( int oldPos, int newPos );
     void removeItem( int pos );
 
 protected:
-    void contentsDropEvent( QDropEvent *e );
-    void moveItem( QListViewItem *i, QListViewItem *firstAfter, QListViewItem *newAfter );
+    void contentsDropEvent( TQDropEvent *e );
+    void moveItem( TQListViewItem *i, TQListViewItem *firstAfter, TQListViewItem *newAfter );
     OutlineSlideItem* slideItem( int pageNumber );
-    bool acceptDrag( QDropEvent* e ) const;
+    bool acceptDrag( TQDropEvent* e ) const;
 
-    virtual QDragObject* dragObject();
+    virtual TQDragObject* dragObject();
 
 signals: // all page numbers 0-based
     void showPage( int i );
@@ -131,27 +133,28 @@ public slots:
     void renamePageTitle();
 
 private slots:
-    void itemClicked( QListViewItem *i );
-    void slotDropped( QDropEvent *e, QListViewItem *parent, QListViewItem *target );
-    void rightButtonPressed( QListViewItem *i, const QPoint &pnt, int c );
-    void slotContextMenu( KListView*, QListViewItem *item, const QPoint &p );
+    void itemClicked( TQListViewItem *i );
+    void slotDropped( TQDropEvent *e, TQListViewItem *tqparent, TQListViewItem *target );
+    void rightButtonPressed( TQListViewItem *i, const TQPoint &pnt, int c );
+    void slotContextMenu( KListView*, TQListViewItem *item, const TQPoint &p );
 
 private:
-    QListViewItem *m_movedItem, *m_movedAfter;
+    TQListViewItem *m_movedItem, *m_movedAfter;
 };
 
-class KPrSideBar: public QTabWidget
+class KPrSideBar: public TQTabWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KPrSideBar(QWidget *parent, KPrDocument *d, KPrView *v);
+    KPrSideBar(TQWidget *tqparent, KPrDocument *d, KPrView *v);
     void setCurrentPage( int pg ) {
         m_outline->setCurrentPage(pg);
         m_thb->setCurrentPage(pg);
     };
     void setOn( int , bool ) { };
-    //QSize sizeHint() const { return QSize( 120, QTabWidget::sizeHint().height() ); };
+    //TQSize tqsizeHint() const { return TQSize( 120, TQTabWidget::tqsizeHint().height() ); };
     void updateItem( KPrPage *page );
     void addItem( int pos );
     void moveItem( int oldPos, int newPos );
@@ -169,7 +172,7 @@ signals: // all page numbers 0-based
 public slots:
     //void rebuildItems() { m_outline->rebuildItems(); m_thb->rebuildItems();};
     void renamePageTitle() { m_outline->renamePageTitle(); };
-    void currentChanged(QWidget *tab);
+    void currentChanged(TQWidget *tab);
 
 private:
     KPrOutline *m_outline;