From 04b08741ee7f99c91e8c25255e997c9c28a1026b Mon Sep 17 00:00:00 2001 From: Ingo Weyrich Date: Wed, 27 Nov 2019 18:55:20 +0100 Subject: [PATCH] Further cleanups --- rtengine/lcp.cc | 1 - rtengine/mytime.h | 2 +- rtgui/cachemanager.cc | 2 +- rtgui/crophandler.h | 1 - rtgui/cropwindow.cc | 1 + rtgui/cropwindow.h | 2 +- rtgui/dirbrowser.h | 4 ---- rtgui/editorpanel.cc | 7 +++++++ rtgui/editorpanel.h | 3 +-- rtgui/editwidgets.h | 2 +- rtgui/editwindow.cc | 3 +++ rtgui/editwindow.h | 5 +++-- rtgui/extprog.cc | 6 +++--- rtgui/filebrowser.h | 1 - rtgui/filecatalog.cc | 2 ++ rtgui/filecatalog.h | 6 +++--- rtgui/filepanel.cc | 5 +++++ rtgui/filepanel.h | 2 +- rtgui/main.cc | 1 + rtgui/navigator.cc | 1 + rtgui/navigator.h | 3 ++- rtgui/placesbrowser.h | 2 -- rtgui/recentbrowser.h | 1 - rtgui/rtwindow.h | 1 + rtgui/toolpanel.h | 1 - 25 files changed, 38 insertions(+), 27 deletions(-) diff --git a/rtengine/lcp.cc b/rtengine/lcp.cc index 57a87c1f1..7fec79717 100644 --- a/rtengine/lcp.cc +++ b/rtengine/lcp.cc @@ -27,7 +27,6 @@ #ifdef WIN32 #include -#include #endif #include "lcp.h" diff --git a/rtengine/mytime.h b/rtengine/mytime.h index 80fb0899a..787fefcc3 100644 --- a/rtengine/mytime.h +++ b/rtengine/mytime.h @@ -19,7 +19,7 @@ #pragma once #ifdef WIN32 -#include +#include #elif defined __APPLE__ #include #else diff --git a/rtgui/cachemanager.cc b/rtgui/cachemanager.cc index 9f6e111e5..c37964e23 100644 --- a/rtgui/cachemanager.cc +++ b/rtgui/cachemanager.cc @@ -25,7 +25,7 @@ #include #ifdef WIN32 -#include +#include #endif #include "cachemanager.h" diff --git a/rtgui/crophandler.h b/rtgui/crophandler.h index d5da1cf6e..98c925b67 100644 --- a/rtgui/crophandler.h +++ b/rtgui/crophandler.h @@ -24,7 +24,6 @@ #include -#include "editbuffer.h" #include "lockablecolorpicker.h" #include "threadutils.h" diff --git a/rtgui/cropwindow.cc b/rtgui/cropwindow.cc index 417786e5b..b00032191 100644 --- a/rtgui/cropwindow.cc +++ b/rtgui/cropwindow.cc @@ -33,6 +33,7 @@ #include "editcallbacks.h" #include "editbuffer.h" #include "editwidgets.h" +#include "pointermotionlistener.h" #include "rtsurface.h" #include "../rtengine/dcrop.h" diff --git a/rtgui/cropwindow.h b/rtgui/cropwindow.h index 0a66506a4..491124ad5 100644 --- a/rtgui/cropwindow.h +++ b/rtgui/cropwindow.h @@ -30,7 +30,6 @@ #include "editenums.h" #include "lwbutton.h" #include "lwbuttonset.h" -#include "pointermotionlistener.h" #include "../rtengine/noncopyable.h" @@ -42,6 +41,7 @@ struct Coord; } class CropWindow; +class PointerMotionListener; class CropWindowListener { diff --git a/rtgui/dirbrowser.h b/rtgui/dirbrowser.h index fa526c3a6..6ead83919 100644 --- a/rtgui/dirbrowser.h +++ b/rtgui/dirbrowser.h @@ -23,10 +23,6 @@ #include "guiutils.h" -#ifdef WIN32 -#include "windows.h" -#endif - class DirBrowser : public Gtk::VBox { public: diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc index 87f4a0b94..1b5ed3fa7 100644 --- a/rtgui/editorpanel.cc +++ b/rtgui/editorpanel.cc @@ -28,9 +28,12 @@ #include "soundman.h" #include "rtimage.h" #include "rtwindow.h" +#include "filepanel.h" #include "guiutils.h" #include "popupbutton.h" #include "options.h" +#include "navigator.h" +#include "previewwindow.h" #include "progressconnector.h" #include "procparamchangers.h" #include "placesbrowser.h" @@ -38,6 +41,10 @@ #include "thumbnail.h" #include "toolpanelcoord.h" +#ifdef WIN32 +#include "windows.h" +#endif + using namespace rtengine::procparams; namespace diff --git a/rtgui/editorpanel.h b/rtgui/editorpanel.h index e348222a5..8993fea07 100644 --- a/rtgui/editorpanel.h +++ b/rtgui/editorpanel.h @@ -21,11 +21,9 @@ #include -#include "filepanel.h" #include "histogrampanel.h" #include "history.h" #include "imageareapanel.h" -#include "navigator.h" #include "profilepanel.h" #include "progressconnector.h" #include "saveasdlg.h" @@ -38,6 +36,7 @@ class BatchQueueEntry; class EditorPanel; class FilePanel; class MyProgressBar; +class Navigator; class Thumbnail; class ToolPanelCoordinator; diff --git a/rtgui/editwidgets.h b/rtgui/editwidgets.h index c902f136a..55b4ca3cc 100644 --- a/rtgui/editwidgets.h +++ b/rtgui/editwidgets.h @@ -20,9 +20,9 @@ #ifdef GUIVERSION +#include #include -#include "editbuffer.h" #include "editcoordsys.h" #include "../rtengine/coord.h" diff --git a/rtgui/editwindow.cc b/rtgui/editwindow.cc index d4bbdb9ba..8841d3d42 100644 --- a/rtgui/editwindow.cc +++ b/rtgui/editwindow.cc @@ -16,8 +16,11 @@ */ #include "editwindow.h" +#include "editorpanel.h" +#include "filepanel.h" #include "../rtengine/procparams.h" #include "options.h" +#include "preferences.h" #include "cursormanager.h" #include "rtwindow.h" #include diff --git a/rtgui/editwindow.h b/rtgui/editwindow.h index 08e8c0199..f4ada571d 100644 --- a/rtgui/editwindow.h +++ b/rtgui/editwindow.h @@ -20,10 +20,11 @@ #include -#include "editorpanel.h" -#include "filepanel.h" #include "rtimage.h" +class EditorPanel; +class RTWindow; + class EditWindow : public Gtk::Window { diff --git a/rtgui/extprog.cc b/rtgui/extprog.cc index e7d0988fb..57d57ecd8 100644 --- a/rtgui/extprog.cc +++ b/rtgui/extprog.cc @@ -22,8 +22,8 @@ #include #ifdef WIN32 -#include #include +#include #endif #include @@ -261,7 +261,7 @@ bool ExtProgStore::openInGimp (const Glib::ustring& fileName) #endif #ifdef WIN32 - if ((uintptr_t)success > 32) { + if (reinterpret_cast(success) > 32) { return true; } #else @@ -278,7 +278,7 @@ bool ExtProgStore::openInGimp (const Glib::ustring& fileName) executable = Glib::build_filename (options.gimpDir, "bin", Glib::ustring::compose (Glib::ustring("gimp-2.%1.exe"), ver)); auto lsuccess = ShellExecute( NULL, "open", executable.c_str(), fileName.c_str(), NULL, SW_SHOWNORMAL ); - if ((uintptr_t)lsuccess > 32) { + if (reinterpret_cast(lsuccess) > 32) { return true; } } diff --git a/rtgui/filebrowser.h b/rtgui/filebrowser.h index fe4877a31..86ab59395 100644 --- a/rtgui/filebrowser.h +++ b/rtgui/filebrowser.h @@ -23,7 +23,6 @@ #include #include "browserfilter.h" -#include "exiffiltersettings.h" #include "exportpanel.h" #include "extprog.h" #include "filebrowserentry.h" diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc index ce9883cdb..109a1bb57 100644 --- a/rtgui/filecatalog.cc +++ b/rtgui/filecatalog.cc @@ -32,6 +32,7 @@ #include "rtimage.h" #include "cachemanager.h" #include "multilangmgr.h" +#include "coarsepanel.h" #include "filepanel.h" #include "renamedlg.h" #include "thumbimageupdater.h" @@ -40,6 +41,7 @@ #include "placesbrowser.h" #include "pathutils.h" #include "thumbnail.h" +#include "toolbar.h" using namespace std; diff --git a/rtgui/filecatalog.h b/rtgui/filecatalog.h index c71658cca..8f7e5618f 100644 --- a/rtgui/filecatalog.h +++ b/rtgui/filecatalog.h @@ -22,21 +22,21 @@ #include -#include "coarsepanel.h" #include "exiffiltersettings.h" #include "exportpanel.h" #include "filebrowser.h" #include "fileselectionchangelistener.h" #include "fileselectionlistener.h" #include "filterpanel.h" -#include "multilangmgr.h" #include "previewloader.h" #include "threadutils.h" -#include "toolbar.h" #include "../rtengine/noncopyable.h" class FilePanel; +class CoarsePanel; +class ToolBar; + /* * Class: * - handling the list of file (add/remove them) diff --git a/rtgui/filepanel.cc b/rtgui/filepanel.cc index 8f45343de..1a66aed7c 100644 --- a/rtgui/filepanel.cc +++ b/rtgui/filepanel.cc @@ -18,6 +18,7 @@ */ #include "filepanel.h" +#include "dirbrowser.h" #include "batchtoolpanelcoord.h" #include "editorpanel.h" #include "rtwindow.h" @@ -25,6 +26,10 @@ #include "placesbrowser.h" #include "thumbnail.h" +#ifdef WIN32 +#include "windows.h" +#endif + FilePanel::FilePanel () : parent(nullptr), error(0) { diff --git a/rtgui/filepanel.h b/rtgui/filepanel.h index 9db9d99b7..cbfe8e53e 100644 --- a/rtgui/filepanel.h +++ b/rtgui/filepanel.h @@ -20,7 +20,6 @@ #include -#include "dirbrowser.h" #include "exportpanel.h" #include "filecatalog.h" #include "fileselectionlistener.h" @@ -35,6 +34,7 @@ class BatchToolPanelCoordinator; class RTWindow; +class DirBrowser; class FilePanel final : public Gtk::HPaned, diff --git a/rtgui/main.cc b/rtgui/main.cc index ae34fc8d0..f669bcf4a 100644 --- a/rtgui/main.cc +++ b/rtgui/main.cc @@ -53,6 +53,7 @@ #else #include #include "conio.h" +#include "windows.h" #endif // Set this to 1 to make RT work when started with Eclipse and arguments, at least on Windows platform diff --git a/rtgui/navigator.cc b/rtgui/navigator.cc index 6a8137737..619ea0cfd 100644 --- a/rtgui/navigator.cc +++ b/rtgui/navigator.cc @@ -18,6 +18,7 @@ */ #include #include "navigator.h" +#include "previewwindow.h" #include "toolpanel.h" #include "../rtengine/color.h" #include "../rtengine/rt_math.h" diff --git a/rtgui/navigator.h b/rtgui/navigator.h index 953a0a44b..c1c23c6dc 100644 --- a/rtgui/navigator.h +++ b/rtgui/navigator.h @@ -22,7 +22,8 @@ #include "options.h" #include "pointermotionlistener.h" -#include "previewwindow.h" + +class PreviewWindow; class Navigator : public Gtk::Frame, diff --git a/rtgui/placesbrowser.h b/rtgui/placesbrowser.h index 78c94969f..d4640fff4 100644 --- a/rtgui/placesbrowser.h +++ b/rtgui/placesbrowser.h @@ -22,8 +22,6 @@ #include -#include "multilangmgr.h" - class PlacesBrowser : public Gtk::VBox { diff --git a/rtgui/recentbrowser.h b/rtgui/recentbrowser.h index 68a7962f9..bc8374087 100644 --- a/rtgui/recentbrowser.h +++ b/rtgui/recentbrowser.h @@ -21,7 +21,6 @@ #include #include "guiutils.h" -#include "multilangmgr.h" class RecentBrowser : public Gtk::VBox diff --git a/rtgui/rtwindow.h b/rtgui/rtwindow.h index 39e1581e3..100ddf636 100644 --- a/rtgui/rtwindow.h +++ b/rtgui/rtwindow.h @@ -34,6 +34,7 @@ class BatchQueueEntry; class BatchQueuePanel; class EditorPanel; class FilePanel; +class PLDBridge; class RTWindow : public Gtk::Window, public rtengine::ProgressListener, diff --git a/rtgui/toolpanel.h b/rtgui/toolpanel.h index 0f002e048..aecf1f39f 100644 --- a/rtgui/toolpanel.h +++ b/rtgui/toolpanel.h @@ -22,7 +22,6 @@ #include -#include "editbuffer.h" #include "guiutils.h" #include "multilangmgr.h" #include "paramsedited.h"