moved export.hpp to macros/ folder

cmake/Modules/TinySources.cmake

@@ -42,6 +42,8 @@ function(tiny_sources out_headers out_sources)
         macros.hpp
         macros/archdetect.hpp
         macros/compilerdetect.hpp
+        macros/export.hpp
+        macros/export_common.hpp
         macros/systemheader.hpp
         mysqlconnection.hpp
         ormtypes.hpp
@@ -93,8 +95,6 @@ function(tiny_sources out_headers out_sources)
         types/log.hpp
         types/statementscounter.hpp
         utils/attribute.hpp
-        utils/export.hpp
-        utils/export_common.hpp
         utils/string.hpp
         utils/type.hpp
         version.hpp

include/include.pri

@@ -38,6 +38,8 @@ HEADERS += \
     $$PWD/orm/macros.hpp \
     $$PWD/orm/macros/archdetect.hpp \
     $$PWD/orm/macros/compilerdetect.hpp \
+    $$PWD/orm/macros/export.hpp \
+    $$PWD/orm/macros/export_common.hpp \
     $$PWD/orm/macros/systemheader.hpp \
     $$PWD/orm/mysqlconnection.hpp \
     $$PWD/orm/ormtypes.hpp \
@@ -89,8 +91,6 @@ HEADERS += \
     $$PWD/orm/types/log.hpp \
     $$PWD/orm/types/statementscounter.hpp \
     $$PWD/orm/utils/attribute.hpp \
-    $$PWD/orm/utils/export.hpp \
-    $$PWD/orm/utils/export_common.hpp \
     $$PWD/orm/utils/string.hpp \
     $$PWD/orm/utils/type.hpp \
     $$PWD/orm/version.hpp \

include/orm/basegrammar.hpp

@@ -6,7 +6,7 @@
 TINY_SYSTEM_HEADER
 
 #include "orm/ormtypes.hpp"
-#include "orm/utils/export.hpp"
+#include "orm/macros/export.hpp"
 
 #ifdef TINYORM_COMMON_NAMESPACE
 namespace TINYORM_COMMON_NAMESPACE

include/orm/concerns/hasconnectionresolver.hpp

@@ -5,7 +5,7 @@
 #include "orm/macros/systemheader.hpp"
 TINY_SYSTEM_HEADER
 
-#include "orm/utils/export.hpp"
+#include "orm/macros/export.hpp"
 
 #ifdef TINYORM_COMMON_NAMESPACE
 namespace TINYORM_COMMON_NAMESPACE

include/orm/constants_extern.hpp

@@ -7,7 +7,7 @@ TINY_SYSTEM_HEADER
 
 #include <QString>
 
-#include "orm/utils/export.hpp"
+#include "orm/macros/export.hpp"
 
 #ifdef TINYORM_COMMON_NAMESPACE
 namespace TINYORM_COMMON_NAMESPACE

include/orm/exceptions/domainerror.hpp

@@ -8,7 +8,7 @@ TINY_SYSTEM_HEADER
 #include <stdexcept>
 
 #include "orm/exceptions/logicerror.hpp"
-#include "orm/utils/export.hpp"
+#include "orm/macros/export.hpp"
 
 #ifdef TINYORM_COMMON_NAMESPACE
 namespace TINYORM_COMMON_NAMESPACE

include/orm/exceptions/invalidargumenterror.hpp

@@ -8,7 +8,7 @@ TINY_SYSTEM_HEADER
 #include <stdexcept>
 
 #include "orm/exceptions/logicerror.hpp"
-#include "orm/utils/export.hpp"
+#include "orm/macros/export.hpp"
 
 #ifdef TINYORM_COMMON_NAMESPACE
 namespace TINYORM_COMMON_NAMESPACE

include/orm/exceptions/logicerror.hpp

@@ -9,7 +9,7 @@ TINY_SYSTEM_HEADER
 
 #include <stdexcept>
 
-#include "orm/utils/export.hpp"
+#include "orm/macros/export.hpp"
 
 #ifdef TINYORM_COMMON_NAMESPACE
 namespace TINYORM_COMMON_NAMESPACE

include/orm/exceptions/runtimeerror.hpp

@@ -9,7 +9,7 @@ TINY_SYSTEM_HEADER
 
 #include <stdexcept>
 
-#include "orm/utils/export.hpp"
+#include "orm/macros/export.hpp"
 
 #ifdef TINYORM_COMMON_NAMESPACE
 namespace TINYORM_COMMON_NAMESPACE

include/orm/libraryinfo.hpp

@@ -7,7 +7,7 @@ TINY_SYSTEM_HEADER
 
 #include <QVersionNumber>
 
