From f3bb513545baf511734d5c41063cbd1b40f3b3ce Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 30 Mar 2021 12:03:29 +0200 Subject: [PATCH] Cleanup Signed-off-by: Simon Rozman --- MSI/MSICA | 2 +- Updater | 2 +- lib/WinStd | 2 +- lib/libZRCola/include/zrcola/character.h | 11 ++++---- lib/libZRCola/include/zrcola/common.h | 13 +++------ lib/libZRCola/include/zrcola/language.h | 8 +++--- lib/libZRCola/include/zrcola/tag.h | 9 ++++--- lib/libZRCola/include/zrcola/translate.h | 12 ++++----- lib/libZRColaUI/build/libZRColaUI.vcxproj | 1 - .../build/libZRColaUI.vcxproj.filters | 3 --- lib/libZRColaUI/include/zrcolaui/chargroup.h | 5 ++-- lib/libZRColaUI/include/zrcolaui/common.h | 27 ------------------- lib/libZRColaUI/include/zrcolaui/keyboard.h | 5 ++-- lib/stdex | 2 +- 14 files changed, 33 insertions(+), 69 deletions(-) delete mode 100644 lib/libZRColaUI/include/zrcolaui/common.h diff --git a/MSI/MSICA b/MSI/MSICA index 00032cd..d3320ca 160000 --- a/MSI/MSICA +++ b/MSI/MSICA @@ -1 +1 @@ -Subproject commit 00032cd404478c9f80f1817cbb8adf81f6a65449 +Subproject commit d3320ca1f3a433fac7886cf3a32cf808ac1b4cb9 diff --git a/Updater b/Updater index 924971b..1658942 160000 --- a/Updater +++ b/Updater @@ -1 +1 @@ -Subproject commit 924971bb3b2b2425b7e69dc315e9771c23d83a1b +Subproject commit 165894247e4807ea137e0ff67255319075402e8f diff --git a/lib/WinStd b/lib/WinStd index 96e1882..51b262b 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit 96e18824059bd8225ab99126e16b33cf50734873 +Subproject commit 51b262b38223fbce3b9b43812ad0ff5ef88bdeb4 diff --git a/lib/libZRCola/include/zrcola/character.h b/lib/libZRCola/include/zrcola/character.h index 886f3cc..f768947 100644 --- a/lib/libZRCola/include/zrcola/character.h +++ b/lib/libZRCola/include/zrcola/character.h @@ -22,6 +22,7 @@ #include "common.h" #include +#include #include #include #include @@ -48,7 +49,7 @@ namespace ZRCola { /// Character category ID type /// Two letter abbreviation, non-terminated /// - struct ZRCOLA_API chrcatid_t { + struct chrcatid_t { char data[2]; inline chrcatid_t& operator=(const chrcatid_t &src) @@ -176,7 +177,7 @@ namespace ZRCola { /// /// Character Database /// - class ZRCOLA_API character_db { + class character_db { public: #pragma pack(push) #pragma pack(2) @@ -334,13 +335,13 @@ namespace ZRCola { }; - typedef ZRCOLA_API stdex::idrec::record character_rec; + typedef stdex::idrec::record character_rec; /// /// Character category database /// - class ZRCOLA_API chrcat_db { + class chrcat_db { public: #pragma pack(push) #pragma pack(2) @@ -502,7 +503,7 @@ namespace ZRCola { }; - typedef ZRCOLA_API stdex::idrec::record chrcat_rec; + typedef stdex::idrec::record chrcat_rec; }; diff --git a/lib/libZRCola/include/zrcola/common.h b/lib/libZRCola/include/zrcola/common.h index bfe6cbb..2093cbf 100644 --- a/lib/libZRCola/include/zrcola/common.h +++ b/lib/libZRCola/include/zrcola/common.h @@ -29,11 +29,6 @@ #endif -/// -/// Public function calling convention -/// -#define ZRCOLA_API -#define ZRCOLA_NOVTABLE __declspec(novtable) #pragma warning(push) #pragma warning(disable: 4251) #pragma warning(disable: 4512) @@ -75,7 +70,7 @@ namespace ZRCola { /// Language ID type /// Three letter abbreviation, zero terminated /// - struct ZRCOLA_API langid_t { + struct langid_t { char data[4]; inline langid_t& operator=(const langid_t &src) @@ -221,7 +216,7 @@ namespace ZRCola { /// \param[in] lang_win Windows language ID /// \param[in,out] lang ZRCola language ID /// - void ZRCOLA_API LangConvert(_In_ LANGID lang_win, _Inout_ langid_t &lang); + void LangConvert(_In_ LANGID lang_win, _Inout_ langid_t &lang); #endif @@ -505,7 +500,7 @@ namespace ZRCola { /// /// Source-destination index transformation mapping /// - class ZRCOLA_NOVTABLE ZRCOLA_API mapping { + class __declspec(novtable) mapping { public: size_t src; ///< Character index in source string size_t dst; ///< Character index in destination string @@ -523,7 +518,7 @@ namespace ZRCola { /// /// A vector for destination-source index transformation mapping /// - class ZRCOLA_API mapping_vector : public std::vector { + class mapping_vector : public std::vector { public: /// /// Transforms character index of destination to source diff --git a/lib/libZRCola/include/zrcola/language.h b/lib/libZRCola/include/zrcola/language.h index a556b87..bd84ba1 100644 --- a/lib/libZRCola/include/zrcola/language.h +++ b/lib/libZRCola/include/zrcola/language.h @@ -37,7 +37,7 @@ namespace ZRCola { /// /// Language Character Database /// - class ZRCOLA_API langchar_db { + class langchar_db { public: #pragma pack(push) #pragma pack(2) @@ -195,13 +195,13 @@ namespace ZRCola { }; - typedef ZRCOLA_API stdex::idrec::record langchar_rec; + typedef stdex::idrec::record langchar_rec; /// /// Language database /// - class ZRCOLA_API language_db { + class language_db { public: #pragma pack(push) #pragma pack(2) @@ -298,7 +298,7 @@ namespace ZRCola { }; - typedef ZRCOLA_API stdex::idrec::record language_rec; + typedef stdex::idrec::record language_rec; }; diff --git a/lib/libZRCola/include/zrcola/tag.h b/lib/libZRCola/include/zrcola/tag.h index 94dfaa5..8fec2f0 100644 --- a/lib/libZRCola/include/zrcola/tag.h +++ b/lib/libZRCola/include/zrcola/tag.h @@ -22,6 +22,7 @@ #include "common.h" #include +#include #include #include #include @@ -39,7 +40,7 @@ namespace ZRCola { /// /// Character Tag Database /// - class ZRCOLA_API chrtag_db { + class chrtag_db { public: #pragma pack(push) #pragma pack(2) @@ -227,13 +228,13 @@ namespace ZRCola { }; - typedef ZRCOLA_API stdex::idrec::record chrtag_rec; + typedef stdex::idrec::record chrtag_rec; /// /// Tag name database /// - class ZRCOLA_API tagname_db { + class tagname_db { public: #pragma pack(push) #pragma pack(2) @@ -440,7 +441,7 @@ namespace ZRCola { }; - typedef ZRCOLA_API stdex::idrec::record tagname_rec; + typedef stdex::idrec::record tagname_rec; }; diff --git a/lib/libZRCola/include/zrcola/translate.h b/lib/libZRCola/include/zrcola/translate.h index b5c3fef..47d7c18 100644 --- a/lib/libZRCola/include/zrcola/translate.h +++ b/lib/libZRCola/include/zrcola/translate.h @@ -59,7 +59,7 @@ namespace ZRCola { /// /// Translation database /// - class ZRCOLA_API translation_db { + class translation_db { public: #pragma pack(push) #pragma pack(2) @@ -324,13 +324,13 @@ namespace ZRCola { }; - typedef ZRCOLA_API stdex::idrec::record translation_rec; + typedef stdex::idrec::record translation_rec; /// /// Translation set database /// - class ZRCOLA_API transet_db { + class transet_db { public: #pragma pack(push) #pragma pack(2) @@ -440,13 +440,13 @@ namespace ZRCola { }; - typedef ZRCOLA_API stdex::idrec::record transet_rec; + typedef stdex::idrec::record transet_rec; /// /// Translation sequence database /// - class ZRCOLA_API transeq_db { + class transeq_db { public: #pragma pack(push) #pragma pack(2) @@ -621,7 +621,7 @@ namespace ZRCola { }; - typedef ZRCOLA_API stdex::idrec::record transeq_rec; + typedef stdex::idrec::record transeq_rec; }; diff --git a/lib/libZRColaUI/build/libZRColaUI.vcxproj b/lib/libZRColaUI/build/libZRColaUI.vcxproj index 9c1b118..657ba39 100644 --- a/lib/libZRColaUI/build/libZRColaUI.vcxproj +++ b/lib/libZRColaUI/build/libZRColaUI.vcxproj @@ -39,7 +39,6 @@ - diff --git a/lib/libZRColaUI/build/libZRColaUI.vcxproj.filters b/lib/libZRColaUI/build/libZRColaUI.vcxproj.filters index d4e9cb8..6164264 100644 --- a/lib/libZRColaUI/build/libZRColaUI.vcxproj.filters +++ b/lib/libZRColaUI/build/libZRColaUI.vcxproj.filters @@ -29,9 +29,6 @@ Header Files - - Header Files - Header Files diff --git a/lib/libZRColaUI/include/zrcolaui/chargroup.h b/lib/libZRColaUI/include/zrcolaui/chargroup.h index 177e4e9..aab7ac1 100644 --- a/lib/libZRColaUI/include/zrcolaui/chargroup.h +++ b/lib/libZRColaUI/include/zrcolaui/chargroup.h @@ -19,7 +19,6 @@ #pragma once -#include "common.h" #include #include @@ -45,7 +44,7 @@ namespace ZRCola { /// /// Character group database /// - class ZRCOLAUI_API chrgrp_db { + class chrgrp_db { public: #pragma pack(push) #pragma pack(2) @@ -184,7 +183,7 @@ namespace ZRCola { }; - typedef ZRCOLAUI_API stdex::idrec::record chrgrp_rec; + typedef stdex::idrec::record chrgrp_rec; }; diff --git a/lib/libZRColaUI/include/zrcolaui/common.h b/lib/libZRColaUI/include/zrcolaui/common.h deleted file mode 100644 index c6ba9d4..0000000 --- a/lib/libZRColaUI/include/zrcolaui/common.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - Copyright © 2015-2021 Amebis - - This file is part of ZRCola. - - ZRCola is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ZRCola is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with ZRCola. If not, see . -*/ - -#pragma once - - -/// -/// Public function calling convention -/// -#define ZRCOLAUI_API -#define ZRCOLA_NOVTABLE __declspec(novtable) diff --git a/lib/libZRColaUI/include/zrcolaui/keyboard.h b/lib/libZRColaUI/include/zrcolaui/keyboard.h index b96598f..a99d571 100644 --- a/lib/libZRColaUI/include/zrcolaui/keyboard.h +++ b/lib/libZRColaUI/include/zrcolaui/keyboard.h @@ -19,7 +19,6 @@ #pragma once -#include "common.h" #include #include @@ -44,7 +43,7 @@ namespace ZRCola { /// /// Key sequence database /// - class ZRCOLAUI_API keyseq_db { + class keyseq_db { public: #pragma pack(push) #pragma pack(2) @@ -288,7 +287,7 @@ namespace ZRCola { }; - typedef ZRCOLAUI_API stdex::idrec::record keyseq_rec; + typedef stdex::idrec::record keyseq_rec; }; diff --git a/lib/stdex b/lib/stdex index 919b445..3d90357 160000 --- a/lib/stdex +++ b/lib/stdex @@ -1 +1 @@ -Subproject commit 919b44573aac51e7288c100abc76ca49483df9c2 +Subproject commit 3d903579052ee07e3c4ee5b0c97daa3fee000b64