Fix includes

Add missing ones

Remove unneeded ones

Convert forward decl to include where needed

Fix syntax where needed

(cherry picked from commit 6a6156db)

src/backends/R/rbackend.cpp

@@ -10,6 +10,8 @@
 #include "settings.h"
 #include "rsettingswidget.h"
 
+#include <KPluginFactory>
+
 RBackend::RBackend(QObject* parent,const QList<QVariant>& args) : Cantor::Backend(parent, args)
 {
     new RScriptExtension(this);

src/backends/R/rhighlighter.h

@@ -8,6 +8,8 @@
 
 #include "defaulthighlighter.h"
 
+#include <QRegExp>
+
 class RSession;
 
 class RHighlighter : public Cantor::DefaultHighlighter

src/backends/R/rkeywords.cpp

@@ -5,8 +5,8 @@
 
 #include "rkeywords.h"
 
-#include <repository.h>
-#include <KF5/KSyntaxHighlighting/Definition>
+#include <KSyntaxHighlighting/Repository>
+#include <KSyntaxHighlighting/Definition>
 
 RKeywords::RKeywords()
 {

src/backends/R/rserver/rserver.cpp

@@ -8,7 +8,7 @@
 // on the one hand comme il faut, on another, causes flickering in UI
 
 #include "rserver.h"
-#include <KIOCore/KIO/DeleteJob>
+#include <KIO/DeleteJob>
 #include "radaptor.h"
 #include "rcallbacks.h"
 #include "settings.h"

src/backends/julia/juliakeywords.cpp

@@ -4,8 +4,8 @@
 */
 #include "juliakeywords.h"
 
-#include <repository.h>
-#include <KF5/KSyntaxHighlighting/Definition>
+#include <KSyntaxHighlighting/Repository>
+#include <KSyntaxHighlighting/Definition>
 
 JuliaKeywords::JuliaKeywords()
 {

src/backends/lua/luabackend.cpp

@@ -10,6 +10,8 @@
 #include "luasettingswidget.h"
 #include "settings.h"
 
+#include <KPluginFactory>
+
 LuaBackend::LuaBackend( QObject* parent,const QList<QVariant> args ) : Cantor::Backend( parent,args )
 {
     new LuaScriptExtension(this);

src/backends/lua/luahelper.h

@@ -6,9 +6,10 @@
 #ifndef _LUAHELPER_H
 #define _LUAHELPER_H
 
+#include <QStringList>
+
 struct lua_State;
 class  QString;
-class  QStringList;
 
 /* follows lua_funcname convention */
 QString     luahelper_tostring   (lua_State* L, int idx);

src/backends/lua/luakeywords.cpp

@@ -5,8 +5,8 @@
 
 #include "luakeywords.h"
 
-#include <repository.h>
-#include <KF5/KSyntaxHighlighting/Definition>
+#include <KSyntaxHighlighting/Repository>
+#include <KSyntaxHighlighting/Definition>
 
 LuaKeywords::LuaKeywords()
 {

src/backends/maxima/maximabackend.cpp

@@ -10,6 +10,8 @@
 #include "maximasettingswidget.h"
 #include "settings.h"
 
+#include <KPluginFactory>
+
 MaximaBackend::MaximaBackend( QObject* parent,const QList<QVariant> args ) : Cantor::Backend( parent,args )
 {
     //initialize the supported extensions

src/backends/maxima/maximakeywords.cpp

@@ -7,8 +7,8 @@
 
 #include <QDebug>
 
-#include <repository.h>
-#include <KF5/KSyntaxHighlighting/Definition>
+#include <KSyntaxHighlighting/Repository>
+#include <KSyntaxHighlighting/Definition>
 
 MaximaKeywords* MaximaKeywords::instance()
 {

src/backends/octave/octavebackend.cpp

@@ -10,6 +10,8 @@
 #include "octavesettingswidget.h"
 #include "settings.h"
 
+#include <KPluginFactory>
+
 OctaveBackend::OctaveBackend(QObject* parent, const QList<QVariant>& args): Backend(parent, args)
 {
     new OctaveHistoryExtension(this);

src/backends/octave/octavekeywords.cpp

@@ -5,8 +5,8 @@
 
 #include "octavekeywords.h"
 
-#include <repository.h>
-#include <KF5/KSyntaxHighlighting/Definition>
+#include <KSyntaxHighlighting/Repository>
+#include <KSyntaxHighlighting/Definition>
 
 OctaveKeywords::OctaveKeywords()
 {

src/backends/python/pythonbackend.cpp

@@ -13,6 +13,8 @@
 #include <QDebug>
 #include <QWidget>
 
+#include <KPluginFactory>
+
 PythonBackend::PythonBackend(QObject* parent, const QList<QVariant>& args) : Cantor::Backend(parent, args)
 {
     new PythonLinearAlgebraExtension(this);

src/backends/python/pythonkeywords.cpp

@@ -8,8 +8,8 @@
 #include <QFile>
 #include <QDebug>
 
-#include <repository.h>
-#include <KF5/KSyntaxHighlighting/Definition>
+#include <KSyntaxHighlighting/Repository>
+#include <KSyntaxHighlighting/Definition>
 
 PythonKeywords::PythonKeywords()
 {

src/backends/qalculate/qalculatebackend.cpp

@@ -12,6 +12,7 @@
 #include "qalculatesettingswidget.h"
 
 #include <KLocalizedString>
+#include <KPluginFactory>
 
 QalculateBackend::QalculateBackend(QObject* parent,const QList<QVariant> args)
   : Cantor::Backend(parent, args)

src/backends/sage/sagebackend.cpp

@@ -10,6 +10,8 @@
 #include "sagesettingswidget.h"
 #include "settings.h"
 
+#include <KPluginFactory>
+
 SageBackend::SageBackend( QObject* parent,const QList<QVariant>& args ) : Cantor::Backend( parent,args )
 {
     //initialize the supported extensions

src/backends/sage/sagekeywords.cpp

@@ -4,8 +4,8 @@
 */
 #include "sagekeywords.h"
 
-#include <repository.h>
-#include <KF5/KSyntaxHighlighting/Definition>
+#include <KSyntaxHighlighting/Repository>
+#include <KSyntaxHighlighting/Definition>
 
 #include <QDebug>
 

src/backends/scilab/scilabbackend.cpp

@@ -9,6 +9,7 @@
 #include "scilabsettingswidget.h"
 #include "settings.h"
 
+#include <KPluginFactory>
 
 ScilabBackend::ScilabBackend(QObject* parent,const QList<QVariant> args) : Cantor::Backend(parent, args)
 {

src/backends/scilab/scilabkeywords.cpp

@@ -10,8 +10,8 @@
 #include <QtAlgorithms>
 #include <QDebug>
 
-#include <repository.h>
-#include <KF5/KSyntaxHighlighting/Definition>
+#include <KSyntaxHighlighting/Repository>
+#include <KSyntaxHighlighting/Definition>
 
 ScilabKeywords::ScilabKeywords()
 {

src/cantor.cpp

@@ -18,6 +18,7 @@
 #include <KNS3/DownloadDialog>
 #include <KParts/ReadWritePart>
 #include <KRecentFilesAction>
+#include <KPluginFactory>
 
 #include <QApplication>
 #include <QCloseEvent>