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

diff --git a/krita/ui/kis_grid_manager.cpp b/krita/ui/kis_grid_manager.cpp
index 0bbbcd88..b659a3b5 100644
--- a/krita/ui/kis_grid_manager.cpp
+++ b/krita/ui/kis_grid_manager.cpp
@@ -25,10 +25,10 @@
 #endif
 
 #ifdef HAVE_GL
-#include <qgl.h>
+#include <tqgl.h>
 #endif
 
-#include <qradiobutton.h>
+#include <tqradiobutton.h>
 
 #include <kaction.h>
 #include <kdialogbase.h>
@@ -40,8 +40,8 @@
 #include "kis_image.h"
 #include "kis_view.h"
 
-KisGridManager::KisGridManager(KisView * parent)
-    : QObject(parent), m_view(parent)
+KisGridManager::KisGridManager(KisView * tqparent)
+    : TQObject(tqparent), m_view(tqparent)
 {
 
 }
@@ -53,17 +53,17 @@ KisGridManager::~KisGridManager()
 
 void KisGridManager::setup(KActionCollection * collection)
 {
-    m_toggleGrid = new KToggleAction(i18n("Show Grid"), "", this, SLOT(toggleGrid()), collection, "view_toggle_grid");
+    m_toggleGrid = new KToggleAction(i18n("Show Grid"), "", this, TQT_SLOT(toggleGrid()), collection, "view_toggle_grid");
     m_toggleGrid->setCheckedState(KGuiItem(i18n("Hide Grid")));
     m_toggleGrid->setChecked(false);
 
     // Fast grid config
-    m_gridFastConfig1x1 = new KAction(i18n("1x1"), 0, "", this, SLOT(fastConfig1x1()), collection, "view_fast_grid_1x1");
-    m_gridFastConfig2x2 = new KAction(i18n("2x2"), 0, "", this, SLOT(fastConfig2x2()), collection, "view_fast_grid_2x2");
-    m_gridFastConfig5x5 = new KAction(i18n("5x5"), 0, "", this, SLOT(fastConfig5x5()), collection, "view_fast_grid_5x5");
-    m_gridFastConfig10x10 = new KAction(i18n("10x10"), 0, "", this, SLOT(fastConfig10x10()), collection, "view_fast_grid_10x10");
-    m_gridFastConfig20x20 = new KAction(i18n("20x20"), 0, "", this, SLOT(fastConfig20x20()), collection, "view_fast_grid_20x20");
-    m_gridFastConfig40x40 = new KAction(i18n("40x40"), 0, "", this, SLOT(fastConfig40x40()), collection, "view_fast_grid_40x40");
+    m_gridFastConfig1x1 = new KAction(i18n("1x1"), 0, "", this, TQT_SLOT(fastConfig1x1()), collection, "view_fast_grid_1x1");
+    m_gridFastConfig2x2 = new KAction(i18n("2x2"), 0, "", this, TQT_SLOT(fastConfig2x2()), collection, "view_fast_grid_2x2");
+    m_gridFastConfig5x5 = new KAction(i18n("5x5"), 0, "", this, TQT_SLOT(fastConfig5x5()), collection, "view_fast_grid_5x5");
+    m_gridFastConfig10x10 = new KAction(i18n("10x10"), 0, "", this, TQT_SLOT(fastConfig10x10()), collection, "view_fast_grid_10x10");
+    m_gridFastConfig20x20 = new KAction(i18n("20x20"), 0, "", this, TQT_SLOT(fastConfig20x20()), collection, "view_fast_grid_20x20");
+    m_gridFastConfig40x40 = new KAction(i18n("40x40"), 0, "", this, TQT_SLOT(fastConfig40x40()), collection, "view_fast_grid_40x40");
 }
 
 void KisGridManager::updateGUI()
@@ -124,7 +124,7 @@ void KisGridManager::fastConfig40x40()
     m_view->updateCanvas();
 }
 
-void KisGridManager::drawGrid(QRect wr, QPainter *p, bool openGL)
+void KisGridManager::drawGrid(TQRect wr, TQPainter *p, bool openGL)
 {
     KisImageSP image = m_view->canvasSubject()->currentImg();
 
@@ -139,7 +139,7 @@ void KisGridManager::drawGrid(QRect wr, QPainter *p, bool openGL)
                 Q_ASSERT(p);
 
                 if (p) {
-                    gridDrawer = new QPainterGridDrawer(p);
+                    gridDrawer = new TQPainterGridDrawer(p);
                 }
             }