haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the moving truck leaving behind IO_ERROR and friends

This commit is contained in:
Marek Roszko 2023-10-02 18:16:17 -04:00
parent 987e382f96
commit aa0d39dfe4
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/CMakeLists.txt
View File

@ -432,7 +432,6 @@ set( COMMON_SRCS
eda_tools.cpp eda_tools.cpp
env_paths.cpp env_paths.cpp
env_vars.cpp env_vars.cpp
exceptions.cpp
executable_names.cpp executable_names.cpp
filename_resolver.cpp filename_resolver.cpp
file_history.cpp file_history.cpp

7
common/swig/kicad.i
View File

@ -37,6 +37,10 @@
%include <std_set.i> %include <std_set.i>
%include <stdint.i> %include <stdint.i>
// SWIG is awful and cant just ignore declspec
#define KICOMMON_API
#define GAL_API
%include "ki_exception.i" // affects all that follow it %include "ki_exception.i" // affects all that follow it
/* /*
@ -118,9 +122,6 @@ principle should be easily implemented by adapting the current STL containers.
// TODO: wrapper of BASE_SET (see std::bitset<PCB_LAYER_ID_COUNT> BASE_SET;) // TODO: wrapper of BASE_SET (see std::bitset<PCB_LAYER_ID_COUNT> BASE_SET;)
#define KICOMMON_API
#define GAL_API
// header files that must be wrapped // header files that must be wrapped
%include <outline_mode.h> %include <outline_mode.h>

9
include/ki_exception.h
View File

@ -25,6 +25,7 @@
#ifndef KI_EXCEPTION_H_ #ifndef KI_EXCEPTION_H_
#define KI_EXCEPTION_H_ #define KI_EXCEPTION_H_
#include <kicommon.h>
#include <wx/string.h> #include <wx/string.h>
@ -41,7 +42,7 @@
* Hold a translatable error message and may be used when throwing exceptions containing a * Hold a translatable error message and may be used when throwing exceptions containing a
* translated error message. * translated error message.
*/ */
class KI_PARAM_ERROR // similar to std::invalid_argument for instance class KICOMMON_API KI_PARAM_ERROR // similar to std::invalid_argument for instance
{ {
public: public:
/** /**
@ -72,7 +73,7 @@ private:
* *
* @author Dick Hollenbeck * @author Dick Hollenbeck
*/ */
class IO_ERROR // : std::exception class KICOMMON_API IO_ERROR // : std::exception
{ {
public: public:
/** /**
@ -115,7 +116,7 @@ protected:
* *
* @author Dick Hollenbeck * @author Dick Hollenbeck
*/ */
struct PARSE_ERROR : public IO_ERROR struct KICOMMON_API PARSE_ERROR : public IO_ERROR
{ {
int lineNumber; ///< at which line number, 1 based index. int lineNumber; ///< at which line number, 1 based index.
int byteIndex; ///< at which byte offset within the line, 1 based index int byteIndex; ///< at which byte offset within the line, 1 based index
@ -171,7 +172,7 @@ protected:
* by a file generated by a newer version of KiCad than this. This can be used to generate * by a file generated by a newer version of KiCad than this. This can be used to generate
* more informative error messages. * more informative error messages.
*/ */
struct FUTURE_FORMAT_ERROR : public PARSE_ERROR struct KICOMMON_API FUTURE_FORMAT_ERROR : public PARSE_ERROR
{ {
wxString requiredVersion; ///< version or date of KiCad required to open file wxString requiredVersion; ///< version or date of KiCad required to open file

1
plugins/3d/vrml/CMakeLists.txt
View File

@ -24,7 +24,6 @@ include_directories(
# #
add_library( s3d_plugin_vrml MODULE add_library( s3d_plugin_vrml MODULE
${CMAKE_SOURCE_DIR}/common/exceptions.cpp
vrml.cpp vrml.cpp
x3d.cpp x3d.cpp
wrlproc.cpp wrlproc.cpp