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

diff --git a/krita/ui/kis_tool_paint.cc b/krita/ui/kis_tool_paint.cc
index 25129a82..d8d19f36 100644
--- a/krita/ui/kis_tool_paint.cc
+++ b/krita/ui/kis_tool_paint.cc
@@ -16,13 +16,13 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <qwidget.h>
-#include <qrect.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qwhatsthis.h>
-#include <qcheckbox.h>
+#include <tqwidget.h>
+#include <tqrect.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
+#include <tqwhatsthis.h>
+#include <tqcheckbox.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -42,7 +42,7 @@
 #include "kis_tool_controller.h"
 #include "kis_tool_paint.h"
 
-KisToolPaint::KisToolPaint(const QString& UIName)
+KisToolPaint::KisToolPaint(const TQString& UIName)
     : super(UIName)
 {
     m_subject = 0;
@@ -75,7 +75,7 @@ void KisToolPaint::paint(KisCanvasPainter&)
 {
 }
 
-void KisToolPaint::paint(KisCanvasPainter&, const QRect&)
+void KisToolPaint::paint(KisCanvasPainter&, const TQRect&)
 {
 }
 
@@ -107,34 +107,34 @@ void KisToolPaint::doubleClick(KisDoubleClickEvent *)
 {
 }
 
-void KisToolPaint::keyPress(QKeyEvent *)
+void KisToolPaint::keyPress(TQKeyEvent *)
 {
 }
 
-void KisToolPaint::keyRelease(QKeyEvent *)
+void KisToolPaint::keyRelease(TQKeyEvent *)
 {
 }
 
-QWidget* KisToolPaint::createOptionWidget(QWidget* parent)
+TQWidget* KisToolPaint::createOptionWidget(TQWidget* tqparent)
 {
-    m_optionWidget = new QWidget(parent);
+    m_optionWidget = new TQWidget(tqparent);
     m_optionWidget->setCaption(m_UIName);
 
-    m_lbOpacity = new QLabel(i18n("Opacity:"), m_optionWidget);
+    m_lbOpacity = new TQLabel(i18n("Opacity:"), m_optionWidget);
     m_slOpacity = new KisIntSpinbox( m_optionWidget, "int_m_optionwidget");
     m_slOpacity->setRange( 0, 100);
     m_slOpacity->setValue(m_opacity / OPACITY_OPAQUE * 100);
-    connect(m_slOpacity, SIGNAL(valueChanged(int)), this, SLOT(slotSetOpacity(int)));
+    connect(m_slOpacity, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetOpacity(int)));
 
-    m_lbComposite = new QLabel(i18n("Mode:"), m_optionWidget);
+    m_lbComposite = new TQLabel(i18n("Mode:"), m_optionWidget);
     m_cmbComposite = new KisCmbComposite(m_optionWidget);
-    connect(m_cmbComposite, SIGNAL(activated(const KisCompositeOp&)), this, SLOT(slotSetCompositeMode(const KisCompositeOp&)));
+    connect(m_cmbComposite, TQT_SIGNAL(activated(const KisCompositeOp&)), this, TQT_SLOT(slotSetCompositeMode(const KisCompositeOp&)));
 
-    QVBoxLayout* verticalLayout = new QVBoxLayout(m_optionWidget);
+    TQVBoxLayout* verticalLayout = new TQVBoxLayout(m_optionWidget);
     verticalLayout->setMargin(0);
     verticalLayout->setSpacing(3);
     
-    m_optionWidgetLayout = new QGridLayout(verticalLayout, 2, 3, 6);
+    m_optionWidgetLayout = new TQGridLayout(verticalLayout, 2, 3, 6);
 
     m_optionWidgetLayout->addWidget(m_lbOpacity, 0, 0);
     m_optionWidgetLayout->addWidget(m_slOpacity, 0, 1);
@@ -142,34 +142,34 @@ QWidget* KisToolPaint::createOptionWidget(QWidget* parent)
     m_optionWidgetLayout->addWidget(m_lbComposite, 1, 0);
     m_optionWidgetLayout->addWidget(m_cmbComposite, 1, 1);
 
-    verticalLayout->addItem(new QSpacerItem(0,0,QSizePolicy::Fixed,QSizePolicy::Expanding));
+    verticalLayout->addItem(new TQSpacerItem(0,0,TQSizePolicy::Fixed,TQSizePolicy::Expanding));
 
     if (!quickHelp().isEmpty()) {
-        QPushButton* push = new QPushButton(SmallIconSet( "help" ), "", m_optionWidget);
-        connect(push, SIGNAL(clicked()), this, SLOT(slotPopupQuickHelp()));
+        TQPushButton* push = new TQPushButton(SmallIconSet( "help" ), "", m_optionWidget);
+        connect(push, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPopupQuickHelp()));
 
-        QHBoxLayout* hLayout = new QHBoxLayout(m_optionWidget);
+        TQHBoxLayout* hLayout = new TQHBoxLayout(m_optionWidget);
         hLayout->addWidget(push);
-        hLayout->addItem(new QSpacerItem(0,0,QSizePolicy::Expanding,QSizePolicy::Fixed));
+        hLayout->addItem(new TQSpacerItem(0,0,TQSizePolicy::Expanding,TQSizePolicy::Fixed));
         verticalLayout->addLayout(hLayout);
     }
     return m_optionWidget;
 }
 
