Revert "tango_color(.h): avoid ‘tango_butter_3’ defined but not used [-Werror=unused-const-variable] found by gcc6"
This reverts commit 5dbc727ae9
.
Change-Id: I71ad6a1468c10d515f73ee25a92fb1e35a995dc6
Reviewed-on: https://code.wireshark.org/review/15523
Reviewed-by: João Valverde <j@v6e.pt>
This commit is contained in:
parent
38cc4287a2
commit
20c284c96b
|
@ -23,15 +23,10 @@
|
||||||
#ifndef __TANGO_COLORS_H__
|
#ifndef __TANGO_COLORS_H__
|
||||||
#define __TANGO_COLORS_H__
|
#define __TANGO_COLORS_H__
|
||||||
|
|
||||||
#include <ws_diag_control.h>
|
|
||||||
|
|
||||||
// http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines
|
// http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines
|
||||||
// with added hues from http://emilis.info/other/extended_tango/
|
// with added hues from http://emilis.info/other/extended_tango/
|
||||||
// (all colors except aluminium)
|
// (all colors except aluminium)
|
||||||
|
|
||||||
// avoid unused-const-variable warning with gcc6
|
|
||||||
DIAG_OFF(unused-const-variable)
|
|
||||||
|
|
||||||
const QRgb tango_aluminium_1 = 0xeeeeec;
|
const QRgb tango_aluminium_1 = 0xeeeeec;
|
||||||
const QRgb tango_aluminium_2 = 0xd3d7cf;
|
const QRgb tango_aluminium_2 = 0xd3d7cf;
|
||||||
const QRgb tango_aluminium_3 = 0xbabdb6;
|
const QRgb tango_aluminium_3 = 0xbabdb6;
|
||||||
|
@ -91,6 +86,4 @@ const QRgb tango_sky_blue_6 = 0x0a3050;
|
||||||
const QRgb ws_css_warn_background = tango_butter_2;
|
const QRgb ws_css_warn_background = tango_butter_2;
|
||||||
const QRgb ws_css_warn_text = tango_aluminium_6;
|
const QRgb ws_css_warn_text = tango_aluminium_6;
|
||||||
|
|
||||||
DIAG_ON(unused-const-variable)
|
|
||||||
|
|
||||||
#endif // __TANGO_COLORS_H__
|
#endif // __TANGO_COLORS_H__
|
||||||
|
|
Loading…
Reference in New Issue