Fix kdevelop Qt3 compilation

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

11 files changed, 58 insertions, 58 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 <te@profzone.ch>
 */
-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 );