Merge branch 'dev' into newlocallab

rtgui/preferences.h

@@ -16,20 +16,27 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef __PREFERENCES_H__
-#define __PREFERENCES_H__
+#pragma once
+
+#include <vector>
 
 #include <gtkmm.h>
-#include "adjuster.h"
-#include "options.h"
-#include <vector>
-#include "rtwindow.h"
-#include "dynamicprofilepanel.h"
 
-class Preferences : public Gtk::Dialog, public ProfileStoreListener
+#include "adjuster.h"
+#include "dynamicprofilepanel.h"
+#include "options.h"
+#include "../rtengine/profilestore.h"
+
+class RTWindow;
+class Splash;
+
+class Preferences :
+    public Gtk::Dialog,
+    public ProfileStoreListener
 {
 
-    class ExtensionColumns : public Gtk::TreeModel::ColumnRecord
+    class ExtensionColumns :
+        public Gtk::TreeModel::ColumnRecord
     {
     public:
         Gtk::TreeModelColumn<bool>  enabled;
@@ -304,5 +311,3 @@ public:
 //    void selectICCProfileDir ();
 //    void selectMonitorProfile ();
 };
-
-#endif