summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-07-02 03:11:14 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-07-02 03:11:14 (GMT)
commitdafd625842e2c66551857810a3660c534962746e (patch)
treeba8029030ad5f744af4633547cf866b2ac9bee1a /src
parentc9525d561fa05f0914546315fc33d8942b80742a (diff)
downloadQt-dafd625842e2c66551857810a3660c534962746e.zip
Qt-dafd625842e2c66551857810a3660c534962746e.tar.gz
Qt-dafd625842e2c66551857810a3660c534962746e.tar.bz2
Fix warnings.
Diffstat (limited to 'src')
-rw-r--r--src/declarative/extra/qfxflowview.cpp3
-rw-r--r--src/declarative/extra/qmlfolderlistmodel.cpp3
-rw-r--r--src/declarative/qml/qmlmetaproperty.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/extra/qfxflowview.cpp b/src/declarative/extra/qfxflowview.cpp
index 254e423..412cbc8 100644
--- a/src/declarative/extra/qfxflowview.cpp
+++ b/src/declarative/extra/qfxflowview.cpp
@@ -199,8 +199,6 @@ void QFxFlowView::reflowDrag(const QPointF &dp)
qreal maxY = 0;
qreal x = 0;
- int flowedItems = 0;
-
clearTimeLine();
QList<QFxItem *> items;
@@ -316,6 +314,7 @@ QRectF QFxFlowView::rectForItem(int idx) const
void QFxFlowView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
{
+ Q_UNUSED(event);
if (m_dragItem) {
m_dragItem->setZ(0);
diff --git a/src/declarative/extra/qmlfolderlistmodel.cpp b/src/declarative/extra/qmlfolderlistmodel.cpp
index 8b008a5..acee5e1 100644
--- a/src/declarative/extra/qmlfolderlistmodel.cpp
+++ b/src/declarative/extra/qmlfolderlistmodel.cpp
@@ -51,7 +51,7 @@ class QmlFolderListModelPrivate : public QObjectPrivate
public:
QmlFolderListModelPrivate() : count(0) {
folder = QDir::currentPath();
- nameFilters << "*";
+ nameFilters << QLatin1String("*");
}
QDirModel model;
@@ -81,6 +81,7 @@ QmlFolderListModel::~QmlFolderListModel()
QHash<int,QVariant> QmlFolderListModel::data(int index, const QList<int> &roles) const
{
+ Q_UNUSED(roles);
Q_D(const QmlFolderListModel);
QHash<int,QVariant> folderData;
QModelIndex modelIndex = d->model.index(index, 0, d->folderIndex);
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index 292aacd..a2138c9 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -1043,7 +1043,7 @@ QMetaMethod QmlMetaProperty::method() const
*/
QmlMetaProperty QmlMetaProperty::createProperty(QObject *obj, const QString &name)
{
- QStringList path = name.split('.');
+ QStringList path = name.split(QLatin1Char('.'));
QObject *object = obj;