summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/mailviewer/contents/ui/MailDataModel.qml2
-rw-r--r--framework/qml/MailViewer.qml4
-rw-r--r--framework/src/domain/mime/partmodel.cpp6
-rw-r--r--framework/src/domain/mime/partmodel.h3
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 {
77 case "plain": 77 case "plain":
78 partLoader.setSource("TextContent.qml", 78 partLoader.setSource("TextContent.qml",
79 {"content": model.content, 79 {"content": model.content,
80 "embedded": model.embeded, 80 "embedded": model.embedded,
81 "type": model.type 81 "type": model.type
82 }) 82 })
83 break 83 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 {
437 title: "Type" 437 title: "Type"
438 } 438 }
439 Controls1.TableViewColumn { 439 Controls1.TableViewColumn {
440 role: "embeded" 440 role: "embedded"
441 title: "Embeded" 441 title: "Embedded"
442 } 442 }
443 Controls1.TableViewColumn { 443 Controls1.TableViewColumn {
444 role: "securityLevel" 444 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
82 QHash<int, QByteArray> roles; 82 QHash<int, QByteArray> roles;
83 roles[TypeRole] = "type"; 83 roles[TypeRole] = "type";
84 roles[ContentRole] = "content"; 84 roles[ContentRole] = "content";
85 roles[IsEmbededRole] = "embeded"; 85 roles[IsEmbeddedRole] = "embedded";
86 roles[IsEncryptedRole] = "encrypted"; 86 roles[IsEncryptedRole] = "encrypted";
87 roles[IsSignedRole] = "signed"; 87 roles[IsSignedRole] = "signed";
88 roles[SecurityLevelRole] = "securityLevel"; 88 roles[SecurityLevelRole] = "securityLevel";
@@ -191,7 +191,7 @@ QVariant PartModel::data(const QModelIndex &index, int role) const
191 } 191 }
192 return "plain"; 192 return "plain";
193 } 193 }
194 case IsEmbededRole: 194 case IsEmbeddedRole:
195 return false; 195 return false;
196 case IsErrorRole: 196 case IsErrorRole:
197 return messagePart->error(); 197 return messagePart->error();
@@ -290,7 +290,7 @@ int PartModel::rowCount(const QModelIndex &parent) const
290 return d->mParts.count(); 290 return d->mParts.count();
291} 291}
292 292
293int PartModel::columnCount(const QModelIndex &parent) const 293int PartModel::columnCount(const QModelIndex &) const
294{ 294{
295 return 1; 295 return 1;
296} 296}
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:
39public: 39public:
40 enum Roles { 40 enum Roles {
41 TypeRole = Qt::UserRole + 1, 41 TypeRole = Qt::UserRole + 1,
42 ContentsRole,
43 ContentRole, 42 ContentRole,
44 IsEmbededRole, 43 IsEmbeddedRole,
45 IsEncryptedRole, 44 IsEncryptedRole,
46 IsSignedRole, 45 IsSignedRole,
47 IsErrorRole, 46 IsErrorRole,