summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-21 20:48:10 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-21 20:48:10 (GMT)
commit9b8ccc61861492b6ce2181ca6cfdab0482189274 (patch)
treeee425c20746c528c20029f4dda5b0980a603dc82
parent1570e8fa4d23e4388f8fe5b3ad9c5544652b3eca (diff)
Astyle kdelibs
-rw-r--r--examples/apps/etm_usage/entitytreemodelfactory.h2
-rw-r--r--plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp2
2 files changed, 1 insertions, 3 deletions
diff --git a/examples/apps/etm_usage/entitytreemodelfactory.h b/examples/apps/etm_usage/entitytreemodelfactory.h
index 970dd1d..4f5b65e 100644
--- a/examples/apps/etm_usage/entitytreemodelfactory.h
+++ b/examples/apps/etm_usage/entitytreemodelfactory.h
@@ -38,7 +38,7 @@ Q_SIGNALS:
void modelCreated(Akonadi::EntityTreeModel *model);
protected:
- virtual Akonadi::EntityTreeModel* getModel(Akonadi::Monitor *monitor, QObject* parent);
+ virtual Akonadi::EntityTreeModel *getModel(Akonadi::Monitor *monitor, QObject *parent);
private Q_SLOTS:
void collectionsFetched(const Akonadi::Collection::List &list);
diff --git a/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp b/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp
index 63c6a80..dfc1883 100644
--- a/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp
+++ b/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp
@@ -227,11 +227,9 @@ QString FancyHeaderStyle::format(KMime::Message *message) const
headerStr.append(QLatin1String("<tr><td colspan=\"2\"><div id=\"attachmentInjectionPoint\"></div></td></tr>"));
-
headerStr.append(
QStringLiteral("</table></td><td align=\"center\">%1</td></tr></table>\n").arg(userHTML));
-
headerStr += QLatin1String("</div>\n\n");
return headerStr;
}