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

diff --git a/karbon/tools/vellipsetool.cc b/karbon/tools/vellipsetool.cc
index 87528f4a..ff68c350 100644
--- a/karbon/tools/vellipsetool.cc
+++ b/karbon/tools/vellipsetool.cc
@@ -18,8 +18,8 @@
 */
 
 
-#include <qgroupbox.h>
-#include <qlabel.h>
+#include <tqgroupbox.h>
+#include <tqlabel.h>
 
 #include <klocale.h>
 #include "KoUnitWidgets.h"
@@ -29,35 +29,35 @@
 
 #include <karbon_view.h>
 #include <karbon_part.h>
-#include <shapes/vellipse.h>
+#include <tqshapes/vellipse.h>
 #include "vellipsetool.h"
 #include "vglobal.h"
 
 
-VEllipseOptionsWidget::VEllipseOptionsWidget( KarbonPart *part, QWidget *parent, const char *name )
-	: KDialogBase( parent, name, true, i18n( "Insert Ellipse" ), Ok | Cancel ), m_part( part )
+VEllipseOptionsWidget::VEllipseOptionsWidget( KarbonPart *part, TQWidget *tqparent, const char *name )
+	: KDialogBase( tqparent, name, true, i18n( "Insert Ellipse" ), Ok | Cancel ), m_part( part )
 {
-	QGroupBox *group = new QGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
-	new QLabel( i18n( "Type:" ), group );
+	TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
+	new TQLabel( i18n( "Type:" ), group );
 	m_type = new KComboBox( false, group );
 	m_type->insertItem( i18n( "Full" ), VEllipse::full );
 	m_type->insertItem( i18n( "Section" ), VEllipse::section );
 	m_type->insertItem( i18n( "Pie" ), VEllipse::cut );
 	m_type->insertItem( i18n( "Arc" ), VEllipse::arc );
-	connect( m_type, SIGNAL( activated( int ) ), this, SLOT( typeChanged( int ) ) );
+	connect( m_type, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( typeChanged( int ) ) );
 
 	// add width/height-input:
-	m_widthLabel = new QLabel( i18n( "object width", "Width:" ), group );
+	m_widthLabel = new TQLabel( i18n( "object width", "Width:" ), group );
 	m_width = new KoUnitDoubleSpinBox( group, 0.0, 1000.0, 0.5, 100.0, KoUnit::U_MM );
-	m_heightLabel = new QLabel( i18n( "Height:" ), group );
+	m_heightLabel = new TQLabel( i18n( "Height:" ), group );
 	m_height = new KoUnitDoubleSpinBox( group, 0.0, 1000.0, 0.5, 100.0, KoUnit::U_MM );
 
-	new QLabel( i18n( "Start angle:" ), group );
+	new TQLabel( i18n( "Start angle:" ), group );
 	m_startAngle = new KIntSpinBox( group );
 	m_startAngle->setMinValue( 0 );
 	m_startAngle->setMaxValue( 360 );
 
-	new QLabel( i18n( "End angle:" ), group );
+	new TQLabel( i18n( "End angle:" ), group );
 	m_endAngle = new KIntSpinBox( group );
 	m_endAngle->setMinValue( 0 );
 	m_endAngle->setMaxValue( 360 );
@@ -152,7 +152,7 @@ VEllipseTool::refreshUnit()
 }
 
 VPath*
-VEllipseTool::shape( bool interactive ) const
+VEllipseTool::tqshape( bool interactive ) const
 {
 	if( interactive )
 	{
@@ -258,7 +258,7 @@ VEllipseTool::cancel()
 bool
 VEllipseTool::showDialog() const
 {
-	return m_optionsWidget->exec() == QDialog::Accepted;
+	return m_optionsWidget->exec() == TQDialog::Accepted;
 }
 
 void
@@ -268,9 +268,9 @@ VEllipseTool::setup( KActionCollection *collection )
 
 	if( m_action == 0 )
 	{
-		m_action = new KRadioAction( i18n( "Ellipse Tool" ), "14_ellipse", Qt::SHIFT+Qt::Key_H, this, SLOT( activate() ), collection, name() );
+		m_action = new KRadioAction( i18n( "Ellipse Tool" ), "14_ellipse", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() );
 		m_action->setToolTip( i18n( "Ellipse" ) );
-		m_action->setExclusiveGroup( "shapes" );
+		m_action->setExclusiveGroup( "tqshapes" );
 		//m_ownAction = true;
 	}
 }