From 3b144259fd41e23dc0e64d5e2a013a6cfc0355f3 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Wed, 30 May 2018 01:22:33 +0200 Subject: [PATCH] WIP: build works again at least on Qt4. --- scripts/mkqtdecl_common/produce.rb | 4 +- src/gsiqt/qt4/QtCore/gsiQtExternals.h | 4 +- src/gsiqt/qt4/QtDesigner/gsiQtExternals.h | 4 +- src/gsiqt/qt4/QtGui/gsiQtExternals.h | 4 +- src/gsiqt/qt4/QtNetwork/gsiQtExternals.h | 4 +- src/gsiqt/qt4/QtSql/gsiQtExternals.h | 4 +- src/gsiqt/qt4/QtXml/gsiQtExternals.h | 4 +- src/gsiqt/qtbasic/gsiQtAllExternals.h | 42 +++++++++++++++++++ src/gsiqt/qtbasic/qtbasic.pro | 3 +- src/lay/lay/gsiDeclLayApplication.cc | 3 +- src/lay/lay/gsiDeclLayHelpDialog.cc | 4 +- src/lay/lay/gsiDeclLayMainWindow.cc | 4 +- src/lay/lay/lay.pro | 6 +-- src/laybasic/laybasic/gsiDeclLayDialogs.cc | 9 ++-- src/laybasic/laybasic/gsiDeclLayLayoutView.cc | 4 +- src/laybasic/laybasic/laybasic.pro | 6 +-- src/with_all_libs.pri | 4 +- 17 files changed, 76 insertions(+), 37 deletions(-) create mode 100644 src/gsiqt/qtbasic/gsiQtAllExternals.h diff --git a/scripts/mkqtdecl_common/produce.rb b/scripts/mkqtdecl_common/produce.rb index 51afe05ab..3ce1529f5 100755 --- a/scripts/mkqtdecl_common/produce.rb +++ b/scripts/mkqtdecl_common/produce.rb @@ -3019,8 +3019,8 @@ END extfile.puts("*/") extfile.puts("") - extfile.puts("#if !defined(HDR_gsiQtExternals)") - extfile.puts("#define HDR_gsiQtExternals") + extfile.puts("#if !defined(HDR_gsi#{modn}Externals)") + extfile.puts("#define HDR_gsi#{modn}Externals") extfile.puts("") extfile.puts("#include \"gsiClassBase.h\"") diff --git a/src/gsiqt/qt4/QtCore/gsiQtExternals.h b/src/gsiqt/qt4/QtCore/gsiQtExternals.h index dcd8744a0..25745f8f1 100644 --- a/src/gsiqt/qt4/QtCore/gsiQtExternals.h +++ b/src/gsiqt/qt4/QtCore/gsiQtExternals.h @@ -27,8 +27,8 @@ This file has been created automatically */ -#if !defined(HDR_gsiQtExternals) -#define HDR_gsiQtExternals +#if !defined(HDR_gsiQtCoreExternals) +#define HDR_gsiQtCoreExternals #include "gsiClassBase.h" #include "gsiQtCoreCommon.h" diff --git a/src/gsiqt/qt4/QtDesigner/gsiQtExternals.h b/src/gsiqt/qt4/QtDesigner/gsiQtExternals.h index 7c1366cda..2ded53743 100644 --- a/src/gsiqt/qt4/QtDesigner/gsiQtExternals.h +++ b/src/gsiqt/qt4/QtDesigner/gsiQtExternals.h @@ -27,8 +27,8 @@ This file has been created automatically */ -#if !defined(HDR_gsiQtExternals) -#define HDR_gsiQtExternals +#if !defined(HDR_gsiQtDesignerExternals) +#define HDR_gsiQtDesignerExternals #include "gsiClassBase.h" #include "gsiQtDesignerCommon.h" diff --git a/src/gsiqt/qt4/QtGui/gsiQtExternals.h b/src/gsiqt/qt4/QtGui/gsiQtExternals.h index b029115a1..a74049318 100644 --- a/src/gsiqt/qt4/QtGui/gsiQtExternals.h +++ b/src/gsiqt/qt4/QtGui/gsiQtExternals.h @@ -27,8 +27,8 @@ This file has been created automatically */ -#if !defined(HDR_gsiQtExternals) -#define HDR_gsiQtExternals +#if !defined(HDR_gsiQtGuiExternals) +#define HDR_gsiQtGuiExternals #include "gsiClassBase.h" #include "gsiQtGuiCommon.h" diff --git a/src/gsiqt/qt4/QtNetwork/gsiQtExternals.h b/src/gsiqt/qt4/QtNetwork/gsiQtExternals.h index c692fe3df..dc5932a18 100644 --- a/src/gsiqt/qt4/QtNetwork/gsiQtExternals.h +++ b/src/gsiqt/qt4/QtNetwork/gsiQtExternals.h @@ -27,8 +27,8 @@ This file has been created automatically */ -#if !defined(HDR_gsiQtExternals) -#define HDR_gsiQtExternals +#if !defined(HDR_gsiQtNetworkExternals) +#define HDR_gsiQtNetworkExternals #include "gsiClassBase.h" #include "gsiQtNetworkCommon.h" diff --git a/src/gsiqt/qt4/QtSql/gsiQtExternals.h b/src/gsiqt/qt4/QtSql/gsiQtExternals.h index 829cb4623..3a57dc947 100644 --- a/src/gsiqt/qt4/QtSql/gsiQtExternals.h +++ b/src/gsiqt/qt4/QtSql/gsiQtExternals.h @@ -27,8 +27,8 @@ This file has been created automatically */ -#if !defined(HDR_gsiQtExternals) -#define HDR_gsiQtExternals +#if !defined(HDR_gsiQtSqlExternals) +#define HDR_gsiQtSqlExternals #include "gsiClassBase.h" #include "gsiQtSqlCommon.h" diff --git a/src/gsiqt/qt4/QtXml/gsiQtExternals.h b/src/gsiqt/qt4/QtXml/gsiQtExternals.h index 35b9ce57d..c0276bb71 100644 --- a/src/gsiqt/qt4/QtXml/gsiQtExternals.h +++ b/src/gsiqt/qt4/QtXml/gsiQtExternals.h @@ -27,8 +27,8 @@ This file has been created automatically */ -#if !defined(HDR_gsiQtExternals) -#define HDR_gsiQtExternals +#if !defined(HDR_gsiQtXmlExternals) +#define HDR_gsiQtXmlExternals #include "gsiClassBase.h" #include "gsiQtXmlCommon.h" diff --git a/src/gsiqt/qtbasic/gsiQtAllExternals.h b/src/gsiqt/qtbasic/gsiQtAllExternals.h new file mode 100644 index 000000000..79fdd8f3c --- /dev/null +++ b/src/gsiqt/qtbasic/gsiQtAllExternals.h @@ -0,0 +1,42 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2018 Matthias Koefferlein + + 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. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + + +#if !defined(HDR_gsiQtAllExternals_h) +# define HDR_gsiQtAllExternals_h + +# if defined(HAVE_QT5) + +... + +# else + +# include "../qt4/QtCore/gsiQtExternals.h" +# include "../qt4/QtGui/gsiQtExternals.h" +# include "../qt4/QtXml/gsiQtExternals.h" +# include "../qt4/QtSql/gsiQtExternals.h" +# include "../qt4/QtNetwork/gsiQtExternals.h" +# include "../qt4/QtDesigner/gsiQtExternals.h" + +# endif + +#endif diff --git a/src/gsiqt/qtbasic/qtbasic.pro b/src/gsiqt/qtbasic/qtbasic.pro index d20370fb2..ad1a197d2 100644 --- a/src/gsiqt/qtbasic/qtbasic.pro +++ b/src/gsiqt/qtbasic/qtbasic.pro @@ -20,4 +20,5 @@ SOURCES += \ HEADERS += \ gsiQt.h \ - gsiQtBasicCommon.h + gsiQtBasicCommon.h \ + gsiQtAllExternals.h diff --git a/src/lay/lay/gsiDeclLayApplication.cc b/src/lay/lay/gsiDeclLayApplication.cc index 87ca59f0b..d6465c334 100644 --- a/src/lay/lay/gsiDeclLayApplication.cc +++ b/src/lay/lay/gsiDeclLayApplication.cc @@ -20,12 +20,11 @@ */ - #include "layApplication.h" #include "layMainWindow.h" #include "laySignalHandler.h" #include "gsiDecl.h" -#include "gsiQtExternals.h" +#include "gsiQtAllExternals.h" #include "tlArch.h" namespace gsi diff --git a/src/lay/lay/gsiDeclLayHelpDialog.cc b/src/lay/lay/gsiDeclLayHelpDialog.cc index 960a3b979..b96c806d4 100644 --- a/src/lay/lay/gsiDeclLayHelpDialog.cc +++ b/src/lay/lay/gsiDeclLayHelpDialog.cc @@ -26,7 +26,7 @@ #include "layMainWindow.h" #include "laybasicCommon.h" #include "gsiDecl.h" -#include "gsiQtExternals.h" +#include "gsiQtAllExternals.h" namespace tl { @@ -53,7 +53,7 @@ lay::HelpDialog *new_help_dialog_with_parent (QWidget *parent, bool modal) return new lay::HelpDialog (parent, modal); } -Class decl_HelpDialog (QT_EXTERNAL_BASE (QDialog) "HelpDialog", +Class decl_HelpDialog (QT_EXTERNAL_BASE (QDialog) "lay", "HelpDialog", method ("new", new_help_dialog, "@brief Creates a new help dialog\n" "@args modal\n" diff --git a/src/lay/lay/gsiDeclLayMainWindow.cc b/src/lay/lay/gsiDeclLayMainWindow.cc index 541ccbac2..1205ec19d 100644 --- a/src/lay/lay/gsiDeclLayMainWindow.cc +++ b/src/lay/lay/gsiDeclLayMainWindow.cc @@ -22,7 +22,7 @@ #include "gsiDecl.h" -#include "gsiQtExternals.h" +#include "gsiQtAllExternals.h" #include "gsiSignals.h" #include "layMainWindow.h" @@ -38,7 +38,7 @@ void enable_edits (lay::MainWindow * /*main_window*/, bool enable) } } -Class decl_MainWindow (QT_EXTERNAL_BASE (QMainWindow) "MainWindow", +Class decl_MainWindow (QT_EXTERNAL_BASE (QMainWindow) "lay", "MainWindow", // QMainWindow interface gsi::method ("menu", &lay::MainWindow::menu, diff --git a/src/lay/lay/lay.pro b/src/lay/lay/lay.pro index 8a1ff4a69..68b10eea1 100644 --- a/src/lay/lay/lay.pro +++ b/src/lay/lay/lay.pro @@ -188,11 +188,11 @@ win32 { INCLUDEPATH += $$DESTDIR/laybasic/laybasic DEPENDPATH += $$DESTDIR/laybasic/laybasic -INCLUDEPATH += $$GSIQT_INC -DEPENDPATH += $$GSIQT_INC +INCLUDEPATH += $$QTBASIC_INC +DEPENDPATH += $$QTBASIC_INC equals(HAVE_QTBINDINGS, "1") { - LIBS += -lklayout_gsiqt + LIBS += -lklayout_qtbasic -lklayout_QtGui } INCLUDEPATH += $$RBA_INC diff --git a/src/laybasic/laybasic/gsiDeclLayDialogs.cc b/src/laybasic/laybasic/gsiDeclLayDialogs.cc index 0927c4a4c..9931ef052 100644 --- a/src/laybasic/laybasic/gsiDeclLayDialogs.cc +++ b/src/laybasic/laybasic/gsiDeclLayDialogs.cc @@ -20,10 +20,9 @@ */ - #include "gsiDecl.h" #include "gsiDeclBasic.h" -#include "gsiQtExternals.h" +#include "gsiQtAllExternals.h" #include "layBrowserDialog.h" #include "layBrowserPanel.h" @@ -267,7 +266,7 @@ BrowserDialog_Stub *new_browser_dialog_static_and_parent (QWidget *parent, const } #endif -Class decl_BrowserDialog (QT_EXTERNAL_BASE (QDialog) "BrowserDialog", +Class decl_BrowserDialog (QT_EXTERNAL_BASE (QDialog) "lay", "BrowserDialog", gsi::constructor ("new", &new_browser_dialog_with_source, "@brief Creates a HTML browser window with a \\BrowserSource as the source of HTML code\n" "@args source\n" @@ -453,7 +452,7 @@ lay::BrowserPanel *new_browser_panel (QWidget *parent) return new lay::BrowserPanel (parent); } -Class decl_BrowserPanel (QT_EXTERNAL_BASE (QWidget) "BrowserPanel", +Class decl_BrowserPanel (QT_EXTERNAL_BASE (QWidget) "lay", "BrowserPanel", gsi::constructor ("new", &new_browser_panel_with_source, "@brief Creates a HTML browser widget with a \\BrowserSource as the source of HTML code\n" "@args parent, source\n" @@ -1165,7 +1164,7 @@ static int warning (const std::string &title, const std::string &text, int butto struct MessageBox { }; -Class decl_MessageBox (QT_EXTERNAL_BASE (QMainWindow) "MessageBox", +Class decl_MessageBox (QT_EXTERNAL_BASE (QMainWindow) "lay", "MessageBox", gsi::method ("Ok|#b_ok", &b_ok, "@brief A constant describing the 'Ok' button") + gsi::method ("Cancel|#b_cancel", &b_cancel, "@brief A constant describing the 'Cancel' button") + gsi::method ("Yes|#b_yes", &b_yes, "@brief A constant describing the 'Yes' button") + diff --git a/src/laybasic/laybasic/gsiDeclLayLayoutView.cc b/src/laybasic/laybasic/gsiDeclLayLayoutView.cc index 9ecd2014c..eb77e6822 100644 --- a/src/laybasic/laybasic/gsiDeclLayLayoutView.cc +++ b/src/laybasic/laybasic/gsiDeclLayLayoutView.cc @@ -367,7 +367,7 @@ static lay::LayoutView *new_view () return new lay::LayoutView (0, false, 0); } -Class decl_LayoutView ("LayoutView", +Class decl_LayoutView ("lay", "LayoutView", gsi::constructor ("new", &new_view, "@brief Creates a standalone view\n" "\n" @@ -1766,7 +1766,7 @@ static void cv_show_all_cells (lay::CellViewRef *cv) } } -Class decl_CellView ("CellView", +Class decl_CellView ("lay", "CellView", method ("==", static_cast (&lay::CellViewRef::operator==), "@brief Equality: indicates whether the cellviews refer to the same one\n" "@args other\n" diff --git a/src/laybasic/laybasic/laybasic.pro b/src/laybasic/laybasic/laybasic.pro index 7ff5d66c2..a0925cf7a 100644 --- a/src/laybasic/laybasic/laybasic.pro +++ b/src/laybasic/laybasic/laybasic.pro @@ -277,10 +277,10 @@ INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb -INCLUDEPATH += $$GSIQT_INC -DEPENDPATH += $$GSIQT_INC +INCLUDEPATH += $$QTBASIC_INC +DEPENDPATH += $$QTBASIC_INC equals(HAVE_QTBINDINGS, "1") { - LIBS += -lklayout_gsiqt + LIBS += -lklayout_qtbasic -lklayout_QtGui -lklayout_QtCore } diff --git a/src/with_all_libs.pri b/src/with_all_libs.pri index 02cb4d3fc..ec9be13fc 100644 --- a/src/with_all_libs.pri +++ b/src/with_all_libs.pri @@ -10,9 +10,7 @@ INCLUDEPATH += $$DESTDIR/laybasic $$DESTDIR/lay $$DESTDIR/ext DEPENDPATH += $$DESTDIR/laybasic $$DESTDIR/lay $$DESTDIR/ext equals(HAVE_QTBINDINGS, "1") { - INCLUDEPATH += $$PWD/gsiqt - DEPENDPATH += $$PWD/gsiqt - LIBS += -lklayout_gsiqt + LIBS += -lklayout_qtbasic -lklayout_QtGui -lklayout_QtCore } equals(HAVE_RUBY, "1") {