Header cleanup

cdoc/CDoc.cpp

@@ -20,9 +20,10 @@
 #include "CDoc1Reader.h"
 #include "CDoc2Writer.h"
 #include "CDoc2Reader.h"
+#include "Configuration.h"
 #include "ILogger.h"
-
-#include <iostream>
+#include "Io.h"
+#include "NetworkBackend.h"
 
 namespace libcdoc {
 

cdoc/CDoc1Reader.cpp

@@ -16,21 +16,22 @@
  *
  */
 
-#include <map>
-#include <set>
-
-#include <openssl/x509.h>
-
-#include "Certificate.h"
+#include "CDoc1Reader.h"
 
 #include "CDoc.h"
+#include "Certificate.h"
 #include "Crypto.h"
+#include "CryptoBackend.h"
 #include "DDocReader.h"
 #include "ILogger.h"
+#include "Lock.h"
 #include "XmlReader.h"
 #include "ZStream.h"
 
-#include "CDoc1Reader.h"
+#include <openssl/x509.h>
+
+#include <map>
+#include <set>
 
 using namespace libcdoc;
 

cdoc/CDoc1Writer.cpp

@@ -16,19 +16,16 @@
  *
  */
 
+#include "CDoc1Writer.h"
+
 #include "Crypto.h"
 #include "DDocWriter.h"
+#include "ILogger.h"
+#include "Recipient.h"
 #include "Utils.h"
-#include "CDoc.h"
 #include "XmlWriter.h"
-#include "CDoc1Writer.h"
-#include "ILogger.h"
 #include "utils/memory.h"
 
-#if defined(_WIN32) || defined(_WIN64)
-#include <IntSafe.h>
-#endif
-
 #define OPENSSL_SUPPRESS_DEPRECATED
 
 #include <openssl/x509.h>

cdoc/CDoc2Reader.cpp

@@ -16,24 +16,27 @@
  *
  */
 
-#include <fstream>
-
-#define OPENSSL_SUPPRESS_DEPRECATED
-
-#include "openssl/evp.h"
-#include <openssl/x509.h>
+#include "CDoc2Reader.h"
 
 #include "Certificate.h"
-#include "Crypto.h"
+#include "Configuration.h"
+#include "CryptoBackend.h"
+#include "CDoc2.h"
+#include "ILogger.h"
+#include "Lock.h"
+#include "NetworkBackend.h"
 #include "Tar.h"
 #include "Utils.h"
 #include "ZStream.h"
-#include "CDoc2.h"
-#include "ILogger.h"
 
 #include "header_generated.h"
 
-#include "CDoc2Reader.h"
+#define OPENSSL_SUPPRESS_DEPRECATED
+
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+
+#include <fstream>
 
 // fixme: Placeholder
 #define t_(t) t

cdoc/CDoc2Reader.h

@@ -21,6 +21,8 @@
 
 #include "CDocReader.h"
 
+#include <memory>
+
 class CDoc2Reader final: public libcdoc::CDocReader {
 public:
 	~CDoc2Reader() final;

cdoc/CDoc2Writer.cpp

@@ -18,18 +18,18 @@
 
 #include "CDoc2Writer.h"
 
-#include "header_generated.h"
-
+#include "Configuration.h"
 #include "Crypto.h"
+#include "CryptoBackend.h"
 #include "CDoc2.h"
-#include "ZStream.h"
+#include "ILogger.h"
+#include "NetworkBackend.h"
+#include "Recipient.h"
 #include "Tar.h"
 #include "Utils.h"
-#include "ILogger.h"
+#include "ZStream.h"
 
-#if defined(_WIN32) || defined(_WIN64)
-#include <IntSafe.h>
-#endif
+#include "header_generated.h"
 
 #define OPENSSL_SUPPRESS_DEPRECATED
 

cdoc/CDoc2Writer.h

@@ -21,6 +21,8 @@
 
 #include "CDocWriter.h"
 
+#include <memory>
+
 class CDoc2Writer final: public libcdoc::CDocWriter {
 public:
 	explicit CDoc2Writer(libcdoc::DataConsumer *dst, bool take_ownership);

cdoc/CDocCipher.cpp

@@ -16,22 +16,24 @@
  *
  */
 
-#include <sstream>
-#include <map>
-#include <openssl/rand.h>
-
 #include "CDocCipher.h"
 #include "CDocReader.h"
-#include "CDoc.h"
 #include "CDoc2.h"
 #include "Certificate.h"
 #include "ILogger.h"
+#include "Lock.h"
+#include "NetworkBackend.h"
 #include "PKCS11Backend.h"
+#include "Recipient.h"
 #include "Utils.h"
 #ifdef _WIN32
 #include "WinBackend.h"
 #endif
 
+#include <sstream>
+#include <map>
+#include <openssl/rand.h>
+
 using namespace std;
 using namespace libcdoc;
 

cdoc/CDocCipher.h

@@ -25,6 +25,7 @@
 #include "ToolConf.h"
 
 #include <map>
+#include <memory>
 
 namespace libcdoc
 {

cdoc/CDocReader.h

@@ -18,14 +18,20 @@
 
 #ifndef __CDOCREADER_H__
 #define __CDOCREADER_H__
-
-#include <cdoc/Configuration.h>
-#include <cdoc/CryptoBackend.h>
-#include <cdoc/Io.h>
-#include <cdoc/NetworkBackend.h>
+
+#include "CDoc.h"
+
+#include <cstdint>
 
 namespace libcdoc {
 
+struct Configuration;
+struct CryptoBackend;
+struct DataSource;
+struct Lock;
+struct MultiDataConsumer;
+struct NetworkBackend;
+
 /**
  * @brief Provides decryption interface
  *

cdoc/CDocWriter.h

@@ -18,13 +18,18 @@
 
 #ifndef __CDOCWRITER_H__
 #define __CDOCWRITER_H__
-
-#include <cdoc/Io.h>
-#include <cdoc/Configuration.h>
-#include <cdoc/CryptoBackend.h>
-#include <cdoc/NetworkBackend.h>
+
+#include "CDoc.h"
+
+#include <cstdint>
 
 namespace libcdoc {
+    struct Configuration;
+    struct CryptoBackend;
+    struct DataConsumer;
+    struct MultiDataSource;
+    struct NetworkBackend;
+    struct Recipient;
 
 /**
  * @brief Provides encryption interface

cdoc/Configuration.h

@@ -19,9 +19,13 @@
 #ifndef __CONFIGURATION_H__
 #define __CONFIGURATION_H__
 
-#include <cdoc/CDoc.h>
+#include "Exports.h"
+
+#include <string>
+#include <vector>
 
 #include <cstdint>
+
 namespace libcdoc {
 
 /**
@@ -40,7 +44,10 @@ struct CDOC_EXPORT Configuration {
     static constexpr char const *KEYSERVER_FETCH_URL = "KEYSERVER_FETCH_URL";
 
 	Configuration() = default;
-	virtual ~Configuration() = default;
+	virtual ~Configuration() noexcept = default;
+    Configuration(const Configuration&) = delete;
+    Configuration& operator=(const Configuration&) = delete;
+    CDOC_ENABLE_MOVE(Configuration);
 
     /**
      * @brief get a value of configuration parameter
@@ -73,9 +80,6 @@ struct CDOC_EXPORT Configuration {
      */
     int getInt(const std::string_view& param, int def_val = 0);
 
-	Configuration (const Configuration&) = delete;
-	Configuration& operator= (const Configuration&) = delete;
-
 #if LIBCDOC_TESTING
     virtual int64_t test(std::vector<uint8_t>& dst);
 #endif

cdoc/CryptoBackend.h

@@ -20,10 +20,12 @@
 #define __CRYPTOBACKEND_H__
 
 #include <cdoc/CDoc.h>
-#include <cdoc/Lock.h>
+
+#include <cstdint>
 
 namespace libcdoc {
 
+struct Lock;
 /**
  * @brief An authentication provider
  *
@@ -50,8 +52,11 @@ struct CDOC_EXPORT CryptoBackend {
         SHA_512
     };
 
-	CryptoBackend() = default;
-	virtual ~CryptoBackend() = default;
+    CryptoBackend() = default;
+    virtual ~CryptoBackend() noexcept = default;
+    CryptoBackend(const CryptoBackend&) = delete;
+    CryptoBackend& operator=(const CryptoBackend&) = delete;
+    CDOC_ENABLE_MOVE(CryptoBackend);
 
 	virtual std::string getLastErrorStr(int code) const;
 
@@ -160,9 +165,6 @@ struct CDOC_EXPORT CryptoBackend {
     }
 
     virtual int test(libcdoc::Lock& lock) { return NOT_IMPLEMENTED; }
-
-	CryptoBackend (const CryptoBackend&) = delete;
-	CryptoBackend& operator= (const CryptoBackend&) = delete;
 };
 
 } // namespace libcdoc

cdoc/DDocReader.cpp

@@ -18,9 +18,11 @@
 
 #include "DDocReader.h"
 #include "CDoc.h"
-
+#include "Io.h"
 #include "XmlReader.h"
 
+using namespace libcdoc;
+
 int
 DDOCReader::parse(libcdoc::DataSource *src, libcdoc::MultiDataConsumer *dst)
 {
@@ -41,10 +43,10 @@ DDOCReader::parse(libcdoc::DataSource *src, libcdoc::MultiDataConsumer *dst)
     return (dst->isError()) ? libcdoc::IO_ERROR : libcdoc::OK;
 }
 
-struct FileListConsumer : public libcdoc::MultiDataConsumer {
+struct DDocFileListConsumer : public libcdoc::MultiDataConsumer {
 	std::vector<DDOCReader::File> files;
 
-	explicit FileListConsumer() = default;
+	explicit DDocFileListConsumer() = default;
 	int64_t write(const uint8_t *src, size_t size) override final {
 		DDOCReader::File& file = files.back();
 		file.data.insert(file.data.end(), src, src + size);
@@ -62,7 +64,7 @@ std::vector<DDOCReader::File>
 DDOCReader::files(const std::vector<uint8_t> &data)
 {
 	libcdoc::VectorSource src(data);
-	FileListConsumer list;
+	DDocFileListConsumer list;
 	parse(&src, &list);
 	return std::move(list.files);
 }

cdoc/DDocReader.h

@@ -18,7 +18,14 @@
 
 #pragma once
 
-#include "Io.h"
+#include <string>
+#include <vector>
+#include <cstdint>
+
+namespace libcdoc {
+
+struct DataSource;
+struct MultiDataConsumer;
 
 class DDOCReader
 {
@@ -32,3 +39,5 @@ class DDOCReader
 
 	static std::vector<File> files(const std::vector<uint8_t> &data);
 };
+
+} // namespace libcdoc

cdoc/DDocWriter.cpp

@@ -18,7 +18,7 @@
 
 #include "DDocWriter.h"
 
-#include "XmlWriter.h"
+using namespace libcdoc;
 
 /**
  * @class DDOCWriter

cdoc/DDocWriter.h

@@ -20,6 +20,8 @@
 
 #include "XmlWriter.h"
 
+namespace libcdoc {
+
 class DDOCWriter: public XMLWriter
 {
 public:
@@ -36,3 +38,5 @@ class DDOCWriter: public XMLWriter
 	struct Private;
 	Private *d;
 };
+
+}