From dd8bf7b48f267e45b3908882dbc645dbad14df58 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Sat, 26 Aug 2017 14:32:56 -0600
Subject: Cleanup

---
 components/mailviewer/contents/ui/MailDataModel.qml | 2 +-
 framework/qml/MailViewer.qml                        | 4 ++--
 framework/src/domain/mime/partmodel.cpp             | 6 +++---
 framework/src/domain/mime/partmodel.h               | 3 +--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/components/mailviewer/contents/ui/MailDataModel.qml b/components/mailviewer/contents/ui/MailDataModel.qml
index bc2fdc58..a626a35a 100644
--- a/components/mailviewer/contents/ui/MailDataModel.qml
+++ b/components/mailviewer/contents/ui/MailDataModel.qml
@@ -77,7 +77,7 @@ DelegateModel {
                 case "plain":
                     partLoader.setSource("TextContent.qml",
                                         {"content": model.content,
-                                        "embedded": model.embeded,
+                                        "embedded": model.embedded,
                                         "type": model.type
                                         })
                     break
diff --git a/framework/qml/MailViewer.qml b/framework/qml/MailViewer.qml
index c3fc45d3..5e1ef845 100644
--- a/framework/qml/MailViewer.qml
+++ b/framework/qml/MailViewer.qml
@@ -437,8 +437,8 @@ Rectangle {
                             title: "Type"
                         }
                         Controls1.TableViewColumn {
-                            role: "embeded"
-                            title: "Embeded"
+                            role: "embedded"
+                            title: "Embedded"
                         }
                         Controls1.TableViewColumn {
                             role: "securityLevel"
diff --git a/framework/src/domain/mime/partmodel.cpp b/framework/src/domain/mime/partmodel.cpp
index 9f802375..331ef379 100644
--- a/framework/src/domain/mime/partmodel.cpp
+++ b/framework/src/domain/mime/partmodel.cpp
@@ -82,7 +82,7 @@ QHash<int, QByteArray> PartModel::roleNames() const
     QHash<int, QByteArray> roles;
     roles[TypeRole] = "type";
     roles[ContentRole] = "content";
-    roles[IsEmbededRole] = "embeded";
+    roles[IsEmbeddedRole] = "embedded";
     roles[IsEncryptedRole] = "encrypted";
     roles[IsSignedRole] = "signed";
     roles[SecurityLevelRole] = "securityLevel";
@@ -191,7 +191,7 @@ QVariant PartModel::data(const QModelIndex &index, int role) const
                 }
                 return "plain";
             }
-            case IsEmbededRole:
+            case IsEmbeddedRole:
                 return false;
             case IsErrorRole:
                 return messagePart->error();
@@ -290,7 +290,7 @@ int PartModel::rowCount(const QModelIndex &parent) const
     return d->mParts.count();
 }
 
-int PartModel::columnCount(const QModelIndex &parent) const
+int PartModel::columnCount(const QModelIndex &) const
 {
     return 1;
 }
diff --git a/framework/src/domain/mime/partmodel.h b/framework/src/domain/mime/partmodel.h
index 318450a5..3c6378a2 100644
--- a/framework/src/domain/mime/partmodel.h
+++ b/framework/src/domain/mime/partmodel.h
@@ -39,9 +39,8 @@ public:
 public:
     enum Roles {
         TypeRole  = Qt::UserRole + 1,
-        ContentsRole,
         ContentRole,
-        IsEmbededRole,
+        IsEmbeddedRole,
         IsEncryptedRole,
         IsSignedRole,
         IsErrorRole,
-- 
cgit v1.2.3