From 903a1a454d439ccc62c1bbf503fde8ff720fc510 Mon Sep 17 00:00:00 2001
From: arcan1s <darkarcanis@mail.ru>
Date: Wed, 15 Jul 2015 19:49:54 +0300
Subject: [PATCH] move plugin back to private

---
 sources/awesome-widget/package/contents/ui/about.qml      | 2 +-
 sources/awesome-widget/package/contents/ui/advanced.qml   | 2 +-
 sources/awesome-widget/package/contents/ui/appearance.qml | 2 +-
 sources/awesome-widget/package/contents/ui/dataengine.qml | 2 +-
 sources/awesome-widget/package/contents/ui/main.qml       | 2 +-
 sources/awesome-widget/package/contents/ui/tooltip.qml    | 2 +-
 sources/awesome-widget/package/contents/ui/widget.qml     | 2 +-
 sources/awesome-widget/plugin/CMakeLists.txt              | 4 ++--
 sources/awesome-widget/plugin/awesomewidget.cpp           | 2 +-
 sources/awesome-widget/plugin/qmldir                      | 2 +-
 sources/desktop-panel/package/contents/ui/about.qml       | 2 +-
 sources/desktop-panel/package/contents/ui/activeapp.qml   | 2 +-
 sources/desktop-panel/package/contents/ui/advanced.qml    | 2 +-
 sources/desktop-panel/package/contents/ui/inactiveapp.qml | 2 +-
 sources/desktop-panel/package/contents/ui/main.qml        | 2 +-
 sources/desktop-panel/package/contents/ui/widget.qml      | 2 +-
 sources/desktop-panel/plugin/CMakeLists.txt               | 4 ++--
 sources/desktop-panel/plugin/desktoppanel.cpp             | 2 +-
 sources/desktop-panel/plugin/qmldir                       | 2 +-
 19 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/sources/awesome-widget/package/contents/ui/about.qml b/sources/awesome-widget/package/contents/ui/about.qml
index 92c4dd0..28e33dc 100644
--- a/sources/awesome-widget/package/contents/ui/about.qml
+++ b/sources/awesome-widget/package/contents/ui/about.qml
@@ -19,7 +19,7 @@ import QtQuick 2.0
 import QtQuick.Controls 1.3 as QtControls
 import QtQuick.Layouts 1.0 as QtLayouts
 
