From 23d0bd8edde6aadfaa282215b5f143ad16210438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 5 Sep 2015 18:46:57 +0200 Subject: NOISSUE make shared logic library ... shared --- logic/net/ByteArrayDownload.h | 4 +++- logic/net/CacheDownload.h | 11 +++++++---- logic/net/HttpMetaCache.h | 6 ++++-- logic/net/NetJob.h | 4 +++- logic/net/PasteUpload.h | 4 +++- logic/net/URLConstants.h | 4 +++- 6 files changed, 23 insertions(+), 10 deletions(-) (limited to 'logic/net') diff --git a/logic/net/ByteArrayDownload.h b/logic/net/ByteArrayDownload.h index a5d8cebe..e2fc2911 100644 --- a/logic/net/ByteArrayDownload.h +++ b/logic/net/ByteArrayDownload.h @@ -16,8 +16,10 @@ #pragma once #include "NetAction.h" +#include "multimc_logic_export.h" + typedef std::shared_ptr ByteArrayDownloadPtr; -class ByteArrayDownload : public NetAction +class MULTIMC_LOGIC_EXPORT ByteArrayDownload : public NetAction { Q_OBJECT public: diff --git a/logic/net/CacheDownload.h b/logic/net/CacheDownload.h index 7f95a69d..f640b740 100644 --- a/logic/net/CacheDownload.h +++ b/logic/net/CacheDownload.h @@ -20,19 +20,22 @@ #include #include -class INetworkValidator +#include "multimc_logic_export.h" + +/* FIXME: move to its own file(s) */ +class MULTIMC_LOGIC_EXPORT INetworkValidator { public: virtual ~INetworkValidator() {} virtual void validate(const QByteArray &data) = 0; }; -class JsonValidator : public INetworkValidator +class MULTIMC_LOGIC_EXPORT JsonValidator : public INetworkValidator { public: void validate(const QByteArray &data) override; }; -class MD5HashValidator : public INetworkValidator +class MULTIMC_LOGIC_EXPORT MD5HashValidator : public INetworkValidator { public: explicit MD5HashValidator(const QByteArray &expected) @@ -44,7 +47,7 @@ private: }; typedef std::shared_ptr CacheDownloadPtr; -class CacheDownload : public NetAction +class MULTIMC_LOGIC_EXPORT CacheDownload : public NetAction { Q_OBJECT private: diff --git a/logic/net/HttpMetaCache.h b/logic/net/HttpMetaCache.h index 042f66bf..fba3fe5a 100644 --- a/logic/net/HttpMetaCache.h +++ b/logic/net/HttpMetaCache.h @@ -19,9 +19,11 @@ #include #include +#include "multimc_logic_export.h" + class HttpMetaCache; -struct MetaEntry +struct MULTIMC_LOGIC_EXPORT MetaEntry { QString base; QString path; @@ -35,7 +37,7 @@ struct MetaEntry typedef std::shared_ptr MetaEntryPtr; -class HttpMetaCache : public QObject +class MULTIMC_LOGIC_EXPORT HttpMetaCache : public QObject { Q_OBJECT public: diff --git a/logic/net/NetJob.h b/logic/net/NetJob.h index 9e4656c7..85a8bf83 100644 --- a/logic/net/NetJob.h +++ b/logic/net/NetJob.h @@ -24,10 +24,12 @@ #include "tasks/Task.h" #include "QObjectPtr.h" +#include "multimc_logic_export.h" + class NetJob; typedef QObjectPtr NetJobPtr; -class NetJob : public Task +class MULTIMC_LOGIC_EXPORT NetJob : public Task { Q_OBJECT public: diff --git a/logic/net/PasteUpload.h b/logic/net/PasteUpload.h index e353f421..11850c71 100644 --- a/logic/net/PasteUpload.h +++ b/logic/net/PasteUpload.h @@ -4,7 +4,9 @@ #include #include -class PasteUpload : public Task +#include "multimc_logic_export.h" + +class MULTIMC_LOGIC_EXPORT PasteUpload : public Task { Q_OBJECT public: diff --git a/logic/net/URLConstants.h b/logic/net/URLConstants.h index 01d1482b..b04f44ba 100644 --- a/logic/net/URLConstants.h +++ b/logic/net/URLConstants.h @@ -17,6 +17,8 @@ #include +#include "multimc_logic_export.h" + namespace URLConstants { extern const QString AWS_DOWNLOAD_BASE; @@ -26,7 +28,7 @@ extern const QString AWS_DOWNLOAD_INDEXES; extern const QString ASSETS_BASE; extern const QString RESOURCE_BASE; extern const QString LIBRARY_BASE; -extern const QString SKINS_BASE; +MULTIMC_LOGIC_EXPORT extern const QString SKINS_BASE; extern const QString AUTH_BASE; extern const QString FORGE_LEGACY_URL; extern const QString FORGE_GRADLE_URL; -- cgit v1.2.3