From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 14 Jun 2011 16:45:05 +0000 Subject: TQt4 port kdevelop This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- .../pcsimporter/qt4importer/kdevqt4importer.cpp | 42 +++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp') diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp index d4635ba4..5864659c 100644 --- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp @@ -22,15 +22,15 @@ #include #include -K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory( "kdevqt4importer" ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory( "kdevqt4importer" ) ) -KDevQt4Importer::KDevQt4Importer( TQObject * parent, const char * name, const TQStringList& ) - : KDevPCSImporter( parent, name ) +KDevTQt4Importer::KDevTQt4Importer( TQObject * tqparent, const char * name, const TQStringList& ) + : KDevPCSImporter( tqparent, name ) { m_qtfile = 0; } -KDevQt4Importer::~KDevQt4Importer() +KDevTQt4Importer::~KDevTQt4Importer() { if (m_qtfile) delete m_qtfile; @@ -38,7 +38,7 @@ KDevQt4Importer::~KDevQt4Importer() m_qtfile = 0; } -TQStringList KDevQt4Importer::fileList() +TQStringList KDevTQt4Importer::fileList() { if( !m_settings ) return TQStringList(); @@ -49,18 +49,18 @@ TQStringList KDevQt4Importer::fileList() KTempFile ifile; TQTextStream &is = *ifile.textStream(); - is << "#include \n" - << "#undef Q_SLOTS\n#undef Q_SIGNALS\n#undef slots\n#undef signals" - << "#define Q_SLOTS slots\n" - << "#define Q_SIGNALS signals\n" - << "#include \n" - << "#include \n" - << "#include \n" - << "#include \n" - << "#include \n" - << "#include \n" - << "#include \n" - << "#include \n"; + is << "#include \n" + << "#undef slots\n#undef signals\n#undef slots\n#undef signals" + << "#define slots slots\n" + << "#define signals signals\n" + << "#include \n" + << "#include \n" + << "#include \n" + << "#include \n" + << "#include \n" + << "#include \n" + << "#include \n" + << "#include \n"; @@ -86,22 +86,22 @@ TQStringList KDevQt4Importer::fileList() return m_qtfile->name(); } -TQStringList KDevQt4Importer::includePaths() +TQStringList KDevTQt4Importer::includePaths() { if( !m_settings || !m_qtfile) return TQStringList(); TQStringList includePaths; includePaths.push_back( m_settings->qtDir() ); - includePaths.push_back( m_settings->qtDir() + "/Qt" ); + includePaths.push_back( m_settings->qtDir() + "/TQt" ); /// @todo add mkspec return includePaths; } -TQWidget * KDevQt4Importer::createSettingsPage( TQWidget * parent, const char * name ) +TQWidget * KDevTQt4Importer::createSettingsPage( TQWidget * tqparent, const char * name ) { - m_settings = new SettingsDialog( parent, name ); + m_settings = new SettingsDialog( tqparent, name ); return m_settings; } -- cgit v1.2.3