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

diff --git a/krita/ui/kis_tool_shape.cc b/krita/ui/kis_tool_shape.cc
index 06c854a7..db510b8f 100644
--- a/krita/ui/kis_tool_shape.cc
+++ b/krita/ui/kis_tool_shape.cc
@@ -16,20 +16,20 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <qwidget.h>
-#include <qlayout.h>
-#include <qcombobox.h>
-#include <qlabel.h>
+#include <tqwidget.h>
+#include <tqlayout.h>
+#include <tqcombobox.h>
+#include <tqlabel.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 
 #include "kis_tool_shape.h"
-#include "wdgshapeoptions.h"
+#include "wdgtqshapeoptions.h"
 
-KisToolShape::KisToolShape(const QString& UIName) : super(UIName)
+KisToolShape::KisToolShape(const TQString& UIName) : super(UIName)
 {
-    m_shapeOptionsWidget = 0;
+    m_tqshapeOptionsWidget = 0;
     m_optionLayout = 0;
 }
 
@@ -37,31 +37,31 @@ KisToolShape::~KisToolShape()
 {
 }
 
-QWidget* KisToolShape::createOptionWidget(QWidget* parent)
+TQWidget* KisToolShape::createOptionWidget(TQWidget* tqparent)
 {
-    QWidget *widget = super::createOptionWidget(parent);
+    TQWidget *widget = super::createOptionWidget(tqparent);
 
-    m_shapeOptionsWidget = new WdgGeometryOptions(0);
-    Q_CHECK_PTR(m_shapeOptionsWidget);
+    m_tqshapeOptionsWidget = new WdgGeometryOptions(0);
+    Q_CHECK_PTR(m_tqshapeOptionsWidget);
 
-    m_optionLayout = new QGridLayout(widget, 2, 1);
+    m_optionLayout = new TQGridLayout(widget, 2, 1);
    // super::addOptionWidgetLayout(m_optionLayout);
 
-    m_shapeOptionsWidget->cmbFill->reparent(widget, QPoint(0,0), true);
-    m_shapeOptionsWidget->textLabel3->reparent(widget, QPoint(0,0), true);
-    addOptionWidgetOption(m_shapeOptionsWidget->cmbFill, m_shapeOptionsWidget->textLabel3);
+    m_tqshapeOptionsWidget->cmbFill->reparent(widget, TQPoint(0,0), true);
+    m_tqshapeOptionsWidget->textLabel3->reparent(widget, TQPoint(0,0), true);
+    addOptionWidgetOption(m_tqshapeOptionsWidget->cmbFill, m_tqshapeOptionsWidget->textLabel3);
 
     return widget;
 }
 
 KisPainter::FillStyle KisToolShape::fillStyle(void)
 {
-    if (m_shapeOptionsWidget) {
-        return static_cast<KisPainter::FillStyle>(m_shapeOptionsWidget->cmbFill->currentItem());
+    if (m_tqshapeOptionsWidget) {
+        return static_cast<KisPainter::FillStyle>(m_tqshapeOptionsWidget->cmbFill->currentItem());
     } else {
         return KisPainter::FillStyleNone;
     }
 }
 
-#include "kis_tool_shape.moc"
+#include "kis_tool_tqshape.moc"