Further cleanups

rtengine/lcp.cc

@@ -27,7 +27,6 @@
 
 #ifdef WIN32
 #include <shlobj.h>
-#include <windows.h>
 #endif
 
 #include "lcp.h"

rtengine/mytime.h

@@ -19,7 +19,7 @@
 #pragma once
 
 #ifdef WIN32
-#include <windows.h>
+#include <profileapi.h>
 #elif defined __APPLE__
 #include <sys/time.h>
 #else

rtgui/cachemanager.cc

@@ -25,7 +25,7 @@
 #include <glib/gstdio.h>
 
 #ifdef WIN32
-#include <windows.h>
+#include <fileapi.h>
 #endif
 
 #include "cachemanager.h"

rtgui/crophandler.h

@@ -24,7 +24,6 @@
 
 #include <gtkmm.h>
 
-#include "editbuffer.h"
 #include "lockablecolorpicker.h"
 #include "threadutils.h"
 

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"

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
 {

rtgui/dirbrowser.h

@@ -23,10 +23,6 @@
 
 #include "guiutils.h"
 
-#ifdef WIN32
-#include "windows.h"
-#endif
-
 class DirBrowser : public Gtk::VBox
 {
 public:

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

rtgui/editorpanel.h

@@ -21,11 +21,9 @@
 
 #include <gtkmm.h>
 
-#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;
 

rtgui/editwidgets.h

@@ -20,9 +20,9 @@
 
 #ifdef GUIVERSION
 
+#include <cairomm/cairomm.h>
 #include <glibmm/ustring.h>
 
-#include "editbuffer.h"
 #include "editcoordsys.h"
 #include "../rtengine/coord.h"
 

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 <gtk/gtk.h>

rtgui/editwindow.h

@@ -20,10 +20,11 @@
 
 #include <gtkmm.h>
 
-#include "editorpanel.h"
-#include "filepanel.h"
 #include "rtimage.h"
 
+class EditorPanel;
+class RTWindow;
+
 class EditWindow :
     public Gtk::Window
 {

rtgui/extprog.cc

@@ -22,8 +22,8 @@
 #include <iostream>
 
 #ifdef WIN32
-#include <windows.h>
 #include <shlobj.h>
+#include <shellapi.h>
 #endif
 
 #include <gtkmm.h>
@@ -261,7 +261,7 @@ bool ExtProgStore::openInGimp (const Glib::ustring& fileName)
 #endif
 
 #ifdef WIN32
-    if ((uintptr_t)success > 32) {
+    if (reinterpret_cast<uintptr_t>(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<uintptr_t>(lsuccess) > 32) {
             return true;
         }
     }

rtgui/filebrowser.h

@@ -23,7 +23,6 @@
 #include <gtkmm.h>
 
 #include "browserfilter.h"
-#include "exiffiltersettings.h"
 #include "exportpanel.h"
 #include "extprog.h"
 #include "filebrowserentry.h"

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;
 

rtgui/filecatalog.h

@@ -22,21 +22,21 @@
 
 #include <giomm.h>
 
-#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)

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)
 {
 

rtgui/filepanel.h

@@ -20,7 +20,6 @@
 
 #include <gtkmm.h>
 
-#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,

rtgui/main.cc

@@ -53,6 +53,7 @@
 #else
 #include <glibmm/thread.h>
 #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

rtgui/navigator.cc

@@ -18,6 +18,7 @@
  */
 #include <iomanip>
 #include "navigator.h"
+#include "previewwindow.h"
 #include "toolpanel.h"
 #include "../rtengine/color.h"
 #include "../rtengine/rt_math.h"

rtgui/navigator.h

@@ -22,7 +22,8 @@
 
 #include "options.h"
 #include "pointermotionlistener.h"
-#include "previewwindow.h"
+
+class PreviewWindow;
 
 class Navigator :
     public Gtk::Frame,

rtgui/placesbrowser.h

@@ -22,8 +22,6 @@
 
 #include <giomm.h>
 
-#include "multilangmgr.h"
-
 class PlacesBrowser :
     public Gtk::VBox
 {

rtgui/recentbrowser.h

@@ -21,7 +21,6 @@
 #include <gtkmm.h>
 
 #include "guiutils.h"
-#include "multilangmgr.h"
 
 class RecentBrowser :
     public Gtk::VBox

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,

rtgui/toolpanel.h

@@ -22,7 +22,6 @@
 
 #include <glibmm/ustring.h>
 
-#include "editbuffer.h"
 #include "guiutils.h"
 #include "multilangmgr.h"
 #include "paramsedited.h"