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

7 files changed, 65 insertions, 62 deletions

diff --git a/krita/plugins/viewplugins/histogram/dlg_histogram.cc b/krita/plugins/viewplugins/histogram/dlg_histogram.cc
index 0440c9db..fe27b257 100644
--- a/krita/plugins/viewplugins/histogram/dlg_histogram.cc
+++ b/krita/plugins/viewplugins/histogram/dlg_histogram.cc
@@ -17,14 +17,14 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-#include <qbuttongroup.h>
-#include <qpushbutton.h>
-#include <qcheckbox.h>
-#include <qslider.h>
-#include <qcombobox.h>
-#include <qpixmap.h>
-#include <qimage.h>
-#include <qlabel.h>
+#include <tqbuttongroup.h>
+#include <tqpushbutton.h>
+#include <tqcheckbox.h>
+#include <tqslider.h>
+#include <tqcombobox.h>
+#include <tqpixmap.h>
+#include <tqimage.h>
+#include <tqlabel.h>
 
 #include <knuminput.h>
 #include <klocale.h>
@@ -39,15 +39,15 @@
 #include "kis_histogram_widget.h"
 
 
-DlgHistogram::DlgHistogram( QWidget *  parent, const char * name)
-    : super (parent, name, true, i18n("Histogram"), Ok | Cancel, Ok)
+DlgHistogram::DlgHistogram( TQWidget *  tqparent, const char * name)
+    : super (tqparent, name, true, i18n("Histogram"), Ok | Cancel, Ok)
 {
     m_page = new KisHistogramWidget(this, "histogram");
     Q_CHECK_PTR(m_page);
 
     setCaption(i18n("Histogram"));
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 }
 
 DlgHistogram::~DlgHistogram()
diff --git a/krita/plugins/viewplugins/histogram/dlg_histogram.h b/krita/plugins/viewplugins/histogram/dlg_histogram.h
index 790e77ef..8e3fda00 100644
--- a/krita/plugins/viewplugins/histogram/dlg_histogram.h
+++ b/krita/plugins/viewplugins/histogram/dlg_histogram.h
@@ -35,10 +35,11 @@ class KisHistogramWidget;
 class DlgHistogram: public KDialogBase {
     typedef KDialogBase super;
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-    DlgHistogram(QWidget * parent = 0,
+    DlgHistogram(TQWidget * tqparent = 0,
              const char* name = 0);
     ~DlgHistogram();
 
diff --git a/krita/plugins/viewplugins/histogram/histogram.cc b/krita/plugins/viewplugins/histogram/histogram.cc
index 7db92dee..59ea0fff 100644
--- a/krita/plugins/viewplugins/histogram/histogram.cc
+++ b/krita/plugins/viewplugins/histogram/histogram.cc
@@ -23,8 +23,8 @@
 
 #include <stdlib.h>
 
-#include <qslider.h>
-#include <qpoint.h>
+#include <tqslider.h>
+#include <tqpoint.h>
 
 #include <klocale.h>
 #include <kiconloader.h>
@@ -52,27 +52,27 @@
 typedef KGenericFactory<Histogram> HistogramFactory;
 K_EXPORT_COMPONENT_FACTORY( kritahistogram, HistogramFactory( "krita" ) )
 
-Histogram::Histogram(QObject *parent, const char *name, const QStringList &)
-    : KParts::Plugin(parent, name)
+Histogram::Histogram(TQObject *tqparent, const char *name, const TQStringList &)
+    : KParts::Plugin(tqparent, name)
 {
 
-    if ( parent->inherits("KisView") ) {
+    if ( tqparent->inherits("KisView") ) {
 
         setInstance(HistogramFactory::instance());
         setXMLFile(locate("data","kritaplugins/histogram.rc"), true);
 
-        m_action = new KAction(i18n("&Histogram"), 0, 0, this, SLOT(slotActivated()), actionCollection(), "histogram");
+        m_action = new KAction(i18n("&Histogram"), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "histogram");
 
-        m_view = (KisView*) parent;
+        m_view = (KisView*) tqparent;
         if (KisImageSP img = m_view->canvasSubject()->currentImg()) {
-            connect(img, SIGNAL(sigLayersChanged(KisGroupLayerSP)), this, SLOT(slotLayersChanged()));
-            connect(img, SIGNAL(sigLayerAdded(KisLayerSP)), this, SLOT(slotLayersChanged()));
-            connect(img, SIGNAL(sigLayerActivated(KisLayerSP)), this, SLOT(slotLayersChanged()));
-            connect(img, SIGNAL(sigLayerPropertiesChanged(KisLayerSP)), this, SLOT(slotLayersChanged()));
-            connect(img, SIGNAL(sigLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)),
-                    this, SLOT(slotLayersChanged()));
-            connect(img, SIGNAL(sigLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)),
-                    this, SLOT(slotLayersChanged()));
+            connect(img, TQT_SIGNAL(sigLayersChanged(KisGroupLayerSP)), this, TQT_SLOT(slotLayersChanged()));
+            connect(img, TQT_SIGNAL(sigLayerAdded(KisLayerSP)), this, TQT_SLOT(slotLayersChanged()));
+            connect(img, TQT_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQT_SLOT(slotLayersChanged()));
+            connect(img, TQT_SIGNAL(sigLayerPropertiesChanged(KisLayerSP)), this, TQT_SLOT(slotLayersChanged()));
+            connect(img, TQT_SIGNAL(sigLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)),
+                    this, TQT_SLOT(slotLayersChanged()));
+            connect(img, TQT_SIGNAL(sigLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)),
+                    this, TQT_SLOT(slotLayersChanged()));
             m_img = img;
         }
     }
