From a40a8ac7eeeaab8e686304b18d9ac0bdc2abee49 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Mon, 22 Feb 2021 08:21:52 +0400 Subject: [PATCH] Use local variable for QLibrary from BaseGtkIntegration --- .../platform/linux/linux_gtk_integration.cpp | 126 +++++++++--------- 1 file changed, 62 insertions(+), 64 deletions(-) diff --git a/Telegram/SourceFiles/platform/linux/linux_gtk_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_gtk_integration.cpp index 394a2fbb06..b9f36c5fbc 100644 --- a/Telegram/SourceFiles/platform/linux/linux_gtk_integration.cpp +++ b/Telegram/SourceFiles/platform/linux/linux_gtk_integration.cpp @@ -22,10 +22,6 @@ using BaseGtkIntegration = base::Platform::GtkIntegration; namespace { -QLibrary &Library() { - return BaseGtkIntegration::Instance()->library(); -} - bool GetImageFromClipboardSupported() { return (gtk_clipboard_get != nullptr) && (gtk_clipboard_wait_for_contents != nullptr) @@ -62,73 +58,75 @@ void GtkIntegration::load() { return; } - LOAD_GTK_SYMBOL(Library(), "gtk_widget_show", gtk_widget_show); - LOAD_GTK_SYMBOL(Library(), "gtk_widget_hide", gtk_widget_hide); - LOAD_GTK_SYMBOL(Library(), "gtk_widget_get_window", gtk_widget_get_window); - LOAD_GTK_SYMBOL(Library(), "gtk_widget_realize", gtk_widget_realize); - LOAD_GTK_SYMBOL(Library(), "gtk_widget_hide_on_delete", gtk_widget_hide_on_delete); - LOAD_GTK_SYMBOL(Library(), "gtk_widget_destroy", gtk_widget_destroy); - LOAD_GTK_SYMBOL(Library(), "gtk_clipboard_get", gtk_clipboard_get); - LOAD_GTK_SYMBOL(Library(), "gtk_clipboard_store", gtk_clipboard_store); - LOAD_GTK_SYMBOL(Library(), "gtk_clipboard_wait_for_contents", gtk_clipboard_wait_for_contents); - LOAD_GTK_SYMBOL(Library(), "gtk_clipboard_wait_for_image", gtk_clipboard_wait_for_image); - LOAD_GTK_SYMBOL(Library(), "gtk_selection_data_targets_include_image", gtk_selection_data_targets_include_image); - LOAD_GTK_SYMBOL(Library(), "gtk_selection_data_free", gtk_selection_data_free); - LOAD_GTK_SYMBOL(Library(), "gtk_file_chooser_dialog_new", gtk_file_chooser_dialog_new); - LOAD_GTK_SYMBOL(Library(), "gtk_file_chooser_get_type", gtk_file_chooser_get_type); - LOAD_GTK_SYMBOL(Library(), "gtk_image_get_type", gtk_image_get_type); - LOAD_GTK_SYMBOL(Library(), "gtk_file_chooser_set_current_folder", gtk_file_chooser_set_current_folder); - LOAD_GTK_SYMBOL(Library(), "gtk_file_chooser_get_current_folder", gtk_file_chooser_get_current_folder); - LOAD_GTK_SYMBOL(Library(), "gtk_file_chooser_set_current_name", gtk_file_chooser_set_current_name); - LOAD_GTK_SYMBOL(Library(), "gtk_file_chooser_select_filename", gtk_file_chooser_select_filename); - LOAD_GTK_SYMBOL(Library(), "gtk_file_chooser_get_filenames", gtk_file_chooser_get_filenames); - LOAD_GTK_SYMBOL(Library(), "gtk_file_chooser_set_filter", gtk_file_chooser_set_filter); - LOAD_GTK_SYMBOL(Library(), "gtk_file_chooser_get_filter", gtk_file_chooser_get_filter); - LOAD_GTK_SYMBOL(Library(), "gtk_window_get_type", gtk_window_get_type); - LOAD_GTK_SYMBOL(Library(), "gtk_window_set_title", gtk_window_set_title); - LOAD_GTK_SYMBOL(Library(), "gtk_file_chooser_set_local_only", gtk_file_chooser_set_local_only); - LOAD_GTK_SYMBOL(Library(), "gtk_file_chooser_set_action", gtk_file_chooser_set_action); - LOAD_GTK_SYMBOL(Library(), "gtk_file_chooser_set_select_multiple", gtk_file_chooser_set_select_multiple); - LOAD_GTK_SYMBOL(Library(), "gtk_file_chooser_set_do_overwrite_confirmation", gtk_file_chooser_set_do_overwrite_confirmation); - LOAD_GTK_SYMBOL(Library(), "gtk_file_chooser_remove_filter", gtk_file_chooser_remove_filter); - LOAD_GTK_SYMBOL(Library(), "gtk_file_filter_set_name", gtk_file_filter_set_name); - LOAD_GTK_SYMBOL(Library(), "gtk_file_filter_add_pattern", gtk_file_filter_add_pattern); - LOAD_GTK_SYMBOL(Library(), "gtk_file_chooser_add_filter", gtk_file_chooser_add_filter); - LOAD_GTK_SYMBOL(Library(), "gtk_file_chooser_set_preview_widget", gtk_file_chooser_set_preview_widget); - LOAD_GTK_SYMBOL(Library(), "gtk_file_chooser_get_preview_filename", gtk_file_chooser_get_preview_filename); - LOAD_GTK_SYMBOL(Library(), "gtk_file_chooser_set_preview_widget_active", gtk_file_chooser_set_preview_widget_active); - LOAD_GTK_SYMBOL(Library(), "gtk_file_filter_new", gtk_file_filter_new); - LOAD_GTK_SYMBOL(Library(), "gtk_image_new", gtk_image_new); - LOAD_GTK_SYMBOL(Library(), "gtk_image_set_from_pixbuf", gtk_image_set_from_pixbuf); + auto &lib = BaseGtkIntegration::Instance()->library(); - LOAD_GTK_SYMBOL(Library(), "gdk_window_set_modal_hint", gdk_window_set_modal_hint); - LOAD_GTK_SYMBOL(Library(), "gdk_window_focus", gdk_window_focus); - LOAD_GTK_SYMBOL(Library(), "gtk_dialog_get_type", gtk_dialog_get_type); - LOAD_GTK_SYMBOL(Library(), "gtk_dialog_run", gtk_dialog_run); + LOAD_GTK_SYMBOL(lib, "gtk_widget_show", gtk_widget_show); + LOAD_GTK_SYMBOL(lib, "gtk_widget_hide", gtk_widget_hide); + LOAD_GTK_SYMBOL(lib, "gtk_widget_get_window", gtk_widget_get_window); + LOAD_GTK_SYMBOL(lib, "gtk_widget_realize", gtk_widget_realize); + LOAD_GTK_SYMBOL(lib, "gtk_widget_hide_on_delete", gtk_widget_hide_on_delete); + LOAD_GTK_SYMBOL(lib, "gtk_widget_destroy", gtk_widget_destroy); + LOAD_GTK_SYMBOL(lib, "gtk_clipboard_get", gtk_clipboard_get); + LOAD_GTK_SYMBOL(lib, "gtk_clipboard_store", gtk_clipboard_store); + LOAD_GTK_SYMBOL(lib, "gtk_clipboard_wait_for_contents", gtk_clipboard_wait_for_contents); + LOAD_GTK_SYMBOL(lib, "gtk_clipboard_wait_for_image", gtk_clipboard_wait_for_image); + LOAD_GTK_SYMBOL(lib, "gtk_selection_data_targets_include_image", gtk_selection_data_targets_include_image); + LOAD_GTK_SYMBOL(lib, "gtk_selection_data_free", gtk_selection_data_free); + LOAD_GTK_SYMBOL(lib, "gtk_file_chooser_dialog_new", gtk_file_chooser_dialog_new); + LOAD_GTK_SYMBOL(lib, "gtk_file_chooser_get_type", gtk_file_chooser_get_type); + LOAD_GTK_SYMBOL(lib, "gtk_image_get_type", gtk_image_get_type); + LOAD_GTK_SYMBOL(lib, "gtk_file_chooser_set_current_folder", gtk_file_chooser_set_current_folder); + LOAD_GTK_SYMBOL(lib, "gtk_file_chooser_get_current_folder", gtk_file_chooser_get_current_folder); + LOAD_GTK_SYMBOL(lib, "gtk_file_chooser_set_current_name", gtk_file_chooser_set_current_name); + LOAD_GTK_SYMBOL(lib, "gtk_file_chooser_select_filename", gtk_file_chooser_select_filename); + LOAD_GTK_SYMBOL(lib, "gtk_file_chooser_get_filenames", gtk_file_chooser_get_filenames); + LOAD_GTK_SYMBOL(lib, "gtk_file_chooser_set_filter", gtk_file_chooser_set_filter); + LOAD_GTK_SYMBOL(lib, "gtk_file_chooser_get_filter", gtk_file_chooser_get_filter); + LOAD_GTK_SYMBOL(lib, "gtk_window_get_type", gtk_window_get_type); + LOAD_GTK_SYMBOL(lib, "gtk_window_set_title", gtk_window_set_title); + LOAD_GTK_SYMBOL(lib, "gtk_file_chooser_set_local_only", gtk_file_chooser_set_local_only); + LOAD_GTK_SYMBOL(lib, "gtk_file_chooser_set_action", gtk_file_chooser_set_action); + LOAD_GTK_SYMBOL(lib, "gtk_file_chooser_set_select_multiple", gtk_file_chooser_set_select_multiple); + LOAD_GTK_SYMBOL(lib, "gtk_file_chooser_set_do_overwrite_confirmation", gtk_file_chooser_set_do_overwrite_confirmation); + LOAD_GTK_SYMBOL(lib, "gtk_file_chooser_remove_filter", gtk_file_chooser_remove_filter); + LOAD_GTK_SYMBOL(lib, "gtk_file_filter_set_name", gtk_file_filter_set_name); + LOAD_GTK_SYMBOL(lib, "gtk_file_filter_add_pattern", gtk_file_filter_add_pattern); + LOAD_GTK_SYMBOL(lib, "gtk_file_chooser_add_filter", gtk_file_chooser_add_filter); + LOAD_GTK_SYMBOL(lib, "gtk_file_chooser_set_preview_widget", gtk_file_chooser_set_preview_widget); + LOAD_GTK_SYMBOL(lib, "gtk_file_chooser_get_preview_filename", gtk_file_chooser_get_preview_filename); + LOAD_GTK_SYMBOL(lib, "gtk_file_chooser_set_preview_widget_active", gtk_file_chooser_set_preview_widget_active); + LOAD_GTK_SYMBOL(lib, "gtk_file_filter_new", gtk_file_filter_new); + LOAD_GTK_SYMBOL(lib, "gtk_image_new", gtk_image_new); + LOAD_GTK_SYMBOL(lib, "gtk_image_set_from_pixbuf", gtk_image_set_from_pixbuf); - LOAD_GTK_SYMBOL(Library(), "gdk_atom_intern", gdk_atom_intern); + LOAD_GTK_SYMBOL(lib, "gdk_window_set_modal_hint", gdk_window_set_modal_hint); + LOAD_GTK_SYMBOL(lib, "gdk_window_focus", gdk_window_focus); + LOAD_GTK_SYMBOL(lib, "gtk_dialog_get_type", gtk_dialog_get_type); + LOAD_GTK_SYMBOL(lib, "gtk_dialog_run", gtk_dialog_run); - LOAD_GTK_SYMBOL(Library(), "gdk_display_get_default", gdk_display_get_default); - LOAD_GTK_SYMBOL(Library(), "gdk_display_get_monitor", gdk_display_get_monitor); - LOAD_GTK_SYMBOL(Library(), "gdk_display_get_primary_monitor", gdk_display_get_primary_monitor); - LOAD_GTK_SYMBOL(Library(), "gdk_monitor_get_scale_factor", gdk_monitor_get_scale_factor); + LOAD_GTK_SYMBOL(lib, "gdk_atom_intern", gdk_atom_intern); - LOAD_GTK_SYMBOL(Library(), "gdk_pixbuf_new_from_file_at_size", gdk_pixbuf_new_from_file_at_size); - LOAD_GTK_SYMBOL(Library(), "gdk_pixbuf_get_has_alpha", gdk_pixbuf_get_has_alpha); - LOAD_GTK_SYMBOL(Library(), "gdk_pixbuf_get_pixels", gdk_pixbuf_get_pixels); - LOAD_GTK_SYMBOL(Library(), "gdk_pixbuf_get_width", gdk_pixbuf_get_width); - LOAD_GTK_SYMBOL(Library(), "gdk_pixbuf_get_height", gdk_pixbuf_get_height); - LOAD_GTK_SYMBOL(Library(), "gdk_pixbuf_get_rowstride", gdk_pixbuf_get_rowstride); + LOAD_GTK_SYMBOL(lib, "gdk_display_get_default", gdk_display_get_default); + LOAD_GTK_SYMBOL(lib, "gdk_display_get_monitor", gdk_display_get_monitor); + LOAD_GTK_SYMBOL(lib, "gdk_display_get_primary_monitor", gdk_display_get_primary_monitor); + LOAD_GTK_SYMBOL(lib, "gdk_monitor_get_scale_factor", gdk_monitor_get_scale_factor); - GdkHelperLoad(Library()); + LOAD_GTK_SYMBOL(lib, "gdk_pixbuf_new_from_file_at_size", gdk_pixbuf_new_from_file_at_size); + LOAD_GTK_SYMBOL(lib, "gdk_pixbuf_get_has_alpha", gdk_pixbuf_get_has_alpha); + LOAD_GTK_SYMBOL(lib, "gdk_pixbuf_get_pixels", gdk_pixbuf_get_pixels); + LOAD_GTK_SYMBOL(lib, "gdk_pixbuf_get_width", gdk_pixbuf_get_width); + LOAD_GTK_SYMBOL(lib, "gdk_pixbuf_get_height", gdk_pixbuf_get_height); + LOAD_GTK_SYMBOL(lib, "gdk_pixbuf_get_rowstride", gdk_pixbuf_get_rowstride); - LOAD_GTK_SYMBOL(Library(), "gtk_dialog_get_widget_for_response", gtk_dialog_get_widget_for_response); - LOAD_GTK_SYMBOL(Library(), "gtk_button_set_label", gtk_button_set_label); - LOAD_GTK_SYMBOL(Library(), "gtk_button_get_type", gtk_button_get_type); + GdkHelperLoad(lib); - LOAD_GTK_SYMBOL(Library(), "gtk_app_chooser_dialog_new", gtk_app_chooser_dialog_new); - LOAD_GTK_SYMBOL(Library(), "gtk_app_chooser_get_app_info", gtk_app_chooser_get_app_info); - LOAD_GTK_SYMBOL(Library(), "gtk_app_chooser_get_type", gtk_app_chooser_get_type); + LOAD_GTK_SYMBOL(lib, "gtk_dialog_get_widget_for_response", gtk_dialog_get_widget_for_response); + LOAD_GTK_SYMBOL(lib, "gtk_button_set_label", gtk_button_set_label); + LOAD_GTK_SYMBOL(lib, "gtk_button_get_type", gtk_button_get_type); + + LOAD_GTK_SYMBOL(lib, "gtk_app_chooser_dialog_new", gtk_app_chooser_dialog_new); + LOAD_GTK_SYMBOL(lib, "gtk_app_chooser_get_app_info", gtk_app_chooser_get_app_info); + LOAD_GTK_SYMBOL(lib, "gtk_app_chooser_get_type", gtk_app_chooser_get_type); Loaded = true; }