From c8c6b016cfad0ef3f566a746c844a629d63a47e1 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Fri, 13 Jan 2017 22:51:41 +0100
Subject: [PATCH] Refactoring to make notemodel and foldermodel share the same
 base class

---
 QtClient/JoplinQtClient/MainPage.qml                 | 12 +++++++-----
 QtClient/JoplinQtClient/application.cpp              |  3 ++-
 QtClient/JoplinQtClient/models/abstractlistmodel.cpp |  1 -
 QtClient/JoplinQtClient/models/abstractlistmodel.h   |  3 +--
 QtClient/JoplinQtClient/models/notemodel.h           |  6 ------
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/QtClient/JoplinQtClient/MainPage.qml b/QtClient/JoplinQtClient/MainPage.qml
index a969c0e56d..7778a68c9f 100755
--- a/QtClient/JoplinQtClient/MainPage.qml
+++ b/QtClient/JoplinQtClient/MainPage.qml
@@ -10,6 +10,11 @@ Item {
 
 	function onShown() {}
 
+	function handleAddItem(list) {
+		list.model.showVirtualItem();
+		list.startEditing(list.model.rowCount() - 1);
+	}
+
 	function handleItemListEditingAccepted(list, index, text) {
 		if (list.model.virtualItemShown()) {
 			list.model.hideVirtualItem();
@@ -106,11 +111,8 @@ Item {
 		id: addButton
 		anchors.right: parent.right
 		anchors.bottom: parent.bottom
-		onAddFolderButtonClicked: {
-			folderList.model.showVirtualItem();
-			folderList.startEditing(folderList.model.rowCount() - 1);
-		}
-		onAddNoteButtonClicked: appRoot.addNoteButtonClicked()
+		onAddFolderButtonClicked: handleAddItem(folderList)
+		onAddNoteButtonClicked: handleAddItem(noteList)
 	}
 
 	Button {
diff --git a/QtClient/JoplinQtClient/application.cpp b/QtClient/JoplinQtClient/application.cpp
index 2ab83dd4d4..45f377944c 100755
--- a/QtClient/JoplinQtClient/application.cpp
+++ b/QtClient/JoplinQtClient/application.cpp
@@ -59,6 +59,7 @@ Application::Application(int &argc, char **argv) :
 	connect(rootObject, SIGNAL(currentFolderChanged()), this, SLOT(view_currentFolderChanged()));
 	connect(rootObject, SIGNAL(currentNoteChanged()), this, SLOT(view_currentNoteChanged()));
 	connect(rootObject, SIGNAL(addFolderButtonClicked()), this, SLOT(view_addFolderButtonClicked()));
+	connect(rootObject, SIGNAL(addNoteButtonClicked()), this, SLOT(view_addNoteButtonClicked()));
 	connect(rootObject, SIGNAL(syncButtonClicked()), this, SLOT(view_syncButtonClicked()));
 	connect(rootObject, SIGNAL(loginClicked(QString,QString,QString)), this, SLOT(dispatcher_loginClicked(QString,QString,QString)));
 	connect(rootObject, SIGNAL(logoutClicked()), this, SLOT(dispatcher_logoutClicked()));
@@ -198,7 +199,7 @@ void Application::view_currentNoteChanged() {
 }
 
 void Application::view_addNoteButtonClicked() {
-
+	qDebug() <<"ADDNOTE";
 }
 
 void Application::view_addFolderButtonClicked() {
diff --git a/QtClient/JoplinQtClient/models/abstractlistmodel.cpp b/QtClient/JoplinQtClient/models/abstractlistmodel.cpp
index 75a89c2922..991d73b577 100755
--- a/QtClient/JoplinQtClient/models/abstractlistmodel.cpp
+++ b/QtClient/JoplinQtClient/models/abstractlistmodel.cpp
@@ -98,7 +98,6 @@ QHash<int, QByteArray> AbstractListModel::roleNames() const {
 	QHash<int, QByteArray> roles = QAbstractItemModel::roleNames();
 	roles[TitleRole] = "title";
 	roles[IdRole] = "id";
-	//roles[RawRole] = "raw";
 	return roles;
 }
 
diff --git a/QtClient/JoplinQtClient/models/abstractlistmodel.h b/QtClient/JoplinQtClient/models/abstractlistmodel.h
index 40bd0da05c..555a2a6b62 100755
--- a/QtClient/JoplinQtClient/models/abstractlistmodel.h
+++ b/QtClient/JoplinQtClient/models/abstractlistmodel.h
@@ -14,8 +14,7 @@ public:
 
 	enum ModelRoles {
 		IdRole = Qt::UserRole + 1,
-		TitleRole,
-		RawRole
+		TitleRole
 	};
 
 	AbstractListModel();
diff --git a/QtClient/JoplinQtClient/models/notemodel.h b/QtClient/JoplinQtClient/models/notemodel.h
index 9e1258e2fb..00ef25dcac 100755
--- a/QtClient/JoplinQtClient/models/notemodel.h
+++ b/QtClient/JoplinQtClient/models/notemodel.h
@@ -15,12 +15,6 @@ class NoteModel : public AbstractListModel {
 
 public:
 
-	enum ModelRoles {
-		IdRole = Qt::UserRole + 1,
-		TitleRole,
-		RawRole
-	};
-
 	NoteModel();
 	Note* atIndex(int index) const;
 	void setFolderId(const QString& v);