-import org.kde.plasma.awesomewidget 1.0
+import org.kde.plasma.private.awesomewidget 1.0
 
 
 Item {
diff --git a/sources/awesome-widget/package/contents/ui/advanced.qml b/sources/awesome-widget/package/contents/ui/advanced.qml
index acd4c64..c4d01ee 100644
--- a/sources/awesome-widget/package/contents/ui/advanced.qml
+++ b/sources/awesome-widget/package/contents/ui/advanced.qml
@@ -18,7 +18,7 @@
 import QtQuick 2.0
 import QtQuick.Controls 1.3 as QtControls
 
-import org.kde.plasma.awesomewidget 1.0
+import org.kde.plasma.private.awesomewidget 1.0
 
 
 Item {
diff --git a/sources/awesome-widget/package/contents/ui/appearance.qml b/sources/awesome-widget/package/contents/ui/appearance.qml
index b1c28df..9fc2619 100644
--- a/sources/awesome-widget/package/contents/ui/appearance.qml
+++ b/sources/awesome-widget/package/contents/ui/appearance.qml
@@ -20,7 +20,7 @@ import QtQuick.Controls 1.3 as QtControls
 import QtQuick.Controls.Styles 1.3 as QtStyles
 import QtQuick.Dialogs 1.1 as QtDialogs
 
-import org.kde.plasma.awesomewidget 1.0
+import org.kde.plasma.private.awesomewidget 1.0
 
 
 Item {
diff --git a/sources/awesome-widget/package/contents/ui/dataengine.qml b/sources/awesome-widget/package/contents/ui/dataengine.qml
index e25d76f..7a681f4 100644
--- a/sources/awesome-widget/package/contents/ui/dataengine.qml
+++ b/sources/awesome-widget/package/contents/ui/dataengine.qml
@@ -21,7 +21,7 @@ import QtQuick.Dialogs 1.1 as QtDialogs
 import QtQuick.Layouts 1.0 as QtLayouts
 import QtQuick.Controls.Styles 1.3 as QtStyles
 
-import org.kde.plasma.awesomewidget 1.0
+import org.kde.plasma.private.awesomewidget 1.0
 
 
 Item {
diff --git a/sources/awesome-widget/package/contents/ui/main.qml b/sources/awesome-widget/package/contents/ui/main.qml
index 2f0ce46..8e4e98d 100644
--- a/sources/awesome-widget/package/contents/ui/main.qml
+++ b/sources/awesome-widget/package/contents/ui/main.qml
@@ -22,7 +22,7 @@ import org.kde.plasma.plasmoid 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 
-import org.kde.plasma.awesomewidget 1.0
+import org.kde.plasma.private.awesomewidget 1.0
 import "."
 
 
diff --git a/sources/awesome-widget/package/contents/ui/tooltip.qml b/sources/awesome-widget/package/contents/ui/tooltip.qml
index a59aa00..bca8235 100644
--- a/sources/awesome-widget/package/contents/ui/tooltip.qml
+++ b/sources/awesome-widget/package/contents/ui/tooltip.qml
@@ -20,7 +20,7 @@ import QtQuick.Controls 1.3 as QtControls
 import QtQuick.Controls.Styles 1.3 as QtStyles
 import QtQuick.Dialogs 1.1 as QtDialogs
 
-import org.kde.plasma.awesomewidget 1.0
+import org.kde.plasma.private.awesomewidget 1.0
 
 
 Item {
diff --git a/sources/awesome-widget/package/contents/ui/widget.qml b/sources/awesome-widget/package/contents/ui/widget.qml
index a7b73c9..0e66439 100644
--- a/sources/awesome-widget/package/contents/ui/widget.qml
+++ b/sources/awesome-widget/package/contents/ui/widget.qml
@@ -19,7 +19,7 @@ import QtQuick 2.0
 import QtQuick.Controls 1.3 as QtControls
 import org.kde.plasma.core 2.0 as PlasmaCore
 
-import org.kde.plasma.awesomewidget 1.0
+import org.kde.plasma.private.awesomewidget 1.0
 
 
 Item {
diff --git a/sources/awesome-widget/plugin/CMakeLists.txt b/sources/awesome-widget/plugin/CMakeLists.txt
index 5219ca8..1ef4af0 100644
--- a/sources/awesome-widget/plugin/CMakeLists.txt
+++ b/sources/awesome-widget/plugin/CMakeLists.txt
@@ -32,7 +32,7 @@ qt5_wrap_ui (SUBPROJECT_UI_HEADER ${SUBPROJECT_UI})
 add_library (${PLUGIN_NAME} SHARED ${SUBPROJECT_SOURCE} ${SUBPROJECT_UI_HEADER})
 target_link_libraries (${PLUGIN_NAME} ${Qt_LIBRARIES} ${Kf5_LIBRARIES})
 
-install (TARGETS ${PLUGIN_NAME} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/awesomewidget)
-install (FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/awesomewidget)
+install (TARGETS ${PLUGIN_NAME} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/awesomewidget)
+install (FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/awesomewidget)
 install (FILES ${SUBPROJECT_NOTIFY} DESTINATION ${KNOTIFYRC_INSTALL_DIR})
 install (DIRECTORY ${SUBPROJECT_DESKTOP} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
diff --git a/sources/awesome-widget/plugin/awesomewidget.cpp b/sources/awesome-widget/plugin/awesomewidget.cpp
index 4c70f56..5166107 100644
--- a/sources/awesome-widget/plugin/awesomewidget.cpp
+++ b/sources/awesome-widget/plugin/awesomewidget.cpp
@@ -43,7 +43,7 @@ static QObject *awkeys_singletontype_provider(QQmlEngine *engine, QJSEngine *scr
 
 void AWPlugin::registerTypes(const char *uri)
 {
-    Q_ASSERT(uri == QLatin1String("org.kde.plasma.awesomewidget"));
+    Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.awesomewidget"));
 
     qmlRegisterSingletonType<AWActions>(uri, 1, 0, "AWActions", awactions_singletontype_provider);
     qmlRegisterSingletonType<AWKeys>(uri, 1, 0, "AWKeys", awkeys_singletontype_provider);
diff --git a/sources/awesome-widget/plugin/qmldir b/sources/awesome-widget/plugin/qmldir
index 76288c8..8a3ed27 100644
--- a/sources/awesome-widget/plugin/qmldir
+++ b/sources/awesome-widget/plugin/qmldir
@@ -1,3 +1,3 @@
-module org.kde.plasma.awesomewidget
+module org.kde.plasma.private.awesomewidget
 
 plugin awplugin
diff --git a/sources/desktop-panel/package/contents/ui/about.qml b/sources/desktop-panel/package/contents/ui/about.qml
index ad3201b..b4ec945 100644
--- a/sources/desktop-panel/package/contents/ui/about.qml
+++ b/sources/desktop-panel/package/contents/ui/about.qml
@@ -19,7 +19,7 @@ import QtQuick 2.0
 import QtQuick.Controls 1.3 as QtControls
 import QtQuick.Layouts 1.0 as QtLayouts
 
-import org.kde.plasma.desktoppanel 1.0
+import org.kde.plasma.private.desktoppanel 1.0
 
 
 Item {
diff --git a/sources/desktop-panel/package/contents/ui/activeapp.qml b/sources/desktop-panel/package/contents/ui/activeapp.qml
index 04855f1..e894571 100644
--- a/sources/desktop-panel/package/contents/ui/activeapp.qml
+++ b/sources/desktop-panel/package/contents/ui/activeapp.qml
@@ -20,7 +20,7 @@ import QtQuick.Controls 1.3 as QtControls
 import QtQuick.Controls.Styles 1.3 as QtStyles
 import QtQuick.Dialogs 1.1 as QtDialogs
 
-import org.kde.plasma.desktoppanel 1.0
+import org.kde.plasma.private.desktoppanel 1.0
 
 
 Item {
diff --git a/sources/desktop-panel/package/contents/ui/advanced.qml b/sources/desktop-panel/package/contents/ui/advanced.qml
index 3425ac5..a8023be 100644
--- a/sources/desktop-panel/package/contents/ui/advanced.qml
+++ b/sources/desktop-panel/package/contents/ui/advanced.qml
@@ -20,7 +20,7 @@ import QtQuick.Controls 1.3 as QtControls
 import QtQuick.Controls.Styles 1.3 as QtStyles
 import QtQuick.Dialogs 1.1 as QtDialogs
 
-import org.kde.plasma.desktoppanel 1.0
+import org.kde.plasma.private.desktoppanel 1.0
 
 
 Item {
diff --git a/sources/desktop-panel/package/contents/ui/inactiveapp.qml b/sources/desktop-panel/package/contents/ui/inactiveapp.qml
index 0333632..3086751 100644
--- a/sources/desktop-panel/package/contents/ui/inactiveapp.qml
+++ b/sources/desktop-panel/package/contents/ui/inactiveapp.qml
@@ -20,7 +20,7 @@ import QtQuick.Controls 1.3 as QtControls
 import QtQuick.Controls.Styles 1.3 as QtStyles
 import QtQuick.Dialogs 1.1 as QtDialogs
 
-import org.kde.plasma.desktoppanel 1.0
+import org.kde.plasma.private.desktoppanel 1.0
 
 
 Item {
diff --git a/sources/desktop-panel/package/contents/ui/main.qml b/sources/desktop-panel/package/contents/ui/main.qml
index 3fb48c4..d4d3219 100644
--- a/sources/desktop-panel/package/contents/ui/main.qml
+++ b/sources/desktop-panel/package/contents/ui/main.qml
@@ -22,7 +22,7 @@ import org.kde.plasma.plasmoid 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 
-import org.kde.plasma.desktoppanel 1.0
+import org.kde.plasma.private.desktoppanel 1.0
 import "."
 
 
diff --git a/sources/desktop-panel/package/contents/ui/widget.qml b/sources/desktop-panel/package/contents/ui/widget.qml
index 27616be..7d4dd13 100644
--- a/sources/desktop-panel/package/contents/ui/widget.qml
+++ b/sources/desktop-panel/package/contents/ui/widget.qml
@@ -18,7 +18,7 @@
 import QtQuick 2.0
 import QtQuick.Controls 1.3 as QtControls
 
-import org.kde.plasma.desktoppanel 1.0
+import org.kde.plasma.private.desktoppanel 1.0
 
 
 Item {
diff --git a/sources/desktop-panel/plugin/CMakeLists.txt b/sources/desktop-panel/plugin/CMakeLists.txt
index db2ccb1..b8bd506 100644
--- a/sources/desktop-panel/plugin/CMakeLists.txt
+++ b/sources/desktop-panel/plugin/CMakeLists.txt
@@ -28,6 +28,6 @@ file (GLOB SUBPROJECT_NOTIFY *.notifyrc)
 add_library (${PLUGIN_NAME} SHARED ${SUBPROJECT_SOURCE})
 target_link_libraries (${PLUGIN_NAME} ${Qt_LIBRARIES} ${Kf5_LIBRARIES})
 
-install (TARGETS ${PLUGIN_NAME} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/desktoppanel)
-install (FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/desktoppanel)
+install (TARGETS ${PLUGIN_NAME} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/desktoppanel)
+install (FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/desktoppanel)
 install (FILES ${SUBPROJECT_NOTIFY} DESTINATION ${KNOTIFYRC_INSTALL_DIR})
diff --git a/sources/desktop-panel/plugin/desktoppanel.cpp b/sources/desktop-panel/plugin/desktoppanel.cpp
index 3ec3cb6..2e40bf0 100644
--- a/sources/desktop-panel/plugin/desktoppanel.cpp
+++ b/sources/desktop-panel/plugin/desktoppanel.cpp
@@ -33,7 +33,7 @@ static QObject *dpadds_singletontype_provider(QQmlEngine *engine, QJSEngine *scr
 
 void DPPlugin::registerTypes(const char *uri)
 {
-    Q_ASSERT(uri == QLatin1String("org.kde.plasma.desktoppanel"));
+    Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.desktoppanel"));
 
     qmlRegisterSingletonType<DPAdds>(uri, 1, 0, "DPAdds", dpadds_singletontype_provider);
 }
diff --git a/sources/desktop-panel/plugin/qmldir b/sources/desktop-panel/plugin/qmldir
index 312f4a7..b49440a 100644
--- a/sources/desktop-panel/plugin/qmldir
+++ b/sources/desktop-panel/plugin/qmldir
@@ -1,3 +1,3 @@
-module org.kde.plasma.desktoppanel
+module org.kde.plasma.private.desktoppanel
 
 plugin dpplugin