Fix clang-format with AttributeMacros

Author: wengxt

.clang-format

@@ -51,6 +51,7 @@ SpaceBeforeAssignmentOperators: true
 ContinuationIndentWidth: 4
 CommentPragmas:  '^ IWYU pragma:'
 ForEachMacros:   [ Q_FOREACH, BOOST_FOREACH ]
+AttributeMacros: [ FCITXCORE_EXPORT, FCITXUTILS_EXPORT, FCITXCONFIG_EXPORT ]
 SpaceBeforeParens: ControlStatements
 DisableFormat:   false
 SortIncludes: true

src/lib/fcitx-config/rawconfig.h

@@ -108,8 +108,8 @@ class FCITXCONFIG_EXPORT RawConfig {
     std::unique_ptr<RawConfigPrivate> d_ptr;
 };
 
-FCITXCONFIG_EXPORT
-LogMessageBuilder &operator<<(LogMessageBuilder &log, const RawConfig &config);
+FCITXCONFIG_EXPORT LogMessageBuilder &operator<<(LogMessageBuilder &log,
+                                                 const RawConfig &config);
 } // namespace fcitx
 
 #endif // _FCITX_CONFIG_RAWCONFIG_H_

src/lib/fcitx-utils/cutf8.h

@@ -21,53 +21,46 @@
 #define FCITX_UTF8_MAX_LENGTH 6
 
 /// \brief Get utf8 string length
-FCITXUTILS_EXPORT
-size_t fcitx_utf8_strlen(const char *s);
+FCITXUTILS_EXPORT size_t fcitx_utf8_strlen(const char *s);
 
 /// \brief Get UCS-4 char in the utf8 string
-FCITXUTILS_EXPORT
-char *fcitx_utf8_get_char(const char *in, uint32_t *chr);
+FCITXUTILS_EXPORT char *fcitx_utf8_get_char(const char *in, uint32_t *chr);
 
 /// \brief Get the number of bytes of next character.
-FCITXUTILS_EXPORT
-unsigned int fcitx_utf8_char_len(const char *in);
+FCITXUTILS_EXPORT unsigned int fcitx_utf8_char_len(const char *in);
 
 /// \brief Get the pointer to the nth character.
 ///
 /// This function will not touch the content for s, so const pointer
 /// can be safely passed and converted.
-FCITXUTILS_EXPORT
-char *fcitx_utf8_get_nth_char(const char *s, uint32_t n);
+FCITXUTILS_EXPORT char *fcitx_utf8_get_nth_char(const char *s, uint32_t n);
 
 /// \brief Check if the string is valid utf8 string.
-FCITXUTILS_EXPORT
-bool fcitx_utf8_check_string(const char *s);
+FCITXUTILS_EXPORT bool fcitx_utf8_check_string(const char *s);
 
 /// \brief Get validated character.
 ///
 /// Returns the UCS-4 value if its valid character. Returns (uint32_t) -1 if
 /// it is not a valid char, (uint32_t)-2 if length is not enough.
-FCITXUTILS_EXPORT
-uint32_t fcitx_utf8_get_char_validated(const char *p, int max_len, int *plen);
+FCITXUTILS_EXPORT uint32_t fcitx_utf8_get_char_validated(const char *p,
+                                                         int max_len,
+                                                         int *plen);
 
 /// \brief Copy most byte length, but keep utf8 valid.
-FCITXUTILS_EXPORT
-void fcitx_utf8_strncpy(char *str, const char *s, size_t byte);
+FCITXUTILS_EXPORT void fcitx_utf8_strncpy(char *str, const char *s,
+                                          size_t byte);
 
 /// \brief Count most byte length, utf8 string length.
-FCITXUTILS_EXPORT
-size_t fcitx_utf8_strnlen(const char *str, size_t byte);
+FCITXUTILS_EXPORT size_t fcitx_utf8_strnlen(const char *str, size_t byte);
 
 /// \brief Count most byte length, utf8 string length and validates the string
-FCITXUTILS_EXPORT
-size_t fcitx_utf8_strnlen_validated(const char *str, size_t byte);
+FCITXUTILS_EXPORT size_t fcitx_utf8_strnlen_validated(const char *str,
+                                                      size_t byte);
 
 /// \brief Return the utf8 bytes of a UCS4 char.
-FCITXUTILS_EXPORT
-int fcitx_ucs4_char_len(uint32_t c);
+FCITXUTILS_EXPORT int fcitx_ucs4_char_len(uint32_t c);
 
 /// \brief Convert ucs4 char to utf8, need to have enough memory for it.
-FCITXUTILS_EXPORT
-int fcitx_ucs4_to_utf8(uint32_t c, char *output);
+FCITXUTILS_EXPORT int fcitx_ucs4_to_utf8(uint32_t c, char *output);
 
 #endif

src/lib/fcitx-utils/dbus/variant.h

@@ -53,8 +53,8 @@ class FCITXUTILS_EXPORT VariantTypeRegistry {
     FCITX_DECLARE_PRIVATE(VariantTypeRegistry);
 };
 
