diff options
author | Axel Waggershauser <awagger@gmail.com> | 2013-03-15 00:42:15 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-16 20:22:50 +0100 |
commit | b11317a64339f5a4bcffc8234ecaf15c7fb416f2 (patch) | |
tree | f81e40ee49f5109b4100048d131d5bb922b448aa /examples/widgets/animation | |
parent | 72367a94a750355eb748793ce8c365373a332c9c (diff) |
Whitespace cleanup: remove trailing whitespace
Remove all trailing whitespace from the following list of files:
*.cpp *.h *.conf *.qdoc *.pro *.pri *.mm *.rc *.pl *.qps *.xpm *.txt *README
excluding 3rdparty, test-data and auto generated code.
Note A): the only non 3rdparty c++-files that still
have trailing whitespace after this change are:
* src/corelib/codecs/cp949codetbl_p.h
* src/corelib/codecs/qjpunicode.cpp
* src/corelib/codecs/qbig5codec.cpp
* src/corelib/xml/qxmlstream_p.h
* src/tools/qdoc/qmlparser/qqmljsgrammar.cpp
* src/tools/uic/ui4.cpp
* tests/auto/other/qtokenautomaton/tokenizers/*
* tests/benchmarks/corelib/tools/qstring/data.cpp
* util/lexgen/tokenizer.cpp
Note B): in about 30 files some overlapping 'leading tab' and
'TAB character in non-leading whitespace' issues have been fixed
to make the sanity bot happy. Plus some general ws-fixes here
and there as asked for during review.
Change-Id: Ia713113c34d82442d6ce4d93d8b1cf545075d11d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'examples/widgets/animation')
-rw-r--r-- | examples/widgets/animation/appchooser/main.cpp | 2 | ||||
-rw-r--r-- | examples/widgets/animation/easing/window.h | 4 | ||||
-rw-r--r-- | examples/widgets/animation/stickman/animation.cpp | 18 | ||||
-rw-r--r-- | examples/widgets/animation/stickman/lifecycle.cpp | 20 | ||||
-rw-r--r-- | examples/widgets/animation/stickman/node.cpp | 4 | ||||
-rw-r--r-- | examples/widgets/animation/stickman/stickman.h | 4 |
6 files changed, 26 insertions, 26 deletions
diff --git a/examples/widgets/animation/appchooser/main.cpp b/examples/widgets/animation/appchooser/main.cpp index 2184d1bcdf..a65e998b32 100644 --- a/examples/widgets/animation/appchooser/main.cpp +++ b/examples/widgets/animation/appchooser/main.cpp @@ -108,7 +108,7 @@ void createStates(const QObjectList &objects, void createAnimations(const QObjectList &objects, QStateMachine *machine) { for (int i=0; i<objects.size(); ++i) - machine->addDefaultAnimation(new QPropertyAnimation(objects.at(i), "geometry")); + machine->addDefaultAnimation(new QPropertyAnimation(objects.at(i), "geometry")); } int main(int argc, char **argv) diff --git a/examples/widgets/animation/easing/window.h b/examples/widgets/animation/easing/window.h index b47f236d95..d7fa927b49 100644 --- a/examples/widgets/animation/easing/window.h +++ b/examples/widgets/animation/easing/window.h @@ -63,11 +63,11 @@ private slots: void periodChanged(double); void amplitudeChanged(double); void overshootChanged(double); - + private: void createCurveIcons(); void startAnimation(); - + Ui::Form m_ui; QGraphicsScene m_scene; PixmapItem *m_item; diff --git a/examples/widgets/animation/stickman/animation.cpp b/examples/widgets/animation/stickman/animation.cpp index ebfbd1b5b8..730ee236e4 100644 --- a/examples/widgets/animation/stickman/animation.cpp +++ b/examples/widgets/animation/stickman/animation.cpp @@ -45,13 +45,13 @@ #include <QIODevice> #include <QDataStream> -class Frame +class Frame { public: Frame() { } - int nodeCount() const + int nodeCount() const { return m_nodePositions.size(); } @@ -70,7 +70,7 @@ public: { m_nodePositions[idx] = pos; } - + private: QVector<QPointF> m_nodePositions; }; @@ -81,7 +81,7 @@ Animation::Animation() m_frames.append(new Frame); } -Animation::~Animation() +Animation::~Animation() { qDeleteAll(m_frames); } @@ -89,10 +89,10 @@ Animation::~Animation() void Animation::setTotalFrames(int totalFrames) { while (m_frames.size() < totalFrames) - m_frames.append(new Frame); + m_frames.append(new Frame); while (totalFrames < m_frames.size()) - delete m_frames.takeLast(); + delete m_frames.takeLast(); } int Animation::totalFrames() const @@ -165,15 +165,15 @@ void Animation::load(QIODevice *device) QDataStream stream(device); stream >> m_name; - + int frameCount; stream >> frameCount; for (int i=0; i<frameCount; ++i) { - + int nodeCount; stream >> nodeCount; - + Frame *frame = new Frame; frame->setNodeCount(nodeCount); diff --git a/examples/widgets/animation/stickman/lifecycle.cpp b/examples/widgets/animation/stickman/lifecycle.cpp index c49fac7905..09ca45e55b 100644 --- a/examples/widgets/animation/stickman/lifecycle.cpp +++ b/examples/widgets/animation/stickman/lifecycle.cpp @@ -65,7 +65,7 @@ public: if (QSignalTransition::eventTest(e)) { QVariant key = static_cast<QStateMachine::SignalEvent*>(e)->arguments().at(0); return (key.toInt() == int(m_key)); - } + } return false; } @@ -100,7 +100,7 @@ LifeCycle::LifeCycle(StickMan *stickMan, GraphicsView *keyReceiver) const int stickManNodeCount = m_stickMan->nodeCount(); for (int i=0; i<stickManNodeCount; ++i) { QPropertyAnimation *pa = new QPropertyAnimation(m_stickMan->node(i), "pos"); - m_animationGroup->addAnimation(pa); + m_animationGroup->addAnimation(pa); } // Set up initial state graph @@ -111,14 +111,14 @@ LifeCycle::LifeCycle(StickMan *stickMan, GraphicsView *keyReceiver) m_alive = new QState(m_machine); m_alive->setObjectName("alive"); - + // Make it blink when lightning strikes before entering dead animation - QState *lightningBlink = new QState(m_machine); + QState *lightningBlink = new QState(m_machine); lightningBlink->assignProperty(m_stickMan->scene(), "backgroundBrush", QColor(Qt::white)); lightningBlink->assignProperty(m_stickMan, "penColor", QColor(Qt::black)); lightningBlink->assignProperty(m_stickMan, "fillColor", QColor(Qt::white)); lightningBlink->assignProperty(m_stickMan, "isDead", true); - + //! [5] QTimer *timer = new QTimer(lightningBlink); timer->setSingleShot(true); @@ -126,13 +126,13 @@ LifeCycle::LifeCycle(StickMan *stickMan, GraphicsView *keyReceiver) QObject::connect(lightningBlink, SIGNAL(entered()), timer, SLOT(start())); QObject::connect(lightningBlink, SIGNAL(exited()), timer, SLOT(stop())); //! [5] - + m_dead = new QState(m_machine); m_dead->assignProperty(m_stickMan->scene(), "backgroundBrush", QColor(Qt::black)); m_dead->assignProperty(m_stickMan, "penColor", QColor(Qt::white)); m_dead->assignProperty(m_stickMan, "fillColor", QColor(Qt::black)); m_dead->setObjectName("dead"); - + // Idle state (sets no properties) m_idle = new QState(m_alive); m_idle->setObjectName("idle"); @@ -172,7 +172,7 @@ void LifeCycle::addActivity(const QString &fileName, Qt::Key key, QObject *sende QState *LifeCycle::makeState(QState *parentState, const QString &animationFileName) { QState *topLevel = new QState(parentState); - + Animation animation; { QFile file(animationFileName); @@ -186,7 +186,7 @@ QState *LifeCycle::makeState(QState *parentState, const QString &animationFileNa animation.setCurrentFrame(i); //! [1] - QState *frameState = new QState(topLevel); + QState *frameState = new QState(topLevel); const int nodeCount = animation.nodeCount(); for (int j=0; j<nodeCount; ++j) frameState->assignProperty(m_stickMan->node(j), "pos", animation.nodePos(j)); @@ -199,7 +199,7 @@ QState *LifeCycle::makeState(QState *parentState, const QString &animationFileNa //! [2] previousState->addTransition(previousState, SIGNAL(propertiesAssigned()), frameState); //! [2] - + previousState = frameState; } diff --git a/examples/widgets/animation/stickman/node.cpp b/examples/widgets/animation/stickman/node.cpp index b47a1e8433..0694ee3a2f 100644 --- a/examples/widgets/animation/stickman/node.cpp +++ b/examples/widgets/animation/stickman/node.cpp @@ -62,7 +62,7 @@ QRectF Node::boundingRect() const } void Node::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) -{ +{ painter->setPen(Qt::white); painter->drawEllipse(QPointF(0.0, 0.0), 5.0, 5.0); } @@ -83,7 +83,7 @@ void Node::mousePressEvent(QGraphicsSceneMouseEvent *) void Node::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { if (m_dragging) - setPos(mapToParent(event->pos())); + setPos(mapToParent(event->pos())); } void Node::mouseReleaseEvent(QGraphicsSceneMouseEvent *) diff --git a/examples/widgets/animation/stickman/stickman.h b/examples/widgets/animation/stickman/stickman.h index 337fe4a794..08928a48a6 100644 --- a/examples/widgets/animation/stickman/stickman.h +++ b/examples/widgets/animation/stickman/stickman.h @@ -62,7 +62,7 @@ public: virtual QRectF boundingRect() const; virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); - int nodeCount() const; + int nodeCount() const; Node *node(int idx) const; void setDrawSticks(bool on); @@ -90,7 +90,7 @@ private: Node *m_nodes[NodeCount]; qreal m_perfectBoneLengths[BoneCount]; - + uint m_sticks : 1; uint m_isDead : 1; uint m_reserved : 30; |