From 6392f5a9dfce2bf83617d49bb7f332181ec6004e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 25 May 2014 15:37:31 +0900 Subject: Revert "Finish renaming tdevelop components" This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73. --- .../cpp/pcsimporter/qt4importer/CMakeLists.txt | 8 +- languages/cpp/pcsimporter/qt4importer/Makefile.am | 12 +-- .../pcsimporter/qt4importer/kdevqt4importer.cpp | 107 +++++++++++++++++++++ .../qt4importer/kdevqt4importer.desktop | 34 +++++++ .../cpp/pcsimporter/qt4importer/kdevqt4importer.h | 40 ++++++++ .../pcsimporter/qt4importer/tdevqt4importer.cpp | 107 --------------------- .../qt4importer/tdevqt4importer.desktop | 34 ------- .../cpp/pcsimporter/qt4importer/tdevqt4importer.h | 40 -------- 8 files changed, 191 insertions(+), 191 deletions(-) create mode 100644 languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp create mode 100644 languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop create mode 100644 languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h delete mode 100644 languages/cpp/pcsimporter/qt4importer/tdevqt4importer.cpp delete mode 100644 languages/cpp/pcsimporter/qt4importer/tdevqt4importer.desktop delete mode 100644 languages/cpp/pcsimporter/qt4importer/tdevqt4importer.h (limited to 'languages/cpp/pcsimporter/qt4importer') diff --git a/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt b/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt index 908c66fc..8e29fdec 100644 --- a/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt +++ b/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt @@ -24,14 +24,14 @@ link_directories( ##### other data ################################ -install( FILES tdevqt4importer.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevqt4importer.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevqt4importer (module) ############### +##### libkdevqt4importer (module) ############### -tde_add_kpart( libtdevqt4importer AUTOMOC +tde_add_kpart( libkdevqt4importer AUTOMOC SOURCES - tdevqt4importer.cpp settingsdialogbase.ui + kdevqt4importer.cpp settingsdialogbase.ui settingsdialog.cpp LINK lang_interfaces-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/languages/cpp/pcsimporter/qt4importer/Makefile.am b/languages/cpp/pcsimporter/qt4importer/Makefile.am index 935c7d49..12f12104 100644 --- a/languages/cpp/pcsimporter/qt4importer/Makefile.am +++ b/languages/cpp/pcsimporter/qt4importer/Makefile.am @@ -1,11 +1,11 @@ INCLUDES = -I$(top_srcdir)/languages/lib/interfaces \ -I$(top_srcdir)/lib/interfaces $(all_includes) METASOURCES = AUTO -kde_module_LTLIBRARIES = libtdevqt4importer.la +kde_module_LTLIBRARIES = libkdevqt4importer.la -noinst_HEADERS = tdevqt4importer.h settingsdialog.h -libtdevqt4importer_la_SOURCES = tdevqt4importer.cpp settingsdialogbase.ui settingsdialog.cpp -kde_services_DATA = tdevqt4importer.desktop -libtdevqt4importer_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ +noinst_HEADERS = kdevqt4importer.h settingsdialog.h +libkdevqt4importer_la_SOURCES = kdevqt4importer.cpp settingsdialogbase.ui settingsdialog.cpp +kde_services_DATA = kdevqt4importer.desktop +libkdevqt4importer_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ $(top_builddir)/languages/lib/interfaces/liblang_interfaces.la -libtdevqt4importer_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) +libkdevqt4importer_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp new file mode 100644 index 00000000..0289c7a4 --- /dev/null +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp @@ -0,0 +1,107 @@ +/*************************************************************************** + * Copyright (C) 2003 by Roberto Raggi * + * roberto@kdevelop.org * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ + +#include "kdevqt4importer.h" +#include "kdevqt4importer.moc" +#include "settingsdialog.h" + +#include +#include +#include +#include + +#include +#include +#include + +K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory( "kdevqt4importer" ) ) + +KDevQt4Importer::KDevQt4Importer( TQObject * parent, const char * name, const TQStringList& ) + : KDevPCSImporter( parent, name ) +{ + m_qtfile = 0; +} + +KDevQt4Importer::~KDevQt4Importer() +{ + if (m_qtfile) + delete m_qtfile; + + m_qtfile = 0; +} + +TQStringList KDevQt4Importer::fileList() +{ + if( !m_settings ) + return TQStringList(); + + if (m_qtfile) + delete m_qtfile; + + KTempFile ifile; + TQTextStream &is = *ifile.textStream(); + + 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"; + + + + TDEProcess proc; + proc << "cpp" << "-nostdinc" << "-xc++"; + + m_qtfile = new KTempFile(); + + // include paths + TQStringList paths = includePaths(); + for (TQStringList::Iterator it = paths.begin(); it != paths.end(); ++it) + proc << "-I" << *it; + + ifile.close(); + + TQString o; + o += "-o"; + o += m_qtfile->name(); + + proc << ifile.name() << o; + proc.start(TDEProcess::Block); + + return m_qtfile->name(); +} + +TQStringList KDevQt4Importer::includePaths() +{ + if( !m_settings || !m_qtfile) + return TQStringList(); + + TQStringList includePaths; + includePaths.push_back( m_settings->qtDir() ); + includePaths.push_back( m_settings->qtDir() + "/TQt" ); + + /// @todo add mkspec + return includePaths; +} + +TQWidget * KDevQt4Importer::createSettingsPage( TQWidget * parent, const char * name ) +{ + m_settings = new SettingsDialog( parent, name ); + return m_settings; +} + diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop new file mode 100644 index 00000000..5d91d917 --- /dev/null +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop @@ -0,0 +1,34 @@ +[Desktop Entry] +Type=Service +Name=KDevQt4Importer +Name[de]=Qt4-PCS-Import (TDevelop) +Name[fr]=KDevQtImporter +Name[nds]=Qt4-PCS-Import (TDevelop) +Name[ru]=KDevQt 4Importer +Name[sv]=TDevelop QT4-import +Comment=TDevelop Qt4 PCS Importer +Comment[ca]=Importador PCS de Qt4 per a TDevelop +Comment[da]=TDevelop Qt4 PCS importør +Comment[de]=Qt4-Import für persistenten Klassenspeicher +Comment[el]=Εισαγωγέας PCS TDevelop Qt4 +Comment[es]=Importador PCS de Qt4 de TDevelop +Comment[et]=TDevelopi Qt4 PCS importija +Comment[fr]=Importation PCS de Qt4 pour TDevelop +Comment[hu]=TDevelop Qt4 PCS-importáló +Comment[it]=Importatore PCS di Qt4 di TDevelop +Comment[ja]=TDevelop Qt4 PCS インポータ +Comment[nds]=Qt4-Import för duerhaftig Klassenspieker +Comment[pl]=TDevelop: importowanie PCS Qt4 +Comment[pt]=Importador de PCS para Qt4 do TDevelop +Comment[pt_BR]=Importador de PCS para Qt4 do TDevelop +Comment[ru]=Импорт Qt 4 PCS в TDevelop +Comment[sk]=TDevelop Qt4 PCS import +Comment[sr]=TDevelop-ов Qt4 PCS увозник +Comment[sr@Latn]=TDevelop-ov Qt4 PCS uvoznik +Comment[sv]=TDevelop QT4 PCS-import +Comment[zh_TW]=TDevelop Qt4 PCS 匯入器 +Icon=gear +ServiceTypes=TDevelop/PCSImporter +X-TDE-Library=libkdevqt4importer +X-TDevelop-PCSImporter= +X-TDevelop-Version=5 diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h new file mode 100644 index 00000000..3b9563f3 --- /dev/null +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h @@ -0,0 +1,40 @@ +/*************************************************************************** + * Copyright (C) 2003 by Roberto Raggi * + * roberto@kdevelop.org * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ + +#ifndef KDEVTQTIMPORTER_H +#define KDEVTQTIMPORTER_H + +#include +#include + +class SettingsDialog; +class KTempFile; + +class KDevQt4Importer : public KDevPCSImporter +{ + Q_OBJECT + +public: + KDevQt4Importer( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); + virtual ~KDevQt4Importer(); + + virtual TQString dbName() const { return TQString::fromLatin1("TQt4"); } + virtual TQStringList fileList(); + virtual TQStringList includePaths(); + + virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); + +private: + TQGuardedPtr m_settings; + KTempFile *m_qtfile; +}; + +#endif diff --git a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.cpp deleted file mode 100644 index fefa57ee..00000000 --- a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2003 by Roberto Raggi * - * roberto@kdevelop.org * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#include "tdevqt4importer.h" -#include "tdevqt4importer.moc" -#include "settingsdialog.h" - -#include -#include -#include -#include - -#include -#include -#include - -K_EXPORT_COMPONENT_FACTORY( libtdevqt4importer, KGenericFactory( "tdevqt4importer" ) ) - -TDevQt4Importer::TDevQt4Importer( TQObject * parent, const char * name, const TQStringList& ) - : TDevPCSImporter( parent, name ) -{ - m_qtfile = 0; -} - -TDevQt4Importer::~TDevQt4Importer() -{ - if (m_qtfile) - delete m_qtfile; - - m_qtfile = 0; -} - -TQStringList TDevQt4Importer::fileList() -{ - if( !m_settings ) - return TQStringList(); - - if (m_qtfile) - delete m_qtfile; - - KTempFile ifile; - TQTextStream &is = *ifile.textStream(); - - 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"; - - - - TDEProcess proc; - proc << "cpp" << "-nostdinc" << "-xc++"; - - m_qtfile = new KTempFile(); - - // include paths - TQStringList paths = includePaths(); - for (TQStringList::Iterator it = paths.begin(); it != paths.end(); ++it) - proc << "-I" << *it; - - ifile.close(); - - TQString o; - o += "-o"; - o += m_qtfile->name(); - - proc << ifile.name() << o; - proc.start(TDEProcess::Block); - - return m_qtfile->name(); -} - -TQStringList TDevQt4Importer::includePaths() -{ - if( !m_settings || !m_qtfile) - return TQStringList(); - - TQStringList includePaths; - includePaths.push_back( m_settings->qtDir() ); - includePaths.push_back( m_settings->qtDir() + "/TQt" ); - - /// @todo add mkspec - return includePaths; -} - -TQWidget * TDevQt4Importer::createSettingsPage( TQWidget * parent, const char * name ) -{ - m_settings = new SettingsDialog( parent, name ); - return m_settings; -} - diff --git a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.desktop b/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.desktop deleted file mode 100644 index cf42c497..00000000 --- a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.desktop +++ /dev/null @@ -1,34 +0,0 @@ -[Desktop Entry] -Type=Service -Name=TDevQt4Importer -Name[de]=Qt4-PCS-Import (TDevelop) -Name[fr]=TDevQtImporter -Name[nds]=Qt4-PCS-Import (TDevelop) -Name[ru]=TDevQt 4Importer -Name[sv]=TDevelop QT4-import -Comment=TDevelop Qt4 PCS Importer -Comment[ca]=Importador PCS de Qt4 per a TDevelop -Comment[da]=TDevelop Qt4 PCS importør -Comment[de]=Qt4-Import für persistenten Klassenspeicher -Comment[el]=Εισαγωγέας PCS TDevelop Qt4 -Comment[es]=Importador PCS de Qt4 de TDevelop -Comment[et]=TDevelopi Qt4 PCS importija -Comment[fr]=Importation PCS de Qt4 pour TDevelop -Comment[hu]=TDevelop Qt4 PCS-importáló -Comment[it]=Importatore PCS di Qt4 di TDevelop -Comment[ja]=TDevelop Qt4 PCS インポータ -Comment[nds]=Qt4-Import för duerhaftig Klassenspieker -Comment[pl]=TDevelop: importowanie PCS Qt4 -Comment[pt]=Importador de PCS para Qt4 do TDevelop -Comment[pt_BR]=Importador de PCS para Qt4 do TDevelop -Comment[ru]=Импорт Qt 4 PCS в TDevelop -Comment[sk]=TDevelop Qt4 PCS import -Comment[sr]=TDevelop-ов Qt4 PCS увозник -Comment[sr@Latn]=TDevelop-ov Qt4 PCS uvoznik -Comment[sv]=TDevelop QT4 PCS-import -Comment[zh_TW]=TDevelop Qt4 PCS 匯入器 -Icon=gear -ServiceTypes=TDevelop/PCSImporter -X-TDE-Library=libtdevqt4importer -X-TDevelop-PCSImporter= -X-TDevelop-Version=5 diff --git a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.h b/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.h deleted file mode 100644 index 53f6a18e..00000000 --- a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.h +++ /dev/null @@ -1,40 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2003 by Roberto Raggi * - * roberto@kdevelop.org * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#ifndef TDEVTQTIMPORTER_H -#define TDEVTQTIMPORTER_H - -#include -#include - -class SettingsDialog; -class KTempFile; - -class TDevQt4Importer : public TDevPCSImporter -{ - Q_OBJECT - -public: - TDevQt4Importer( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); - virtual ~TDevQt4Importer(); - - virtual TQString dbName() const { return TQString::fromLatin1("TQt4"); } - virtual TQStringList fileList(); - virtual TQStringList includePaths(); - - virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); - -private: - TQGuardedPtr m_settings; - KTempFile *m_qtfile; -}; - -#endif -- cgit v1.2.1