Remove LanguagePluginInterface

Not needed, just use AbstractLanguagePlugin directly.
maliit · May 5, 2017 · 1e5aa06 · 1e5aa06
1 parent 676e614
commit 1e5aa06
Show file tree

Hide file tree

Showing 43 changed files with 13 additions and 124 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -45,12 +45,10 @@ set(MALIIT_KEYBOARD_LIB_SOURCES
         src/lib/logic/abstractwordengine.h
         src/lib/logic/eventhandler.cpp
         src/lib/logic/eventhandler.h
-        src/lib/logic/languageplugininterface.h
         src/lib/logic/style.cpp
         src/lib/logic/style.h
         src/lib/logic/wordengine.cpp
         src/lib/logic/wordengine.h
-
         src/lib/models/area.cpp
         src/lib/models/area.h
         src/lib/models/key.cpp
@@ -69,7 +67,6 @@ set(MALIIT_KEYBOARD_LIB_SOURCES
         src/lib/models/wordcandidate.h
         src/lib/models/wordribbon.cpp
         src/lib/models/wordribbon.h
-
         src/lib/coreutils.cpp
         src/lib/coreutils.h)
 
@@ -86,7 +83,7 @@ set(WESTERNSUPPORT_SOURCES
         src/lib/logic/abstractlanguageplugin.cpp
         src/lib/logic/abstractlanguageplugin.h)
 
-# TODO install logic/languageplugininterface.h and logic/abstractplugininterface.h as HEADERS
+# TODO install logic/abstractplugininterface.h as HEADERS
 
 set(maliit-keyboard-libraries Qt5::Core)
 set(maliit-keyboard-definitions HUNSPELL_DICT_PATH="${HUNSPELL_DICT_PATH}"

diff --git a/plugins/ar/src/arabicplugin.h b/plugins/ar/src/arabicplugin.h
@@ -2,13 +2,11 @@
 #define ARABICPLUGIN_H
 
 #include <QObject>
-#include "languageplugininterface.h"
 #include "westernlanguagesplugin.h"
 
 class ArabicPlugin : public WesternLanguagesPlugin
 {
     Q_OBJECT
-    Q_INTERFACES(LanguagePluginInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.ArabicPlugin" FILE "arabicplugin.json")
 
 public:

diff --git a/plugins/az/src/azerbaijaniplugin.h b/plugins/az/src/azerbaijaniplugin.h
@@ -2,15 +2,13 @@
 #define AZERBAIJANIPLUGIN_H
 
 #include <QObject>
-#include "languageplugininterface.h"
 #include "westernlanguagesplugin.h"
 
 //#include <presage.h>
 
 class AzerbaijaniPlugin : public WesternLanguagesPlugin
 {
     Q_OBJECT
-    Q_INTERFACES(LanguagePluginInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.AzerbaijaniPlugin" FILE "azerbaijaniplugin.json")
 
 public:

diff --git a/plugins/bs/src/bosnianplugin.h b/plugins/bs/src/bosnianplugin.h
@@ -2,13 +2,11 @@
 #define BOSNIANPLUGIN_H
 
 #include <QObject>
-#include "languageplugininterface.h"
 #include "westernlanguagesplugin.h"
 
 class BosnianPlugin : public WesternLanguagesPlugin
 {
     Q_OBJECT
-    Q_INTERFACES(LanguagePluginInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.BosnianPlugin" FILE "bosnianplugin.json")
 
 public:

diff --git a/plugins/ca/src/catalanplugin.h b/plugins/ca/src/catalanplugin.h
@@ -2,13 +2,11 @@
 #define CATALANPLUGIN_H
 
 #include <QObject>
-#include "languageplugininterface.h"
 #include "westernlanguagesplugin.h"
 
 class CatalanPlugin : public WesternLanguagesPlugin
 {
     Q_OBJECT
-    Q_INTERFACES(LanguagePluginInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.CatalanPlugin" FILE "catalanplugin.json")
 
 public:

diff --git a/plugins/chewing/src/chewingplugin.h b/plugins/chewing/src/chewingplugin.h
@@ -4,7 +4,6 @@
 #include <QObject>
 #include <QStringList>
 #include <QThread>
-#include "languageplugininterface.h"
 #include "abstractlanguageplugin.h"
 
 #include "chewingadapter.h"
@@ -16,7 +15,6 @@ class ChewingPlugin : public AbstractLanguagePlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.ChewingPlugin" FILE "chewingplugin.json")
-    Q_INTERFACES(LanguagePluginInterface)
 
 public:
     explicit ChewingPlugin(QObject *parent = nullptr);

diff --git a/plugins/cs/src/czechplugin.h b/plugins/cs/src/czechplugin.h
@@ -2,13 +2,11 @@
 #define CZECHPLUGIN_H
 
 #include <QObject>
-#include "languageplugininterface.h"
 #include "westernlanguagesplugin.h"
 
 class CzechPlugin : public WesternLanguagesPlugin
 {
     Q_OBJECT
-    Q_INTERFACES(LanguagePluginInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.CzechPlugin" FILE "czechplugin.json")
 
 public:

diff --git a/plugins/da/src/danishplugin.h b/plugins/da/src/danishplugin.h
@@ -2,13 +2,11 @@
 #define DANISHPLUGIN_H
 
 #include <QObject>
-#include "languageplugininterface.h"
 #include "westernlanguagesplugin.h"
 
 class DanishPlugin : public WesternLanguagesPlugin
 {
     Q_OBJECT
-    Q_INTERFACES(LanguagePluginInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.DanishPlugin" FILE "danishplugin.json")
 
 public:

diff --git a/plugins/de/src/germanplugin.h b/plugins/de/src/germanplugin.h
@@ -2,13 +2,11 @@
 #define GERMANPLUGIN_H
 
 #include <QObject>
-#include "languageplugininterface.h"
 #include "westernlanguagesplugin.h"
 
 class GermanPlugin : public WesternLanguagesPlugin
 {
     Q_OBJECT
-    Q_INTERFACES(LanguagePluginInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.GermanPlugin" FILE "germanplugin.json")
 
 public:

diff --git a/plugins/el/src/greekplugin.h b/plugins/el/src/greekplugin.h
@@ -2,13 +2,11 @@
 #define GREEKPLUGIN_H
 
 #include <QObject>
-#include "languageplugininterface.h"
 #include "westernlanguagesplugin.h"
 
 class GreekPlugin : public WesternLanguagesPlugin
 {
     Q_OBJECT
-    Q_INTERFACES(LanguagePluginInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.GreekPlugin" FILE "greekplugin.json")
 
 public:

diff --git a/plugins/emoji/src/emojiplugin.h b/plugins/emoji/src/emojiplugin.h
@@ -3,7 +3,6 @@
 
 #include <QObject>
 #include <QStringList>
-#include "languageplugininterface.h"
 #include "abstractlanguageplugin.h"
 
 #include <iostream>
@@ -14,7 +13,6 @@ class EmojiPlugin : public AbstractLanguagePlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.EmojiPlugin" FILE "emojiplugin.json")
-    Q_INTERFACES(LanguagePluginInterface)
 
 public:
     explicit EmojiPlugin(QObject *parent = nullptr);

diff --git a/plugins/en/src/englishplugin.h b/plugins/en/src/englishplugin.h
@@ -2,15 +2,13 @@
 #define ENGLISHPLUGIN_H
 
 #include <QObject>
-#include "languageplugininterface.h"
 #include "westernlanguagesplugin.h"
 
 //#include <presage.h>
 
 class EnglishPlugin : public WesternLanguagesPlugin
 {
     Q_OBJECT
-    Q_INTERFACES(LanguagePluginInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.EnglishPlugin" FILE "englishplugin.json")
 
 public:

diff --git a/plugins/eo/src/esperantoplugin.h b/plugins/eo/src/esperantoplugin.h
@@ -2,13 +2,11 @@
 #define ESPERANTOPLUGIN_H
 
 #include <QObject>
-#include "languageplugininterface.h"
 #include "westernlanguagesplugin.h"
 
 class EsperantoPlugin : public WesternLanguagesPlugin
 {
     Q_OBJECT
-    Q_INTERFACES(LanguagePluginInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.EsperantoPlugin" FILE "esperantoplugin.json")
 
 public:

diff --git a/plugins/es/src/spanishplugin.h b/plugins/es/src/spanishplugin.h
@@ -2,13 +2,11 @@
 #define SPANISHPLUGIN_H
 
 #include <QObject>
-#include "languageplugininterface.h"
 #include "westernlanguagesplugin.h"
 
 class SpanishPlugin : public WesternLanguagesPlugin
 {
     Q_OBJECT
-    Q_INTERFACES(LanguagePluginInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.SpanishPlugin" FILE "spanishplugin.json")
 
 public:

diff --git a/plugins/fa/src/persianplugin.h b/plugins/fa/src/persianplugin.h
@@ -2,13 +2,11 @@
 #define PERSIANPLUGIN_H
 
 #include <QObject>
-#include "languageplugininterface.h"
 #include "westernlanguagesplugin.h"
 
 class PersianPlugin : public WesternLanguagesPlugin
 {
     Q_OBJECT
-    Q_INTERFACES(LanguagePluginInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.PersianPlugin" FILE "persianplugin.json")
 
 public:

diff --git a/plugins/fi/src/finnishplugin.h b/plugins/fi/src/finnishplugin.h
@@ -2,13 +2,11 @@
 #define FINNISHPLUGIN_H
 
 #include <QObject>
-#include "languageplugininterface.h"
 #include "westernlanguagesplugin.h"
 
 class FinnishPlugin : public WesternLanguagesPlugin
 {
     Q_OBJECT
-    Q_INTERFACES(LanguagePluginInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.FinnishPlugin" FILE "finnishplugin.json")
 
 public:

diff --git a/plugins/fr/src/frenchplugin.h b/plugins/fr/src/frenchplugin.h
@@ -2,15 +2,13 @@
 #define FRENCHPLUGIN_H
 
 #include <QObject>
-#include "languageplugininterface.h"
 #include "westernlanguagesplugin.h"
 
 //#include <presage.h>
 
 class FrenchPlugin : public WesternLanguagesPlugin
 {
     Q_OBJECT
-    Q_INTERFACES(LanguagePluginInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.FrenchPlugin" FILE "frenchplugin.json")
 
 public:

diff --git a/plugins/gd/src/gaelicplugin.h b/plugins/gd/src/gaelicplugin.h
@@ -2,15 +2,13 @@
 #define GAELICPLUGIN_H
 
 #include <QObject>
-#include "languageplugininterface.h"
 #include "westernlanguagesplugin.h"
 
 //#include <presage.h>
 
 class GaelicPlugin : public WesternLanguagesPlugin
 {
     Q_OBJECT
-    Q_INTERFACES(LanguagePluginInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.GaelicPlugin" FILE "gaelicplugin.json")
 
 public:

diff --git a/plugins/he/src/hebrewplugin.h b/plugins/he/src/hebrewplugin.h
@@ -2,13 +2,11 @@
 #define HEBREWPLUGIN_H
 
 #include <QObject>
-#include "languageplugininterface.h"
 #include "westernlanguagesplugin.h"
 
 class HebrewPlugin : public WesternLanguagesPlugin
 {
     Q_OBJECT
-    Q_INTERFACES(LanguagePluginInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.HebrewPlugin" FILE "hebrewplugin.json")
 
 public:

diff --git a/plugins/hr/src/croatianplugin.h b/plugins/hr/src/croatianplugin.h
@@ -2,13 +2,11 @@
 #define CROATIANPLUGIN_H
 
 #include <QObject>
-#include "languageplugininterface.h"
 #include "westernlanguagesplugin.h"
 
 class CroatianPlugin : public WesternLanguagesPlugin
 {
     Q_OBJECT
-    Q_INTERFACES(LanguagePluginInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.CroatianPlugin" FILE "croatianplugin.json")
 
 public:

diff --git a/plugins/hu/src/hungarianplugin.h b/plugins/hu/src/hungarianplugin.h
@@ -2,13 +2,11 @@
 #define HUNGARIANPLUGIN_H
 
 #include <QObject>
-#include "languageplugininterface.h"
 #include "westernlanguagesplugin.h"
 
 class HungarianPlugin : public WesternLanguagesPlugin
 {
     Q_OBJECT
-    Q_INTERFACES(LanguagePluginInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.HungarianPlugin" FILE "hungarianplugin.json")
 
 public:

diff --git a/plugins/is/src/icelandicplugin.h b/plugins/is/src/icelandicplugin.h
@@ -2,13 +2,11 @@
 #define ICELANDICPLUGIN_H
 
 #include <QObject>
-#include "languageplugininterface.h"
 #include "westernlanguagesplugin.h"
 
 class IcelandicPlugin : public WesternLanguagesPlugin
 {
     Q_OBJECT
-    Q_INTERFACES(LanguagePluginInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.IcelandicPlugin" FILE "icelandicplugin.json")
 
 public:

diff --git a/plugins/it/src/italianplugin.h b/plugins/it/src/italianplugin.h
@@ -2,13 +2,11 @@
 #define ITALIANPLUGIN_H
 
 #include <QObject>
-#include "languageplugininterface.h"
 #include "westernlanguagesplugin.h"
 
 class ItalianPlugin : public WesternLanguagesPlugin
 {
     Q_OBJECT
-    Q_INTERFACES(LanguagePluginInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.ItalianPlugin" FILE "italianplugin.json")
 
 public:

diff --git a/plugins/ja/src/japaneseplugin.h b/plugins/ja/src/japaneseplugin.h
@@ -3,7 +3,6 @@
 
 #include <QObject>
 #include <QThread>
-#include "languageplugininterface.h"
 #include "abstractlanguageplugin.h"
 
 #include "anthyadapter.h"
@@ -13,7 +12,6 @@ class JapaneseLanguageFeatures;
 class JapanesePlugin : public AbstractLanguagePlugin
 {
     Q_OBJECT
-    Q_INTERFACES(LanguagePluginInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.JapanesePlugin" FILE "japaneseplugin.json")
 
 public:

diff --git a/plugins/ko/src/koreanplugin.h b/plugins/ko/src/koreanplugin.h
@@ -3,7 +3,6 @@
 
 #include <QObject>
 #include <QStringList>
-#include "languageplugininterface.h"
 #include "abstractlanguageplugin.h"
 #include "candidatescallback.h"
 #include "spellchecker.h"
@@ -18,7 +17,6 @@ class KoreanPlugin : public AbstractLanguagePlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.KoreanPlugin" FILE "koreanplugin.json")
-    Q_INTERFACES(LanguagePluginInterface)
 
 public:
     explicit KoreanPlugin(QObject *parent = nullptr);

diff --git a/plugins/lv/src/latvianplugin.h b/plugins/lv/src/latvianplugin.h
@@ -2,13 +2,11 @@
 #define LATVIANPLUGIN_H
 
 #include <QObject>
-#include "languageplugininterface.h"
 #include "westernlanguagesplugin.h"
 
 class LatvianPlugin : public WesternLanguagesPlugin
 {
     Q_OBJECT
-    Q_INTERFACES(LanguagePluginInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.LatvianPlugin" FILE "latvianplugin.json")
 
 public: