Merge branch 'dev' into newlocallab

rtgui/cachemanager.h

@@ -16,18 +16,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _CACHEMANAGER_
-#define _CACHEMANAGER_
+#pragma once
 
-#include <string>
 #include <map>
+#include <string>
 
 #include <glibmm/ustring.h>
 
-#include "../rtengine/noncopyable.h"
-
 #include "threadutils.h"
 
+#include "../rtengine/noncopyable.h"
+
 class Thumbnail;
 
 class CacheManager :
@@ -69,6 +68,3 @@ public:
 };
 
 #define cacheMgr CacheManager::getInstance()
-
-#endif
-