Commit f0f03684 authored by Sandro Knauß's avatar Sandro Knauß

Mimetreeparser has nothing todo with viewer.

The subdir viewer is misleading and not usefull anymore and a leftover
of the mimetreeparser split. Let's clean this up.
parent 215cde9f
......@@ -103,13 +103,10 @@
//own includes
#include "widgets/attachmentdialog.h"
#include "viewer/attachmentstrategy.h"
#include "csshelper.h"
#include "settings/messageviewersettings.h"
#include "widgets/htmlstatusbar.h"
#include "viewer/mimeparttree/mimetreemodel.h"
#include <MimeTreeParser/NodeHelper>
#include <MimeTreeParser/ObjectTreeParser>
#include "viewer/urlhandlermanager.h"
#include "messageviewer/messageviewerutil.h"
#include "utils/messageviewerutil_p.h"
......@@ -124,13 +121,17 @@
#include "widgets/submittedformwarningwidget.h"
#include <WebEngineViewer/LocalDataBaseManager>
#include <MimeTreeParser/AttachmentStrategy>
#include <MimeTreeParser/BodyPart>
#include <MimeTreeParser/HtmlWriter>
#include <MimeTreeParser/NodeHelper>
#include <MimeTreeParser/ObjectTreeParser>
#include <MessageCore/StringUtil>
#include <MessageCore/NodeHelper>
#include "MessageCore/MessageCoreSettings"
#include <MessageCore/MessageCoreSettings>
#include <AkonadiCore/agentinstance.h>
#include <AkonadiCore/agentmanager.h>
#include <AkonadiCore/CollectionFetchJob>
......
......@@ -39,4 +39,4 @@ endmacro ()
add_mimetreeparser_crypto_unittest(attachmenttest.cpp)
add_mimetreeparser_unittest(bodypartformatterbasefactorytest.cpp)
add_mimetreeparser_unittest(nodehelpertest.cpp)
add_mimetreeparser_class_unittest( cryptohelpertest.cpp "../src/viewer/cryptohelper.cpp")
add_mimetreeparser_class_unittest(cryptohelpertest.cpp "../src/cryptohelper.cpp")
......@@ -16,7 +16,7 @@
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
*/
#include "viewer/objecttreeparser.h"
#include "objecttreeparser.h"
#include "util.h"
#include "setupenv.h"
......
......@@ -17,7 +17,7 @@
02110-1301, USA.
*/
#include "viewer/bodypartformatterfactory.h"
#include "bodypartformatterfactory.h"
#include "interfaces/bodypartformatter.h"
#include <qtest.h>
......
......@@ -18,7 +18,7 @@
*/
#include "cryptohelpertest.h"
#include "viewer/cryptohelper.h"
#include "cryptohelper.h"
#include <QTest>
......
......@@ -18,7 +18,7 @@
*/
#include "nodehelpertest.h"
#include "viewer/nodehelper.h"
#include "nodehelper.h"
#include <qtest.h>
......
......@@ -32,7 +32,7 @@
#ifndef __MIMETREEPARSER_TESTCSSHELPER_H__
#define __MIMETREEPARSER_TESTCSSHELPER_H__
#include "viewer/csshelperbase.h"
#include "csshelperbase.h"
namespace MimeTreeParser {
class TestCSSHelper : public CSSHelperBase
......
......@@ -25,18 +25,18 @@ set(libmimetreeparser_main_SRCS
interfaces/htmlwriter.cpp
job/qgpgmejobexecutor.cpp
utils/util.cpp
viewer/attachmentstrategy.cpp
viewer/bodypartformatter.cpp
viewer/bodypartformatterfactory.cpp
viewer/cryptohelper.cpp
viewer/nodehelper.cpp
viewer/objecttreeparser.cpp
viewer/messagepart.cpp
viewer/partnodebodypart.cpp
viewer/memento/cryptobodypartmemento.cpp
viewer/memento/decryptverifybodypartmemento.cpp
viewer/memento/verifydetachedbodypartmemento.cpp
viewer/memento/verifyopaquebodypartmemento.cpp
attachmentstrategy.cpp
bodypartformatter.cpp
bodypartformatterfactory.cpp
cryptohelper.cpp
nodehelper.cpp
objecttreeparser.cpp
messagepart.cpp
partnodebodypart.cpp
memento/cryptobodypartmemento.cpp
memento/decryptverifybodypartmemento.cpp
memento/verifydetachedbodypartmemento.cpp
memento/verifyopaquebodypartmemento.cpp
)
set(libmimetreeparser_extra_SRCS
......@@ -49,7 +49,7 @@ set(mimetreeparser_temporaryfile_SRCS
temporaryfile/attachmenttemporaryfilesdirs.cpp
)
ecm_generate_headers(MimeTreeParser_Camelcaseviewer_HEADERS
ecm_generate_headers(MimeTreeParser_Camelcasemain_HEADERS
HEADER_NAMES
AttachmentStrategy
BodyPartFormatterFactory
......@@ -59,9 +59,8 @@ ecm_generate_headers(MimeTreeParser_Camelcaseviewer_HEADERS
ObjectTreeParser
PartMetaData
PartNodeBodyPart
REQUIRED_HEADERS MimeTreeParser_viewer_HEADERS
REQUIRED_HEADERS MimeTreeParser_main_HEADERS
PREFIX MimeTreeParser
RELATIVE viewer
)
ecm_generate_headers(MimeTreeParser_Camelcaseutils_HEADERS
......@@ -104,7 +103,7 @@ install(FILES
${MimeTreeParser_Camelcasehtmlwriter_HEADERS}
${MimeTreeParser_Camelcaseutils_HEADERS}
${MimeTreeParser_Camelcaseinterfaces_HEADERS}
${MimeTreeParser_Camelcaseviewer_HEADERS}
${MimeTreeParser_Camelcasemain_HEADERS}
${MimeTreeParser_Camelcasetemporaryfile_HEADERS}
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/MimeTreeParser
COMPONENT Devel
......@@ -114,7 +113,7 @@ install(FILES
${MimeTreeParser_htmlwriter_HEADERS}
${MimeTreeParser_utils_HEADERS}
${MimeTreeParser_interfaces_HEADERS}
${MimeTreeParser_viewer_HEADERS}
${MimeTreeParser_main_HEADERS}
${MimeTreeParser_temporaryfile_HEADERS}
${CMAKE_CURRENT_BINARY_DIR}/mimetreeparser_export.h
${CMAKE_CURRENT_BINARY_DIR}/mimetreeparser_debug.h
......
......@@ -21,8 +21,8 @@
#include "utils.h"
#include "viewer/objecttreeparser.h"
#include "viewer/messagepart.h"
#include "objecttreeparser.h"
#include "messagepart.h"
#include <QGpgME/Protocol>
......
......@@ -21,9 +21,9 @@
#include "utils.h"
#include "viewer/attachmentstrategy.h"
#include "viewer/objecttreeparser.h"
#include "viewer/messagepart.h"
#include "attachmentstrategy.h"
#include "objecttreeparser.h"
#include "messagepart.h"
#include <QGpgME/Protocol>
......
......@@ -21,8 +21,8 @@
#include "utils.h"
#include "viewer/objecttreeparser.h"
#include "viewer/messagepart.h"
#include "objecttreeparser.h"
#include "messagepart.h"
#include <KMime/Content>
......
......@@ -21,8 +21,8 @@
#include "utils.h"
#include "viewer/objecttreeparser.h"
#include "viewer/messagepart.h"
#include "objecttreeparser.h"
#include "messagepart.h"
#include <KMime/Content>
......
......@@ -21,8 +21,8 @@
#include "utils.h"
#include "viewer/objecttreeparser.h"
#include "viewer/messagepart.h"
#include "objecttreeparser.h"
#include "messagepart.h"
#include <KMime/Content>
......
......@@ -19,8 +19,8 @@
#include "multipartmixed.h"
#include "viewer/objecttreeparser.h"
#include "viewer/messagepart.h"
#include "objecttreeparser.h"
#include "messagepart.h"
#include <KMime/Content>
......
......@@ -19,8 +19,8 @@
#include "multipartsigned.h"
#include "viewer/objecttreeparser.h"
#include "viewer/messagepart.h"
#include "objecttreeparser.h"
#include "messagepart.h"
#include <KMime/Content>
......
......@@ -19,9 +19,9 @@
#include "texthtml.h"
#include "viewer/attachmentstrategy.h"
#include "viewer/objecttreeparser.h"
#include "viewer/messagepart.h"
#include "attachmentstrategy.h"
#include "objecttreeparser.h"
#include "messagepart.h"
#include <KMime/Content>
......
......@@ -19,9 +19,9 @@
#include "textplain.h"
#include "viewer/attachmentstrategy.h"
#include "viewer/objecttreeparser.h"
#include "viewer/messagepart.h"
#include "attachmentstrategy.h"
#include "objecttreeparser.h"
#include "messagepart.h"
#include <KMime/Content>
......
......@@ -21,7 +21,7 @@
#define __MIMETREEPARSER_BODYFORAMATTER_UTILS_H__
#include "interfaces/bodypart.h"
#include "viewer/messagepart.h"
#include "messagepart.h"
#include <KMime/Content>
......
......@@ -45,12 +45,12 @@
#include "interfaces/bodypart.h"
#include "interfaces/htmlwriter.h"
#include "viewer/bodypartformatterfactory.h"
#include "viewer/bodypartformatterfactory_p.h"
#include "bodypartformatterfactory.h"
#include "bodypartformatterfactory_p.h"
#include "viewer/attachmentstrategy.h"
#include "viewer/objecttreeparser.h"
#include "viewer/messagepart.h"
#include "attachmentstrategy.h"
#include "objecttreeparser.h"
#include "messagepart.h"
#include <KMime/Content>
......
......@@ -19,7 +19,7 @@
#include "objecttreesource.h"
#include "bodypartformatter.h"
#include "viewer/messagepart.h"
#include "messagepart.h"
using namespace MimeTreeParser;
......
......@@ -24,7 +24,7 @@
#include <QString>
#include "interfaces/bodypart.h"
#include "viewer/enums.h"
#include "enums.h"
namespace MimeTreeParser {
class CryptoBodyPartMemento : public QObject, public Interface::BodyPartMemento
......
......@@ -20,7 +20,7 @@
#include "mimetreeparser_debug.h"
#include "viewer/nodehelper.h"
#include "nodehelper.h"
#include <KMime/Content>
......
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