Improve UML concrete syntax DuSE-MT plugin implementation

Change-Id: I3952e437144a29eb0bdb333726f4076f22bf0b57
Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>

18 files changed, 153 insertions, 33 deletions

diff --git a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/duseplugin/duseplugin.pro b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/duseplugin/duseplugin.pro
new file mode 100644
index 00000000..25a1eae0
--- /dev/null
+++ b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/duseplugin/duseplugin.pro
@@ -0,0 +1,13 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2013-10-25T17:38:51
+#
+#-------------------------------------------------
+
+include(../../../duse-mt-plugin.pri)
+
+HEADERS += umlconcretesyntaxplugin.h
+
+SOURCES += umlconcretesyntaxplugin.cpp
+
+OTHER_FILES += umlconcretesyntax.json
diff --git a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/umlconcretesyntax_dependencies.pri b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/duseplugin/duseplugin_dependencies.pri
index 21ac3ba6..21ac3ba6 100644
--- a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/umlconcretesyntax_dependencies.pri
+++ b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/duseplugin/duseplugin_dependencies.pri
diff --git a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/duseplugin/umlconcretesyntax.json b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/duseplugin/umlconcretesyntax.json
new file mode 100644
index 00000000..a28ac84a
--- /dev/null
+++ b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/duseplugin/umlconcretesyntax.json
@@ -0,0 +1,8 @@
+{
+    "Category": "Concrete Syntax",
+    "Vendor": "Qt Project",
+    "Version": "1.0",
+    "DependencyList": [
+        "ConcreteSyntaxViewPlugin"
+    ]
+}
diff --git a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/umlconcretesyntaxplugin.cpp b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/duseplugin/umlconcretesyntaxplugin.cpp
index 783e1b46..783e1b46 100644
--- a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/umlconcretesyntaxplugin.cpp
+++ b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/duseplugin/umlconcretesyntaxplugin.cpp
diff --git a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/umlconcretesyntaxplugin.h b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/duseplugin/umlconcretesyntaxplugin.h
index 21110950..0c243822 100644
--- a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/umlconcretesyntaxplugin.h
+++ b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/duseplugin/umlconcretesyntaxplugin.h
@@ -43,9 +43,6 @@
 
 #include <duseinterfaces/iplugin.h>
 
-class QQuickView;
-class QQuickItem;
-
 class UmlConcreteSyntaxPlugin : public DuSE::IPlugin
 {
     Q_OBJECT
diff --git a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/UmlClass.qml b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/UmlClass.qml
index 7e6106ee..7e6106ee 100644
--- a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/UmlClass.qml
+++ b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/UmlClass.qml
diff --git a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/UmlComponent.qml b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/UmlComponent.qml
index a0639d5b..a0639d5b 100644
--- a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/UmlComponent.qml
+++ b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/UmlComponent.qml
diff --git a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/UmlElement.qml b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/UmlElement.qml
index 03a3d120..3d7bce0b 100644
--- a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/UmlElement.qml
+++ b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/UmlElement.qml
@@ -76,7 +76,7 @@ Rectangle {
     Image {
         id: resizeMark
         visible: parent.focus
-        source: "resize-mark.png"
+        source: "images/resize-mark.png"
         anchors { right: parent.right; bottom: parent.bottom }
         z: 1
         MouseArea {
diff --git a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/UmlProperty.qml b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/UmlProperty.qml
index 1972afa8..1972afa8 100644
--- a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/UmlProperty.qml
+++ b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/UmlProperty.qml
diff --git a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/UmlSlot.qml b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/UmlSlot.qml
index 23f22ded..23f22ded 100644
--- a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/UmlSlot.qml
+++ b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/UmlSlot.qml
diff --git a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/resize-mark.png b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/images/resize-mark.png
index b3697697..b3697697 100644
--- a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/resize-mark.png
+++ b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/images/resize-mark.png
diff --git a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmldir b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/qmldir
index ddc74ca3..ddc74ca3 100644
--- a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmldir
+++ b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/qmldir
diff --git a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/qmlplugin.pro b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/qmlplugin.pro
new file mode 100644
index 00000000..c6432afd
--- /dev/null
+++ b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/qmlplugin.pro
@@ -0,0 +1,27 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2013-10-25T17:38:51
+#
+#-------------------------------------------------
+
+TARGET  = qtmodelingumlplugin
+TARGETPATH = QtModeling/Uml
+
+# Qml
+QML_FILES = \
+    UmlElement.qml \
+    UmlSlot.qml \
+    UmlClass.qml \
+    UmlComponent.qml \
+    UmlProperty.qml
+
+# Images
+QML_FILES += \
+    images/resize-mark.png \
+
+HEADERS += umlconcretesyntaxqmlplugin.h
+
+SOURCES += umlconcretesyntaxqmlplugin.cpp
+
+CONFIG += no_cxx_module
+load(qml_plugin)
diff --git a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/umlconcretesyntaxqmlplugin.cpp b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/umlconcretesyntaxqmlplugin.cpp
new file mode 100644
index 00000000..dd09e3d2
--- /dev/null
+++ b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/umlconcretesyntaxqmlplugin.cpp
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org>
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtUml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "umlconcretesyntaxqmlplugin.h"
+
+void UmlConcreteSyntaxQmlPlugin::registerTypes(const char *uri)
+{
+}
+
diff --git a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/umlconcretesyntaxqmlplugin.h b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/umlconcretesyntaxqmlplugin.h
new file mode 100644
index 00000000..bf5438f6
--- /dev/null
+++ b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/umlconcretesyntaxqmlplugin.h
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org>
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtUml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef UMLCONCRETESYNTAXQMLPLUGIN_H
+#define UMLCONCRETESYNTAXQMLPLUGIN_H
+
+#include <QtQml/QQmlExtensionPlugin>
+
+class UmlConcreteSyntaxQmlPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
+
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif // UMLCONCRETESYNTAXQMLPLUGIN_H
+
diff --git a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/util.js b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/util.js
index f422aca6..f422aca6 100644
--- a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/util.js
+++ b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/qmlplugin/util.js
diff --git a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/umlconcretesyntax.json b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/umlconcretesyntax.json
deleted file mode 100644
index e845db64..00000000
--- a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/umlconcretesyntax.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "Category": "Concrete Syntax",
-    "Vendor": "Qt Project",
-    "Version": "1.0"
-}
diff --git a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/umlconcretesyntax.pro b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/umlconcretesyntax.pro
index 577b2a0e..5dd1557f 100644
--- a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/umlconcretesyntax.pro
+++ b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/umlconcretesyntax.pro
@@ -1,25 +1,3 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2013-10-25T17:38:51
-#
-#-------------------------------------------------
+TEMPLATE = subdirs
 
-include(../../duse-mt-plugin.pri)
-
-TARGETPATH = QtModeling/Uml
-
-QML_FILES = \
-    resize-mark.png \
-    UmlElement.qml \
-    UmlSlot.qml \
-    UmlClass.qml \
-    UmlComponent.qml \
-    UmlProperty.qml
-
-load(qml_module)
-
-SOURCES += umlconcretesyntaxplugin.cpp
-
-HEADERS += umlconcretesyntaxplugin.h
-
-OTHER_FILES += umlconcretesyntax.json
+SUBDIRS = duseplugin qmlplugin