TQt4 port basket

This enables compilation under both Qt3 and Qt4


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

1 files changed, 61 insertions, 59 deletions

diff --git a/src/qeffects.h b/src/qeffects.h
index b898ad4..eb6f308 100644
--- a/src/qeffects.h
+++ b/src/qeffects.h
@@ -1,8 +1,8 @@
 #if 0
 
-// Note: this file has been copied from the Qt source.
-// Those classes are normally used internally in Qt
-// but we need them for immitate the roll-over effect of QComboBox.
+// Note: this file has been copied from the TQt source.
+// Those classes are normally used internally in TQt
+// but we need them for immitate the roll-over effect of TQComboBox.
 //
 // Some class definitions have been moved from qeffects.cpp to this file.
 // They are framed with the comment "MOVED FROM qeffect.cpp"
@@ -10,33 +10,33 @@
 /****************************************************************************
 ** $Id: qt/qeffects_p.h   3.3.4   edited May 27 2003 $
 **
-** Definition of QEffects functions
+** Definition of TQEffects functions
 **
 ** Created : 000621
 **
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of the widgets module of the Qt GUI Toolkit.
+** This file is part of the widgets module of the TQt GUI Toolkit.
 **
 ** This file may be distributed under the terms of the Q Public License
 ** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
+** LICENSE.TQPL included in the packaging of this file.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
+**   information about TQt Commercial License Agreements.
+** See http://www.trolltech.com/qpl/ for TQPL licensing information.
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
@@ -44,15 +44,15 @@
 **
 **********************************************************************/
 
-#ifndef QEFFECTS_P_H
-#define QEFFECTS_P_H
+#ifndef TQEFFECTS_P_H
+#define TQEFFECTS_P_H
 
 
 //
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the Qt API.  It exists for the convenience
+// This file is not part of the TQt API.  It exists for the convenience
 // of qeffects.cpp, qcombobox.cpp, qpopupmenu.cpp and qtooltip.cpp.
 // This header file may change from version to version without notice,
 // or even be removed.
@@ -61,14 +61,14 @@
 //
 //
 
-#ifndef QT_H
-#include "qnamespace.h"
-#endif // QT_H
+#ifndef TQT_H
+#include "tqnamespace.h"
+#endif // TQT_H
 
-#ifndef QT_NO_EFFECTS
-class QWidget;
+#ifndef TQT_NO_EFFECTS
+class TQWidget;
 
-struct QEffects
+struct TQEffects
 {
 	enum Direction {
 		LeftScroll	= 0x0001,
@@ -80,94 +80,96 @@ struct QEffects
 	typedef uint DirFlags;
 };
 
-extern void Q_EXPORT qScrollEffect( QWidget*, QEffects::DirFlags dir = QEffects::DownScroll, int time = -1 );
-extern void Q_EXPORT qFadeEffect( QWidget*, int time = -1 );
+extern void TQ_EXPORT qScrollEffect( TQWidget*, TQEffects::DirFlags dir = TQEffects::DownScroll, int time = -1 );
+extern void TQ_EXPORT qFadeEffect( TQWidget*, int time = -1 );
 
 
 /******************* MOVED FROM qeffect.cpp: */
 
-#include "qguardedptr.h"
-#include "qdatetime.h"
-#include "qtimer.h"
-#include "qpixmap.h"
-#include "qimage.h"
+#include "tqguardedptr.h"
+#include "tqdatetime.h"
+#include "tqtimer.h"
+#include "tqpixmap.h"
+#include "tqimage.h"
 
 /*
-  Internal class to get access to protected QWidget-members
+  Internal class to get access to protected TQWidget-members
 */
 
-class QAccessWidget : public QWidget
+class TQAccessWidget : public TQWidget
 {
-	friend class QAlphaWidget;
-	friend class QRollEffect;
+	friend class TQAlphaWidget;
+	friend class TQRollEffect;
 	public:
-		QAccessWidget( QWidget* parent=0, const char* name=0, WFlags f = 0 )
-	: QWidget( parent, name, f ) {}
+		TQAccessWidget( TQWidget* tqparent=0, const char* name=0, WFlags f = 0 )
+	: TQWidget( tqparent, name, f ) {}
 };
 
 /*
-  Internal class QAlphaWidget.
+  Internal class TQAlphaWidget.
 
-  The QAlphaWidget is shown while the animation lasts
+  The TQAlphaWidget is shown while the animation lasts
   and displays the pixmap resulting from the alpha blending.
 */
 
-class QAlphaWidget: public QWidget, private QEffects
+class TQAlphaWidget: public TQWidget, private TQEffects
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		QAlphaWidget( QWidget* w, WFlags f = 0 );
+		TQAlphaWidget( TQWidget* w, WFlags f = 0 );
 
 		void run( int time );
 
 	protected:
-		void paintEvent( QPaintEvent* e );
-		void closeEvent( QCloseEvent* );
-		bool eventFilter( QObject* o, QEvent* e );
+		void paintEvent( TQPaintEvent* e );
+		void closeEvent( TQCloseEvent* );
+		bool eventFilter( TQObject* o, TQEvent* e );
 		void alphaBlend();
 
 	protected slots:
 		void render();
 
 	private:
-		QPixmap pm;
+		TQPixmap pm;
 		double alpha;
-		QImage back;
-		QImage front;
-		QImage mixed;
-		QGuardedPtr<QAccessWidget> widget;
+		TQImage back;
+		TQImage front;
+		TQImage mixed;
+		TQGuardedPtr<TQAccessWidget> widget;
 		int duration;
 		int elapsed;
 		bool showWidget;
-		QTimer anim;
-		QTime checkTime;
+		TQTimer anim;
+		TQTime checkTime;
 };
 
 /*
-  Internal class QRollEffect
+  Internal class TQRollEffect
 
-  The QRollEffect widget is shown while the animation lasts
+  The TQRollEffect widget is shown while the animation lasts
   and displays a scrolling pixmap.
 */
 
-class QRollEffect : public QWidget, private QEffects
+class TQRollEffect : public TQWidget, private TQEffects
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		QRollEffect( QWidget* w, WFlags f, DirFlags orient );
+		TQRollEffect( TQWidget* w, WFlags f, DirFlags orient );
 
 		void run( int time );
 
 	protected:
-		void paintEvent( QPaintEvent* );
-		bool eventFilter( QObject*, QEvent* );
-		void closeEvent( QCloseEvent* );
+		void paintEvent( TQPaintEvent* );
+		bool eventFilter( TQObject*, TQEvent* );
+		void closeEvent( TQCloseEvent* );
 
 	private slots:
 		void scroll();
 
 	private:
-		QGuardedPtr<QAccessWidget> widget;
+		TQGuardedPtr<TQAccessWidget> widget;
 
 		int currentHeight;
 		int currentWidth;
@@ -180,16 +182,16 @@ class QRollEffect : public QWidget, private QEffects
 		bool showWidget;
 		int orientation;
 
-		QTimer anim;
-		QTime checkTime;
+		TQTimer anim;
+		TQTime checkTime;
 
-		QPixmap pm;
+		TQPixmap pm;
 };
 
 /******************************/
 
-#endif // QT_NO_EFFECTS
+#endif // TQT_NO_EFFECTS
 
-#endif // QEFFECTS_P_H
+#endif // TQEFFECTS_P_H
 
 #endif // #if 0