Merge branch 'dev' into newlocallab

rtgui/toolbar.h

@@ -16,13 +16,14 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef __TOOLBAR_H__
-#define __TOOLBAR_H__
+#pragma once
 
 #include <gtkmm.h>
-#include "toolenum.h"
-#include "rtimage.h"
+
 #include "lockablecolorpicker.h"
+#include "toolenum.h"
+
+class RTImage;
 
 class ToolBarListener
 {
@@ -105,5 +106,3 @@ public:
         blockEdit = cond;
     }
 };
-
-#endif