SIM/qucs_s
1
0
Fork 0
mirror of https://github.com/ra3xdh/qucs_s synced 2025-03-28 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix multiple enum definition

Browse Source
This commit is contained in:
Krasilnikov Sergey 2023-06-16 16:20:34 +03:00
parent 68a37e44ab
commit b1681daaab
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qucs-filter/qucsfilter.cpp
View File

@ -40,6 +40,7 @@
#include "qucsfilter.h"
#include "helpdialog.h"
#include "material_props.h"
#include "../qucs/extsimkernels/spicecompat.h"
QucsFilter::QucsFilter()
{

6
qucs-filter/qucsfilter.h
View File

@ -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

1
qucs-powercombining/main.cpp
View File

@ -23,6 +23,7 @@
#include <QApplication>
#include "qucspowercombiningtool.h"
#include "../qucs/extsimkernels/spicecompat.h"
struct tQucsSettings QucsSettings;

6
qucs-powercombining/qucspowercombiningtool.h
View File

@ -29,9 +29,9 @@
#include <QSvgWidget>
#include <QDebug>
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

4
qucs/extsimkernels/simsettingsdialog.cpp
View File

@ -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();
}