diff --git a/zlibrary/core/CMakeLists.txt b/zlibrary/core/CMakeLists.txt index 92c3b5d..0f0be4f 100644 --- a/zlibrary/core/CMakeLists.txt +++ b/zlibrary/core/CMakeLists.txt @@ -1,9 +1,13 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/include - ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/include ${CMAKE_BINARY_DIR} ) +configure_file( include/core_export.h.cmake include/core_export.h ) + + ##### libzlcore-tqt (shared) file( GLOB_RECURSE _zlcore_cpp_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp) diff --git a/zlibrary/core/include/ZLApplication.h b/zlibrary/core/include/ZLApplication.h index cdffa6c..3fdf130 100644 --- a/zlibrary/core/include/ZLApplication.h +++ b/zlibrary/core/include/ZLApplication.h @@ -41,14 +41,14 @@ class ZLPopupData; class ZLMenubar; class ZLFile; -class ZLApplicationBase { +class ZLCORE_EXPORT ZLApplicationBase { protected: ZLApplicationBase(const std::string &name); ~ZLApplicationBase(); }; -class ZLApplication : public ZLApplicationBase { +class ZLCORE_EXPORT ZLApplication : public ZLApplicationBase { public: static ZLApplication &Instance(); diff --git a/zlibrary/core/include/ZLApplicationWindow.h b/zlibrary/core/include/ZLApplicationWindow.h index 535ebd7..069b7a4 100644 --- a/zlibrary/core/include/ZLApplicationWindow.h +++ b/zlibrary/core/include/ZLApplicationWindow.h @@ -25,7 +25,7 @@ #include "ZLApplication.h" #include "ZLToolbar.h" -class ZLApplicationWindow { +class ZLCORE_EXPORT ZLApplicationWindow { public: static ZLApplicationWindow &Instance(); diff --git a/zlibrary/core/include/ZLAsynchronousInputStream.h b/zlibrary/core/include/ZLAsynchronousInputStream.h index 371d703..12242a0 100644 --- a/zlibrary/core/include/ZLAsynchronousInputStream.h +++ b/zlibrary/core/include/ZLAsynchronousInputStream.h @@ -20,10 +20,12 @@ #ifndef __ZLASYNCHRONOUSINPUTSTREAM_H__ #define __ZLASYNCHRONOUSINPUTSTREAM_H__ +#include "core_export.h" + #include -class ZLAsynchronousInputStream { +class ZLCORE_EXPORT ZLAsynchronousInputStream { public: class Handler { diff --git a/zlibrary/core/include/ZLBase64EncodedImage.h b/zlibrary/core/include/ZLBase64EncodedImage.h index 9e7a61e..b5e0de3 100644 --- a/zlibrary/core/include/ZLBase64EncodedImage.h +++ b/zlibrary/core/include/ZLBase64EncodedImage.h @@ -24,7 +24,7 @@ #include -class ZLBase64EncodedImage : public ZLSingleImage { +class ZLCORE_EXPORT ZLBase64EncodedImage : public ZLSingleImage { public: ZLBase64EncodedImage(shared_ptr mimeType); diff --git a/zlibrary/core/include/ZLBase64InputStream.h b/zlibrary/core/include/ZLBase64InputStream.h index 4a073d6..e4e0658 100644 --- a/zlibrary/core/include/ZLBase64InputStream.h +++ b/zlibrary/core/include/ZLBase64InputStream.h @@ -22,7 +22,7 @@ #include -class ZLBase64InputStream : public ZLInputStream { +class ZLCORE_EXPORT ZLBase64InputStream : public ZLInputStream { public: ZLBase64InputStream(shared_ptr base); ~ZLBase64InputStream(); diff --git a/zlibrary/core/include/ZLBlockTreeNode.h b/zlibrary/core/include/ZLBlockTreeNode.h index 38b4a9e..45f5654 100644 --- a/zlibrary/core/include/ZLBlockTreeNode.h +++ b/zlibrary/core/include/ZLBlockTreeNode.h @@ -31,7 +31,7 @@ class ZLBlockTreeView; -class ZLBlockTreeNode : public ZLObjectWithRTTI { +class ZLCORE_EXPORT ZLBlockTreeNode : public ZLObjectWithRTTI { public: typedef std::vector List; diff --git a/zlibrary/core/include/ZLBlockTreeView.h b/zlibrary/core/include/ZLBlockTreeView.h index 95d5e9a..79b1f7d 100644 --- a/zlibrary/core/include/ZLBlockTreeView.h +++ b/zlibrary/core/include/ZLBlockTreeView.h @@ -24,7 +24,7 @@ #include -class ZLBlockTreeView : public ZLView { +class ZLCORE_EXPORT ZLBlockTreeView : public ZLView { public: class RootNode : public ZLBlockTreeNode { diff --git a/zlibrary/core/include/ZLBzip2InputStream.h b/zlibrary/core/include/ZLBzip2InputStream.h index edeb288..ba500a3 100644 --- a/zlibrary/core/include/ZLBzip2InputStream.h +++ b/zlibrary/core/include/ZLBzip2InputStream.h @@ -33,7 +33,7 @@ class ZLFSCompressorBzip2; -class ZLBzip2InputStream : public ZLInputStream { +class ZLCORE_EXPORT ZLBzip2InputStream : public ZLInputStream { private: ZLBzip2InputStream(shared_ptr base); diff --git a/zlibrary/core/include/ZLCharSequence.h b/zlibrary/core/include/ZLCharSequence.h index 6b4b112..e11c270 100644 --- a/zlibrary/core/include/ZLCharSequence.h +++ b/zlibrary/core/include/ZLCharSequence.h @@ -20,9 +20,11 @@ #ifndef __ZLCHARSEQUENCE_H__ #define __ZLCHARSEQUENCE_H__ +#include "core_export.h" + #include -class ZLCharSequence { +class ZLCORE_EXPORT ZLCharSequence { public: ZLCharSequence(); diff --git a/zlibrary/core/include/ZLColorOptionBuilder.h b/zlibrary/core/include/ZLColorOptionBuilder.h index 54ba59a..a435830 100644 --- a/zlibrary/core/include/ZLColorOptionBuilder.h +++ b/zlibrary/core/include/ZLColorOptionBuilder.h @@ -25,7 +25,7 @@ #include #include -class ZLColorOptionBuilder { +class ZLCORE_EXPORT ZLColorOptionBuilder { public: ZLColorOptionBuilder(); diff --git a/zlibrary/core/include/ZLConfig.h b/zlibrary/core/include/ZLConfig.h index cee6465..143092e 100644 --- a/zlibrary/core/include/ZLConfig.h +++ b/zlibrary/core/include/ZLConfig.h @@ -20,12 +20,14 @@ #ifndef __ZLCONFIG_H__ #define __ZLCONFIG_H__ +#include "core_export.h" + #include #include class ZLConfig; -class ZLConfigManager { +class ZLCORE_EXPORT ZLConfigManager { private: static ZLConfigManager &Instance() { @@ -55,7 +57,7 @@ protected: friend class ZLOption; }; -class ZLConfig { +class ZLCORE_EXPORT ZLConfig { public: virtual ~ZLConfig(); diff --git a/zlibrary/core/include/ZLDesktopApplicationWindow.h b/zlibrary/core/include/ZLDesktopApplicationWindow.h index 9f4171a..78f27a3 100644 --- a/zlibrary/core/include/ZLDesktopApplicationWindow.h +++ b/zlibrary/core/include/ZLDesktopApplicationWindow.h @@ -24,7 +24,7 @@ #include "ZLApplicationWindow.h" -class ZLDesktopApplicationWindow : public ZLApplicationWindow { +class ZLCORE_EXPORT ZLDesktopApplicationWindow : public ZLApplicationWindow { public: ZLDesktopApplicationWindow(ZLApplication *application); diff --git a/zlibrary/core/include/ZLDesktopOpenFileDialog.h b/zlibrary/core/include/ZLDesktopOpenFileDialog.h index 72d163a..388fec8 100644 --- a/zlibrary/core/include/ZLDesktopOpenFileDialog.h +++ b/zlibrary/core/include/ZLDesktopOpenFileDialog.h @@ -23,7 +23,7 @@ #include #include -class ZLDesktopOpenFileDialog : public ZLOpenFileDialog { +class ZLCORE_EXPORT ZLDesktopOpenFileDialog : public ZLOpenFileDialog { protected: ZLDesktopOpenFileDialog(); diff --git a/zlibrary/core/include/ZLDesktopOptionsDialog.h b/zlibrary/core/include/ZLDesktopOptionsDialog.h index 95475c7..b886508 100644 --- a/zlibrary/core/include/ZLDesktopOptionsDialog.h +++ b/zlibrary/core/include/ZLDesktopOptionsDialog.h @@ -24,7 +24,7 @@ #include -class ZLDesktopOptionsDialog : public ZLOptionsDialog { +class ZLCORE_EXPORT ZLDesktopOptionsDialog : public ZLOptionsDialog { protected: ZLDesktopOptionsDialog(const ZLResource &resource, shared_ptr applyAction); diff --git a/zlibrary/core/include/ZLDialog.h b/zlibrary/core/include/ZLDialog.h index 6bd29a5..dcc4b39 100644 --- a/zlibrary/core/include/ZLDialog.h +++ b/zlibrary/core/include/ZLDialog.h @@ -24,7 +24,7 @@ #include #include -class ZLDialog { +class ZLCORE_EXPORT ZLDialog { protected: ZLDialog(); diff --git a/zlibrary/core/include/ZLDialogContent.h b/zlibrary/core/include/ZLDialogContent.h index a39415d..92bbc09 100644 --- a/zlibrary/core/include/ZLDialogContent.h +++ b/zlibrary/core/include/ZLDialogContent.h @@ -29,7 +29,7 @@ class ZLOptionEntry; class ZLOptionView; -class ZLDialogContent { +class ZLCORE_EXPORT ZLDialogContent { protected: ZLDialogContent(const ZLResource &resource); diff --git a/zlibrary/core/include/ZLDialogContentBuilder.h b/zlibrary/core/include/ZLDialogContentBuilder.h index 49157dc..aa55995 100644 --- a/zlibrary/core/include/ZLDialogContentBuilder.h +++ b/zlibrary/core/include/ZLDialogContentBuilder.h @@ -20,9 +20,11 @@ #ifndef __ZLDIALOGCONTENTBUILDER_H__ #define __ZLDIALOGCONTENTBUILDER_H__ +#include "core_export.h" + class ZLOptionsDialog; -class ZLDialogContentBuilder { +class ZLCORE_EXPORT ZLDialogContentBuilder { public: virtual ~ZLDialogContentBuilder(); diff --git a/zlibrary/core/include/ZLDialogManager.h b/zlibrary/core/include/ZLDialogManager.h index 8d84d0c..1cb8886 100644 --- a/zlibrary/core/include/ZLDialogManager.h +++ b/zlibrary/core/include/ZLDialogManager.h @@ -35,7 +35,7 @@ class ZLApplication; class ZLImageData; class ZLProgressDialog; -class ZLDialogManager { +class ZLCORE_EXPORT ZLDialogManager { public: static const ZLResourceKey OK_BUTTON; diff --git a/zlibrary/core/include/ZLDir.h b/zlibrary/core/include/ZLDir.h index d353391..c4c52d2 100644 --- a/zlibrary/core/include/ZLDir.h +++ b/zlibrary/core/include/ZLDir.h @@ -25,7 +25,7 @@ #include -class ZLDir { +class ZLCORE_EXPORT ZLDir { public: static shared_ptr root(); diff --git a/zlibrary/core/include/ZLEncodingConverter.h b/zlibrary/core/include/ZLEncodingConverter.h index 84a61de..40f2875 100644 --- a/zlibrary/core/include/ZLEncodingConverter.h +++ b/zlibrary/core/include/ZLEncodingConverter.h @@ -26,7 +26,7 @@ #include -class ZLEncodingConverter { +class ZLCORE_EXPORT ZLEncodingConverter { public: static const std::string ASCII; @@ -49,7 +49,7 @@ private: ZLEncodingConverter &operator = (const ZLEncodingConverter&); }; -class ZLEncodingConverterInfo { +class ZLCORE_EXPORT ZLEncodingConverterInfo { public: ZLEncodingConverterInfo(const std::string &name, const std::string ®ion); @@ -73,7 +73,7 @@ private: typedef shared_ptr ZLEncodingConverterInfoPtr; -class ZLEncodingSet { +class ZLCORE_EXPORT ZLEncodingSet { public: ZLEncodingSet(const std::string &name); @@ -93,7 +93,7 @@ private: class ZLEncodingConverterProvider; -class ZLEncodingCollection { +class ZLCORE_EXPORT ZLEncodingCollection { public: static ZLEncodingCollection &Instance(); diff --git a/zlibrary/core/include/ZLEncodingConverterProvider.h b/zlibrary/core/include/ZLEncodingConverterProvider.h index 5a292eb..083202a 100644 --- a/zlibrary/core/include/ZLEncodingConverterProvider.h +++ b/zlibrary/core/include/ZLEncodingConverterProvider.h @@ -26,7 +26,7 @@ class ZLEncodingConverter; -class ZLEncodingConverterProvider { +class ZLCORE_EXPORT ZLEncodingConverterProvider { protected: ZLEncodingConverterProvider(); diff --git a/zlibrary/core/include/ZLExecutionUtil.h b/zlibrary/core/include/ZLExecutionUtil.h index 83f08a6..cec7498 100644 --- a/zlibrary/core/include/ZLExecutionUtil.h +++ b/zlibrary/core/include/ZLExecutionUtil.h @@ -23,7 +23,7 @@ #include #include "ZLNetworkRequest.h" -class ZLExecutionUtil { +class ZLCORE_EXPORT ZLExecutionUtil { //code for convenient async syntax createListener method: public: template diff --git a/zlibrary/core/include/ZLFSArchiverTar.h b/zlibrary/core/include/ZLFSArchiverTar.h index 703c746..a62952d 100644 --- a/zlibrary/core/include/ZLFSArchiverTar.h +++ b/zlibrary/core/include/ZLFSArchiverTar.h @@ -22,7 +22,7 @@ #include "ZLFSPlugin.h" -class ZLFSArchiverTar : public ZLFSArchiver { +class ZLCORE_EXPORT ZLFSArchiverTar : public ZLFSArchiver { public: ZLFSArchiverTar(); diff --git a/zlibrary/core/include/ZLFSArchiverZip.h b/zlibrary/core/include/ZLFSArchiverZip.h index 7d7d650..a9cf8e1 100644 --- a/zlibrary/core/include/ZLFSArchiverZip.h +++ b/zlibrary/core/include/ZLFSArchiverZip.h @@ -22,7 +22,7 @@ #include "ZLFSPlugin.h" -class ZLFSArchiverZip : public ZLFSArchiver { +class ZLCORE_EXPORT ZLFSArchiverZip : public ZLFSArchiver { public: ZLFSArchiverZip(); diff --git a/zlibrary/core/include/ZLFSCompressorBzip2.h b/zlibrary/core/include/ZLFSCompressorBzip2.h index 1339d93..0786af2 100644 --- a/zlibrary/core/include/ZLFSCompressorBzip2.h +++ b/zlibrary/core/include/ZLFSCompressorBzip2.h @@ -22,7 +22,7 @@ #include "ZLFSPlugin.h" -class ZLFSCompressorBzip2 : public ZLFSCompressor { +class ZLCORE_EXPORT ZLFSCompressorBzip2 : public ZLFSCompressor { public: ZLFSCompressorBzip2(); diff --git a/zlibrary/core/include/ZLFSCompressorGzip.h b/zlibrary/core/include/ZLFSCompressorGzip.h index 8552880..da5b45b 100644 --- a/zlibrary/core/include/ZLFSCompressorGzip.h +++ b/zlibrary/core/include/ZLFSCompressorGzip.h @@ -22,7 +22,7 @@ #include "ZLFSPlugin.h" -class ZLFSCompressorGzip : public ZLFSCompressor { +class ZLCORE_EXPORT ZLFSCompressorGzip : public ZLFSCompressor { public: ZLFSCompressorGzip(); diff --git a/zlibrary/core/include/ZLFSDir.h b/zlibrary/core/include/ZLFSDir.h index 9c63443..fc42aec 100644 --- a/zlibrary/core/include/ZLFSDir.h +++ b/zlibrary/core/include/ZLFSDir.h @@ -22,7 +22,7 @@ #include "ZLDir.h" -class ZLFSDir : public ZLDir { +class ZLCORE_EXPORT ZLFSDir : public ZLDir { protected: ZLFSDir(const std::string &path); diff --git a/zlibrary/core/include/ZLFSManager.h b/zlibrary/core/include/ZLFSManager.h index 9103f69..900d9cd 100644 --- a/zlibrary/core/include/ZLFSManager.h +++ b/zlibrary/core/include/ZLFSManager.h @@ -32,7 +32,7 @@ class ZLInputStream; class ZLOutputStream; class ZLFSPluginManager; -class ZLFSManager { +class ZLCORE_EXPORT ZLFSManager { public: static void deleteInstance(); diff --git a/zlibrary/core/include/ZLFSPlugin.h b/zlibrary/core/include/ZLFSPlugin.h index 6e7651e..fc87b2d 100644 --- a/zlibrary/core/include/ZLFSPlugin.h +++ b/zlibrary/core/include/ZLFSPlugin.h @@ -20,12 +20,14 @@ #ifndef __ZLFSPLUGIN_H__ #define __ZLFSPLUGIN_H__ +#include "core_export.h" + #include #include #include -class ZLFSCompressor { +class ZLCORE_EXPORT ZLFSCompressor { public: ZLFSCompressor(); @@ -40,7 +42,7 @@ public: inline ZLFSCompressor::ZLFSCompressor() {} inline ZLFSCompressor::~ZLFSCompressor() {} -class ZLFSArchiver { +class ZLCORE_EXPORT ZLFSArchiver { public: ZLFSArchiver(); diff --git a/zlibrary/core/include/ZLFSPluginManager.h b/zlibrary/core/include/ZLFSPluginManager.h index 9cef53e..9a70d3b 100644 --- a/zlibrary/core/include/ZLFSPluginManager.h +++ b/zlibrary/core/include/ZLFSPluginManager.h @@ -30,7 +30,7 @@ class ZLFile; -class ZLFSPluginManager { +class ZLCORE_EXPORT ZLFSPluginManager { public: ZLFSPluginManager(); diff --git a/zlibrary/core/include/ZLFile.h b/zlibrary/core/include/ZLFile.h index 5dae04c..7ee2f00 100644 --- a/zlibrary/core/include/ZLFile.h +++ b/zlibrary/core/include/ZLFile.h @@ -34,7 +34,7 @@ class ZLFSCompressor; class ZLFSArchiver; class ZLFSPluginManager; -class ZLFile { +class ZLCORE_EXPORT ZLFile { friend class ZLFSPluginManager; friend class ZLFSArchiver; diff --git a/zlibrary/core/include/ZLFileImage.h b/zlibrary/core/include/ZLFileImage.h index ff7ed86..e9f40a8 100644 --- a/zlibrary/core/include/ZLFileImage.h +++ b/zlibrary/core/include/ZLFileImage.h @@ -20,13 +20,15 @@ #ifndef __ZLFILEIMAGE_H__ #define __ZLFILEIMAGE_H__ +#include "core_export.h" + #include #include #include #include -class ZLFileImage : public ZLSingleImage { +class ZLCORE_EXPORT ZLFileImage : public ZLSingleImage { public: struct Block { diff --git a/zlibrary/core/include/ZLFileUtil.h b/zlibrary/core/include/ZLFileUtil.h index b76b68d..91ba4d3 100644 --- a/zlibrary/core/include/ZLFileUtil.h +++ b/zlibrary/core/include/ZLFileUtil.h @@ -20,9 +20,11 @@ #ifndef __ZLFILEUTIL_H__ #define __ZLFILEUTIL_H__ +#include "core_export.h" + #include -class ZLFileUtil { +class ZLCORE_EXPORT ZLFileUtil { public: static std::string normalizeUnixPath(const std::string &path); diff --git a/zlibrary/core/include/ZLFontFamilyOptionEntry.h b/zlibrary/core/include/ZLFontFamilyOptionEntry.h index 9a8a687..00f38c1 100644 --- a/zlibrary/core/include/ZLFontFamilyOptionEntry.h +++ b/zlibrary/core/include/ZLFontFamilyOptionEntry.h @@ -26,7 +26,7 @@ class ZLPaintContext; -class ZLFontFamilyOptionEntry : public ZLComboOptionEntry { +class ZLCORE_EXPORT ZLFontFamilyOptionEntry : public ZLComboOptionEntry { public: ZLFontFamilyOptionEntry(ZLStringOption &option, const ZLPaintContext &context); diff --git a/zlibrary/core/include/ZLGzipAsynchronousInputStream.h b/zlibrary/core/include/ZLGzipAsynchronousInputStream.h index b4cbfaa..667e1df 100644 --- a/zlibrary/core/include/ZLGzipAsynchronousInputStream.h +++ b/zlibrary/core/include/ZLGzipAsynchronousInputStream.h @@ -26,7 +26,7 @@ #include "ZLAsynchronousInputStream.h" -class ZLGzipAsynchronousInputStream : public ZLAsynchronousInputStream { +class ZLCORE_EXPORT ZLGzipAsynchronousInputStream : public ZLAsynchronousInputStream { public: ZLGzipAsynchronousInputStream(const char *encoding = 0); diff --git a/zlibrary/core/include/ZLHexEncodedImage.h b/zlibrary/core/include/ZLHexEncodedImage.h index 134314f..a89bdae 100644 --- a/zlibrary/core/include/ZLHexEncodedImage.h +++ b/zlibrary/core/include/ZLHexEncodedImage.h @@ -24,7 +24,7 @@ #include -class ZLHexEncodedImage : public ZLSingleImage { +class ZLCORE_EXPORT ZLHexEncodedImage : public ZLSingleImage { public: ZLHexEncodedImage(shared_ptr mimeType, shared_ptr encodedData); diff --git a/zlibrary/core/include/ZLHexInputStream.h b/zlibrary/core/include/ZLHexInputStream.h index b846cdd..6b8329b 100644 --- a/zlibrary/core/include/ZLHexInputStream.h +++ b/zlibrary/core/include/ZLHexInputStream.h @@ -22,7 +22,7 @@ #include -class ZLHexInputStream : public ZLInputStream { +class ZLCORE_EXPORT ZLHexInputStream : public ZLInputStream { public: ZLHexInputStream(shared_ptr base); ~ZLHexInputStream(); diff --git a/zlibrary/core/include/ZLImage.h b/zlibrary/core/include/ZLImage.h index 15c88b9..7cae527 100644 --- a/zlibrary/core/include/ZLImage.h +++ b/zlibrary/core/include/ZLImage.h @@ -28,7 +28,7 @@ class ZLNetworkRequest; -class ZLImage { +class ZLCORE_EXPORT ZLImage { protected: ZLImage(); @@ -40,7 +40,7 @@ public: virtual bool good() const = 0; }; -class ZLSingleImage : public ZLImage { +class ZLCORE_EXPORT ZLSingleImage : public ZLImage { protected: ZLSingleImage(shared_ptr mimeType); @@ -56,7 +56,7 @@ private: shared_ptr myMimeType; }; -class ZLMultiImage : public ZLImage { +class ZLCORE_EXPORT ZLMultiImage : public ZLImage { protected: ZLMultiImage(); diff --git a/zlibrary/core/include/ZLImageManager.h b/zlibrary/core/include/ZLImageManager.h index c845c2b..52012e7 100644 --- a/zlibrary/core/include/ZLImageManager.h +++ b/zlibrary/core/include/ZLImageManager.h @@ -28,7 +28,7 @@ class ZLImage; class ZLMultiImage; -class ZLImageData { +class ZLCORE_EXPORT ZLImageData { protected: ZLImageData() {} @@ -49,7 +49,7 @@ public: virtual void copyFrom(const ZLImageData &source, unsigned int targetX, unsigned int targetY) = 0; }; -class ZLImageManager { +class ZLCORE_EXPORT ZLImageManager { public: static const ZLImageManager &Instance(); diff --git a/zlibrary/core/include/ZLInputStream.h b/zlibrary/core/include/ZLInputStream.h index 7ac09c7..51e6622 100644 --- a/zlibrary/core/include/ZLInputStream.h +++ b/zlibrary/core/include/ZLInputStream.h @@ -25,7 +25,7 @@ #include #include -class ZLInputStream : public ZLUserDataHolder { +class ZLCORE_EXPORT ZLInputStream : public ZLUserDataHolder { protected: ZLInputStream(); @@ -46,7 +46,7 @@ private: const ZLInputStream &operator = (const ZLInputStream&); }; -class ZLInputStreamDecorator : public ZLInputStream { +class ZLCORE_EXPORT ZLInputStreamDecorator : public ZLInputStream { public: ZLInputStreamDecorator(shared_ptr decoratee); diff --git a/zlibrary/core/include/ZLKeyBindings.h b/zlibrary/core/include/ZLKeyBindings.h index 322baa4..2ea8633 100644 --- a/zlibrary/core/include/ZLKeyBindings.h +++ b/zlibrary/core/include/ZLKeyBindings.h @@ -20,10 +20,12 @@ #ifndef __ZLKEYBINDINGS_H__ #define __ZLKEYBINDINGS_H__ +#include "core_export.h" + #include #include -class ZLKeyBindings { +class ZLCORE_EXPORT ZLKeyBindings { public: ZLKeyBindings(const std::string &name); diff --git a/zlibrary/core/include/ZLKeyUtil.h b/zlibrary/core/include/ZLKeyUtil.h index 9368e5e..58c82e7 100644 --- a/zlibrary/core/include/ZLKeyUtil.h +++ b/zlibrary/core/include/ZLKeyUtil.h @@ -20,10 +20,12 @@ #ifndef __ZLKEYUTIL_H__ #define __ZLKEYUTIL_H__ +#include "core_export.h" + #include #include -class ZLKeyUtil { +class ZLCORE_EXPORT ZLKeyUtil { private: static bool ourInitialized; diff --git a/zlibrary/core/include/ZLLanguageDetector.h b/zlibrary/core/include/ZLLanguageDetector.h index 7f5d8dc..6cd51e1 100644 --- a/zlibrary/core/include/ZLLanguageDetector.h +++ b/zlibrary/core/include/ZLLanguageDetector.h @@ -20,6 +20,8 @@ #ifndef __ZLLANGUAGEDETECTOR_H__ #define __ZLLANGUAGEDETECTOR_H__ +#include "core_export.h" + #include #include @@ -27,7 +29,7 @@ class ZLStatisticsBasedMatcher; -class ZLLanguageDetector { +class ZLCORE_EXPORT ZLLanguageDetector { public: struct LanguageInfo { diff --git a/zlibrary/core/include/ZLLanguageList.h b/zlibrary/core/include/ZLLanguageList.h index 318c545..f9bd083 100644 --- a/zlibrary/core/include/ZLLanguageList.h +++ b/zlibrary/core/include/ZLLanguageList.h @@ -24,7 +24,7 @@ #include -class ZLLanguageList { +class ZLCORE_EXPORT ZLLanguageList { public: static std::string patternsDirectoryPath(); diff --git a/zlibrary/core/include/ZLLanguageMatcher.h b/zlibrary/core/include/ZLLanguageMatcher.h index 9460854..5ec9e8a 100644 --- a/zlibrary/core/include/ZLLanguageMatcher.h +++ b/zlibrary/core/include/ZLLanguageMatcher.h @@ -24,7 +24,7 @@ #include "ZLStatistics.h" -class ZLLanguageMatcher { +class ZLCORE_EXPORT ZLLanguageMatcher { public: ZLLanguageMatcher(shared_ptr info); @@ -36,7 +36,7 @@ private: shared_ptr myInfo; }; -class ZLStatisticsBasedMatcher : public ZLLanguageMatcher { +class ZLCORE_EXPORT ZLStatisticsBasedMatcher : public ZLLanguageMatcher { public: ZLStatisticsBasedMatcher(const std::string &fileName, shared_ptr info); diff --git a/zlibrary/core/include/ZLLanguageOptionEntry.h b/zlibrary/core/include/ZLLanguageOptionEntry.h index 292b89d..84711f3 100644 --- a/zlibrary/core/include/ZLLanguageOptionEntry.h +++ b/zlibrary/core/include/ZLLanguageOptionEntry.h @@ -24,7 +24,7 @@ #include -class ZLAbstractLanguageOptionEntry : public ZLComboOptionEntry { +class ZLCORE_EXPORT ZLAbstractLanguageOptionEntry : public ZLComboOptionEntry { public: ZLAbstractLanguageOptionEntry(const std::string &initialCode, const std::vector &languageCodes); @@ -42,7 +42,7 @@ private: }; -class ZLLanguageOptionEntry : public ZLAbstractLanguageOptionEntry { +class ZLCORE_EXPORT ZLLanguageOptionEntry : public ZLAbstractLanguageOptionEntry { public: ZLLanguageOptionEntry(ZLStringOption &languageOption, const std::vector &languageCodes); diff --git a/zlibrary/core/include/ZLLanguageUtil.h b/zlibrary/core/include/ZLLanguageUtil.h index a0f912c..67b2607 100644 --- a/zlibrary/core/include/ZLLanguageUtil.h +++ b/zlibrary/core/include/ZLLanguageUtil.h @@ -20,9 +20,11 @@ #ifndef __ZLLANGUAGEUTIL_H__ #define __ZLLANGUAGEUTIL_H__ +#include "core_export.h" + #include -class ZLLanguageUtil { +class ZLCORE_EXPORT ZLLanguageUtil { public: static const std::string OtherLanguageCode; diff --git a/zlibrary/core/include/ZLLogger.h b/zlibrary/core/include/ZLLogger.h index 5484b91..14ee23d 100644 --- a/zlibrary/core/include/ZLLogger.h +++ b/zlibrary/core/include/ZLLogger.h @@ -20,10 +20,12 @@ #ifndef __ZLLOGGER_H__ #define __ZLLOGGER_H__ +#include "core_export.h" + #include #include -class ZLLogger { +class ZLCORE_EXPORT ZLLogger { public: static const std::string DEFAULT_CLASS; diff --git a/zlibrary/core/include/ZLMenu.h b/zlibrary/core/include/ZLMenu.h index 5f6064b..cce2f07 100644 --- a/zlibrary/core/include/ZLMenu.h +++ b/zlibrary/core/include/ZLMenu.h @@ -26,7 +26,7 @@ #include #include -class ZLMenu { +class ZLCORE_EXPORT ZLMenu { public: class Item { @@ -72,7 +72,7 @@ private: friend class ZLApplication; }; -class ZLMenubar : public ZLMenu { +class ZLCORE_EXPORT ZLMenubar : public ZLMenu { public: class PlainItem : public ZLMenu::Item { @@ -108,7 +108,7 @@ public: friend class ZLApplication; }; -class ZLMenuVisitor { +class ZLCORE_EXPORT ZLMenuVisitor { public: virtual ~ZLMenuVisitor(); diff --git a/zlibrary/core/include/ZLMessage.h b/zlibrary/core/include/ZLMessage.h index 1b0bf8e..00252da 100644 --- a/zlibrary/core/include/ZLMessage.h +++ b/zlibrary/core/include/ZLMessage.h @@ -31,7 +31,7 @@ class ZLMessageSender; class ZLMessageHandler; -class ZLCommunicationManager { +class ZLCORE_EXPORT ZLCommunicationManager { public: static ZLCommunicationManager &Instance(); @@ -66,7 +66,7 @@ private: const ZLCommunicationManager &operator = (const ZLCommunicationManager&); }; -class ZLMessageOutputChannel { +class ZLCORE_EXPORT ZLMessageOutputChannel { public: virtual ~ZLMessageOutputChannel(); @@ -74,7 +74,7 @@ public: virtual shared_ptr createSender(const ZLCommunicationManager::Data &data) = 0; }; -class ZLMessageSender { +class ZLCORE_EXPORT ZLMessageSender { public: virtual ~ZLMessageSender(); @@ -82,7 +82,7 @@ public: virtual void sendStringMessage(const std::string &message) = 0; }; -class ZLMessageHandler { +class ZLCORE_EXPORT ZLMessageHandler { public: virtual ~ZLMessageHandler(); diff --git a/zlibrary/core/include/ZLMimeType.h b/zlibrary/core/include/ZLMimeType.h index 307dc6c..93cdafc 100644 --- a/zlibrary/core/include/ZLMimeType.h +++ b/zlibrary/core/include/ZLMimeType.h @@ -24,7 +24,7 @@ #include #include -class ZLMimeType { +class ZLCORE_EXPORT ZLMimeType { private: diff --git a/zlibrary/core/include/ZLMirroredPaintContext.h b/zlibrary/core/include/ZLMirroredPaintContext.h index ff7272d..b7bedfe 100644 --- a/zlibrary/core/include/ZLMirroredPaintContext.h +++ b/zlibrary/core/include/ZLMirroredPaintContext.h @@ -26,7 +26,7 @@ #include #include -class ZLMirroredPaintContext : public ZLPaintContext { +class ZLCORE_EXPORT ZLMirroredPaintContext : public ZLPaintContext { public: ZLMirroredPaintContext(ZLPaintContext &base); diff --git a/zlibrary/core/include/ZLNetworkDownloadRequest.h b/zlibrary/core/include/ZLNetworkDownloadRequest.h index 2726c65..6f212e8 100644 --- a/zlibrary/core/include/ZLNetworkDownloadRequest.h +++ b/zlibrary/core/include/ZLNetworkDownloadRequest.h @@ -25,7 +25,7 @@ class ZLOutputStream; -class ZLNetworkDownloadRequest : public ZLNetworkRequest { +class ZLCORE_EXPORT ZLNetworkDownloadRequest : public ZLNetworkRequest { public: ZLNetworkDownloadRequest(const std::string &url, const std::string &fileName); diff --git a/zlibrary/core/include/ZLNetworkImage.h b/zlibrary/core/include/ZLNetworkImage.h index 98a8223..f18ff3a 100644 --- a/zlibrary/core/include/ZLNetworkImage.h +++ b/zlibrary/core/include/ZLNetworkImage.h @@ -24,7 +24,7 @@ class ZLFileImage; -class ZLNetworkImage : public ZLSingleImage { +class ZLCORE_EXPORT ZLNetworkImage : public ZLSingleImage { public: ZLNetworkImage(shared_ptr mimeType, const std::string &url); diff --git a/zlibrary/core/include/ZLNetworkManager.h b/zlibrary/core/include/ZLNetworkManager.h index b2fb817..99fe9a0 100644 --- a/zlibrary/core/include/ZLNetworkManager.h +++ b/zlibrary/core/include/ZLNetworkManager.h @@ -32,7 +32,7 @@ class ZLNetworkData; class ZLOutputStream; class ZLXMLReader; -class ZLNetworkManager { +class ZLCORE_EXPORT ZLNetworkManager { public: static void deleteInstance(); diff --git a/zlibrary/core/include/ZLNetworkNoActionRequest.h b/zlibrary/core/include/ZLNetworkNoActionRequest.h index 96e21b3..e7ba005 100644 --- a/zlibrary/core/include/ZLNetworkNoActionRequest.h +++ b/zlibrary/core/include/ZLNetworkNoActionRequest.h @@ -23,7 +23,7 @@ #include "ZLNetworkRequest.h" -class ZLNetworkNoActionRequest : public ZLNetworkRequest { +class ZLCORE_EXPORT ZLNetworkNoActionRequest : public ZLNetworkRequest { public: ZLNetworkNoActionRequest(const std::string &url); diff --git a/zlibrary/core/include/ZLNetworkReadToStringRequest.h b/zlibrary/core/include/ZLNetworkReadToStringRequest.h index f1c37ba..e535238 100644 --- a/zlibrary/core/include/ZLNetworkReadToStringRequest.h +++ b/zlibrary/core/include/ZLNetworkReadToStringRequest.h @@ -22,8 +22,7 @@ #include "ZLNetworkRequest.h" - -class ZLNetworkReadToStringRequest : public ZLNetworkRequest { +class ZLCORE_EXPORT ZLNetworkReadToStringRequest : public ZLNetworkRequest { public: ZLNetworkReadToStringRequest(const std::string &url, std::string &buffer); diff --git a/zlibrary/core/include/ZLNetworkRequest.h b/zlibrary/core/include/ZLNetworkRequest.h index 431355a..5bc63f1 100644 --- a/zlibrary/core/include/ZLNetworkRequest.h +++ b/zlibrary/core/include/ZLNetworkRequest.h @@ -25,7 +25,7 @@ #include -class ZLNetworkRequest { +class ZLCORE_EXPORT ZLNetworkRequest { public: typedef std::vector > Vector; diff --git a/zlibrary/core/include/ZLNetworkUtil.h b/zlibrary/core/include/ZLNetworkUtil.h index 430044a..183402f 100644 --- a/zlibrary/core/include/ZLNetworkUtil.h +++ b/zlibrary/core/include/ZLNetworkUtil.h @@ -20,9 +20,11 @@ #ifndef __ZLNETWORKUTIL_H__ #define __ZLNETWORKUTIL_H__ +#include "core_export.h" + #include -class ZLNetworkUtil { +class ZLCORE_EXPORT ZLNetworkUtil { public: static std::string htmlEncode(const std::string &stringToEncode); diff --git a/zlibrary/core/include/ZLNetworkXMLParserRequest.h b/zlibrary/core/include/ZLNetworkXMLParserRequest.h index b03c847..708f4d8 100644 --- a/zlibrary/core/include/ZLNetworkXMLParserRequest.h +++ b/zlibrary/core/include/ZLNetworkXMLParserRequest.h @@ -20,14 +20,15 @@ #ifndef __ZLNETWORKXMLPARSERREQUEST_H__ #define __ZLNETWORKXMLPARSERREQUEST_H__ -#include +#include "core_export.h" +#include #include "ZLNetworkRequest.h" class ZLXMLReader; class ZLAsynchronousInputStream; -class ZLNetworkXMLParserRequest : public ZLNetworkRequest { +class ZLCORE_EXPORT ZLNetworkXMLParserRequest : public ZLNetworkRequest { public: ZLNetworkXMLParserRequest(const std::string &url, shared_ptr reader, shared_ptr runnable = 0); diff --git a/zlibrary/core/include/ZLOpenFileDialog.h b/zlibrary/core/include/ZLOpenFileDialog.h index e20673d..8cf79ff 100644 --- a/zlibrary/core/include/ZLOpenFileDialog.h +++ b/zlibrary/core/include/ZLOpenFileDialog.h @@ -20,11 +20,13 @@ #ifndef __ZLOPENFILEDIALOG_H__ #define __ZLOPENFILEDIALOG_H__ +#include "core_export.h" + #include class ZLFile; -class ZLOpenFileDialog { +class ZLCORE_EXPORT ZLOpenFileDialog { public: class Filter { diff --git a/zlibrary/core/include/ZLOptionEntry.h b/zlibrary/core/include/ZLOptionEntry.h index fb3a319..cb638d8 100644 --- a/zlibrary/core/include/ZLOptionEntry.h +++ b/zlibrary/core/include/ZLOptionEntry.h @@ -20,6 +20,8 @@ #ifndef __ZLOPTIONENTRY_H__ #define __ZLOPTIONENTRY_H__ +#include "core_export.h" + #include #include @@ -27,7 +29,7 @@ class ZLOptionView; -class ZLOptionEntry { +class ZLCORE_EXPORT ZLOptionEntry { public: enum ZLOptionKind { @@ -65,7 +67,7 @@ private: bool myIsActive; }; -class ZLChoiceOptionEntry : public ZLOptionEntry { +class ZLCORE_EXPORT ZLChoiceOptionEntry : public ZLOptionEntry { protected: ZLChoiceOptionEntry(); @@ -79,7 +81,7 @@ public: virtual void onAccept(int index) = 0; }; -class ZLTextOptionEntry : public ZLOptionEntry { +class ZLCORE_EXPORT ZLTextOptionEntry : public ZLOptionEntry { public: virtual const std::string &initialValue() const = 0; @@ -90,7 +92,7 @@ public: virtual void onValueEdited(const std::string &value); }; -class ZLStringOptionEntry : public ZLTextOptionEntry { +class ZLCORE_EXPORT ZLStringOptionEntry : public ZLTextOptionEntry { protected: ZLStringOptionEntry(); @@ -99,7 +101,7 @@ public: ZLOptionKind kind() const; }; -class ZLPasswordOptionEntry : public ZLTextOptionEntry { +class ZLCORE_EXPORT ZLPasswordOptionEntry : public ZLTextOptionEntry { protected: ZLPasswordOptionEntry(); @@ -108,7 +110,7 @@ public: ZLOptionKind kind() const; }; -class ZLMultilineOptionEntry : public ZLTextOptionEntry { +class ZLCORE_EXPORT ZLMultilineOptionEntry : public ZLTextOptionEntry { protected: ZLMultilineOptionEntry(); @@ -117,7 +119,7 @@ public: ZLOptionKind kind() const; }; -class ZLBooleanOptionEntry : public ZLOptionEntry { +class ZLCORE_EXPORT ZLBooleanOptionEntry : public ZLOptionEntry { protected: ZLBooleanOptionEntry(); @@ -130,7 +132,7 @@ public: virtual void onAccept(bool state) = 0; }; -class ZLBoolean3OptionEntry : public ZLOptionEntry { +class ZLCORE_EXPORT ZLBoolean3OptionEntry : public ZLOptionEntry { protected: ZLBoolean3OptionEntry(); @@ -143,7 +145,7 @@ public: virtual void onAccept(ZLBoolean3 state) = 0; }; -class ZLSpinOptionEntry : public ZLOptionEntry { +class ZLCORE_EXPORT ZLSpinOptionEntry : public ZLOptionEntry { protected: ZLSpinOptionEntry(); @@ -158,7 +160,7 @@ public: virtual void onAccept(int value) = 0; }; -class ZLComboOptionEntry : public ZLOptionEntry { +class ZLCORE_EXPORT ZLComboOptionEntry : public ZLOptionEntry { protected: ZLComboOptionEntry(bool editable = false); @@ -183,7 +185,7 @@ private: const bool myEditable; }; -class ZLColorOptionEntry : public ZLOptionEntry { +class ZLCORE_EXPORT ZLColorOptionEntry : public ZLOptionEntry { protected: ZLColorOptionEntry(); @@ -197,7 +199,7 @@ public: virtual void onReset(ZLColor color); }; -class ZLKeyOptionEntry : public ZLOptionEntry { +class ZLCORE_EXPORT ZLKeyOptionEntry : public ZLOptionEntry { public: ZLKeyOptionEntry(); @@ -215,7 +217,7 @@ private: std::vector myActionNames; }; -class ZLOrderOptionEntry : public ZLOptionEntry { +class ZLCORE_EXPORT ZLOrderOptionEntry : public ZLOptionEntry { public: ZLOrderOptionEntry(); @@ -228,7 +230,7 @@ private: std::vector myValues; }; -class ZLStaticTextOptionEntry : public ZLOptionEntry { +class ZLCORE_EXPORT ZLStaticTextOptionEntry : public ZLOptionEntry { public: virtual ZLOptionKind kind() const; diff --git a/zlibrary/core/include/ZLOptionView.h b/zlibrary/core/include/ZLOptionView.h index b89bf48..e537f31 100644 --- a/zlibrary/core/include/ZLOptionView.h +++ b/zlibrary/core/include/ZLOptionView.h @@ -26,7 +26,7 @@ class ZLOptionEntry; -class ZLOptionView { +class ZLCORE_EXPORT ZLOptionView { public: ZLOptionView(const std::string &name, const std::string &tooltip, shared_ptr option); diff --git a/zlibrary/core/include/ZLOptions.h b/zlibrary/core/include/ZLOptions.h index 80a6aec..5a4c11c 100644 --- a/zlibrary/core/include/ZLOptions.h +++ b/zlibrary/core/include/ZLOptions.h @@ -20,13 +20,15 @@ #ifndef __ZLOPTIONS_H__ #define __ZLOPTIONS_H__ +#include "core_export.h" + #include #include #include #include -class ZLCategoryKey { +class ZLCORE_EXPORT ZLCategoryKey { public: static const ZLCategoryKey EMPTY; @@ -48,7 +50,7 @@ public: class ZLConfig; -class ZLOption { +class ZLCORE_EXPORT ZLOption { private: static ZLConfig *ourConfig; @@ -99,7 +101,7 @@ private: const ZLOption &operator = (const ZLOption&); }; -class ZLSimpleOption : public ZLOption { +class ZLCORE_EXPORT ZLSimpleOption : public ZLOption { public: enum Type { @@ -116,7 +118,7 @@ public: virtual Type type() const = 0; }; -class ZLBooleanOption : public ZLSimpleOption { +class ZLCORE_EXPORT ZLBooleanOption : public ZLSimpleOption { public: ZLBooleanOption(const ZLCategoryKey &category, const std::string &group, const std::string &optionName, bool defaultValue); @@ -130,7 +132,7 @@ private: const bool myDefaultValue; }; -class ZLBoolean3Option : public ZLSimpleOption { +class ZLCORE_EXPORT ZLBoolean3Option : public ZLSimpleOption { public: ZLBoolean3Option(const ZLCategoryKey &category, const std::string &group, const std::string &optionName, ZLBoolean3 defaultValue); @@ -144,7 +146,7 @@ private: const ZLBoolean3 myDefaultValue; }; -class ZLIntegerOption : public ZLOption { +class ZLCORE_EXPORT ZLIntegerOption : public ZLOption { public: ZLIntegerOption(const ZLCategoryKey &category, const std::string &group, const std::string &optionName, long defaultValue); @@ -157,7 +159,7 @@ private: const long myDefaultValue; }; -class ZLIntegerRangeOption : public ZLOption { +class ZLCORE_EXPORT ZLIntegerRangeOption : public ZLOption { public: ZLIntegerRangeOption(const ZLCategoryKey &category, const std::string &group, const std::string &optionName, long minValue, long maxValue, long defaultValue); @@ -174,7 +176,7 @@ private: const long myDefaultValue; }; -class ZLColorOption : public ZLOption { +class ZLCORE_EXPORT ZLColorOption : public ZLOption { public: ZLColorOption(const ZLCategoryKey &category, const std::string &group, const std::string &optionName, ZLColor defaultValue); @@ -187,7 +189,7 @@ private: const long myDefaultIntValue; }; -class ZLDoubleOption : public ZLOption { +class ZLCORE_EXPORT ZLDoubleOption : public ZLOption { public: ZLDoubleOption(const ZLCategoryKey &category, const std::string &group, const std::string &optionName, double defaultValue); @@ -200,7 +202,7 @@ private: const double myDefaultValue; }; -class ZLStringOption : public ZLSimpleOption { +class ZLCORE_EXPORT ZLStringOption : public ZLSimpleOption { public: ZLStringOption(const ZLCategoryKey &category, const std::string &group, const std::string &optionName, const std::string &defaultValue); diff --git a/zlibrary/core/include/ZLOptionsDialog.h b/zlibrary/core/include/ZLOptionsDialog.h index 0a72cdb..b0d9e93 100644 --- a/zlibrary/core/include/ZLOptionsDialog.h +++ b/zlibrary/core/include/ZLOptionsDialog.h @@ -34,7 +34,7 @@ class ZLOptionEntry; class ZLDialogContentBuilder; -class ZLOptionsDialog { +class ZLCORE_EXPORT ZLOptionsDialog { protected: static void addPlatformDependentBuilder(shared_ptr builder); diff --git a/zlibrary/core/include/ZLOutputStream.h b/zlibrary/core/include/ZLOutputStream.h index 63da97f..912eb0d 100644 --- a/zlibrary/core/include/ZLOutputStream.h +++ b/zlibrary/core/include/ZLOutputStream.h @@ -20,9 +20,11 @@ #ifndef __ZLOUTPUTSTREAM_H__ #define __ZLOUTPUTSTREAM_H__ +#include "core_export.h" + #include -class ZLOutputStream { +class ZLCORE_EXPORT ZLOutputStream { protected: ZLOutputStream(); diff --git a/zlibrary/core/include/ZLPaintContext.h b/zlibrary/core/include/ZLPaintContext.h index 7597a33..c81226b 100644 --- a/zlibrary/core/include/ZLPaintContext.h +++ b/zlibrary/core/include/ZLPaintContext.h @@ -26,7 +26,7 @@ #include #include -class ZLPaintContext { +class ZLCORE_EXPORT ZLPaintContext { public: enum LineStyle { diff --git a/zlibrary/core/include/ZLPlainAsynchronousInputStream.h b/zlibrary/core/include/ZLPlainAsynchronousInputStream.h index eb8d0a7..df1087e 100644 --- a/zlibrary/core/include/ZLPlainAsynchronousInputStream.h +++ b/zlibrary/core/include/ZLPlainAsynchronousInputStream.h @@ -20,10 +20,10 @@ #ifndef __ZLPLAINASYNCHRONOUSINPUTSTREAM_H__ #define __ZLPLAINASYNCHRONOUSINPUTSTREAM_H__ +#include "core_export.h" #include - -class ZLPlainAsynchronousInputStream : public ZLAsynchronousInputStream { +class ZLCORE_EXPORT ZLPlainAsynchronousInputStream : public ZLAsynchronousInputStream { public: ZLPlainAsynchronousInputStream(const char *encoding = 0); diff --git a/zlibrary/core/include/ZLPopupData.h b/zlibrary/core/include/ZLPopupData.h index 235826e..4e02f65 100644 --- a/zlibrary/core/include/ZLPopupData.h +++ b/zlibrary/core/include/ZLPopupData.h @@ -24,7 +24,7 @@ #include -class ZLPopupData { +class ZLCORE_EXPORT ZLPopupData { public: virtual ~ZLPopupData(); diff --git a/zlibrary/core/include/ZLProgressDialog.h b/zlibrary/core/include/ZLProgressDialog.h index be471a0..58aab60 100644 --- a/zlibrary/core/include/ZLProgressDialog.h +++ b/zlibrary/core/include/ZLProgressDialog.h @@ -24,7 +24,7 @@ #include #include -class ZLProgressDialog { +class ZLCORE_EXPORT ZLProgressDialog { private: class ProgressListener; diff --git a/zlibrary/core/include/ZLResource.h b/zlibrary/core/include/ZLResource.h index ee088f2..76a954b 100644 --- a/zlibrary/core/include/ZLResource.h +++ b/zlibrary/core/include/ZLResource.h @@ -20,6 +20,8 @@ #ifndef __ZLRESOURCE_H__ #define __ZLRESOURCE_H__ +#include "core_export.h" + #include struct ZLResourceKey { @@ -29,7 +31,7 @@ struct ZLResourceKey { std::string Name; }; -class ZLResource { +class ZLCORE_EXPORT ZLResource { public: static const ZLResource &resource(const std::string &key); diff --git a/zlibrary/core/include/ZLRunnable.h b/zlibrary/core/include/ZLRunnable.h index 60914f1..dcbc299 100644 --- a/zlibrary/core/include/ZLRunnable.h +++ b/zlibrary/core/include/ZLRunnable.h @@ -20,19 +20,21 @@ #ifndef __ZLRUNNABLE_H__ #define __ZLRUNNABLE_H__ +#include "core_export.h" + #include class ZLResource; struct ZLResourceKey; -class ZLRunnable { +class ZLCORE_EXPORT ZLRunnable { public: virtual ~ZLRunnable(); virtual void run() = 0; }; -class ZLRunnableWithKey : public ZLRunnable { +class ZLCORE_EXPORT ZLRunnableWithKey : public ZLRunnable { public: virtual ZLResourceKey key() const = 0; diff --git a/zlibrary/core/include/ZLSearchUtil.h b/zlibrary/core/include/ZLSearchUtil.h index 797b7af..0afc3b8 100644 --- a/zlibrary/core/include/ZLSearchUtil.h +++ b/zlibrary/core/include/ZLSearchUtil.h @@ -20,9 +20,11 @@ #ifndef __ZLSEARCHUTIL_H__ #define __ZLSEARCHUTIL_H__ +#include "core_export.h" + #include -class ZLSearchPattern { +class ZLCORE_EXPORT ZLSearchPattern { public: ZLSearchPattern(const std::string &pattern, bool ignoreCase); @@ -42,7 +44,7 @@ private: friend class ZLSearchUtil; }; -class ZLSearchUtil { +class ZLCORE_EXPORT ZLSearchUtil { private: ZLSearchUtil(); diff --git a/zlibrary/core/include/ZLSimpleKeyOptionEntry.h b/zlibrary/core/include/ZLSimpleKeyOptionEntry.h index 439fb53..d0363ce 100644 --- a/zlibrary/core/include/ZLSimpleKeyOptionEntry.h +++ b/zlibrary/core/include/ZLSimpleKeyOptionEntry.h @@ -27,7 +27,7 @@ class ZLKeyBindings; -class ZLSimpleKeyOptionEntry : public ZLKeyOptionEntry { +class ZLCORE_EXPORT ZLSimpleKeyOptionEntry : public ZLKeyOptionEntry { public: class CodeIndexBimap { diff --git a/zlibrary/core/include/ZLSimpleOptionEntry.h b/zlibrary/core/include/ZLSimpleOptionEntry.h index 12288c3..c753148 100644 --- a/zlibrary/core/include/ZLSimpleOptionEntry.h +++ b/zlibrary/core/include/ZLSimpleOptionEntry.h @@ -22,7 +22,7 @@ #include -class ZLSimpleStringOptionEntry : public ZLStringOptionEntry { +class ZLCORE_EXPORT ZLSimpleStringOptionEntry : public ZLStringOptionEntry { public: ZLSimpleStringOptionEntry(ZLStringOption &option); @@ -33,7 +33,7 @@ private: ZLStringOption &myOption; }; -class ZLSimpleBooleanOptionEntry : public ZLBooleanOptionEntry { +class ZLCORE_EXPORT ZLSimpleBooleanOptionEntry : public ZLBooleanOptionEntry { public: ZLSimpleBooleanOptionEntry(ZLBooleanOption &option); @@ -44,7 +44,7 @@ private: ZLBooleanOption &myOption; }; -class ZLSimpleSpinOptionEntry : public ZLSpinOptionEntry { +class ZLCORE_EXPORT ZLSimpleSpinOptionEntry : public ZLSpinOptionEntry { public: ZLSimpleSpinOptionEntry(ZLIntegerRangeOption &option, int step); @@ -59,7 +59,7 @@ private: int myStep; }; -class ZLSimpleBoolean3OptionEntry : public ZLBoolean3OptionEntry { +class ZLCORE_EXPORT ZLSimpleBoolean3OptionEntry : public ZLBoolean3OptionEntry { public: ZLSimpleBoolean3OptionEntry(ZLBoolean3Option &option); @@ -71,7 +71,7 @@ private: }; /* -class ZLSimpleColorOptionEntry : public ZLColorOptionEntry { +class ZLCORE_EXPORT ZLSimpleColorOptionEntry : public ZLColorOptionEntry { public: ZLSimpleColorOptionEntry(ZLColorOption &option); @@ -83,7 +83,7 @@ private: }; */ -class ZLSimpleStaticTextOptionEntry : public ZLStaticTextOptionEntry { +class ZLCORE_EXPORT ZLSimpleStaticTextOptionEntry : public ZLStaticTextOptionEntry { public: ZLSimpleStaticTextOptionEntry(const std::string &text); diff --git a/zlibrary/core/include/ZLSliceInputStream.h b/zlibrary/core/include/ZLSliceInputStream.h index 9333be8..3f25524 100644 --- a/zlibrary/core/include/ZLSliceInputStream.h +++ b/zlibrary/core/include/ZLSliceInputStream.h @@ -22,7 +22,7 @@ #include -class ZLSliceInputStream : public ZLInputStream { +class ZLCORE_EXPORT ZLSliceInputStream : public ZLInputStream { public: ZLSliceInputStream(shared_ptr base, std::size_t start, std::size_t length); diff --git a/zlibrary/core/include/ZLStatistics.h b/zlibrary/core/include/ZLStatistics.h index 98bd387..35d5147 100644 --- a/zlibrary/core/include/ZLStatistics.h +++ b/zlibrary/core/include/ZLStatistics.h @@ -28,7 +28,7 @@ #include "ZLCharSequence.h" #include "ZLStatisticsItem.h" -class ZLStatistics { +class ZLCORE_EXPORT ZLStatistics { public: ZLStatistics(); diff --git a/zlibrary/core/include/ZLStatisticsGenerator.h b/zlibrary/core/include/ZLStatisticsGenerator.h index 2196725..053ae7a 100644 --- a/zlibrary/core/include/ZLStatisticsGenerator.h +++ b/zlibrary/core/include/ZLStatisticsGenerator.h @@ -20,11 +20,13 @@ #ifndef __ZLSTATISTICSGENERATOR_H__ #define __ZLSTATISTICSGENERATOR_H__ +#include "core_export.h" + #include class ZLMapBasedStatistics; -class ZLStatisticsGenerator { +class ZLCORE_EXPORT ZLStatisticsGenerator { public: ZLStatisticsGenerator(const std::string &breakSymbols); diff --git a/zlibrary/core/include/ZLStatisticsXMLReader.h b/zlibrary/core/include/ZLStatisticsXMLReader.h index 8058f81..a2a7f44 100644 --- a/zlibrary/core/include/ZLStatisticsXMLReader.h +++ b/zlibrary/core/include/ZLStatisticsXMLReader.h @@ -27,7 +27,7 @@ class ZLCharSequence; -class ZLStatisticsXMLReader : public ZLXMLReader { +class ZLCORE_EXPORT ZLStatisticsXMLReader : public ZLXMLReader { public: shared_ptr readStatistics(const std::string &fileName); diff --git a/zlibrary/core/include/ZLStatisticsXMLWriter.h b/zlibrary/core/include/ZLStatisticsXMLWriter.h index 64e6822..300dd2d 100644 --- a/zlibrary/core/include/ZLStatisticsXMLWriter.h +++ b/zlibrary/core/include/ZLStatisticsXMLWriter.h @@ -27,7 +27,7 @@ class ZLMapBasedStatistics; -class ZLStatisticsXMLWriter: public ZLXMLWriter { +class ZLCORE_EXPORT ZLStatisticsXMLWriter: public ZLXMLWriter { public: ZLStatisticsXMLWriter(ZLOutputStream &stream) : ZLXMLWriter(stream) {} diff --git a/zlibrary/core/include/ZLStreamImage.h b/zlibrary/core/include/ZLStreamImage.h index 95f03f8..06c164e 100644 --- a/zlibrary/core/include/ZLStreamImage.h +++ b/zlibrary/core/include/ZLStreamImage.h @@ -25,7 +25,7 @@ #include #include -class ZLStreamImage : public ZLSingleImage { +class ZLCORE_EXPORT ZLStreamImage : public ZLSingleImage { public: ZLStreamImage(shared_ptr mimeType, std::size_t offset, std::size_t size = 0); diff --git a/zlibrary/core/include/ZLStringEditOptionEntry.h b/zlibrary/core/include/ZLStringEditOptionEntry.h index c7e234a..1992f90 100644 --- a/zlibrary/core/include/ZLStringEditOptionEntry.h +++ b/zlibrary/core/include/ZLStringEditOptionEntry.h @@ -22,7 +22,7 @@ #include -class ZLStringEditOptionEntry : public ZLStringOptionEntry { +class ZLCORE_EXPORT ZLStringEditOptionEntry : public ZLStringOptionEntry { public: ZLStringEditOptionEntry(std::string &value); diff --git a/zlibrary/core/include/ZLStringInfoEntry.h b/zlibrary/core/include/ZLStringInfoEntry.h index a419157..30f723e 100644 --- a/zlibrary/core/include/ZLStringInfoEntry.h +++ b/zlibrary/core/include/ZLStringInfoEntry.h @@ -24,7 +24,7 @@ #include -class ZLStringInfoEntry : public ZLStringOptionEntry { +class ZLCORE_EXPORT ZLStringInfoEntry : public ZLStringOptionEntry { public: ZLStringInfoEntry(const std::string &value); diff --git a/zlibrary/core/include/ZLStringUtil.h b/zlibrary/core/include/ZLStringUtil.h index 71dda00..61af9f6 100644 --- a/zlibrary/core/include/ZLStringUtil.h +++ b/zlibrary/core/include/ZLStringUtil.h @@ -20,10 +20,12 @@ #ifndef __ZLSTRINGUTIL_H__ #define __ZLSTRINGUTIL_H__ +#include "core_export.h" + #include #include -class ZLStringUtil { +class ZLCORE_EXPORT ZLStringUtil { private: ZLStringUtil(); diff --git a/zlibrary/core/include/ZLTar.h b/zlibrary/core/include/ZLTar.h index b916a83..b1b2aae 100644 --- a/zlibrary/core/include/ZLTar.h +++ b/zlibrary/core/include/ZLTar.h @@ -27,7 +27,7 @@ class ZLFSArchiverTar; -class ZLTarInputStream : public ZLInputStream { +class ZLCORE_EXPORT ZLTarInputStream : public ZLInputStream { private: ZLTarInputStream(shared_ptr &base, const std::string &name); @@ -51,7 +51,7 @@ private: friend class ZLFSArchiverTar; }; -class ZLTarDir : public ZLDir { +class ZLCORE_EXPORT ZLTarDir : public ZLDir { private: ZLTarDir(const std::string &path); diff --git a/zlibrary/core/include/ZLTime.h b/zlibrary/core/include/ZLTime.h index c06478f..53897ba 100644 --- a/zlibrary/core/include/ZLTime.h +++ b/zlibrary/core/include/ZLTime.h @@ -20,7 +20,9 @@ #ifndef __ZLTIME_H__ #define __ZLTIME_H__ -class ZLTime { +#include "core_export.h" + +class ZLCORE_EXPORT ZLTime { public: ZLTime(); diff --git a/zlibrary/core/include/ZLTimeManager.h b/zlibrary/core/include/ZLTimeManager.h index 639e420..a52ab3d 100644 --- a/zlibrary/core/include/ZLTimeManager.h +++ b/zlibrary/core/include/ZLTimeManager.h @@ -27,7 +27,7 @@ class ZLTime; -class ZLTimeManager { +class ZLCORE_EXPORT ZLTimeManager { private: class AutoRemovableTask; diff --git a/zlibrary/core/include/ZLToggleBooleanOptionEntry.h b/zlibrary/core/include/ZLToggleBooleanOptionEntry.h index 8859267..e9b6c0b 100644 --- a/zlibrary/core/include/ZLToggleBooleanOptionEntry.h +++ b/zlibrary/core/include/ZLToggleBooleanOptionEntry.h @@ -22,7 +22,7 @@ #include -class ZLToggleBooleanOptionEntry : public ZLSimpleBooleanOptionEntry { +class ZLCORE_EXPORT ZLToggleBooleanOptionEntry : public ZLSimpleBooleanOptionEntry { public: ZLToggleBooleanOptionEntry(ZLBooleanOption &option); diff --git a/zlibrary/core/include/ZLToolbar.h b/zlibrary/core/include/ZLToolbar.h index f7e9f72..66b8400 100644 --- a/zlibrary/core/include/ZLToolbar.h +++ b/zlibrary/core/include/ZLToolbar.h @@ -31,7 +31,7 @@ class ZLResource; class ZLPopupData; -class ZLToolbar { +class ZLCORE_EXPORT ZLToolbar { public: class Item { diff --git a/zlibrary/core/include/ZLTreeActionNode.h b/zlibrary/core/include/ZLTreeActionNode.h index 6212aed..8176b64 100644 --- a/zlibrary/core/include/ZLTreeActionNode.h +++ b/zlibrary/core/include/ZLTreeActionNode.h @@ -22,7 +22,7 @@ #include "ZLTreeTitledNode.h" -class ZLTreeActionNode : public ZLTreeTitledNode { +class ZLCORE_EXPORT ZLTreeActionNode : public ZLTreeTitledNode { public: static const ZLTypeId TYPE_ID; diff --git a/zlibrary/core/include/ZLTreeDialog.h b/zlibrary/core/include/ZLTreeDialog.h index 2bf5289..b432d26 100644 --- a/zlibrary/core/include/ZLTreeDialog.h +++ b/zlibrary/core/include/ZLTreeDialog.h @@ -24,7 +24,7 @@ #include #include -class ZLTreeDialog : public ZLTreeListener { +class ZLCORE_EXPORT ZLTreeDialog : public ZLTreeListener { protected: ZLTreeDialog(const ZLResource &resource); diff --git a/zlibrary/core/include/ZLTreeListener.h b/zlibrary/core/include/ZLTreeListener.h index e602015..5112571 100644 --- a/zlibrary/core/include/ZLTreeListener.h +++ b/zlibrary/core/include/ZLTreeListener.h @@ -24,7 +24,7 @@ //ZLTreeListener is used to get ability to node to notificate Tree Dialog about any changes -class ZLTreeListener { +class ZLCORE_EXPORT ZLTreeListener { public: virtual void onExpandRequest(ZLTreeNode *node) = 0; diff --git a/zlibrary/core/include/ZLTreeNode.h b/zlibrary/core/include/ZLTreeNode.h index 79c8b87..7b182f9 100644 --- a/zlibrary/core/include/ZLTreeNode.h +++ b/zlibrary/core/include/ZLTreeNode.h @@ -60,7 +60,7 @@ class ZLTreeListener; typedef ZLRunnableWithKey ZLTreeAction; -class ZLTreeNode : public ZLObjectWithRTTI { +class ZLCORE_EXPORT ZLTreeNode : public ZLObjectWithRTTI { public: typedef std::vector List; diff --git a/zlibrary/core/include/ZLTreePageNode.h b/zlibrary/core/include/ZLTreePageNode.h index 8226ea1..18c5e2a 100644 --- a/zlibrary/core/include/ZLTreePageNode.h +++ b/zlibrary/core/include/ZLTreePageNode.h @@ -23,7 +23,7 @@ #include "ZLTreeTitledNode.h" #include -class ZLTreePageInfo { +class ZLCORE_EXPORT ZLTreePageInfo { public: virtual bool isPageInfoLoaded() = 0; @@ -40,7 +40,7 @@ public: virtual const std::vector > relatedActions() const = 0; }; -class ZLTreePageNode : public ZLTreeTitledNode { +class ZLCORE_EXPORT ZLTreePageNode : public ZLTreeTitledNode { public: ZLTreePageNode(ZLTreeNode *parent = 0, std::size_t position = -1); diff --git a/zlibrary/core/include/ZLTreeSearcher.h b/zlibrary/core/include/ZLTreeSearcher.h index 747d9c5..8f7ebe4 100644 --- a/zlibrary/core/include/ZLTreeSearcher.h +++ b/zlibrary/core/include/ZLTreeSearcher.h @@ -20,9 +20,11 @@ #ifndef __ZLTREESEARCHER_H__ #define __ZLTREESEARCHER_H__ +#include "core_export.h" + #include -class ZLTreeSearcher { +class ZLCORE_EXPORT ZLTreeSearcher { public: virtual void simpleSearch(const std::string &pattern) = 0; }; diff --git a/zlibrary/core/include/ZLTreeTitledNode.h b/zlibrary/core/include/ZLTreeTitledNode.h index a68a746..f2545ab 100644 --- a/zlibrary/core/include/ZLTreeTitledNode.h +++ b/zlibrary/core/include/ZLTreeTitledNode.h @@ -23,7 +23,7 @@ #include "ZLTreeNode.h" #include -class ZLTreeTitledNode : public ZLTreeNode { +class ZLCORE_EXPORT ZLTreeTitledNode : public ZLTreeNode { public: static const ZLTypeId TYPE_ID; diff --git a/zlibrary/core/include/ZLTypeId.h b/zlibrary/core/include/ZLTypeId.h index ed5679a..5a65514 100644 --- a/zlibrary/core/include/ZLTypeId.h +++ b/zlibrary/core/include/ZLTypeId.h @@ -20,7 +20,9 @@ #ifndef __ZLTYPEID_H__ #define __ZLTYPEID_H__ -class ZLTypeId { +#include "core_export.h" + +class ZLCORE_EXPORT ZLTypeId { private: ZLTypeId(); @@ -38,7 +40,7 @@ private: friend class ZLObjectWithRTTI; }; -class ZLObjectWithRTTI { +class ZLCORE_EXPORT ZLObjectWithRTTI { public: static const ZLTypeId TYPE_ID; diff --git a/zlibrary/core/include/ZLUnicodeUtil.h b/zlibrary/core/include/ZLUnicodeUtil.h index 963e671..4d8493d 100644 --- a/zlibrary/core/include/ZLUnicodeUtil.h +++ b/zlibrary/core/include/ZLUnicodeUtil.h @@ -20,11 +20,13 @@ #ifndef __ZLUNICODEUTIL_H__ #define __ZLUNICODEUTIL_H__ +#include "core_export.h" + #include #include #include -class ZLUnicodeUtil { +class ZLCORE_EXPORT ZLUnicodeUtil { private: ZLUnicodeUtil(); diff --git a/zlibrary/core/include/ZLUnixFSDir.h b/zlibrary/core/include/ZLUnixFSDir.h index 50bd44c..4cc82e8 100644 --- a/zlibrary/core/include/ZLUnixFSDir.h +++ b/zlibrary/core/include/ZLUnixFSDir.h @@ -22,7 +22,7 @@ #include "ZLFSDir.h" -class ZLUnixFSDir : public ZLFSDir { +class ZLCORE_EXPORT ZLUnixFSDir : public ZLFSDir { public: ZLUnixFSDir(const std::string &name) : ZLFSDir(name) {} diff --git a/zlibrary/core/include/ZLUnixFSManager.h b/zlibrary/core/include/ZLUnixFSManager.h index fb80c16..fb94262 100644 --- a/zlibrary/core/include/ZLUnixFSManager.h +++ b/zlibrary/core/include/ZLUnixFSManager.h @@ -20,9 +20,11 @@ #ifndef __ZLUNIXFSMANAGER_H__ #define __ZLUNIXFSMANAGER_H__ +#include "core_export.h" + #include "ZLFSManager.h" -class ZLUnixFSManager : public ZLFSManager { +class ZLCORE_EXPORT ZLUnixFSManager : public ZLFSManager { protected: void normalizeRealPath(std::string &path) const; diff --git a/zlibrary/core/include/ZLUnixFileInputStream.h b/zlibrary/core/include/ZLUnixFileInputStream.h index 470489e..183cefa 100644 --- a/zlibrary/core/include/ZLUnixFileInputStream.h +++ b/zlibrary/core/include/ZLUnixFileInputStream.h @@ -24,7 +24,7 @@ #include -class ZLUnixFileInputStream : public ZLInputStream { +class ZLCORE_EXPORT ZLUnixFileInputStream : public ZLInputStream { public: ZLUnixFileInputStream(const std::string &name); diff --git a/zlibrary/core/include/ZLUnixFileOutputStream.h b/zlibrary/core/include/ZLUnixFileOutputStream.h index 7f61a0c..a4dfe9e 100644 --- a/zlibrary/core/include/ZLUnixFileOutputStream.h +++ b/zlibrary/core/include/ZLUnixFileOutputStream.h @@ -24,7 +24,7 @@ #include -class ZLUnixFileOutputStream : public ZLOutputStream { +class ZLCORE_EXPORT ZLUnixFileOutputStream : public ZLOutputStream { public: ZLUnixFileOutputStream(const std::string &name); diff --git a/zlibrary/core/include/ZLUnixMessage.h b/zlibrary/core/include/ZLUnixMessage.h index 69b33c9..6b731c5 100644 --- a/zlibrary/core/include/ZLUnixMessage.h +++ b/zlibrary/core/include/ZLUnixMessage.h @@ -24,7 +24,7 @@ #include -class ZLUnixCommunicationManager : public ZLCommunicationManager { +class ZLCORE_EXPORT ZLUnixCommunicationManager : public ZLCommunicationManager { public: static void createInstance(); @@ -36,13 +36,13 @@ private: ZLUnixCommunicationManager(); }; -class ZLUnixExecMessageOutputChannel : public ZLMessageOutputChannel { +class ZLCORE_EXPORT ZLUnixExecMessageOutputChannel : public ZLMessageOutputChannel { public: shared_ptr createSender(const ZLCommunicationManager::Data &data); }; -class ZLUnixExecMessageSender : public ZLMessageSender { +class ZLCORE_EXPORT ZLUnixExecMessageSender : public ZLMessageSender { private: ZLUnixExecMessageSender(const std::string &command); diff --git a/zlibrary/core/include/ZLUnixTime.h b/zlibrary/core/include/ZLUnixTime.h index 5877f3d..871d466 100644 --- a/zlibrary/core/include/ZLUnixTime.h +++ b/zlibrary/core/include/ZLUnixTime.h @@ -22,7 +22,7 @@ #include -class ZLUnixTimeManager : public ZLTimeManager { +class ZLCORE_EXPORT ZLUnixTimeManager : public ZLTimeManager { private: ZLTime currentTime() const; diff --git a/zlibrary/core/include/ZLUserData.h b/zlibrary/core/include/ZLUserData.h index db98346..7c07f5e 100644 --- a/zlibrary/core/include/ZLUserData.h +++ b/zlibrary/core/include/ZLUserData.h @@ -25,13 +25,13 @@ #include -class ZLUserData { +class ZLCORE_EXPORT ZLUserData { public: virtual ~ZLUserData(); }; -class ZLUserDataHolder { +class ZLCORE_EXPORT ZLUserDataHolder { public: ZLUserDataHolder(); diff --git a/zlibrary/core/include/ZLView.h b/zlibrary/core/include/ZLView.h index bc8e42b..66837ce 100644 --- a/zlibrary/core/include/ZLView.h +++ b/zlibrary/core/include/ZLView.h @@ -30,7 +30,7 @@ class ZLViewWidget; class ZLPaintContext; -class ZLView : public ZLObjectWithRTTI { +class ZLCORE_EXPORT ZLView : public ZLObjectWithRTTI { public: enum Angle { diff --git a/zlibrary/core/include/ZLViewWidget.h b/zlibrary/core/include/ZLViewWidget.h index cd1057f..7c922ea 100644 --- a/zlibrary/core/include/ZLViewWidget.h +++ b/zlibrary/core/include/ZLViewWidget.h @@ -26,7 +26,7 @@ class ZLView; -class ZLViewWidget { +class ZLCORE_EXPORT ZLViewWidget { protected: ZLViewWidget(ZLView::Angle initialAngle); diff --git a/zlibrary/core/include/ZLXMLNamespace.h b/zlibrary/core/include/ZLXMLNamespace.h index 784e438..e4c57d2 100644 --- a/zlibrary/core/include/ZLXMLNamespace.h +++ b/zlibrary/core/include/ZLXMLNamespace.h @@ -20,9 +20,11 @@ #ifndef __ZLXMLNAMESPACE_H__ #define __ZLXMLNAMESPACE_H__ +#include "core_export.h" + #include -class ZLXMLNamespace { +class ZLCORE_EXPORT ZLXMLNamespace { private: ZLXMLNamespace(); diff --git a/zlibrary/core/include/ZLXMLReader.h b/zlibrary/core/include/ZLXMLReader.h index c3c4c41..c912906 100644 --- a/zlibrary/core/include/ZLXMLReader.h +++ b/zlibrary/core/include/ZLXMLReader.h @@ -31,7 +31,7 @@ class ZLInputStream; class ZLAsynchronousInputStream; class ZLXMLReaderInternal; -class ZLXMLReader { +class ZLCORE_EXPORT ZLXMLReader { public: class AttributeNamePredicate { diff --git a/zlibrary/core/include/ZLXMLReaderInternal.h b/zlibrary/core/include/ZLXMLReaderInternal.h index 1fc73af..2bf0e70 100644 --- a/zlibrary/core/include/ZLXMLReaderInternal.h +++ b/zlibrary/core/include/ZLXMLReaderInternal.h @@ -26,7 +26,7 @@ class ZLXMLReader; -class ZLXMLReaderInternal { +class ZLCORE_EXPORT ZLXMLReaderInternal { private: static void fStartElementHandler(void *userData, const char *name, const char **attributes); diff --git a/zlibrary/core/include/ZLXMLWriter.h b/zlibrary/core/include/ZLXMLWriter.h index 5966f1c..a6b0816 100644 --- a/zlibrary/core/include/ZLXMLWriter.h +++ b/zlibrary/core/include/ZLXMLWriter.h @@ -20,13 +20,15 @@ #ifndef __ZLXMLWRITER_H__ #define __ZLXMLWRITER_H__ +#include "core_export.h" + #include #include #include #include -class ZLXMLWriter { +class ZLCORE_EXPORT ZLXMLWriter { private: struct Attribute { diff --git a/zlibrary/core/include/ZLZDecompressor.h b/zlibrary/core/include/ZLZDecompressor.h index 3264bc3..f656a6e 100644 --- a/zlibrary/core/include/ZLZDecompressor.h +++ b/zlibrary/core/include/ZLZDecompressor.h @@ -26,7 +26,7 @@ class ZLInputStream; -class ZLZDecompressor { +class ZLCORE_EXPORT ZLZDecompressor { public: ZLZDecompressor(std::size_t size); diff --git a/zlibrary/core/include/ZLZip.h b/zlibrary/core/include/ZLZip.h index 8789abb..82228da 100644 --- a/zlibrary/core/include/ZLZip.h +++ b/zlibrary/core/include/ZLZip.h @@ -30,7 +30,7 @@ class ZLZDecompressor; class ZLFile; -class ZLZipEntryCache : public ZLUserData { +class ZLCORE_EXPORT ZLZipEntryCache : public ZLUserData { public: static shared_ptr cache(const std::string &containerName, ZLInputStream &containerStream); @@ -62,7 +62,7 @@ private: std::map myInfoMap; }; -class ZLZipInputStream : public ZLInputStream { +class ZLCORE_EXPORT ZLZipInputStream : public ZLInputStream { private: ZLZipInputStream(shared_ptr &base, const std::string &baseName, const std::string &entryName); @@ -94,7 +94,7 @@ friend class ZLFSArchiverZip; class ZLFSCompresorGz; class ZLFSArchiverZip; -class ZLGzipInputStream : public ZLInputStream { +class ZLCORE_EXPORT ZLGzipInputStream : public ZLInputStream { private: ZLGzipInputStream(shared_ptr stream); @@ -120,7 +120,7 @@ private: friend class ZLFSCompressorGzip; }; -class ZLZipDir : public ZLDir { +class ZLCORE_EXPORT ZLZipDir : public ZLDir { private: ZLZipDir(const std::string &name); diff --git a/zlibrary/core/include/ZLZipHeader.h b/zlibrary/core/include/ZLZipHeader.h index c1ca54e..94883fe 100644 --- a/zlibrary/core/include/ZLZipHeader.h +++ b/zlibrary/core/include/ZLZipHeader.h @@ -20,9 +20,11 @@ #ifndef __ZLZIPHEADER_H__ #define __ZLZIPHEADER_H__ +#include "core_export.h" + class ZLInputStream; -struct ZLZipHeader { +struct ZLCORE_EXPORT ZLZipHeader { static const int SignatureLocalFile; static const int SignatureData; static const int SignatureCentralDirectory; diff --git a/zlibrary/core/include/ZLibrary.h b/zlibrary/core/include/ZLibrary.h index 9f4a62d..d0090de 100644 --- a/zlibrary/core/include/ZLibrary.h +++ b/zlibrary/core/include/ZLibrary.h @@ -20,12 +20,14 @@ #ifndef __ZLIBRARY_H__ #define __ZLIBRARY_H__ +#include "core_export.h" + #include class ZLApplication; class ZLPaintContext; -class ZLibrary { +class ZLCORE_EXPORT ZLibrary { public: static const std::string FileNameDelimiter; diff --git a/zlibrary/core/include/ZLibraryImplementation.h b/zlibrary/core/include/ZLibraryImplementation.h index 24c7b10..3bc22b9 100644 --- a/zlibrary/core/include/ZLibraryImplementation.h +++ b/zlibrary/core/include/ZLibraryImplementation.h @@ -20,7 +20,9 @@ #ifndef __ZLIBRARYIMPLEMENTATION_H__ #define __ZLIBRARYIMPLEMENTATION_H__ -class ZLibraryImplementation { +#include "core_export.h" + +class ZLCORE_EXPORT ZLibraryImplementation { public: static ZLibraryImplementation *Instance; diff --git a/zlibrary/core/include/core_export.h.cmake b/zlibrary/core/include/core_export.h.cmake new file mode 100644 index 0000000..95b1efb --- /dev/null +++ b/zlibrary/core/include/core_export.h.cmake @@ -0,0 +1,13 @@ +#ifndef _CORE_EXPORT_H_ +#define _CORE_EXPORT_H_ + +// Set by configure +#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1 + +#ifdef __KDE_HAVE_GCC_VISIBILITY +#define ZLCORE_EXPORT __attribute__ ((visibility("default"))) +#else +#define ZLCORE_EXPORT +#endif + +#endif diff --git a/zlibrary/core/include/shared_ptr.h b/zlibrary/core/include/shared_ptr.h index 8a499c3..18e23d9 100644 --- a/zlibrary/core/include/shared_ptr.h +++ b/zlibrary/core/include/shared_ptr.h @@ -20,6 +20,8 @@ #ifndef __SHARED_PTR_H__ #define __SHARED_PTR_H__ +#include "core_export.h" + template class shared_ptr_storage { private: unsigned int myCounter; @@ -42,7 +44,7 @@ template class shared_ptr_storage { template class weak_ptr; -template class shared_ptr { +template class ZLCORE_EXPORT shared_ptr { friend class weak_ptr; private: