4 files changed, 22 insertions, 21 deletions
diff --git a/karbon/plugins/imagetool/imagetoolplugin.cc b/karbon/plugins/imagetool/imagetoolplugin.cc
index cd9c7c2f..2bb9962a 100644
--- a/karbon/plugins/imagetool/imagetoolplugin.cc
+++ b/karbon/plugins/imagetool/imagetoolplugin.cc
@@ -31,17 +31,17 @@
 typedef KGenericFactory<ImageToolPlugin> ImageToolPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( karbon_imagetoolplugin, ImageToolPluginFactory( "karbonimagetoolplugin" ) )
 
-ImageToolPlugin::ImageToolPlugin(QObject *parent, const char *name, const QStringList &) : KParts::Plugin(parent, name)
+ImageToolPlugin::ImageToolPlugin(TQObject *tqparent, const char *name, const TQStringList &) : KParts::Plugin(tqparent, name)
 {
 	setInstance(ImageToolPluginFactory::instance());
 
 	kdDebug() << "VImageToolPlugin. Class: "
 		<< className()
 		<< ", Parent: "
-		<< parent -> className()
+		<< tqparent -> className()
 		<< "\n";
 
-	if ( parent->inherits("KarbonFactory") )
+	if ( tqparent->inherits("KarbonFactory") )
 	{
 		KarbonToolRegistry* r = KarbonToolRegistry::instance();
 		r->add(new KarbonToolFactory<VImageTool>());
diff --git a/karbon/plugins/imagetool/imagetoolplugin.h b/karbon/plugins/imagetool/imagetoolplugin.h
index 6f7e6547..236b0ac6 100644
--- a/karbon/plugins/imagetool/imagetoolplugin.h
+++ b/karbon/plugins/imagetool/imagetoolplugin.h
@@ -21,7 +21,7 @@
 #ifndef __IMAGETOOLPLUGIN_H__
 #define __IMAGETOOLPLUGIN_H__
 
-#include <qstring.h>
+#include <tqstring.h>
 
 #include <kparts/plugin.h>
 
@@ -30,8 +30,9 @@
 class ImageToolPlugin : public KParts::Plugin
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	ImageToolPlugin(QObject *parent, const char *name, const QStringList &);
+	ImageToolPlugin(TQObject *tqparent, const char *name, const TQStringList &);
 	virtual ~ImageToolPlugin();
 };
 
diff --git a/karbon/plugins/imagetool/vimagetool.cc b/karbon/plugins/imagetool/vimagetool.cc
index 6511fa4d..40823e99 100644
--- a/karbon/plugins/imagetool/vimagetool.cc
+++ b/karbon/plugins/imagetool/vimagetool.cc
@@ -18,7 +18,7 @@
 
 */
 
-#include <qcursor.h>
+#include <tqcursor.h>
 #include <klocale.h>
 #include <kfiledialog.h>
 #include <kdebug.h>
@@ -33,7 +33,7 @@
 VImageTool::VImageTool( KarbonView *view ) : VTool( view, "tool_image_plugin" )
 {
 	registerTool( this );
-	m_cursor = new QCursor( VCursor::createCursor( VCursor::CrossHair ) );
+	m_cursor = new TQCursor( VCursor::createCursor( VCursor::CrossHair ) );
 }
 
 VImageTool::~VImageTool()
@@ -41,10 +41,10 @@ VImageTool::~VImageTool()
 	delete m_cursor;
 }
 
-QString
+TQString
 VImageTool::contextHelp()
 {
-	QString s = i18n( "<qt><b>Image tool:</b><br>" );
+	TQString s = i18n( "<qt><b>Image tool:</b><br>" );
 	return s;
 }
 
@@ -55,7 +55,7 @@ VImageTool::activate()
 	VTool::activate();
 }
 
-QString
+TQString
 VImageTool::statusText()
 {
 	return i18n( "Image Tool" );
@@ -69,7 +69,7 @@ VImageTool::deactivate()
 void
 VImageTool::mouseButtonRelease()
 {
-	QString fname = KFileDialog::getOpenFileName( QString::null, "*.jpg *.gif *.png", view(), i18n( "Choose Image to Add" ) );
+	TQString fname = KFileDialog::getOpenFileName( TQString(), "*.jpg *.gif *.png", view(), i18n( "Choose Image to Add" ) );
 	if( !fname.isEmpty() )
 	{
 		VImage *image = new VImage( 0L, fname );
@@ -79,7 +79,7 @@ VImageTool::mouseButtonRelease()
 	}
 }
 
-VImageTool::VInsertImageCmd::VInsertImageCmd( VDocument* doc, const QString& name, VImage *image, KoPoint pos )
+VImageTool::VInsertImageCmd::VInsertImageCmd( VDocument* doc, const TQString& name, VImage *image, KoPoint pos )
 	: VCommand( doc, name, "frame_image" ), m_image( image ), m_pos( pos )
 {
 }
@@ -95,7 +95,7 @@ VImageTool::VInsertImageCmd::execute()
 	else
 	{
 		m_image->setState( VObject::normal );
-		m_image->transform( QWMatrix().translate( m_pos.x(), m_pos.y() ) );
+		m_image->transform( TQWMatrix().translate( m_pos.x(), m_pos.y() ) );
 		document()->append( m_image );
 		document()->selection()->clear();
 		document()->selection()->append( m_image );
@@ -123,7 +123,7 @@ VImageTool::setup( KActionCollection *collection )
 
 	if( m_action == 0 )
 	{
-		m_action = new KRadioAction( i18n( "Image Tool" ), "14_image", Qt::SHIFT+Qt::Key_H, this, SLOT( activate() ), collection, name() );
+		m_action = new KRadioAction( i18n( "Image Tool" ), "14_image", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() );
 		m_action->setToolTip( i18n( "Image" ) );
 		m_action->setExclusiveGroup( "misc" );
 		//m_ownAction = true;
diff --git a/karbon/plugins/imagetool/vimagetool.h b/karbon/plugins/imagetool/vimagetool.h
index c9ac7f44..65b187ea 100644
--- a/karbon/plugins/imagetool/vimagetool.h
+++ b/karbon/plugins/imagetool/vimagetool.h
@@ -21,14 +21,14 @@
 #ifndef __VIMAGETOOL_H__
 #define __VIMAGETOOL_H__
 
-#include <qstring.h>
+#include <tqstring.h>
 
 #include "vtool.h"
 #include <commands/vcommand.h>
 
 class KarbonView;
 class VImage;
-class QCursor;
+class TQCursor;
 
 class VImageTool : public VTool
 {
@@ -40,15 +40,15 @@ public:
 	virtual void deactivate();
 
 	virtual void setup( KActionCollection *collection );
-	virtual QString uiname() { return i18n( "Image Tool" ); }
-	virtual QString contextHelp();
-	virtual QString statusText();
+	virtual TQString uiname() { return i18n( "Image Tool" ); }
+	virtual TQString contextHelp();
+	virtual TQString statusText();
 
 protected:
 	class VInsertImageCmd : public VCommand
 	{
 	public:
-		VInsertImageCmd( VDocument* doc, const QString& name, VImage *image, KoPoint pos );
+		VInsertImageCmd( VDocument* doc, const TQString& name, VImage *image, KoPoint pos );
 		virtual ~VInsertImageCmd() {}
 
 		virtual void execute();
@@ -63,7 +63,7 @@ protected:
 	virtual void mouseButtonRelease();
 
 private:
-	QCursor* m_cursor;
+	TQCursor* m_cursor;
 };
 
 #endif