-#include "orm/utils/export.hpp"
+#include "orm/macros/export.hpp"
 
 #ifdef TINYORM_COMMON_NAMESPACE
 namespace TINYORM_COMMON_NAMESPACE

include/orm/macros/export.hpp

@@ -5,7 +5,7 @@
 #include "orm/macros/systemheader.hpp"
 TINY_SYSTEM_HEADER
 
-#include "orm/utils/export_common.hpp"
+#include "orm/macros/export_common.hpp"
 
 #if defined(TINYORM_BUILDING_SHARED)
 #  define SHAREDLIB_EXPORT TINY_DECL_EXPORT

include/orm/ormtypes.hpp

@@ -17,7 +17,7 @@ TINY_SYSTEM_HEADER
 
 #include "orm/constants.hpp"
 #include "orm/query/expression.hpp"
-#include "orm/utils/export.hpp"
+#include "orm/macros/export.hpp"
 
 // TODO divide OrmTypes to internal and types which user will / may need, so divide to two files silverqx
 /* 👆 I have good idea hot to do that, public types will be tinytypes.hpp and private will be

include/orm/query/expression.hpp

@@ -8,7 +8,7 @@ TINY_SYSTEM_HEADER
 #include <QVariant>
 #include <QVector>
 
-#include "orm/utils/export.hpp"
+#include "orm/macros/export.hpp"
 
 #ifdef TINYORM_COMMON_NAMESPACE
 namespace TINYORM_COMMON_NAMESPACE

include/orm/query/processors/processor.hpp

@@ -8,7 +8,7 @@ TINY_SYSTEM_HEADER
 #include <QStringList>
 #include <QtGlobal>
 
-#include "orm/utils/export.hpp"
+#include "orm/macros/export.hpp"
 
 class QSqlQuery;
 

include/orm/schema/schemabuilder.hpp

@@ -8,7 +8,7 @@ TINY_SYSTEM_HEADER
 #include <QStringList>
 #include <QtGlobal>
 
-#include "orm/utils/export.hpp"
+#include "orm/macros/export.hpp"
 
 #ifdef TINYORM_COMMON_NAMESPACE
 namespace TINYORM_COMMON_NAMESPACE

include/orm/tiny/model.hpp

@@ -109,7 +109,6 @@ namespace Relations {
     // FUTURE linux, add linker version script https://github.com/sailfishos/qtbase/commit/72ba0079c3967bdfa26acdce78ce6cb98b30c27b?view=parallel https://www.gnu.org/software/gnulib/manual/html_node/Exported-Symbols-of-Shared-Libraries.html https://stackoverflow.com/questions/41061220/where-do-object-file-version-references-come-from silverqx
     // TODO Visual Studio memory analyzer https://docs.microsoft.com/en-us/visualstudio/profiling/memory-usage-without-debugging2?view=vs-2019 silverqx
     // CUR replace all TINYORM_COMMON_NAMESPACE and Orm namespace with macros silverqx
-    // CUR move export.hpp to macros/ silverqx
     // CUR cmake rename TinyQtCommon to TinyCommon silverqx
     /*! Base model class. */
     template<typename Derived, AllRelationsConcept ...AllRelations>

include/orm/utils/attribute.hpp

@@ -6,7 +6,7 @@
 TINY_SYSTEM_HEADER
 
 #include "orm/ormtypes.hpp"
-#include "orm/utils/export.hpp"
+#include "orm/macros/export.hpp"
 
 #ifdef TINYORM_COMMON_NAMESPACE
 namespace TINYORM_COMMON_NAMESPACE

include/orm/utils/string.hpp

@@ -7,7 +7,7 @@ TINY_SYSTEM_HEADER
 
 #include <QString>
 
-#include "orm/utils/export.hpp"
+#include "orm/macros/export.hpp"
 
 #ifdef TINYORM_COMMON_NAMESPACE
 namespace TINYORM_COMMON_NAMESPACE

include/orm/utils/type.hpp

@@ -14,7 +14,7 @@ TINY_SYSTEM_HEADER
 #include <cxxabi.h>
 #endif
 
-#include "orm/utils/export.hpp"
+#include "orm/macros/export.hpp"
 
 #ifdef __GNUG__
 #  define __tiny_func__ Orm::Utils::Type::prettyFunction(__PRETTY_FUNCTION__)

tests/TinyUtils/src/export.hpp

@@ -2,7 +2,7 @@
 #ifndef TINYUTILS_EXPORT_HPP
 #define TINYUTILS_EXPORT_HPP
 
-#include "orm/utils/export_common.hpp"
+#include "orm/macros/export_common.hpp"
 
 #if defined(TINYUTILS_BUILDING_SHARED)
 #  define TINYUTILS_EXPORT TINY_DECL_EXPORT