Fix kdevelop Qt3 compilation

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1237312 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

24 files changed, 122 insertions, 122 deletions

diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp
index f3400a28..c9092969 100644
--- a/languages/cpp/ccconfigwidget.cpp
+++ b/languages/cpp/ccconfigwidget.cpp
@@ -397,7 +397,7 @@ void CCConfigWidget::initTQtTab()
 {
 	m_qtDir->setMode(KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly);
 
-	TQtBuildConfig* c = m_pPart->qtBuildConfig();
+	QtBuildConfig* c = m_pPart->qtBuildConfig();
 	c->init();
 
 	m_qtUsed->setChecked( c->isUsed() );
@@ -484,7 +484,7 @@ void CCConfigWidget::isDesignerExecutable( const TQString& path )
 
 void CCConfigWidget::saveTQtTab()
 {
-	TQtBuildConfig* c = m_pPart->qtBuildConfig();
+	QtBuildConfig* c = m_pPart->qtBuildConfig();
 
 	c->setUsed( m_qtUsed->isChecked() );
 	if( m_versionQt4->isChecked() )
@@ -559,7 +559,7 @@ void CCConfigWidget::toggleTQtVersion( bool )
 void CCConfigWidget::openPluginPaths()
 {
     kdDebug(9024) << "Plugin paths opened" << endl;
-    TQtBuildConfig* c = m_pPart->qtBuildConfig();
+    QtBuildConfig* c = m_pPart->qtBuildConfig();
     KDialog d( this );
     TQVBoxLayout* maintqlayout = new TQVBoxLayout( &d );
     KPushButton* ok = new KPushButton( KStdGuiItem::ok(), &d );
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index 2fa5e2d8..e58d3a86 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -205,7 +205,7 @@ CppSupportPart::CppSupportPart( TQObject *tqparent, const char *name, const TQSt
 		this, TQT_SLOT( splitHeaderSourceConfigStored() ) );
 	connect( m_pCompletionConfig, TQT_SIGNAL( stored() ),
 	         this, TQT_SLOT( codeCompletionConfigStored() ) );
-	m_qtBuildConfig = new TQtBuildConfig( this, projectDom() );
+	m_qtBuildConfig = new QtBuildConfig( this, projectDom() );
     m_qtBuildConfig->store();
 
 	m_backgroundParserConfig = new BackgroundParserConfig;
@@ -2764,7 +2764,7 @@ KDevDesignerIntegration * CppSupportPart::designer( KInterfaceDesigner::Designer
 		if ( des == 0 )
 		{
 			CppImplementationWidget * impl = new CppImplementationWidget( this );
-			des = new TQtDesignerCppIntegration( this, impl );
+			des = new QtDesignerCppIntegration( this, impl );
 			des->loadSettings( *project() ->projectDom(), "kdevcppsupport/designerintegration" );
 			m_designers[ type ] = des;
 		}
@@ -2791,7 +2791,7 @@ void CppSupportPart::slotCreateSubclass()
 	TQFileInfo fi( m_contextFileName );
 	if ( fi.extension( false ) != "ui" )
 		return ;
-	TQtDesignerCppIntegration *des = dynamic_cast<TQtDesignerCppIntegration*>( designer( KInterfaceDesigner::TQtDesigner ) );
+	QtDesignerCppIntegration *des = dynamic_cast<QtDesignerCppIntegration*>( designer( KInterfaceDesigner::TQtDesigner ) );
 	if ( des )
 		des->selectImplementation( m_contextFileName );
 }
diff --git a/languages/cpp/cppsupportpart.h b/languages/cpp/cppsupportpart.h
index b9d5a53f..6e2ee964 100644
--- a/languages/cpp/cppsupportpart.h
+++ b/languages/cpp/cppsupportpart.h
@@ -75,7 +75,7 @@ class CppCodeCompletion;
 class CppCodeCompletionConfig;
 class CppSplitHeaderSourceConfig;
 class CreateGetterSetterConfiguration;
-class TQtBuildConfig;
+class QtBuildConfig;
 class ProblemReporter;
 class BackgroundParser;
 class Catalog;
@@ -205,10 +205,10 @@ public:
 	}
 	
 	/**
-		Get a pointer to the TQtBuildConfig object
-		@return A pointer to the TQtBuildConfig object.
+		Get a pointer to the QtBuildConfig object
+		@return A pointer to the QtBuildConfig object.
 	*/
-	inline TQtBuildConfig* qtBuildConfig() const { return m_qtBuildConfig; }
+	inline QtBuildConfig* qtBuildConfig() const { return m_qtBuildConfig; }
 
     const TQPtrList<Catalog>& catalogList() const
 	{
@@ -417,7 +417,7 @@ private:
 	KAction * m_createGetterSetterAction;
 	KAction * m_switchHeaderSourceAction;
 	
-	TQtBuildConfig* m_qtBuildConfig;
+	QtBuildConfig* m_qtBuildConfig;
 
 	bool withcpp;
 	TQString m_contextFileName;
diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
index 5864659c..e26872e2 100644
--- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
+++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
@@ -22,15 +22,15 @@
 #include <tqlabel.h>
 #include <tqdir.h>
 
-K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory<KDevTQt4Importer>( "kdevqt4importer" ) )
+K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory<KDevQt4Importer>( "kdevqt4importer" ) )
 
-KDevTQt4Importer::KDevTQt4Importer( TQObject * tqparent, const char * name, const TQStringList& )
+KDevQt4Importer::KDevQt4Importer( TQObject * tqparent, const char * name, const TQStringList& )
     : KDevPCSImporter( tqparent, name )
 {
     m_qtfile = 0;
 }
 
-KDevTQt4Importer::~KDevTQt4Importer()
+KDevQt4Importer::~KDevQt4Importer()
 {
     if (m_qtfile)
         delete m_qtfile;
@@ -38,7 +38,7 @@ KDevTQt4Importer::~KDevTQt4Importer()
     m_qtfile = 0;
 }
 
-TQStringList KDevTQt4Importer::fileList()
+TQStringList KDevQt4Importer::fileList()
 {
     if( !m_settings )
         return TQStringList();
@@ -86,7 +86,7 @@ TQStringList KDevTQt4Importer::fileList()
     return m_qtfile->name();
 }
 
-TQStringList KDevTQt4Importer::includePaths()
+TQStringList KDevQt4Importer::includePaths()
 {
     if( !m_settings || !m_qtfile)
         return TQStringList();
@@ -99,7 +99,7 @@ TQStringList KDevTQt4Importer::includePaths()
     return includePaths;
 }
 
-TQWidget * KDevTQt4Importer::createSettingsPage( TQWidget * tqparent, const char * name )
+TQWidget * KDevQt4Importer::createSettingsPage( TQWidget * tqparent, const char * name )
 {
     m_settings = new SettingsDialog( tqparent, name );
     return m_settings;
diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
index 5a365bf6..0da1185d 100644
--- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
+++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
@@ -18,13 +18,13 @@
 class SettingsDialog;
 class KTempFile;
 
-class KDevTQt4Importer : public KDevPCSImporter
+class KDevQt4Importer : public KDevPCSImporter
 {
     Q_OBJECT
   TQ_OBJECT
 public:
-    KDevTQt4Importer( TQObject* tqparent=0, const char* name=0, const TQStringList& args=TQStringList() );
-    virtual ~KDevTQt4Importer();
+    KDevQt4Importer( TQObject* tqparent=0, const char* name=0, const TQStringList& args=TQStringList() );
+    virtual ~KDevQt4Importer();
 
     virtual TQString dbName() const { return TQString::tqfromLatin1("TQt4"); }
     virtual TQStringList fileList();
diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp
index 25937879..ea9bfb52 100644
--- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp
+++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp
@@ -18,16 +18,16 @@
 #include <tqlabel.h>
 #include <tqdir.h>
 
-K_EXPORT_COMPONENT_FACTORY( libkdevqtimporter, KGenericFactory<KDevTQtImporter>( "kdevqtimporter" ) )
+K_EXPORT_COMPONENT_FACTORY( libkdevqtimporter, KGenericFactory<KDevQtImporter>( "kdevqtimporter" ) )
 
-KDevTQtImporter::KDevTQtImporter( TQObject * tqparent, const char * name, const TQStringList& )
+KDevQtImporter::KDevQtImporter( TQObject * tqparent, const char * name, const TQStringList& )
 		: KDevPCSImporter( tqparent, name )
 {}
 
-KDevTQtImporter::~KDevTQtImporter()
+KDevQtImporter::~KDevQtImporter()
 {}
 
-TQStringList KDevTQtImporter::fileList()
+TQStringList KDevQtImporter::fileList()
 {
 	if ( !m_settings )
 		return TQStringList();
@@ -50,7 +50,7 @@ TQStringList KDevTQtImporter::fileList()
 	return fileList;
 }
 
-TQStringList KDevTQtImporter::includePaths()
+TQStringList KDevQtImporter::includePaths()
 {
 	if ( !m_settings )
 		return TQStringList();
@@ -64,7 +64,7 @@ TQStringList KDevTQtImporter::includePaths()
 	return includePaths;
 }
 
-TQWidget * KDevTQtImporter::createSettingsPage( TQWidget * tqparent, const char * name )
+TQWidget * KDevQtImporter::createSettingsPage( TQWidget * tqparent, const char * name )
 {
 	m_settings = new SettingsDialog( tqparent, name );
 	return m_settings;
diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
index 744a4b67..ebbc7ab4 100644
--- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
+++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
@@ -17,13 +17,13 @@
 
 class SettingsDialog;
 
-class KDevTQtImporter : public KDevPCSImporter
+class KDevQtImporter : public KDevPCSImporter
 {
     Q_OBJECT
   TQ_OBJECT
 public:
-    KDevTQtImporter( TQObject* tqparent=0, const char* name=0, const TQStringList& args=TQStringList() );
-    virtual ~KDevTQtImporter();
+    KDevQtImporter( TQObject* tqparent=0, const char* name=0, const TQStringList& args=TQStringList() );
+    virtual ~KDevQtImporter();
 
     virtual TQString dbName() const { return TQString::tqfromLatin1("TQt"); }
     virtual TQStringList fileList();
diff --git a/languages/cpp/qtbuildconfig.cpp b/languages/cpp/qtbuildconfig.cpp
index 21717dd2..1d20a9f9 100644
--- a/languages/cpp/qtbuildconfig.cpp
+++ b/languages/cpp/qtbuildconfig.cpp
@@ -25,19 +25,19 @@
 
 #include <stdlib.h>
 
-const TQString TQtBuildConfig::m_configRoot = TQString( "/kdevcppsupport/qt" );
+const TQString QtBuildConfig::m_configRoot = TQString( "/kdevcppsupport/qt" );
 
-TQtBuildConfig::TQtBuildConfig( CppSupportPart * part, TQDomDocument* dom )
+QtBuildConfig::QtBuildConfig( CppSupportPart * part, TQDomDocument* dom )
 	: TQObject( part ), m_part( part ), m_dom( dom )
 {
 	init();
 }
 
-TQtBuildConfig::~TQtBuildConfig()
+QtBuildConfig::~QtBuildConfig()
 {
 }
 
-void TQtBuildConfig::init( )
+void QtBuildConfig::init( )
 {
 	m_used = DomUtil::readBoolEntry( *m_dom, m_configRoot + "/used", false );
 	m_version = DomUtil::readIntEntry( *m_dom, m_configRoot + "/version", 3 );
@@ -83,7 +83,7 @@ void TQtBuildConfig::init( )
 	}
 }
 
-bool TQtBuildConfig::isValidTQtDir( const TQString& path ) const
+bool QtBuildConfig::isValidTQtDir( const TQString& path ) const
 {
     TQFileInfo inc( path + TQString( TQChar( TQDir::separator() ) )+
                    "include"+TQString( TQChar( TQDir::separator() ) )+
@@ -91,7 +91,7 @@ bool TQtBuildConfig::isValidTQtDir( const TQString& path ) const
     return ( m_version == 4 || ( m_version != 4 && inc.exists() ) );
 }
 
-void TQtBuildConfig::buildBinDirs( TQStringList & dirs ) const
+void QtBuildConfig::buildBinDirs( TQStringList & dirs ) const
 {
     if( m_version == 3 )
     {
@@ -114,7 +114,7 @@ void TQtBuildConfig::buildBinDirs( TQStringList & dirs ) const
 }
 
 
-TQString TQtBuildConfig::findExecutable( const TQString& execname ) const
+TQString QtBuildConfig::findExecutable( const TQString& execname ) const
 {
     TQStringList dirs;
     buildBinDirs( dirs );
@@ -130,13 +130,13 @@ TQString TQtBuildConfig::findExecutable( const TQString& execname ) const
     return "";
 }
 
-bool TQtBuildConfig::isExecutable( const TQString& path ) const
+bool QtBuildConfig::isExecutable( const TQString& path ) const
 {
     TQFileInfo fi(path);
     return( fi.exists() && fi.isExecutable() );
 }
 
-void TQtBuildConfig::findTQtDir()
+void QtBuildConfig::findTQtDir()
 {
     TQStringList qtdirs;
     if( m_version == 3 )
@@ -158,7 +158,7 @@ void TQtBuildConfig::findTQtDir()
     }
 }
 
-void TQtBuildConfig::store( )
+void QtBuildConfig::store( )
 {
 	DomUtil::writeBoolEntry( *m_dom, m_configRoot + "/used", m_used );
 	DomUtil::writeIntEntry( *m_dom, m_configRoot + "/version", m_version );
@@ -172,42 +172,42 @@ void TQtBuildConfig::store( )
 	emit stored();
 }
 
-void TQtBuildConfig::setUsed( bool used )
+void QtBuildConfig::setUsed( bool used )
 {
 	m_used = used;
 }
 
-void TQtBuildConfig::setVersion( int version )
+void QtBuildConfig::setVersion( int version )
 {
 	m_version = version;
 }
 
-void TQtBuildConfig::setIncludeStyle( int style )
+void QtBuildConfig::setIncludeStyle( int style )
 {
 	m_includeStyle = style;
 }
 
-void TQtBuildConfig::setRoot( const TQString& root )
+void QtBuildConfig::setRoot( const TQString& root )
 {
 	m_root = root;
 }
 
-void TQtBuildConfig::setTQMakePath( const TQString& path )
+void QtBuildConfig::setTQMakePath( const TQString& path )
 {
     m_qmakePath = path;
 }
 
-void TQtBuildConfig::setDesignerPluginPaths( const TQStringList& pfx )
+void QtBuildConfig::setDesignerPluginPaths( const TQStringList& pfx )
 {
     m_designerPluginPaths = pfx;
 }
 
-void TQtBuildConfig::setDesignerPath( const TQString& path )
+void QtBuildConfig::setDesignerPath( const TQString& path )
 {
     m_designerPath = path;
 }
 
-void TQtBuildConfig::setDesignerIntegration( const TQString& designerIntegration )
+void QtBuildConfig::setDesignerIntegration( const TQString& designerIntegration )
 {
 	m_designerIntegration = designerIntegration;
 }
diff --git a/languages/cpp/qtbuildconfig.h b/languages/cpp/qtbuildconfig.h
index df92869b..1d6e1e25 100644
--- a/languages/cpp/qtbuildconfig.h
+++ b/languages/cpp/qtbuildconfig.h
@@ -25,18 +25,18 @@ class CppSupportPart;
 class TQDomDocument;
 
 /**
-	@brief The TQtBuildConfig class stores all parameters related to the used TQt library
+	@brief The QtBuildConfig class stores all parameters related to the used TQt library
 
 	@author Tobias Erbsland <[email protected]>
 */
-class TQtBuildConfig : public TQObject
+class QtBuildConfig : public TQObject
 {
 	Q_OBJECT
   TQ_OBJECT
 
 public:
-	TQtBuildConfig( CppSupportPart* part, TQDomDocument* dom );
-	virtual ~TQtBuildConfig();
+	QtBuildConfig( CppSupportPart* part, TQDomDocument* dom );
+	virtual ~QtBuildConfig();
 
 	inline bool isUsed() const { return m_used; }
 	inline int version() const { return m_version; }
diff --git a/languages/cpp/qtdesignercppintegration.cpp b/languages/cpp/qtdesignercppintegration.cpp
index 83354fa8..b39d3ea1 100644
--- a/languages/cpp/qtdesignercppintegration.cpp
+++ b/languages/cpp/qtdesignercppintegration.cpp
@@ -40,12 +40,12 @@
 #include "codemodel_utils.h"
 #include "implementationwidget.h"
 
-TQtDesignerCppIntegration::TQtDesignerCppIntegration( KDevLanguageSupport *part,
+QtDesignerCppIntegration::QtDesignerCppIntegration( KDevLanguageSupport *part,
 	                                                ImplementationWidget *impl )
-: TQtDesignerIntegration( part, impl, true, 0 )
+: QtDesignerIntegration( part, impl, true, 0 )
 {}
 
-void TQtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function function, ClassDom klass )
+void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function function, ClassDom klass )
 {
 	m_part->partController() ->editDocument( KURL( klass->fileName() ) );
 	KTextEditor::EditInterface* editIface = dynamic_cast<KTextEditor::EditInterface*>( m_part->partController() ->activePart() );
@@ -182,7 +182,7 @@ void TQtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function
 	cppPart->backgroundParser() ->addFile( implementationFile );
 }
 
-TQString TQtDesignerCppIntegration::accessID( FunctionDom fun ) const
+TQString QtDesignerCppIntegration::accessID( FunctionDom fun ) const
 {
 	if ( fun->isSignal() )
 		return TQString::tqfromLatin1( "signals" );
@@ -208,7 +208,7 @@ TQString TQtDesignerCppIntegration::accessID( FunctionDom fun ) const
 	return TQString();
 }
 
-void TQtDesignerCppIntegration::processImplementationName( TQString &name )
+void QtDesignerCppIntegration::processImplementationName( TQString &name )
 {
 	name.tqreplace( ".h", ".cpp" );
 }
diff --git a/languages/cpp/qtdesignercppintegration.h b/languages/cpp/qtdesignercppintegration.h
index 5fd95b58..995898e1 100644
--- a/languages/cpp/qtdesignercppintegration.h
+++ b/languages/cpp/qtdesignercppintegration.h
@@ -22,12 +22,12 @@
 
 #include <qtdesignerintegration.h>
 
-class TQtDesignerCppIntegration : public TQtDesignerIntegration
+class QtDesignerCppIntegration : public QtDesignerIntegration
 {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	TQtDesignerCppIntegration( KDevLanguageSupport *part, ImplementationWidget *impl );
+	QtDesignerCppIntegration( KDevLanguageSupport *part, ImplementationWidget *impl );
 
 protected:
 	virtual void addFunctionToClass( KInterfaceDesigner::Function function, ClassDom klass );
diff --git a/languages/lib/designer_integration/qtdesignerintegration.cpp b/languages/lib/designer_integration/qtdesignerintegration.cpp
index f46bd422..43359bd1 100644
--- a/languages/lib/designer_integration/qtdesignerintegration.cpp
+++ b/languages/lib/designer_integration/qtdesignerintegration.cpp
@@ -38,20 +38,20 @@
 #include "codemodel_utils.h"
 #include "implementationwidget.h"
 
-TQtDesignerIntegration::TQtDesignerIntegration(KDevLanguageSupport *part, ImplementationWidget *impl, bool classHasDefinitions, const char* name)
+QtDesignerIntegration::QtDesignerIntegration(KDevLanguageSupport *part, ImplementationWidget *impl, bool classHasDefinitions, const char* name)
     :KDevDesignerIntegration(part, name), m_part(part), m_impl(impl),
     m_classHasDefinitions(classHasDefinitions)
 {
 }
 
-TQtDesignerIntegration::~TQtDesignerIntegration()
+QtDesignerIntegration::~QtDesignerIntegration()
 {
     delete m_impl;
 }
 
-void TQtDesignerIntegration::addFunction(const TQString& formName, KInterfaceDesigner::Function function)
+void QtDesignerIntegration::addFunction(const TQString& formName, KInterfaceDesigner::Function function)
 {
-    kdDebug() << "TQtDesignerIntegration::addFunction: form: " << formName << ", function: " << function.function << endl;
+    kdDebug() << "QtDesignerIntegration::addFunction: form: " << formName << ", function: " << function.function << endl;
 
     if (!m_implementations.tqcontains(formName))
         if (!selectImplementation(formName))
@@ -67,19 +67,19 @@ void TQtDesignerIntegration::addFunction(const TQString& formName, KInterfaceDes
     addFunctionToClass(function, klass);
 }
 
-void TQtDesignerIntegration::editFunction(const TQString& formName, KInterfaceDesigner::Function oldFunction, KInterfaceDesigner::Function function)
+void QtDesignerIntegration::editFunction(const TQString& formName, KInterfaceDesigner::Function oldFunction, KInterfaceDesigner::Function function)
 {
-    kdDebug() << "TQtDesignerIntegration::editFunction: form: " << formName
+    kdDebug() << "QtDesignerIntegration::editFunction: form: " << formName
         << ", old function: " << oldFunction.function
         << ", function: " << function.function << endl;
 }
 
-void TQtDesignerIntegration::removeFunction(const TQString& formName, KInterfaceDesigner::Function function)
+void QtDesignerIntegration::removeFunction(const TQString& formName, KInterfaceDesigner::Function function)
 {
-    kdDebug() << "TQtDesignerIntegration::removeFunction: form: " << formName << ", function: " << function.function << endl;
+    kdDebug() << "QtDesignerIntegration::removeFunction: form: " << formName << ", function: " << function.function << endl;
 }
 
-bool TQtDesignerIntegration::selectImplementation(const TQString &formName)
+bool QtDesignerIntegration::selectImplementation(const TQString &formName)
 {
     TQFileInfo fi(formName);
     if (!fi.exists())
@@ -93,7 +93,7 @@ bool TQtDesignerIntegration::selectImplementation(const TQString &formName)
     return false;
 }
 
-void TQtDesignerIntegration::loadSettings(TQDomDocument dom, TQString path)
+void QtDesignerIntegration::loadSettings(TQDomDocument dom, TQString path)
 {
     TQDomElement el = DomUtil::elementByPath(dom, path + "/qtdesigner");
     if (el.isNull())
@@ -117,9 +117,9 @@ void TQtDesignerIntegration::loadSettings(TQDomDocument dom, TQString path)
     }
 }
 
-void TQtDesignerIntegration::saveSettings(TQDomDocument dom, TQString path)
+void QtDesignerIntegration::saveSettings(TQDomDocument dom, TQString path)
 {
-    kdDebug() << "TQtDesignerIntegration::saveSettings" << endl;
+    kdDebug() << "QtDesignerIntegration::saveSettings" << endl;
     TQDomElement el = DomUtil::createElementByPath(dom, path + "/qtdesigner");
     for (TQMap<TQString, ClassDom>::const_iterator it = m_implementations.begin();
         it != m_implementations.end(); ++it)
@@ -134,9 +134,9 @@ void TQtDesignerIntegration::saveSettings(TQDomDocument dom, TQString path)
     }
 }
 
-void TQtDesignerIntegration::openFunction(const TQString &formName, const TQString &functionName)
+void QtDesignerIntegration::openFunction(const TQString &formName, const TQString &functionName)
 {
-    kdDebug() << "TQtDesignerIntegration::openFunction, formName = " << formName
+    kdDebug() << "QtDesignerIntegration::openFunction, formName = " << formName
         << ", functionName = " << functionName << endl;
     TQString fn = functionName;
     if (fn.tqfind("(") > 0)
@@ -177,12 +177,12 @@ void TQtDesignerIntegration::openFunction(const TQString &formName, const TQStri
     m_part->partController()->editDocument(KURL(impl), line, col);
 }
 
-void TQtDesignerIntegration::processImplementationName(TQString &// name
+void QtDesignerIntegration::processImplementationName(TQString &// name
                                                       )
 {
 }
 
-void TQtDesignerIntegration::openSource(const TQString &formName)
+void QtDesignerIntegration::openSource(const TQString &formName)
 {
     if (!m_implementations.tqcontains(formName))
         if (!selectImplementation(formName))
diff --git a/languages/lib/designer_integration/qtdesignerintegration.h b/languages/lib/designer_integration/qtdesignerintegration.h
index 9a750fbd..aa0c0f2f 100644
--- a/languages/lib/designer_integration/qtdesignerintegration.h
+++ b/languages/lib/designer_integration/qtdesignerintegration.h
@@ -35,14 +35,14 @@ Ready to use in KDevelop language support plugins.
 
 Subclasses of this class should reimplement only pure virtual functions in the common case.
 */
-class TQtDesignerIntegration : public KDevDesignerIntegration
+class QtDesignerIntegration : public KDevDesignerIntegration
 {
 Q_OBJECT
   TQ_OBJECT
 public:
-    TQtDesignerIntegration(KDevLanguageSupport *part, ImplementationWidget *impl,
+    QtDesignerIntegration(KDevLanguageSupport *part, ImplementationWidget *impl,
         bool classHasDefinitions, const char* name = 0);
-    virtual ~TQtDesignerIntegration();
+    virtual ~QtDesignerIntegration();
 
 public slots:
     virtual void addFunction(const TQString& formName, KInterfaceDesigner::Function function);
diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp
index d1f2e503..3ecc2109 100644
--- a/languages/python/pythonsupportpart.cpp
+++ b/languages/python/pythonsupportpart.cpp
@@ -379,7 +379,7 @@ KDevDesignerIntegration *PythonSupportPart::designer(KInterfaceDesigner::Designe
             if (des == 0)
             {
                 PythonImplementationWidget *impl = new PythonImplementationWidget(this);
-                des = new TQtDesignerPythonIntegration(this, impl);
+                des = new QtDesignerPythonIntegration(this, impl);
                 des->loadSettings(*project()->projectDom(),
                     "kdevpythonsupport/designerintegration");
                 m_designers[type] = des;
@@ -398,7 +398,7 @@ void PythonSupportPart::slotCreateSubclass()
     kdDebug(9014) << k_funcinfo << " file: " << m_contextFileName << " ext: " << fi.extension(false) << endl;
     if (fi.extension(false) != "ui")
         return;
-    TQtDesignerPythonIntegration *des = dynamic_cast<TQtDesignerPythonIntegration*>(designer(KInterfaceDesigner::TQtDesigner));
+    QtDesignerPythonIntegration *des = dynamic_cast<QtDesignerPythonIntegration*>(designer(KInterfaceDesigner::TQtDesigner));
     if (des)
     {
         kdDebug(9014) << "ok: " << des << endl;
diff --git a/languages/python/qtdesignerpythonintegration.cpp b/languages/python/qtdesignerpythonintegration.cpp
index c0e6dba1..0eb67147 100644
--- a/languages/python/qtdesignerpythonintegration.cpp
+++ b/languages/python/qtdesignerpythonintegration.cpp
@@ -38,18 +38,18 @@
 #include "codemodel_utils.h"
 #include "implementationwidget.h"
 
-TQtDesignerPythonIntegration::TQtDesignerPythonIntegration(KDevLanguageSupport* part, ImplementationWidget* impl)
-    :TQtDesignerIntegration(part, impl, false, 0)
+QtDesignerPythonIntegration::QtDesignerPythonIntegration(KDevLanguageSupport* part, ImplementationWidget* impl)
+    :QtDesignerIntegration(part, impl, false, 0)
 {
 }
 
 
-TQtDesignerPythonIntegration::~TQtDesignerPythonIntegration()
+QtDesignerPythonIntegration::~QtDesignerPythonIntegration()
 {
 }
 
 
-void TQtDesignerPythonIntegration::addFunctionToClass(KInterfaceDesigner::Function function, ClassDom klass)
+void QtDesignerPythonIntegration::addFunctionToClass(KInterfaceDesigner::Function function, ClassDom klass)
 {
     m_part->partController()->editDocument( KURL( klass->fileName() ) );
     KTextEditor::EditInterface* editIface = dynamic_cast<KTextEditor::EditInterface*>( m_part->partController()->activePart() );
diff --git a/languages/python/qtdesignerpythonintegration.h b/languages/python/qtdesignerpythonintegration.h
index 8af2f271..63759d23 100644
--- a/languages/python/qtdesignerpythonintegration.h
+++ b/languages/python/qtdesignerpythonintegration.h
@@ -22,14 +22,14 @@
 
 #include <qtdesignerintegration.h>
 
-class TQtDesignerPythonIntegration : public TQtDesignerIntegration
+class QtDesignerPythonIntegration : public QtDesignerIntegration
 {
 Q_OBJECT
   TQ_OBJECT
 public:
-    TQtDesignerPythonIntegration(KDevLanguageSupport* part, ImplementationWidget* impl);
+    QtDesignerPythonIntegration(KDevLanguageSupport* part, ImplementationWidget* impl);
 
-    ~TQtDesignerPythonIntegration();
+    ~QtDesignerPythonIntegration();
 
     virtual void addFunctionToClass(KInterfaceDesigner::Function function, ClassDom klass);
 
diff --git a/languages/ruby/qtdesignerrubyintegration.cpp b/languages/ruby/qtdesignerrubyintegration.cpp
index 068d983a..4ad11e8e 100644
--- a/languages/ruby/qtdesignerrubyintegration.cpp
+++ b/languages/ruby/qtdesignerrubyintegration.cpp
@@ -39,13 +39,13 @@
 #include "codemodel_utils.h"
 #include "implementationwidget.h"
 
-TQtDesignerRubyIntegration::TQtDesignerRubyIntegration(KDevLanguageSupport *part,
+QtDesignerRubyIntegration::QtDesignerRubyIntegration(KDevLanguageSupport *part,
     ImplementationWidget *impl)
-    :TQtDesignerIntegration(part, impl, false, 0)
+    :QtDesignerIntegration(part, impl, false, 0)
 {
 }
 
-void TQtDesignerRubyIntegration::addFunctionToClass(KInterfaceDesigner::Function function, ClassDom klass)
+void QtDesignerRubyIntegration::addFunctionToClass(KInterfaceDesigner::Function function, ClassDom klass)
 {
     m_part->partController()->editDocument( KURL( klass->fileName() ) );
     KTextEditor::EditInterface* editIface = dynamic_cast<KTextEditor::EditInterface*>( m_part->partController()->activePart() );
diff --git a/languages/ruby/qtdesignerrubyintegration.h b/languages/ruby/qtdesignerrubyintegration.h
index b2f8d4ef..20a2544c 100644
--- a/languages/ruby/qtdesignerrubyintegration.h
+++ b/languages/ruby/qtdesignerrubyintegration.h
@@ -22,12 +22,12 @@
 
 #include <qtdesignerintegration.h>
 
-class TQtDesignerRubyIntegration : public TQtDesignerIntegration
+class QtDesignerRubyIntegration : public QtDesignerIntegration
 {
 Q_OBJECT
   TQ_OBJECT
 public:
-    TQtDesignerRubyIntegration(KDevLanguageSupport *part, ImplementationWidget *impl);
+    QtDesignerRubyIntegration(KDevLanguageSupport *part, ImplementationWidget *impl);
 
 protected:
     void addFunctionToClass(KInterfaceDesigner::Function function, ClassDom klass);
diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp
index 4fe000a5..7c451a05 100644
--- a/languages/ruby/rubysupport_part.cpp
+++ b/languages/ruby/rubysupport_part.cpp
@@ -637,7 +637,7 @@ KDevDesignerIntegration *RubySupportPart::designer(KInterfaceDesigner::DesignerT
             if (des == 0)
             {
                 RubyImplementationWidget *impl = new RubyImplementationWidget(this);
-                des = new TQtDesignerRubyIntegration(this, impl);
+                des = new QtDesignerRubyIntegration(this, impl);
                 des->loadSettings(*project()->projectDom(),
                     "kdevrubysupport/designerintegration");
                 m_designers[type] = des;
@@ -679,7 +679,7 @@ void RubySupportPart::slotCreateSubclass()
     TQFileInfo fi(m_contextFileName);
     if (fi.extension(false) != "ui")
         return;
-    TQtDesignerRubyIntegration *des = dynamic_cast<TQtDesignerRubyIntegration*>(designer(KInterfaceDesigner::TQtDesigner));
+    QtDesignerRubyIntegration *des = dynamic_cast<QtDesignerRubyIntegration*>(designer(KInterfaceDesigner::TQtDesigner));
     if (des)
         des->selectImplementation(m_contextFileName);
 }
diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp
index 8d533a9e..eabb1c5a 100644
--- a/languages/sql/sqlactions.cpp
+++ b/languages/sql/sqlactions.cpp
@@ -25,7 +25,7 @@
 #include "kdevlanguagesupport.h"
 #include "sqlsupport_part.h"
 
-SqlListAction::SqlListAction(STQLSupportPart *part, const TQString &text, 
+SqlListAction::SqlListAction(SQLSupportPart *part, const TQString &text, 
 				 const KShortcut& cut,
                                  const TQObject *receiver, const char *slot,
                                  KActionCollection *tqparent, const char *name)
diff --git a/languages/sql/sqlactions.h b/languages/sql/sqlactions.h
index ff71ae54..a85f3709 100644
--- a/languages/sql/sqlactions.h
+++ b/languages/sql/sqlactions.h
@@ -16,7 +16,7 @@
 #include <kxmlguiclient.h>
 #include <kaction.h>
 
-class STQLSupportPart;
+class SQLSupportPart;
 class KComboBox;
 
 class SqlListAction : public KWidgetAction
@@ -24,7 +24,7 @@ class SqlListAction : public KWidgetAction
     Q_OBJECT
   TQ_OBJECT
 public:
-    SqlListAction( STQLSupportPart *part, const TQString &text, const KShortcut& cut,
+    SqlListAction( SQLSupportPart *part, const TQString &text, const KShortcut& cut,
                      const TQObject *receiver, const char *slot,
                      KActionCollection *tqparent, const char *name );
     void setCurrentConnectionName(const TQString &name);
@@ -35,7 +35,7 @@ private slots:
     void activated(int);
 
 private:
-    STQLSupportPart *m_part;
+    SQLSupportPart *m_part;
     KComboBox* m_combo;
 };
 
diff --git a/languages/sql/sqlconfigwidget.ui.h b/languages/sql/sqlconfigwidget.ui.h
index 877c1569..808ca504 100644
--- a/languages/sql/sqlconfigwidget.ui.h
+++ b/languages/sql/sqlconfigwidget.ui.h
@@ -203,7 +203,7 @@ void SqlConfigWidget::accept()
 	db << dbTable->text( i, 0 ) << dbTable->text( i, 1 )
 		<< dbTable->text( i, 2 ) << dbTable->text( i, 3 )
 		<< dbTable->text( i, 4 )
-		<< STQLSupportPart::cryptStr( ((PasswordTableItem*)dbTable->item( i, 5 ))->password );
+		<< SQLSupportPart::cryptStr( ((PasswordTableItem*)dbTable->item( i, 5 ))->password );
 	
 	DomUtil::writeListEntry( *doc, 
 				 "/kdevsqlsupport/servers/server" + TQString::number( i ), 
@@ -235,7 +235,7 @@ void SqlConfigWidget::loadConfig()
         int row = dbTable->numRows() - 2;
         for ( int ii = 0; ii < 6; ii++ )
             dbTable->setText( row, ii, db[ii] );
-        ((PasswordTableItem*)dbTable->item( row, 5 ))->password = STQLSupportPart::cryptStr( db[5] );
+        ((PasswordTableItem*)dbTable->item( row, 5 ))->password = SQLSupportPart::cryptStr( db[5] );
 
         i++;
     }
diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp
index c31a4499..9ce617e3 100644
--- a/languages/sql/sqlsupport_part.cpp
+++ b/languages/sql/sqlsupport_part.cpp
@@ -29,12 +29,12 @@
 #include "sqloutputwidget.h"
 #include "domutil.h"
 
-typedef KDevGenericFactory<STQLSupportPart> STQLSupportFactory;
+typedef KDevGenericFactory<SQLSupportPart> STQLSupportFactory;
 static const KDevPluginInfo data("kdevsqlsupport");
 K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, STQLSupportFactory( data ) )
 
-STQLSupportPart::STQLSupportPart( TQObject *tqparent, const char *name, const TQStringList& )
-        : KDevLanguageSupport ( &data, tqparent, name ? name : "STQLSupportPart" )
+SQLSupportPart::SQLSupportPart( TQObject *tqparent, const char *name, const TQStringList& )
+        : KDevLanguageSupport ( &data, tqparent, name ? name : "SQLSupportPart" )
 {
     setInstance( STQLSupportFactory::instance() );
     setXMLFile( "kdevsqlsupport.rc" );
@@ -46,7 +46,7 @@ STQLSupportPart::STQLSupportPart( TQObject *tqparent, const char *name, const TQ
 
     dbAction = new SqlListAction( this, i18n( "&Database Connections" ), 0, this, TQT_SLOT(activeConnectionChanged()), actionCollection(), "connection_combo" );
 
-    kdDebug( 9000 ) << "Creating STQLSupportPart" << endl;
+    kdDebug( 9000 ) << "Creating SQLSupportPart" << endl;
 
     connect( core(), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ),
              this, TQT_SLOT( projectConfigWidget( KDialogBase* ) ) );
@@ -61,13 +61,13 @@ STQLSupportPart::STQLSupportPart( TQObject *tqparent, const char *name, const TQ
 }
 
 
-STQLSupportPart::~STQLSupportPart()
+SQLSupportPart::~SQLSupportPart()
 {
     mainWindow()->removeView(m_widget);
     delete m_widget;
 }
 
-TQString STQLSupportPart::cryptStr(const TQString& aStr)
+TQString SQLSupportPart::cryptStr(const TQString& aStr)
 {
     TQString result;
     for (unsigned int i = 0; i < aStr.length(); i++)
@@ -76,12 +76,12 @@ TQString STQLSupportPart::cryptStr(const TQString& aStr)
     return result;
 }
 
-void STQLSupportPart::activeConnectionChanged()
+void SQLSupportPart::activeConnectionChanged()
 {
     updateCatalog();
 }
 
-void STQLSupportPart::clearConfig()
+void SQLSupportPart::clearConfig()
 {
     for ( TQStringList::Iterator it = conNames.begin(); it != conNames.end(); ++it ) {
         if ( TQSqlDatabase::tqcontains( *it ) ) {
@@ -96,7 +96,7 @@ void STQLSupportPart::clearConfig()
     dbAction->refresh();
 }
 
-void STQLSupportPart::loadConfig()
+void SQLSupportPart::loadConfig()
 {
     clearConfig();
 
@@ -130,7 +130,7 @@ void STQLSupportPart::loadConfig()
     dbAction->refresh();
 }
 
-void STQLSupportPart::projectConfigWidget( KDialogBase *dlg )
+void SQLSupportPart::projectConfigWidget( KDialogBase *dlg )
 {
     TQVBox *vbox = dlg->addVBoxPage( TQString( "SQL" ), i18n( "Specify Your Database Connections" ), BarIcon("source", KIcon::SizeMedium) );
     SqlConfigWidget *w = new SqlConfigWidget( (TQWidget*)vbox, "SQL config widget" );
@@ -140,7 +140,7 @@ void STQLSupportPart::projectConfigWidget( KDialogBase *dlg )
     connect( w, TQT_SIGNAL(newConfigSaved()), this, TQT_SLOT(loadConfig()) );
 }
 
-void STQLSupportPart::projectOpened()
+void SQLSupportPart::projectOpened()
 {
     connect( project(), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ),
              this, TQT_SLOT( addedFilesToProject( const TQStringList & ) ) );
@@ -155,12 +155,12 @@ void STQLSupportPart::projectOpened()
 }
 
 
-void STQLSupportPart::projectClosed()
+void SQLSupportPart::projectClosed()
 {
     clearConfig();
 }
 
-void STQLSupportPart::slotRun ()
+void SQLSupportPart::slotRun ()
 {
     TQString cName = dbAction->currentConnectionName();
     if ( cName.isEmpty() ) {
@@ -191,12 +191,12 @@ static TQString dbCaption(const TQSqlDatabase* db)
 }
 #endif
 
-void STQLSupportPart::parse()
+void SQLSupportPart::parse()
 {
     // @todo
 }
 
-void STQLSupportPart::updateCatalog()
+void SQLSupportPart::updateCatalog()
 {
     if (!project() || !dbAction)
         return;
@@ -236,7 +236,7 @@ void STQLSupportPart::updateCatalog()
     emit updatedSourceInfo();
 }
 
-void STQLSupportPart::addedFilesToProject( const TQStringList &fileList )
+void SQLSupportPart::addedFilesToProject( const TQStringList &fileList )
 {
     TQStringList::ConstIterator it;
 
@@ -248,7 +248,7 @@ void STQLSupportPart::addedFilesToProject( const TQStringList &fileList )
 }
 
 
-void STQLSupportPart::removedFilesFromProject( const TQStringList &fileList )
+void SQLSupportPart::removedFilesFromProject( const TQStringList &fileList )
 {
     TQStringList::ConstIterator it;
 
@@ -259,7 +259,7 @@ void STQLSupportPart::removedFilesFromProject( const TQStringList &fileList )
     emit updatedSourceInfo();
 }
 
-void STQLSupportPart::savedFile( const KURL &fileName )
+void SQLSupportPart::savedFile( const KURL &fileName )
 {
     if ( project() ->allFiles().tqcontains( fileName.path().mid ( project() ->projectDirectory().length() + 1 ) ) ) {
 //        parse( fileName );
@@ -267,12 +267,12 @@ void STQLSupportPart::savedFile( const KURL &fileName )
     }
 }
 
-KDevLanguageSupport::Features STQLSupportPart::features()
+KDevLanguageSupport::Features SQLSupportPart::features()
 {
     return Features( Classes | Functions );
 }
 
-KMimeType::List STQLSupportPart::mimeTypes( )
+KMimeType::List SQLSupportPart::mimeTypes( )
 {
     KMimeType::List list;
     KMimeType::Ptr mime = KMimeType::mimeType( "text/plain" );
diff --git a/languages/sql/sqlsupport_part.h b/languages/sql/sqlsupport_part.h
index 71007d3c..1e72eca1 100644
--- a/languages/sql/sqlsupport_part.h
+++ b/languages/sql/sqlsupport_part.h
@@ -14,15 +14,15 @@ class SqlListAction;
 class SqlOutputWidget;
 class CodeModel;
 
-class STQLSupportPart : public KDevLanguageSupport
+class SQLSupportPart : public KDevLanguageSupport
 {
   Q_OBJECT
   TQ_OBJECT
 
 public:
 
-    STQLSupportPart(TQObject *tqparent, const char *name, const TQStringList &);
-    virtual ~STQLSupportPart();
+    SQLSupportPart(TQObject *tqparent, const char *name, const TQStringList &);
+    virtual ~SQLSupportPart();
 
     static TQString cryptStr(const TQString& aStr);
     const TQStringList& connections() const { return conNames; }