@@ -95,7 +95,7 @@ void Histogram::slotActivated()
     if (dev)
         dlgHistogram->setPaintDevice(dev);
 
-    if (dlgHistogram->exec() == QDialog::Accepted) {
+    if (dlgHistogram->exec() == TQDialog::Accepted) {
         // Do nothing; this is an informational dialog
     }
     delete dlgHistogram;
diff --git a/krita/plugins/viewplugins/histogram/histogram.h b/krita/plugins/viewplugins/histogram/histogram.h
index adaa6bfd..9cce8359 100644
--- a/krita/plugins/viewplugins/histogram/histogram.h
+++ b/krita/plugins/viewplugins/histogram/histogram.h
@@ -30,8 +30,9 @@ class KisImage;
 class Histogram : public KParts::Plugin
 {
         Q_OBJECT
+  TQ_OBJECT
     public:
-        Histogram(QObject *parent, const char *name, const QStringList &);
+        Histogram(TQObject *tqparent, const char *name, const TQStringList &);
         virtual ~Histogram();
     
     private slots:
diff --git a/krita/plugins/viewplugins/histogram/kis_histogram_widget.cc b/krita/plugins/viewplugins/histogram/kis_histogram_widget.cc
index 0e738435..12005e05 100644
--- a/krita/plugins/viewplugins/histogram/kis_histogram_widget.cc
+++ b/krita/plugins/viewplugins/histogram/kis_histogram_widget.cc
@@ -17,14 +17,14 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qlabel.h>
-#include <qcombobox.h>
-#include <qbuttongroup.h>
-#include <qpushbutton.h>
-#include <qscrollbar.h>
-#include <qtooltip.h>
+#include <tqpainter.h>
+#include <tqpixmap.h>
+#include <tqlabel.h>
+#include <tqcombobox.h>
+#include <tqbuttongroup.h>
+#include <tqpushbutton.h>
+#include <tqscrollbar.h>
+#include <tqtooltip.h>
 
 #include <kdebug.h>
 
@@ -39,8 +39,8 @@
 #include "kis_colorspace.h"
 
 
-KisHistogramWidget::KisHistogramWidget(QWidget *parent, const char *name)
-    : super(parent, name)
+KisHistogramWidget::KisHistogramWidget(TQWidget *tqparent, const char *name)
+    : super(tqparent, name)
 {
     m_from = 0.0;
     m_width = 0.0;
@@ -72,11 +72,11 @@ void KisHistogramWidget::setPaintDevice(KisPaintDeviceSP dev)
     m_from = m_histogramView->currentProducer()->viewFrom();
     m_width = m_histogramView->currentProducer()->viewWidth();
 
-    connect(grpType, SIGNAL(clicked(int)), this, SLOT(slotTypeSwitched(int)));
-    connect(cmbChannel, SIGNAL(activated(int)), this, SLOT(setActiveChannel(int)));
-    connect(zoomIn, SIGNAL(clicked()), this, SLOT(slotZoomIn()));
-    connect(zoomOut, SIGNAL(clicked()), this, SLOT(slotZoomOut()));
-    connect(currentView, SIGNAL(valueChanged(int)), this, SLOT(slide(int)));
+    connect(grpType, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotTypeSwitched(int)));
+    connect(cmbChannel, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setActiveChannel(int)));
+    connect(zoomIn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotZoomIn()));
+    connect(zoomOut, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotZoomOut()));
+    connect(currentView, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slide(int)));
 }
 
 void KisHistogramWidget::setActiveChannel(int channel)
