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

diff --git a/karbon/plugins/insertknots/insertknotsplugin.cc b/karbon/plugins/insertknots/insertknotsplugin.cc
index 2d470b88..b31d33f9 100644
--- a/karbon/plugins/insertknots/insertknotsplugin.cc
+++ b/karbon/plugins/insertknots/insertknotsplugin.cc
@@ -25,19 +25,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<InsertKnotsPlugin, KarbonView> InsertKnotsPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( karbon_insertknotsplugin, InsertKnotsPluginFactory( "karboninsertknotsplugin" ) )
 
-InsertKnotsPlugin::InsertKnotsPlugin( KarbonView *parent, const char* name, const QStringList & ) : Plugin( parent, name )
+InsertKnotsPlugin::InsertKnotsPlugin( KarbonView *tqparent, const char* name, const TQStringList & ) : Plugin( tqparent, name )
 {
 	new KAction(
 		i18n( "&Insert Knots..." ), "14_insertknots", 0, this,
-		SLOT( slotInsertKnots() ), actionCollection(), "path_insert_knots" );
+		TQT_SLOT( slotInsertKnots() ), actionCollection(), "path_insert_knots" );
 
 	m_insertKnotsDlg = new VInsertKnotsDlg();
 }
@@ -45,25 +45,25 @@ InsertKnotsPlugin::InsertKnotsPlugin( KarbonView *parent, const char* name, cons
 void
 InsertKnotsPlugin::slotInsertKnots()
 {
-	KarbonPart *part = ((KarbonView *)parent())->part();
+	KarbonPart *part = ((KarbonView *)tqparent())->part();
 	if( part && m_insertKnotsDlg->exec() )
 		part->addCommand( new VInsertKnotsCmd( &part->document(), m_insertKnotsDlg->knots() ), true );
 }
 
-VInsertKnotsDlg::VInsertKnotsDlg( QWidget* parent, const char* name )
-	: KDialogBase( parent, name, true,  i18n( "Insert Knots" ), Ok | Cancel )
+VInsertKnotsDlg::VInsertKnotsDlg( TQWidget* tqparent, const char* name )
+	: KDialogBase( tqparent, name, true,  i18n( "Insert Knots" ), Ok | Cancel )
 {
 	// add input fields:
-	QGroupBox* group = new QGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
+	TQGroupBox* group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
 
-	new QLabel( i18n( "Knots:" ), group );
+	new TQLabel( i18n( "Knots:" ), group );
 	m_knots = new KIntSpinBox( group );
 	m_knots->setMinValue( 1 );
 	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() );
diff --git a/karbon/plugins/insertknots/insertknotsplugin.h b/karbon/plugins/insertknots/insertknotsplugin.h
index 89f0a4d0..4bd2b212 100644
--- a/karbon/plugins/insertknots/insertknotsplugin.h
+++ b/karbon/plugins/insertknots/insertknotsplugin.h
@@ -30,8 +30,9 @@ class KarbonView;
 class InsertKnotsPlugin : public KParts::Plugin
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	InsertKnotsPlugin( KarbonView *parent, const char* name, const QStringList & );
+	InsertKnotsPlugin( KarbonView *tqparent, const char* name, const TQStringList & );
 	virtual ~InsertKnotsPlugin() {}
 
 private slots:
@@ -46,9 +47,10 @@ class KIntSpinBox;
 class VInsertKnotsDlg : public KDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	VInsertKnotsDlg( QWidget* parent = 0L, const char* name = 0L );
+	VInsertKnotsDlg( TQWidget* tqparent = 0L, const char* name = 0L );
 
 	uint knots() const;
 	void setKnots( uint value );