diff options
| author | Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> | 2012-04-13 15:38:41 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-17 06:19:49 +0200 |
| commit | f285356e88d025d51f8a903e5baff15c4090b5c3 (patch) | |
| tree | 499fe8cd95a85cc774ef02a42d59e030837c2d65 /src/gui/kernel/qscreen.cpp | |
| parent | 6094197294481f586fe544e326ed1056a800e3f1 (diff) | |
api: Fix const correctness of api in QScreen
const was missing in many convenience functions.
grabWindow should not be const since it actually does something.
Change-Id: I0ffa718878d4251c4fb5c34789cf58ebb85cff37
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/gui/kernel/qscreen.cpp')
| -rw-r--r-- | src/gui/kernel/qscreen.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp index ce26b9dd93..3546ce01dd 100644 --- a/src/gui/kernel/qscreen.cpp +++ b/src/gui/kernel/qscreen.cpp @@ -401,7 +401,7 @@ static int log2(uint i) Qt::PrimaryOrientation is interpreted as the screen's primaryOrientation(). */ -int QScreen::angleBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b) +int QScreen::angleBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b) const { if (a == Qt::PrimaryOrientation) a = primaryOrientation(); @@ -436,7 +436,7 @@ int QScreen::angleBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b) Qt::PrimaryOrientation is interpreted as the screen's primaryOrientation(). */ -QTransform QScreen::transformBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b, const QRect &target) +QTransform QScreen::transformBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b, const QRect &target) const { if (a == Qt::PrimaryOrientation) a = primaryOrientation(); @@ -477,7 +477,7 @@ QTransform QScreen::transformBetween(Qt::ScreenOrientation a, Qt::ScreenOrientat Qt::PrimaryOrientation is interpreted as the screen's primaryOrientation(). */ -QRect QScreen::mapBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b, const QRect &rect) +QRect QScreen::mapBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b, const QRect &rect) const { if (a == Qt::PrimaryOrientation) a = primaryOrientation(); @@ -503,7 +503,7 @@ QRect QScreen::mapBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b, cons Qt::PrimaryOrientation is interpreted as the screen's primaryOrientation(). */ -bool QScreen::isPortrait(Qt::ScreenOrientation o) +bool QScreen::isPortrait(Qt::ScreenOrientation o) const { return o == Qt::PortraitOrientation || o == Qt::InvertedPortraitOrientation || (o == Qt::PrimaryOrientation && primaryOrientation() == Qt::PortraitOrientation); @@ -515,7 +515,7 @@ bool QScreen::isPortrait(Qt::ScreenOrientation o) Qt::PrimaryOrientation is interpreted as the screen's primaryOrientation(). */ -bool QScreen::isLandscape(Qt::ScreenOrientation o) +bool QScreen::isLandscape(Qt::ScreenOrientation o) const { return o == Qt::LandscapeOrientation || o == Qt::InvertedLandscapeOrientation || (o == Qt::PrimaryOrientation && primaryOrientation() == Qt::LandscapeOrientation); @@ -580,7 +580,7 @@ void QScreenPrivate::updatePrimaryOrientation() safe. This depends on the underlying window system. */ -QPixmap QScreen::grabWindow(WId window, int x, int y, int w, int h) const +QPixmap QScreen::grabWindow(WId window, int x, int y, int w, int h) { const QPlatformScreen *platformScreen = handle(); if (!platformScreen) { |