[connectionagent] support connman 1.21 and refactor

sailfishos · Mar 17, 2014 · 72bd715 · 72bd715
1 parent 00cfb49
commit 72bd715
Show file tree

Hide file tree

Showing 12 changed files with 603 additions and 1,179 deletions.
diff --git a/connd/connd.pro b/connd/connd.pro
@@ -12,7 +12,7 @@ equals(QT_MAJOR_VERSION, 5):  {
     PKGCONFIG += connman-qt5 qofono-qt5
 }
 
-CONFIG   += console link_pkgconfig 
+CONFIG   += console link_pkgconfig
 CONFIG   -= app_bundle
 
 TEMPLATE = app
@@ -25,12 +25,12 @@ OTHER_FILES += com.jolla.Connectiond.xml
 #system(qdbusxml2cpp -c ConnAdaptor -a connadaptor.h:connadaptor.cpp com.jollamobile.Connectiond.xml)
 
 SOURCES += main.cpp \
-    qconnectionmanager.cpp \
+    qconnectionagent.cpp \
     connadaptor.cpp \
     wakeupwatcher.cpp
 
 HEADERS+= \
-    qconnectionmanager.h \
+    qconnectionagent.h \
     connadaptor.h \
     wakeupwatcher.h
 

diff --git a/connd/main.cpp b/connd/main.cpp
@@ -24,7 +24,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "qconnectionmanager.h"
+#include "qconnectionagent.h"
 #include "connadaptor.h"
 
 static void signal_handler(int signum)
@@ -108,7 +108,7 @@ int main(int argc, char *argv[])
         return 1;
     }
 
-    QConnectionManager::instance();
+    QConnectionAgent::instance();
 
     return a.exec();
 }