diff --git a/containment/package/contents/ui/abilities/Debug.qml b/containment/package/contents/ui/abilities/Debug.qml index cfc422b2d..f9cc07050 100644 --- a/containment/package/contents/ui/abilities/Debug.qml +++ b/containment/package/contents/ui/abilities/Debug.qml @@ -20,7 +20,7 @@ import QtQuick 2.7 import org.kde.plasma.plasmoid 2.0 -import org.kde.latte.abilities.definitions 0.1 as AbilityDefinition +import org.kde.latte.abilities.definition 0.1 as AbilityDefinition import org.kde.latte.abilities.host 0.1 as AbilityHost AbilityHost.Debug { diff --git a/containment/package/contents/ui/abilities/UserRequests.qml b/containment/package/contents/ui/abilities/UserRequests.qml index 9b0c91ac1..3e814998c 100644 --- a/containment/package/contents/ui/abilities/UserRequests.qml +++ b/containment/package/contents/ui/abilities/UserRequests.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import org.kde.latte.core 0.2 as LatteCore -import org.kde.latte.abilities.definitions 0.1 as AbilityDefinition +import org.kde.latte.abilities.definition 0.1 as AbilityDefinition AbilityDefinition.UserRequests { id: containerUserRequests diff --git a/containment/package/contents/ui/abilities/privates/IndexerPrivate.qml b/containment/package/contents/ui/abilities/privates/IndexerPrivate.qml index 77052e3b7..80e3ee99e 100644 --- a/containment/package/contents/ui/abilities/privates/IndexerPrivate.qml +++ b/containment/package/contents/ui/abilities/privates/IndexerPrivate.qml @@ -20,7 +20,7 @@ import QtQuick 2.7 import org.kde.plasma.plasmoid 2.0 -import org.kde.latte.abilities.definitions 0.1 as AbilityDefinition +import org.kde.latte.abilities.definition 0.1 as AbilityDefinition AbilityDefinition.Indexer { id: indxr diff --git a/containment/package/contents/ui/abilities/privates/PositionShortcutsPrivate.qml b/containment/package/contents/ui/abilities/privates/PositionShortcutsPrivate.qml index 410e83d63..a3aff52ef 100644 --- a/containment/package/contents/ui/abilities/privates/PositionShortcutsPrivate.qml +++ b/containment/package/contents/ui/abilities/privates/PositionShortcutsPrivate.qml @@ -19,7 +19,7 @@ import QtQuick 2.7 -import org.kde.latte.abilities.definitions 0.1 as AbilityDefinition +import org.kde.latte.abilities.definition 0.1 as AbilityDefinition AbilityDefinition.PositionShortcuts { id: _shortcutsprivate diff --git a/containment/package/contents/ui/applet/communicator/Engine.qml b/containment/package/contents/ui/applet/communicator/Engine.qml index 52ef32ce8..0f5882cd6 100644 --- a/containment/package/contents/ui/applet/communicator/Engine.qml +++ b/containment/package/contents/ui/applet/communicator/Engine.qml @@ -19,7 +19,7 @@ import QtQuick 2.7 -import org.kde.latte.abilities.definitions 0.1 as AbilityDefinition +import org.kde.latte.abilities.definition 0.1 as AbilityDefinition import "../../../code/AppletIdentifier.js" as AppletIdentifier diff --git a/declarativeimports/abilities/client/Animations.qml b/declarativeimports/abilities/client/Animations.qml index 1c811a528..8bbb5a4c3 100644 --- a/declarativeimports/abilities/client/Animations.qml +++ b/declarativeimports/abilities/client/Animations.qml @@ -19,7 +19,7 @@ import QtQuick 2.7 -import org.kde.latte.abilities.definitions 0.1 as AbilityDefinition +import org.kde.latte.abilities.definition 0.1 as AbilityDefinition AbilityDefinition.Animations { id: _animations diff --git a/declarativeimports/abilities/client/Debug.qml b/declarativeimports/abilities/client/Debug.qml index b9d75af58..e2a8d6439 100644 --- a/declarativeimports/abilities/client/Debug.qml +++ b/declarativeimports/abilities/client/Debug.qml @@ -19,7 +19,7 @@ import QtQuick 2.0 -import org.kde.latte.abilities.definitions 0.1 as AbilityDefinition +import org.kde.latte.abilities.definition 0.1 as AbilityDefinition AbilityDefinition.Debug { property Item bridge: null diff --git a/declarativeimports/abilities/client/Indexer.qml b/declarativeimports/abilities/client/Indexer.qml index 8903ce646..4085f95ab 100644 --- a/declarativeimports/abilities/client/Indexer.qml +++ b/declarativeimports/abilities/client/Indexer.qml @@ -19,7 +19,7 @@ import QtQuick 2.0 -import org.kde.latte.abilities.definitions 0.1 as AbilityDefinition +import org.kde.latte.abilities.definition 0.1 as AbilityDefinition AbilityDefinition.Indexer { id: indexer diff --git a/declarativeimports/abilities/client/Metrics.qml b/declarativeimports/abilities/client/Metrics.qml index 99ce353eb..47ce58143 100644 --- a/declarativeimports/abilities/client/Metrics.qml +++ b/declarativeimports/abilities/client/Metrics.qml @@ -19,7 +19,7 @@ import QtQuick 2.0 -import org.kde.latte.abilities.definitions 0.1 as AbilityDefinition +import org.kde.latte.abilities.definition 0.1 as AbilityDefinition AbilityDefinition.Metrics { property Item bridge: null diff --git a/declarativeimports/abilities/client/ParabolicEffect.qml b/declarativeimports/abilities/client/ParabolicEffect.qml index 2aeee790c..14f8b0abe 100644 --- a/declarativeimports/abilities/client/ParabolicEffect.qml +++ b/declarativeimports/abilities/client/ParabolicEffect.qml @@ -19,7 +19,7 @@ import QtQuick 2.0 -import org.kde.latte.abilities.definitions 0.1 as AbilityDefinition +import org.kde.latte.abilities.definition 0.1 as AbilityDefinition AbilityDefinition.ParabolicEffect { id: parabolic diff --git a/declarativeimports/abilities/client/PositionShortcuts.qml b/declarativeimports/abilities/client/PositionShortcuts.qml index c9b67b275..5f98f1529 100644 --- a/declarativeimports/abilities/client/PositionShortcuts.qml +++ b/declarativeimports/abilities/client/PositionShortcuts.qml @@ -19,7 +19,7 @@ import QtQuick 2.0 -import org.kde.latte.abilities.definitions 0.1 as AbilityDefinition +import org.kde.latte.abilities.definition 0.1 as AbilityDefinition AbilityDefinition.PositionShortcuts { id: shortcuts diff --git a/declarativeimports/abilities/client/Requirements.qml b/declarativeimports/abilities/client/Requirements.qml index 370cd1630..0ed3a3066 100644 --- a/declarativeimports/abilities/client/Requirements.qml +++ b/declarativeimports/abilities/client/Requirements.qml @@ -19,7 +19,7 @@ import QtQuick 2.0 -import org.kde.latte.abilities.definitions 0.1 as AbilityDefinition +import org.kde.latte.abilities.definition 0.1 as AbilityDefinition AbilityDefinition.AppletRequirements { id: requirements diff --git a/declarativeimports/abilities/client/UserRequests.qml b/declarativeimports/abilities/client/UserRequests.qml index 2f3c8f0c3..15b5fa365 100644 --- a/declarativeimports/abilities/client/UserRequests.qml +++ b/declarativeimports/abilities/client/UserRequests.qml @@ -19,7 +19,7 @@ import QtQuick 2.0 -import org.kde.latte.abilities.definitions 0.1 as AbilityDefinition +import org.kde.latte.abilities.definition 0.1 as AbilityDefinition AbilityDefinition.UserRequests { id: _userRequests diff --git a/declarativeimports/abilities/definitions/Animations.qml b/declarativeimports/abilities/definition/Animations.qml similarity index 100% rename from declarativeimports/abilities/definitions/Animations.qml rename to declarativeimports/abilities/definition/Animations.qml diff --git a/declarativeimports/abilities/definitions/AppletRequirements.qml b/declarativeimports/abilities/definition/AppletRequirements.qml similarity index 100% rename from declarativeimports/abilities/definitions/AppletRequirements.qml rename to declarativeimports/abilities/definition/AppletRequirements.qml diff --git a/declarativeimports/abilities/definitions/Debug.qml b/declarativeimports/abilities/definition/Debug.qml similarity index 100% rename from declarativeimports/abilities/definitions/Debug.qml rename to declarativeimports/abilities/definition/Debug.qml diff --git a/declarativeimports/abilities/definitions/Indexer.qml b/declarativeimports/abilities/definition/Indexer.qml similarity index 100% rename from declarativeimports/abilities/definitions/Indexer.qml rename to declarativeimports/abilities/definition/Indexer.qml diff --git a/declarativeimports/abilities/definitions/Metrics.qml b/declarativeimports/abilities/definition/Metrics.qml similarity index 100% rename from declarativeimports/abilities/definitions/Metrics.qml rename to declarativeimports/abilities/definition/Metrics.qml diff --git a/declarativeimports/abilities/definitions/ParabolicEffect.qml b/declarativeimports/abilities/definition/ParabolicEffect.qml similarity index 100% rename from declarativeimports/abilities/definitions/ParabolicEffect.qml rename to declarativeimports/abilities/definition/ParabolicEffect.qml diff --git a/declarativeimports/abilities/definitions/PositionShortcuts.qml b/declarativeimports/abilities/definition/PositionShortcuts.qml similarity index 100% rename from declarativeimports/abilities/definitions/PositionShortcuts.qml rename to declarativeimports/abilities/definition/PositionShortcuts.qml diff --git a/declarativeimports/abilities/definitions/UserRequests.qml b/declarativeimports/abilities/definition/UserRequests.qml similarity index 100% rename from declarativeimports/abilities/definitions/UserRequests.qml rename to declarativeimports/abilities/definition/UserRequests.qml diff --git a/declarativeimports/abilities/definitions/animations/Duration.qml b/declarativeimports/abilities/definition/animations/Duration.qml similarity index 100% rename from declarativeimports/abilities/definitions/animations/Duration.qml rename to declarativeimports/abilities/definition/animations/Duration.qml diff --git a/declarativeimports/abilities/definitions/animations/Requirements.qml b/declarativeimports/abilities/definition/animations/Requirements.qml similarity index 100% rename from declarativeimports/abilities/definitions/animations/Requirements.qml rename to declarativeimports/abilities/definition/animations/Requirements.qml diff --git a/declarativeimports/abilities/definitions/animations/SpeedFactor.qml b/declarativeimports/abilities/definition/animations/SpeedFactor.qml similarity index 100% rename from declarativeimports/abilities/definitions/animations/SpeedFactor.qml rename to declarativeimports/abilities/definition/animations/SpeedFactor.qml diff --git a/declarativeimports/abilities/definitions/animations/Tracker.qml b/declarativeimports/abilities/definition/animations/Tracker.qml similarity index 100% rename from declarativeimports/abilities/definitions/animations/Tracker.qml rename to declarativeimports/abilities/definition/animations/Tracker.qml diff --git a/declarativeimports/abilities/definitions/metrics/Margin.qml b/declarativeimports/abilities/definition/metrics/Margin.qml similarity index 100% rename from declarativeimports/abilities/definitions/metrics/Margin.qml rename to declarativeimports/abilities/definition/metrics/Margin.qml diff --git a/declarativeimports/abilities/definitions/metrics/Mask.qml b/declarativeimports/abilities/definition/metrics/Mask.qml similarity index 100% rename from declarativeimports/abilities/definitions/metrics/Mask.qml rename to declarativeimports/abilities/definition/metrics/Mask.qml diff --git a/declarativeimports/abilities/definitions/metrics/Padding.qml b/declarativeimports/abilities/definition/metrics/Padding.qml similarity index 100% rename from declarativeimports/abilities/definitions/metrics/Padding.qml rename to declarativeimports/abilities/definition/metrics/Padding.qml diff --git a/declarativeimports/abilities/definitions/metrics/Totals.qml b/declarativeimports/abilities/definition/metrics/Totals.qml similarity index 100% rename from declarativeimports/abilities/definitions/metrics/Totals.qml rename to declarativeimports/abilities/definition/metrics/Totals.qml diff --git a/declarativeimports/abilities/definitions/metrics/mask/Thickness.qml b/declarativeimports/abilities/definition/metrics/mask/Thickness.qml similarity index 100% rename from declarativeimports/abilities/definitions/metrics/mask/Thickness.qml rename to declarativeimports/abilities/definition/metrics/mask/Thickness.qml diff --git a/declarativeimports/abilities/definitions/paraboliceffect/Factor.qml b/declarativeimports/abilities/definition/paraboliceffect/Factor.qml similarity index 100% rename from declarativeimports/abilities/definitions/paraboliceffect/Factor.qml rename to declarativeimports/abilities/definition/paraboliceffect/Factor.qml diff --git a/declarativeimports/abilities/definitions/paraboliceffect/PrivateProperties.qml b/declarativeimports/abilities/definition/paraboliceffect/PrivateProperties.qml similarity index 100% rename from declarativeimports/abilities/definitions/paraboliceffect/PrivateProperties.qml rename to declarativeimports/abilities/definition/paraboliceffect/PrivateProperties.qml diff --git a/declarativeimports/abilities/definitions/qmldir b/declarativeimports/abilities/definition/qmldir similarity index 85% rename from declarativeimports/abilities/definitions/qmldir rename to declarativeimports/abilities/definition/qmldir index 9bb34e3d3..2fbfc2947 100644 --- a/declarativeimports/abilities/definitions/qmldir +++ b/declarativeimports/abilities/definition/qmldir @@ -1,4 +1,4 @@ -module org.kde.latte.abilities.definitions +module org.kde.latte.abilities.definition Animations 0.1 Animations.qml AppletRequirements 0.1 AppletRequirements.qml diff --git a/declarativeimports/abilities/host/Animations.qml b/declarativeimports/abilities/host/Animations.qml index 15da6056a..c1089c391 100644 --- a/declarativeimports/abilities/host/Animations.qml +++ b/declarativeimports/abilities/host/Animations.qml @@ -19,7 +19,7 @@ import QtQuick 2.7 -import org.kde.latte.abilities.definitions 0.1 as AbilityDefinition +import org.kde.latte.abilities.definition 0.1 as AbilityDefinition AbilityDefinition.Animations { id: apis diff --git a/declarativeimports/abilities/host/Debug.qml b/declarativeimports/abilities/host/Debug.qml index 5d03ce273..a9854d691 100644 --- a/declarativeimports/abilities/host/Debug.qml +++ b/declarativeimports/abilities/host/Debug.qml @@ -19,7 +19,7 @@ import QtQuick 2.0 -import org.kde.latte.abilities.definitions 0.1 as AbilityDefinition +import org.kde.latte.abilities.definition 0.1 as AbilityDefinition AbilityDefinition.Debug { id: apis diff --git a/declarativeimports/abilities/host/Metrics.qml b/declarativeimports/abilities/host/Metrics.qml index fc535e8d1..a18766ef5 100644 --- a/declarativeimports/abilities/host/Metrics.qml +++ b/declarativeimports/abilities/host/Metrics.qml @@ -19,7 +19,7 @@ import QtQuick 2.0 -import org.kde.latte.abilities.definitions 0.1 as AbilityDefinition +import org.kde.latte.abilities.definition 0.1 as AbilityDefinition AbilityDefinition.Metrics { id: apis diff --git a/declarativeimports/abilities/host/ParabolicEffect.qml b/declarativeimports/abilities/host/ParabolicEffect.qml index eb49dab0c..ae9cb0b01 100644 --- a/declarativeimports/abilities/host/ParabolicEffect.qml +++ b/declarativeimports/abilities/host/ParabolicEffect.qml @@ -19,7 +19,7 @@ import QtQuick 2.0 -import org.kde.latte.abilities.definitions 0.1 as AbilityDefinition +import org.kde.latte.abilities.definition 0.1 as AbilityDefinition AbilityDefinition.ParabolicEffect { id: apis