qtextracomponents->kquickcontrolsaddons

2014-03-25 17:10:25 +01:00 · 2014-03-25 17:10:25 +01:00 · 91642b0868
commit 91642b0868
parent c8844799eb
25 changed files with 39 additions and 27 deletions
--- a/examples/applets/testcomponents/contents/ui/ButtonsPage.qml
+++ b/examples/applets/testcomponents/contents/ui/ButtonsPage.qml
@ -21,7 +21,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons

 // ButtonsPage

--- a/examples/applets/testcomponents/contents/ui/DialogContent.qml
+++ b/examples/applets/testcomponents/contents/ui/DialogContent.qml
@ -22,7 +22,7 @@ import QtQuick.Window 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons

 // DialogContent

--- a/examples/applets/testcomponents/contents/ui/DialogsPage.qml
+++ b/examples/applets/testcomponents/contents/ui/DialogsPage.qml
@ -22,7 +22,7 @@ import QtQuick.Window 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons

 // DialogsPage

--- a/examples/applets/testcomponents/contents/ui/DragItem.qml
+++ b/examples/applets/testcomponents/contents/ui/DragItem.qml
@ -21,7 +21,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons

 import org.kde.draganddrop 2.0 as DragAndDrop

--- a/examples/applets/testcomponents/contents/ui/DragPage.qml
+++ b/examples/applets/testcomponents/contents/ui/DragPage.qml
@ -21,7 +21,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons

 import org.kde.draganddrop 2.0 as DragAndDrop

--- a/examples/applets/testcomponents/contents/ui/IconsPage.qml
+++ b/examples/applets/testcomponents/contents/ui/IconsPage.qml
@ -21,7 +21,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons

 // IconTab

@ -77,7 +77,7 @@ PlasmaComponents.Page {
                width: _h
                height: width
            }
