From a0d27513f4eff3f76fd85e6442aca443b7c05a53 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 17 Jan 2014 19:33:29 +0100 Subject: whitespace fixes remove trailing spaces & expand tabs Change-Id: Ia088c8cc8a83d068f6e2ec84903b5220cd3411f1 Reviewed-by: Alan Alpert Reviewed-by: Oswald Buddenhagen --- src/declarative/util/qdeclarativeanimation_p_p.h | 2 +- src/declarative/util/qdeclarativeconnections.cpp | 2 +- src/declarative/util/qdeclarativefontloader.cpp | 8 +-- src/declarative/util/qdeclarativelistmodel.cpp | 20 +++---- src/declarative/util/qdeclarativelistmodel_p_p.h | 2 +- .../util/qdeclarativelistmodelworkeragent.cpp | 16 +++--- .../util/qdeclarativelistmodelworkeragent_p.h | 8 +-- .../util/qdeclarativenullablevalue_p_p.h | 2 +- .../util/qdeclarativeopenmetaobject.cpp | 2 +- src/declarative/util/qdeclarativepackage.cpp | 18 +++--- src/declarative/util/qdeclarativepixmapcache.cpp | 64 +++++++++++----------- .../util/qdeclarativepropertychanges.cpp | 18 +++--- .../util/qdeclarativepropertychanges_p.h | 2 +- src/declarative/util/qdeclarativestate.cpp | 6 +- src/declarative/util/qdeclarativestate_p_p.h | 2 +- src/declarative/util/qdeclarativestategroup.cpp | 10 ++-- .../util/qdeclarativestateoperations.cpp | 4 +- .../util/qdeclarativestateoperations_p.h | 2 +- src/declarative/util/qdeclarativesystempalette.cpp | 2 +- src/declarative/util/qdeclarativetimeline.cpp | 24 ++++---- .../util/qdeclarativetransitionmanager.cpp | 12 ++-- .../util/qdeclarativetransitionmanager_p_p.h | 2 +- src/declarative/util/qdeclarativexmllistmodel.cpp | 28 +++++----- src/declarative/util/qlistmodelinterface_p.h | 2 +- 24 files changed, 129 insertions(+), 129 deletions(-) (limited to 'src/declarative/util') diff --git a/src/declarative/util/qdeclarativeanimation_p_p.h b/src/declarative/util/qdeclarativeanimation_p_p.h index bbd4a34e..9dceb5f8 100644 --- a/src/declarative/util/qdeclarativeanimation_p_p.h +++ b/src/declarative/util/qdeclarativeanimation_p_p.h @@ -172,7 +172,7 @@ protected: animValue->setValue(value.toReal()); } virtual void updateState(State newState, State oldState) - { + { QVariantAnimation::updateState(newState, oldState); if (newState == Running) { //check for new from every loop diff --git a/src/declarative/util/qdeclarativeconnections.cpp b/src/declarative/util/qdeclarativeconnections.cpp index c1ee8d41..4d8fc55b 100644 --- a/src/declarative/util/qdeclarativeconnections.cpp +++ b/src/declarative/util/qdeclarativeconnections.cpp @@ -88,7 +88,7 @@ public: } \endqml - However, it is not possible to connect to a signal in this way in some + However, it is not possible to connect to a signal in this way in some cases, such as when: \list diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp index 764257dd..1626cfeb 100644 --- a/src/declarative/util/qdeclarativefontloader.cpp +++ b/src/declarative/util/qdeclarativefontloader.cpp @@ -152,16 +152,16 @@ QHash QDeclarativeFontLoaderPrivate::fonts; \since 4.7 \brief The FontLoader element allows fonts to be loaded by name or URL. - The FontLoader element is used to load fonts by name or URL. - - The \l status indicates when the font has been loaded, which is useful + The FontLoader element is used to load fonts by name or URL. + + The \l status indicates when the font has been loaded, which is useful for fonts loaded from remote sources. For example: \qml import QtQuick 1.0 - Column { + Column { FontLoader { id: fixedFont; name: "Courier" } FontLoader { id: webFont; source: "http://www.mysite.com/myfont.ttf" } diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp index c9441a0c..cb3f62ef 100644 --- a/src/declarative/util/qdeclarativelistmodel.cpp +++ b/src/declarative/util/qdeclarativelistmodel.cpp @@ -210,7 +210,7 @@ QDeclarativeListModelParser::ListInstruction *QDeclarativeListModelParser::ListM when retrieved from get() is accessible as a list model within the list model) whereas a FlatListModel cannot. - ListModel uses a NestedListModel to begin with, and if the model is later + ListModel uses a NestedListModel to begin with, and if the model is later used from a WorkerScript, it changes to use a FlatListModel instead. This is because ModelNode (which abstracts the nested list model data) needs access to the declarative engine and script engine, which cannot be @@ -351,7 +351,7 @@ void QDeclarativeListModel::clear() QDeclarativeListModel *ModelNode::model(const NestedListModel *model) { - if (!modelCache) { + if (!modelCache) { modelCache = new QDeclarativeListModel; QDeclarativeEngine::setContextForObject(modelCache,QDeclarativeEngine::contextForObject(model->m_listModel)); modelCache->m_nested->_root = this; // ListModel defaults to nestable model @@ -368,8 +368,8 @@ QDeclarativeListModel *ModelNode::model(const NestedListModel *model) ModelObject *ModelNode::object(const NestedListModel *model) { if (!objectCache) { - objectCache = new ModelObject(this, - const_cast(model), + objectCache = new ModelObject(this, + const_cast(model), QDeclarativeEnginePrivate::getScriptEngine(qmlEngine(model->m_listModel))); QHash::iterator it; for (it = properties.begin(); it != properties.end(); ++it) { @@ -984,7 +984,7 @@ QScriptValue FlatListModel::get(int index) const { QScriptEngine *scriptEngine = m_scriptEngine ? m_scriptEngine : QDeclarativeEnginePrivate::getScriptEngine(qmlEngine(m_listModel)); - if (!scriptEngine) + if (!scriptEngine) return 0; if (index < 0 || index >= m_values.count()) @@ -1101,7 +1101,7 @@ void FlatListModel::moveNodes(int from, int to, int n) qdeclarativelistmodel_move >(from, to, n, &m_nodeData); for (int i=from; iindex = i; } } @@ -1116,7 +1116,7 @@ FlatNodeData::~FlatNodeData() } } -void FlatNodeData::addData(FlatNodeObjectData *data) +void FlatNodeData::addData(FlatNodeObjectData *data) { objects.insert(data); } @@ -1343,9 +1343,9 @@ void NestedListModel::move(int from, int to, int n) } QScriptValue NestedListModel::get(int index) const -{ +{ QDeclarativeEngine *eng = qmlEngine(m_listModel); - if (!eng) + if (!eng) return 0; if (index < 0 || index >= count()) { @@ -1358,7 +1358,7 @@ QScriptValue NestedListModel::get(int index) const ModelNode *node = qvariant_cast(_root->values.at(index)); if (!node) return 0; - + return QDeclarativeEnginePrivate::qmlScriptObject(node->object(this), eng); } diff --git a/src/declarative/util/qdeclarativelistmodel_p_p.h b/src/declarative/util/qdeclarativelistmodel_p_p.h index 5b204a9a..90d267b9 100644 --- a/src/declarative/util/qdeclarativelistmodel_p_p.h +++ b/src/declarative/util/qdeclarativelistmodel_p_p.h @@ -91,7 +91,7 @@ public: void setProperty(int index, const QString& property, const QVariant& value, QList *roles); void move(int from, int to, int count); -private: +private: friend class QDeclarativeListModelWorkerAgent; friend class QDeclarativeListModel; friend class FlatListScriptClass; diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp index 6020a261..842de7f4 100644 --- a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp +++ b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp @@ -53,18 +53,18 @@ QT_BEGIN_NAMESPACE -void QDeclarativeListModelWorkerAgent::Data::clearChange() -{ - changes.clear(); +void QDeclarativeListModelWorkerAgent::Data::clearChange() +{ + changes.clear(); } -void QDeclarativeListModelWorkerAgent::Data::insertChange(int index, int count) +void QDeclarativeListModelWorkerAgent::Data::insertChange(int index, int count) { Change c = { Change::Inserted, index, count, 0, QList() }; changes << c; } -void QDeclarativeListModelWorkerAgent::Data::removeChange(int index, int count) +void QDeclarativeListModelWorkerAgent::Data::removeChange(int index, int count) { Change c = { Change::Removed, index, count, 0, QList() }; changes << c; @@ -83,9 +83,9 @@ void QDeclarativeListModelWorkerAgent::Data::changedChange(int index, int count, } QDeclarativeListModelWorkerAgent::QDeclarativeListModelWorkerAgent(QDeclarativeListModel *model) - : m_engine(0), - m_ref(1), - m_orig(model), + : m_engine(0), + m_ref(1), + m_orig(model), m_copy(new QDeclarativeListModel(model, this)) { } diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h index b076a855..eeb47432 100644 --- a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h +++ b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h @@ -101,10 +101,10 @@ public: VariantRef(QDeclarativeListModelWorkerAgent *_a) : a(_a) { if (a) a->addref(); } ~VariantRef() { if (a) a->release(); } - VariantRef &operator=(const VariantRef &o) { - if (o.a) o.a->addref(); - if (a) a->release(); a = o.a; - return *this; + VariantRef &operator=(const VariantRef &o) { + if (o.a) o.a->addref(); + if (a) a->release(); a = o.a; + return *this; } QDeclarativeListModelWorkerAgent *a; diff --git a/src/declarative/util/qdeclarativenullablevalue_p_p.h b/src/declarative/util/qdeclarativenullablevalue_p_p.h index 7773ed8f..8e6360f0 100644 --- a/src/declarative/util/qdeclarativenullablevalue_p_p.h +++ b/src/declarative/util/qdeclarativenullablevalue_p_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE template -struct QDeclarativeNullableValue +struct QDeclarativeNullableValue { QDeclarativeNullableValue() : isNull(true), value(T()) {} diff --git a/src/declarative/util/qdeclarativeopenmetaobject.cpp b/src/declarative/util/qdeclarativeopenmetaobject.cpp index b1c01394..c346c1a4 100644 --- a/src/declarative/util/qdeclarativeopenmetaobject.cpp +++ b/src/declarative/util/qdeclarativeopenmetaobject.cpp @@ -235,7 +235,7 @@ int QDeclarativeOpenMetaObject::metaCall(QMetaObject::Call c, int id, void **a) propertyWritten(propId); activate(d->object, d->type->d->signalOffset + propId, 0); } - } + } return -1; } else { if (d->parent) diff --git a/src/declarative/util/qdeclarativepackage.cpp b/src/declarative/util/qdeclarativepackage.cpp index c0098c32..59c08986 100644 --- a/src/declarative/util/qdeclarativepackage.cpp +++ b/src/declarative/util/qdeclarativepackage.cpp @@ -128,14 +128,14 @@ QDeclarativePackageAttached::~QDeclarativePackageAttached() attached.remove(parent()); } -QString QDeclarativePackageAttached::name() const -{ - return _name; +QString QDeclarativePackageAttached::name() const +{ + return _name; } -void QDeclarativePackageAttached::setName(const QString &n) -{ - _name = n; +void QDeclarativePackageAttached::setName(const QString &n) +{ + _name = n; } QDeclarativePackage::QDeclarativePackage(QObject *parent) @@ -155,9 +155,9 @@ QDeclarativePackage::~QDeclarativePackage() QDeclarativeListProperty QDeclarativePackage::data() { Q_D(QDeclarativePackage); - return QDeclarativeListProperty(this, &d->dataList, QDeclarativePackagePrivate::data_append, - QDeclarativePackagePrivate::data_count, - QDeclarativePackagePrivate::data_at, + return QDeclarativeListProperty(this, &d->dataList, QDeclarativePackagePrivate::data_append, + QDeclarativePackagePrivate::data_count, + QDeclarativePackagePrivate::data_at, QDeclarativePackagePrivate::data_clear); } diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp index 0c660ad9..5438cea1 100644 --- a/src/declarative/util/qdeclarativepixmapcache.cpp +++ b/src/declarative/util/qdeclarativepixmapcache.cpp @@ -186,21 +186,21 @@ class QDeclarativePixmapData { public: QDeclarativePixmapData(const QUrl &u, const QSize &s, const QString &e) - : refCount(1), inCache(false), pixmapStatus(QDeclarativePixmap::Error), + : refCount(1), inCache(false), pixmapStatus(QDeclarativePixmap::Error), url(u), errorString(e), requestSize(s), reply(0), prevUnreferenced(0), prevUnreferencedPtr(0), nextUnreferenced(0) { } QDeclarativePixmapData(const QUrl &u, const QSize &r) - : refCount(1), inCache(false), pixmapStatus(QDeclarativePixmap::Loading), - url(u), requestSize(r), reply(0), prevUnreferenced(0), prevUnreferencedPtr(0), + : refCount(1), inCache(false), pixmapStatus(QDeclarativePixmap::Loading), + url(u), requestSize(r), reply(0), prevUnreferenced(0), prevUnreferencedPtr(0), nextUnreferenced(0) { } QDeclarativePixmapData(const QUrl &u, const QPixmap &p, const QSize &s, const QSize &r) - : refCount(1), inCache(false), privatePixmap(false), pixmapStatus(QDeclarativePixmap::Ready), + : refCount(1), inCache(false), privatePixmap(false), pixmapStatus(QDeclarativePixmap::Ready), url(u), pixmap(p), implicitSize(s), requestSize(r), reply(0), prevUnreferenced(0), prevUnreferencedPtr(0), nextUnreferenced(0) { @@ -223,7 +223,7 @@ public: bool inCache:1; bool privatePixmap:1; - + QDeclarativePixmap::Status pixmapStatus; QUrl url; QString errorString; @@ -251,7 +251,7 @@ int QDeclarativePixmapReader::downloadProgress = -1; int QDeclarativePixmapReader::threadNetworkRequestDone = -1; -void QDeclarativePixmapReply::postReply(ReadError error, const QString &errorString, +void QDeclarativePixmapReply::postReply(ReadError error, const QString &errorString, const QSize &implicitSize, const QImage &image) { loading = false; @@ -272,7 +272,7 @@ QNetworkAccessManager *QDeclarativePixmapReader::networkAccessManager() return accessManager; } -static bool readImage(const QUrl& url, QIODevice *dev, QImage *image, QString *errorString, QSize *impsize, +static bool readImage(const QUrl& url, QIODevice *dev, QImage *image, QString *errorString, QSize *impsize, const QSize &requestSize) { QImageReader imgio(dev); @@ -404,17 +404,17 @@ QDeclarativePixmapReaderThreadObject::QDeclarativePixmapReaderThreadObject(QDecl { } -void QDeclarativePixmapReaderThreadObject::processJobs() -{ - QCoreApplication::postEvent(this, new QEvent(QEvent::User)); +void QDeclarativePixmapReaderThreadObject::processJobs() +{ + QCoreApplication::postEvent(this, new QEvent(QEvent::User)); } -bool QDeclarativePixmapReaderThreadObject::event(QEvent *e) +bool QDeclarativePixmapReaderThreadObject::event(QEvent *e) { - if (e->type() == QEvent::User) { - reader->processJobs(); - return true; - } else { + if (e->type() == QEvent::User) { + reader->processJobs(); + return true; + } else { return QObject::event(e); } } @@ -430,7 +430,7 @@ void QDeclarativePixmapReader::processJobs() QMutexLocker locker(&mutex); while (true) { - if (cancelled.isEmpty() && (jobs.isEmpty() || replies.count() >= IMAGEREQUEST_MAX_REQUEST_COUNT)) + if (cancelled.isEmpty() && (jobs.isEmpty() || replies.count() >= IMAGEREQUEST_MAX_REQUEST_COUNT)) return; // Nothing else to do // Clean cancelled jobs @@ -461,7 +461,7 @@ void QDeclarativePixmapReader::processJobs() } } -void QDeclarativePixmapReader::processJob(QDeclarativePixmapReply *runningJob, const QUrl &url, +void QDeclarativePixmapReader::processJob(QDeclarativePixmapReply *runningJob, const QUrl &url, const QSize &requestSize) { // fetch @@ -535,7 +535,7 @@ QDeclarativePixmapReply *QDeclarativePixmapReader::getImage(QDeclarativePixmapDa QDeclarativePixmapReply *reply = new QDeclarativePixmapReply(data); reply->engineForReader = engine; jobs.append(reply); - // XXX + // XXX if (threadObject) threadObject->processJobs(); mutex.unlock(); return reply; @@ -547,7 +547,7 @@ void QDeclarativePixmapReader::cancel(QDeclarativePixmapReply *reply) if (reply->loading) { cancelled.append(reply); reply->data = 0; - // XXX + // XXX if (threadObject) threadObject->processJobs(); } else { jobs.removeAll(reply); @@ -650,7 +650,7 @@ void QDeclarativePixmapStore::unreferencePixmap(QDeclarativePixmapData *data) shrinkCache(-1); // Shrink the cache incase it has become larger than cache_limit - if (m_timerId == -1 && m_unreferencedPixmaps) + if (m_timerId == -1 && m_unreferencedPixmaps) m_timerId = startTimer(CACHE_EXPIRE_TIME * 1000); } @@ -659,7 +659,7 @@ void QDeclarativePixmapStore::referencePixmap(QDeclarativePixmapData *data) Q_ASSERT(data->prevUnreferencedPtr); *data->prevUnreferencedPtr = data->nextUnreferenced; - if (data->nextUnreferenced) { + if (data->nextUnreferenced) { data->nextUnreferenced->prevUnreferencedPtr = data->prevUnreferencedPtr; data->nextUnreferenced->prevUnreferenced = data->prevUnreferenced; } @@ -731,7 +731,7 @@ bool QDeclarativePixmapReply::event(QEvent *event) if (data) { Event *de = static_cast(event); data->pixmapStatus = (de->error == NoError) ? QDeclarativePixmap::Ready : QDeclarativePixmap::Error; - + if (data->pixmapStatus == QDeclarativePixmap::Ready) { data->pixmap = QPixmap::fromImage(de->image); data->implicitSize = de->implicitSize; @@ -759,7 +759,7 @@ int QDeclarativePixmapData::cost() const void QDeclarativePixmapData::addref() { ++refCount; - if (prevUnreferencedPtr) + if (prevUnreferencedPtr) pixmapStore()->referencePixmap(this); } @@ -839,7 +839,7 @@ static QDeclarativePixmapData* createPixmapDataSync(QDeclarativeEngine *engine, } QString localFile = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(url); - if (localFile.isEmpty()) + if (localFile.isEmpty()) return 0; QFile f(localFile); @@ -937,7 +937,7 @@ const QUrl &QDeclarativePixmap::url() const const QSize &QDeclarativePixmap::implicitSize() const { - if (d) + if (d) return d->implicitSize; else return nullPixmap()->size; @@ -953,13 +953,13 @@ const QSize &QDeclarativePixmap::requestSize() const const QPixmap &QDeclarativePixmap::pixmap() const { - if (d) + if (d) return d->pixmap; else return nullPixmap()->pixmap; } -void QDeclarativePixmap::setPixmap(const QPixmap &p) +void QDeclarativePixmap::setPixmap(const QPixmap &p) { clear(); @@ -969,7 +969,7 @@ void QDeclarativePixmap::setPixmap(const QPixmap &p) int QDeclarativePixmap::width() const { - if (d) + if (d) return d->pixmap.width(); else return 0; @@ -977,7 +977,7 @@ int QDeclarativePixmap::width() const int QDeclarativePixmap::height() const { - if (d) + if (d) return d->pixmap.height(); else return 0; @@ -1018,7 +1018,7 @@ void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, const if (iter == store->m_cache.end()) { if (options & QDeclarativePixmap::Asynchronous) { // pixmaps can only be loaded synchronously - if (url.scheme() == QLatin1String("image") + if (url.scheme() == QLatin1String("image") && QDeclarativeEnginePrivate::get(engine)->getImageProviderType(url) == QDeclarativeImageProvider::Pixmap) { options &= ~QDeclarativePixmap::Asynchronous; } @@ -1034,7 +1034,7 @@ void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, const } if (d) // loadable, but encountered error while loading return; - } + } if (!engine) return; @@ -1062,7 +1062,7 @@ void QDeclarativePixmap::clear() void QDeclarativePixmap::clear(QObject *obj) { if (d) { - if (d->reply) + if (d->reply) QObject::disconnect(d->reply, 0, obj, 0); d->release(); d = 0; diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp index cb41ff15..96024fe9 100644 --- a/src/declarative/util/qdeclarativepropertychanges.cpp +++ b/src/declarative/util/qdeclarativepropertychanges.cpp @@ -70,28 +70,28 @@ QT_BEGIN_NAMESPACE \since 4.7 \brief The PropertyChanges element describes new property bindings or values for a state. - PropertyChanges is used to define the property values or bindings in a + PropertyChanges is used to define the property values or bindings in a \l State. This enables an item's property values to be changed when it \l {QML States}{changes between states}. - To create a PropertyChanges object, specify the \l target item whose + To create a PropertyChanges object, specify the \l target item whose properties are to be modified, and define the new property values or bindings. For example: - - \snippet doc/src/snippets/declarative/propertychanges.qml import + + \snippet doc/src/snippets/declarative/propertychanges.qml import \codeline \snippet doc/src/snippets/declarative/propertychanges.qml 0 When the mouse is pressed, the \l Rectangle changes to the \e resized - state. In this state, the PropertyChanges object sets the rectangle's + state. In this state, the PropertyChanges object sets the rectangle's color to blue and the \c height value to that of \c container.height. - Note this automatically binds \c rect.height to \c container.height + Note this automatically binds \c rect.height to \c container.height in the \e resized state. If a property binding should not be established, and the height should just be set to the value of \c container.height at the time of the state change, set the \l explicit property to \c true. - + A PropertyChanges object can also override the default signal handler for an object to implement a signal handler specific to the new state: @@ -191,7 +191,7 @@ public: if (ownedExpression == rewindExpression) ownedExpression = 0; } - virtual void saveCurrentValues() { + virtual void saveCurrentValues() { rewindExpression = QDeclarativePropertyPrivate::signalExpression(property); } @@ -399,7 +399,7 @@ void QDeclarativePropertyChanges::setObject(QObject *o) \qmlproperty bool PropertyChanges::restoreEntryValues This property holds whether the previous values should be restored when - leaving the state. + leaving the state. The default value is \c true. Setting this value to \c false creates a temporary state that has permanent effects on property values. diff --git a/src/declarative/util/qdeclarativepropertychanges_p.h b/src/declarative/util/qdeclarativepropertychanges_p.h index fc7295bd..b385284c 100644 --- a/src/declarative/util/qdeclarativepropertychanges_p.h +++ b/src/declarative/util/qdeclarativepropertychanges_p.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) - + class QDeclarativePropertyChangesPrivate; class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativePropertyChanges : public QDeclarativeStateOperation { diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp index c6185b7f..fc01ad46 100644 --- a/src/declarative/util/qdeclarativestate.cpp +++ b/src/declarative/util/qdeclarativestate.cpp @@ -65,7 +65,7 @@ QDeclarativeAction::QDeclarativeAction() QDeclarativeAction::QDeclarativeAction(QObject *target, const QString &propertyName, const QVariant &value) -: restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false), +: restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false), property(target, propertyName, qmlEngine(target)), toValue(value), fromBinding(0), event(0), specifiedObject(target), specifiedProperty(propertyName) @@ -682,7 +682,7 @@ void QDeclarativeState::apply(QDeclarativeStateGroup *group, QDeclarativeTransit } if (!found) { QVariant cur = d->revertList.at(ii).property().read(); - QDeclarativeAbstractBinding *delBinding = + QDeclarativeAbstractBinding *delBinding = QDeclarativePropertyPrivate::setBinding(d->revertList.at(ii).property(), 0); if (delBinding) delBinding->destroy(); @@ -714,7 +714,7 @@ void QDeclarativeState::apply(QDeclarativeStateGroup *group, QDeclarativeTransit qWarning() << " QDeclarativeAction event:" << action.event->typeName(); else qWarning() << " QDeclarativeAction:" << action.property.object() - << action.property.name() << "From:" << action.fromValue + << action.property.name() << "From:" << action.fromValue << "To:" << action.toValue; } } diff --git a/src/declarative/util/qdeclarativestate_p_p.h b/src/declarative/util/qdeclarativestate_p_p.h index c25c0402..a01c6d0e 100644 --- a/src/declarative/util/qdeclarativestate_p_p.h +++ b/src/declarative/util/qdeclarativestate_p_p.h @@ -206,7 +206,7 @@ public: struct OperationGuard : public QDeclarativeGuard { - OperationGuard(QObject *obj, QList *l) : list(l) { + OperationGuard(QObject *obj, QList *l) : list(l) { setObject(static_cast(obj)); } QList *list; diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp index 341e708e..c6a70c85 100644 --- a/src/declarative/util/qdeclarativestategroup.cpp +++ b/src/declarative/util/qdeclarativestategroup.cpp @@ -340,8 +340,8 @@ bool QDeclarativeStateGroupPrivate::updateAutoState() if (state->isWhenKnown()) { if (state->isNamed()) { if (state->when() && state->when()->evaluate().toBool()) { - if (stateChangeDebug()) - qWarning() << "Setting auto state due to:" + if (stateChangeDebug()) + qWarning() << "Setting auto state due to:" << state->when()->expression(); if (currentState != state->name()) { q->setState(state->name()); @@ -376,7 +376,7 @@ QDeclarativeTransition *QDeclarativeStateGroupPrivate::findTransition(const QStr for (int ii = 0; ii < 2; ++ii) { if (ii && (!t->reversible() || - (t->fromState() == QLatin1String("*") && + (t->fromState() == QLatin1String("*") && t->toState() == QLatin1String("*")))) break; QStringList fromState; @@ -423,7 +423,7 @@ QDeclarativeTransition *QDeclarativeStateGroupPrivate::findTransition(const QStr return highest; } -void QDeclarativeStateGroupPrivate::setCurrentStateInternal(const QString &state, +void QDeclarativeStateGroupPrivate::setCurrentStateInternal(const QString &state, bool ignoreTrans) { Q_Q(QDeclarativeStateGroup); @@ -443,7 +443,7 @@ void QDeclarativeStateGroupPrivate::setCurrentStateInternal(const QString &state if (stateChangeDebug()) { qWarning() << this << "Changing state. From" << currentState << ". To" << state; if (transition) - qWarning() << " using transition" << transition->fromState() + qWarning() << " using transition" << transition->fromState() << transition->toState(); } diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp index 4137de50..62d0e689 100644 --- a/src/declarative/util/qdeclarativestateoperations.cpp +++ b/src/declarative/util/qdeclarativestateoperations.cpp @@ -183,8 +183,8 @@ void QDeclarativeParentChangePrivate::doChange(QDeclarativeItem *targetParent, Q items involved in the reparenting (i.e. items in the common ancestor tree for the original and new parent). - The example below displays a large red rectangle and a small blue rectangle, side by side. - When the \c blueRect is clicked, it changes to the "reparented" state: its parent is changed to \c redRect and it is + The example below displays a large red rectangle and a small blue rectangle, side by side. + When the \c blueRect is clicked, it changes to the "reparented" state: its parent is changed to \c redRect and it is positioned at (10, 10) within the red rectangle, as specified in the ParentChange. \snippet doc/src/snippets/declarative/parentchange.qml 0 diff --git a/src/declarative/util/qdeclarativestateoperations_p.h b/src/declarative/util/qdeclarativestateoperations_p.h index 01b3e1d8..68a2bef6 100644 --- a/src/declarative/util/qdeclarativestateoperations_p.h +++ b/src/declarative/util/qdeclarativestateoperations_p.h @@ -134,7 +134,7 @@ public: QDeclarativeScriptString script() const; void setScript(const QDeclarativeScriptString &); - + QString name() const; void setName(const QString &); diff --git a/src/declarative/util/qdeclarativesystempalette.cpp b/src/declarative/util/qdeclarativesystempalette.cpp index 8ebda247..1febf865 100644 --- a/src/declarative/util/qdeclarativesystempalette.cpp +++ b/src/declarative/util/qdeclarativesystempalette.cpp @@ -64,7 +64,7 @@ public: \brief The SystemPalette element provides access to the Qt palettes. The SystemPalette element provides access to the Qt application - palettes. This provides information about the standard colors used + palettes. This provides information about the standard colors used for application windows, buttons and other features. These colors are grouped into three \e {color groups}: \c Active, \c Inactive, and \c Disabled. See the QPalette documentation for details about diff --git a/src/declarative/util/qdeclarativetimeline.cpp b/src/declarative/util/qdeclarativetimeline.cpp index d4045ef3..078cdd6a 100644 --- a/src/declarative/util/qdeclarativetimeline.cpp +++ b/src/declarative/util/qdeclarativetimeline.cpp @@ -80,7 +80,7 @@ struct QDeclarativeTimeLinePrivate Execute }; Op() {} - Op(Type t, int l, qreal v, qreal v2, int o, + Op(Type t, int l, qreal v, qreal v2, int o, const QDeclarativeTimeLineCallback &ev = QDeclarativeTimeLineCallback(), const QEasingCurve &es = QEasingCurve()) : type(t), length(l), value(v), value2(v2), order(o), event(ev), easing(es) {} @@ -88,8 +88,8 @@ struct QDeclarativeTimeLinePrivate : type(o.type), length(o.length), value(o.value), value2(o.value2), order(o.order), event(o.event), easing(o.easing) {} Op &operator=(const Op &o) { - type = o.type; length = o.length; value = o.value; - value2 = o.value2; order = o.order; event = o.event; + type = o.type; length = o.length; value = o.value; + value2 = o.value2; order = o.order; event = o.event; easing = o.easing; return *this; } @@ -603,8 +603,8 @@ void QDeclarativeTimeLine::sync(QDeclarativeTimeLineValue &timeLineValue) d->syncPoint = d->length; }*/ -/*! - \internal +/*! + \internal Temporary hack. */ @@ -613,9 +613,9 @@ void QDeclarativeTimeLine::setSyncPoint(int sp) d->syncPoint = sp; } -/*! - \internal - +/*! + \internal + Temporary hack. */ int QDeclarativeTimeLine::syncPoint() const @@ -738,7 +738,7 @@ int QDeclarativeTimeLinePrivate::advance(int t) TimeLine &tl = *iter; Op &op = tl.ops.first(); int length = op.length - tl.consumedOpLength; - + if (length < advanceTime) { advanceTime = length; if (advanceTime == 0) @@ -747,7 +747,7 @@ int QDeclarativeTimeLinePrivate::advance(int t) } t -= advanceTime; - // Process until then. A zero length advance time will only process + // Process until then. A zero length advance time will only process // sets. QList > updates; @@ -761,8 +761,8 @@ int QDeclarativeTimeLinePrivate::advance(int t) if (advanceTime == 0 && op.length != 0) continue; - if (tl.consumedOpLength == 0 && - op.type != Op::Pause && + if (tl.consumedOpLength == 0 && + op.type != Op::Pause && op.type != Op::Execute) tl.base = v->value(); diff --git a/src/declarative/util/qdeclarativetransitionmanager.cpp b/src/declarative/util/qdeclarativetransitionmanager.cpp index 000427d3..232f947f 100644 --- a/src/declarative/util/qdeclarativetransitionmanager.cpp +++ b/src/declarative/util/qdeclarativetransitionmanager.cpp @@ -81,7 +81,7 @@ QDeclarativeTransitionManager::~QDeclarativeTransitionManager() delete d; d = 0; } -void QDeclarativeTransitionManager::complete() +void QDeclarativeTransitionManager::complete() { d->applyBindings(); @@ -92,7 +92,7 @@ void QDeclarativeTransitionManager::complete() d->completeList.clear(); - if (d->state) + if (d->state) static_cast(QObjectPrivate::get(d->state))->complete(); } @@ -207,8 +207,8 @@ void QDeclarativeTransitionManager::transition(const QList & } else { if (touched.contains(action.property)) { - if (action.toValue != action.fromValue) - d->completeList << + if (action.toValue != action.fromValue) + d->completeList << QDeclarativeSimpleAction(action, QDeclarativeSimpleAction::EndState); applyList.removeAt(ii); @@ -221,7 +221,7 @@ void QDeclarativeTransitionManager::transition(const QList & // Any actions remaining have not been handled by the transition and should // be applied immediately. We skip applying bindings, as they are all - // applied at the end in applyBindings() to avoid any nastiness mid + // applied at the end in applyBindings() to avoid any nastiness mid // transition foreach(const QDeclarativeAction &action, applyList) { if (action.event && !action.event->changesBindings()) { @@ -240,7 +240,7 @@ void QDeclarativeTransitionManager::transition(const QList & qWarning() << " No transition for event:" << action.event->typeName(); else qWarning() << " No transition for:" << action.property.object() - << action.property.name() << "From:" << action.fromValue + << action.property.name() << "From:" << action.fromValue << "To:" << action.toValue; } } diff --git a/src/declarative/util/qdeclarativetransitionmanager_p_p.h b/src/declarative/util/qdeclarativetransitionmanager_p_p.h index 2902cb41..c37fc6b6 100644 --- a/src/declarative/util/qdeclarativetransitionmanager_p_p.h +++ b/src/declarative/util/qdeclarativetransitionmanager_p_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE class QDeclarativeStatePrivate; class QDeclarativeTransitionManagerPrivate; -class Q_AUTOTEST_EXPORT QDeclarativeTransitionManager +class Q_AUTOTEST_EXPORT QDeclarativeTransitionManager { public: QDeclarativeTransitionManager(); diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp index 7139581a..badfff43 100644 --- a/src/declarative/util/qdeclarativexmllistmodel.cpp +++ b/src/declarative/util/qdeclarativexmllistmodel.cpp @@ -114,7 +114,7 @@ typedef QPair QDeclarativeXmlListRange; For example, if there is an XML document like this: \quotefile doc/src/snippets/declarative/xmlrole.xml - + Here are some valid XPath expressions for XmlRole queries on this document: \snippet doc/src/snippets/declarative/xmlrole.qml 0 @@ -127,7 +127,7 @@ typedef QPair QDeclarativeXmlListRange; /*! \qmlproperty bool XmlRole::isKey Defines whether this is a key role. - + Key roles are used to to determine whether a set of values should be updated or added to the XML list model when XmlListModel::reload() is called. @@ -321,7 +321,7 @@ void QDeclarativeXmlQueryEngine::processJobs() return; currentJob = m_jobs.takeLast(); } - + locker.unlock(); processQuery(¤tJob); locker.relock(); @@ -450,7 +450,7 @@ void QDeclarativeXmlQueryEngine::doSubQueryJob(XmlQueryJob *currentJob, QDeclara for (int i=0; ikeyRoleResultsCache.count(); i++) { if (!keyRoleResults.contains(currentJob->keyRoleResultsCache[i])) addIndexToRangeList(¤tResult->removed, i); - else + else temp << currentJob->keyRoleResultsCache[i]; } @@ -644,10 +644,10 @@ void QDeclarativeXmlListModelPrivate::clear_role(QDeclarativeListProperty in the XML document. - + a model item for each \c in the XML document. + The XmlRole objects define the - model item attributes. Here, each model item will have \c title and \c pubDate + model item attributes. Here, each model item will have \c title and \c pubDate attributes that match the \c title and \c pubDate values of its corresponding \c . (See \l XmlRole::query for more examples of valid XPath expressions for XmlRole.) @@ -682,8 +682,8 @@ void QDeclarativeXmlListModelPrivate::clear_role(QDeclarativeListPropertyundefinedValue(); QScriptValue sv = sengine->newObject(); - for (int i=0; iroleObjects.count(); i++) + for (int i=0; iroleObjects.count(); i++) sv.setProperty(d->roleObjects[i]->name(), sengine->toScriptValue(d->data.value(i).value(index))); - return sv; + return sv; } /*! @@ -935,7 +935,7 @@ QDeclarativeXmlListModel::Status QDeclarativeXmlListModel::status() const 1.0 (all data downloaded). If the XML data is not from a remote source, the progress becomes 1.0 as soon as the data is read. - Note that when the progress is 1.0, the XML data has been downloaded, but + Note that when the progress is 1.0, the XML data has been downloaded, but it is yet to be loaded into the model at this point. Use the status property to find out when the XML data has been read and loaded into the model. @@ -983,13 +983,13 @@ void QDeclarativeXmlListModel::componentComplete() \qmlmethod XmlListModel::reload() Reloads the model. - + If no key roles have been specified, all existing model data is removed, and the model is rebuilt from scratch. Otherwise, items are only added if the model does not already contain items with matching key role values. - + \sa {Using key XML roles}, XmlRole::isKey */ void QDeclarativeXmlListModel::reload() diff --git a/src/declarative/util/qlistmodelinterface_p.h b/src/declarative/util/qlistmodelinterface_p.h index b485c5fe..be097d7e 100644 --- a/src/declarative/util/qlistmodelinterface_p.h +++ b/src/declarative/util/qlistmodelinterface_p.h @@ -71,7 +71,7 @@ class Q_DECLARATIVE_PRIVATE_EXPORT QListModelInterface : public QObject void itemsChanged(int index, int count, const QList &roles); protected: - QListModelInterface(QObjectPrivate &dd, QObject *parent) + QListModelInterface(QObjectPrivate &dd, QObject *parent) : QObject(dd, parent) {} }; -- cgit v1.2.3