From cc5fe02cde44a36c677666e2df0270641b2987cf Mon Sep 17 00:00:00 2001 From: Lukas Matena <lukasmatena@seznam.cz> Date: Wed, 4 Mar 2020 11:32:22 +0100 Subject: [PATCH] Include cleanup: GUI_ObjectManipulation.hpp, GUI, GUI_Preview --- src/slic3r/GUI/GUI.cpp | 21 ++++++--------------- src/slic3r/GUI/GUI_App.cpp | 1 + src/slic3r/GUI/GUI_ObjectManipulation.cpp | 1 + src/slic3r/GUI/GUI_ObjectManipulation.hpp | 3 ++- src/slic3r/GUI/GUI_Preview.cpp | 1 - src/slic3r/GUI/GUI_Preview.hpp | 2 ++ 6 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp index 7deed0786..18d4bee94 100644 --- a/src/slic3r/GUI/GUI.cpp +++ b/src/slic3r/GUI/GUI.cpp @@ -1,12 +1,9 @@ #include "GUI.hpp" #include "GUI_App.hpp" #include "I18N.hpp" -#include "WipeTowerDialog.hpp" -#include <assert.h> #include <string> -#include <boost/lexical_cast.hpp> #include <boost/algorithm/string.hpp> #if __APPLE__ @@ -18,22 +15,16 @@ #include "boost/nowide/convert.hpp" #endif -#include <wx/display.h> - -#include "wxExtensions.hpp" -#include "GUI_Preview.hpp" #include "AboutDialog.hpp" -#include "AppConfig.hpp" -#include "ConfigWizard.hpp" -#include "PresetBundle.hpp" -#include "UpdateDialogs.hpp" +#include "MsgDialog.hpp" -#include "libslic3r/Utils.hpp" #include "libslic3r/Print.hpp" -#include "Tab.hpp" -#include "GUI_ObjectList.hpp" -namespace Slic3r { namespace GUI { +namespace Slic3r { + +class AppConfig; + +namespace GUI { #if __APPLE__ IOPMAssertionID assertionID; diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 88018c87f..4c53a5b94 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -36,6 +36,7 @@ #include "GUI_Utils.hpp" #include "AppConfig.hpp" #include "PresetBundle.hpp" +#include "3DScene.hpp" #include "../Utils/PresetUpdater.hpp" #include "../Utils/PrintHost.hpp" diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.cpp b/src/slic3r/GUI/GUI_ObjectManipulation.cpp index 32de03c98..6a9e2ddc1 100644 --- a/src/slic3r/GUI/GUI_ObjectManipulation.cpp +++ b/src/slic3r/GUI/GUI_ObjectManipulation.cpp @@ -2,6 +2,7 @@ #include "GUI_ObjectList.hpp" #include "I18N.hpp" +#include "GLCanvas3D.hpp" #include "OptionsGroup.hpp" #include "wxExtensions.hpp" #include "PresetBundle.hpp" diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.hpp b/src/slic3r/GUI/GUI_ObjectManipulation.hpp index f002491f0..560fbb400 100644 --- a/src/slic3r/GUI/GUI_ObjectManipulation.hpp +++ b/src/slic3r/GUI/GUI_ObjectManipulation.hpp @@ -4,7 +4,8 @@ #include <memory> #include "GUI_ObjectSettings.hpp" -#include "GLCanvas3D.hpp" +#include "libslic3r/Point.hpp" +#include <float.h> class wxBitmapComboBox; class wxStaticText; diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp index 8cf524f7d..ba5aab2e5 100644 --- a/src/slic3r/GUI/GUI_Preview.cpp +++ b/src/slic3r/GUI/GUI_Preview.cpp @@ -4,7 +4,6 @@ #include "GUI_App.hpp" #include "GUI.hpp" #include "I18N.hpp" -#include "AppConfig.hpp" #include "3DScene.hpp" #include "BackgroundSlicingProcess.hpp" #include "OpenGLManager.hpp" diff --git a/src/slic3r/GUI/GUI_Preview.hpp b/src/slic3r/GUI/GUI_Preview.hpp index 5df3e38c6..bbf2774b8 100644 --- a/src/slic3r/GUI/GUI_Preview.hpp +++ b/src/slic3r/GUI/GUI_Preview.hpp @@ -2,11 +2,13 @@ #define slic3r_GUI_Preview_hpp_ #include <wx/panel.h> + #include "libslic3r/Point.hpp" #include "libslic3r/CustomGCode.hpp" #include <string> + class wxNotebook; class wxGLCanvas; class wxBoxSizer;