1 files changed, 110 insertions, 82 deletions
diff --git a/tests/auto/other/modeltest/dynamictreemodel.h b/tests/auto/other/modeltest/dynamictreemodel.h
index e31c4569fd..709751dd27 100644
--- a/tests/auto/other/modeltest/dynamictreemodel.h
+++ b/tests/auto/other/modeltest/dynamictreemodel.h
@@ -34,119 +34,142 @@
 #include <QtCore/QHash>
 #include <QtCore/QList>
 
-
 class DynamicTreeModel : public QAbstractItemModel
 {
-  Q_OBJECT
+    Q_OBJECT
 
 public:
-  DynamicTreeModel(QObject *parent = 0);
+    DynamicTreeModel(QObject *parent = 0);
 
-  QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
-  QModelIndex parent(const QModelIndex &index) const;
-  int rowCount(const QModelIndex &index = QModelIndex()) const;
-  int columnCount(const QModelIndex &index = QModelIndex()) const;
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex parent(const QModelIndex &index) const;
+    int rowCount(const QModelIndex &index = QModelIndex()) const;
+    int columnCount(const QModelIndex &index = QModelIndex()) const;
 
-  QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
 
-  void clear();
+    void clear();
 
 protected slots:
 
-  /**
-  Finds the parent id of the string with id @p searchId.
+    /**
+    Finds the parent id of the string with id @p searchId.
 
-  Returns -1 if not found.
-  */
-  qint64 findParentId(qint64 searchId) const;
+    Returns -1 if not found.
+    */
+    qint64 findParentId(qint64 searchId) const;
 
 private:
-  QHash<qint64, QString> m_items;
-  QHash<qint64, QList<QList<qint64> > > m_childItems;
-  qint64 nextId;
-  qint64 newId() { return nextId++; };
-
-  QModelIndex m_nextParentIndex;
-  int m_nextRow;
-
-  int m_depth;
-  int maxDepth;
-
-  friend class ModelInsertCommand;
-  friend class ModelMoveCommand;
-  friend class ModelResetCommand;
-  friend class ModelResetCommandFixed;
-  friend class ModelChangeChildrenLayoutsCommand;
-
+    QHash<qint64, QString> m_items;
+    QHash<qint64, QList<QList<qint64> > > m_childItems;
+    qint64 nextId;
+    qint64 newId()
+    {
+        return nextId++;
+    }
+
+    QModelIndex m_nextParentIndex;
+    int m_nextRow;
+
+    int m_depth;
+    int maxDepth;
+
+    friend class ModelInsertCommand;
+    friend class ModelMoveCommand;
+    friend class ModelResetCommand;
+    friend class ModelResetCommandFixed;
+    friend class ModelChangeChildrenLayoutsCommand;
 };
 
-
 class ModelChangeCommand : public QObject
 {
-  Q_OBJECT
+    Q_OBJECT
 public:
 
-  ModelChangeCommand( DynamicTreeModel *model, QObject *parent = 0 );
+    ModelChangeCommand(DynamicTreeModel *model, QObject *parent = 0);
 
-  virtual ~ModelChangeCommand() {}
+    virtual ~ModelChangeCommand()
+    {
+    }
 
-  void setAncestorRowNumbers(QList<int> rowNumbers) { m_rowNumbers = rowNumbers; }
+    void setAncestorRowNumbers(QList<int> rowNumbers)
+    {
+        m_rowNumbers = rowNumbers;
+    }
 
-  QModelIndex findIndex(QList<int> rows);
+    QModelIndex findIndex(QList<int> rows);
 
-  void setStartRow(int row) { m_startRow = row; }
+    void setStartRow(int row)
+    {
+        m_startRow = row;
+    }
 
-  void setEndRow(int row) { m_endRow = row; }
+    void setEndRow(int row)
+    {
+        m_endRow = row;
+    }
 
-  void setNumCols(int cols) { m_numCols = cols; }
+    void setNumCols(int cols)
+    {
+        m_numCols = cols;
+    }
 
-  virtual void doCommand() = 0;
+    virtual void doCommand() = 0;
 
 protected:
-  DynamicTreeModel* m_model;
-  QList<int> m_rowNumbers;
-  int m_numCols;
-  int m_startRow;
-  int m_endRow;
-
+    DynamicTreeModel *m_model;
+    QList<int> m_rowNumbers;
+    int m_numCols;
+    int m_startRow;
+    int m_endRow;
 };
 
