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, 9 insertions, 7 deletions

diff --git a/krita/plugins/viewplugins/histogram_docker/histogramdocker.h b/krita/plugins/viewplugins/histogram_docker/histogramdocker.h
index 5cc57e18..bc023a89 100644
--- a/krita/plugins/viewplugins/histogram_docker/histogramdocker.h
+++ b/krita/plugins/viewplugins/histogram_docker/histogramdocker.h
@@ -21,8 +21,8 @@
 #ifndef _HISTOGRAMDOCKER_H_
 #define _HISTOGRAMDOCKER_H_
 
-#include <qobject.h>
-#include <qpopupmenu.h>
+#include <tqobject.h>
+#include <tqpopupmenu.h>
 
 #include <kparts/plugin.h>
 #include <kis_histogram_view.h>
@@ -39,12 +39,13 @@ class KisColorSpace;
 class KritaHistogramDocker : public KParts::Plugin
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    KritaHistogramDocker(QObject *parent, const char *name, const QStringList &);
+    KritaHistogramDocker(TQObject *tqparent, const char *name, const TQStringList &);
     virtual ~KritaHistogramDocker();
 private slots:
     void producerChanged(int pos);
-    void popupMenu(const QPoint & pos);
+    void popupMenu(const TQPoint & pos);
     void colorSpaceChanged(KisColorSpace* cs);
 private:
     KisHistogramProducerFactory* m_factory;
@@ -54,17 +55,18 @@ private:
     KisView* m_view;
     KisHistogramView* m_hview;
     KisImageRasteredCache* m_cache;
-    QPopupMenu m_popup;
+    TQPopupMenu m_popup;
     KisHistogramSP m_histogram;
     uint m_currentProducerPos;
 };
 
 class KisGenericRGBHistogramProducerFactory;
 
-class HistogramDockerUpdater : public QObject {
+class HistogramDockerUpdater : public TQObject {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    HistogramDockerUpdater(QObject* parent, KisHistogramSP h, KisHistogramView* v,
+    HistogramDockerUpdater(TQObject* tqparent, KisHistogramSP h, KisHistogramView* v,
                            KisAccumulatingHistogramProducer* p);
 public slots:
     void updated();