-QWidget* KisToolPaint::optionWidget()
+TQWidget* KisToolPaint::optionWidget()
 {
     return m_optionWidget;
 }
 
-void KisToolPaint::addOptionWidgetLayout(QLayout *layout)
+void KisToolPaint::addOptionWidgetLayout(TQLayout *tqlayout)
 {
     Q_ASSERT(m_optionWidget != 0);
     Q_ASSERT(m_optionWidgetLayout != 0);
     int rowCount = m_optionWidgetLayout->numRows();
-    m_optionWidgetLayout->addMultiCellLayout(layout, rowCount, rowCount, 0, 1);
+    m_optionWidgetLayout->addMultiCellLayout(tqlayout, rowCount, rowCount, 0, 1);
 }
 
-void KisToolPaint::addOptionWidgetOption(QWidget *control, QWidget *label)
+void KisToolPaint::addOptionWidgetOption(TQWidget *control, TQWidget *label)
 {
     Q_ASSERT(m_optionWidget != 0);
     Q_ASSERT(m_optionWidgetLayout != 0);
@@ -192,12 +192,12 @@ void KisToolPaint::slotSetCompositeMode(const KisCompositeOp& compositeOp)
     m_compositeOp = compositeOp;
 }
 
-QCursor KisToolPaint::cursor()
+TQCursor KisToolPaint::cursor()
 {
     return m_cursor;
 }
 
-void KisToolPaint::setCursor(const QCursor& cursor)
+void KisToolPaint::setCursor(const TQCursor& cursor)
 {
     m_cursor = cursor;
 
@@ -244,7 +244,7 @@ void KisToolPaint::updateCompositeOpComboBox()
                 KisCompositeOpList compositeOps = device->colorSpace()->userVisiblecompositeOps();
                 m_cmbComposite->setCompositeOpList(compositeOps);
 
-                if (compositeOps.find(m_compositeOp) == compositeOps.end()) {
+                if (compositeOps.tqfind(m_compositeOp) == compositeOps.end()) {
                     m_compositeOp = COMPOSITE_OVER;
                 }
                 m_cmbComposite->setCurrentItem(m_compositeOp);
@@ -254,7 +254,7 @@ void KisToolPaint::updateCompositeOpComboBox()
 }
 
 void KisToolPaint::slotPopupQuickHelp() {
-    QWhatsThis::display(quickHelp());
+    TQWhatsThis::display(quickHelp());
 }
 
 #include "kis_tool_paint.moc"