diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-06 08:33:33 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-11-11 16:06:51 (GMT) |
| commit | 216f47e9bfb96a4f2075098fddbee434afe90ada (patch) | |
| tree | 3b9f607f0be89d59d5259ddb6503cf8d1d14b313 | |
| parent | 26906adb699638f54dcdcb4835514765736992fe (diff) | |
| download | Qt-216f47e9bfb96a4f2075098fddbee434afe90ada.zip Qt-216f47e9bfb96a4f2075098fddbee434afe90ada.tar.gz Qt-216f47e9bfb96a4f2075098fddbee434afe90ada.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) |