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

diff --git a/krita/ui/kis_paintop_box.cc b/krita/ui/kis_paintop_box.cc
index 3479075d..b29077fd 100644
--- a/krita/ui/kis_paintop_box.cc
+++ b/krita/ui/kis_paintop_box.cc
@@ -17,12 +17,12 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-#include <qwidget.h>
-#include <qstring.h>
-#include <qvaluelist.h>
-#include <qpixmap.h>
-#include <qlayout.h>
-#include <qtooltip.h>
+#include <tqwidget.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
+#include <tqpixmap.h>
+#include <tqlayout.h>
+#include <tqtooltip.h>
 
 #include <klocale.h>
 #include <kactioncollection.h>
@@ -43,8 +43,8 @@
 
 #include "kis_paintop_box.h"
 
-KisPaintopBox::KisPaintopBox (KisView * view, QWidget *parent, const char * name)
-    : super (parent, name),
+KisPaintopBox::KisPaintopBox (KisView * view, TQWidget *tqparent, const char * name)
+    : super (tqparent, name),
       m_canvasController(view->getCanvasController())
 {
 #if KDE_VERSION >= KDE_MAKE_VERSION(3,3,90)
@@ -55,17 +55,17 @@ KisPaintopBox::KisPaintopBox (KisView * view, QWidget *parent, const char * name
 
     setCaption(i18n("Painter's Toolchest"));
     m_optionWidget = 0;
-    m_paintops = new QValueList<KisID>();
-    m_displayedOps = new QValueList<KisID>();
+    m_paintops = new TQValueList<KisID>();
+    m_displayedOps = new TQValueList<KisID>();
 
-    m_cmbPaintops = new QComboBox(this, "KisPaintopBox::m_cmbPaintops");
+    m_cmbPaintops = new TQComboBox(this, "KisPaintopBox::m_cmbPaintops");
     m_cmbPaintops->setMinimumWidth(150);
-    QToolTip::add(m_cmbPaintops, i18n("Styles of painting for the painting tools"));
-    m_layout = new QHBoxLayout(this, 1, 1);
+    TQToolTip::add(m_cmbPaintops, i18n("Styles of painting for the painting tools"));
+    m_layout = new TQHBoxLayout(this, 1, 1);
     m_layout->addWidget(m_cmbPaintops);
 
-    connect(this, SIGNAL(selected(const KisID &, const KisPaintOpSettings *)), view, SLOT(paintopActivated(const KisID &, const KisPaintOpSettings *)));
-    connect(m_cmbPaintops, SIGNAL(activated(int)), this, SLOT(slotItemSelected(int)));
+    connect(this, TQT_SIGNAL(selected(const KisID &, const KisPaintOpSettings *)), view, TQT_SLOT(paintopActivated(const KisID &, const KisPaintOpSettings *)));
+    connect(m_cmbPaintops, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotItemSelected(int)));
 
     // XXX: Let's see... Are all paintops loaded and ready?
     KisIDList keys = KisPaintOpRegistry::instance()->listKeys();
@@ -74,10 +74,10 @@ KisPaintopBox::KisPaintopBox (KisView * view, QWidget *parent, const char * name
         addItem(*it);
     }
 
-    connect(view, SIGNAL(currentColorSpaceChanged(KisColorSpace*)),
-            this, SLOT(colorSpaceChanged(KisColorSpace*)));
-    connect(view, SIGNAL(sigInputDeviceChanged(const KisInputDevice&)),
-            this, SLOT(slotInputDeviceChanged(const KisInputDevice&)));
+    connect(view, TQT_SIGNAL(currentColorSpaceChanged(KisColorSpace*)),
+            this, TQT_SLOT(colorSpaceChanged(KisColorSpace*)));
+    connect(view, TQT_SIGNAL(sigInputDeviceChanged(const KisInputDevice&)),
+            this, TQT_SLOT(slotInputDeviceChanged(const KisInputDevice&)));
 
     setCurrentPaintop(defaultPaintop(m_canvasController->currentInputDevice()));
 }
@@ -88,7 +88,7 @@ KisPaintopBox::~KisPaintopBox()
     delete m_displayedOps;
 }
 
