Remove qml NetworkingModel

"this class is going to be deprecated" for nearly five years should be deprecated already.
sailfishos · Jun 28, 2017 · bb6f1e2 · bb6f1e2
1 parent ec09ded
commit bb6f1e2
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 320 deletions.
diff --git a/README.rst b/README.rst
@@ -13,11 +13,6 @@ services of a given technology.
 
 `UserAgent` is a QML component providing `net.connman.Agent` D-Bus interface.
 
-The class `NetworkingModel` is a QML component adapting a static instance of
-`NetworkManager`. Also it provides the D-Bus interface `net.connman.Agent`.
-
-.. warning:: `NetworkingModel` is going to be deprecated.
-
 These classes are written to be re-usable in the qml environment, by setting the
 path property to that of an appropriate dbus path, will re-initialize the object to be used for the path given.
 

diff --git a/plugin/networkingmodel.cpp b/plugin/networkingmodel.cpp
diff --git a/plugin/networkingmodel.h b/plugin/networkingmodel.h
diff --git a/plugin/plugin.cpp b/plugin/plugin.cpp
@@ -15,7 +15,6 @@
 
 #include <networkservice.h>
 #include <clockmodel.h>
-#include "networkingmodel.h"
 #include "technologymodel.h"
 #include "savedservicemodel.h"
 #include "useragent.h"
@@ -38,7 +37,6 @@ void ConnmanPlugin::registerTypes(const char *uri)
     // @uri MeeGo.Connman
 
     qmlRegisterType<NetworkService>(uri,0,2,"NetworkService");
-    qmlRegisterType<NetworkingModel>(uri,0,2,"NetworkingModel");
     qmlRegisterType<TechnologyModel>(uri,0,2,"TechnologyModel");
     qmlRegisterType<SavedServiceModel>(uri,0,2,"SavedServiceModel");
     qmlRegisterType<UserAgent>(uri,0,2,"UserAgent");

diff --git a/plugin/plugin.pro b/plugin/plugin.pro
@@ -2,8 +2,8 @@ TARGET=ConnmanQtDeclarative
 TEMPLATE = lib
 QT += dbus
 CONFIG += plugin
-SOURCES = plugin.cpp networkingmodel.cpp technologymodel.cpp savedservicemodel.cpp
-HEADERS = networkingmodel.h technologymodel.h savedservicemodel.h
+SOURCES = plugin.cpp technologymodel.cpp savedservicemodel.cpp
+HEADERS = technologymodel.h savedservicemodel.h
 INCLUDEPATH += ../libconnman-qt
 LIBS += -L../libconnman-qt
 QT -= gui

diff --git a/plugin/savedservicemodel.h b/plugin/savedservicemodel.h
@@ -6,8 +6,7 @@
  * Apache License, version 2.0.  The full text of the Apache License is at
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * WARNING: this class is experimetal and is about to be refactored in order
- *          to deprecate NetworkingModel.
+ * WARNING: this class is experimental and is about to be refactored
  */
 
 #ifndef SAVEDSERVICEMODEL_H