diff options
Diffstat (limited to 'examples/widgets/itemviews/interview')
-rw-r--r-- | examples/widgets/itemviews/interview/main.cpp | 6 | ||||
-rw-r--r-- | examples/widgets/itemviews/interview/model.cpp | 23 | ||||
-rw-r--r-- | examples/widgets/itemviews/interview/model.h | 13 |
3 files changed, 22 insertions, 20 deletions
diff --git a/examples/widgets/itemviews/interview/main.cpp b/examples/widgets/itemviews/interview/main.cpp index b95acbc18e..a272f67f40 100644 --- a/examples/widgets/itemviews/interview/main.cpp +++ b/examples/widgets/itemviews/interview/main.cpp @@ -42,11 +42,11 @@ #include "model.h" #include <QApplication> -#include <QTableView> -#include <QTreeView> +#include <QHeaderView> #include <QListView> #include <QSplitter> -#include <QHeaderView> +#include <QTableView> +#include <QTreeView> int main(int argc, char *argv[]) { diff --git a/examples/widgets/itemviews/interview/model.cpp b/examples/widgets/itemviews/interview/model.cpp index ef0057981b..e99eb477fb 100644 --- a/examples/widgets/itemviews/interview/model.cpp +++ b/examples/widgets/itemviews/interview/model.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "model.h" + #include <QIcon> #include <QPixmap> @@ -60,10 +61,10 @@ Model::~Model() QModelIndex Model::index(int row, int column, const QModelIndex &parent) const { if (row < rc && row >= 0 && column < cc && column >= 0) { - Node *p = static_cast<Node*>(parent.internalPointer()); - Node *n = node(row, p); - if (n) - return createIndex(row, column, n); + Node *parentNode = static_cast<Node*>(parent.internalPointer()); + Node *childNode = node(row, parentNode); + if (childNode) + return createIndex(row, column, childNode); } return QModelIndex(); } @@ -71,10 +72,10 @@ QModelIndex Model::index(int row, int column, const QModelIndex &parent) const QModelIndex Model::parent(const QModelIndex &child) const { if (child.isValid()) { - Node *n = static_cast<Node*>(child.internalPointer()); - Node *p = parent(n); - if (p) - return createIndex(row(p), 0, p); + Node *childNode = static_cast<Node*>(child.internalPointer()); + Node *parentNode = parent(childNode); + if (parentNode) + return createIndex(row(parentNode), 0, parentNode); } return QModelIndex(); } @@ -130,7 +131,7 @@ Qt::ItemFlags Model::flags(const QModelIndex &index) const Model::Node *Model::node(int row, Node *parent) const { if (parent && !parent->children) - parent->children = new QVector<Node>(rc, Node(parent)); + parent->children = new QVector<Node>(rc, Node(parent)); QVector<Node> *v = parent ? parent->children : tree; return const_cast<Node*>(&(v->at(row))); } @@ -142,6 +143,6 @@ Model::Node *Model::parent(Node *child) const int Model::row(Node *node) const { - const Node *first = node->parent ? &(node->parent->children->at(0)) : &(tree->at(0)); - return (node - first); + const Node *first = node->parent ? &(node->parent->children->at(0)) : &(tree->at(0)); + return node - first; } diff --git a/examples/widgets/itemviews/interview/model.h b/examples/widgets/itemviews/interview/model.h index dcbbc67d86..c6c8493aa6 100644 --- a/examples/widgets/itemviews/interview/model.h +++ b/examples/widgets/itemviews/interview/model.h @@ -71,10 +71,10 @@ private: struct Node { - Node(Node *parent = 0) : parent(parent), children(0) {} - ~Node() { delete children; } - Node *parent; - QVector<Node> *children; + Node(Node *parent = 0) : parent(parent), children(0) {} + ~Node() { delete children; } + Node *parent; + QVector<Node> *children; }; Node *node(int row, Node *parent) const; @@ -82,9 +82,10 @@ private: int row(Node *node) const; QIcon services; - int rc, cc; + int rc; + int cc; QVector<Node> *tree; QFileIconProvider iconProvider; }; -#endif +#endif // MODEL_H |