Merge branch 'dev' into newlocallab

rtgui/filecatalog.h

@@ -16,22 +16,24 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _FILECATALOG_
-#define _FILECATALOG_
+#pragma once
 
-#include "filebrowser.h"
-#include "exiffiltersettings.h"
-#include <giomm.h>
-#include "fileselectionlistener.h"
 #include <set>
-#include "fileselectionchangelistener.h"
+
+#include <giomm.h>
+
 #include "coarsepanel.h"
-#include "toolbar.h"
-#include "filterpanel.h"
+#include "exiffiltersettings.h"
 #include "exportpanel.h"
-#include "previewloader.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;
@@ -289,5 +291,3 @@ inline void FileCatalog::setDirSelector (const FileCatalog::DirSelectionSlot& se
 {
     this->selectDir = selectDir;
 }
-
-#endif