From 7a4e3dc724fe4fed1515f991411cf18944cbca29 Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Mon, 26 Dec 2016 01:02:02 +0200
Subject: [PATCH] drop the dock part from plugin uri

--instead of org.kde.latte.dock, we now
ise org.kde.latte
---
 containment/contents/ui/PanelBox.qml                          | 2 +-
 containment/contents/ui/VisibilityManager.qml                 | 2 +-
 containment/contents/ui/main.qml                              | 2 +-
 liblattedock/CMakeLists.txt                                   | 4 ++--
 liblattedock/lattedockplugin.cpp                              | 2 +-
 liblattedock/qmldir                                           | 2 +-
 plasmoid/contents/ui/main.qml                                 | 2 +-
 shell/contents/configuration/LatteDockConfiguration.qml.cmake | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/containment/contents/ui/PanelBox.qml b/containment/contents/ui/PanelBox.qml
index 7797cae12..8ff1427cf 100644
--- a/containment/contents/ui/PanelBox.qml
+++ b/containment/contents/ui/PanelBox.qml
@@ -26,7 +26,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.kquickcontrolsaddons 2.0
 
-import org.kde.latte.dock 0.1 as Latte
+import org.kde.latte 0.1 as Latte
 
 Item{
     id:barLine
diff --git a/containment/contents/ui/VisibilityManager.qml b/containment/contents/ui/VisibilityManager.qml
index 61a6d1b21..92a3b9084 100644
--- a/containment/contents/ui/VisibilityManager.qml
+++ b/containment/contents/ui/VisibilityManager.qml
@@ -6,7 +6,7 @@ import org.kde.plasma.plasmoid 2.0
 
 import org.kde.taskmanager 0.1 as TaskManager
 
-import org.kde.latte.dock 0.1 as Latte
+import org.kde.latte 0.1 as Latte
 
 Item{
     id: manager
diff --git a/containment/contents/ui/main.qml b/containment/contents/ui/main.qml
index 5a4c67926..807fd742b 100644
--- a/containment/contents/ui/main.qml
+++ b/containment/contents/ui/main.qml
@@ -26,7 +26,7 @@ import org.kde.kquickcontrolsaddons 2.0
 import org.kde.draganddrop 2.0 as DragDrop
 import org.kde.plasma.plasmoid 2.0
 
-import org.kde.latte.dock 0.1 as Latte
+import org.kde.latte 0.1 as Latte
 
 import "LayoutManager.js" as LayoutManager
 
diff --git a/liblattedock/CMakeLists.txt b/liblattedock/CMakeLists.txt
index 5ee779b3c..ca280ff4a 100644
--- a/liblattedock/CMakeLists.txt
+++ b/liblattedock/CMakeLists.txt
@@ -25,6 +25,6 @@ target_link_libraries(lattedockplugin
         KF5::CoreAddons
 )
 
-install(TARGETS lattedockplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte/dock)
+install(TARGETS lattedockplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte)
 
-install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte/dock)
+install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte)
diff --git a/liblattedock/lattedockplugin.cpp b/liblattedock/lattedockplugin.cpp
index 160ec17b8..04cb9ae57 100644
--- a/liblattedock/lattedockplugin.cpp
+++ b/liblattedock/lattedockplugin.cpp
@@ -6,7 +6,7 @@
 
 void LatteDockPlugin::registerTypes(const char *uri)
 {
-    Q_ASSERT(uri == QLatin1String("org.kde.latte.dock"));
+    Q_ASSERT(uri == QLatin1String("org.kde.latte"));
     
     qmlRegisterUncreatableType<Latte::Dock>(uri, 0, 1, "Dock", "Latte Dock Types uncreatable");
     
diff --git a/liblattedock/qmldir b/liblattedock/qmldir
index 02729d107..737db9ed6 100644
--- a/liblattedock/qmldir
+++ b/liblattedock/qmldir
@@ -1,2 +1,2 @@
-module org.kde.latte.dock
+module org.kde.latte
 plugin lattedockplugin
diff --git a/plasmoid/contents/ui/main.qml b/plasmoid/contents/ui/main.qml
index 225e2ce9f..59cd8de50 100644
--- a/plasmoid/contents/ui/main.qml
+++ b/plasmoid/contents/ui/main.qml
@@ -29,7 +29,7 @@ import org.kde.plasma.private.taskmanager 0.1 as TaskManagerApplet
 
 import org.kde.activities 0.1 as Activities
 
-import org.kde.latte.dock 0.1 as Latte
+import org.kde.latte 0.1 as Latte
 
 import "../code/tools.js" as TaskTools
 import "../code/activitiesTools.js" as ActivitiesTools
diff --git a/shell/contents/configuration/LatteDockConfiguration.qml.cmake b/shell/contents/configuration/LatteDockConfiguration.qml.cmake
index 6c46b9dde..9fc7573cb 100644
--- a/shell/contents/configuration/LatteDockConfiguration.qml.cmake
+++ b/shell/contents/configuration/LatteDockConfiguration.qml.cmake
@@ -8,7 +8,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
 
 import org.kde.plasma.plasmoid 2.0
 
-import org.kde.latte.dock 0.1 as Latte
+import org.kde.latte 0.1 as Latte
 
 PlasmaCore.FrameSvgItem {
     imagePath: "dialogs/background"