|
Lukáš Tinkl |
6a6da7c |
commit 688e2a2ce823d99e5ca1def1861fdf7591603cf2
|
|
Lukáš Tinkl |
6a6da7c |
Author: Lamarque V. Souza <lamarque@kde.org>
|
|
Lukáš Tinkl |
6a6da7c |
Date: Tue Jul 2 00:26:02 2013 -0300
|
|
Lukáš Tinkl |
6a6da7c |
|
|
Lukáš Tinkl |
6a6da7c |
Add missing files from last commit.
|
|
Lukáš Tinkl |
6a6da7c |
|
|
Lukáš Tinkl |
6a6da7c |
diff --git a/contourd/location/network-engines/networkmanager/NetworkManagerQtNotifier.cpp b/contourd/location/network-engines/networkmanager/NetworkManagerQtNotifier.cpp
|
|
Lukáš Tinkl |
6a6da7c |
new file mode 100644
|
|
Lukáš Tinkl |
6a6da7c |
index 0000000..bccbaf1
|
|
Lukáš Tinkl |
6a6da7c |
--- /dev/null
|
|
Lukáš Tinkl |
6a6da7c |
+++ b/contourd/location/network-engines/networkmanager/NetworkManagerQtNotifier.cpp
|
|
Lukáš Tinkl |
6a6da7c |
@@ -0,0 +1,66 @@
|
|
Lukáš Tinkl |
6a6da7c |
+/*
|
|
Lukáš Tinkl |
6a6da7c |
+ * Copyright (C) 2013 Lamarque V. Souza <lamarque@kde.org>
|
|
Lukáš Tinkl |
6a6da7c |
+ *
|
|
Lukáš Tinkl |
6a6da7c |
+ * This program is free software; you can redistribute it and/or modify
|
|
Lukáš Tinkl |
6a6da7c |
+ * it under the terms of the GNU General Public License version 2,
|
|
Lukáš Tinkl |
6a6da7c |
+ * or (at your option) any later version, as published by the Free
|
|
Lukáš Tinkl |
6a6da7c |
+ * Software Foundation
|
|
Lukáš Tinkl |
6a6da7c |
+ *
|
|
Lukáš Tinkl |
6a6da7c |
+ * This program is distributed in the hope that it will be useful,
|
|
Lukáš Tinkl |
6a6da7c |
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
Lukáš Tinkl |
6a6da7c |
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
Lukáš Tinkl |
6a6da7c |
+ * GNU General Public License for more details
|
|
Lukáš Tinkl |
6a6da7c |
+ *
|
|
Lukáš Tinkl |
6a6da7c |
+ * You should have received a copy of the GNU General Public
|
|
Lukáš Tinkl |
6a6da7c |
+ * License along with this program; if not, write to the
|
|
Lukáš Tinkl |
6a6da7c |
+ * Free Software Foundation, Inc.,
|
|
Lukáš Tinkl |
6a6da7c |
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
Lukáš Tinkl |
6a6da7c |
+ */
|
|
Lukáš Tinkl |
6a6da7c |
+
|
|
Lukáš Tinkl |
6a6da7c |
+#include "NetworkManagerQtNotifier.h"
|
|
Lukáš Tinkl |
6a6da7c |
+
|
|
Lukáš Tinkl |
6a6da7c |
+#include <NetworkManagerQt/Manager>
|
|
Lukáš Tinkl |
6a6da7c |
+#include <NetworkManagerQt/WirelessDevice>
|
|
Lukáš Tinkl |
6a6da7c |
+#include <NetworkManagerQt/AccessPoint>
|
|
Lukáš Tinkl |
6a6da7c |
+
|
|
Lukáš Tinkl |
6a6da7c |
+#include <QHash>
|
|
Lukáš Tinkl |
6a6da7c |
+
|
|
Lukáš Tinkl |
6a6da7c |
+#include <KDebug>
|
|
Lukáš Tinkl |
6a6da7c |
+
|
|
Lukáš Tinkl |
6a6da7c |
+REGISTER_NETWORK_NOTIFIER(NetworkManagerQtNotifier)
|
|
Lukáš Tinkl |
6a6da7c |
+
|
|
Lukáš Tinkl |
6a6da7c |
+class NetworkManagerQtNotifier::Private {
|
|
Lukáš Tinkl |
6a6da7c |
+public:
|
|
Lukáš Tinkl |
6a6da7c |
+ QHash<QString, NetworkManager::WirelessDevice::Ptr> devices;
|
|
Lukáš Tinkl |
6a6da7c |
+};
|
|
Lukáš Tinkl |
6a6da7c |
+
|
|
Lukáš Tinkl |
6a6da7c |
+
|
|
Lukáš Tinkl |
6a6da7c |
+NetworkManagerQtNotifier::NetworkManagerQtNotifier(QObject *parent)
|
|
Lukáš Tinkl |
6a6da7c |
+ : NetworkNotifier(parent), d(new Private())
|
|
Lukáš Tinkl |
6a6da7c |
+{
|
|
Lukáš Tinkl |
6a6da7c |
+}
|
|
Lukáš Tinkl |
6a6da7c |
+
|
|
Lukáš Tinkl |
6a6da7c |
+void NetworkManagerQtNotifier::init()
|
|
Lukáš Tinkl |
6a6da7c |
+{
|
|
Lukáš Tinkl |
6a6da7c |
+ kDebug() << "NetworkManagerQt";
|
|
Lukáš Tinkl |
6a6da7c |
+
|
|
Lukáš Tinkl |
6a6da7c |
+ foreach (const NetworkManager::Device::Ptr &device, NetworkManager::networkInterfaces()) {
|
|
Lukáš Tinkl |
6a6da7c |
+ // Check whether it is a wifi device.
|
|
Lukáš Tinkl |
6a6da7c |
+ if (device->type() != NetworkManager::Device::Wifi) {
|
|
Lukáš Tinkl |
6a6da7c |
+ continue;
|
|
Lukáš Tinkl |
6a6da7c |
+ }
|
|
Lukáš Tinkl |
6a6da7c |
+
|
|
Lukáš Tinkl |
6a6da7c |
+ NetworkManager::WirelessDevice::Ptr wifiDevice = device.objectCast<NetworkManager::WirelessDevice>();
|
|
Lukáš Tinkl |
6a6da7c |
+
|
|
Lukáš Tinkl |
6a6da7c |
+ d->devices[device->interfaceName()] = wifiDevice;
|
|
Lukáš Tinkl |
6a6da7c |
+
|
|
Lukáš Tinkl |
6a6da7c |
+ connect(wifiDevice.data(), SIGNAL(activeAccessPointChanged(QString)),
|
|
Lukáš Tinkl |
6a6da7c |
+ this, SLOT(setActiveAccessPoint(QString)));
|
|
Lukáš Tinkl |
6a6da7c |
+ }
|
|
Lukáš Tinkl |
6a6da7c |
+}
|
|
Lukáš Tinkl |
6a6da7c |
+
|
|
Lukáš Tinkl |
6a6da7c |
+NetworkManagerQtNotifier::~NetworkManagerQtNotifier()
|
|
Lukáš Tinkl |
6a6da7c |
+{
|
|
Lukáš Tinkl |
6a6da7c |
+ delete d;
|
|
Lukáš Tinkl |
6a6da7c |
+}
|
|
Lukáš Tinkl |
6a6da7c |
+
|
|
Lukáš Tinkl |
6a6da7c |
diff --git a/contourd/location/network-engines/networkmanager/NetworkManagerQtNotifier.h b/contourd/location/network-engines/networkmanager/NetworkManagerQtNotifier.h
|
|
Lukáš Tinkl |
6a6da7c |
new file mode 100644
|
|
Lukáš Tinkl |
6a6da7c |
index 0000000..765d66c
|
|
Lukáš Tinkl |
6a6da7c |
--- /dev/null
|
|
Lukáš Tinkl |
6a6da7c |
+++ b/contourd/location/network-engines/networkmanager/NetworkManagerQtNotifier.h
|
|
Lukáš Tinkl |
6a6da7c |
@@ -0,0 +1,44 @@
|
|
Lukáš Tinkl |
6a6da7c |
+/*
|
|
Lukáš Tinkl |
6a6da7c |
+ * Copyright (C) 2013 Lamarque V. Souza <lamarque@kde.org>
|
|
Lukáš Tinkl |
6a6da7c |
+ *
|
|
Lukáš Tinkl |
6a6da7c |
+ * This program is free software; you can redistribute it and/or modify
|
|
Lukáš Tinkl |
6a6da7c |
+ * it under the terms of the GNU General Public License version 2,
|
|
Lukáš Tinkl |
6a6da7c |
+ * or (at your option) any later version, as published by the Free
|
|
Lukáš Tinkl |
6a6da7c |
+ * Software Foundation
|
|
Lukáš Tinkl |
6a6da7c |
+ *
|
|
Lukáš Tinkl |
6a6da7c |
+ * This program is distributed in the hope that it will be useful,
|
|
Lukáš Tinkl |
6a6da7c |
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
Lukáš Tinkl |
6a6da7c |
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
Lukáš Tinkl |
6a6da7c |
+ * GNU General Public License for more details
|
|
Lukáš Tinkl |
6a6da7c |
+ *
|
|
Lukáš Tinkl |
6a6da7c |
+ * You should have received a copy of the GNU General Public
|
|
Lukáš Tinkl |
6a6da7c |
+ * License along with this program; if not, write to the
|
|
Lukáš Tinkl |
6a6da7c |
+ * Free Software Foundation, Inc.,
|
|
Lukáš Tinkl |
6a6da7c |
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
Lukáš Tinkl |
6a6da7c |
+ */
|
|
Lukáš Tinkl |
6a6da7c |
+
|
|
Lukáš Tinkl |
6a6da7c |
+#ifndef NETWORK_MANAGER_QT_NOTIFIER_H
|
|
Lukáš Tinkl |
6a6da7c |
+#define NETWORK_MANAGER_QT_NOTIFIER_H
|
|
Lukáš Tinkl |
6a6da7c |
+
|
|
Lukáš Tinkl |
6a6da7c |
+#include "../NetworkNotifier.h"
|
|
Lukáš Tinkl |
6a6da7c |
+
|
|
Lukáš Tinkl |
6a6da7c |
+/**
|
|
Lukáš Tinkl |
6a6da7c |
+ * NetworkManagerQtNotifier
|
|
Lukáš Tinkl |
6a6da7c |
+ */
|
|
Lukáš Tinkl |
6a6da7c |
+class NetworkManagerQtNotifier: public NetworkNotifier {
|
|
Lukáš Tinkl |
6a6da7c |
+ Q_OBJECT
|
|
Lukáš Tinkl |
6a6da7c |
+
|
|
Lukáš Tinkl |
6a6da7c |
+public:
|
|
Lukáš Tinkl |
6a6da7c |
+ NetworkManagerQtNotifier(QObject *parent = 0);
|
|
Lukáš Tinkl |
6a6da7c |
+ virtual ~NetworkManagerQtNotifier();
|
|
Lukáš Tinkl |
6a6da7c |
+
|
|
Lukáš Tinkl |
6a6da7c |
+protected:
|
|
Lukáš Tinkl |
6a6da7c |
+ void init();
|
|
Lukáš Tinkl |
6a6da7c |
+
|
|
Lukáš Tinkl |
6a6da7c |
+private:
|
|
Lukáš Tinkl |
6a6da7c |
+ class Private;
|
|
Lukáš Tinkl |
6a6da7c |
+ Private * const d;
|
|
Lukáš Tinkl |
6a6da7c |
+};
|
|
Lukáš Tinkl |
6a6da7c |
+
|
|
Lukáš Tinkl |
6a6da7c |
+#endif // NETWORK_MANAGER_QT_NOTIFIER_H
|
|
Lukáš Tinkl |
6a6da7c |
+
|