diff options
author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-06-16 08:00:26 (GMT) |
---|---|---|
committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-06-16 08:00:26 (GMT) |
commit | 915749c9a2e3a00d26f69077ab35f2e1e4bb23dd (patch) | |
tree | b1a71032a1a244ec089abb90b99521061b939b8a /src | |
parent | 4175bad3c2351c3aad0c2d49653b41aaa0dbc02c (diff) | |
parent | 9fbf1387b04ec1dab0772956457fdbf1c0e508f2 (diff) | |
download | Qt-915749c9a2e3a00d26f69077ab35f2e1e4bb23dd.zip Qt-915749c9a2e3a00d26f69077ab35f2e1e4bb23dd.tar.gz Qt-915749c9a2e3a00d26f69077ab35f2e1e4bb23dd.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/image/qpicture.cpp | 12 | ||||
-rw-r--r-- | src/gui/image/qpicture_p.h | 2 | ||||
-rw-r--r-- | src/gui/styles/qs60style.cpp | 15 |
3 files changed, 19 insertions, 10 deletions
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp index 8528173..a16305e 100644 --- a/src/gui/image/qpicture.cpp +++ b/src/gui/image/qpicture.cpp @@ -1041,6 +1041,18 @@ QPicture& QPicture::operator=(const QPicture &p) /*! \internal + Constructs a QPicturePrivate +*/ +QPicturePrivate::QPicturePrivate() + : in_memory_only(false), + q_ptr(0) +{ + ref = 1; +} + +/*! + \internal + Sets formatOk to false and resets the format version numbers to default */ diff --git a/src/gui/image/qpicture_p.h b/src/gui/image/qpicture_p.h index e0c3117..373ff15 100644 --- a/src/gui/image/qpicture_p.h +++ b/src/gui/image/qpicture_p.h @@ -143,7 +143,7 @@ public: PdcReservedStop = 199 // for Qt }; - inline QPicturePrivate() : in_memory_only(false), q_ptr(0) { ref = 1; } + QPicturePrivate(); QAtomicInt ref; bool checkFormat(); diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index c6118d6..d2bd679 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -559,7 +559,7 @@ void QS60StylePrivate::drawRow(QS60StyleEnums::SkinParts start, QRect endRect; if (orientation == Qt::Horizontal) { - startRect.setWidth(qMin(rect.width() >>1 - 1, startRect.width())); + startRect.setWidth(qMin((rect.width() >> 1) - 1, startRect.width())); endRect = startRect.translated(rect.width() - startRect.width(), 0); middleRect.adjust(startRect.width(), 0, -startRect.width(), 0); if (startRect.bottomRight().x() > endRect.topLeft().x()) { @@ -568,7 +568,7 @@ void QS60StylePrivate::drawRow(QS60StyleEnums::SkinParts start, endRect.adjust(overlap,0,0,0); } } else { - startRect.setHeight(qMin(rect.height() >>1 - 1, startRect.height())); + startRect.setHeight(qMin((rect.height() >> 1) - 1, startRect.height())); endRect = startRect.translated(0, rect.height() - startRect.height()); middleRect.adjust(0, startRect.height(), 0, -startRect.height()); if (startRect.topRight().y() > endRect.bottomLeft().y()) { @@ -2038,16 +2038,12 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti #endif //QT_NO_SPINBOX case PE_FrameFocusRect: // Calendar widget and combox both do not use styled itemDelegate - if ( widget && ( + if (widget && !(false #ifndef QT_NO_CALENDARWIDGET - (qobject_cast<const QCalendarWidget *>(widget->parent())) -#else - false + || qobject_cast<const QCalendarWidget *>(widget->parent()) #endif //QT_NO_CALENDARWIDGET #ifndef QT_NO_COMBOBOX - || (qobject_cast<const QComboBoxListView *>(widget)) -#else - || false + || qobject_cast<const QComboBoxListView *>(widget) #endif //QT_NO_COMBOBOX )) { // no focus selection for touch @@ -2326,6 +2322,7 @@ int QS60Style::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w break; case SH_UnderlineShortcut: retValue = 0; + break; default: break; } |