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

6 files changed, 47 insertions, 45 deletions

diff --git a/krita/plugins/viewplugins/substrate/dlg_substrate.cc b/krita/plugins/viewplugins/substrate/dlg_substrate.cc
index d1bbe38f..51de887d 100644
--- a/krita/plugins/viewplugins/substrate/dlg_substrate.cc
+++ b/krita/plugins/viewplugins/substrate/dlg_substrate.cc
@@ -24,19 +24,19 @@
 #include "wdgsubstrate.h"
 
 
-DlgSubstrate::DlgSubstrate( QWidget *  parent,
+DlgSubstrate::DlgSubstrate( TQWidget *  tqparent,
                     const char * name)
-    : super (parent, name, true, i18n("Color Range"), Ok | Cancel, Ok)
+    : super (tqparent, name, true, i18n("Color Range"), Ok | Cancel, Ok)
 {
-    m_previewPix = QPixmap();
+    m_previewPix = TQPixmap();
     m_page = new WdgSubstrate(this, "substrate");
     Q_CHECK_PTR(m_page);
     setCaption(i18n("Substrate"));
     setMainWidget(m_page);
     resize(m_page -> size());
 
-    connect(this, SIGNAL(okClicked()),
-        this, SLOT(okClicked()));
+    connect(this, TQT_SIGNAL(okClicked()),
+        this, TQT_SLOT(okClicked()));
 }
 
 DlgSubstrate::~DlgSubstrate()
@@ -44,7 +44,7 @@ DlgSubstrate::~DlgSubstrate()
     delete m_page;
 }
 
