Skip to content

Commit

Permalink
slic3r: Fix missing includes
Browse files Browse the repository at this point in the history
Fix a lot of "undeclared" errors during compilation on top of the
current GNOME 45 Flatpak SDK.
  • Loading branch information
hadess authored and lanewei120 committed Jan 2, 2024
1 parent 4c83631 commit d310e4c
Show file tree
Hide file tree
Showing 88 changed files with 140 additions and 7 deletions.
2 changes: 2 additions & 0 deletions src/slic3r/GUI/AMSMaterialsSetting.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include "GUI_App.hpp"
#include "libslic3r/Preset.hpp"
#include "I18N.hpp"
#include <boost/log/trivial.hpp>
#include <wx/colordlg.h>
#include <wx/dcgraph.h>
#include "CalibUtils.hpp"

Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/AMSMaterialsSetting.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "GUI_Utils.hpp"
#include "DeviceManager.hpp"
#include "wx/clrpicker.h"
#include "wx/colourdata.h"
#include "Widgets/RadioBox.hpp"
#include "Widgets/Button.hpp"
#include "Widgets/RoundedRectangle.hpp"
Expand Down
2 changes: 2 additions & 0 deletions src/slic3r/GUI/Auxiliary.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#include <wx/arrstr.h>
#include <wx/tglbtn.h>

#include <boost/log/trivial.hpp>

#include "wxExtensions.hpp"
#include "GUI_App.hpp"
#include "GUI_ObjectList.hpp"
Expand Down
4 changes: 4 additions & 0 deletions src/slic3r/GUI/AuxiliaryDataViewModel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
#include "libslic3r/Model.hpp"
#include "libslic3r/Format/bbs_3mf.hpp"

#include <boost/log/trivial.hpp>

#include <wx/log.h>

