From 2b23b812e185ee01fa091ced3ba49d56af2dc993 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 25 Dec 2021 16:27:03 +0200 Subject: [PATCH] add missing XPM headers Signed-off-by: Ivailo Monev --- src/gui/kernel/qdnd_x11.cpp | 1 + src/gui/kernel/qwhatsthis.cpp | 1 + src/gui/qguicommon_p.h | 3 +++ src/gui/styles/qcleanlooksstyle.cpp | 18 +++++++++++++++++- src/gui/styles/qcommonstyle.cpp | 6 ++++++ src/gui/styles/qmotifstyle.cpp | 12 +++++++++--- src/gui/styles/qplastiquestyle.cpp | 17 +++++++++++++++++ src/gui/styles/qwindowsstyle.cpp | 8 ++++++++ 8 files changed, 62 insertions(+), 4 deletions(-) diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp index e2db647ef..0c0eefac9 100644 --- a/src/gui/kernel/qdnd_x11.cpp +++ b/src/gui/kernel/qdnd_x11.cpp @@ -233,6 +233,7 @@ static QPixmap *defaultPm = 0; static const int default_pm_hotx = -2; static const int default_pm_hoty = -16; +/* XPM */ static const char* const default_pm[] = { "13 9 3 1", ". c None", diff --git a/src/gui/kernel/qwhatsthis.cpp b/src/gui/kernel/qwhatsthis.cpp index 4d8f342fb..a0ba50ac2 100644 --- a/src/gui/kernel/qwhatsthis.cpp +++ b/src/gui/kernel/qwhatsthis.cpp @@ -310,6 +310,7 @@ void QWhatsThat::paintEvent(QPaintEvent*) } } +/* XPM */ static const char * const button_image[] = { "16 16 3 1", " c None", diff --git a/src/gui/qguicommon_p.h b/src/gui/qguicommon_p.h index 3adf60c69..76472ec40 100644 --- a/src/gui/qguicommon_p.h +++ b/src/gui/qguicommon_p.h @@ -153,6 +153,7 @@ static const char * const qt_information_xpm[]={ ".................cc**...........", "..................***...........", "...................**..........."}; + /* XPM */ static const char* const qt_warning_xpm[]={ "32 32 4 1", @@ -192,6 +193,7 @@ static const char* const qt_warning_xpm[]={ "..*************************bbbbb", "....bbbbbbbbbbbbbbbbbbbbbbbbbbb.", ".....bbbbbbbbbbbbbbbbbbbbbbbbb.."}; + /* XPM */ static const char* const qt_critical_xpm[]={ "32 32 4 1", @@ -231,6 +233,7 @@ static const char* const qt_critical_xpm[]={ ".........aa********aaaaa........", "...........aaaaaaaaaaa..........", ".............aaaaaaa............"}; + /* XPM */ static const char *const qt_question_xpm[] = { "32 32 5 1", diff --git a/src/gui/styles/qcleanlooksstyle.cpp b/src/gui/styles/qcleanlooksstyle.cpp index 9b0370cc3..4eadee574 100644 --- a/src/gui/styles/qcleanlooksstyle.cpp +++ b/src/gui/styles/qcleanlooksstyle.cpp @@ -89,6 +89,7 @@ static const char * const qt_cleanlooks_dock_widget_close_xpm[] = { " +@@@@@@@+ ", " "}; +/* XPM */ static const char * const qt_cleanlooks_arrow_down_xpm[] = { "11 7 2 1", " c None", @@ -101,6 +102,7 @@ static const char * const qt_cleanlooks_arrow_down_xpm[] = { " xxx ", " x "}; +/* XPM */ static const char * const qt_cleanlooks_arrow_up_xpm[] = { "11 7 2 1", " c None", @@ -113,6 +115,7 @@ static const char * const qt_cleanlooks_arrow_up_xpm[] = { " x x ", " "}; +/* XPM */ static const char * const qt_cleanlooks_dock_widget_restore_xpm[] = { "11 13 7 1", " c None", @@ -136,6 +139,7 @@ static const char * const qt_cleanlooks_dock_widget_restore_xpm[] = { " +@@@@@@@+ ", " "}; +/* XPM */ static const char * const qt_cleanlooks_workspace_minimize[] = { "11 13 7 1", " c None", @@ -159,7 +163,7 @@ static const char * const qt_cleanlooks_workspace_minimize[] = { " +@@@@@@@+ ", " "}; - +/* XPM */ static const char * const qt_cleanlooks_titlebar_context_help[] = { "10 10 3 1", " c None", @@ -176,6 +180,7 @@ static const char * const qt_cleanlooks_titlebar_context_help[] = { " ## ", " ## "}; +/* XPM */ static const char * const qt_cleanlooks_radiobutton[] = { "13 13 9 1", " c None", @@ -201,6 +206,7 @@ static const char * const qt_cleanlooks_radiobutton[] = { " @+#%*%#+@ ", " #@...+# "}; +/* XPM */ static const char * const qt_cleanlooks_radiobutton_checked[] = { "13 13 20 1", " c None", @@ -237,6 +243,7 @@ static const char * const qt_cleanlooks_radiobutton_checked[] = { " ", " "}; +/* XPM */ static const char * const qt_cleanlooks_scrollbar_button_arrow_up[] = { "7 4 2 1", " c None", @@ -246,6 +253,7 @@ static const char * const qt_cleanlooks_scrollbar_button_arrow_up[] = { " ***** ", "*******"}; +/* XPM */ static const char * const qt_cleanlooks_scrollbar_button_arrow_down[] = { "7 4 2 1", " c None", @@ -255,6 +263,7 @@ static const char * const qt_cleanlooks_scrollbar_button_arrow_down[] = { " *** ", " * "}; +/* XPM */ static const char * const qt_cleanlooks_spinbox_button_arrow_down[] = { "7 4 2 1", " c None", @@ -264,6 +273,7 @@ static const char * const qt_cleanlooks_spinbox_button_arrow_down[] = { " *** ", " * "}; +/* XPM */ static const char * const qt_cleanlooks_spinbox_button_arrow_up[] = { "7 4 2 1", " c None", @@ -273,6 +283,7 @@ static const char * const qt_cleanlooks_spinbox_button_arrow_up[] = { " ***** ", "*******"}; +/* XPM */ static const char * const qt_cleanlooks_scrollbar_button_left[] = { "16 16 6 1", " c None", @@ -298,6 +309,7 @@ static const char * const qt_cleanlooks_scrollbar_button_left[] = { ".+<<<<<<<<<<<<<+", " .++++++++++++++"}; +/* XPM */ static const char * const qt_cleanlooks_scrollbar_button_right[] = { "16 16 6 1", " c None", @@ -323,6 +335,7 @@ static const char * const qt_cleanlooks_scrollbar_button_right[] = { "+<<<<<<<<<<<<<+.", "++++++++++++++. "}; +/* XPM */ static const char * const qt_cleanlooks_scrollbar_button_up[] = { "16 16 6 1", " c None", @@ -348,6 +361,7 @@ static const char * const qt_cleanlooks_scrollbar_button_up[] = { "+<<<<<<<<<<<<<<+", "++++++++++++++++"}; +/* XPM */ static const char * const qt_cleanlooks_scrollbar_button_down[] = { "16 16 6 1", " c None", @@ -373,6 +387,7 @@ static const char * const qt_cleanlooks_scrollbar_button_down[] = { ".+<<<<<<<<<<<<+.", " .++++++++++++. "}; +/* XPM */ static const char * const qt_cleanlooks_menuitem_checkbox_checked[] = { "8 7 6 1", " g None", @@ -389,6 +404,7 @@ static const char * const qt_cleanlooks_menuitem_checkbox_checked[] = { " @# ", " . "}; +/* XPM */ static const char * const qt_cleanlooks_checkbox_checked[] = { "13 13 3 1", " c None", diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp index 1970a81cc..b94639f0b 100644 --- a/src/gui/styles/qcommonstyle.cpp +++ b/src/gui/styles/qcommonstyle.cpp @@ -60,6 +60,7 @@ QT_BEGIN_NAMESPACE #ifndef QT_NO_XPM +/* XPM */ static const char * const tree_branch_open_xpm[] = { "9 9 2 1", " c None", @@ -74,6 +75,7 @@ static const char * const tree_branch_open_xpm[] = { "# #", "#########"}; +/* XPM */ static const char * const tree_branch_closed_xpm[] = { "9 9 2 1", " c None", @@ -88,6 +90,7 @@ static const char * const tree_branch_closed_xpm[] = { "# #", "#########"}; +/* XPM */ static const char * const tb_extension_arrow_v_xpm[] = { "5 8 3 1", " c None", @@ -103,6 +106,7 @@ static const char * const tb_extension_arrow_v_xpm[] = { "++.++" }; +/* XPM */ static const char * const tb_extension_arrow_h_xpm[] = { "8 5 3 1", " c None", @@ -115,6 +119,7 @@ static const char * const tb_extension_arrow_h_xpm[] = { "..++..++", }; +/* XPM */ static const char * const filedialog_start_xpm[]={ "16 15 8 1", "a c #cec6bd", @@ -141,6 +146,7 @@ static const char * const filedialog_start_xpm[]={ "...#############", "................"}; +/* XPM */ static const char * const filedialog_end_xpm[]={ "16 15 9 1", "d c #a0a0a0", diff --git a/src/gui/styles/qmotifstyle.cpp b/src/gui/styles/qmotifstyle.cpp index f118b3c58..f69a3bf7b 100644 --- a/src/gui/styles/qmotifstyle.cpp +++ b/src/gui/styles/qmotifstyle.cpp @@ -1987,6 +1987,7 @@ QMotifStyle::subElementRect(SubElement sr, const QStyleOption *opt, const QWidge } #ifndef QT_NO_XPM +/* XPM */ static const char * const qt_motif_menu_xpm[] = { "16 16 11 1", " c #000000", @@ -2017,7 +2018,7 @@ static const char * const qt_motif_menu_xpm[] = { "................", "................"}; - +/* XPM */ static const char * const qt_motif_close_xpm[] = { "12 12 2 1", " s None c None", @@ -2035,6 +2036,7 @@ static const char * const qt_motif_close_xpm[] = { " ", " "}; +/* XPM */ static const char * const qt_motif_maximize_xpm[] = { "12 12 2 1", " s None c None", @@ -2052,6 +2054,7 @@ static const char * const qt_motif_maximize_xpm[] = { " ", " "}; +/* XPM */ static const char * const qt_motif_minimize_xpm[] = { "12 12 2 1", " s None c None", @@ -2070,6 +2073,7 @@ static const char * const qt_motif_minimize_xpm[] = { " "}; #if 0 // ### not used??? +/* XPM */ static const char * const qt_motif_normalize_xpm[] = { "12 12 2 1", " s None c None", @@ -2088,6 +2092,7 @@ static const char * const qt_motif_normalize_xpm[] = { " "}; #endif +/* XPM */ static const char * const qt_motif_normalizeup_xpm[] = { "12 12 2 1", " s None c None", @@ -2105,6 +2110,7 @@ static const char * const qt_motif_normalizeup_xpm[] = { " ", " "}; +/* XPM */ static const char * const qt_motif_shade_xpm[] = { "12 12 2 1", "# c #000000", ". c None", @@ -2121,7 +2127,7 @@ static const char * const qt_motif_shade_xpm[] = { "............", "............"}; - +/* XPM */ static const char * const qt_motif_unshade_xpm[] = { "12 12 2 1", "# c #000000", @@ -2139,7 +2145,7 @@ static const char * const qt_motif_unshade_xpm[] = { "............", "............"}; - +/* XPM */ static const char * qt_motif_dock_window_close_xpm[] = { "8 8 2 1", "# c #000000", diff --git a/src/gui/styles/qplastiquestyle.cpp b/src/gui/styles/qplastiquestyle.cpp index c3ba9f5f3..301842dff 100644 --- a/src/gui/styles/qplastiquestyle.cpp +++ b/src/gui/styles/qplastiquestyle.cpp @@ -78,6 +78,7 @@ static const int plastiqueWindowsItemHMargin = 3; // menu item hor text ma static const int plastiqueWindowsItemVMargin = 2; // menu item ver text margin static const int plastiqueWindowsRightBorder = 15; // right border on windows +/* XPM */ static const char * const qt_plastique_slider_verticalhandle[] = { "15 11 6 1", " c None", @@ -98,6 +99,7 @@ static const char * const qt_plastique_slider_verticalhandle[] = { "$+dddddddd+$ ", " $++++++++$ "}; +/* XPM */ static const char * const qt_plastique_slider_verticalhandle_left[] = { "15 11 6 1", " c None", @@ -118,6 +120,7 @@ static const char * const qt_plastique_slider_verticalhandle_left[] = { " $+dddddddd+$", " $++++++++$ "}; +/* XPM */ static const char * const qt_plastique_slider_horizontalhandle[] = { "11 15 6 1", " c None", @@ -142,6 +145,7 @@ static const char * const qt_plastique_slider_horizontalhandle[] = { " $+d+$ ", " $+$ "}; +/* XPM */ static const char * const qt_plastique_slider_horizontalhandle_up[] = { "11 15 6 1", " c None", @@ -166,6 +170,7 @@ static const char * const qt_plastique_slider_horizontalhandle_up[] = { "$+ddddddd+$", " $+++++++$ "}; +/* XPM */ static const char * const qt_plastique_scrollbar_button_arrow_left[] = { "4 7 2 1", " c None", @@ -178,6 +183,7 @@ static const char * const qt_plastique_scrollbar_button_arrow_left[] = { " **", " *"}; +/* XPM */ static const char * const qt_plastique_scrollbar_button_arrow_right[] = { "4 7 2 1", " c None", @@ -190,6 +196,7 @@ static const char * const qt_plastique_scrollbar_button_arrow_right[] = { "** ", "* "}; +/* XPM */ static const char * const qt_plastique_scrollbar_button_arrow_up[] = { "7 4 2 1", " c None", @@ -199,6 +206,7 @@ static const char * const qt_plastique_scrollbar_button_arrow_up[] = { " ***** ", "*******"}; +/* XPM */ static const char * const qt_plastique_scrollbar_button_arrow_down[] = { "7 4 2 1", " c None", @@ -208,6 +216,7 @@ static const char * const qt_plastique_scrollbar_button_arrow_down[] = { " *** ", " * "}; +/* XPM */ static const char * const qt_plastique_scrollbar_button_left[] = { "16 16 6 1", " c None", @@ -233,6 +242,7 @@ static const char * const qt_plastique_scrollbar_button_left[] = { ".+<<<<<<<<<<<<<+", " .+++++++++++++."}; +/* XPM */ static const char * const qt_plastique_scrollbar_button_right[] = { "16 16 6 1", " c None", @@ -258,6 +268,7 @@ static const char * const qt_plastique_scrollbar_button_right[] = { "+<<<<<<<<<<<<<+.", ".+++++++++++++. "}; +/* XPM */ static const char * const qt_plastique_scrollbar_button_up[] = { "16 16 6 1", " c None", @@ -283,6 +294,7 @@ static const char * const qt_plastique_scrollbar_button_up[] = { "+<<<<<<<<<<<<<<+", ".++++++++++++++."}; +/* XPM */ static const char * const qt_plastique_scrollbar_button_down[] = { "16 16 6 1", " c None", @@ -308,6 +320,7 @@ static const char * const qt_plastique_scrollbar_button_down[] = { ".+<<<<<<<<<<<<+.", " .++++++++++++. "}; +/* XPM */ static const char * const qt_plastique_scrollbar_slider_pattern_vertical[] = { "10 18 3 1", " c None", @@ -332,6 +345,7 @@ static const char * const qt_plastique_scrollbar_slider_pattern_vertical[] = { ".. .. ..", ".+ .+ .+"}; +/* XPM */ static const char * const qt_plastique_scrollbar_slider_pattern_horizontal[] = { "18 10 3 1", " c None", @@ -348,6 +362,7 @@ static const char * const qt_plastique_scrollbar_slider_pattern_horizontal[] = { ".. .. .. .. ..", ".+ .+ .+ .+ .+"}; +/* XPM */ static const char * const qt_plastique_toolbarhandle[] = { "6 6 4 1", " c None", @@ -361,6 +376,7 @@ static const char * const qt_plastique_toolbarhandle[] = { " .+@", " @@"}; +/* XPM */ static const char * const qt_plastique_simple_toolbarhandle[] = { "3 3 4 1", " c None", @@ -371,6 +387,7 @@ static const char * const qt_plastique_simple_toolbarhandle[] = { ".+@", " @@"}; +/* XPM */ static const char * const qt_plastique_titlebar_context_help[] = { "27 27 5 1", " c None", diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/gui/styles/qwindowsstyle.cpp index c04fd196e..ea7e6671e 100644 --- a/src/gui/styles/qwindowsstyle.cpp +++ b/src/gui/styles/qwindowsstyle.cpp @@ -430,6 +430,7 @@ static const char * const qt_windows_menu_xpm[] = { "++++++FG+++++++.", "++++++++++++++. "}; +/* XPM */ static const char * const qt_windows_close_xpm[] = { "10 10 2 1", "# c #000000", @@ -445,6 +446,7 @@ static const char * const qt_windows_close_xpm[] = { "..........", ".........."}; +/* XPM */ static const char * const qt_windows_maximize_xpm[]={ "10 10 2 1", "# c #000000", @@ -460,6 +462,7 @@ static const char * const qt_windows_maximize_xpm[]={ "#########.", ".........."}; +/* XPM */ static const char * const qt_windows_minimize_xpm[] = { "10 10 2 1", "# c #000000", @@ -475,6 +478,7 @@ static const char * const qt_windows_minimize_xpm[] = { ".#######..", ".........."}; +/* XPM */ static const char * const qt_windows_normalizeup_xpm[] = { "10 10 2 1", "# c #000000", @@ -490,6 +494,7 @@ static const char * const qt_windows_normalizeup_xpm[] = { ".######...", ".........."}; +/* XPM */ static const char * const qt_windows_help_xpm[] = { "10 10 2 1", ". c None", @@ -505,6 +510,7 @@ static const char * const qt_windows_help_xpm[] = { "....##....", ".........."}; +/* XPM */ static const char * const qt_windows_shade_xpm[] = { "10 10 2 1", "# c #000000", @@ -520,6 +526,7 @@ static const char * const qt_windows_shade_xpm[] = { "..........", ".........."}; +/* XPM */ static const char * const qt_windows_unshade_xpm[] = { "10 10 2 1", "# c #000000", @@ -535,6 +542,7 @@ static const char * const qt_windows_unshade_xpm[] = { "..........", ".........."}; +/* XPM */ static const char * qt_windows_dock_widget_close_xpm[] = { "8 8 2 1", "# c #000000",