Move gettext.h

dn/action.cpp

@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: MPL-2.0
 //
 
-#include <dawn-gettext.h>
+#include <libdn/gettext.hpp>
 
 #include "action.hpp"
 

dn/app-menu-macos.mm

@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: MPL-2.0
 //
 
-#include <dawn-gettext.h>
+#include <libdn/gettext.h>
 
 #include "app-menu-macos.hpp"
 

dn/app.cpp

@@ -6,11 +6,12 @@
 //
 
 #include <dawn-config.h>
-#include <dawn-gettext.h>
+
+#include <libdn/gettext.hpp>
+#include <libdn/vk-device.hpp>
 
 #include "app.hpp"
 
-#include "libdn/vk-device.hpp"
 #include "url.hpp"
 #include "window.hpp"
 

dn/kit-browser.cpp

@@ -5,14 +5,14 @@
 // SPDX-License-Identifier: MPL-2.0
 //
 
-#include <dawn-gettext.h>
+#include <libdn/gettext.hpp>
+#include <libdn/libdn.hpp>
+#include <libdn/thumb-scaler.hpp>
 
 #include "kit-browser.hpp"
 
 #include "action.hpp"
 #include "kit-chrome.hpp"
-#include "libdn/libdn.hpp"
-#include "libdn/thumb-scaler.hpp"
 #include "renderer.hpp"
 #include "thumbnail-cache.hpp"
 #include "thumbnailer.hpp"

dn/kit-chrome.cpp

@@ -6,7 +6,8 @@
 //
 
 #include <dawn-config.h>
-#include <dawn-gettext.h>
+
+#include <libdn/gettext.hpp>
 
 #include "assoc.hpp"
 #include "kit-browser.hpp"

dn/kit-cie-diagram.cpp

@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: MPL-2.0
 //
 
-#include <dawn-gettext.h>
+#include <libdn/gettext.hpp>
 
 #include "kit-cie-diagram.hpp"
 

dn/kit-viewer.cpp

@@ -6,7 +6,8 @@
 //
 
 #include <dawn-config.h>
-#include <dawn-gettext.h>
+
+#include <libdn/gettext.hpp>
 
 #include "kit-viewer.hpp"
 

dn/main.cpp

@@ -6,10 +6,11 @@
 //
 
 #include <dawn-config.h>
-#include <dawn-gettext.h>
+
+#include <libdn/gettext.hpp>
+#include <libdn/libdn.hpp>
 
 #include "app.hpp"
-#include "libdn/libdn.hpp"
 #include "thumbnail-cache.hpp"
 #include "url.hpp"
 #include "window.hpp"

dn/window.cpp

@@ -6,7 +6,8 @@
 //
 
 #include <dawn-config.h>
-#include <dawn-gettext.h>
+
+#include <libdn/gettext.hpp>
 
 #include "window.hpp"
 

dnimaged/main.cpp

@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: MPL-2.0
 //
 
-#include <dawn-gettext.h>
-
+#include <libdn/gettext.hpp>
 #include <libdn/ipc-rpc.hpp>
 #include <libdn/ipc-shm.hpp>
 #include <libdn/libdn.hpp>

dnthumbd/main.cpp

@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: MPL-2.0
 //
 
-#include <dawn-gettext.h>
-
+#include <libdn/gettext.hpp>
 #include <libdn/ipc-rpc.hpp>
 #include <libdn/ipc-shm.hpp>
 #include <libdn/libdn.hpp>

libdn/config-macos.mm

@@ -6,7 +6,7 @@
 //
 
 #include <dawn-config.h>
-#include <dawn-gettext.h>
+#include <libdn/gettext.h>
 
 #include "libdn.h"
 

libdn/config-unix.cpp

@@ -6,8 +6,8 @@
 //
 
 #include <dawn-config.h>
-#include <dawn-gettext.h>
 
+#include "gettext.hpp"
 #include "libdn.hpp"
 
 #include <cstdlib>

libdn/config-windows.cpp

@@ -6,9 +6,9 @@
 //
 
 #include <dawn-config.h>
-#include <dawn-gettext.h>
 
-#include "libdn.h"
+#include "gettext.hpp"
+#include "libdn.hpp"
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>

libdn/gettext.cpp

@@ -6,7 +6,8 @@
 //
 
 #include <dawn-config.h>
-#include <dawn-gettext.h>
+
+#include "gettext.hpp"
 
 #include <clocale>
 #include <cstdarg>

libdn/gettext.hpp

@@ -1,5 +1,5 @@
 //
-// dawn-gettext.h: message translation macros
+// libdn/gettext.h: message translation macros
 //
 // Copyright The Dawn Authors
 // SPDX-License-Identifier: MPL-2.0

libdn/libdn.cpp

@@ -6,8 +6,8 @@
 //
 
 #include <dawn-config.h>
-#include <dawn-gettext.h>
 
+#include "gettext.hpp"
 #include "libdn-loaders.h"
 #include "libdn.hpp"
 

libdn/load-cgpdf.mm

@@ -11,7 +11,7 @@
 // producing no pages at all.
 
 #include <dawn-config.h>
-#include <dawn-gettext.h>
+#include <libdn/gettext.h>
 
 #include "libdn-loaders.h"
 #include "libdn.h"

libdn/load-dnrs.cpp

@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: MPL-2.0
 //
 
-#include <dawn-gettext.h>
-
+#include "gettext.hpp"
 #include "libdn-loaders.h"
 #include "libdn.hpp"
 

libdn/load-heif.cpp

@@ -6,8 +6,8 @@
 //
 
 #include <dawn-config.h>
-#include <dawn-gettext.h>
 
+#include "gettext.hpp"
 #include "libdn-loaders.h"
 #include "libdn.hpp"
 