-void KisPaintopBox::addItem(const KisID & paintop, const QString & /*category*/)
+void KisPaintopBox::addItem(const KisID & paintop, const TQString & /*category*/)
 {
     m_paintops->append(paintop);
 }
@@ -106,16 +106,16 @@ void KisPaintopBox::slotItemSelected(int index)
 
 void KisPaintopBox::colorSpaceChanged(KisColorSpace *cs)
 {
-    QValueList<KisID>::iterator it = m_paintops->begin();
-    QValueList<KisID>::iterator end = m_paintops->end();
+    TQValueList<KisID>::iterator it = m_paintops->begin();
+    TQValueList<KisID>::iterator end = m_paintops->end();
     m_displayedOps->clear();
     m_cmbPaintops->clear();
 
     for ( ; it != end; ++it ) {
         if (KisPaintOpRegistry::instance()->userVisible(*it, cs)) {
-            QPixmap pm = paintopPixmap(*it);
+            TQPixmap pm = paintopPixmap(*it);
             if (pm.isNull()) {
-                QPixmap p = QPixmap( 16, 16 );
+                TQPixmap p = TQPixmap( 16, 16 );
                 p.fill();
                 m_cmbPaintops->insertItem(p,  (*it).name());
             }
@@ -138,23 +138,23 @@ void KisPaintopBox::colorSpaceChanged(KisColorSpace *cs)
     slotItemSelected( index );
 }
 
-QPixmap KisPaintopBox::paintopPixmap(const KisID & paintop)
+TQPixmap KisPaintopBox::paintopPixmap(const KisID & paintop)
 {
-    QString pixmapName = KisPaintOpRegistry::instance()->pixmap(paintop);
+    TQString pixmapName = KisPaintOpRegistry::instance()->pixmap(paintop);
 
     if (pixmapName.isEmpty()) {
-        return QPixmap();
+        return TQPixmap();
     }
 
-    QString fname = KisFactory::instance()->dirs()->findResource("kis_images", pixmapName);
+    TQString fname = KisFactory::instance()->dirs()->findResource("kis_images", pixmapName);
 
-    return QPixmap(fname);
+    return TQPixmap(fname);
 }
 
 void KisPaintopBox::slotInputDeviceChanged(const KisInputDevice & inputDevice)
 {
     KisID paintop;
-    InputDevicePaintopMap::iterator it = m_currentID.find(inputDevice);
+    InputDevicePaintopMap::iterator it = m_currentID.tqfind(inputDevice);
 
     if (it == m_currentID.end()) {
         paintop = defaultPaintop(inputDevice);
@@ -180,7 +180,7 @@ void KisPaintopBox::updateOptionWidget()
     if (m_optionWidget != 0) {
         m_layout->remove(m_optionWidget);
         m_optionWidget->hide();
-        m_layout->invalidate();
+        m_layout->tqinvalidate();
     }
 
     const KisPaintOpSettings *settings = paintopSettings(currentPaintop(), m_canvasController->currentInputDevice());
@@ -220,13 +220,13 @@ KisID KisPaintopBox::defaultPaintop(const KisInputDevice& inputDevice)
 
 const KisPaintOpSettings *KisPaintopBox::paintopSettings(const KisID & paintop, const KisInputDevice & inputDevice)
 {
-    QValueVector<KisPaintOpSettings *> settingsArray;
-    InputDevicePaintopSettingsMap::iterator it = m_inputDevicePaintopSettings.find(inputDevice);
+    TQValueVector<KisPaintOpSettings *> settingsArray;
+    InputDevicePaintopSettingsMap::iterator it = m_inputDevicePaintopSettings.tqfind(inputDevice);
 
     if (it == m_inputDevicePaintopSettings.end()) {
         // Create settings for each paintop.
 
-        for (QValueList<KisID>::const_iterator pit = m_paintops->begin(); pit != m_paintops->end(); ++pit) {
+        for (TQValueList<KisID>::const_iterator pit = m_paintops->begin(); pit != m_paintops->end(); ++pit) {
             KisPaintOpSettings *settings = KisPaintOpRegistry::instance()->settings(*pit, this, inputDevice);
             settingsArray.append(settings);
             if (settings && settings->widget()) {