diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-06 08:33:33 (GMT) |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2009-11-10 09:30:32 (GMT) |
| commit | d6c9a246b6fcfdc8e1f972d6a91da2c642ef3fc2 (patch) | |
| tree | e9d9f1b539a413337d13506d70c6d0ae497d8d6e | |
| parent | 9e06a5883b7e719417ecb3f8f5188e2a3b1bc953 (diff) | |
| download | Qt-d6c9a246b6fcfdc8e1f972d6a91da2c642ef3fc2.zip Qt-d6c9a246b6fcfdc8e1f972d6a91da2c642ef3fc2.tar.gz Qt-d6c9a246b6fcfdc8e1f972d6a91da2c642ef3fc2.tar.bz2 | |
Re-apply change e53c26b52c890f242491e0dfed4201313d98f720 by Marius Storm-Olsen
API review: Rename functions numColors(), setNumColors() and numBytes()
QPaintDevice and QImage used the functions numColors(), setNumColors(),
and numBytes(). However, this is not consistent with the rest of the Qt
API which uses *Count() and set*Count().
Removed all usage of these functions inside Qt and test-cases.
Reviewed-by: Andreas Aardal Hanssen
| -rw-r--r-- | src/3rdparty/webkit/WebCore/platform/qt/PlatformScreenQt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/platform/qt/PlatformScreenQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/PlatformScreenQt.cpp index 8221760..442ffa3 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/PlatformScreenQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/PlatformScreenQt.cpp @@ -72,7 +72,7 @@ int screenDepthPerComponent(Widget* w) bool screenIsMonochrome(Widget* w) { - return QApplication::desktop()->screen(screenNumber(w))->numColors() < 2; + return QApplication::desktop()->screen(screenNumber(w))->colorCount() < 2; } FloatRect screenRect(Widget* w) |