try to support a public liblatte library

CMakeLists.txt

@@ -23,6 +23,8 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     Activities Archive CoreAddons GuiAddons Crash DBusAddons Declarative GlobalAccel I18n 
     IconThemes KIO NewStuff Notifications Plasma PlasmaQuick Wayland WindowSystem XmlGui)
 
+find_package(Latte REQUIRED)
+    
 find_package(X11 REQUIRED)
 set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
     URL "http://www.x.org"

app/CMakeLists.txt

@@ -23,7 +23,6 @@ add_subdirectory(settings/views)
 add_subdirectory(settings/widgets)
 add_subdirectory(shortcuts)
 add_subdirectory(tools)
-add_subdirectory(types)
 add_subdirectory(view)
 add_subdirectory(view/helpers)
 add_subdirectory(view/indicator)

app/indicator/factory.h

@@ -20,14 +20,14 @@
 #ifndef INDICATORFACTORY_H
 #define INDICATORFACTORY_H
 
-// local
-#include "../types/types.h"
-
 // Qt
 #include <QHash>
 #include <QObject>
 #include <QWidget>
 
+// Latte
+#include <Latte/types.h>
+
 class KPluginMetaData;
 
 namespace Latte {

app/lattecorona.h

@@ -24,7 +24,6 @@
 // local
 #include "plasma/quick/configview.h"
 #include "layout/storage.h"
-#include "types/types.h"
 #include "view/panelshadows_p.h"
 
 // Qt
@@ -37,6 +36,9 @@
 // KDE
 #include <KAboutApplicationDialog>
 
+// Latte
+#include <Latte/types.h>
+
 namespace KDeclarative {
 class QmlObjectSharedEngine;
 }

app/layout/abstractlayout.h

@@ -20,9 +20,6 @@
 #ifndef ABSTRACTLAYOUT_H
 #define ABSTRACTLAYOUT_H
 
-// local
-#include "../types/types.h"
-
 // Qt
 #include <QObject>
 
@@ -32,6 +29,9 @@
 // Plasma
 #include <Plasma>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Plasma {
 class Types;
 }

app/layout/centrallayout.cpp

@@ -29,12 +29,14 @@
 #include "../layouts/synchronizer.h"
 #include "../settings/universalsettings.h"
 #include "../view/view.h"
-#include "../types/types.h"
 
 // KDE
 #include <KConfigGroup>
 #include <KActivities/Consumer>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Latte {
 
 CentralLayout::CentralLayout(QObject *parent, QString layoutFile, QString assignedName)

app/layout/genericlayout.h

@@ -22,7 +22,6 @@
 
 // local
 #include "abstractlayout.h"
-#include "../types/types.h"
 
 // Qt
 #include <QObject>
@@ -33,6 +32,9 @@
 // Plasma
 #include <Plasma>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Plasma {
 class Applet;
 class Containment;

app/layouts/importer.cpp

@@ -26,7 +26,6 @@
 #include "../screenpool.h"
 #include "../layout/abstractlayout.h"
 #include "../settings/universalsettings.h"
-#include "../types/types.h"
 
 // Qt
 #include <QFile>
@@ -40,6 +39,9 @@
 #include <KLocalizedString>
 #include <KNotification>
 
