summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qpalette.cpp
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2020-08-19 11:52:07 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2020-08-25 17:59:10 +0200
commitb77a3f47c9d6f4fd68a687e3bdb38e550d2810ad (patch)
tree0849ece35646b7847218a54005ff512ae25eda5d /src/gui/kernel/qpalette.cpp
parentc0d0949448c5a75d50ca189974d4d9f48133aea8 (diff)
Rename confusingly named QFont/QPalette::resolve overloads
Having three methods with the same name doing different things is unnecessarily confusing, so follow the standard naming convention in Qt and call the getter of the resolve mask resolveMask, and the setter setResolveMask. These methods were all documented as internal. The publicly documented resolve() method that merges two fonts and palettes based on the respective masks remains as it is, even though 'merge' would perhaps be a better name. Change-Id: If90b1ad800834baccd1dbc38fc6b861540d6df6e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/gui/kernel/qpalette.cpp')
-rw-r--r--src/gui/kernel/qpalette.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp
index 4129e189f3..5bcd4c8b10 100644
--- a/src/gui/kernel/qpalette.cpp
+++ b/src/gui/kernel/qpalette.cpp
@@ -961,20 +961,22 @@ QPalette QPalette::resolve(const QPalette &other) const
}
/*!
- \fn uint QPalette::resolve() const
+ \fn QPalette::ResolveMask QPalette::resolveMask() const
\internal
*/
/*!
- \typedef ResolveMaskType
+ \typedef ResolveMask
\internal
- */
+*/
/*!
- \fn void QPalette::resolve(ResolveMaskType mask)
+ \fn void QPalette::setResolveMask(ResolveMask)
\internal
-*/
+ A bit mask that stores which colors the palette instance explicitly defines,
+ and which ones are inherited from a parent.
+*/
/*****************************************************************************
QPalette stream functions
@@ -1250,7 +1252,7 @@ QDebug operator<<(QDebug dbg, const QPalette &p)
QDebugStateSaver saver(dbg);
dbg.nospace();
- dbg << "QPalette(resolve=" << Qt::hex << Qt::showbase << p.resolve();
+ dbg << "QPalette(resolve=" << Qt::hex << Qt::showbase << p.resolveMask();
auto roleString = rolesToString(p);
if (!roleString.isEmpty())