maliit · xingwozhonghua126 · Mar 22, 2024
diff --git a/plugins/chewing/src/chewingadapter.cpp b/plugins/chewing/src/chewingadapter.cpp
@@ -16,14 +16,8 @@
 
 #include "chewingadapter.h"
 
-#include <iostream>
 
-#include <iconv.h>
-#include <string>
-#include <string.h>
 
-#include <QChar>
-#include <QCoreApplication>
 
 #define CHEWING_MAX_LEN 32
 

diff --git a/plugins/chewing/src/chewingadapter.h b/plugins/chewing/src/chewingadapter.h
@@ -18,7 +18,6 @@
 #define CHEWINGADAPTER_H
 
 #include <QObject>
-#include <QStringList>
 
 #include "chewing.h"
 

diff --git a/plugins/chewing/src/chewinglanguagefeatures.h b/plugins/chewing/src/chewinglanguagefeatures.h
@@ -18,7 +18,6 @@
 #define CHEWINGLANGUAGEFEATURES_H
 
 #include "abstractlanguagefeatures.h"
-#include <QObject>
 
 class ChewingLanguageFeatures : public QObject, public AbstractLanguageFeatures
 {

diff --git a/plugins/chewing/src/chewingplugin.cpp b/plugins/chewing/src/chewingplugin.cpp
@@ -1,7 +1,6 @@
 #include "chewingplugin.h"
 #include "chewinglanguagefeatures.h"
 
-#include <QDebug>
 
 ChewingPlugin::ChewingPlugin(QObject *parent) :
     AbstractLanguagePlugin(parent)

diff --git a/plugins/chewing/src/chewingplugin.h b/plugins/chewing/src/chewingplugin.h
@@ -1,14 +1,10 @@
 #ifndef CHEWINGPLUGIN_H
 #define CHEWINGPLUGIN_H
 
-#include <QObject>
-#include <QStringList>
 #include <QThread>
-#include "languageplugininterface.h"
 #include "abstractlanguageplugin.h"
 
 #include "chewingadapter.h"
-#include <iostream>
 
 class ChewingLanguageFeatures;
 

diff --git a/plugins/ko/src/koreanlanguagefeatures.h b/plugins/ko/src/koreanlanguagefeatures.h
@@ -18,7 +18,6 @@
 #define KOREANLANGUAGEFEATURES_H
 
 #include "abstractlanguagefeatures.h"
-#include <QObject>
 
 class KoreanLanguageFeatures : public QObject, public AbstractLanguageFeatures
 {

diff --git a/plugins/ko/src/koreanplugin.cpp b/plugins/ko/src/koreanplugin.cpp
@@ -2,7 +2,6 @@
 #include "koreanlanguagefeatures.h"
 #include "spellpredictworker.h"
 
-#include <QDebug>
 
 KoreanPlugin::KoreanPlugin(QObject *parent) :
     AbstractLanguagePlugin(parent)

diff --git a/plugins/ko/src/koreanplugin.h b/plugins/ko/src/koreanplugin.h
@@ -1,14 +1,9 @@
 #ifndef KOREANPLUGIN_H
 #define KOREANPLUGIN_H
 
-#include <QObject>
-#include <QStringList>
-#include "languageplugininterface.h"
 #include "abstractlanguageplugin.h"
-#include "spellchecker.h"
 #include "spellpredictworker.h"
 
-#include <iostream>
 
 class KoreanLanguageFeatures;
 

diff --git a/plugins/pinyin/src/chineselanguagefeatures.h b/plugins/pinyin/src/chineselanguagefeatures.h
@@ -18,7 +18,6 @@
 #define CHINESELANGUAGEFEATURES_H
 
 #include "abstractlanguagefeatures.h"
-#include <QObject>
 
 class ChineseLanguageFeatures : public QObject, public AbstractLanguageFeatures
 {

diff --git a/plugins/pinyin/src/pinyinadapter.cpp b/plugins/pinyin/src/pinyinadapter.cpp
@@ -21,14 +21,8 @@
 #include <algorithm>
 #include <iterator>
 
-#include <iconv.h>
-#include <string>
-#include <string.h>
 
-#include <QDebug>
 #include <QLoggingCategory>
-#include <QCoreApplication>
-#include <QRegExp>
 
 #define MAX_SUGGESTIONS 100
 

diff --git a/plugins/pinyin/src/pinyinadapter.h b/plugins/pinyin/src/pinyinadapter.h
@@ -17,8 +17,6 @@
 #ifndef PINYINADAPTER_H
 #define PINYINADAPTER_H
 
-#include <QObject>
-#include <QStringList>
 
 #include "pinyin.h"
 #include "abstractlanguageplugin.h"

diff --git a/plugins/pinyin/src/pinyinplugin.h b/plugins/pinyin/src/pinyinplugin.h
@@ -1,14 +1,11 @@
 #ifndef PINYINPLUGIN_H
 #define PINYINPLUGIN_H
 
-#include <QObject>
-#include <QStringList>
 #include <QThread>
 #include "languageplugininterface.h"
 #include "abstractlanguageplugin.h"
 
 #include "pinyinadapter.h"
-#include <iostream>
 
 class ChineseLanguageFeatures;
 

diff --git a/plugins/th/src/thailanguagefeatures.h b/plugins/th/src/thailanguagefeatures.h
@@ -18,7 +18,6 @@
 #define THAILANGUAGEFEATURES_H
 
 #include "abstractlanguagefeatures.h"
-#include <QObject>
 
 class ThaiLanguageFeatures : public QObject, public AbstractLanguageFeatures
 {

diff --git a/plugins/th/src/thaiplugin.h b/plugins/th/src/thaiplugin.h
@@ -1,8 +1,6 @@
 #ifndef THAIPLUGIN_H
 #define THAIPLUGIN_H
 
-#include <QObject>
-#include "languageplugininterface.h"
 #include "abstractlanguageplugin.h"
 
 class ThaiLanguageFeatures;

diff --git a/plugins/westernsupport/spellchecker.cpp b/plugins/westernsupport/spellchecker.cpp
@@ -52,11 +52,6 @@ class Hunspell
 };
 #endif
 
-#include <QFile>
-#include <QTextStream>
-#include <QTextCodec>
-#include <QStringList>
-#include <QDebug>
 #include <QDir>
 
 //! \class SpellChecker

diff --git a/plugins/westernsupport/spellpredictworker.cpp b/plugins/westernsupport/spellpredictworker.cpp
@@ -27,7 +27,6 @@
 
 #include "spellpredictworker.h"
 
-#include <QDebug>
 
 SpellPredictWorker::SpellPredictWorker(QObject *parent)
     : QObject(parent)

diff --git a/plugins/westernsupport/spellpredictworker.h b/plugins/westernsupport/spellpredictworker.h
@@ -31,9 +31,6 @@
 #include "spellchecker.h"
 #include "languageplugininterface.h"
 
-#include <QObject>
-#include <QStringList>
-#include <QMap>
 
 class SpellPredictWorker : public QObject
 {

diff --git a/plugins/westernsupport/westernlanguagefeatures.cpp b/plugins/westernsupport/westernlanguagefeatures.cpp
@@ -30,7 +30,6 @@
 
 #include "westernlanguagefeatures.h"
 
-#include <QtCore>
 
 WesternLanguageFeatures::WesternLanguageFeatures(QObject *parent) :
     QObject(parent)

diff --git a/plugins/westernsupport/westernlanguagefeatures.h b/plugins/westernsupport/westernlanguagefeatures.h
@@ -32,7 +32,6 @@
 #define MALIITKEYBOARD_LANGUAGEFEATURES_H
 
 #include "abstractlanguagefeatures.h"
-#include <QObject>
 
 class WesternLanguageFeatures : public QObject, public AbstractLanguageFeatures
 {

diff --git a/plugins/westernsupport/westernlanguagesplugin.cpp b/plugins/westernsupport/westernlanguagesplugin.cpp
@@ -2,7 +2,6 @@
 #include "westernlanguagefeatures.h"
 #include "spellpredictworker.h"
 
-#include <QDebug>
 
 WesternLanguagesPlugin::WesternLanguagesPlugin(QObject *parent) :
     AbstractLanguagePlugin(parent)

diff --git a/plugins/westernsupport/westernlanguagesplugin.h b/plugins/westernsupport/westernlanguagesplugin.h
@@ -1,14 +1,9 @@
 #ifndef WESTERNLANGUAGESPLUGIN_H
 #define WESTERNLANGUAGESPLUGIN_H
 
-#include <QObject>
 
-#include "languageplugininterface.h"
-#include "westernlanguagefeatures.h"
-#include "spellchecker.h"
 #include "abstractlanguageplugin.h"
 
-#include "spellpredictworker.h"
 
 class WesternLanguageFeatures;
 class SpellPredictWorker;

diff --git a/src/3rdparty/QGSettings/qconftypes.cpp b/src/3rdparty/QGSettings/qconftypes.cpp
@@ -16,7 +16,6 @@
 
 #include "qconftypes.h"
 
-#include <QStringList>
 
 /* This file is responsible for conversion between C++ values and GVariant *.
  *

diff --git a/src/3rdparty/QGSettings/qgsettings.h b/src/3rdparty/QGSettings/qgsettings.h
@@ -20,7 +20,6 @@
 #define __QGSETTINGS_H__
 
 #include <QObject>
-#include <QStringList>
 
 /**
  * @brief QGSettings provides access to application settings stored with GSettings.

diff --git a/src/lib/logic/abstractwordengine.h b/src/lib/logic/abstractwordengine.h
@@ -33,7 +33,6 @@
 
 #include "models/text.h"
 #include "models/wordcandidate.h"
-#include <QtCore>
 
 class AbstractLanguageFeatures;
 

diff --git a/src/lib/logic/eventhandler.h b/src/lib/logic/eventhandler.h
@@ -31,20 +31,14 @@
 #ifndef MALIIT_KEYBOARD_EVENTHANDLER_H
 #define MALIIT_KEYBOARD_EVENTHANDLER_H
 
-#include <QtCore>
 #include "models/wordcandidate.h"
 
 namespace MaliitKeyboard {
 
 class Key;
 
-namespace Model {
-class Layout;
-}
-
 namespace Logic {
 
-class LayoutUpdater;
 
 class EventHandler
     : public QObject

diff --git a/src/lib/logic/wordengine.h b/src/lib/logic/wordengine.h
@@ -32,13 +32,10 @@
 #ifndef MALIIT_KEYBOARD_WORDENGINE_H
 #define MALIIT_KEYBOARD_WORDENGINE_H
 
-#include "models/text.h"
 #include "logic/abstractwordengine.h"
 #include "logic/abstractlanguagefeatures.h"
 #include "languageplugininterface.h"
 
-#include <QtCore>
-#include <QMutex>
 
 namespace MaliitKeyboard {
 namespace Logic {

diff --git a/src/lib/models/key.h b/src/lib/models/key.h
@@ -34,7 +34,6 @@
 
 #include "models/area.h"
 
-#include <QtCore>
 
 namespace MaliitKeyboard {
 

diff --git a/src/lib/models/layout.cpp b/src/lib/models/layout.cpp
@@ -31,10 +31,7 @@
 #include "layout.h"
 #include "keyarea.h"
 #include "key.h"
-#include "keydescription.h"
 
-#include <QtGui/QGuiApplication>
-#include <QScreen>
 
 namespace MaliitKeyboard {
 namespace Model {

diff --git a/src/lib/models/layout.h b/src/lib/models/layout.h
@@ -32,18 +32,11 @@
 #define MALIIT_KEYBOARD_LAYOUT_H
 
 #include "models/key.h"
-#include <QtCore>
 
 namespace MaliitKeyboard {
 
 class KeyArea;
 
-
-namespace Logic {
-class LayoutHelper;
-class LayoutUpdater;
-}
-
 namespace Model {
 
 class LayoutPrivate;

diff --git a/src/lib/models/wordcandidate.h b/src/lib/models/wordcandidate.h
@@ -34,7 +34,6 @@
 
 #include "models/area.h"
 
-#include <QtCore>
 
 namespace MaliitKeyboard {
 

diff --git a/src/lib/models/wordribbon.h b/src/lib/models/wordribbon.h
@@ -35,7 +35,6 @@
 #include "models/wordcandidate.h"
 #include "models/area.h"
 
-#include <QtCore>
 
 namespace MaliitKeyboard {
 

diff --git a/src/plugin/device.cpp b/src/plugin/device.cpp
@@ -29,7 +29,6 @@
 
 #include "keyboardsettings.h"
 
-#include <QFile>
 #include <QFileInfo>
 #include <QJsonDocument>
 #include <QScreen>

diff --git a/src/plugin/device.h b/src/plugin/device.h
@@ -28,7 +28,6 @@
 #ifndef DEVICE_H
 #define DEVICE_H
 
-#include <QObject>
 #include <QJsonObject>
 
 class QScreen;

diff --git a/src/plugin/editor.cpp b/src/plugin/editor.cpp
@@ -32,8 +32,6 @@
 #include "models/text.h"
 #include "editor.h"
 
-#include <QtGui/QKeyEvent>
-#include <QTimer>
 #include <maliit/namespace.h>
 
 namespace MaliitKeyboard {

diff --git a/src/plugin/editor.h b/src/plugin/editor.h
@@ -32,12 +32,9 @@
 #ifndef MALIIT_KEYBOARD_EDITOR_H
 #define MALIIT_KEYBOARD_EDITOR_H
 
-#include "models/key.h"
-#include "models/wordcandidate.h"
 #include "view/abstracttexteditor.h"
 
 #include <maliit/plugins/abstractinputmethodhost.h>
-#include <QtCore>
 
 namespace MaliitKeyboard {
 

diff --git a/src/plugin/inputmethod.cpp b/src/plugin/inputmethod.cpp
@@ -32,23 +32,16 @@
 #include "inputmethod.h"
 #include "inputmethod_p.h"
 
-#include "models/key.h"
-#include "models/keyarea.h"
-#include "models/wordribbon.h"
-#include "models/layout.h"
 
 #include "logic/abstractlanguagefeatures.h"
 
 #include "view/setup.h"
 
-#include <maliit/plugins/subviewdescription.h>
 #include <maliit/plugins/updateevent.h>
 #include <maliit/namespace.h>
 
-#include <QGuiApplication>
 
 
-class MImUpdateEvent;
 
 using namespace MaliitKeyboard;
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,6 @@ @@
     #include "qconftypes.h"
-    #include <QStringList>
     /* This file is responsible for conversion between C++ values and GVariant *.
      *
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,7 +34,6 @@

		#include "models/area.h"

		#include <QtCore>

		namespace MaliitKeyboard {

Expand Down