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

diff --git a/krita/plugins/tools/defaulttools/kis_tool_brush.cc b/krita/plugins/tools/defaulttools/kis_tool_brush.cc
index a65795d1..3a931bfb 100644
--- a/krita/plugins/tools/defaulttools/kis_tool_brush.cc
+++ b/krita/plugins/tools/defaulttools/kis_tool_brush.cc
@@ -17,15 +17,15 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-#include <qevent.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qwidget.h>
-#include <qtimer.h>
-#include <qpushbutton.h>
-#include <qpainter.h>
-#include <qrect.h>
-#include <qcheckbox.h>
+#include <tqevent.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqwidget.h>
+#include <tqtimer.h>
+#include <tqpushbutton.h>
+#include <tqpainter.h>
+#include <tqrect.h>
+#include <tqcheckbox.h>
 
 #include <kdebug.h>
 #include <kaction.h>
@@ -52,10 +52,10 @@ KisToolBrush::KisToolBrush()
     setName("tool_brush");
     setCursor(KisCursor::load("tool_freehand_cursor.png", 5, 5));
     m_rate = 100; // Conveniently hardcoded for now
-    m_timer = new QTimer(this);
+    m_timer = new TQTimer(this);
     Q_CHECK_PTR(m_timer);
 
-    connect(m_timer, SIGNAL(timeout()), this, SLOT(timeoutPaint()));
+    connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutPaint()));
 
 }
 
@@ -114,8 +114,8 @@ void KisToolBrush::setup(KActionCollection *collection)
 
     if (m_action == 0) {
         m_action = new KRadioAction(i18n("&Brush"),
-                                    "tool_freehand", Qt::Key_B, this,
-                                    SLOT(activate()), collection,
+                                    "tool_freehand", TQt::Key_B, this,
+                                    TQT_SLOT(activate()), collection,
                                     name());
         m_action->setToolTip(i18n("Draw freehand"));
         m_action->setExclusiveGroup("tools");
@@ -130,14 +130,14 @@ void KisToolBrush::move(KisMoveEvent *e) {
         paintOutline(e->pos());
 }
 
-void KisToolBrush::leave(QEvent */*e*/) {
+void KisToolBrush::leave(TQEvent */*e*/) {
     m_subject->canvasController()->kiscanvas()->update(); // remove the outline
 }
 
 
 void KisToolBrush::slotSetPaintingMode( int mode )
 {
-    if (mode == QButton::On) {
+    if (mode == TQButton::On) {
         // Direct painting
         m_paintIncremental = true;
     }
@@ -147,14 +147,14 @@ void KisToolBrush::slotSetPaintingMode( int mode )
 }
 
 
-QWidget* KisToolBrush::createOptionWidget(QWidget* parent)
+TQWidget* KisToolBrush::createOptionWidget(TQWidget* tqparent)
 {
-    QWidget *widget = super::createOptionWidget(parent);
-    m_chkDirect = new QCheckBox(i18n("Paint direct"), widget, "chkDirect");
+    TQWidget *widget = super::createOptionWidget(tqparent);
+    m_chkDirect = new TQCheckBox(i18n("Paint direct"), widget, "chkDirect");
     m_chkDirect->setChecked(true);
-    connect(m_chkDirect, SIGNAL(stateChanged(int)), this, SLOT(slotSetPaintingMode(int)));
+    connect(m_chkDirect, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotSetPaintingMode(int)));
     
-    m_optionLayout = new QGridLayout(widget, 3, 2, 0, 6);
+    m_optionLayout = new TQGridLayout(widget, 3, 2, 0, 6);
     Q_CHECK_PTR(m_optionLayout);
 
     super::addOptionWidgetLayout(m_optionLayout);