Rename Splitter to SplitView

Change-Id: I1db05195ada0b798a632da04fb256f030c894560
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>

11 files changed, 30 insertions, 136 deletions

diff --git a/examples/ApplicationTemplate/qml/main.qml b/examples/ApplicationTemplate/qml/main.qml
index 40662b4b..a307dc49 100644
--- a/examples/ApplicationTemplate/qml/main.qml
+++ b/examples/ApplicationTemplate/qml/main.qml
@@ -68,7 +68,7 @@ ApplicationWindow {
         }
     }
 
-    SplitterRow {
+    SplitView {
         anchors.fill: parent
         handleWidth: 1
         TableView {
diff --git a/examples/splitters/main.qml b/examples/splitters/main.qml
index eea57fca..dfacadaa 100644
--- a/examples/splitters/main.qml
+++ b/examples/splitters/main.qml
@@ -49,7 +49,7 @@ ApplicationWindow {
     width: 600
     height: 400
 
-    Splitter {
+    SplitView {
         anchors.fill: parent
 
         Rectangle {
@@ -68,7 +68,7 @@ ApplicationWindow {
             color: "lightsteelblue"
         }
 
-        Splitter {
+        SplitView {
             orientation: Qt.Vertical
             Layout.horizontalSizePolicy: Layout.Expanding
 
diff --git a/src/controls/Splitter.qml b/src/controls/SplitView.qml
index 8323bcbd..9f4ffff7 100644
--- a/src/controls/Splitter.qml
+++ b/src/controls/SplitView.qml
@@ -43,23 +43,23 @@ import QtQuick.Controls 1.0
 import QtQuick.Controls.Private 1.0 as Private
 
 /*!
-    \qmltype Splitter
+    \qmltype SplitView
     \inqmlmodule QtQuick.Controls 1.0
-    \brief Splitter is a component that lays out items horisontally or
+    \brief SplitView is a component that lays out items horisontally or
     vertically with a draggable splitter between each item.
 */
 
 /*
 *
-* Splitter
+* SplitView
 *
-* Splitter is a component that lays out items horisontally or
+* SplitView is a component that lays out items horisontally or
 * vertically with a draggable splitter between each item.
 *
-* There will always be one (and only one) item in the Splitter that is 'expanding'.
+* There will always be one (and only one) item in the SplitView that is 'expanding'.
 * Being expanding means that the item will get all the remaining space when other
 * items have been laid out according to their own width and height.
-* By default, the last visible child of the Splitter will be expanding, but
+* By default, the last visible child of the SplitView will be expanding, but
 * this can changed by setting Layout.horizontalSizePolicy to \c Layout.Expanding.
 * Since the expanding item will automatically be resized to fit the extra space, it
 * will ignore explicit assignments to width and height.
@@ -70,7 +70,7 @@ import QtQuick.Controls.Private 1.0 as Private
 * will belong to the item on the right. This will again control which item that gets resized
 * when the user drags a handle, and which handle that gets hidden when an item is told to hide.
 *
-* The Splitter contains the following API:
+* The SplitView contains the following API:
 *
 * int orientation - the orientation of the splitter. Can be either Qt.Horizontal
 *   or Qt.Vertical.
@@ -82,16 +82,16 @@ import QtQuick.Controls.Private 1.0 as Private
 *   bool pressed: the handle is being pressed.
 *   bool dragged: the handle is being dragged.
 *
-* Splitter supports setting Layout properties on child items, which means that you
+* SplitView supports setting Layout properties on child items, which means that you
 * can control minimumWidth, minimumHeight, maximumWidth and maximumHeight (in addition
 * to horizontalSizePolicy/verticalSizePolicy) for each child.
 *
 * Example:
 *
-* To create a Splitter with three items, and let
+* To create a SplitView with three items, and let
 * the center item be expanding, one could do the following:
 *
-*    Splitter {
+*    SplitView {
 *        anchors.fill: parent
 *        orientation: Qt.Horizontal
 *
@@ -175,7 +175,7 @@ Item {
                 if (!root.visible)
                     return
                 if (item.visible) {
-                    // Try to keep all items within the SplitterRow. When an item
+                    // Try to keep all items within the SplitView. When an item
                     // has been hidden, the expanding item might no longer be large enough
                     // to give away space to the new items width. So we need to resize:
                     var overflow = d.accumulatedSize(0, __items.length, true) - root[d.size];
diff --git a/src/controls/controls.pro b/src/controls/controls.pro
index 66410f7c..49d3eaaf 100644
--- a/src/controls/controls.pro
+++ b/src/controls/controls.pro
@@ -25,7 +25,7 @@ QML_FILES = \
     ScrollView.qml \
     Slider.qml \
     SpinBox.qml \
-    Splitter.qml \
+    SplitView.qml \
     StatusBar.qml \
     Tab.qml \
     TabView.qml \
diff --git a/src/controls/doc/qtquickcontrols.qdocconf b/src/controls/doc/qtquickcontrols.qdocconf
index 29fcbd1a..22b96798 100644
--- a/src/controls/doc/qtquickcontrols.qdocconf
+++ b/src/controls/doc/qtquickcontrols.qdocconf
@@ -26,7 +26,6 @@ sources += ../../private/qstyleitem.cpp \
            ../../private/PageSlideTransition.qml \
            ../../private/ScrollAreaHelper.qml \
            ../../private/ScrollBar.qml \
-           ../../private/SplitterBase.qml \
            ../../private/TabBar.qml \
            ../../private/Control.qml \
            ../../styles/Style.qml \
diff --git a/src/controls/qmldir b/src/controls/qmldir
index bb2b24e8..23b65844 100644
--- a/src/controls/qmldir
+++ b/src/controls/qmldir
@@ -18,7 +18,7 @@ RadioButton 1.0 RadioButton.qml
 ScrollView 1.0 ScrollView.qml
 Slider 1.0 Slider.qml
 SpinBox 1.0 SpinBox.qml
-Splitter 1.0 Splitter.qml
+SplitView 1.0 SplitView.qml
 StatusBar 1.0 StatusBar.qml
 Tab 1.0 Tab.qml
 TabView 1.0 TabView.qml
diff --git a/tests/auto/controls/data/tst_pagestack.qml b/tests/auto/controls/data/tst_pagestack.qml
index 5a7840a6..bad1683b 100644
--- a/tests/auto/controls/data/tst_pagestack.qml
+++ b/tests/auto/controls/data/tst_pagestack.qml
@@ -60,7 +60,7 @@ TestCase {
         PageStack {}
     }
 
-    function test_splitterrow() {
+    function test_pagestack() {
         var component = stackComponent
         var stack = component.createObject(testCase);
         verify (stack !== null, "pagestack created is null")
diff --git a/tests/auto/controls/data/tst_splitter.qml b/tests/auto/controls/data/tst_splitview.qml
index 9115540a..cf4eb6c2 100644
--- a/tests/auto/controls/data/tst_splitter.qml
+++ b/tests/auto/controls/data/tst_splitview.qml
@@ -44,23 +44,23 @@ import QtQuick.Controls 1.0
 
 TestCase {
     id: testCase
-    name: "Tests_Splitter"
+    name: "Tests_SplitView"
     when: windowShown
     width: 400
     height: 400
 
 
     Component {
-        id: splitterRow
-        Splitter { Item {}  Item {} }
+        id: splitView
+        SplitView { Item {}  Item {} }
     }
 
-    function test_splitter() {
-        var component = splitterRow
-        var splitter = component.createObject(testCase);
-        verify (splitter !== null, "splitterrow created is null")
-        verify (splitter.orientation === Qt.Horizontal)
-        verify (splitter.__items.length === 2)
+    function test_splitView() {
+        var component = splitView
+        var view = component.createObject(testCase);
+        verify (view !== null, "splitview created is null")
+        verify (view.orientation === Qt.Horizontal)
+        verify (view.__items.length === 2)
     }
 
 }
diff --git a/tests/manual/SplitterGallery.qml b/tests/manual/SplitterGallery.qml
deleted file mode 100644
index 8f0e6f65..00000000
--- a/tests/manual/SplitterGallery.qml
+++ /dev/null
@@ -1,106 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 1.0
-
-Rectangle {
-    width: 800
-    height: 500
-    color: syspal.window
-    SystemPalette{id:syspal}
-    SplitterRow {
-        id: sr
-        anchors.fill: parent
-        Item {
-            id: r1
-            Splitter.minimumWidth: 140
-            Splitter.expanding: false
-            width: 200
-            CheckBox {
-                id: be1
-                anchors.centerIn: parent
-                checked: parent.Splitter.expanding
-                text: "Set expanding"
-                onClicked: {
-                    parent.Splitter.expanding = true
-                    be2.checked = !parent.Splitter.expanding
-                }
-            }
-        }
-        Item {
-            id: r2
-            Splitter.minimumWidth: 140
-            Splitter.expanding: true
-            width: 200
-            CheckBox {
-                id: be2
-                anchors.centerIn: parent
-                text: "Set expanding"
-                checked: true
-                onClicked: {
-                    parent.Splitter.expanding = true
-                    be1.checked = !parent.Splitter.expanding
-                }
-            }
-        }
-        Item {
-            id: r3
-            Splitter.expanding: false
-            Splitter.minimumWidth: 140
-            width: 200
-            SplitterColumn {
-                id: sc
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.top: parent.top
-                anchors.bottom: parent.bottom
-                Item {
-                    id: cr1
-                    height:200
-                }
-                Item {
-                    id: cr2
-                    height: 200
-                }
-            }
-        }
-    }
-}
diff --git a/tests/manual/splitter.qml b/tests/manual/splitter.qml
index 82f0243b..104c92e6 100644
--- a/tests/manual/splitter.qml
+++ b/tests/manual/splitter.qml
@@ -46,9 +46,10 @@ ApplicationWindow {
     height: 200
 
     Row {
-        SplitterColumn {
+        SplitView {
             width: 200
             height: 200
+            orientation: Qt.Vertical
 
             Button {
                 text: "Button 1"
@@ -61,7 +62,7 @@ ApplicationWindow {
             }
         }
 
-        SplitterRow {
+        SplitView {
             width: 200
             height: 200
 
diff --git a/tests/manual/testbench/main.qml b/tests/manual/testbench/main.qml
index 78248d7f..5f2fea96 100644
--- a/tests/manual/testbench/main.qml
+++ b/tests/manual/testbench/main.qml
@@ -96,7 +96,7 @@ ApplicationWindow {
         }
     }
 
-    Splitter {
+    SplitView {
         anchors.fill: parent
         Flickable {
             id: testBenchRect