@@ -1,24 +1,27 @@
11/*
2− * Copyright (C) 2012 Canonical, Ltd.
2+ * Copyright 2013 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
5+ * it under the terms of the GNU Lesser General Public License as published by
66 * the Free Software Foundation; version 3.
77 *
88 * This program is distributed in the hope that it will be useful,
99 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1010 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
11+ * GNU Lesser General Public License for more details.
1212 *
13− * You should have received a copy of the GNU General Public License
13+ * You should have received a copy of the GNU Lesser General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ * Authors:
17+ * Nick Dedekind <nick.dedekind@canonical.com>
1518 */
1619
1720// self
1821#include "modelprinter.h"
1922
2023// Qt
21−#include <QDebug>
24+#include <QTextStream>
2225
2326ModelPrinter::ModelPrinter(QObject *parent)
2427 : QObject(parent)
@@ -29,19 +32,17 @@ ModelPrinter::ModelPrinter(QObject *parent)
2932void ModelPrinter::setSourceModel(QAbstractItemModel * sourceModel)
3033{
3134 if (m_model != NULL) {
32− disconnect(m_model, SIGNAL(modelReset()), this, SIGNAL(sourceChanged()));
33− disconnect(m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SIGNAL(sourceChanged()));
34− disconnect(m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SIGNAL(sourceChanged()));
35+ disconnect(m_model);
3536 }
3637 if (m_model != sourceModel) {
3738 m_model = sourceModel;
3839 Q_EMIT modelChanged();
39− Q_EMIT sourceChanged();
40+ Q_EMIT textChanged();
4041 }
4142 if (m_model != NULL) {
42− connect(m_model, SIGNAL(modelReset()), this, SIGNAL(sourceChanged()));
43− connect(m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SIGNAL(sourceChanged()));
44− connect(m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SIGNAL(sourceChanged()));
43+ connect(m_model, SIGNAL(modelReset()), this, SIGNAL(textChanged()));
44+ connect(m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SIGNAL(textChanged()));
45+ connect(m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SIGNAL(textChanged()));
4546 }
4647}
4748
@@ -50,9 +51,9 @@ QAbstractItemModel* ModelPrinter::sourceModel() const
5051 return m_model;
5152}
5253
53−QString ModelPrinter::getString(const QModelIndex& index) const
54+QString ModelPrinter::text(const QModelIndex& index) const
5455{
55− return recurse_string(index, 0);
56+ return recurseString(index, 0);
5657}
5758
5859QString tabify(int level) { QString str;
@@ -62,8 +63,11 @@ QString tabify(int level) { QString str;
6263 return str;
6364}
6465
65−QString ModelPrinter::recurse_string(const QModelIndex& index, int level) const
66+QString ModelPrinter::recurseString(const QModelIndex& index, int level) const
6667{
68+ if (!m_model)
69+ return "";
70+
6771 QString str;
6872 QTextStream stream(&str);
6973
@@ -76,19 +80,34 @@ QString ModelPrinter::recurse_string(const QModelIndex& index, int level) const
7680 QMapIterator<QString, QVariant> iter(vData.toMap());
7781 while (iter.hasNext()) {
7882 iter.next();
79− stream << tabify(level) << roleNames[role] << "." << iter.key() << ": " << iter.value().toString() << endl;
83+ stream << tabify(level)
84+ << roleNames[role]
85+ << "."
86+ << iter.key()
87+ << ": "
88+ << iter.value().toString()
89+ << endl;
8090 }
8191 }
8292 else {
83− stream << tabify(level) << roleNames[role] << ": " << vData.toString() << endl;
93+ stream << tabify(level)
94+ << roleNames[role]
95+ << ": "
96+ << vData.toString()
97+ << endl;
8498 }
8599 }
86100
87101 int rowCount = m_model->rowCount(index);
88− stream << tabify(level) << "child count" << ": " << rowCount << endl;
102+ stream << tabify(level)
103+ << "child count"
104+ << ": "
105+ << rowCount
106+ << endl;
107+
89108 for (int i = 0; i < rowCount; i++) {
90109 QModelIndex child = m_model->index(i, 0, index);
91− str += recurse_string(child, level+1);
110+ str += recurseString(child, level+1);
92111 }
93112 return str;
94113}