Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
move libconnman-qt stuff here from liblipstick
  • Loading branch information
Lorn Potter committed Mar 20, 2013
1 parent f11e5cd commit aa869b2
Show file tree
Hide file tree
Showing 12 changed files with 272 additions and 128 deletions.
41 changes: 22 additions & 19 deletions connd/com.jollamobile.Connectiond.xml
@@ -1,27 +1,30 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="com.jolla.Connectiond">
<method name="sendUserReply">
<annotation value="QVariantMap" name="org.qtproject.QtDBus.QtTypeName.In0"/>
<arg type="a{sv}" name="input"/>
</method>
<method name="sendConnectReply">
<arg direction="in" type="s"/>
<arg direction="in" type="i"/>
</method>
<signal name="userInputRequested">
<annotation value="QVariantMap" name="org.qtproject.QtDBus.QtTypeName.In1"/>
<arg type="s" name="service"/>
<arg type="a{sv}" name="fields"/>
</signal>
<signal name="userInputCanceled"/>
<signal name="connectionRequest"/>
<signal name="configurationNeeded"/>
<signal name="errorReported">
<arg type="s" name="error"/>
<arg direction="out" type="s" name="error"/>
</signal>
<signal name="requestBrowser">
<arg type="s" name="url"/>
<arg direction="out" type="s" name="url"/>
</signal>
<signal name="connectionRequest"/>
<signal name="userInputCanceled"/>
<signal name="userInputRequested">
<arg direction="out" type="s" name="service"/>
<arg direction="out" type="a{sv}" name="fields"/>
<annotation value="QVariantMap" name="org.qtproject.QtDBus.QtTypeName.In1"/>
</signal>
<method name="sendConnectReply">
<arg direction="in" type="s" name="in0"/>
<arg direction="in" type="i" name="in1"/>
</method>
<method name="sendUserReply">
<arg direction="in" type="a{sv}" name="input"/>
<annotation value="QVariantMap" name="org.qtproject.QtDBus.QtTypeName.In0"/>
</method>
<method name="connectToType">
<arg direction="in" type="s" name="in0"/>
</method>
</interface>
</node>
40 changes: 21 additions & 19 deletions connd/conn.xml
@@ -1,28 +1,30 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="com.jolla.Connectiond">
<method name="sendUserReply">
<annotation value="QVariantMap" name="org.qtproject.QtDBus.QtTypeName.In0"/>
<arg type="a{sv}" name="input"/>
</method>
<method name="sendConnectReply">
<arg direction="in" type="s"/>
<arg direction="in" type="i"/>
</method>
<signal name="userInputRequested">
<annotation value="QVariantMap" name="org.qtproject.QtDBus.QtTypeName.In1"/>
<arg type="s" name="service"/>
<arg type="a{sv}" name="fields "/>
</signal>
<signal name="userInputCanceled"/>
<signal name="connectionRequest"/>
<signal name="wlanConfigurationNeeded"/>
<signal name="errorReported">
<arg type="s" name="service"/>
<arg type="s" name="error"/>
<arg direction="out" type="s" name="error"/>
</signal>
<signal name="requestBrowser">
<arg type="s" name="service"/>
<arg type="s" name="url"/>
<arg direction="out" type="s" name="url"/>
</signal>
<signal name="connectionRequest"/>
<signal name="userInputCanceled"/>
<signal name="userInputRequested">
<arg direction="out" type="s" name="service"/>
<arg direction="out" type="a{sv}" name="fields"/>
<annotation value="QVariantMap" name="org.qtproject.QtDBus.QtTypeName.In1"/>
</signal>
<method name="sendConnectReply">
<arg direction="in" type="s" name="in0"/>
<arg direction="in" type="i" name="in1"/>
</method>
<method name="sendUserReply">
<arg direction="in" type="a{sv}" name="input"/>
<annotation value="QVariantMap" name="org.qtproject.QtDBus.QtTypeName.In0"/>
</method>
<method name="connectToType">
<arg direction="in" type="s" name="in0"/>
</method>
</interface>
</node>
32 changes: 17 additions & 15 deletions connd/connadaptor.cpp
@@ -1,18 +1,12 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
** Contact: lorn.potter@gmail.com
**
**
** GNU Lesser General Public License Usage
** 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.
**
****************************************************************************/
/*
* This file was generated by qdbusxml2cpp version 0.7
* Command line was: qdbusxml2cpp -v -c ConnAdaptor -a connadaptor.h:connadaptor.cpp conn.xml
*
* qdbusxml2cpp is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
*
* This is an auto-generated file.
* Do not edit! All changes made to it will be lost.
*/

#include "connadaptor.h"
#include <QtCore/QMetaObject>
Expand All @@ -30,11 +24,19 @@
ConnAdaptor::ConnAdaptor(QObject *parent)
: QDBusAbstractAdaptor(parent)
{
// constructor
setAutoRelaySignals(true);
}

ConnAdaptor::~ConnAdaptor()
{
// destructor
}