-std::shared_ptr<VariantHelperBase>
-    FCITXUTILS_EXPORT lookupVariantType(const std::string &signature);
+std::shared_ptr<VariantHelperBase> FCITXUTILS_EXPORT
+lookupVariantType(const std::string &signature);
 
 template <typename TypeName>
 inline void registerVariantType() {

src/lib/fcitx-utils/i18n.h

@@ -12,28 +12,22 @@
 
 namespace fcitx {
 
-FCITXUTILS_EXPORT
-std::string translate(const std::string &s);
-FCITXUTILS_EXPORT
-const char *translate(const char *s);
-FCITXUTILS_EXPORT
-std::string translateCtx(const char *ctx, const std::string &s);
-FCITXUTILS_EXPORT
-const char *translateCtx(const char *ctx, const char *s);
-
-FCITXUTILS_EXPORT
-std::string translateDomain(const char *domain, const std::string &s);
-FCITXUTILS_EXPORT
-const char *translateDomain(const char *domain, const char *s);
-FCITXUTILS_EXPORT
-std::string translateDomainCtx(const char *domain, const char *ctx,
-                               const std::string &s);
-
-FCITXUTILS_EXPORT
-const char *translateDomainCtx(const char *domain, const char *ctx,
-                               const char *s);
-FCITXUTILS_EXPORT
-void registerDomain(const char *domain, const char *dir);
+FCITXUTILS_EXPORT std::string translate(const std::string &s);
+FCITXUTILS_EXPORT const char *translate(const char *s);
+FCITXUTILS_EXPORT std::string translateCtx(const char *ctx,
+                                           const std::string &s);
+FCITXUTILS_EXPORT const char *translateCtx(const char *ctx, const char *s);
+
+FCITXUTILS_EXPORT std::string translateDomain(const char *domain,
+                                              const std::string &s);
+FCITXUTILS_EXPORT const char *translateDomain(const char *domain,
+                                              const char *s);
+FCITXUTILS_EXPORT std::string
+translateDomainCtx(const char *domain, const char *ctx, const std::string &s);
+
+FCITXUTILS_EXPORT const char *
+translateDomainCtx(const char *domain, const char *ctx, const char *s);
+FCITXUTILS_EXPORT void registerDomain(const char *domain, const char *dir);
 } // namespace fcitx
 
 #ifndef FCITX_NO_I18N_MACRO

src/lib/fcitx-utils/stringutils.h

@@ -59,8 +59,7 @@ trimInplace(std::string_view str);
 /// \brief Trim the white space in string view
 /// \see trimInplace
 /// \since 5.0.16
-FCITXUTILS_EXPORT
-std::string_view trimView(std::string_view);
+FCITXUTILS_EXPORT std::string_view trimView(std::string_view);
 
 /// \brief Trim the white space in str.
 /// \see trimInplace

src/lib/fcitx-wayland/blur/org_kde_kwin_blur_manager.cpp

@@ -7,7 +7,9 @@ OrgKdeKwinBlurManager::OrgKdeKwinBlurManager(org_kde_kwin_blur_manager *data)
     org_kde_kwin_blur_manager_set_user_data(*this, this);
 }
 void OrgKdeKwinBlurManager::destructor(org_kde_kwin_blur_manager *data) {
-    { return org_kde_kwin_blur_manager_destroy(data); }
+    {
+        return org_kde_kwin_blur_manager_destroy(data);
+    }
 }
 OrgKdeKwinBlur *OrgKdeKwinBlurManager::create(WlSurface *surface) {
     return new OrgKdeKwinBlur(

src/lib/fcitx-wayland/core/wl_buffer.cpp

@@ -5,7 +5,9 @@ const struct wl_buffer_listener WlBuffer::listener = {
     [](void *data, wl_buffer *wldata) {
         auto *obj = static_cast<WlBuffer *>(data);
         assert(*obj == wldata);
-        { return obj->release()(); }
+        {
+            return obj->release()();
+        }
     },
 };
 WlBuffer::WlBuffer(wl_buffer *data)

src/lib/fcitx-wayland/core/wl_callback.cpp

@@ -5,7 +5,9 @@ const struct wl_callback_listener WlCallback::listener = {
     [](void *data, wl_callback *wldata, uint32_t callbackData) {
         auto *obj = static_cast<WlCallback *>(data);
         assert(*obj == wldata);
-        { return obj->done()(callbackData); }
+        {
+            return obj->done()(callbackData);
+        }
     },
 };
 WlCallback::WlCallback(wl_callback *data)
@@ -14,6 +16,8 @@ WlCallback::WlCallback(wl_callback *data)
     wl_callback_add_listener(*this, &WlCallback::listener, this);
 }
 void WlCallback::destructor(wl_callback *data) {
-    { return wl_callback_destroy(data); }
+    {
+        return wl_callback_destroy(data);
+    }
 }
 } // namespace fcitx::wayland

src/lib/fcitx-wayland/core/wl_compositor.cpp

@@ -7,7 +7,9 @@ WlCompositor::WlCompositor(wl_compositor *data)
     wl_compositor_set_user_data(*this, this);
 }
 void WlCompositor::destructor(wl_compositor *data) {
-    { return wl_compositor_destroy(data); }
+    {
+        return wl_compositor_destroy(data);
+    }
 }
 WlSurface *WlCompositor::createSurface() {
     return new WlSurface(wl_compositor_create_surface(*this));