3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Include cleanup in several files

Browse source 
src/slic3r/Config/Snapshot.cpp
src/slic3r/Config/Snapshot.hpp
src/slic3r/Config/Version.cpp
src/slic3r/Config/Version.hpp
src/slic3r/GUI/2DBed.cpp
src/slic3r/GUI/3DBed.cpp
src/slic3r/GUI/3DScene.cpp
src/slic3r/GUI/3DScene.hpp
src/slic3r/GUI/AboutDialog.cpp
src/slic3r/GUI/AboutDialog.hpp
src/slic3r/GUI/AppConfig.cpp
src/slic3r/GUI/BackgroundSlicingProcess.cpp
src/slic3r/GUI/BackgroundSlicingProcess.hpp
This commit is contained in:
Lukas Matena 2020-02-28 11:13:14 +01:00
parent c70b34b6c8
commit 87e77e20fa
13 changed files with 22 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/slic3r/Config/Snapshot.cpp
View file

@ -5,11 +5,12 @@
#include <time.h> #include <time.h>
#include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/trim.hpp>
#include <boost/nowide/cstdio.hpp> #include <boost/nowide/cstdio.hpp>
#include <boost/nowide/fstream.hpp> #include <boost/nowide/fstream.hpp>
#include <boost/property_tree/ini_parser.hpp> #include <boost/property_tree/ini_parser.hpp>
#include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree_fwd.hpp>
#include <boost/filesystem/operations.hpp>
#include "libslic3r/libslic3r.h" #include "libslic3r/libslic3r.h"
#include "libslic3r/Time.hpp" #include "libslic3r/Time.hpp"

3
src/slic3r/Config/Snapshot.hpp
View file

