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

2 files changed, 17 insertions, 15 deletions

diff --git a/karbon/plugins/roundcorners/roundcornersplugin.cc b/karbon/plugins/roundcorners/roundcornersplugin.cc
index 5a36fa51..cb24087f 100644
--- a/karbon/plugins/roundcorners/roundcornersplugin.cc
+++ b/karbon/plugins/roundcorners/roundcornersplugin.cc
@@ -24,19 +24,19 @@
 #include <core/vsegment.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
+#include <tqgroupbox.h>
+#include <tqlabel.h>
 
 #include <knuminput.h>
 
 typedef KGenericFactory<VRoundCornersPlugin, KarbonView> VRoundCornersPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( karbon_roundcornersplugin, VRoundCornersPluginFactory( "karbonroundcornersplugin" ) )
 
-VRoundCornersPlugin::VRoundCornersPlugin( KarbonView *parent, const char* name, const QStringList & ) : Plugin( parent, name )
+VRoundCornersPlugin::VRoundCornersPlugin( KarbonView *tqparent, const char* name, const TQStringList & ) : Plugin( tqparent, name )
 {
 	new KAction(
 		i18n( "&Round Corners..." ), "14_roundcorners", 0, this,
-		SLOT( slotRoundCorners() ), actionCollection(), "path_round_corners" );
+		TQT_SLOT( slotRoundCorners() ), actionCollection(), "path_round_corners" );
 
 	m_roundCornersDlg = new VRoundCornersDlg();
 	m_roundCornersDlg->setRadius( 10.0 );
@@ -49,25 +49,25 @@ VRoundCornersPlugin::~VRoundCornersPlugin()
 void
 VRoundCornersPlugin::slotRoundCorners()
 {
-	KarbonPart *part = ((KarbonView *)parent())->part();
+	KarbonPart *part = ((KarbonView *)tqparent())->part();
 	if( part && m_roundCornersDlg->exec() )
 		part->addCommand( new VRoundCornersCmd( &part->document(), m_roundCornersDlg->radius() ), true );
 }
 
 
-VRoundCornersDlg::VRoundCornersDlg( QWidget* parent, const char* name )
-	: KDialogBase( parent, name, true,  i18n( "Polygonize" ), Ok | Cancel  )
+VRoundCornersDlg::VRoundCornersDlg( TQWidget* tqparent, const char* name )
+	: KDialogBase( tqparent, name, true,  i18n( "Polygonize" ), Ok | Cancel  )
 {
 	// add input:
-	QGroupBox* group = new QGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
+	TQGroupBox* group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
 
-	new QLabel( i18n( "Round corners:" ), group );
+	new TQLabel( i18n( "Round corners:" ), group );
 	m_radius = new KDoubleNumInput( group );
 	group->setMinimumWidth( 300 );
 
 	// signals and slots:
-	connect( this, SIGNAL( okClicked() ), this, SLOT( accept() ) );
-	connect( this, SIGNAL( cancelClicked() ), this, SLOT( reject() ) );
+	connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( accept() ) );
+	connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( reject() ) );
 
 	setMainWidget( group );
 	setFixedSize( baseSize() );
@@ -102,7 +102,7 @@ VRoundCornersCmd::visitVSubpath( VSubpath& path )
 		return;
 
 	// Note: we modiy segments from path. that doesn't hurt, since we
-	// replace "path" with the temporary path "newPath" afterwards.
+	// tqreplace "path" with the temporary path "newPath" afterwards.
 
 	VSubpath newPath( 0L );
 
@@ -395,7 +395,7 @@ VRoundCornersCmd::visitVSubpath( VSubpath& path )
 	path = newPath;
 
 	// Invalidate bounding box once.
-	path.invalidateBoundingBox();
+	path.tqinvalidateBoundingBox();
 }
 
 #include "roundcornersplugin.moc"
diff --git a/karbon/plugins/roundcorners/roundcornersplugin.h b/karbon/plugins/roundcorners/roundcornersplugin.h
index 626d698c..74e49f88 100644
--- a/karbon/plugins/roundcorners/roundcornersplugin.h
+++ b/karbon/plugins/roundcorners/roundcornersplugin.h
@@ -31,8 +31,9 @@ class VRoundCornersDlg;
 class KARBONBASE_EXPORT VRoundCornersPlugin : public KParts::Plugin
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	VRoundCornersPlugin( KarbonView *parent, const char* name, const QStringList & );
+	VRoundCornersPlugin( KarbonView *tqparent, const char* name, const TQStringList & );
 	virtual ~VRoundCornersPlugin();
 
 private slots:
@@ -47,9 +48,10 @@ class KDoubleNumInput;
 class VRoundCornersDlg : public KDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	VRoundCornersDlg( QWidget* parent = 0L, const char* name = 0L );
+	VRoundCornersDlg( TQWidget* tqparent = 0L, const char* name = 0L );
 
 	double radius() const;
 	void setRadius( double value );