-void DlgSubstrate::setPixmap(QPixmap pix)
+void DlgSubstrate::setPixmap(TQPixmap pix)
 {
     m_previewPix = pix;
     m_previewPix.detach();
diff --git a/krita/plugins/viewplugins/substrate/dlg_substrate.h b/krita/plugins/viewplugins/substrate/dlg_substrate.h
index 0a566b11..869eaafa 100644
--- a/krita/plugins/viewplugins/substrate/dlg_substrate.h
+++ b/krita/plugins/viewplugins/substrate/dlg_substrate.h
@@ -20,7 +20,7 @@
 #ifndef DLG_SUBSTRATE
 #define DLG_SUBSTRATE
 
-#include <qpixmap.h>
+#include <tqpixmap.h>
 
 #include <kdialogbase.h>
 
@@ -36,17 +36,18 @@ class DlgSubstrate: public KDialogBase {
 
     typedef KDialogBase super;
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-    DlgSubstrate(QWidget * parent = 0,
+    DlgSubstrate(TQWidget * tqparent = 0,
               const char* name = 0);
     ~DlgSubstrate();
 
     /**
      * Set the initial preview pixmap
      */
-    void setPixmap(QPixmap pix);
+    void setPixmap(TQPixmap pix);
 
 private slots:
 
@@ -55,7 +56,7 @@ private slots:
 private:
 
     WdgSubstrate * m_page;
-    QPixmap m_previewPix;
+    TQPixmap m_previewPix;
 };
 
 #endif // DLG_SUBSTRATE
diff --git a/krita/plugins/viewplugins/substrate/kis_repeating_substrate.h b/krita/plugins/viewplugins/substrate/kis_repeating_substrate.h
index 9dc512d1..1a229dc1 100644
--- a/krita/plugins/viewplugins/substrate/kis_repeating_substrate.h
+++ b/krita/plugins/viewplugins/substrate/kis_repeating_substrate.h
@@ -18,7 +18,7 @@
 #ifndef KIS_SUBSTRATE_H
 #define KIS_SUBSTRATE_H
 
-#include <qrect.h>
+#include <tqrect.h>
 #include <ksharedptr.h>
 
 class KisImage;
@@ -55,7 +55,7 @@ public:
      * Copy the pixel values in the specified rect into an array of Substrate.
      * Make sure the array is big enough!
      */ 
-    virtual void getPixels(KisSubstratePixel * /*substrate*/, const QRect & /*rc*/) = 0;
+    virtual void getPixels(KisSubstratePixel * /*substrate*/, const TQRect & /*rc*/) = 0;
 
     /**
      * Return a pointer to the substrate at the specified position. Note that
diff --git a/krita/plugins/viewplugins/substrate/substrate.cc b/krita/plugins/viewplugins/substrate/substrate.cc
index aac9ef94..996516e1 100644
--- a/krita/plugins/viewplugins/substrate/substrate.cc
+++ b/krita/plugins/viewplugins/substrate/substrate.cc
@@ -19,8 +19,8 @@
 
 #include <stdlib.h>
 
-#include <qslider.h>
-#include <qpoint.h>
+#include <tqslider.h>
+#include <tqpoint.h>
 
 #include <klocale.h>
 #include <kiconloader.h>
@@ -44,18 +44,18 @@
 typedef KGenericFactory<SubstratePlugin> SubstrateFactory;
 K_EXPORT_COMPONENT_FACTORY( kritasubstrate, SubstrateFactory( "krita" ) )
 
-SubstratePlugin::SubstratePlugin(QObject *parent, const char *name, const QStringList &)
-    : KParts::Plugin(parent, name)
+SubstratePlugin::SubstratePlugin(TQObject *tqparent, const char *name, const TQStringList &)
+    : KParts::Plugin(tqparent, name)
 {
 
-    if ( parent->inherits("KisView") )
+    if ( tqparent->inherits("KisView") )
     {
         setInstance(SubstrateFactory::instance());
         setXMLFile(locate("data","kritaplugins/substrate.rc"), true);
 
-        (void) new KAction(i18n("&Substrate..."), 0, 0, this, SLOT(slotSubstrateActivated()), actionCollection(), "substrate");
+        (void) new KAction(i18n("&Substrate..."), 0, 0, this, TQT_SLOT(slotSubstrateActivated()), actionCollection(), "substrate");
 
-         m_view = (KisView*) parent;
+         m_view = (KisView*) tqparent;
     }
 }
 
@@ -67,7 +67,7 @@ void SubstratePlugin::slotSubstrateActivated()
 {
     DlgSubstrate * dlgSubstrate = new DlgSubstrate(m_view, "Substrate");
     Q_CHECK_PTR(dlgSubstrate);
-    if (dlgSubstrate -> exec() == QDialog::Accepted) {
+    if (dlgSubstrate -> exec() == TQDialog::Accepted) {
         // Retrieve changes made by dialog
         // Apply changes to layer (selection)
     }
diff --git a/krita/plugins/viewplugins/substrate/substrate.h b/krita/plugins/viewplugins/substrate/substrate.h
index ebb9e48e..2d00e234 100644
--- a/krita/plugins/viewplugins/substrate/substrate.h
+++ b/krita/plugins/viewplugins/substrate/substrate.h
@@ -28,8 +28,9 @@ class KisView;
 class SubstratePlugin : public KParts::Plugin
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    SubstratePlugin(QObject *parent, const char *name, const QStringList &);
+    SubstratePlugin(TQObject *tqparent, const char *name, const TQStringList &);
     virtual ~SubstratePlugin();
     
 private slots:
diff --git a/krita/plugins/viewplugins/substrate/wdgsubstrate.ui b/krita/plugins/viewplugins/substrate/wdgsubstrate.ui
index 846b43a7..be0713ed 100644
--- a/krita/plugins/viewplugins/substrate/wdgsubstrate.ui
+++ b/krita/plugins/viewplugins/substrate/wdgsubstrate.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>WdgSubstrate</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QButtonGroup" row="0" column="0">
+        <widget class="TQButtonGroup" row="0" column="0">
             <property name="name">
                 <cstring>grpCustom</cstring>
             </property>
@@ -27,15 +27,15 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QComboBox" row="0" column="1" rowspan="1" colspan="2">
+                        <widget class="TQComboBox" row="0" column="1" rowspan="1" colspan="2">
                             <item>
                                 <property name="text">
                                     <string>Custom</string>
@@ -53,7 +53,7 @@
                                 <string></string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>textLabel1</cstring>
                             </property>
@@ -61,7 +61,7 @@
                                 <string>Save custom substrate as:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>lblPredefined</cstring>
                             </property>
@@ -72,7 +72,7 @@
                                 <cstring>cmbPredefinedCanvases</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2">
+                        <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2">
                             <property name="name">
                                 <cstring>lblColor</cstring>
                             </property>
@@ -83,22 +83,22 @@
                                 <cstring>bnBackground</cstring>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="2">
+                        <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="2">
                             <property name="name">
                                 <cstring>lineEdit1</cstring>
                             </property>
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QSlider" row="3" column="1">
+                        <widget class="TQSlider" row="3" column="1">
                             <property name="name">
                                 <cstring>slAbsorbency</cstring>
                             </property>
@@ -106,7 +106,7 @@
                                 <enum>Horizontal</enum>
                             </property>
                         </widget>
-                        <widget class="QSlider" row="2" column="1">
+                        <widget class="TQSlider" row="2" column="1">
                             <property name="name">
                                 <cstring>slFiber</cstring>
                             </property>
@@ -114,7 +114,7 @@
                                 <enum>Horizontal</enum>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="2">
+                        <widget class="TQLabel" row="1" column="2">
                             <property name="name">
                                 <cstring>textLabel9</cstring>
                             </property>
@@ -122,7 +122,7 @@
                                 <string>Grainy</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>lblSmoothness</cstring>
                             </property>
@@ -133,7 +133,7 @@
                                 <cstring>slSlippery</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="3" column="0">
+                        <widget class="TQLabel" row="3" column="0">
                             <property name="name">
                                 <cstring>lblAbsorbency</cstring>
                             </property>
@@ -144,7 +144,7 @@
                                 <cstring>slAbsorbency</cstring>
                             </property>
                         </widget>
-                        <widget class="QSlider" row="0" column="1">
+                        <widget class="TQSlider" row="0" column="1">
                             <property name="name">
                                 <cstring>slSlippery</cstring>
                             </property>
@@ -152,7 +152,7 @@
                                 <enum>Horizontal</enum>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>lblHeight</cstring>
                             </property>
@@ -163,7 +163,7 @@
                                 <cstring>slHeight</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="TQLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>lblFiber</cstring>
                             </property>
@@ -174,7 +174,7 @@
                                 <cstring>slFiber</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="2">
+                        <widget class="TQLabel" row="0" column="2">
                             <property name="name">
                                 <cstring>lblRough</cstring>
                             </property>
@@ -182,7 +182,7 @@
                                 <string>Rough</string>
                             </property>
                         </widget>
-                        <widget class="QSlider" row="1" column="1">
+                        <widget class="TQSlider" row="1" column="1">
                             <property name="name">
                                 <cstring>slHeight</cstring>
                             </property>
@@ -190,7 +190,7 @@
                                 <enum>Horizontal</enum>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="3" column="2">
+                        <widget class="TQLabel" row="3" column="2">
                             <property name="name">
                                 <cstring>textLabel11</cstring>
                             </property>
@@ -198,7 +198,7 @@
                                 <string>Absorbent</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="2">
+                        <widget class="TQLabel" row="2" column="2">
                             <property name="name">
                                 <cstring>textLabel10</cstring>
                             </property>
@@ -214,7 +214,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
 </includehints>