Commit 0b4d9424 authored by Yuri Chornoivan's avatar Yuri Chornoivan
Browse files

Fix minor EBN issues

parent 2417f2a7
......@@ -33,7 +33,6 @@
#include <QPushButton>
#include <QFormLayout>
#include <QLineEdit>
#include <KDateComboBox>
using namespace MessageComposer;
class MessageComposer::FollowUpReminderSelectDateDialogPrivate
{
......
......@@ -42,7 +42,6 @@
#include "messagecomposer_debug.h"
#include <KCharsets>
#include <QTextCodec>
#include <KCharsets>
using namespace MessageComposer;
......
......@@ -39,7 +39,6 @@
#include <QVBoxLayout>
#include <KSharedConfig>
#include <QDialogButtonBox>
#include <KConfigGroup>
using namespace MessageComposer;
......
......@@ -18,8 +18,8 @@
02110-1301, USA.
*/
#ifndef MIMETREEPARSER_TESTS_OBJECTTREEPARSERTEST_H
#define MIMETREEPARSER_TESTS_OBJECTTREEPARSERTEST_H
#ifndef MIMETREEPARSER_TESTS_BASICOBJECTTREEPARSERTEST_H
#define MIMETREEPARSER_TESTS_BASICOBJECTTREEPARSERTEST_H
#include <QObject>
......@@ -53,4 +53,4 @@ private Q_SLOTS:
void testHTMLOnly();
};
#endif // MIMETREEPARSER_TESTS_OBJECTTREEPARSERTEST_H
#endif // MIMETREEPARSER_TESTS_BASICOBJECTTREEPARSERTEST_H
......@@ -39,7 +39,6 @@
#include <string>
#include <sstream>
#include <algorithm>
#include <KCharsets>
#include <QMimeDatabase>
#include <QMimeType>
#include <QFileDevice>
......@@ -785,7 +784,7 @@ KMime::Content *NodeHelper::fromHREF(const KMime::Message::Ptr &mMessage, const
QString NodeHelper::fixEncoding(const QString &encoding)
{
QString returnEncoding = encoding;
// According to http://www.iana.org/assignments/character-sets, uppercase is
// According to https://www.iana.org/assignments/character-sets, uppercase is
// preferred in MIME headers
const QString returnEncodingToUpper = returnEncoding.toUpper();
if (returnEncodingToUpper.contains(QLatin1String("ISO "))) {
......
......@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef TEMPLATEEXTRACTHTMLELEMENTWEBENGINEVIEWTEST_H
#define TEMPLATEEXTRACTHTMLELEMENTWEBENGINEVIEWTEST_H
#ifndef TEMPLATEEXTRACTHTMLELEMENTFROMMAILTEST_H
#define TEMPLATEEXTRACTHTMLELEMENTFROMMAILTEST_H
#include <QObject>
......@@ -34,4 +34,4 @@ private Q_SLOTS:
void shouldExtractHtml();
};
#endif // TEMPLATEEXTRACTHTMLELEMENTWEBENGINEVIEWTEST_H
#endif // TEMPLATEEXTRACTHTMLELEMENTFROMMAILTEST_H
......@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef TEMPLATEWEBENGINEVIEWTEST_H
#define TEMPLATEWEBENGINEVIEWTEST_H
#ifndef TEMPLATEEXTRACTTEXTFROMMAILTEST_H
#define TEMPLATEEXTRACTTEXTFROMMAILTEST_H
#include <QObject>
......@@ -33,4 +33,4 @@ private Q_SLOTS:
void shouldExtractHtml();
};
#endif // TEMPLATEWEBENGINEVIEWTEST_H
#endif // TEMPLATEEXTRACTTEXTFROMMAILTEST_H
......@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef TEMPLATEEXTRACTHTMLELEMENTWEBENGINEVIEW_H
#define TEMPLATEEXTRACTHTMLELEMENTWEBENGINEVIEW_H
#ifndef TEMPLATEEXTRACTHTMLELEMENTFROMMAIL_H
#define TEMPLATEEXTRACTHTMLELEMENTFROMMAIL_H
#include "templateparser_private_export.h"
#include <QObject>
......@@ -55,4 +55,4 @@ private:
TemplateWebEnginePage *mPage = nullptr;
};
}
#endif // TEMPLATEEXTRACTHTMLELEMENTWEBENGINEVIEW_H
#endif // TEMPLATEEXTRACTHTMLELEMENTFROMMAIL_H
......@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef TEMPLATEWEBENGINEVIEW_H
#define TEMPLATEWEBENGINEVIEW_H
#ifndef TEMPLATEEXTRACTTEXTFROMMAIL_H
#define TEMPLATEEXTRACTTEXTFROMMAIL_H
#include "templateparser_export.h"
#include <QObject>
......@@ -50,4 +50,4 @@ private:
TemplateWebEnginePage *mPage = nullptr;
};
}
#endif // TEMPLATEWEBENGINEVIEW_H
#endif // TEMPLATEEXTRACTTEXTFROMMAIL_H
......@@ -693,7 +693,7 @@ void TemplateParserJob::slotExtractInfoDone(const TemplateParserExtractHtmlInfoR
// something wrong
i += strlen("HEADER( ");
} else {
i += match.capturedLength(0); //lenght of HEADER(<space> + <space>)
i += match.capturedLength(0); //length of HEADER(<space> + <space>)
const QString hdr = match.captured(1).trimmed();
QString str;
if (auto hrdMsgOrigin = d->mOrigMsg->headerByType(hdr.toLocal8Bit().constData())) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment