From ba99c25d9b416125ca61b470fd43c0e460add989 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Kundr=C3=A1t?= Date: Sat, 5 Jan 2013 15:42:47 +0100 Subject: [PATCH] The great header cleanup The motivation behind this is to make it possible to build the libCommon without the QtNetwork :). Oh well... --- src/Gui/ComposeWidget.cpp | 1 + src/Gui/Window.cpp | 3 ++ src/Harmattan/trojita-tp/ImapAccess.cpp | 4 +++ src/Harmattan/trojita-tp/ImapAccess.h | 1 + src/Imap/ConnectionState.cpp | 41 +++++++++++----------- src/Imap/Model/Model.cpp | 1 + src/Imap/Model/Model.h | 9 ++--- src/Imap/Model/TaskFactory.cpp | 1 + src/Imap/Parser/Parser.h | 4 ++- src/Imap/Parser/Response.cpp | 1 + src/Imap/Parser/Response.h | 4 ++- src/Imap/Tasks/KeepMailboxOpenTask.h | 3 +- src/Imap/Tasks/OpenConnectionTask.cpp | 1 + src/Streams/IODeviceSocket.h | 3 +- src/XtConnect/XtConnect.cpp | 4 +++ .../test_Imap_Parser_parse.h | 1 + .../test_Imap_Tasks_OpenConnection.cpp | 2 ++ 17 files changed, 52 insertions(+), 32 deletions(-) diff --git a/src/Gui/ComposeWidget.cpp b/src/Gui/ComposeWidget.cpp index d35828bc..4ee50934 100644 --- a/src/Gui/ComposeWidget.cpp +++ b/src/Gui/ComposeWidget.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include "AbstractAddressbook.h" #include "AutoCompletion.h" diff --git a/src/Gui/Window.cpp b/src/Gui/Window.cpp index 548ec43e..a9e1a596 100644 --- a/src/Gui/Window.cpp +++ b/src/Gui/Window.cpp @@ -76,6 +76,9 @@ #include "Imap/Model/ModelTest/modeltest.h" +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(QList) + /** @short All user-facing widgets and related classes */ namespace Gui { diff --git a/src/Harmattan/trojita-tp/ImapAccess.cpp b/src/Harmattan/trojita-tp/ImapAccess.cpp index d51de1bc..301f1999 100644 --- a/src/Harmattan/trojita-tp/ImapAccess.cpp +++ b/src/Harmattan/trojita-tp/ImapAccess.cpp @@ -27,6 +27,10 @@ #include "Imap/Model/MemoryCache.h" #include "Imap/Model/Utils.h" #include "Imap/Network/MsgPartNetAccessManager.h" +#include "Streams/SocketFactory.h" + +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(QList) ImapAccess::ImapAccess(QObject *parent) : QObject(parent), m_imapModel(0), cache(0), m_mailboxModel(0), m_mailboxSubtreeModel(0), m_msgListModel(0), diff --git a/src/Harmattan/trojita-tp/ImapAccess.h b/src/Harmattan/trojita-tp/ImapAccess.h index 8c43aaf5..aad690b3 100644 --- a/src/Harmattan/trojita-tp/ImapAccess.h +++ b/src/Harmattan/trojita-tp/ImapAccess.h @@ -24,6 +24,7 @@ #define IMAPACCESS_H #include +#include #include "Imap/Model/MailboxModel.h" #include "Imap/Model/Model.h" diff --git a/src/Imap/ConnectionState.cpp b/src/Imap/ConnectionState.cpp index c31b359c..a6d75ef7 100644 --- a/src/Imap/ConnectionState.cpp +++ b/src/Imap/ConnectionState.cpp @@ -22,7 +22,6 @@ #include #include "ConnectionState.h" -#include "Imap/Model/Model.h" namespace Imap { @@ -33,45 +32,45 @@ QString connectionStateToString(const ConnectionState state) case CONN_STATE_NONE: return QString(); case CONN_STATE_HOST_LOOKUP: - return Imap::Mailbox::Model::tr("Resolving hostname..."); + return QObject::tr("Resolving hostname..."); case CONN_STATE_CONNECTING: - return Imap::Mailbox::Model::tr("Connecting to the IMAP server..."); + return QObject::tr("Connecting to the IMAP server..."); case CONN_STATE_SSL_HANDSHAKE: - return Imap::Mailbox::Model::tr("Starting encryption (SSL)..."); + return QObject::tr("Starting encryption (SSL)..."); case CONN_STATE_SSL_VERIFYING: - return Imap::Mailbox::Model::tr("Checking certificates (SSL)..."); + return QObject::tr("Checking certificates (SSL)..."); case CONN_STATE_CONNECTED_PRETLS_PRECAPS: - return Imap::Mailbox::Model::tr("Checking capabilities..."); + return QObject::tr("Checking capabilities..."); case CONN_STATE_CONNECTED_PRETLS: - return Imap::Mailbox::Model::tr("Waiting for encryption..."); + return QObject::tr("Waiting for encryption..."); case CONN_STATE_STARTTLS_ISSUED: - return Imap::Mailbox::Model::tr("Asking for encryption..."); + return QObject::tr("Asking for encryption..."); case CONN_STATE_STARTTLS_HANDSHAKE: - return Imap::Mailbox::Model::tr("Starting encryption (STARTTLS)..."); + return QObject::tr("Starting encryption (STARTTLS)..."); case CONN_STATE_STARTTLS_VERIFYING: - return Imap::Mailbox::Model::tr("Checking certificates (STARTTLS)..."); + return QObject::tr("Checking certificates (STARTTLS)..."); case CONN_STATE_ESTABLISHED_PRECAPS: - return Imap::Mailbox::Model::tr("Checking capabilities (after STARTTLS)..."); + return QObject::tr("Checking capabilities (after STARTTLS)..."); case CONN_STATE_LOGIN: - return Imap::Mailbox::Model::tr("Logging in..."); + return QObject::tr("Logging in..."); case CONN_STATE_POSTAUTH_PRECAPS: - return Imap::Mailbox::Model::tr("Checking capabilities (after login)..."); + return QObject::tr("Checking capabilities (after login)..."); case CONN_STATE_COMPRESS_DEFLATE: - return Imap::Mailbox::Model::tr("Activating compression..."); + return QObject::tr("Activating compression..."); case CONN_STATE_AUTHENTICATED: - return Imap::Mailbox::Model::tr("Logged in."); + return QObject::tr("Logged in."); case CONN_STATE_SELECTING: - return Imap::Mailbox::Model::tr("Opening mailbox..."); + return QObject::tr("Opening mailbox..."); case CONN_STATE_SYNCING: - return Imap::Mailbox::Model::tr("Synchronizing mailbox..."); + return QObject::tr("Synchronizing mailbox..."); case CONN_STATE_SELECTED: - return Imap::Mailbox::Model::tr("Mailbox opened."); + return QObject::tr("Mailbox opened."); case CONN_STATE_FETCHING_PART: - return Imap::Mailbox::Model::tr("Downloading message..."); + return QObject::tr("Downloading message..."); case CONN_STATE_FETCHING_MSG_METADATA: - return Imap::Mailbox::Model::tr("Downloading message structure..."); + return QObject::tr("Downloading message structure..."); case CONN_STATE_LOGOUT: - return Imap::Mailbox::Model::tr("Logged out."); + return QObject::tr("Logged out."); } Q_ASSERT(false); return QString(); diff --git a/src/Imap/Model/Model.cpp b/src/Imap/Model/Model.cpp index a275eacb..f9e4ad05 100644 --- a/src/Imap/Model/Model.cpp +++ b/src/Imap/Model/Model.cpp @@ -39,6 +39,7 @@ #include "OpenConnectionTask.h" #include "QAIM_reset.h" #include "Common/FindWithUnknown.h" +#include "Streams/SocketFactory.h" //#define DEBUG_PERIODICALLY_DUMP_TASKS //#define DEBUG_TASK_ROUTING diff --git a/src/Imap/Model/Model.h b/src/Imap/Model/Model.h index 18a2c757..aa4a996a 100644 --- a/src/Imap/Model/Model.h +++ b/src/Imap/Model/Model.h @@ -31,7 +31,6 @@ #include "Cache.h" #include "../ConnectionState.h" #include "../Parser/Parser.h" -#include "Streams/SocketFactory.h" #include "CopyMoveOperation.h" #include "FlagsOperation.h" #include "ParserState.h" @@ -44,11 +43,6 @@ class QNetworkConfigurationManager; class QNetworkSession; class QSslError; -// Required for Qt5; without this, qRegisterMetaType asserts. -// See http://lists.qt-project.org/pipermail/development/2013-January/008976.html for details. -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(QList) - class FakeCapabilitiesInjector; class ImapModelIdleTest; @@ -74,6 +68,9 @@ class KeepMailboxOpenTask; class TaskPresentationModel; template class SubtreeClassSpecificItem; +class SocketFactory; +typedef std::auto_ptr SocketFactoryPtr; + /** @short Progress of mailbox synchronization with the IMAP server */ typedef enum { STATE_WAIT_FOR_CONN, /**< Waiting for connection to become active */ STATE_SELECTING, /**< SELECT command in progress */ diff --git a/src/Imap/Model/TaskFactory.cpp b/src/Imap/Model/TaskFactory.cpp index 6cd2a299..c038542d 100644 --- a/src/Imap/Model/TaskFactory.cpp +++ b/src/Imap/Model/TaskFactory.cpp @@ -47,6 +47,7 @@ #include "SubscribeUnsubscribeTask.h" #include "Imap/Model/TaskPresentationModel.h" #include "Imap/Parser/Parser.h" +#include "Streams/SocketFactory.h" namespace Imap { diff --git a/src/Imap/Parser/Parser.h b/src/Imap/Parser/Parser.h index 7ec512b1..f4f192c9 100644 --- a/src/Imap/Parser/Parser.h +++ b/src/Imap/Parser/Parser.h @@ -26,8 +26,8 @@ #include "Command.h" #include "Response.h" #include "Sequence.h" +#include "../ConnectionState.h" #include "../Exceptions.h" -#include "Streams/Socket.h" #include "Imap/Model/CatenateData.h" #include "Imap/Model/UidSubmitData.h" @@ -44,6 +44,8 @@ class ImapParserParseTest; namespace Imap { +class Socket; + /** @short A handle identifying a command sent to the server */ typedef QByteArray CommandHandle; diff --git a/src/Imap/Parser/Response.cpp b/src/Imap/Parser/Response.cpp index a918c943..d468961b 100644 --- a/src/Imap/Parser/Response.cpp +++ b/src/Imap/Parser/Response.cpp @@ -20,6 +20,7 @@ along with this program. If not, see . */ #include +#include #include "Response.h" #include "Message.h" #include "LowLevelParser.h" diff --git a/src/Imap/Parser/Response.h b/src/Imap/Parser/Response.h index 49eeb11f..4b7bd307 100644 --- a/src/Imap/Parser/Response.h +++ b/src/Imap/Parser/Response.h @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -40,6 +39,9 @@ #pragma warning(disable: 4290) #endif +class QSslCertificate; +class QSslError; + /** * @file * @short Various data structures related to IMAP responses diff --git a/src/Imap/Tasks/KeepMailboxOpenTask.h b/src/Imap/Tasks/KeepMailboxOpenTask.h index 46504f20..57d10b07 100644 --- a/src/Imap/Tasks/KeepMailboxOpenTask.h +++ b/src/Imap/Tasks/KeepMailboxOpenTask.h @@ -23,8 +23,9 @@ #ifndef IMAP_KEEPMAILBOXOPENTASK_H #define IMAP_KEEPMAILBOXOPENTASK_H -#include "ImapTask.h" #include +#include +#include "ImapTask.h" class QTimer; class ImapModelIdleTest; diff --git a/src/Imap/Tasks/OpenConnectionTask.cpp b/src/Imap/Tasks/OpenConnectionTask.cpp index 2dc958ce..5e70338f 100644 --- a/src/Imap/Tasks/OpenConnectionTask.cpp +++ b/src/Imap/Tasks/OpenConnectionTask.cpp @@ -24,6 +24,7 @@ #include #include "ItemRoles.h" #include "Model/TaskPresentationModel.h" +#include "Streams/SocketFactory.h" #include "Streams/TrojitaZlibStatus.h" namespace Imap diff --git a/src/Streams/IODeviceSocket.h b/src/Streams/IODeviceSocket.h index 30c35cab..25d9b59f 100644 --- a/src/Streams/IODeviceSocket.h +++ b/src/Streams/IODeviceSocket.h @@ -22,11 +22,10 @@ #ifndef IMAP_IODEVICE_SOCKET_H #define IMAP_IODEVICE_SOCKET_H -#include #include +#include #include "Socket.h" -class QSslSocket; class QTimer; namespace Imap diff --git a/src/XtConnect/XtConnect.cpp b/src/XtConnect/XtConnect.cpp index 85bf9031..ab447bda 100644 --- a/src/XtConnect/XtConnect.cpp +++ b/src/XtConnect/XtConnect.cpp @@ -42,6 +42,10 @@ #include "MailboxFinder.h" #include "MessageDownloader.h" #include "SqlStorage.h" +#include "Streams/SocketFactory.h" + +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(QList) namespace XtConnect { diff --git a/tests/tests/test_Imap_Parser_parse/test_Imap_Parser_parse.h b/tests/tests/test_Imap_Parser_parse/test_Imap_Parser_parse.h index eef7c46a..f8b09e29 100644 --- a/tests/tests/test_Imap_Parser_parse/test_Imap_Parser_parse.h +++ b/tests/tests/test_Imap_Parser_parse/test_Imap_Parser_parse.h @@ -22,6 +22,7 @@ #ifndef TEST_IMAP_PARSER_PARSE #define TEST_IMAP_PARSER_PARSE +#include #include #include "Imap/Parser/Parser.h" diff --git a/tests/tests/test_Imap_Tasks_OpenConnection/test_Imap_Tasks_OpenConnection.cpp b/tests/tests/test_Imap_Tasks_OpenConnection/test_Imap_Tasks_OpenConnection.cpp index 842c81f0..45e638b0 100644 --- a/tests/tests/test_Imap_Tasks_OpenConnection/test_Imap_Tasks_OpenConnection.cpp +++ b/tests/tests/test_Imap_Tasks_OpenConnection/test_Imap_Tasks_OpenConnection.cpp @@ -30,6 +30,8 @@ #include "Imap/Model/MailboxModel.h" #include "Imap/Tasks/OpenConnectionTask.h" +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(QList) Q_DECLARE_METATYPE(Imap::Mailbox::ImapTask*) void ImapModelOpenConnectionTest::initTestCase() -- 2.11.4.GIT