Remove local_glibmm.h workaround for broken libintl.h.

src/applib/app_builder_widget.h

@@ -12,9 +12,11 @@ Copyright:
 #ifndef APP_BUILDER_WIDGET_H
 #define APP_BUILDER_WIDGET_H
 
-#include "local_glibmm.h"
-#include <string>
+#include <glibmm.h>
+#include <glibmm/i18n.h>
 #include <gtkmm.h>
+
+#include <string>
 #include <memory>
 #include <utility>
 

src/applib/app_gtkmm_tools.cpp

@@ -9,7 +9,7 @@ Copyright:
 /// \weakgroup applib
 /// @{
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 #include <gtkmm.h>
 #include <glib.h>
 #include <cstring>  // std::strlen

src/applib/async_command_executor.cpp

@@ -9,7 +9,7 @@ Copyright:
 /// \weakgroup applib
 /// @{
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 
 #include <string>
 #include <sys/types.h>

src/applib/command_executor.cpp

@@ -9,7 +9,8 @@ Copyright:
 /// \weakgroup applib
 /// @{
 
-#include "local_glibmm.h"
+#include <glibmm.h>
+#include <glibmm/i18n.h>
 #include <glib.h>  // g_usleep()
 
 #include "command_executor.h"

src/applib/command_executor_3ware.h

@@ -14,7 +14,7 @@ Copyright:
 
 #include <ranges>
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 
 #include "async_command_executor.h"
 #include "command_executor.h"

src/applib/command_executor_areca.h

@@ -14,7 +14,8 @@ Copyright:
 
 #include <ranges>
 
-#include "local_glibmm.h"
+#include <glibmm.h>
+#include <glibmm/i18n.h>
 
 #include "async_command_executor.h"
 #include "command_executor.h"

src/applib/command_executor_gui.cpp

@@ -9,7 +9,8 @@ Copyright:
 /// \weakgroup applib
 /// @{
 
-#include "local_glibmm.h"
+#include <glibmm.h>
+#include <glibmm/i18n.h>
 #include <gtkmm.h>  // Gtk::Main
 #include <gdkmm.h>
 

src/applib/command_executor_gui.h

@@ -12,7 +12,7 @@ Copyright:
 #ifndef COMMAND_EXECUTOR_GUI_H
 #define COMMAND_EXECUTOR_GUI_H
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 #include <gtkmm.h>
 #include <memory>
 

src/applib/examples/example_smartctl_executor.cpp

@@ -12,7 +12,7 @@ Copyright:
 // #include "applib/smartctl_executor_gui.h"
 #include "applib/smartctl_executor.h"
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 #include <gtkmm.h>
 #include <iostream>
 

src/applib/gui_utils.h

@@ -12,7 +12,7 @@ Copyright:
 #ifndef GUI_UTILS_H
 #define GUI_UTILS_H
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 #include <gtkmm.h>
 #include <string>
 

src/applib/selftest.cpp

@@ -11,7 +11,7 @@ Copyright:
 
 #include "hz/error_container.h"
 #include "command_executor.h"
-#include "local_glibmm.h"
+#include <glibmm.h>
 #include <algorithm>  // std::max, std::min
 #include <cmath>  // std::floor
 #include <chrono>

src/applib/selftest.h

@@ -12,7 +12,7 @@ Copyright:
 #ifndef SELFTEST_H
 #define SELFTEST_H
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 #include <memory>
 #include <string>
 #include <cstdint>

src/applib/smartctl_executor.cpp

@@ -9,7 +9,7 @@ Copyright:
 /// \weakgroup applib
 /// @{
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 
 #include "smartctl_executor.h"
 #include "hz/win32_tools.h"

src/applib/smartctl_executor.h

@@ -12,7 +12,9 @@ Copyright:
 #ifndef SMARTCTL_EXECUTOR_H
 #define SMARTCTL_EXECUTOR_H
 
-#include "local_glibmm.h"
+#include <glibmm.h>
+#include <glibmm/i18n.h>
+
 #include <ranges>
 #include <vector>
 

src/applib/smartctl_json_basic_parser.cpp

@@ -11,7 +11,7 @@ Copyright:
 
 #include "smartctl_json_basic_parser.h"
 
-// #include "local_glibmm.h"
+// #include <glibmm.h>
 //#include <clocale>  // localeconv
 #include <cstdint>
 #include <format>

src/applib/smartctl_parser_types.h

@@ -12,7 +12,8 @@ Copyright:
 #ifndef SMARTCTL_PARSER_TYPES_H
 #define SMARTCTL_PARSER_TYPES_H
 
-#include "local_glibmm.h"
+#include <glibmm.h>
+#include <glibmm/i18n.h>
 
 #include "hz/enum_helper.h"
 