-            QtExtras.QIconItem {
+            KQuickControlsAddons.QIconItem {
                icon: "preferences-desktop-icons"
                width: _h
                height: width
--- a/examples/applets/testcomponents/contents/ui/MousePage.qml
+++ b/examples/applets/testcomponents/contents/ui/MousePage.qml
@ -21,7 +21,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons

 // MousePage

@ -36,7 +36,7 @@ PlasmaComponents.Page {
        text: "MouseEventListener"
        anchors { left: parent.left; right: parent.right; top: parent.top }
    }
-    QtExtras.MouseEventListener {
+    KQuickControlsAddons.MouseEventListener {
        id: mel
        hoverEnabled: true
        anchors { left: parent.left; right: parent.right; top: mellabel.bottom; bottom: parent.bottom; }
--- a/examples/applets/testcomponents/contents/ui/PlasmoidPage.qml
+++ b/examples/applets/testcomponents/contents/ui/PlasmoidPage.qml
@ -20,7 +20,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons

 // PlasmoidPage

--- a/examples/applets/testcomponents/contents/ui/TestMenu.qml
+++ b/examples/applets/testcomponents/contents/ui/TestMenu.qml
@ -20,7 +20,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons

 // PlasmoidPage

--- a/examples/applets/testcomponents/contents/ui/ThemePage.qml
+++ b/examples/applets/testcomponents/contents/ui/ThemePage.qml
@ -21,7 +21,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons

 // IconTab

--- a/examples/applets/testcomponents/contents/ui/testcomponents.qml
+++ b/examples/applets/testcomponents/contents/ui/testcomponents.qml
@ -23,7 +23,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.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons

 Item {
    id: root
--- a/examples/applets/testshaders/contents/ui/EditorPage.qml
+++ b/examples/applets/testshaders/contents/ui/EditorPage.qml
@ -21,7 +21,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons

 // ButtonsPage

--- a/examples/applets/testshaders/contents/ui/ShaderExample.qml
+++ b/examples/applets/testshaders/contents/ui/ShaderExample.qml
@ -21,7 +21,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons

 // VertexPage

--- a/examples/applets/testshaders/contents/ui/WaterEffect.qml
+++ b/examples/applets/testshaders/contents/ui/WaterEffect.qml
@ -21,7 +21,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons

 // VertexPage

--- a/examples/applets/testshaders/contents/ui/testshaderapplet.qml
+++ b/examples/applets/testshaders/contents/ui/testshaderapplet.qml
@ -21,7 +21,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons

 Item {
    id: root
--- a/examples/applets/testtheme/contents/ui/ScalePage.qml
+++ b/examples/applets/testtheme/contents/ui/ScalePage.qml
@ -21,7 +21,7 @@ import QtQuick 2.1
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons

 Item {

@ -125,7 +125,7 @@ Item {
            width: units.iconSizes.huge
            height: width
        }
-//         QtExtras.QIconItem {
+//         KQuickControlsAddons.QIconItem {
 //             icon: "preferences-desktop-icons"
 //             width: units.iconSizes.enormous
 //             height: width
--- a/examples/applets/testtheme/contents/ui/UnitsPage.qml
+++ b/examples/applets/testtheme/contents/ui/UnitsPage.qml
@ -21,7 +21,7 @@ import QtQuick 2.1
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons

 // IconTab

--- a/examples/applets/testtheme/contents/ui/testtheme.qml
+++ b/examples/applets/testtheme/contents/ui/testtheme.qml
@ -22,7 +22,7 @@ import QtQuick.Layouts 1.1
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 // import org.kde.plasma.extras 2.0 as PlasmaExtras
-// import org.kde.qtextracomponents 2.0 as QtExtras
+// import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons

 Item {
    id: root
--- a/src/declarativeimports/core/private/DefaultToolTip.qml
+++ b/src/declarativeimports/core/private/DefaultToolTip.qml
@ -22,7 +22,7 @@ import QtQuick.Layouts 1.1
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons



--- a/src/declarativeimports/plasmacomponents/platformcomponents/touch/EditBubble.qml
+++ b/src/declarativeimports/plasmacomponents/platformcomponents/touch/EditBubble.qml
@ -19,7 +19,7 @@

 import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.qtextracomponents 2.0
+import org.kde.kquickcontrolsaddons 2.0

 PlasmaCore.FrameSvgItem {
    id: editBubble
--- a/src/declarativeimports/plasmacomponents/platformcomponents/touch/TextArea.qml
+++ b/src/declarativeimports/plasmacomponents/platformcomponents/touch/TextArea.qml
@ -19,7 +19,7 @@

 import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.qtextracomponents 2.0
+import org.kde.kquickcontrolsaddons 2.0
 import "EditBubble.js" as EditBubbleHelper

 Item {
--- a/src/declarativeimports/plasmacomponents/platformcomponents/touch/TextField.qml
+++ b/src/declarativeimports/plasmacomponents/platformcomponents/touch/TextField.qml
@ -19,7 +19,7 @@

 import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.qtextracomponents 2.0
+import org.kde.kquickcontrolsaddons 2.0
 import "EditBubble.js" as EditBubbleHelper

 Item {
--- a/src/declarativeimports/plasmacomponents/qml/ProgressBar.qml
+++ b/src/declarativeimports/plasmacomponents/qml/ProgressBar.qml
@ -20,7 +20,7 @@
 import QtQuick 2.1
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
-import org.kde.qtextracomponents 2.0
+import org.kde.kquickcontrolsaddons 2.0

 /**
 * Simple progressBar using the plasma theme.
--- a/src/declarativeimports/plasmacomponents/qml/private/TabBarLayout.qml
+++ b/src/declarativeimports/plasmacomponents/qml/private/TabBarLayout.qml
@ -55,7 +55,7 @@ Properties:
 **/

 import QtQuick 2.1
-import org.kde.qtextracomponents 2.0
+import org.kde.kquickcontrolsaddons 2.0
 import "AppManager.js" as Utils

 Item {
--- a/tools/port-plasma2.sh
+++ b/tools/port-plasma2.sh
@ -154,3 +154,15 @@ for FS in `find $PWD -type f -name '*main.qml'`; do
    perl -p -i -e 's/QtQuick 2.0/QtQuick 2.0\nimport org.kde.plasma.plasmoid 2.0/g' $FS
 done

+for FS in `find $PWD  -name '*.qml'`; do
+    perl -p -i -e 's/org.kde.qtextracomponents/org.kde.kquickcontrolsaddons/g' $FS
+done
+
+for FS in `find $PWD  -name '*.qml'`; do
+    perl -p -i -e 's/QtExtras/KQuickControlsAddons/g' $FS
+done
+
+for FS in `find $PWD  -name '*.qml'`; do
+    perl -p -i -e 's/QtExtra/KQuickControlsAddons/g' $FS
+done
+