-typedef QList<ModelChangeCommand*> ModelChangeCommandList;
+typedef QList<ModelChangeCommand *> ModelChangeCommandList;
 
 class ModelInsertCommand : public ModelChangeCommand
 {
-  Q_OBJECT
+    Q_OBJECT
 
 public:
 
-  ModelInsertCommand(DynamicTreeModel *model, QObject *parent = 0 );
-  virtual ~ModelInsertCommand() {}
+    ModelInsertCommand(DynamicTreeModel *model, QObject *parent = 0);
+    virtual ~ModelInsertCommand()
+    {
+    }
 
-  virtual void doCommand();
+    virtual void doCommand();
 };
 
-
 class ModelMoveCommand : public ModelChangeCommand
 {
-  Q_OBJECT
+    Q_OBJECT
 public:
-  ModelMoveCommand(DynamicTreeModel *model, QObject *parent);
+    ModelMoveCommand(DynamicTreeModel *model, QObject *parent);
 
-  virtual ~ModelMoveCommand() {}
+    virtual ~ModelMoveCommand()
+    {
+    }
 
-  virtual bool emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destRow);
+    virtual bool emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd,
+                               const QModelIndex &destParent, int destRow);
 
-  virtual void doCommand();
+    virtual void doCommand();
 
-  virtual void emitPostSignal();
+    virtual void emitPostSignal();
 
-  void setDestAncestors( QList<int> rows ) { m_destRowNumbers = rows; }
+    void setDestAncestors(QList<int> rows)
+    {
+        m_destRowNumbers = rows;
+    }
 
-  void setDestRow(int row) { m_destRow = row; }
+    void setDestRow(int row)
+    {
+        m_destRow = row;
+    }
 
 protected:
-  QList<int> m_destRowNumbers;
-  int m_destRow;
+    QList<int> m_destRowNumbers;
+    int m_destRow;
 };
 
 /**
@@ -154,15 +177,15 @@ protected:
 */
 class ModelResetCommand : public ModelMoveCommand
 {
-  Q_OBJECT
+    Q_OBJECT
 public:
-  ModelResetCommand(DynamicTreeModel* model, QObject* parent = 0);
+    ModelResetCommand(DynamicTreeModel *model, QObject *parent = 0);
 
-  virtual ~ModelResetCommand();
-
-  virtual bool emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destRow);
-  virtual void emitPostSignal();
+    virtual ~ModelResetCommand();
 
+    virtual bool emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd,
+                               const QModelIndex &destParent, int destRow);
+    virtual void emitPostSignal();
 };
 
 /**
@@ -170,32 +193,37 @@ public:
 */
 class ModelResetCommandFixed : public ModelMoveCommand
 {
-  Q_OBJECT
+    Q_OBJECT
 public:
-  ModelResetCommandFixed(DynamicTreeModel* model, QObject* parent = 0);
-
-  virtual ~ModelResetCommandFixed();
+    ModelResetCommandFixed(DynamicTreeModel *model, QObject *parent = 0);
 
-  virtual bool emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destRow);
-  virtual void emitPostSignal();
+    virtual ~ModelResetCommandFixed();
 
+    virtual bool emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd,
+                               const QModelIndex &destParent, int destRow);
+    virtual void emitPostSignal();
 };
 
 class ModelChangeChildrenLayoutsCommand : public ModelChangeCommand
 {
-  Q_OBJECT
+    Q_OBJECT
 public:
-  ModelChangeChildrenLayoutsCommand(DynamicTreeModel *model, QObject *parent);
+    ModelChangeChildrenLayoutsCommand(DynamicTreeModel *model, QObject *parent);
 
-  virtual ~ModelChangeChildrenLayoutsCommand() {}
+    virtual ~ModelChangeChildrenLayoutsCommand()
+    {
+    }
 
-  virtual void doCommand();
+    virtual void doCommand();
 
-  void setSecondAncestorRowNumbers( QList<int> rows ) { m_secondRowNumbers = rows; }
+    void setSecondAncestorRowNumbers(QList<int> rows)
+    {
+        m_secondRowNumbers = rows;
+    }
 
 protected:
-  QList<int> m_secondRowNumbers;
-  int m_destRow;
+    QList<int> m_secondRowNumbers;
+    int m_destRow;
 };
 
 #endif