TQt4 port kdetoys

This enables compilation under both Qt3 and Qt4


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

1 files changed, 14 insertions, 10 deletions

diff --git a/kworldwatch/flow.h b/kworldwatch/flow.h
index dd0930e..df7f6b3 100644
--- a/kworldwatch/flow.h
+++ b/kworldwatch/flow.h
@@ -1,13 +1,13 @@
 /****************************************************************************
 ** $Id$
 **
-** Definition of simple flow layout for custom layout example
+** Definition of simple flow tqlayout for custom tqlayout example
 **
 ** Created : 979899
 **
 ** Copyright (C) 1997 by Trolltech AS.  All rights reserved.
 **
-** This file is part of an example program for Qt.  This example
+** This file is part of an example program for TQt.  This example
 ** program may be used, distributed and modified without limitation.
 **
 *****************************************************************************/
@@ -18,15 +18,15 @@
 #include <tqlayout.h>
 #include <tqptrlist.h>
 
-class SimpleFlow : public QLayout
+class SimpleFlow : public TQLayout
 {
 public:
-    SimpleFlow( TQWidget *parent, int border=0, int space=-1,
+    SimpleFlow( TQWidget *tqparent, int border=0, int space=-1,
 		const char *name=0 )
-	: TQLayout( parent, border, space, name ),
+	: TQLayout( tqparent, border, space, name ),
 	cached_width(0), cached_hfw(0) {}
-    SimpleFlow( TQLayout* parent, int space=-1, const char *name=0 )
-	: TQLayout( parent, space, name ),
+    SimpleFlow( TQLayout* tqparent, int space=-1, const char *name=0 )
+	: TQLayout( tqparent, space, name ),
 	cached_width(0), cached_hfw(0) {}
     SimpleFlow( int space=-1, const char *name=0 )
 	: TQLayout( space, name ),
@@ -34,14 +34,18 @@ public:
 
     ~SimpleFlow();
 
-    void addItem( TQLayoutItem *item);
+    void addItem( QLayoutItem *item);
     bool hasHeightForWidth() const;
     int heightForWidth( int ) const;
-    TQSize sizeHint() const;
-    TQSize minimumSize() const;
+    TQSize tqsizeHint() const;
+    TQSize tqminimumSize() const;
     TQLayoutIterator iterator();
     TQSizePolicy::ExpandData expanding() const;
 
+#ifdef USE_QT4
+	QLAYOUT_REQUIRED_METHOD_DECLARATIONS
+#endif // USE_QT4
+
 protected:
     void setGeometry( const TQRect& );