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, 17 insertions, 16 deletions

diff --git a/krita/ui/kis_histogram_view.h b/krita/ui/kis_histogram_view.h
index b44ee79d..6b4524a8 100644
--- a/krita/ui/kis_histogram_view.h
+++ b/krita/ui/kis_histogram_view.h
@@ -19,10 +19,10 @@
 #ifndef _KIS_HISTOGRAM_VIEW_
 #define _KIS_HISTOGRAM_VIEW_
 
-#include <qlabel.h>
-#include <qpixmap.h>
-#include <qvaluevector.h>
-#include <qstringlist.h>
+#include <tqlabel.h>
+#include <tqpixmap.h>
+#include <tqvaluevector.h>
+#include <tqstringlist.h>
 
 #include "kis_types.h"
 #include "kis_histogram_producer.h"
@@ -45,23 +45,24 @@ class KisChannelInfo;
  * some functionality will disappear, like listProducers(). Setting a histogram will discard
  * info on the layer, and setting a layer will discard info on the histogram.
  **/
-class KisHistogramView : public QLabel {
+class KisHistogramView : public TQLabel {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KisHistogramView(QWidget *parent = 0, const char *name = 0, WFlags f = 0);
+    KisHistogramView(TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0);
     virtual ~KisHistogramView();
 
     void setPaintDevice(KisPaintDeviceSP dev);
     void setHistogram(KisHistogramSP histogram);
     void setView(double from, double size);
     KisHistogramProducerSP currentProducer();
-    QStringList channelStrings();
+    TQStringList channelStrings();
     /** Lists all producers currently available */
     KisIDList listProducers();
     /** Sets the currently displayed channels to channels of the producer with producerID as ID*/
-    void setCurrentChannels(const KisID& producerID, QValueVector<KisChannelInfo *> channels);
+    void setCurrentChannels(const KisID& producerID, TQValueVector<KisChannelInfo *> channels);
     /** Be careful, producer will be modified */
-    void setCurrentChannels(KisHistogramProducerSP producer, QValueVector<KisChannelInfo *> channels);
+    void setCurrentChannels(KisHistogramProducerSP producer, TQValueVector<KisChannelInfo *> channels);
     bool hasColor();
     void setColor(bool set);
 
@@ -71,10 +72,10 @@ public slots:
     void updateHistogram();
 
 signals:
-    void rightClicked(const QPoint& pos);
+    void rightClicked(const TQPoint& pos);
 
 protected:
-    virtual void mousePressEvent(QMouseEvent * e);
+    virtual void mousePressEvent(TQMouseEvent * e);
 
 private:
     void setChannels();
@@ -86,15 +87,15 @@ private:
         KisChannelInfo * channel;
     } ComboboxInfo;
 
-    QValueVector<ComboboxInfo> m_comboInfo;
-    QPixmap m_pix;
+    TQValueVector<ComboboxInfo> m_comboInfo;
+    TQPixmap m_pix;
     KisHistogramSP m_histogram;
     KisColorSpace* m_cs;
     KisHistogramProducerSP m_currentProducer;
-    QValueVector<KisChannelInfo *> m_channels;
+    TQValueVector<KisChannelInfo *> m_channels;
     // Maps the channels in m_channels to a real channel offset in the producer->channels()
-    QValueVector<Q_INT32> m_channelToOffset;
-    QStringList m_channelStrings;
+    TQValueVector<TQ_INT32> m_channelToOffset;
+    TQStringList m_channelStrings;
     bool m_color;
     double m_from;
     double m_width;