diff --git a/krita/plugins/viewplugins/histogram/kis_histogram_widget.h b/krita/plugins/viewplugins/histogram/kis_histogram_widget.h
index 84b551d8..f83394e7 100644
--- a/krita/plugins/viewplugins/histogram/kis_histogram_widget.h
+++ b/krita/plugins/viewplugins/histogram/kis_histogram_widget.h
@@ -30,9 +30,10 @@ class KisColorSpace;
 class KisHistogramWidget : public WdgHistogram {
     typedef WdgHistogram super;
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KisHistogramWidget(QWidget *parent, const char *name);
+    KisHistogramWidget(TQWidget *tqparent, const char *name);
     virtual ~KisHistogramWidget();
 
     void setPaintDevice(KisPaintDeviceSP dev);
diff --git a/krita/plugins/viewplugins/histogram/wdghistogram.ui b/krita/plugins/viewplugins/histogram/wdghistogram.ui
index e538adae..77c418ed 100644
--- a/krita/plugins/viewplugins/histogram/wdghistogram.ui
+++ b/krita/plugins/viewplugins/histogram/wdghistogram.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>WdgHistogram</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>WdgHistogram</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>grpType</cstring>
             </property>
@@ -27,7 +27,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton" row="0" column="2">
+                <widget class="TQRadioButton" row="0" column="2">
                     <property name="name">
                         <cstring>radioLinear</cstring>
                     </property>
@@ -38,7 +38,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="1" column="2" rowspan="2" colspan="1">
+                <widget class="TQRadioButton" row="1" column="2" rowspan="2" colspan="1">
                     <property name="name">
                         <cstring>radioLog</cstring>
                     </property>
@@ -56,14 +56,14 @@
                     <property name="sizeType">
                         <enum>Preferred</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QComboBox" row="0" column="1" rowspan="2" colspan="1">
+                <widget class="TQComboBox" row="0" column="1" rowspan="2" colspan="1">
                     <property name="name">
                         <cstring>cmbChannel</cstring>
                     </property>
@@ -75,14 +75,14 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>200</width>
                             <height>0</height>
                         </size>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1">
+                <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1">
                     <property name="name">
                         <cstring>lblChannel</cstring>
                     </property>
@@ -103,7 +103,7 @@
                     <property name="sizeType">
                         <enum>Preferred</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>21</height>
@@ -124,22 +124,22 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>256</width>
                     <height>150</height>
                 </size>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -147,7 +147,7 @@
                         <string>View:</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>zoomIn</cstring>
                     </property>
@@ -163,7 +163,7 @@
                         <string>+</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>zoomOut</cstring>
                     </property>
@@ -179,7 +179,7 @@
                         <string>-</string>
                     </property>
                 </widget>
-                <widget class="QScrollBar">
+                <widget class="TQScrollBar">
                     <property name="name">
                         <cstring>currentView</cstring>
                     </property>
@@ -222,7 +222,7 @@
         <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data>
     </image>
 </images>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kis_histogram_view.h</includehint>
 </includehints>