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, 24 insertions, 23 deletions

diff --git a/kexi/plugins/forms/widgets/kexiframe.h b/kexi/plugins/forms/widgets/kexiframe.h
index 8d60d597..d960cefd 100644
--- a/kexi/plugins/forms/widgets/kexiframe.h
+++ b/kexi/plugins/forms/widgets/kexiframe.h
@@ -20,62 +20,63 @@
 #ifndef KexiFrame_H
 #define KexiFrame_H
 
-#include <qframe.h>
+#include <tqframe.h>
 
 //! @short Frame widget for Kexi forms
-class KEXIFORMUTILS_EXPORT KexiFrame : public QFrame
+class KEXIFORMUTILS_EXPORT KexiFrame : public TQFrame
 {
 	Q_OBJECT
+  TQ_OBJECT
 //todo	Q_ENUMS( Shape Shadow )
-	Q_PROPERTY( QColor frameColor READ frameColor WRITE setFrameColor DESIGNABLE true )
-//todo	Q_OVERRIDE( Shape frameShape READ frameShape WRITE setFrameShape )
-//todo	Q_OVERRIDE( Shadow frameShadow READ frameShadow WRITE setFrameShadow )
+	TQ_PROPERTY( TQColor frameColor READ frameColor WRITE setFrameColor DESIGNABLE true )
+//todo	TQ_OVERRIDE( Shape frameShape READ frameShape WRITE setFrameShape )
+//todo	TQ_OVERRIDE( Shadow frameShadow READ frameShadow WRITE setFrameShadow )
 
 	public:
-		KexiFrame( QWidget * parent, const char * name = 0, WFlags f = 0 );
+		KexiFrame( TQWidget * tqparent, const char * name = 0, WFlags f = 0 );
 		virtual ~KexiFrame();
 
-		virtual const QColor& frameColor() const;
+		virtual const TQColor& frameColor() const;
 
 #if 0
 //! @todo more options
 		enum Shadow {
-			NoShadow = QFrame::Plain,
-			Raised = QFrame::Raised,
-			Sunken = QFrame::Sunken
+			NoShadow = TQFrame::Plain,
+			Raised = TQFrame::Raised,
+			Sunken = TQFrame::Sunken
 		};
 //! @todo more options
-		enum Shape { NoFrame = QFrame::NoFrame, //!< no frame
-			Box = QFrame::Box,                  //!< rectangular box
-			Panel = QFrame::Panel,              //!< rectangular panel
-			StyledPanel = QFrame::StyledPanel,  //!< rectangular panel depending on the GUI style
-			GroupBoxPanel = QFrame::GroupBoxPanel //!< rectangular group-box-like panel depending on the GUI style
+		enum Shape { NoFrame = TQFrame::NoFrame, //!< no frame
+			Box = TQFrame::Box,                  //!< rectangular box
+			Panel = TQFrame::Panel,              //!< rectangular panel
+			StyledPanel = TQFrame::StyledPanel,  //!< rectangular panel depending on the GUI style
+			GroupBoxPanel = TQFrame::GroupBoxPanel //!< rectangular group-box-like panel depending on the GUI style
 		};
 		Shape frameShape() const;
-		void setFrameShape( KexiFrame::Shape shape );
+		void setFrameShape( KexiFrame::Shape tqshape );
 		Shadow frameShadow() const;
 		void setFrameShadow( KexiFrame::Shadow shadow );
 #endif
 
 		//! Used to emit handleDragMoveEvent() signal needed to control dragging over the container's surface
-		virtual void dragMoveEvent( QDragMoveEvent *e );
+		virtual void dragMoveEvent( TQDragMoveEvent *e );
 
 		//! Used to emit handleDropEvent() signal needed to control dropping on the container's surface
-		virtual void dropEvent( QDropEvent *e );
+		virtual void dropEvent( TQDropEvent *e );
 
 	public slots:
-		virtual void setPalette( const QPalette &pal );
-		virtual void setFrameColor(const QColor& color);
+		virtual void setPalette( const TQPalette &pal );
+		virtual void setFrameColor(const TQColor& color);
 
 	signals:
 		//! Needed to control dragging over the container's surface
-		void handleDragMoveEvent(QDragMoveEvent *e);
+		void handleDragMoveEvent(TQDragMoveEvent *e);
 
 		//! Needed to control dropping on the container's surface
-		void handleDropEvent(QDropEvent *e);
+		void handleDropEvent(TQDropEvent *e);
 
 	protected:
-		virtual void drawFrame( QPainter * );
+		virtual void drawFrame( TQPainter * );
 
 		class Private;
 		Private *d;