@ -6,7 +6,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <boost/filesystem.hpp> #include <boost/filesystem/path.hpp>
#include "libslic3r/Semver.hpp" #include "libslic3r/Semver.hpp"
#include "Version.hpp" #include "Version.hpp"
@ -18,7 +18,6 @@ class AppConfig;
namespace GUI { namespace GUI {
namespace Config { namespace Config {
class Index;
// A snapshot contains: // A snapshot contains:
// Slic3r.ini // Slic3r.ini

3
src/slic3r/Config/Version.cpp
View file

@ -2,8 +2,7 @@
#include <cctype> #include <cctype>
#include <boost/algorithm/string/predicate.hpp> #include <boost/filesystem/operations.hpp>
#include <boost/algorithm/string/trim.hpp>
#include <boost/nowide/fstream.hpp> #include <boost/nowide/fstream.hpp>
#include "libslic3r/libslic3r.h" #include "libslic3r/libslic3r.h"

4
src/slic3r/Config/Version.hpp
View file

@ -4,7 +4,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <boost/filesystem.hpp> #include <boost/filesystem/path.hpp>
#include "libslic3r/FileParserError.hpp" #include "libslic3r/FileParserError.hpp"
#include "libslic3r/Semver.hpp" #include "libslic3r/Semver.hpp"
@ -54,7 +54,7 @@ struct Version
class Index class Index
{ {
public: public:
typedef std::vector<Version>::const_iterator const_iterator; typedef std::vector<Version>::const_iterator const_iterator;
// Read a config index file in the simple format described in the Index class comment. // Read a config index file in the simple format described in the Index class comment.
// Throws Slic3r::file_parser_error and the standard std file access exceptions. // Throws Slic3r::file_parser_error and the standard std file access exceptions.
size_t load(const boost::filesystem::path &path); size_t load(const boost::filesystem::path &path);

1
src/slic3r/GUI/3DBed.cpp
View file

@ -8,7 +8,6 @@
#include "GUI_App.hpp" #include "GUI_App.hpp"
#include "PresetBundle.hpp" #include "PresetBundle.hpp"
#include "Gizmos/GLGizmoBase.hpp"
#include "GLCanvas3D.hpp" #include "GLCanvas3D.hpp"
#include <GL/glew.h> #include <GL/glew.h>

8
src/slic3r/GUI/3DScene.cpp
View file

@ -17,23 +17,17 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <utility>
#include <assert.h> #include <assert.h>
#include <boost/log/trivial.hpp> #include <boost/log/trivial.hpp>
#include <boost/filesystem/operations.hpp> #include <boost/filesystem/operations.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string/predicate.hpp>
#include <boost/nowide/cstdio.hpp> #include <boost/nowide/cstdio.hpp>
#include <tbb/parallel_for.h>
#include <tbb/spin_mutex.h>
#include <Eigen/Dense> #include <Eigen/Dense>
#include "GUI.hpp"
#ifdef HAS_GLSAFE #ifdef HAS_GLSAFE
void glAssertRecentCallImpl(const char *file_name, unsigned int line, const char *function_name) void glAssertRecentCallImpl(const char *file_name, unsigned int line, const char *function_name)
{ {

6
src/slic3r/GUI/3DScene.hpp
View file

@ -10,7 +10,6 @@
#include "slic3r/GUI/GLCanvas3DManager.hpp" #include "slic3r/GUI/GLCanvas3DManager.hpp"
#include <functional> #include <functional>
#include <memory>
#ifndef NDEBUG #ifndef NDEBUG
#define HAS_GLSAFE #define HAS_GLSAFE
@ -34,13 +33,8 @@ struct Camera;
class GLToolbar; class GLToolbar;
} // namespace GUI } // namespace GUI
class Print;
class PrintObject;
class SLAPrint;
class SLAPrintObject; class SLAPrintObject;
enum SLAPrintObjectStep : unsigned int; enum SLAPrintObjectStep : unsigned int;
class Model;
class ModelObject;
class DynamicPrintConfig; class DynamicPrintConfig;
class ExtrusionPath; class ExtrusionPath;
class ExtrusionMultiPath; class ExtrusionMultiPath;

3
src/slic3r/GUI/AboutDialog.cpp
View file

@ -2,8 +2,9 @@
#include "I18N.hpp" #include "I18N.hpp"
#include "libslic3r/Utils.hpp" #include "libslic3r/Utils.hpp"
#include "GUI.hpp"
#include "GUI_App.hpp" #include "GUI_App.hpp"
#include "wxExtensions.hpp"
namespace Slic3r { namespace Slic3r {
namespace GUI { namespace GUI {

2
src/slic3r/GUI/AboutDialog.hpp
View file

@ -1,8 +1,6 @@
#ifndef slic3r_GUI_AboutDialog_hpp_ #ifndef slic3r_GUI_AboutDialog_hpp_
#define slic3r_GUI_AboutDialog_hpp_ #define slic3r_GUI_AboutDialog_hpp_
#include "GUI.hpp"
#include <wx/wx.h> #include <wx/wx.h>
#include <wx/intl.h> #include <wx/intl.h>
#include <wx/html/htmlwin.h> #include <wx/html/htmlwin.h>

12
src/slic3r/GUI/AppConfig.cpp
View file

@ -2,22 +2,18 @@
#include "libslic3r/Utils.hpp" #include "libslic3r/Utils.hpp"
#include "AppConfig.hpp" #include "AppConfig.hpp"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <utility> #include <utility>
#include <assert.h>
#include <vector> #include <vector>
#include <stdexcept> #include <stdexcept>
#include <boost/filesystem.hpp> #include <boost/filesystem/path.hpp>
#include <boost/filesystem/operations.hpp>
#include <boost/nowide/cenv.hpp> #include <boost/nowide/cenv.hpp>
#include <boost/nowide/fstream.hpp> #include <boost/nowide/fstream.hpp>
#include <boost/property_tree/ini_parser.hpp> #include <boost/property_tree/ini_parser.hpp>
#include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree_fwd.hpp>
#include <boost/property_tree/exceptions.hpp>
#include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/predicate.hpp>
#include <boost/format.hpp> #include <boost/format/format_fwd.hpp>
#include <wx/string.h> #include <wx/string.h>
#include "I18N.hpp" #include "I18N.hpp"

9
src/slic3r/GUI/BackgroundSlicingProcess.cpp
View file

@ -25,17 +25,16 @@
#include <cassert> #include <cassert>
#include <stdexcept> #include <stdexcept>
#include <cctype> #include <cctype>
#include <algorithm>
#include <boost/format.hpp> #include <boost/format/format_fwd.hpp>
#include <boost/filesystem/path.hpp> #include <boost/filesystem/operations.hpp>
#include <boost/filesystem.hpp>
#include <boost/log/trivial.hpp> #include <boost/log/trivial.hpp>
#include <boost/nowide/cstdio.hpp> #include <boost/nowide/cstdio.hpp>
#include "I18N.hpp" #include "I18N.hpp"
#include "GUI.hpp"
#include "RemovableDriveManager.hpp" #include "RemovableDriveManager.hpp"
#include "slic3r/Utils/Thread.hpp"
namespace Slic3r { namespace Slic3r {
BackgroundSlicingProcess::BackgroundSlicingProcess() BackgroundSlicingProcess::BackgroundSlicingProcess()

4
src/slic3r/GUI/BackgroundSlicingProcess.hpp
View file

@ -5,13 +5,13 @@
#include <condition_variable> #include <condition_variable>
#include <mutex> #include <mutex>
#include <boost/filesystem.hpp> #include <boost/filesystem/path.hpp>
#include <wx/event.h> #include <wx/event.h>
#include "libslic3r/Print.hpp" #include "libslic3r/Print.hpp"
#include "slic3r/Utils/PrintHost.hpp" #include "slic3r/Utils/PrintHost.hpp"
#include "slic3r/Utils/Thread.hpp"
namespace Slic3r { namespace Slic3r {