src/applib/smartctl_text_ata_parser.cpp

@@ -11,7 +11,7 @@ Copyright:
 
 #include "smartctl_text_ata_parser.h"
 
-// #include "local_glibmm.h"
+// #include <glibmm.h>
 #include <chrono>
 #include <clocale>  // localeconv
 #include <cstddef>

src/applib/smartctl_text_basic_parser.cpp

@@ -11,7 +11,7 @@ Copyright:
 
 #include "smartctl_text_basic_parser.h"
 
-// #include "local_glibmm.h"
+// #include <glibmm.h>
 //#include <cstdint>
 //#include <utility>
 #include <cstdint>

src/applib/smartctl_version_parser.cpp

@@ -9,7 +9,7 @@ Copyright:
 /// \weakgroup applib
 /// @{
 
-// #include "local_glibmm.h"
+// #include <glibmm.h>
 
 #include "hz/string_algo.h"  // string_*
 #include "hz/string_num.h"  // string_is_numeric, number_to_string

src/applib/smartctl_version_parser.h

@@ -12,7 +12,7 @@ Copyright:
 #ifndef SMARTCTL_VERSION_PARSER_H
 #define SMARTCTL_VERSION_PARSER_H
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 
 #include <string>
 #include <optional>

src/applib/storage_detector.cpp

@@ -9,7 +9,7 @@ Copyright:
 /// \weakgroup applib
 /// @{
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 #include <gtkmm.h>  // compose()
 #include <algorithm>
 #include <memory>

src/applib/storage_detector_helpers.h

@@ -15,7 +15,7 @@ Copyright:
 #include <string>
 #include <vector>
 
-#include "local_glibmm.h"  // Glib::compose
+#include <glibmm.h>  // Glib::compose
 
 #include "build_config.h"
 #include "command_executor_factory.h"

src/applib/storage_detector_linux.cpp

@@ -12,7 +12,7 @@ Copyright:
 #include "storage_detector_linux.h"
 
 #include "command_executor.h"
-#include "local_glibmm.h"
+#include <glibmm.h>
 
 #include <algorithm>  // std::find
 #include <cstdio>  // std::fgets(), std::FILE

src/applib/storage_detector_other.cpp

@@ -11,7 +11,7 @@ Copyright:
 
 #include "build_config.h"
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 #include <algorithm>  // std::sort
 #include <cerrno>
 

src/applib/storage_detector_win32.cpp

@@ -11,7 +11,7 @@ Copyright:
 
 #include "build_config.h"
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 #include <set>
 #include <bitset>
 #include <map>

src/applib/storage_device.cpp

@@ -11,7 +11,7 @@ Copyright:
 
 #include "storage_device.h"
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 #include <cctype>
 #include <cstdint>
 #include <format>

src/applib/storage_device_detected_type.h

@@ -11,7 +11,7 @@ Copyright:
 #ifndef STORAGE_DEVICE_DETECTED_TYPE_H
 #define STORAGE_DEVICE_DETECTED_TYPE_H
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 
 #include "hz/enum_helper.h"
 

src/applib/storage_property.cpp

@@ -9,7 +9,7 @@ Copyright:
 /// \weakgroup applib
 /// @{
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 #include <cstddef>
 #include <chrono>
 #include <ios>

src/applib/storage_property.h

@@ -12,7 +12,8 @@ Copyright:
 #ifndef STORAGE_PROPERTY_H
 #define STORAGE_PROPERTY_H
 
-#include "local_glibmm.h"
+#include <glibmm.h>
+#include <glibmm/i18n.h>
 
 #include <cstddef>  // std::size_t
 #include <string>

src/applib/storage_property_descr.cpp

@@ -9,7 +9,7 @@ Copyright:
 /// \weakgroup applib
 /// @{
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 #include <utility>
 #include <vector>
 #include <map>

src/applib/warning_colors.h

@@ -12,7 +12,7 @@ Copyright:
 #ifndef WARNING_COLORS_H
 #define WARNING_COLORS_H
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 
 #include "storage_property.h"
 

src/applib/window_instance_manager.h

@@ -14,7 +14,7 @@ Copyright:
 
 #include <memory>
 #include <unordered_set>
-#include "local_glibmm.h"
+#include <glibmm.h>
 #include <gtkmm.h>
 
 

src/gui/gsc_add_device_window.cpp

@@ -9,7 +9,7 @@ Copyright:
 /// \weakgroup gsc
 /// @{
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 #include <gdk/gdk.h>  // GDK_KEY_Escape
 #include <memory>
 

src/gui/gsc_executor_error_dialog.cpp

@@ -9,7 +9,8 @@ Copyright:
 /// \weakgroup gsc
 /// @{
 
