diff --git a/qucs-filter/qucsfilter.cpp b/qucs-filter/qucsfilter.cpp index 6e5517bd..9364e622 100644 --- a/qucs-filter/qucsfilter.cpp +++ b/qucs-filter/qucsfilter.cpp @@ -40,6 +40,7 @@ #include "qucsfilter.h" #include "helpdialog.h" #include "material_props.h" +#include "../qucs/extsimkernels/spicecompat.h" QucsFilter::QucsFilter() { diff --git a/qucs-filter/qucsfilter.h b/qucs-filter/qucsfilter.h index 299f8e31..d7f2a2c2 100644 --- a/qucs-filter/qucsfilter.h +++ b/qucs-filter/qucsfilter.h @@ -30,9 +30,9 @@ class QLabel; class QIntValidator; class QDoubleValidator; -namespace spicecompat { - enum Simulator {simNgspice = 0, simXyceSer = 1, simXycePar = 2, simSpiceOpus = 3, simQucsator = 4, simNotSpecified=10}; -} +//namespace spicecompat { +// enum Simulator {simNgspice = 0, simXyceSer = 1, simXycePar = 2, simSpiceOpus = 3, simQucsator = 4, simNotSpecified=10}; +//} struct tQucsSettings { int x, y; // position of main window diff --git a/qucs-powercombining/main.cpp b/qucs-powercombining/main.cpp index a4ccc906..8df5a88e 100644 --- a/qucs-powercombining/main.cpp +++ b/qucs-powercombining/main.cpp @@ -23,6 +23,7 @@ #include #include "qucspowercombiningtool.h" +#include "../qucs/extsimkernels/spicecompat.h" struct tQucsSettings QucsSettings; diff --git a/qucs-powercombining/qucspowercombiningtool.h b/qucs-powercombining/qucspowercombiningtool.h index 48289440..07db9653 100644 --- a/qucs-powercombining/qucspowercombiningtool.h +++ b/qucs-powercombining/qucspowercombiningtool.h @@ -29,9 +29,9 @@ #include #include -namespace spicecompat { - enum Simulator {simNgspice = 0, simXyceSer = 1, simXycePar = 2, simSpiceOpus = 3, simQucsator = 4, simNotSpecified=10}; -} +//namespace spicecompat { +// enum Simulator {simNgspice = 0, simXyceSer = 1, simXycePar = 2, simSpiceOpus = 3, simQucsator = 4, simNotSpecified=10}; +//} struct tQucsSettings { int x, y; // position of main window diff --git a/qucs/extsimkernels/simsettingsdialog.cpp b/qucs/extsimkernels/simsettingsdialog.cpp index 944c7a0b..9a71bc45 100644 --- a/qucs/extsimkernels/simsettingsdialog.cpp +++ b/qucs/extsimkernels/simsettingsdialog.cpp @@ -189,8 +189,8 @@ void SimSettingsDialog::slotApply() void SimSettingsDialog::slotCancel() { - if (QucsSettings.DefaultSimulator == spicecompat::simNotSpecified) - QucsSettings.DefaultSimulator = spicecompat::simQucsator; + //if (QucsSettings.DefaultSimulator == spicecompat::simNotSpecified) + //QucsSettings.DefaultSimulator = spicecompat::simQucsator; reject(); }