Fix kdesdk Qt3 FTBFS

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236291 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 30 insertions, 32 deletions

diff --git a/kompare/komparepart/kompare_qsplitter.h b/kompare/komparepart/kompare_qsplitter.h
index 3c9345c7..52009244 100644
--- a/kompare/komparepart/kompare_qsplitter.h
+++ b/kompare/komparepart/kompare_qsplitter.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 **
-** Definition of QSplitter class
+** Definition of KQSplitter class
 **
 **  Created : 980105
 **
@@ -21,35 +21,33 @@
 **
 **********************************************************************/
 
-#ifndef KOMPARE_TQSPLITTER_H
-#define KOMPARE_TQSPLITTER_H
+#ifndef KQSPLITTER_H
+#define KQSPLITTER_H
 
-#ifndef TQT_H
 #include "tqframe.h"
 #include "tqvaluelist.h"
-#endif // TQT_H
 
 #ifndef TQT_NO_SPLITTER
 
-//class QSplitterHandle;
-class QSplitterLayoutStruct;
+//class KQSplitterHandle;
+class KQSplitterLayoutStruct;
 class TQTextStream;
 
-class QSplitterPrivate
+class KQSplitterPrivate
 {
 public:
-    QSplitterPrivate()
+    KQSplitterPrivate()
 	: opaque( FALSE ), firstShow( TRUE ), tqchildrenCollapsible( TRUE ),
 	  handleWidth( 0 ) { }
 
-    TQPtrList<QSplitterLayoutStruct> list;
+    TQPtrList<KQSplitterLayoutStruct> list;
     bool opaque : 8;
     bool firstShow : 8;
     bool tqchildrenCollapsible : 8;
     int handleWidth;
 };
 
-class TQ_EXPORT QSplitter : public TQFrame
+class TQ_EXPORT KQSplitter : public TQFrame
 {
     Q_OBJECT
   TQ_OBJECT
@@ -62,9 +60,9 @@ public:
     // ### TQt 4.0: remove Auto from public API
     enum ResizeMode { Stretch, KeepSize, FollowSizeHint, Auto };
 
-    QSplitter( TQWidget* tqparent = 0, const char* name = 0 );
-    QSplitter( Qt::Orientation, TQWidget* tqparent = 0, const char* name = 0 );
-    ~QSplitter();
+    KQSplitter( TQWidget* tqparent = 0, const char* name = 0 );
+    KQSplitter( Qt::Orientation, TQWidget* tqparent = 0, const char* name = 0 );
+    ~KQSplitter();
 
     virtual void setOrientation( Qt::Orientation );
     Qt::Orientation orientation() const { return orient; }
@@ -118,10 +116,10 @@ public: // private (:
     void getRange( int id, int *, int *, int *, int * );
     void addContribution( int, int *, int *, bool );
     int adjustPos( int, int, int *, int *, int *, int * );
-    bool collapsible( QSplitterLayoutStruct * );
+    bool collapsible( KQSplitterLayoutStruct * );
     void processChildEvents();
-    QSplitterLayoutStruct *findWidget( TQWidget * );
-    QSplitterLayoutStruct *addWidget( TQWidget *, bool prepend = FALSE );
+    KQSplitterLayoutStruct *findWidget( TQWidget * );
+    KQSplitterLayoutStruct *addWidget( TQWidget *, bool prepend = FALSE );
     void recalcId();
     void doMove( bool backwards, int pos, int id, int delta, bool upLeft,
 		 bool mayCollapse );
@@ -139,36 +137,36 @@ public: // private (:
     inline TQCOORD trans( const TQSize &s ) const
     { return orient ==Qt::Vertical ? s.width() : s.height(); }
 
-    QSplitterPrivate *d;
+    KQSplitterPrivate *d;
 
     Qt::Orientation orient;
-    friend class QSplitterHandle;
+    friend class KQSplitterHandle;
 
 #ifndef TQT_NO_TEXTSTREAM
 // tqmoc doesn't like these.
-//    friend TQ_EXPORT TQTextStream& operator<<( TQTextStream&, const QSplitter& );
-//    friend TQ_EXPORT TQTextStream& operator>>( TQTextStream&, QSplitter& );
+//    friend TQ_EXPORT TQTextStream& operator<<( TQTextStream&, const KQSplitter& );
+//    friend TQ_EXPORT TQTextStream& operator>>( TQTextStream&, KQSplitter& );
 #endif
 
 public:
 #if defined(TQ_DISABLE_COPY)
-    QSplitter( const QSplitter & );
-    QSplitter& operator=( const QSplitter & );
+    KQSplitter( const KQSplitter & );
+    KQSplitter& operator=( const KQSplitter & );
 #endif
 };
 
 #ifndef TQT_NO_TEXTSTREAM
-TQ_EXPORT TQTextStream& operator<<( TQTextStream&, const QSplitter& );
-TQ_EXPORT TQTextStream& operator>>( TQTextStream&, QSplitter& );
+TQ_EXPORT TQTextStream& operator<<( TQTextStream&, const KQSplitter& );
+TQ_EXPORT TQTextStream& operator>>( TQTextStream&, KQSplitter& );
 #endif
 
-class QSplitterHandle : public TQWidget
+class KQSplitterHandle : public TQWidget
 {
     Q_OBJECT
   TQ_OBJECT
 public:
-    QSplitterHandle( Qt::Orientation o,
-		     QSplitter *tqparent, const char* name=0 );
+    KQSplitterHandle( Qt::Orientation o,
+		     KQSplitter *tqparent, const char* name=0 );
     void setOrientation( Qt::Orientation o );
     Qt::Orientation orientation() const { return orient; }
 
@@ -190,12 +188,12 @@ public: // private (:
     bool opaq;
     int myId;
 
-    QSplitter *s;
+    KQSplitter *s;
 };
 
 const uint Default = 2;
 
-class QSplitterLayoutStruct : public TQt
+class KQSplitterLayoutStruct : public TQt
 {
 public:
     TQCOORD sizer;
@@ -204,11 +202,11 @@ public:
     uint resizeMode : 2;
     TQWidget *wid;
 
-    QSplitterLayoutStruct()
+    KQSplitterLayoutStruct()
 	: sizer( -1 ), collapsible( Default ) { }
     TQCOORD getSizer( Qt::Orientation orient );
 };
 
 #endif // TQT_NO_SPLITTER
 
-#endif // KOMPARE_TQSPLITTER_H
+#endif // KQSPLITTER_H