Cleanup header include style

Author: wengxt

src/lib/fcitx-utils/environ.cpp

@@ -10,7 +10,6 @@
 #include <string>
 #include <string_view>
 #include <utility>
-#include "fcitx-utils/utf8.h"
 #include "stringutils.h"
 #include "utf8.h"
 

src/lib/fcitx-utils/key.cpp

@@ -15,7 +15,6 @@
 #include <string_view>
 #include <unordered_map>
 #include <vector>
-#include "fcitx-utils/keysym.h"
 #include "charutils.h"
 #include "i18n.h"
 #include "keydata.h"

src/lib/fcitx/addoninstance.cpp

@@ -10,7 +10,7 @@
 #include <stdexcept>
 #include <string>
 #include "fcitx-utils/macros.h"
-#include "fcitx/addoninfo.h"
+#include "addoninfo.h"
 #include "addoninstance_p.h"
 
 namespace fcitx {

src/lib/fcitx/addonloader.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "fcitx/addonloader.h"
+#include "addonloader.h"
 #include <exception>
 #include <filesystem>
 #include <memory>
@@ -18,8 +18,8 @@
 #include "fcitx-utils/log.h"
 #include "fcitx-utils/standardpaths.h"
 #include "fcitx-utils/stringutils.h"
-#include "fcitx/addoninfo.h"
-#include "fcitx/addoninstance.h"
+#include "addoninfo.h"
+#include "addoninstance.h"
 #include "addonloader_p.h"
 #include "config.h"
 

src/lib/fcitx/candidatelist.cpp

@@ -19,7 +19,7 @@
 #include "fcitx-utils/key.h"
 #include "fcitx-utils/keysym.h"
 #include "fcitx-utils/misc.h"
-#include "fcitx/text.h"
+#include "text.h"
 
 namespace fcitx {
 

src/lib/fcitx/focusgroup.cpp

@@ -10,7 +10,7 @@
 #include <memory>
 #include <string>
 #include "fcitx-utils/macros.h"
-#include "fcitx/event.h"
+#include "event.h"
 #include "focusgroup_p.h"
 #include "inputcontext.h"
 #include "inputcontextmanager.h"

src/lib/fcitx/inputcontextmanager.cpp

@@ -11,11 +11,11 @@
 #include <unordered_map>
 #include "fcitx-utils/intrusivelist.h"
 #include "fcitx-utils/log.h"
-#include "fcitx/misc_p.h"
 #include "focusgroup.h"
 #include "focusgroup_p.h"
 #include "inputcontext_p.h"
 #include "inputcontextproperty_p.h"
+#include "misc_p.h"
 
 namespace fcitx {
 

src/lib/fcitx/instance.cpp

@@ -33,16 +33,16 @@
 #include "fcitx-utils/standardpaths.h"
 #include "fcitx-utils/stringutils.h"
 #include "fcitx-utils/utf8.h"
-#include "fcitx/event.h"
-#include "fcitx/inputmethodgroup.h"
 #include "../../modules/notifications/notifications_public.h"
 #include "addonmanager.h"
+#include "event.h"
 #include "focusgroup.h"
 #include "globalconfig.h"
 #include "inputcontextmanager.h"
 #include "inputcontextproperty.h"
 #include "inputmethodengine.h"
 #include "inputmethodentry.h"
+#include "inputmethodgroup.h"
 #include "inputmethodmanager.h"
 #include "instance.h"
 #include "instance_p.h"

src/lib/fcitx/userinterfacemanager.cpp

@@ -7,8 +7,8 @@
 
 #include "userinterfacemanager.h"
 #include <set>
-#include "fcitx/event.h"
 #include "action.h"
+#include "event.h"
 #include "inputcontext.h"
 #include "instance.h"
 #include "userinterface.h"