diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-27 16:37:28 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-28 08:50:52 (GMT) |
| commit | 28061caa38d94de85db9aec743d1efba33c1e46f (patch) | |
| tree | 75bb9d1ff713979ef040fd8eab63ea18cae1f6a2 /src/gui/kernel | |
| parent | e8019cf8feb402303e6d253f5ca58bebfda42679 (diff) | |
| download | Qt-28061caa38d94de85db9aec743d1efba33c1e46f.zip Qt-28061caa38d94de85db9aec743d1efba33c1e46f.tar.gz Qt-28061caa38d94de85db9aec743d1efba33c1e46f.tar.bz2 | |
Fixes warnings about unused variables
Reviewed-by: Samuel
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qgesturemanager.cpp | 1 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget_x11.cpp | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/gui/kernel/qgesturemanager.cpp b/src/gui/kernel/qgesturemanager.cpp index 5359fb3..7aa7dffd 100644 --- a/src/gui/kernel/qgesturemanager.cpp +++ b/src/gui/kernel/qgesturemanager.cpp @@ -566,7 +566,6 @@ void QGestureManager::getGestureTargets(const QSet<QGesture*> &gestures, = w->d_func()->gestureContext.find(type); if (it != w->d_func()->gestureContext.end()) { // i.e. 'w' listens to gesture 'type' - Qt::GestureFlags flags = it.value(); if (!(it.value() & Qt::DontStartGestureOnChildren) && w != widget) { // conflicting gesture! (*conflicts)[widget].append(gestures[widget]); diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp index 5ece7d6..241a13f 100644 --- a/src/gui/kernel/qwidget_x11.cpp +++ b/src/gui/kernel/qwidget_x11.cpp @@ -486,8 +486,6 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO bool topLevel = (flags & Qt::Window); bool popup = (type == Qt::Popup); - bool dialog = (type == Qt::Dialog - || type == Qt::Sheet); bool desktop = (type == Qt::Desktop); bool tool = (type == Qt::Tool || type == Qt::SplashScreen || type == Qt::ToolTip || type == Qt::Drawer); @@ -553,7 +551,7 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO int sh = DisplayHeight(dpy,scr); if (desktop) { // desktop widget - dialog = popup = false; // force these flags off + popup = false; // force these flags off data.crect.setRect(0, 0, sw, sh); } else if (topLevel && !q->testAttribute(Qt::WA_Resized)) { QDesktopWidget *desktopWidget = qApp->desktop(); |