libdn/load-icns.cpp

@@ -6,8 +6,8 @@
 //
 
 #include <dawn-config.h>
-#include <dawn-gettext.h>
 
+#include "gettext.hpp"
 #include "libdn-loaders.h"
 #include "libdn.hpp"
 

libdn/load-imageio.mm

@@ -10,7 +10,7 @@
 // or GdkPixbuf.
 
 #include <dawn-config.h>
-#include <dawn-gettext.h>
+#include <libdn/gettext.h>
 
 #include "libdn-loaders.h"
 #include "libdn.h"

libdn/load-jpeg.cpp

@@ -6,8 +6,8 @@
 //
 
 #include <dawn-config.h>
-#include <dawn-gettext.h>
 
+#include "gettext.hpp"
 #include "libdn-loaders.h"
 #include "libdn.hpp"
 

libdn/load-jxl.cpp

@@ -6,8 +6,8 @@
 //
 
 #include <dawn-config.h>
-#include <dawn-gettext.h>
 
+#include "gettext.hpp"
 #include "libdn-loaders.h"
 #include "libdn.hpp"
 

libdn/load-jxr.cpp

@@ -6,8 +6,8 @@
 //
 
 #include <dawn-config.h>
-#include <dawn-gettext.h>
 
+#include "gettext.hpp"
 #include "libdn-loaders.h"
 #include "libdn.hpp"
 

libdn/load-libraw.cpp

@@ -6,8 +6,8 @@
 //
 
 #include <dawn-config.h>
-#include <dawn-gettext.h>
 
+#include "gettext.hpp"
 #include "libdn-loaders.h"
 #include "libdn.hpp"
 

libdn/load-librsvg.cpp

@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: MPL-2.0
 //
 
-#include <dawn-gettext.h>
-
+#include "gettext.hpp"
 #include "libdn-loaders.h"
 #include "libdn.hpp"
 

libdn/load-libwmf.cpp

@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: MPL-2.0
 //
 
-#include <dawn-gettext.h>
-
+#include "gettext.hpp"
 #include "libdn-loaders.h"
 #include "libdn.hpp"
 

libdn/load-openjpeg.cpp

@@ -6,8 +6,8 @@
 //
 
 #include <dawn-config.h>
-#include <dawn-gettext.h>
 
+#include "gettext.hpp"
 #include "libdn-loaders.h"
 #include "libdn.hpp"
 

libdn/load-ora.cpp

@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: MPL-2.0
 //
 
-#include <dawn-gettext.h>
-
+#include "gettext.hpp"
 #include "libdn-loaders.h"
 #include "libdn.hpp"
 

libdn/load-poppler.cpp

@@ -8,8 +8,8 @@
 // Deliberately not advertising support elsewhere, as with Core Graphics PDF.
 
 #include <dawn-config.h>
-#include <dawn-gettext.h>
 
+#include "gettext.hpp"
 #include "libdn-loaders.h"
 #include "libdn.hpp"
 

libdn/load-psd.cpp

@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: MPL-2.0
 //
 
-#include <dawn-gettext.h>
-
+#include "gettext.hpp"
 #include "libdn-loaders.h"
 #include "libdn.hpp"
 

libdn/load-resvg.cpp

@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: MPL-2.0
 //
 
-#include <dawn-gettext.h>
-
+#include "gettext.hpp"
 #include "libdn-loaders.h"
 #include "libdn.hpp"
 

libdn/load-tiff-ep.cpp

@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: MPL-2.0
 //
 
-#include <dawn-gettext.h>
-
+#include "gettext.hpp"
 #include "libdn-loaders.h"
 #include "libdn.hpp"
 

libdn/load-tiff.cpp

@@ -13,8 +13,8 @@
 //
 
 #include <dawn-config.h>
-#include <dawn-gettext.h>
 
+#include "gettext.hpp"
 #include "libdn-loaders.h"
 #include "libdn.hpp"
 

libdn/load-webp.cpp

@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: MPL-2.0
 //
 
-#include <dawn-gettext.h>
-
+#include "gettext.hpp"
 #include "libdn-loaders.h"
 #include "libdn.hpp"
 

libdn/load-wuffs.cpp

@@ -27,8 +27,8 @@
 #include "wuffs-v0.4.c"
 
 #include <dawn-config.h>
-#include <dawn-gettext.h>
 
+#include "gettext.hpp"
 #include "libdn-loaders.h"
 #include "libdn.hpp"
 

libdn/load-xcursor.cpp

@@ -6,8 +6,8 @@
 //
 
 #include <dawn-config.h>
-#include <dawn-gettext.h>
 
+#include "gettext.hpp"
 #include "libdn-loaders.h"
 #include "libdn.hpp"
 

tests/test-gettext.cpp

@@ -5,9 +5,9 @@
 // SPDX-License-Identifier: MPL-2.0
 //
 
-#include <dawn-gettext.h>
+#include <libdn/gettext.hpp>
+#include <libdn/libdn.hpp>
 
-#include "libdn/libdn.hpp"
 #include "test.hpp"
 
 #include <clocale>

tools/dnimage.cpp

@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: MPL-2.0
 //
 
-#include <dawn-gettext.h>
-
+#include <libdn/gettext.hpp>
 #include <libdn/ipc-rpc.hpp>
 #include <libdn/ipc-shm.hpp>
 #include <libdn/libdn.hpp>

tools/dnthumb.cpp

@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: MPL-2.0
 //
 
-#include <dawn-gettext.h>
-
+#include <libdn/gettext.hpp>
 #include <libdn/ipc-rpc.hpp>
 #include <libdn/ipc-shm.hpp>
 #include <libdn/libdn.hpp>