diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-09-14 13:01:34 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-09-14 13:45:31 (GMT) |
| commit | 916ba1588577b971a1e5ae6ce10c1348388ea6ee (patch) | |
| tree | dd21e25088b3f6f5dca95c54cd4983ea7ca6d2e3 /src/gui | |
| parent | acfa2011d2d472f029d30286a36586e16b9bade8 (diff) | |
| download | Qt-916ba1588577b971a1e5ae6ce10c1348388ea6ee.zip Qt-916ba1588577b971a1e5ae6ce10c1348388ea6ee.tar.gz Qt-916ba1588577b971a1e5ae6ce10c1348388ea6ee.tar.bz2 | |
Cleanup qwidget_s60.cpp
Removed some unused code from qwidget_s60.cpp.
Reviewed-by: TrustMe
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qwidget_s60.cpp | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index 2b51aaa..e06b625 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -84,21 +84,6 @@ CEikButtonGroupContainer *QS60Data::cba = 0; int qt_symbian_create_desktop_on_screen = -1; -static bool isEqual(const QList<QAction*>& a, const QList<QAction*>& b) -{ - if ( a.count() != b.count()) - return false; - int index=0; - while (index<a.count()) { - if (a.at(index)->softKeyRole() != b.at(index)->softKeyRole()) - return false; - if (a.at(index)->text().compare(b.at(index)->text())!=0) - return false; - index++; - } - return true; -} - void QWidgetPrivate::setWSGeometry(bool dontShow, const QRect &) { // Note: based on x11 implementation @@ -231,7 +216,6 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove) QPoint oldPos(q->pos()); QSize oldSize(q->size()); - QRect oldGeom(data.crect); bool checkExtra = true; if (q->isWindow() && (data.window_state & (Qt::WindowFullScreen | Qt::WindowMaximized))) { @@ -348,11 +332,7 @@ void QWidgetPrivate::create_sys(WId window, bool /* initializeWindow */, bool de bool topLevel = (flags & Qt::Window); bool popup = (type == Qt::Popup); - bool dialog = (type == Qt::Dialog - || type == Qt::Sheet - || (flags & Qt::MSWindowsFixedSizeDialogHint)); bool desktop = (type == Qt::Desktop); - //bool tool = (type == Qt::Tool || type == Qt::Drawer); if (popup) flags |= Qt::WindowStaysOnTopHint; // a popup stays on top @@ -1075,7 +1055,7 @@ void QWidgetPrivate::registerTouchWindow() int QWidget::metric(PaintDeviceMetric m) const { Q_D(const QWidget); - int val; + int val = 0; if (m == PdmWidth) { val = data->crect.width(); } else if (m == PdmHeight) { |