From db6811450e64fcef717af59afb0902d8a4c67ae7 Mon Sep 17 00:00:00 2001 From: Alexander Shaduri Date: Wed, 22 May 2024 11:51:41 +0400 Subject: [PATCH] Remove local_glibmm.h workaround for broken libintl.h. --- src/applib/app_builder_widget.h | 6 +- src/applib/app_gtkmm_tools.cpp | 2 +- src/applib/async_command_executor.cpp | 2 +- src/applib/command_executor.cpp | 3 +- src/applib/command_executor_3ware.h | 2 +- src/applib/command_executor_areca.h | 3 +- src/applib/command_executor_gui.cpp | 3 +- src/applib/command_executor_gui.h | 2 +- .../examples/example_smartctl_executor.cpp | 2 +- src/applib/gui_utils.h | 2 +- src/applib/selftest.cpp | 2 +- src/applib/selftest.h | 2 +- src/applib/smartctl_executor.cpp | 2 +- src/applib/smartctl_executor.h | 4 +- src/applib/smartctl_json_basic_parser.cpp | 2 +- src/applib/smartctl_parser_types.h | 3 +- src/applib/smartctl_text_ata_parser.cpp | 2 +- src/applib/smartctl_text_basic_parser.cpp | 2 +- src/applib/smartctl_version_parser.cpp | 2 +- src/applib/smartctl_version_parser.h | 2 +- src/applib/storage_detector.cpp | 2 +- src/applib/storage_detector_helpers.h | 2 +- src/applib/storage_detector_linux.cpp | 2 +- src/applib/storage_detector_other.cpp | 2 +- src/applib/storage_detector_win32.cpp | 2 +- src/applib/storage_device.cpp | 2 +- src/applib/storage_device_detected_type.h | 2 +- src/applib/storage_property.cpp | 2 +- src/applib/storage_property.h | 3 +- src/applib/storage_property_descr.cpp | 2 +- src/applib/warning_colors.h | 2 +- src/applib/window_instance_manager.h | 2 +- src/gui/gsc_add_device_window.cpp | 2 +- src/gui/gsc_executor_error_dialog.cpp | 3 +- src/gui/gsc_executor_log_window.cpp | 2 +- src/gui/gsc_info_window.cpp | 2 +- src/gui/gsc_init.cpp | 2 +- src/gui/gsc_main_window.cpp | 2 +- src/gui/gsc_main_window_iconview.h | 2 +- src/gui/gsc_preferences_window.cpp | 2 +- src/gui/gsc_text_window.h | 2 +- src/hz/format_unit.h | 4 +- src/local_glibmm.h | 66 ------------------- 43 files changed, 54 insertions(+), 110 deletions(-) delete mode 100644 src/local_glibmm.h diff --git a/src/applib/app_builder_widget.h b/src/applib/app_builder_widget.h index 2534566..98e3b67 100644 --- a/src/applib/app_builder_widget.h +++ b/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 +#include +#include #include + +#include #include #include diff --git a/src/applib/app_gtkmm_tools.cpp b/src/applib/app_gtkmm_tools.cpp index a3e3c6b..37200d4 100644 --- a/src/applib/app_gtkmm_tools.cpp +++ b/src/applib/app_gtkmm_tools.cpp @@ -9,7 +9,7 @@ Copyright: /// \weakgroup applib /// @{ -#include "local_glibmm.h" +#include #include #include #include // std::strlen diff --git a/src/applib/async_command_executor.cpp b/src/applib/async_command_executor.cpp index d386688..ee4e6ec 100644 --- a/src/applib/async_command_executor.cpp +++ b/src/applib/async_command_executor.cpp @@ -9,7 +9,7 @@ Copyright: /// \weakgroup applib /// @{ -#include "local_glibmm.h" +#include #include #include diff --git a/src/applib/command_executor.cpp b/src/applib/command_executor.cpp index 61959e1..a3318bb 100644 --- a/src/applib/command_executor.cpp +++ b/src/applib/command_executor.cpp @@ -9,7 +9,8 @@ Copyright: /// \weakgroup applib /// @{ -#include "local_glibmm.h" +#include +#include #include // g_usleep() #include "command_executor.h" diff --git a/src/applib/command_executor_3ware.h b/src/applib/command_executor_3ware.h index 2087b6d..9b0f5a0 100644 --- a/src/applib/command_executor_3ware.h +++ b/src/applib/command_executor_3ware.h @@ -14,7 +14,7 @@ Copyright: #include -#include "local_glibmm.h" +#include #include "async_command_executor.h" #include "command_executor.h" diff --git a/src/applib/command_executor_areca.h b/src/applib/command_executor_areca.h index cc53dd8..da9aecd 100644 --- a/src/applib/command_executor_areca.h +++ b/src/applib/command_executor_areca.h @@ -14,7 +14,8 @@ Copyright: #include -#include "local_glibmm.h" +#include +#include #include "async_command_executor.h" #include "command_executor.h" diff --git a/src/applib/command_executor_gui.cpp b/src/applib/command_executor_gui.cpp index b35a036..0666341 100644 --- a/src/applib/command_executor_gui.cpp +++ b/src/applib/command_executor_gui.cpp @@ -9,7 +9,8 @@ Copyright: /// \weakgroup applib /// @{ -#include "local_glibmm.h" +#include +#include #include // Gtk::Main #include diff --git a/src/applib/command_executor_gui.h b/src/applib/command_executor_gui.h index b7b4935..32580ef 100644 --- a/src/applib/command_executor_gui.h +++ b/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 #include #include diff --git a/src/applib/examples/example_smartctl_executor.cpp b/src/applib/examples/example_smartctl_executor.cpp index 7ad802f..45b5611 100644 --- a/src/applib/examples/example_smartctl_executor.cpp +++ b/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 #include #include diff --git a/src/applib/gui_utils.h b/src/applib/gui_utils.h index 2140285..f7ee726 100644 --- a/src/applib/gui_utils.h +++ b/src/applib/gui_utils.h @@ -12,7 +12,7 @@ Copyright: #ifndef GUI_UTILS_H #define GUI_UTILS_H -#include "local_glibmm.h" +#include #include #include diff --git a/src/applib/selftest.cpp b/src/applib/selftest.cpp index f8893b6..aa7b6a6 100644 --- a/src/applib/selftest.cpp +++ b/src/applib/selftest.cpp @@ -11,7 +11,7 @@ Copyright: #include "hz/error_container.h" #include "command_executor.h" -#include "local_glibmm.h" +#include #include // std::max, std::min #include // std::floor #include diff --git a/src/applib/selftest.h b/src/applib/selftest.h index 534ec2f..046baf8 100644 --- a/src/applib/selftest.h +++ b/src/applib/selftest.h @@ -12,7 +12,7 @@ Copyright: #ifndef SELFTEST_H #define SELFTEST_H -#include "local_glibmm.h" +#include #include #include #include diff --git a/src/applib/smartctl_executor.cpp b/src/applib/smartctl_executor.cpp index 9b27f3e..7caeae6 100644 --- a/src/applib/smartctl_executor.cpp +++ b/src/applib/smartctl_executor.cpp @@ -9,7 +9,7 @@ Copyright: /// \weakgroup applib /// @{ -#include "local_glibmm.h" +#include #include "smartctl_executor.h" #include "hz/win32_tools.h" diff --git a/src/applib/smartctl_executor.h b/src/applib/smartctl_executor.h index f080839..7340f7f 100644 --- a/src/applib/smartctl_executor.h +++ b/src/applib/smartctl_executor.h @@ -12,7 +12,9 @@ Copyright: #ifndef SMARTCTL_EXECUTOR_H #define SMARTCTL_EXECUTOR_H -#include "local_glibmm.h" +#include +#include + #include #include diff --git a/src/applib/smartctl_json_basic_parser.cpp b/src/applib/smartctl_json_basic_parser.cpp index b57ddc1..38dec75 100644 --- a/src/applib/smartctl_json_basic_parser.cpp +++ b/src/applib/smartctl_json_basic_parser.cpp @@ -11,7 +11,7 @@ Copyright: #include "smartctl_json_basic_parser.h" -// #include "local_glibmm.h" +// #include //#include // localeconv #include #include diff --git a/src/applib/smartctl_parser_types.h b/src/applib/smartctl_parser_types.h index 360c4d5..278213b 100644 --- a/src/applib/smartctl_parser_types.h +++ b/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 +#include #include "hz/enum_helper.h" diff --git a/src/applib/smartctl_text_ata_parser.cpp b/src/applib/smartctl_text_ata_parser.cpp index 1a995cd..021c2c2 100644 --- a/src/applib/smartctl_text_ata_parser.cpp +++ b/src/applib/smartctl_text_ata_parser.cpp @@ -11,7 +11,7 @@ Copyright: #include "smartctl_text_ata_parser.h" -// #include "local_glibmm.h" +// #include #include #include // localeconv #include diff --git a/src/applib/smartctl_text_basic_parser.cpp b/src/applib/smartctl_text_basic_parser.cpp index 15b057f..74dd59b 100644 --- a/src/applib/smartctl_text_basic_parser.cpp +++ b/src/applib/smartctl_text_basic_parser.cpp @@ -11,7 +11,7 @@ Copyright: #include "smartctl_text_basic_parser.h" -// #include "local_glibmm.h" +// #include //#include //#include #include diff --git a/src/applib/smartctl_version_parser.cpp b/src/applib/smartctl_version_parser.cpp index 6fcdc69..2bd1d17 100644 --- a/src/applib/smartctl_version_parser.cpp +++ b/src/applib/smartctl_version_parser.cpp @@ -9,7 +9,7 @@ Copyright: /// \weakgroup applib /// @{ -// #include "local_glibmm.h" +// #include #include "hz/string_algo.h" // string_* #include "hz/string_num.h" // string_is_numeric, number_to_string diff --git a/src/applib/smartctl_version_parser.h b/src/applib/smartctl_version_parser.h index 56253b8..78e5575 100644 --- a/src/applib/smartctl_version_parser.h +++ b/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 #include #include diff --git a/src/applib/storage_detector.cpp b/src/applib/storage_detector.cpp index 8d0b07e..d916da0 100644 --- a/src/applib/storage_detector.cpp +++ b/src/applib/storage_detector.cpp @@ -9,7 +9,7 @@ Copyright: /// \weakgroup applib /// @{ -#include "local_glibmm.h" +#include #include // compose() #include #include diff --git a/src/applib/storage_detector_helpers.h b/src/applib/storage_detector_helpers.h index b152ef3..abc04bb 100644 --- a/src/applib/storage_detector_helpers.h +++ b/src/applib/storage_detector_helpers.h @@ -15,7 +15,7 @@ Copyright: #include #include -#include "local_glibmm.h" // Glib::compose +#include // Glib::compose #include "build_config.h" #include "command_executor_factory.h" diff --git a/src/applib/storage_detector_linux.cpp b/src/applib/storage_detector_linux.cpp index 67f1f47..9acd049 100644 --- a/src/applib/storage_detector_linux.cpp +++ b/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 #include // std::find #include // std::fgets(), std::FILE diff --git a/src/applib/storage_detector_other.cpp b/src/applib/storage_detector_other.cpp index 583f1f0..7308a4c 100644 --- a/src/applib/storage_detector_other.cpp +++ b/src/applib/storage_detector_other.cpp @@ -11,7 +11,7 @@ Copyright: #include "build_config.h" -#include "local_glibmm.h" +#include #include // std::sort #include diff --git a/src/applib/storage_detector_win32.cpp b/src/applib/storage_detector_win32.cpp index 72e0b3e..10472f4 100644 --- a/src/applib/storage_detector_win32.cpp +++ b/src/applib/storage_detector_win32.cpp @@ -11,7 +11,7 @@ Copyright: #include "build_config.h" -#include "local_glibmm.h" +#include #include #include #include diff --git a/src/applib/storage_device.cpp b/src/applib/storage_device.cpp index 0f6d925..1595f51 100644 --- a/src/applib/storage_device.cpp +++ b/src/applib/storage_device.cpp @@ -11,7 +11,7 @@ Copyright: #include "storage_device.h" -#include "local_glibmm.h" +#include #include #include #include diff --git a/src/applib/storage_device_detected_type.h b/src/applib/storage_device_detected_type.h index 53d274b..0ca34eb 100644 --- a/src/applib/storage_device_detected_type.h +++ b/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 #include "hz/enum_helper.h" diff --git a/src/applib/storage_property.cpp b/src/applib/storage_property.cpp index 9ee4eb4..e316210 100644 --- a/src/applib/storage_property.cpp +++ b/src/applib/storage_property.cpp @@ -9,7 +9,7 @@ Copyright: /// \weakgroup applib /// @{ -#include "local_glibmm.h" +#include #include #include #include diff --git a/src/applib/storage_property.h b/src/applib/storage_property.h index 919739a..c7cfe7f 100644 --- a/src/applib/storage_property.h +++ b/src/applib/storage_property.h @@ -12,7 +12,8 @@ Copyright: #ifndef STORAGE_PROPERTY_H #define STORAGE_PROPERTY_H -#include "local_glibmm.h" +#include +#include #include // std::size_t #include diff --git a/src/applib/storage_property_descr.cpp b/src/applib/storage_property_descr.cpp index 82e0b0b..651ba21 100644 --- a/src/applib/storage_property_descr.cpp +++ b/src/applib/storage_property_descr.cpp @@ -9,7 +9,7 @@ Copyright: /// \weakgroup applib /// @{ -#include "local_glibmm.h" +#include #include #include #include diff --git a/src/applib/warning_colors.h b/src/applib/warning_colors.h index be8cf69..c16183b 100644 --- a/src/applib/warning_colors.h +++ b/src/applib/warning_colors.h @@ -12,7 +12,7 @@ Copyright: #ifndef WARNING_COLORS_H #define WARNING_COLORS_H -#include "local_glibmm.h" +#include #include "storage_property.h" diff --git a/src/applib/window_instance_manager.h b/src/applib/window_instance_manager.h index 48ddd25..9196e45 100644 --- a/src/applib/window_instance_manager.h +++ b/src/applib/window_instance_manager.h @@ -14,7 +14,7 @@ Copyright: #include #include -#include "local_glibmm.h" +#include #include diff --git a/src/gui/gsc_add_device_window.cpp b/src/gui/gsc_add_device_window.cpp index f9b5731..b3dcfb8 100644 --- a/src/gui/gsc_add_device_window.cpp +++ b/src/gui/gsc_add_device_window.cpp @@ -9,7 +9,7 @@ Copyright: /// \weakgroup gsc /// @{ -#include "local_glibmm.h" +#include #include // GDK_KEY_Escape #include diff --git a/src/gui/gsc_executor_error_dialog.cpp b/src/gui/gsc_executor_error_dialog.cpp index 106cf05..21f9d04 100644 --- a/src/gui/gsc_executor_error_dialog.cpp +++ b/src/gui/gsc_executor_error_dialog.cpp @@ -9,7 +9,8 @@ Copyright: /// \weakgroup gsc /// @{ -#include "local_glibmm.h" +#include +#include #include #include "gsc_executor_log_window.h" diff --git a/src/gui/gsc_executor_log_window.cpp b/src/gui/gsc_executor_log_window.cpp index db80928..2eb85fb 100644 --- a/src/gui/gsc_executor_log_window.cpp +++ b/src/gui/gsc_executor_log_window.cpp @@ -10,7 +10,7 @@ Copyright: /// @{ #include "hz/string_algo.h" -#include "local_glibmm.h" +#include #include #include // GDK_KEY_Escape #include diff --git a/src/gui/gsc_info_window.cpp b/src/gui/gsc_info_window.cpp index 695aa2f..6af00d0 100644 --- a/src/gui/gsc_info_window.cpp +++ b/src/gui/gsc_info_window.cpp @@ -9,7 +9,7 @@ Copyright: /// \weakgroup gsc /// @{ -#include "local_glibmm.h" +#include #include #include // GDK_KEY_Escape #include // better use vector, it's needed by others too diff --git a/src/gui/gsc_init.cpp b/src/gui/gsc_init.cpp index 25be175..ae36922 100644 --- a/src/gui/gsc_init.cpp +++ b/src/gui/gsc_init.cpp @@ -11,7 +11,7 @@ /// \weakgroup gsc /// @{ -#include "local_glibmm.h" +#include #include #include // g_, G* diff --git a/src/gui/gsc_main_window.cpp b/src/gui/gsc_main_window.cpp index 7a0fcce..60775fc 100644 --- a/src/gui/gsc_main_window.cpp +++ b/src/gui/gsc_main_window.cpp @@ -9,7 +9,7 @@ Copyright: /// \weakgroup gsc /// @{ -#include "local_glibmm.h" +#include #include #include #include diff --git a/src/gui/gsc_main_window_iconview.h b/src/gui/gsc_main_window_iconview.h index 740afaa..3f6e66e 100644 --- a/src/gui/gsc_main_window_iconview.h +++ b/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 #include #include #include // std::floor diff --git a/src/gui/gsc_preferences_window.cpp b/src/gui/gsc_preferences_window.cpp index ffba6bb..864079a 100644 --- a/src/gui/gsc_preferences_window.cpp +++ b/src/gui/gsc_preferences_window.cpp @@ -9,7 +9,7 @@ Copyright: /// \weakgroup gsc /// @{ -#include "local_glibmm.h" +#include #include #include // GDK_KEY_Escape #include diff --git a/src/gui/gsc_text_window.h b/src/gui/gsc_text_window.h index e18fc2e..3b1cf0e 100644 --- a/src/gui/gsc_text_window.h +++ b/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 #include #include // GDK_KEY_Escape #include diff --git a/src/hz/format_unit.h b/src/hz/format_unit.h index 4773f12..9c33659 100644 --- a/src/hz/format_unit.h +++ b/src/hz/format_unit.h @@ -27,8 +27,8 @@ Copyright: #endif #ifdef ENABLE_GLIB - #include "local_glibmm.h" - // #include // may cause conflicts with std::*printf() + #include + #include #else #define C_(Context,String) (String) #endif diff --git a/src/local_glibmm.h b/src/local_glibmm.h deleted file mode 100644 index d59a230..0000000 --- a/src/local_glibmm.h +++ /dev/null @@ -1,66 +0,0 @@ -/****************************************************************************** -License: GNU General Public License v3.0 only -Copyright: - (C) 2008 - 2021 Alexander Shaduri -******************************************************************************/ -/// \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() - #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 // libstdc++ only - - #define throw(a) // glibmm uses dynamic exception specifications, remove them. - #include - #undef throw - -#else - #include -#endif - -#include - -// 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 - -/// @}