From 050958c58924934b10cf3a6272cff3ebe867f1dd Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Mon, 24 Jun 2013 17:04:57 -0400
Subject: Remove unityqmlmenumodel

It was used for calling ::init() on the unitymenumodel when parsing finished
(so that unitymenumodel wouldn't have to implement QQmlParserStatus). Now that
init() is gone, unityqmlmenumodel doesn't serve any purpose.
---
 libqmenumodel/QMenuModel/plugin.cpp     |  4 ++--
 libqmenumodel/src/CMakeLists.txt        |  1 -
 libqmenumodel/src/unityqmlmenumodel.cpp | 36 ----------------------------
 libqmenumodel/src/unityqmlmenumodel.h   | 42 ---------------------------------
 4 files changed, 2 insertions(+), 81 deletions(-)
 delete mode 100644 libqmenumodel/src/unityqmlmenumodel.cpp
 delete mode 100644 libqmenumodel/src/unityqmlmenumodel.h

diff --git a/libqmenumodel/QMenuModel/plugin.cpp b/libqmenumodel/QMenuModel/plugin.cpp
index 0205102..f529c0a 100644
--- a/libqmenumodel/QMenuModel/plugin.cpp
+++ b/libqmenumodel/QMenuModel/plugin.cpp
@@ -22,7 +22,7 @@
 #include "qdbusmenumodel.h"
 #include "qdbusactiongroup.h"
 #include "qstateaction.h"
-#include "unityqmlmenumodel.h"
+#include "unitymenumodel.h"
 
 #include <QtQml>
 
@@ -37,5 +37,5 @@ void QMenuModelQmlPlugin::registerTypes(const char *uri)
 
     qmlRegisterType<QDBusMenuModel>(uri, 0, 1, "QDBusMenuModel");
     qmlRegisterType<QDBusActionGroup>(uri, 0, 1, "QDBusActionGroup");
-    qmlRegisterType<UnityQmlMenuModel>(uri, 0, 1, "UnityMenuModel");
+    qmlRegisterType<UnityMenuModel>(uri, 0, 1, "UnityMenuModel");
 }
diff --git a/libqmenumodel/src/CMakeLists.txt b/libqmenumodel/src/CMakeLists.txt
index a2a6177..d74f2cc 100644
--- a/libqmenumodel/src/CMakeLists.txt
+++ b/libqmenumodel/src/CMakeLists.txt
@@ -11,7 +11,6 @@ set(QMENUMODEL_SRC
     qstateaction.cpp
     unitymenumodel.cpp
     unitymenumodel.h
-    unityqmlmenumodel.cpp
     gtk/gtkactionmuxer.c
     gtk/gtkactionmuxer.h
     gtk/gtkactionobservable.c
diff --git a/libqmenumodel/src/unityqmlmenumodel.cpp b/libqmenumodel/src/unityqmlmenumodel.cpp
deleted file mode 100644
index 36bb2bd..0000000
--- a/libqmenumodel/src/unityqmlmenumodel.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Lars Uebernickel <lars.uebernickel@canonical.com>
- */
-
-#include "unityqmlmenumodel.h"
-
-UnityQmlMenuModel::UnityQmlMenuModel(QObject *parent):
-    UnityMenuModel(parent)
-{
-}
-
-UnityQmlMenuModel::~UnityQmlMenuModel()
-{
-}
-
-void UnityQmlMenuModel::classBegin()
-{
-}
-
-void UnityQmlMenuModel::componentComplete()
-{
-}
diff --git a/libqmenumodel/src/unityqmlmenumodel.h b/libqmenumodel/src/unityqmlmenumodel.h
deleted file mode 100644
index d57d52e..0000000
--- a/libqmenumodel/src/unityqmlmenumodel.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Lars Uebernickel <lars.uebernickel@canonical.com>
- */
-
-#ifndef UNITYQMLENUMODEL_H
-#define UNITYQMLENUMODEL_H
-
-#include "unitymenumodel.h"
-
-#include <QQmlParserStatus>
-
-class UnityQmlMenuModel: public UnityMenuModel, public QQmlParserStatus
-{
-    Q_OBJECT
-    Q_INTERFACES(QQmlParserStatus)
-
-public:
-    UnityQmlMenuModel(QObject *parent = NULL);
-    ~UnityQmlMenuModel();
-
-    void classBegin();
-    void componentComplete();
-
-private:
-    struct UnityQmlMenuModelPrivate *priv;
-};
-
-#endif
-- 
cgit v1.2.3