Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
PIM Messagelib
Commits
3d594846
Commit
3d594846
authored
Mar 28, 2016
by
Sandro Knauß
🐝
Browse files
Move Namespace to MimeTreeParser
parent
a955dd92
Changes
64
Hide whitespace changes
Inline
Side-by-side
mimetreeparser/autotests/attachmenttest.cpp
View file @
3d594846
...
...
@@ -23,7 +23,7 @@
#include <qtest.h>
using
namespace
M
essageView
er
;
using
namespace
M
imeTreePars
er
;
class
AttachmentTest
:
public
QObject
{
...
...
@@ -38,7 +38,7 @@ QTEST_MAIN(AttachmentTest)
void
AttachmentTest
::
initTestCase
()
{
M
essageView
er
::
Test
::
setupEnv
();
M
imeTreePars
er
::
Test
::
setupEnv
();
}
void
AttachmentTest
::
testEncryptedAttachment_data
()
...
...
mimetreeparser/autotests/converthtmltoplaintexttest.cpp
View file @
3d594846
...
...
@@ -35,20 +35,20 @@ ConvertHtmlToPlainTextTest::~ConvertHtmlToPlainTextTest()
void
ConvertHtmlToPlainTextTest
::
shouldHaveDefaultValue
()
{
M
essageView
er
::
ConvertHtmlToPlainText
convert
;
M
imeTreePars
er
::
ConvertHtmlToPlainText
convert
;
QVERIFY
(
convert
.
htmlString
().
isEmpty
());
}
void
ConvertHtmlToPlainTextTest
::
shouldReturnEmptyStringIfInputTextIsEmpty
()
{
M
essageView
er
::
ConvertHtmlToPlainText
convert
;
M
imeTreePars
er
::
ConvertHtmlToPlainText
convert
;
convert
.
setHtmlString
(
QString
());
QVERIFY
(
convert
.
generatePlainText
().
isEmpty
());
}
void
ConvertHtmlToPlainTextTest
::
shouldReturnNotEmptyStringIfInputTextIsNotEmpty
()
{
M
essageView
er
::
ConvertHtmlToPlainText
convert
;
M
imeTreePars
er
::
ConvertHtmlToPlainText
convert
;
const
QString
str
=
QStringLiteral
(
"foo bla"
);
convert
.
setHtmlString
(
str
);
const
QString
result
=
convert
.
generatePlainText
();
...
...
@@ -72,7 +72,7 @@ void ConvertHtmlToPlainTextTest::shouldConvertToPlainText()
QFETCH
(
QString
,
inputText
);
QFETCH
(
QString
,
convertedText
);
M
essageView
er
::
ConvertHtmlToPlainText
convert
;
M
imeTreePars
er
::
ConvertHtmlToPlainText
convert
;
convert
.
setHtmlString
(
inputText
);
const
QString
result
=
convert
.
generatePlainText
();
QVERIFY
(
!
result
.
isEmpty
());
...
...
mimetreeparser/autotests/cryptohelpertest.cpp
View file @
3d594846
...
...
@@ -22,7 +22,7 @@
#include <QTest>
using
namespace
M
essageView
er
;
using
namespace
M
imeTreePars
er
;
void
CryptoHelperTest
::
testPMFDEmpty
()
{
...
...
mimetreeparser/autotests/cryptohelpertest.h
View file @
3d594846
...
...
@@ -21,7 +21,7 @@
#include <QObject>
namespace
M
essageView
er
namespace
M
imeTreePars
er
{
class
CryptoHelperTest
:
public
QObject
...
...
mimetreeparser/autotests/csshelpertest.cpp
View file @
3d594846
...
...
@@ -22,7 +22,7 @@
#include <QTest>
using
namespace
M
essageView
er
;
using
namespace
M
imeTreePars
er
;
QTEST_MAIN
(
CSSHelperTest
)
...
...
mimetreeparser/autotests/nodehelpertest.cpp
View file @
3d594846
...
...
@@ -22,7 +22,7 @@
#include <qtest.h>
using
namespace
M
essageView
er
;
using
namespace
M
imeTreePars
er
;
NodeHelperTest
::
NodeHelperTest
()
:
QObject
()
...
...
mimetreeparser/autotests/nodehelpertest.h
View file @
3d594846
...
...
@@ -23,7 +23,7 @@
#include <KMime/Message>
namespace
M
essageView
er
namespace
M
imeTreePars
er
{
class
NodeHelperTest
:
public
QObject
...
...
mimetreeparser/autotests/objecttreeparsertest.cpp
View file @
3d594846
...
...
@@ -27,13 +27,13 @@
#include <setupenv.h>
using
namespace
M
essageView
er
;
using
namespace
M
imeTreePars
er
;
QTEST_MAIN
(
ObjectTreeParserTester
)
void
ObjectTreeParserTester
::
initTestCase
()
{
M
essageView
er
::
Test
::
setupEnv
();
M
imeTreePars
er
::
Test
::
setupEnv
();
}
void
ObjectTreeParserTester
::
test_parsePlainMessage
()
...
...
@@ -94,7 +94,7 @@ void ObjectTreeParserTester::test_parseEncapsulatedMessage()
TestHtmlWriter
testWriter
;
TestCSSHelper
testCSSHelper
;
NodeHelper
nodeHelper
;
M
essageView
er
::
Test
::
TestObjectTreeSource
emptySource
(
&
testWriter
,
&
testCSSHelper
);
M
imeTreePars
er
::
Test
::
TestObjectTreeSource
emptySource
(
&
testWriter
,
&
testCSSHelper
);
ObjectTreeParser
otp
(
&
emptySource
,
&
nodeHelper
);
otp
.
parseObjectTree
(
msg
.
data
());
...
...
@@ -129,7 +129,7 @@ void ObjectTreeParserTester::test_missingContentTypeHeader()
TestHtmlWriter
testWriter
;
TestCSSHelper
testCSSHelper
;
NodeHelper
nodeHelper
;
M
essageView
er
::
Test
::
TestObjectTreeSource
emptySource
(
&
testWriter
,
&
testCSSHelper
);
M
imeTreePars
er
::
Test
::
TestObjectTreeSource
emptySource
(
&
testWriter
,
&
testCSSHelper
);
ObjectTreeParser
otp
(
&
emptySource
,
&
nodeHelper
);
otp
.
parseObjectTree
(
msg
.
data
());
...
...
@@ -147,7 +147,7 @@ void ObjectTreeParserTester::test_inlinePGPDecryption()
TestHtmlWriter
testWriter
;
TestCSSHelper
testCSSHelper
;
NodeHelper
nodeHelper
;
M
essageView
er
::
Test
::
TestObjectTreeSource
emptySource
(
&
testWriter
,
&
testCSSHelper
);
M
imeTreePars
er
::
Test
::
TestObjectTreeSource
emptySource
(
&
testWriter
,
&
testCSSHelper
);
ObjectTreeParser
otp
(
&
emptySource
,
&
nodeHelper
);
emptySource
.
setAllowDecryption
(
true
);
...
...
@@ -172,7 +172,7 @@ void ObjectTreeParserTester::test_inlinePGPSigned()
TestHtmlWriter
testWriter
;
TestCSSHelper
testCSSHelper
;
NodeHelper
nodeHelper
;
M
essageView
er
::
Test
::
TestObjectTreeSource
emptySource
(
&
testWriter
,
&
testCSSHelper
);
M
imeTreePars
er
::
Test
::
TestObjectTreeSource
emptySource
(
&
testWriter
,
&
testCSSHelper
);
ObjectTreeParser
otp
(
&
emptySource
,
&
nodeHelper
);
emptySource
.
setAllowDecryption
(
true
);
...
...
@@ -208,7 +208,7 @@ void ObjectTreeParserTester::test_HTMLasText()
TestHtmlWriter
testWriter
;
TestCSSHelper
testCSSHelper
;
M
essageView
er
::
Test
::
TestObjectTreeSource
emptySource
(
&
testWriter
,
&
testCSSHelper
);
M
imeTreePars
er
::
Test
::
TestObjectTreeSource
emptySource
(
&
testWriter
,
&
testCSSHelper
);
ObjectTreeParser
otp
(
&
emptySource
);
emptySource
.
setHtmlMail
(
false
);
otp
.
parseObjectTree
(
msg
.
data
());
...
...
@@ -244,7 +244,7 @@ void ObjectTreeParserTester::test_HTMLOnlyText()
TestHtmlWriter
testWriter
;
TestCSSHelper
testCSSHelper
;
M
essageView
er
::
Test
::
TestObjectTreeSource
emptySource
(
&
testWriter
,
&
testCSSHelper
);
M
imeTreePars
er
::
Test
::
TestObjectTreeSource
emptySource
(
&
testWriter
,
&
testCSSHelper
);
ObjectTreeParser
otp
(
&
emptySource
);
emptySource
.
setHtmlMail
(
false
);
...
...
@@ -266,7 +266,7 @@ void ObjectTreeParserTester::test_HTMLExternal()
{
TestHtmlWriter
testWriter
;
TestCSSHelper
testCSSHelper
;
M
essageView
er
::
Test
::
TestObjectTreeSource
emptySource
(
&
testWriter
,
&
testCSSHelper
);
M
imeTreePars
er
::
Test
::
TestObjectTreeSource
emptySource
(
&
testWriter
,
&
testCSSHelper
);
ObjectTreeParser
otp
(
&
emptySource
);
otp
.
parseObjectTree
(
msg
.
data
());
...
...
@@ -279,7 +279,7 @@ void ObjectTreeParserTester::test_HTMLExternal()
{
TestHtmlWriter
testWriter
;
TestCSSHelper
testCSSHelper
;
M
essageView
er
::
Test
::
TestObjectTreeSource
emptySource
(
&
testWriter
,
&
testCSSHelper
);
M
imeTreePars
er
::
Test
::
TestObjectTreeSource
emptySource
(
&
testWriter
,
&
testCSSHelper
);
ObjectTreeParser
otp
(
&
emptySource
);
emptySource
.
setHtmlLoadExternal
(
true
);
...
...
@@ -309,7 +309,7 @@ void ObjectTreeParserTester::text_quoteHtml()
QFETCH
(
QString
,
result
);
TestHtmlWriter
testWriter
;
TestCSSHelper
testCSSHelper
;
M
essageView
er
::
Test
::
TestObjectTreeSource
emptySource
(
&
testWriter
,
&
testCSSHelper
);
M
imeTreePars
er
::
Test
::
TestObjectTreeSource
emptySource
(
&
testWriter
,
&
testCSSHelper
);
ObjectTreeParser
otp
(
&
emptySource
);
QCOMPARE
(
otp
.
quotedHTML
(
data
,
false
),
result
);
}
mimetreeparser/autotests/rendertest.cpp
View file @
3d594846
...
...
@@ -31,11 +31,11 @@
#include <QProcess>
#include <QTest>
using
namespace
M
essageView
er
;
using
namespace
M
imeTreePars
er
;
void
RenderTest
::
initTestCase
()
{
M
essageView
er
::
Test
::
setupEnv
();
M
imeTreePars
er
::
Test
::
setupEnv
();
}
void
RenderTest
::
testRenderSmart_data
()
...
...
@@ -174,9 +174,9 @@ void RenderTest::testRender()
// render the mail
FileHtmlWriter
fileWriter
(
outFileName
);
QImage
paintDevice
;
M
essageView
er
::
TestCSSHelper
cssHelper
(
&
paintDevice
);
M
imeTreePars
er
::
TestCSSHelper
cssHelper
(
&
paintDevice
);
NodeHelper
nodeHelper
;
M
essageView
er
::
Test
::
TestObjectTreeSource
testSource
(
&
fileWriter
,
&
cssHelper
);
M
imeTreePars
er
::
Test
::
TestObjectTreeSource
testSource
(
&
fileWriter
,
&
cssHelper
);
testSource
.
setAllowDecryption
(
true
);
testSource
.
setAttachmentStrategy
(
attachmentStrategy
);
ObjectTreeParser
otp
(
&
testSource
,
&
nodeHelper
);
...
...
mimetreeparser/autotests/setupenv.cpp
View file @
3d594846
...
...
@@ -25,7 +25,7 @@
#include <QFile>
#include <QDir>
void
M
essageView
er
::
Test
::
setupEnv
()
void
M
imeTreePars
er
::
Test
::
setupEnv
()
{
setenv
(
"LC_ALL"
,
"C"
,
1
);
setenv
(
"KDEHOME"
,
QFile
::
encodeName
(
QDir
::
homePath
()
+
QString
::
fromLatin1
(
"/.qttest"
)),
1
);
...
...
mimetreeparser/autotests/setupenv.h
View file @
3d594846
...
...
@@ -26,7 +26,7 @@
#include <viewer/attachmentstrategy.h>
#include "viewer/bodypartformatterbasefactory.h"
namespace
M
essageView
er
namespace
M
imeTreePars
er
{
namespace
Test
...
...
@@ -41,11 +41,11 @@ void setupEnv();
// We can't use EmptySource, since we need to control some emelnets of the source for tests to also test
// loadExternal and htmlMail.
class
TestObjectTreeSource
:
public
M
essageView
er
::
ObjectTreeSourceIf
class
TestObjectTreeSource
:
public
M
imeTreePars
er
::
ObjectTreeSourceIf
{
public:
TestObjectTreeSource
(
M
essageView
er
::
HtmlWriter
*
writer
,
M
essageView
er
::
CSSHelperBase
*
cssHelper
)
TestObjectTreeSource
(
M
imeTreePars
er
::
HtmlWriter
*
writer
,
M
imeTreePars
er
::
CSSHelperBase
*
cssHelper
)
:
mWriter
(
writer
)
,
mCSSHelper
(
cssHelper
)
,
mAttachmentStrategy
(
QStringLiteral
(
"smart"
))
...
...
@@ -55,10 +55,10 @@ public:
{
}
M
essageView
er
::
HtmlWriter
*
htmlWriter
()
Q_DECL_OVERRIDE
{
M
imeTreePars
er
::
HtmlWriter
*
htmlWriter
()
Q_DECL_OVERRIDE
{
return
mWriter
;
}
M
essageView
er
::
CSSHelperBase
*
cssHelper
()
Q_DECL_OVERRIDE
{
M
imeTreePars
er
::
CSSHelperBase
*
cssHelper
()
Q_DECL_OVERRIDE
{
return
mCSSHelper
;
}
...
...
@@ -126,7 +126,7 @@ public:
return
false
;
}
void
setHtmlMode
(
M
essageView
er
::
Util
::
HtmlMode
mode
)
Q_DECL_OVERRIDE
void
setHtmlMode
(
M
imeTreePars
er
::
Util
::
HtmlMode
mode
)
Q_DECL_OVERRIDE
{
Q_UNUSED
(
mode
);
}
...
...
@@ -153,8 +153,8 @@ public:
}
private:
M
essageView
er
::
HtmlWriter
*
mWriter
;
M
essageView
er
::
CSSHelperBase
*
mCSSHelper
;
M
imeTreePars
er
::
HtmlWriter
*
mWriter
;
M
imeTreePars
er
::
CSSHelperBase
*
mCSSHelper
;
QString
mAttachmentStrategy
;
BodyPartFormatterBaseFactory
mBodyPartFormatterBaseFactory
;
bool
mHtmlLoadExternal
;
...
...
mimetreeparser/autotests/testcsshelper.cpp
View file @
3d594846
...
...
@@ -36,7 +36,7 @@
#include <QPalette>
#include <QApplication>
namespace
M
essageView
er
namespace
M
imeTreePars
er
{
TestCSSHelper
::
TestCSSHelper
(
const
QPaintDevice
*
pd
)
:
...
...
mimetreeparser/autotests/testcsshelper.h
View file @
3d594846
...
...
@@ -34,7 +34,7 @@
#include "viewer/csshelperbase.h"
namespace
M
essageView
er
namespace
M
imeTreePars
er
{
class
TestCSSHelper
:
public
CSSHelperBase
...
...
mimetreeparser/autotests/unencryptedmessagetest.cpp
View file @
3d594846
...
...
@@ -23,7 +23,7 @@
#include <qtest.h>
using
namespace
M
essageView
er
;
using
namespace
M
imeTreePars
er
;
class
UnencryptedMessageTest
:
public
QObject
{
...
...
mimetreeparser/autotests/util.h
View file @
3d594846
...
...
@@ -21,7 +21,7 @@
#include <KMime/Message>
class
TestHtmlWriter
:
public
M
essageView
er
::
HtmlWriter
class
TestHtmlWriter
:
public
M
imeTreePars
er
::
HtmlWriter
{
public:
explicit
TestHtmlWriter
()
{}
...
...
@@ -42,10 +42,10 @@ public:
QString
html
;
};
class
TestCSSHelper
:
public
M
essageView
er
::
CSSHelperBase
class
TestCSSHelper
:
public
M
imeTreePars
er
::
CSSHelperBase
{
public:
TestCSSHelper
()
:
M
essageView
er
::
CSSHelperBase
(
0
)
TestCSSHelper
()
:
M
imeTreePars
er
::
CSSHelperBase
(
0
)
{
for
(
int
i
=
0
;
i
<
3
;
++
i
)
{
mQuoteColor
[
i
]
=
QColor
(
0x00
,
0x80
-
i
*
0x10
,
0x00
);
...
...
mimetreeparser/src/bodyformatter/mailman.cpp
View file @
3d594846
...
...
@@ -28,7 +28,7 @@
#include "mimetreeparser_debug.h"
using
namespace
M
essageView
er
;
using
namespace
M
imeTreePars
er
;
const
MailmanBodyPartFormatter
*
MailmanBodyPartFormatter
::
self
;
...
...
mimetreeparser/src/bodyformatter/mailman.h
View file @
3d594846
...
...
@@ -23,7 +23,7 @@
#include "interfaces/bodypartformatter.h"
#include "interfaces/bodypart.h"
namespace
M
essageView
er
namespace
M
imeTreePars
er
{
class
MailmanBodyPartFormatter
:
public
Interface
::
BodyPartFormatter
...
...
@@ -41,4 +41,4 @@ private:
}
#endif
\ No newline at end of file
#endif
mimetreeparser/src/bodyformatter/utils.cpp
View file @
3d594846
...
...
@@ -21,9 +21,9 @@
#include <MessageCore/NodeHelper>
using
namespace
M
essageView
er
;
using
namespace
M
imeTreePars
er
;
MimeMessagePart
::
Ptr
M
essageView
er
::
createAndParseTempNode
(
Interface
::
BodyPart
&
part
,
KMime
::
Content
*
parentNode
,
const
char
*
content
,
const
char
*
cntDesc
)
MimeMessagePart
::
Ptr
M
imeTreePars
er
::
createAndParseTempNode
(
Interface
::
BodyPart
&
part
,
KMime
::
Content
*
parentNode
,
const
char
*
content
,
const
char
*
cntDesc
)
{
KMime
::
Content
*
newNode
=
new
KMime
::
Content
();
newNode
->
setContent
(
KMime
::
CRLFtoLF
(
content
));
...
...
@@ -37,7 +37,7 @@ MimeMessagePart::Ptr MessageViewer::createAndParseTempNode(Interface::BodyPart &
return
MimeMessagePart
::
Ptr
(
new
MimeMessagePart
(
part
.
objectTreeParser
(),
newNode
,
false
));
}
KMime
::
Content
*
M
essageView
er
::
findType
(
KMime
::
Content
*
content
,
const
QByteArray
&
mimeType
,
bool
deep
,
bool
wide
)
KMime
::
Content
*
M
imeTreePars
er
::
findType
(
KMime
::
Content
*
content
,
const
QByteArray
&
mimeType
,
bool
deep
,
bool
wide
)
{
if
((
!
content
->
contentType
()
->
isEmpty
())
&&
(
mimeType
.
isEmpty
()
||
(
mimeType
==
content
->
contentType
()
->
mimeType
())))
{
...
...
mimetreeparser/src/bodyformatter/utils.h
View file @
3d594846
...
...
@@ -25,7 +25,7 @@
#include <KMime/Content>
namespace
M
essageView
er
namespace
M
imeTreePars
er
{
/**
1. Create a new partNode using 'content' data and Content-Description
...
...
@@ -38,4 +38,4 @@ MimeMessagePart::Ptr createAndParseTempNode(Interface::BodyPart &part, KMime::Co
KMime
::
Content
*
findType
(
KMime
::
Content
*
content
,
const
QByteArray
&
mimeType
,
bool
deep
,
bool
wide
);
}
#endif
\ No newline at end of file
#endif
mimetreeparser/src/htmlwriter/filehtmlwriter.cpp
View file @
3d594846
...
...
@@ -33,7 +33,7 @@
#include "mimetreeparser_debug.h"
namespace
M
essageView
er
namespace
M
imeTreePars
er
{
FileHtmlWriter
::
FileHtmlWriter
(
const
QString
&
filename
)
...
...
Prev
1
2
3
4
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment