summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-10-24 10:39:18 +0200
committerMontel Laurent <[email protected]>2015-10-24 10:39:18 +0200
commitc9f0b609bf832120c9c5101ee7171380127adbea (patch)
treee9451a13a8b0b815d88130228cf6fc0c5763a7ff
parent827d371a10c3752c74ccb82f067aed048fb362a9 (diff)
Astyle kdelibs
-rw-r--r--messageviewer/src/viewer/bodypartformatter.cpp5
-rw-r--r--messageviewer/src/viewer/editorwatcher.cpp2
-rw-r--r--messageviewer/src/viewer/messagepart.cpp20
-rw-r--r--messageviewer/src/viewer/messagepart.h6
-rw-r--r--messageviewer/src/viewer/objecttreeparser.cpp5
-rw-r--r--messageviewer/src/viewer/viewer_p.cpp2
-rw-r--r--pimsettingexporter/core/addressbook/exportaddressbookjob.cpp1
-rw-r--r--pimsettingexporter/core/exportresourcearchivejob.h1
-rw-r--r--pimsettingexporter/core/pimsettingbackupthread.cpp1
-rw-r--r--pimsettingexporter/core/pimsettingsbackuprestore.cpp2
-rw-r--r--pimsettingexporter/gui/widgets/selectiontypetreewidget.cpp4
11 files changed, 20 insertions, 29 deletions
diff --git a/messageviewer/src/viewer/bodypartformatter.cpp b/messageviewer/src/viewer/bodypartformatter.cpp
index fdf9b35..c39ac68 100644
--- a/messageviewer/src/viewer/bodypartformatter.cpp
+++ b/messageviewer/src/viewer/bodypartformatter.cpp
@@ -116,7 +116,8 @@ public:
const MessageRfc822BodyPartFormatter *MessageRfc822BodyPartFormatter::self;
-const MessageViewer::Interface::BodyPartFormatter *MessageRfc822BodyPartFormatter::create() {
+const MessageViewer::Interface::BodyPartFormatter *MessageRfc822BodyPartFormatter::create()
+{
if (!self) {
self = new MessageRfc822BodyPartFormatter();
}
@@ -134,7 +135,7 @@ MessageViewer::Interface::BodyPartFormatter::Result MessageRfc822BodyPartFormatt
Q_UNUSED(writer)
const ObjectTreeParser *otp = part->objectTreeParser();
const MessagePart::Ptr mp = process(part);
- if (mp && !otp->attachmentStrategy()->inlineNestedMessages() && !otp->showOnlyOneMimePart()) {
+ if (mp && !otp->attachmentStrategy()->inlineNestedMessages() && !otp->showOnlyOneMimePart()) {
return Failed;
} else {
mp->html(true);
diff --git a/messageviewer/src/viewer/editorwatcher.cpp b/messageviewer/src/viewer/editorwatcher.cpp
index a574819..0ec4207 100644
--- a/messageviewer/src/viewer/editorwatcher.cpp
+++ b/messageviewer/src/viewer/editorwatcher.cpp
@@ -78,7 +78,7 @@ EditorWatcher::ErrorEditorWatcher EditorWatcher::start()
KService::Ptr offer = KMimeTypeTrader::self()->preferredService(mMimeType, QStringLiteral("Application"));
if ((mOpenWithOption == OpenWithDialog) || !offer) {
QScopedPointer<KOpenWithDialog> dlg(new KOpenWithDialog(list, i18n("Edit with:"),
- QString(), mParentWidget));
+ QString(), mParentWidget));
const int dlgrc = dlg->exec();
if (dlgrc && dlg) {
offer = dlg->service();
diff --git a/messageviewer/src/viewer/messagepart.cpp b/messageviewer/src/viewer/messagepart.cpp
index c455488..ed0cf71 100644
--- a/messageviewer/src/viewer/messagepart.cpp
+++ b/messageviewer/src/viewer/messagepart.cpp
@@ -123,7 +123,6 @@ MessagePart::~MessagePart()
}
}
-
PartMetaData *MessagePart::partMetaData()
{
return &mMetaData;
@@ -151,7 +150,7 @@ void MessagePart::html(bool decorate)
writer->queue(mOtp->quotedHTML(text(), decorate));
}
-void MessagePart::parseInternal(KMime::Content* node, bool onlyOneMimePart)
+void MessagePart::parseInternal(KMime::Content *node, bool onlyOneMimePart)
{
mSubOtp = new ObjectTreeParser(mOtp, onlyOneMimePart);
mSubOtp->setAllowAsync(mOtp->allowAsync());
@@ -183,13 +182,12 @@ QString MessagePart::renderInternalText() const
return mSubOtp->plainTextContent();
}
-
//-----MimeMessageBlock----------------------
-MimeMessagePart::MimeMessagePart(ObjectTreeParser* otp, KMime::Content* node, bool onlyOneMimePart)
-: MessagePart(otp, QString())
-, mNode(node)
-, mOnlyOneMimePart(onlyOneMimePart)
+MimeMessagePart::MimeMessagePart(ObjectTreeParser *otp, KMime::Content *node, bool onlyOneMimePart)
+ : MessagePart(otp, QString())
+ , mNode(node)
+ , mOnlyOneMimePart(onlyOneMimePart)
{
if (!mNode) {
qCWarning(MESSAGEVIEWER_LOG) << "not a valid node";
@@ -397,8 +395,6 @@ void CryptoMessagePart::html(bool decorate)
//TODO: still the following part should not be here
copyContentFrom();
-
-
if (!writer) {
return;
}
@@ -437,9 +433,9 @@ void CryptoMessagePart::html(bool decorate)
}
EncapsulatedRfc822MessagePart::EncapsulatedRfc822MessagePart(ObjectTreeParser *otp, KMime::Content *node, const KMime::Message::Ptr &message)
-: MessagePart(otp, QString())
-, mMessage(message)
-, mNode(node)
+ : MessagePart(otp, QString())
+ , mMessage(message)
+ , mNode(node)
{
mMetaData.isEncrypted = false;
mMetaData.isSigned = false;
diff --git a/messageviewer/src/viewer/messagepart.h b/messageviewer/src/viewer/messagepart.h
index f81ef68..bf5a6c4 100644
--- a/messageviewer/src/viewer/messagepart.h
+++ b/messageviewer/src/viewer/messagepart.h
@@ -108,7 +108,7 @@ public:
PartMetaData *partMetaData();
protected:
- void parseInternal(KMime::Content* node, bool onlyOneMimePart);
+ void parseInternal(KMime::Content *node, bool onlyOneMimePart);
void renderInternalHtml() const;
void copyContentFrom() const;
QString renderInternalText() const;
@@ -122,14 +122,14 @@ class MimeMessagePart : public MessagePart
{
public:
typedef QSharedPointer<MimeMessagePart> Ptr;
- MimeMessagePart( MessageViewer::ObjectTreeParser* otp, KMime::Content* node, bool onlyOneMimePart );
+ MimeMessagePart(MessageViewer::ObjectTreeParser *otp, KMime::Content *node, bool onlyOneMimePart);
virtual ~MimeMessagePart();
QString text() const Q_DECL_OVERRIDE;
void html(bool decorate) Q_DECL_OVERRIDE;
private:
- KMime::Content* mNode;
+ KMime::Content *mNode;
bool mOnlyOneMimePart;
};
diff --git a/messageviewer/src/viewer/objecttreeparser.cpp b/messageviewer/src/viewer/objecttreeparser.cpp
index 02b516f..31e3d3c 100644
--- a/messageviewer/src/viewer/objecttreeparser.cpp
+++ b/messageviewer/src/viewer/objecttreeparser.cpp
@@ -1207,8 +1207,8 @@ MessagePart::Ptr ObjectTreeParser::processMultiPartSignedSubtype(KMime::Content
const QTextCodec *aCodec(codecFor(signedData));
CryptoMessagePart::Ptr mp(new CryptoMessagePart(this,
- aCodec->toUnicode(cleartext), cryptoProtocol(),
- NodeHelper::fromAsString(node), signature));
+ aCodec->toUnicode(cleartext), cryptoProtocol(),
+ NodeHelper::fromAsString(node), signature));
PartMetaData *messagePart(mp->partMetaData());
messagePart->isSigned = true;
@@ -1272,7 +1272,6 @@ bool ObjectTreeParser::processMultiPartEncryptedSubtype(KMime::Content *node, Pr
mNodeHelper->setEncryptionState(node, KMMsgFullyEncrypted);
-
CryptoMessagePart mp(this,
data->decodedText(), Kleo::CryptoBackendFactory::instance()->openpgp(),
NodeHelper::fromAsString(data), node);
diff --git a/messageviewer/src/viewer/viewer_p.cpp b/messageviewer/src/viewer/viewer_p.cpp
index eab8d60..c2047bb 100644
--- a/messageviewer/src/viewer/viewer_p.cpp
+++ b/messageviewer/src/viewer/viewer_p.cpp
@@ -111,8 +111,6 @@
#include <AkonadiCore/attributefactory.h>
#include <Akonadi/KMime/MessageParts>
-
-
//own includes
#include "widgets/attachmentdialog.h"
#include "viewer/attachmentstrategy.h"
diff --git a/pimsettingexporter/core/addressbook/exportaddressbookjob.cpp b/pimsettingexporter/core/addressbook/exportaddressbookjob.cpp
index 8a126f7..1426236 100644
--- a/pimsettingexporter/core/addressbook/exportaddressbookjob.cpp
+++ b/pimsettingexporter/core/addressbook/exportaddressbookjob.cpp
@@ -125,7 +125,6 @@ void ExportAddressbookJob::slotWriteNextArchiveResource()
}
}
-
void ExportAddressbookJob::backupConfig()
{
showInfo(i18n("Backing up config..."));
diff --git a/pimsettingexporter/core/exportresourcearchivejob.h b/pimsettingexporter/core/exportresourcearchivejob.h
index 75876b9..dbe8181 100644
--- a/pimsettingexporter/core/exportresourcearchivejob.h
+++ b/pimsettingexporter/core/exportresourcearchivejob.h
@@ -15,7 +15,6 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#ifndef EXPORTADDRESSBOOKRESOURCEJOB_H
#define EXPORTADDRESSBOOKRESOURCEJOB_H
diff --git a/pimsettingexporter/core/pimsettingbackupthread.cpp b/pimsettingexporter/core/pimsettingbackupthread.cpp
index 87a67aa..ec719e5 100644
--- a/pimsettingexporter/core/pimsettingbackupthread.cpp
+++ b/pimsettingexporter/core/pimsettingbackupthread.cpp
@@ -15,7 +15,6 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#include "pimsettingbackupthread.h"
#include <KZip>
diff --git a/pimsettingexporter/core/pimsettingsbackuprestore.cpp b/pimsettingexporter/core/pimsettingsbackuprestore.cpp
index 72994df..57c9934 100644
--- a/pimsettingexporter/core/pimsettingsbackuprestore.cpp
+++ b/pimsettingexporter/core/pimsettingsbackuprestore.cpp
@@ -106,7 +106,7 @@ void PimSettingsBackupRestore::nextStep()
{
mStoreIterator++;
Q_EMIT addEndLine();
- switch(mAction) {
+ switch (mAction) {
case Backup:
backupNextStep();
break;
diff --git a/pimsettingexporter/gui/widgets/selectiontypetreewidget.cpp b/pimsettingexporter/gui/widgets/selectiontypetreewidget.cpp
index b3c05ff..7c63430 100644
--- a/pimsettingexporter/gui/widgets/selectiontypetreewidget.cpp
+++ b/pimsettingexporter/gui/widgets/selectiontypetreewidget.cpp
@@ -301,9 +301,9 @@ void SelectionTypeTreeWidget::saveAsDefaultTemplate()
QString ret = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + QStringLiteral("pimsettingexporter/");
QFileInfo fileInfo(ret);
QDir().mkpath(fileInfo.absolutePath());
- qDebug()<<" ret :"<<ret;
+ qDebug() << " ret :" << ret;
- PimCommon::Util::saveToFile(ret + QStringLiteral("defaulttemplate.xml"),templateStr);
+ PimCommon::Util::saveToFile(ret + QStringLiteral("defaulttemplate.xml"), templateStr);
}
void SelectionTypeTreeWidget::saveAsTemplate()