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, 20 insertions, 19 deletions

diff --git a/kexi/widget/kexiscrollview.h b/kexi/widget/kexiscrollview.h
index c313f2d7..92615cf3 100644
--- a/kexi/widget/kexiscrollview.h
+++ b/kexi/widget/kexiscrollview.h
@@ -21,25 +21,26 @@
 #ifndef KEXISCROLLVIEW_H
 #define KEXISCROLLVIEW_H
 
-#include <qscrollview.h>
-#include <qtimer.h>
+#include <tqscrollview.h>
+#include <tqtimer.h>
 
-class QColor;
-class QFont;
+class TQColor;
+class TQFont;
 class KexiRecordNavigator;
 
 //! The scrollview which includes KexiDBForm
 /*! It allows to resize its m_widget, following snapToGrid setting. 
  Its contents is resized so the widget can always be resized. */
-class KEXIEXTWIDGETS_EXPORT KexiScrollView : public QScrollView
+class KEXIEXTWIDGETS_EXPORT KexiScrollView : public TQScrollView
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		KexiScrollView(QWidget *parent, bool preview);
+		KexiScrollView(TQWidget *tqparent, bool preview);
 		virtual ~KexiScrollView();
 
-		void setWidget(QWidget *w);
+		void setWidget(TQWidget *w);
 		void setSnapToGrid(bool enable, int gridSize=10);
 
 		void setResizingEnabled(bool enabled) { m_enableResizing = enabled; }
@@ -64,24 +65,24 @@ class KEXIEXTWIDGETS_EXPORT KexiScrollView : public QScrollView
 		void resizingEnded();
 
 	protected:
-		virtual void contentsMousePressEvent(QMouseEvent * ev);
-		virtual void contentsMouseReleaseEvent(QMouseEvent * ev);
-		virtual void contentsMouseMoveEvent(QMouseEvent * ev);
-		virtual void drawContents( QPainter * p, int clipx, int clipy, int clipw, int cliph );
-		virtual void leaveEvent( QEvent *e );
-		virtual void setHBarGeometry( QScrollBar & hbar, int x, int y, int w, int h );
-		void setupPixmapBuffer(QPixmap& pixmap, const QString& text, int lines);
+		virtual void contentsMousePressEvent(TQMouseEvent * ev);
+		virtual void contentsMouseReleaseEvent(TQMouseEvent * ev);
+		virtual void contentsMouseMoveEvent(TQMouseEvent * ev);
+		virtual void drawContents( TQPainter * p, int clipx, int clipy, int clipw, int cliph );
+		virtual void leaveEvent( TQEvent *e );
+		virtual void setHBarGeometry( TQScrollBar & hbar, int x, int y, int w, int h );
+		void setupPixmapBuffer(TQPixmap& pixmap, const TQString& text, int lines);
 
 		bool m_resizing;
 		bool m_enableResizing;
-		QWidget *m_widget;
+		TQWidget *m_widget;
 
 		int m_gridSize;
-		QFont m_helpFont;
-		QColor m_helpColor;
-		QTimer m_delayedResize;
+		TQFont m_helpFont;
+		TQColor m_helpColor;
+		TQTimer m_delayedResize;
 		//! for refreshContentsSizeLater()
-		QScrollView::ScrollBarMode m_vsmode, m_hsmode;
+		TQScrollView::ScrollBarMode m_vsmode, m_hsmode;
 		bool m_snapToGrid : 1;
 		bool m_preview : 1;
 		bool m_smodeSet : 1;