void ConnAdaptor::connectToType(const QString &in0)
{
// handle method call com.jolla.Connectiond.connectToType
QMetaObject::invokeMethod(parent(), "connectToType", Q_ARG(QString, in0));
}

void ConnAdaptor::sendConnectReply(const QString &in0, int in1)
Expand Down
69 changes: 35 additions & 34 deletions connd/connadaptor.h
@@ -1,21 +1,16 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
** Contact: lorn.potter@gmail.com
**
**
** GNU Lesser General Public License Usage
** 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.
**
****************************************************************************/
/*
* This file was generated by qdbusxml2cpp version 0.7
* Command line was: qdbusxml2cpp -v -c ConnAdaptor -a connadaptor.h:connadaptor.cpp conn.xml
*
* qdbusxml2cpp is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
*
* This is an auto-generated file.
* This file may have been hand-edited. Look for HAND-EDIT comments
* before re-generating it.
*/

#ifndef CONNADAPTOR_H_1363412350
#define CONNADAPTOR_H_1363412350
#ifndef CONNADAPTOR_H_1363743442
#define CONNADAPTOR_H_1363743442

#include <QtCore/QObject>
#include <QtDBus/QtDBus>
Expand All @@ -35,27 +30,31 @@ class ConnAdaptor: public QDBusAbstractAdaptor
Q_CLASSINFO("D-Bus Interface", "com.jolla.Connectiond")
Q_CLASSINFO("D-Bus Introspection", ""
" <interface name=\"com.jolla.Connectiond\">\n"
" <method name=\"sendUserReply\">\n"
" <annotation value=\"QVariantMap\" name=\"org.qtproject.QtDBus.QtTypeName.In0\"/>\n"
" <arg type=\"a{sv}\" name=\"input\"/>\n"
" </method>\n"
" <method name=\"sendConnectReply\">\n"
" <arg direction=\"in\" type=\"s\"/>\n"
" <arg direction=\"in\" type=\"i\"/>\n"
" </method>\n"
" <signal name=\"userInputRequested\">\n"
" <annotation value=\"QVariantMap\" name=\"org.qtproject.QtDBus.QtTypeName.In1\"/>\n"
" <arg type=\"s\" name=\"service\"/>\n"
" <arg type=\"a{sv}\" name=\"fields \"/>\n"
" </signal>\n"
" <signal name=\"userInputCanceled\"/>\n"
" <signal name=\"connectionRequest\"/>\n"
" <signal name=\"wlanConfigurationNeeded\"/>\n"
" <signal name=\"errorReported\">\n"
" <arg type=\"s\" name=\"error\"/>\n"
" <arg direction=\"out\" type=\"s\" name=\"error\"/>\n"
" </signal>\n"
" <signal name=\"requestBrowser\">\n"
" <arg type=\"s\" name=\"url\"/>\n"
" <arg direction=\"out\" type=\"s\" name=\"url\"/>\n"
" </signal>\n"
" <signal name=\"connectionRequest\"/>\n"
" <signal name=\"userInputCanceled\"/>\n"
" <signal name=\"userInputRequested\">\n"
" <arg direction=\"out\" type=\"s\" name=\"service\"/>\n"
" <arg direction=\"out\" type=\"a{sv}\" name=\"fields\"/>\n"
" <annotation value=\"QVariantMap\" name=\"org.qtproject.QtDBus.QtTypeName.In1\"/>\n"
" </signal>\n"
" <method name=\"sendConnectReply\">\n"
" <arg direction=\"in\" type=\"s\" name=\"in0\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"in1\"/>\n"
" </method>\n"
" <method name=\"sendUserReply\">\n"
" <arg direction=\"in\" type=\"a{sv}\" name=\"input\"/>\n"
" <annotation value=\"QVariantMap\" name=\"org.qtproject.QtDBus.QtTypeName.In0\"/>\n"
" </method>\n"
" <method name=\"connectToType\">\n"
" <arg direction=\"in\" type=\"s\" name=\"in0\"/>\n"
" </method>\n"
" </interface>\n"
"")
public:
Expand All @@ -64,6 +63,7 @@ class ConnAdaptor: public QDBusAbstractAdaptor

public: // PROPERTIES
public Q_SLOTS: // METHODS
void connectToType(const QString &in0);
void sendConnectReply(const QString &in0, int in1);
void sendUserReply(const QVariantMap &input);
Q_SIGNALS: // SIGNALS
Expand All @@ -72,6 +72,7 @@ public Q_SLOTS: // METHODS
void requestBrowser(const QString &url);
void userInputCanceled();
void userInputRequested(const QString &service, const QVariantMap &fields);
void wlanConfigurationNeeded();
};

#endif
2 changes: 1 addition & 1 deletion connd/connd.pro
Expand Up @@ -3,7 +3,7 @@ QT += core network dbus gui
QT -= gui

TARGET = connectionagent
CONFIG += console
CONFIG += console link_pkgconfig
CONFIG -= app_bundle

TEMPLATE = app
Expand Down

0 comments on commit aa869b2

Please sign in to comment.