From a41393d0bc05998a7de2dcf872953b6d24b71e96 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 19 Aug 2016 09:00:37 +0200 Subject: QColor: clean up qcolor_p.h Only qt_get_hex_rgb(const char*, QRgb*) is used outside qcolor.cpp (in qxpmhandler.cpp), so remove all other function declarations from qcolor_p.h, and make the functions file-static in qcolor.cpp, removing their qt_ prefix to avoid confusion. Exception: it turned out that qt_get_named_rgb(const char *, QRgb*) wasn't actually used anywhere, but a follow-up commit will fix this. Adjust interface to that of the QChar overload (add explicit int len). Simplify conditional compilation of QT_NO_COLORNAMES: move the ifdef inside get_colornames, to avoid duplicating the declaration, and remove the empty implementation of get_named_rgb, since their use is already conditional on QT_NO_COLORNAMES not being defined. Change-Id: Iaf685dfbea0b9d3bd010448dac0e95be7b097ce5 Reviewed-by: Edward Welbourne --- src/gui/painting/qcolor_p.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/gui/painting/qcolor_p.h') diff --git a/src/gui/painting/qcolor_p.h b/src/gui/painting/qcolor_p.h index b5e92e2ea2..b44f2b163a 100644 --- a/src/gui/painting/qcolor_p.h +++ b/src/gui/painting/qcolor_p.h @@ -53,15 +53,10 @@ #include #include "QtGui/qrgb.h" -#include "QtCore/qstringlist.h" QT_BEGIN_NAMESPACE -bool qt_get_named_rgb(const char *, QRgb*); -bool qt_get_named_rgb(const QChar *, int len, QRgb*); bool qt_get_hex_rgb(const char *, QRgb *); -bool qt_get_hex_rgb(const QChar *, int len, QRgb *); -QStringList qt_get_colornames(); QT_END_NAMESPACE -- cgit v1.2.3