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, 12 insertions, 11 deletions

diff --git a/krita/ui/kis_previewwidget.h b/krita/ui/kis_previewwidget.h
index f3b38e98..e507ea60 100644
--- a/krita/ui/kis_previewwidget.h
+++ b/krita/ui/kis_previewwidget.h
@@ -23,18 +23,18 @@
 #ifndef __kis_previewwidget_h__
 #define __kis_previewwidget_h__
 
-#include <qimage.h>
-#include <qevent.h>
+#include <tqimage.h>
+#include <tqevent.h>
 
 #include "kis_types.h"
 
 #include "kis_previewwidgetbase.h"
 
-class QWidget;
+class TQWidget;
 class KisProfile;
 class KisFilter;
 class KisFilterConfiguration;
-class QTimer;
+class TQTimer;
 class KisLabelProgress;
 
 /**
@@ -48,16 +48,17 @@ class KisLabelProgress;
 class KisPreviewWidget : public PreviewWidgetBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     /** Constructs the widget */
-    KisPreviewWidget( QWidget* parent = 0, const char* name = 0 );
+    KisPreviewWidget( TQWidget* tqparent = 0, const char* name = 0 );
     virtual ~KisPreviewWidget();
 
     /** returns if the preview is automatically updated */
     bool getAutoUpdate() const;
 
-    void wheelEvent(QWheelEvent * e);
+    void wheelEvent(TQWheelEvent * e);
 
     /** Instructs the KisPreviewWidget to eventually update the preview. 
      * KisPreviewWidget delays the actual running of the filter for 500ms 
@@ -114,23 +115,23 @@ private:
     bool m_autoupdate; /// Flag indicating that the widget should auto update whenever a setting is changed
     bool m_previewIsDisplayed; /// Flag indicating whether the filtered or original image is displayed
 
-    QImage m_scaledOriginal; /// QImage copy of the original image
+    TQImage m_scaledOriginal; /// TQImage copy of the original image
     bool m_dirtyOriginal; /// flag indicating that the original image is dirty
     KisPaintDeviceSP m_origDevice; /// Pointer to the original image
     
-    QImage m_scaledPreview; /// QImage copy of the filtered image
+    TQImage m_scaledPreview; /// TQImage copy of the filtered image
     bool m_dirtyPreview; /// flag indicating that the preview image is dirty
     KisPaintDeviceSP m_previewDevice; /// Pointer to the preview image
     KisImageSP m_scaledImage; /// Scaled image copied from the original
 
     double m_filterZoom; /// Zoom amount when the filtering occurred
     double m_zoom; /// Current zoom amount
-    KisProfile * m_profile; /// the color profile to use when converting to QImage
+    KisProfile * m_profile; /// the color profile to use when converting to TQImage
 
     KisLabelProgress *m_progress; /// Progress bar of the preview.
 
-    QTimer * m_zoomTimer; /// Timer used to update the view whenever the zoom changes
-    QTimer * m_filterTimer; /// Timer used to update the view whenever the filter changes
+    TQTimer * m_zoomTimer; /// Timer used to update the view whenever the zoom changes
+    TQTimer * m_filterTimer; /// Timer used to update the view whenever the filter changes
     KisFilter * m_filter; /// Filter used
     KisFilterConfiguration * m_config; /// Configuration used
     bool m_firstFilter; /// Flag to determine if we should delay the first filter or not