const static std::array<wxString, 4> s_default_folders = {
_L("Model Pictures"),
_L("Bill of Materials"),
Expand Down
2 changes: 1 addition & 1 deletion src/slic3r/GUI/AuxiliaryDataViewModel.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "I18N.hpp"

#include <filesystem>
#include <boost/filesystem.hpp>

class AuxiliaryModelNode;
WX_DEFINE_ARRAY_PTR(AuxiliaryModelNode*, AuxiliaryModelNodePtrArray);
Expand Down
2 changes: 2 additions & 0 deletions src/slic3r/GUI/AuxiliaryDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

#include "libslic3r/Utils.hpp"

#include <boost/property_tree/ptree.hpp>

namespace pt = boost::property_tree;
typedef pt::ptree JSON;

Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/BBLStatusBar.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define BBLSTATUSBAR_HPP

#include <wx/panel.h>
#include <wx/sizer.h>
#include <wx/stattext.h>

#include <memory>
Expand Down
2 changes: 1 addition & 1 deletion src/slic3r/GUI/BBLStatusBarSend.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "I18N.hpp"

#include <iostream>

#include <regex>

namespace Slic3r {

Expand Down
3 changes: 3 additions & 0 deletions src/slic3r/GUI/BBLTopbar.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "BBLTopbar.hpp"
#include "wx/artprov.h"
#include "wx/aui/framemanager.h"
#include "wx/display.h"
#include "I18N.hpp"
#include "GUI_App.hpp"
#include "GUI.hpp"
Expand All @@ -10,6 +11,8 @@
#include "WebViewDialog.hpp"
#include "PartPlate.hpp"

#include <boost/log/trivial.hpp>

#define TOPBAR_ICON_SIZE 18
#define TOPBAR_TITLE_WIDTH 300

Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/BindDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include "GUI_App.hpp"

#include <wx/wx.h>
#include <wx/mstream.h>
#include <wx/sizer.h>
#include <wx/statbox.h>
#include "wx/evtloop.h"
Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/CameraPopup.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <wx/bitmap.h>
#include <wx/image.h>
#include <wx/sizer.h>
#include <wx/timer.h>
#include <wx/gbsizer.h>
#include <wx/webrequest.h>
#include <wx/hyperlink.h>
Expand Down
2 changes: 2 additions & 0 deletions src/slic3r/GUI/CreatePresetsDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
#include <unordered_set>
#include <openssl/md5.h>
#include <openssl/evp.h>
#include <boost/nowide/cstdio.hpp>
#include <wx/dcgraph.h>
#include <wx/tooltip.h>
#include "libslic3r/PresetBundle.hpp"
#include "I18N.hpp"
#include "GUI_App.hpp"
Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/DeviceManager.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define slic3r_DeviceManager_hpp_

#include <map>
#include <mutex>
#include <vector>
#include <string>
#include <memory>
Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/ExtrusionCalibration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "MsgDialog.hpp"
#include "libslic3r/Preset.hpp"
#include "I18N.hpp"
#include <boost/log/trivial.hpp>
#include <wx/dcgraph.h>

namespace Slic3r { namespace GUI {
Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/GCodeViewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include "GCodeViewer.hpp"

#include "libslic3r/BuildVolume.hpp"
#include "libslic3r/ClipperUtils.hpp"
#include "libslic3r/Print.hpp"
#include "libslic3r/Geometry.hpp"
#include "libslic3r/Model.hpp"
Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/GLTexture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

#include "libslic3r/Utils.hpp"
#include "GUI_App.hpp"
#include <boost/log/trivial.hpp>
#include <wx/dcgraph.h>
namespace Slic3r {
namespace GUI {
Expand Down
3 changes: 3 additions & 0 deletions src/slic3r/GUI/GLTexture.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
#include <vector>
#include <thread>

#include <wx/colour.h>
#include <wx/font.h>

class wxImage;

namespace Slic3r {
Expand Down
2 changes: 2 additions & 0 deletions src/slic3r/GUI/GUI_App.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
#include <boost/lexical_cast.hpp>
#include <boost/log/trivial.hpp>
#include <boost/nowide/convert.hpp>
#include <boost/property_tree/ptree.hpp>
#include <boost/property_tree/json_parser.hpp>

#include <wx/stdpaths.h>
#include <wx/imagpng.h>
Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/GUI_Colors.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define slic3r_GUI_Colors_hpp_

#include "imgui/imgui.h"
#include <array>

enum RenderCol_ {
RenderCol_3D_Background = 0,
Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/GUI_Init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// To show a message box if GUI initialization ends up with an exception thrown.
#include <wx/msgdlg.h>

#include <boost/log/trivial.hpp>
#include <boost/nowide/iostream.hpp>
#include <boost/nowide/convert.hpp>

Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/GUI_ObjectTable.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "wx/clipbrd.h"
#include "wx/display.h"

#include "SelectMachine.hpp"
#include "I18N.hpp"
Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

#include <GL/glew.h>

#include <boost/log/trivial.hpp>

namespace Slic3r::GUI {

Expand Down
2 changes: 2 additions & 0 deletions src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#include "slic3r/GUI/GLCanvas3D.hpp"
#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"

#include <boost/log/trivial.hpp>

#include <GL/glew.h>

#include "slic3r/GUI/GUI_App.hpp"
Expand Down
3 changes: 3 additions & 0 deletions src/slic3r/GUI/Gizmos/GLGizmoText.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Include GLGizmoBase.hpp before I18N.hpp as it includes some libigl code, which overrides our localization "L" macro.
#include "GLGizmoText.hpp"
#include "libslic3r/ClipperUtils.hpp"
#include "slic3r/GUI/GLCanvas3D.hpp"
#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
#include "slic3r/GUI/GUI_App.hpp"
Expand All @@ -14,6 +15,8 @@

#include <numeric>

#include <boost/log/trivial.hpp>

#include <GL/glew.h>

#ifndef IMGUI_DEFINE_MATH_OPERATORS
Expand Down
2 changes: 1 addition & 1 deletion src/slic3r/GUI/HMS.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "HMS.hpp"


#include <boost/log/trivial.hpp>

namespace Slic3r {
namespace GUI {
Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/HttpServer.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef slic3r_Http_App_hpp_
#define slic3r_Http_App_hpp_

#include <iostream>
#include <mutex>
#include <stack>

Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/IMSlider.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include "TickCode.hpp"
#include <imgui/imgui.h>
#include <wx/slider.h>

#include <set>

Expand Down
2 changes: 2 additions & 0 deletions src/slic3r/GUI/ImageGrid.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

#include <wx/dcgraph.h>

#include <boost/log/trivial.hpp>

wxDEFINE_EVENT(EVT_ITEM_ACTION, wxCommandEvent);

BEGIN_EVENT_TABLE(Slic3r::GUI::ImageGrid, wxPanel)
Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/ImageGrid.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#define ImageGrid_h

#include <wx/window.h>
#include <wx/timer.h>
#include <boost/shared_ptr.hpp>

#include "Widgets/StateColor.hpp"
Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/Jobs/PrintJob.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <boost/filesystem/path.hpp>
#include <boost/filesystem/operations.hpp>
#include "libslic3r/PrintConfig.hpp"
#include "PlaterJob.hpp"

namespace fs = boost::filesystem;
Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/Jobs/ProgressIndicator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <string>
#include <functional>
#include <wx/string.h>

namespace Slic3r {

Expand Down
2 changes: 2 additions & 0 deletions src/slic3r/GUI/Jobs/UpgradeNetworkJob.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#ifndef __UpgradeNetworkJob_HPP__
#define __UpgradeNetworkJob_HPP__

#include <boost/filesystem.hpp>
#include <boost/log/trivial.hpp>
#include <functional>
#include "Job.hpp"

Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/MainFrame.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

#include <boost/algorithm/string/predicate.hpp>
#include <boost/log/trivial.hpp>
#include <boost/property_tree/ptree.hpp>

#include "libslic3r/Print.hpp"
#include "libslic3r/Polygon.hpp"
Expand Down
2 changes: 2 additions & 0 deletions src/slic3r/GUI/MainFrame.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

#include "libslic3r/PrintConfig.hpp"

#include <boost/property_tree/ptree_fwd.hpp>

#include <wx/frame.h>
#include <wx/settings.h>
#include <wx/string.h>
Expand Down
2 changes: 2 additions & 0 deletions src/slic3r/GUI/MarkdownTip.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#include "libslic3r/Utils.hpp"
#include "I18N.hpp"

#include <wx/display.h>

namespace fs = boost::filesystem;

namespace Slic3r { namespace GUI {
Expand Down
2 changes: 2 additions & 0 deletions src/slic3r/GUI/MediaFilePanel.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
#ifndef MediaFilePanel_h
#define MediaFilePanel_h

#include <set>

#include "GUI_Utils.hpp"
#include "wxExtensions.hpp"

Expand Down
5 changes: 5 additions & 0 deletions src/slic3r/GUI/MediaPlayCtrl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
#include "DownloadProgressDialog.hpp"

#include <boost/filesystem/string_file.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/log/trivial.hpp>
#include <boost/nowide/cstdio.hpp>
#include <boost/nowide/utf8_codecvt.hpp>
#undef pid_t
#include <boost/process.hpp>
Expand All @@ -19,6 +22,8 @@
#include <sys/shm.h>
#endif

#include <wx/clipbrd.h>

namespace Slic3r {
namespace GUI {

Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/MonitorPage.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define slic3r_MonitorPage_hpp_

#include <wx/panel.h>
#include <wx/sizer.h>

namespace Slic3r {
namespace GUI {
Expand Down
2 changes: 1 addition & 1 deletion src/slic3r/GUI/NetworkTestDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "slic3r/Utils/Http.hpp"
#include "libslic3r/AppConfig.hpp"
#include <boost/asio/ip/address.hpp>

#include <boost/log/trivial.hpp>

namespace Slic3r {
namespace GUI {
Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/Notebook.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
//#ifdef _WIN32

#include <wx/bookctrl.h>
#include <wx/sizer.h>

class ModeSizer;
class ScalableButton;
Expand Down
2 changes: 2 additions & 0 deletions src/slic3r/GUI/ObjectDataViewModel.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#ifndef slic3r_GUI_ObjectDataViewModel_hpp_
#define slic3r_GUI_ObjectDataViewModel_hpp_

#include <boost/log/trivial.hpp>

#include <wx/dataview.h>
#include <vector>
#include <map>
Expand Down
2 changes: 2 additions & 0 deletions src/slic3r/GUI/ParamsPanel.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
#include <wx/sizer.h>
#include <wx/statline.h>
#include <wx/scrolwin.h>
#include <wx/timer.h>
#include <wx/panel.h>
#include <wx/wupdlock.h>

#include "wxExtensions.hpp"
#include "GUI_Utils.hpp"
Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/PartPlate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <boost/filesystem/operations.hpp>
#include <boost/log/trivial.hpp>
#include <boost/nowide/convert.hpp>
#include <boost/nowide/cstdio.hpp>
#include <boost/algorithm/string/predicate.hpp>

#include "libslic3r/libslic3r.h"
Expand Down
Loading

0 comments on commit d310e4c

Please sign in to comment.