+// Latte
+#include <Latte/types.h>
+
 enum SessionType
 {
     DefaultSession = 0,

app/layouts/launcherssignals.cpp

@@ -25,7 +25,6 @@
 #include "../layout/centrallayout.h"
 #include "../layouts/manager.h"
 #include "../layouts/synchronizer.h"
-#include "../types/tasks.h"
 
 // Qt
 #include <QQuickItem>
@@ -34,6 +33,9 @@
 #include <Plasma/Applet>
 #include <Plasma/Containment>
 
+// Latte
+#include <Latte/tasks.h>
+
 namespace Latte {
 namespace Layouts {
 

app/main.cpp

@@ -22,8 +22,6 @@
 #include "config-latte.h"
 #include "lattecorona.h"
 #include "layouts/importer.h"
-#include "types/tasks.h"
-#include "types/types.h"
 
 // C++
 #include <memory>
@@ -60,9 +58,6 @@ inline void detectPlatform(int argc, char **argv);
 
 int main(int argc, char **argv)
 {
-    qmlRegisterUncreatableType<Latte::Tasks>("org.kde.latte", 0, 2, "Tasks", "Latte Tasks Types uncreatable");
-    qmlRegisterUncreatableType<Latte::Types>("org.kde.latte", 0, 2, "Types", "Latte Types uncreatable");
-
     //Plasma scales itself to font DPI
     //on X, where we don't have compositor scaling, this generally works fine.
     //also there are bugs on older Qt, especially when it comes to fractional scaling

app/plasma/extended/screengeometries.h

@@ -25,7 +25,8 @@
 #include <QObject>
 #include <QTimer>
 
-#include "../../types/types.h"
+// Latte
+#include <Latte/types.h>
 
 namespace Latte {
 class Corona;

app/settings/controllers/layoutscontroller.h

@@ -27,7 +27,6 @@
 #include "../views/layoutsheaderview.h"
 #include "../models/layoutsmodel.h"
 #include "../../lattecorona.h"
-#include "../../types/types.h"
 
 // Qt
 #include <QAbstractItemModel>
@@ -35,6 +34,9 @@
 #include <QSortFilterProxyModel>
 #include <QTableView>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Latte {
 class Corona;
 class CentralLayout;

app/settings/data/layoutdata.h

@@ -21,14 +21,14 @@
 #ifndef SETTINGSDATALAYOUT_H
 #define SETTINGSDATALAYOUT_H
 
-//local
-#include "../../types/types.h"
-
 //Qt
 #include <QMetaType>
 #include <QString>
 #include <QStringList>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Latte {
 namespace Settings {
 namespace Data {

app/settings/data/preferencesdata.h

@@ -21,7 +21,8 @@
 #ifndef SETTINGSDATAPREFERENCES_H
 #define SETTINGSDATAPREFERENCES_H
 
-#include "../../types/types.h"
+// Latte
+#include <Latte/types.h>
 
 namespace Latte {
 namespace Settings {

app/settings/dialogs/settingsdialog.cpp

@@ -33,7 +33,6 @@
 #include "../../layouts/manager.h"
 #include "../../layouts/synchronizer.h"
 #include "../../plasma/extended/theme.h"
-#include "../../types/types.h"
 
 // Qt
 #include <QButtonGroup>

app/settings/dialogs/settingsdialog.h

@@ -27,7 +27,6 @@
 #include "../controllers/layoutscontroller.h"
 #include "../handlers/tablayoutshandler.h"
 #include "../handlers/tabpreferenceshandler.h"
-#include "../../types/types.h"
 
 // Qt
 #include <QObject>
@@ -41,6 +40,9 @@
 // KDE
 #include <KHelpMenu>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Ui {
 class SettingsDialog;
 }

app/settings/handlers/detailsinfohandler.cpp

@@ -26,7 +26,9 @@
 #include "../dialogs/detailsdialog.h"
 #include "../widgets/patternwidget.h"
 #include "../../layout/abstractlayout.h"
-#include "../../types/types.h"
+
+// Latte
+#include <Latte/types.h>
 
 namespace Latte {
 namespace Settings {

app/settings/handlers/tablayoutshandler.cpp

@@ -31,7 +31,6 @@
 #include "../../layout/centrallayout.h"
 #include "../../layouts/importer.h"
 #include "../../layouts/manager.h"
-#include "../../types/types.h"
 
 //! Qt
 #include <QFileDialog>
@@ -45,6 +44,9 @@
 #include <KIO/OpenFileManagerWindowJob>
 #include <KNewStuff3/KNS3/DownloadDialog>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Latte {
 namespace Settings {
 namespace Handler {

app/settings/handlers/tabpreferenceshandler.cpp

@@ -26,7 +26,9 @@
 #include "../dialogs/settingsdialog.h"
 #include "../../lattecorona.h"
 #include "../../plasma/extended/theme.h"
-#include "../../types/types.h"
+
+// Latte
+#include <Latte/types.h>
 
 namespace Latte {
 namespace Settings {

app/settings/universalsettings.h

@@ -23,7 +23,6 @@
 
 // local
 #include "../lattecorona.h"
-#include "../types/types.h"
 
 // Qt
 #include <QObject>
@@ -38,6 +37,9 @@
 #include <KConfigGroup>
 #include <KSharedConfig>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Latte {
 namespace Layouts {
 class Manager;

app/shortcuts/globalshortcuts.h

@@ -21,9 +21,6 @@
 #ifndef GLOBALSHORTCUTS_H
 #define GLOBALSHORTCUTS_H
 
-// local
-#include "../types/types.h"
-
 // Qt
 #include <QAction>
 #include <QPointer>
@@ -32,6 +29,9 @@
 // KDE
 #include <kmodifierkeyinfo.h>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Plasma {
 class Containment;
 }

app/view/effects.cpp

@@ -23,7 +23,6 @@
 #include "panelshadows_p.h"
 #include "view.h"
 #include "settings/primaryconfigview.h"
-#include "../types/types.h"
 
 // Qt
 #include <QRegion>
@@ -32,6 +31,9 @@
 #include <KWindowEffects>
 #include <KWindowSystem>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Latte {
 namespace ViewPart {
 

app/view/indicator/indicator.cpp

@@ -24,7 +24,6 @@
 #include "../view.h"
 #include "../../lattecorona.h"
 #include "../../indicator/factory.h"
-#include "../../types/types.h"
 
 // Qt
 #include <QFileDialog>
@@ -35,6 +34,9 @@
 #include <KDeclarative/ConfigPropertyMap>
 #include <KDeclarative/QmlObjectSharedEngine>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Latte {
 namespace ViewPart {
 

app/view/positioner.cpp

@@ -26,7 +26,6 @@
 #include "../lattecorona.h"
 #include "../screenpool.h"
 #include "../settings/universalsettings.h"
-#include "../types/types.h"
 
 // Qt
 #include <QDebug>
@@ -36,6 +35,9 @@
 #include <KWayland/Client/surface.h>
 #include <KWindowSystem>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Latte {
 namespace ViewPart {
 

app/view/settings/primaryconfigview.cpp

@@ -32,7 +32,6 @@
 #include "../../settings/universalsettings.h"
 #include "../../shortcuts/globalshortcuts.h"
 #include "../../shortcuts/shortcutstracker.h"
-#include "../../types/tasks.h"
 #include "../../wm/abstractwindowinterface.h"
 
 // Qt
@@ -52,6 +51,9 @@
 // Plasma
 #include <Plasma/Package>
 
+// Latte
+#include <Latte/tasks.h>
+
 namespace Latte {
 namespace ViewPart {
 

app/view/settings/primaryconfigview.h

@@ -24,7 +24,6 @@
 // local
 #include "../../plasma/quick/configview.h"
 #include "../../wm/windowinfowrap.h"
-#include "../../types/types.h"
 
 //Qt
 #include <QObject>
@@ -36,6 +35,9 @@
 #include <plasma/package.h>
 #include <Plasma/FrameSvg>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Plasma {
 class Applet;
 class Containment;

app/view/settings/secondaryconfigview.h

@@ -22,7 +22,6 @@
 
 // local
 #include "../../wm/windowinfowrap.h"
-#include "../../types/types.h"
 
 //Qt
 #include <QObject>
@@ -34,6 +33,9 @@
 #include <plasma/package.h>
 #include <Plasma/FrameSvg>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Plasma {
 class Applet;
 class Containment;

app/view/view.h

@@ -33,7 +33,6 @@
 #include "../layout/genericlayout.h"
 #include "../plasma/quick/containmentview.h"
 #include "../plasma/quick/configview.h"
-#include "../types/types.h"
 
 // C++
 #include <array>
@@ -47,6 +46,9 @@
 #include <QPointer>
 #include <QTimer>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Plasma {
 class Types;
 class Corona;

app/view/visibilitymanager.h

@@ -25,7 +25,6 @@
 
 // local
 #include "../plasma/quick/containmentview.h"
-#include "../types/types.h"
 
 // Qt
 #include <QObject>
@@ -34,6 +33,9 @@
 // Plasma
 #include <Plasma/Containment>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Latte {
 class Corona;
 class View;

app/wm/abstractwindowinterface.h

@@ -26,8 +26,6 @@
 #include "tasktools.h"
 #include "windowinfowrap.h"
 #include "tracker/windowstracker.h"
-#include "../types/types.h"
-//#include "../liblatte2/extras.h"
 
 // C++
 #include <unordered_map>
@@ -51,6 +49,9 @@
 // Plasma
 #include <Plasma>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Latte {
 class Corona;
 namespace WindowSystem {

app/wm/tracker/windowstracker.h

@@ -22,7 +22,6 @@
 
 // local
 #include "../windowinfowrap.h"
-#include "../../types/types.h"
 
 // Qt
 #include <QObject>
@@ -31,6 +30,9 @@
 #include <QMap>
 #include <QTimer>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Latte {
 class View;
 namespace Layout {

app/wm/waylandinterface.cpp

@@ -25,7 +25,6 @@
 #include "view/view.h"
 #include "view/helpers/screenedgeghostwindow.h"
 #include "../lattecorona.h"
-#include "../types/types.h"
 
 // Qt
 #include <QDebug>
@@ -34,6 +33,9 @@
 #include <QtX11Extras/QX11Info>
 #include <QRasterWindow>
 
+// Latte
+#include <Latte/types.h>
+
 // KDE
 #include <KWindowSystem>
 #include <KWindowInfo>

app/wm/xwindowinterface.cpp

@@ -24,7 +24,6 @@
 #include "tasktools.h"
 #include "view/view.h"
 #include "view/helpers/screenedgeghostwindow.h"
-#include "../types/types.h"
 
 // Qt
 #include <QDebug>
@@ -37,6 +36,9 @@
 #include <KWindowInfo>
 #include <KIconThemes/KIconLoader>
 
+// Latte
+#include <Latte/types.h>
+
 // X11
 #include <NETWM>
 #include <xcb/xcb.h>