-#include "local_glibmm.h"
+#include <glibmm.h>
+#include <glibmm/i18n.h>
 #include <gtkmm.h>
 
 #include "gsc_executor_log_window.h"

src/gui/gsc_executor_log_window.cpp

@@ -10,7 +10,7 @@ Copyright:
 /// @{
 
 #include "hz/string_algo.h"
-#include "local_glibmm.h"
+#include <glibmm.h>
 #include <gtkmm.h>
 #include <gdk/gdk.h>  // GDK_KEY_Escape
 #include <sstream>

src/gui/gsc_info_window.cpp

@@ -9,7 +9,7 @@ Copyright:
 /// \weakgroup gsc
 /// @{
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 #include <gtkmm.h>
 #include <gdk/gdk.h>  // GDK_KEY_Escape
 #include <vector>  // better use vector, it's needed by others too

src/gui/gsc_init.cpp

@@ -11,7 +11,7 @@
 /// \weakgroup gsc
 /// @{
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 #include <gtkmm.h>
 #include <glib.h>  // g_, G*
 

src/gui/gsc_main_window.cpp

@@ -9,7 +9,7 @@ Copyright:
 /// \weakgroup gsc
 /// @{
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 #include <gtkmm.h>
 #include <vector>
 #include <memory>

src/gui/gsc_main_window_iconview.h

@@ -12,7 +12,7 @@ Copyright:
 #ifndef GSC_MAIN_WINDOW_ICONVIEW_H
 #define GSC_MAIN_WINDOW_ICONVIEW_H
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 #include <gtkmm.h>
 #include <vector>
 #include <cmath>  // std::floor

src/gui/gsc_preferences_window.cpp

@@ -9,7 +9,7 @@ Copyright:
 /// \weakgroup gsc
 /// @{
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 #include <gtkmm.h>
 #include <gdk/gdk.h>  // GDK_KEY_Escape
 #include <map>

src/gui/gsc_text_window.h

@@ -12,7 +12,7 @@ Copyright:
 #ifndef GSC_TEXT_WINDOW_H
 #define GSC_TEXT_WINDOW_H
 
-#include "local_glibmm.h"
+#include <glibmm.h>
 #include <gtkmm.h>
 #include <gdk/gdk.h>  // GDK_KEY_Escape
 #include <memory>

src/hz/format_unit.h

@@ -27,8 +27,8 @@ Copyright:
 #endif
 
 #ifdef ENABLE_GLIB
-	#include "local_glibmm.h"
-	// #include <glib/gi18n.h>  // may cause conflicts with std::*printf()
+	#include <glibmm.h>
+	#include <glibmm/i18n.h>
 #else
 	#define C_(Context,String) (String)
 #endif

src/local_glibmm.h

@@ -1,66 +0,0 @@
-/******************************************************************************
-License: GNU General Public License v3.0 only
-Copyright:
-	(C) 2008 - 2021 Alexander Shaduri <ashaduri@gmail.com>
-******************************************************************************/
-/// \file
-/// \author Alexander Shaduri
-/// \ingroup gsc
-/// \weakgroup gsc
-/// @{
-
-#ifndef LOCAL_GLIBMM_H
-#define LOCAL_GLIBMM_H
-
-
-// Glibmm before 2.50.1 uses throw(...) exception specifications which are invalid in C++17.
-// Try to work around that.
-#ifdef APP_GLIBMM_USES_THROW
-	#if !__has_include(<bits/stdc++.h>)
-		#error "This version of GLibmm is incompatible with C++17. Use GLibmm 2.50.1 or later."
-	#endif
-
-	// include complete stdlib, to avoid throw() macro errors there.
-	#include <bits/stdc++.h>  // libstdc++ only
-
-	#define throw(a)  // glibmm uses dynamic exception specifications, remove them.
-		#include <glibmm.h>
-	#undef throw
-
-#else
-	#include <glibmm.h>
-#endif
-
-#include <glibmm/i18n.h>
-
-// Undo the macros declared by libintl.h (included by glibmm/i18n.h),
-// they conflict with C++ std:: versions.
-#undef fprintf
-#undef vfprintf
-#undef printf
-#undef vprintf
-#undef sprintf
-#undef vsprintf
-#undef snprintf
-#undef vsnprintf
-#undef asprintf
-#undef vasprintf
-#undef fwprintf
-#undef vfwprintf
-#undef wprintf
-#undef vfwprintf
-#undef swprintf
-#undef vswprintf
-#undef fwprintf
-#undef vfwprintf
-#undef wprintf
-#undef vwprintf
-#undef swprintf
-#undef vswprintf
-#undef setlocale
-
-
-
-#endif
-
-/// @}