Reformat, Rename, Redo

1 files changed, 15 insertions, 10 deletions

diff --git a/main.cpp b/main.cpp
index bd6a44f9..b9ecde8f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,8 +5,8 @@
 #include <QPainter>
 #include <QTime>
 
-#include "CategorizedView.h"
-#include "CategorizedProxyModel.h"
+#include "GroupView.h"
+#include "GroupedProxyModel.h"
 #include "InstanceDelegate.h"
 
 Progresser *progresser;
@@ -25,18 +25,20 @@ QPixmap icon(const int number)
 	font.setBold(true);
 	font.setPixelSize(28);
 	painter.setFont(font);
-	painter.drawText(QRect(QPoint(0, 0), p.size()), Qt::AlignVCenter | Qt::AlignHCenter, QString::number(number));
+	painter.drawText(QRect(QPoint(0, 0), p.size()), Qt::AlignVCenter | Qt::AlignHCenter,
+					 QString::number(number));
 	painter.end();
 	return p;
 }
-QStandardItem *createItem(const Qt::GlobalColor color, const QString &text, const QString &category)
+QStandardItem *createItem(const Qt::GlobalColor color, const QString &text,
+						  const QString &category)
 {
 	QStandardItem *item = new QStandardItem;
 	item->setText(text);
 	item->setData(icon(color), Qt::DecorationRole);
 	item->setData(category, CategorizedViewRoles::CategoryRole);
 	item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
-	//progresser->addTrackedIndex(item);
+	// progresser->addTrackedIndex(item);
 	return item;
 }
 QStandardItem *createItem(const int index, const QString &category)
@@ -46,7 +48,7 @@ QStandardItem *createItem(const int index, const QString &category)
 	item->setData(icon(index), Qt::DecorationRole);
 	item->setData(category, CategorizedViewRoles::CategoryRole);
 	item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
-	//progresser->addTrackedIndex(item);
+	// progresser->addTrackedIndex(item);
 	return item;
 }
 
@@ -62,7 +64,10 @@ int main(int argc, char *argv[])
 	model.setRowCount(10);
 	model.setColumnCount(1);
 
-	model.setItem(0, createItem(Qt::red, "Red is a color. Some more text. I'm out of ideas. 42. What's your name?", "Colorful"));
+	model.setItem(
+		0, createItem(Qt::red,
+					  "Red is a color. Some more text. I'm out of ideas. 42. What's your name?",
+					  "Colorful"));
 	model.setItem(1, createItem(Qt::blue, "Blue", "Colorful"));
 	model.setItem(2, createItem(Qt::yellow, "Yellow", "Colorful"));
 
@@ -77,13 +82,13 @@ int main(int argc, char *argv[])
 
 	for (int i = 0; i < 20; ++i)
 	{
-		model.setItem(i + 10, createItem(i+1, "Items 1-20"));
+		model.setItem(i + 10, createItem(i + 1, "Items 1-20"));
 	}
 
-	CategorizedProxyModel pModel;
+	GroupedProxyModel pModel;
 	pModel.setSourceModel(&model);
 
-	CategorizedView w;
+	GroupView w;
 	w.setItemDelegate(new ListViewDelegate);
 	w.setModel(&pModel);
 	w.resize(640, 480);