From 4ab75786a1b5fc68992d7c83ca6e801e85f46c90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Tue, 6 Mar 2018 14:25:16 +0100 Subject: [PATCH] Add license header --- libnymea-networkmanager/dbus-interfaces.h | 16 ------------- .../libnymea-networkmanager.pro | 1 - libnymea-networkmanager/networkconnection.cpp | 18 +++++++++++---- libnymea-networkmanager/networkconnection.h | 18 +++++++++++---- libnymea-networkmanager/networkdevice.cpp | 18 +++++++++++---- libnymea-networkmanager/networkdevice.h | 18 +++++++++++---- libnymea-networkmanager/networkmanager.cpp | 18 +++++++++++---- libnymea-networkmanager/networkmanager.h | 18 +++++++++++---- .../networkmanagerutils.cpp | 21 +++++++++++++++++ libnymea-networkmanager/networkmanagerutils.h | 21 +++++++++++++++++ libnymea-networkmanager/networksettings.cpp | 18 +++++++++++---- libnymea-networkmanager/networksettings.h | 18 +++++++++++---- .../wirednetworkdevice.cpp | 16 ++++++++++--- libnymea-networkmanager/wirednetworkdevice.h | 18 +++++++++++---- .../wirelessaccesspoint.cpp | 18 +++++++++++---- libnymea-networkmanager/wirelessaccesspoint.h | 18 +++++++++++---- .../wirelessnetworkdevice.cpp | 18 +++++++++++---- .../wirelessnetworkdevice.h | 18 +++++++++++---- .../bluetooth/bluetoothserver.cpp | 23 ++++++++++++------- .../bluetooth/bluetoothserver.h | 18 +++++++++++---- .../bluetooth/bluetoothuuids.h | 18 +++++++++++---- .../bluetooth/loggingcategories.cpp | 21 +++++++++++++++++ .../bluetooth/loggingcategories.h | 21 +++++++++++++++++ .../bluetooth/networkservice.cpp | 19 +++++++++++---- .../bluetooth/networkservice.h | 18 +++++++++++---- .../bluetooth/wirelessservice.cpp | 18 +++++++++++---- nymea-networkmanager/core.cpp | 21 +++++++++++++++++ nymea-networkmanager/core.h | 21 +++++++++++++++++ 28 files changed, 407 insertions(+), 100 deletions(-) delete mode 100644 libnymea-networkmanager/dbus-interfaces.h diff --git a/libnymea-networkmanager/dbus-interfaces.h b/libnymea-networkmanager/dbus-interfaces.h deleted file mode 100644 index 4ccd749..0000000 --- a/libnymea-networkmanager/dbus-interfaces.h +++ /dev/null @@ -1,16 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * * - * Copyright (C) 2016 Simon Stürz * - * * - * This file is part of loopd. * - * * - * Loopd can not be copied and/or distributed without the express * - * permission of guh GmbH. * - * * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -#ifndef DBUSINTERFACES_H -#define DBUSINTERFACES_H - - -#endif // DBUSINTERFACES_H diff --git a/libnymea-networkmanager/libnymea-networkmanager.pro b/libnymea-networkmanager/libnymea-networkmanager.pro index 2c5ac4c..9186cf0 100644 --- a/libnymea-networkmanager/libnymea-networkmanager.pro +++ b/libnymea-networkmanager/libnymea-networkmanager.pro @@ -11,7 +11,6 @@ QMAKE_LFLAGS += -std=c++11 HEADERS += \ networkmanager.h \ - dbus-interfaces.h \ networkconnection.h \ networkdevice.h \ networksettings.h \ diff --git a/libnymea-networkmanager/networkconnection.cpp b/libnymea-networkmanager/networkconnection.cpp index d8009c9..96e1ae6 100644 --- a/libnymea-networkmanager/networkconnection.cpp +++ b/libnymea-networkmanager/networkconnection.cpp @@ -1,11 +1,21 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2016 Simon Stürz * + * Copyright (C) 2018 Simon Stürz * * * - * This file is part of loopd. * + * This file is part of libnymea-networkmanager. * * * - * Loopd can not be copied and/or distributed without the express * - * permission of guh GmbH. * + * libnymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * libnymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with libnymea-networkmanager. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libnymea-networkmanager/networkconnection.h b/libnymea-networkmanager/networkconnection.h index d118a82..7ace7d2 100644 --- a/libnymea-networkmanager/networkconnection.h +++ b/libnymea-networkmanager/networkconnection.h @@ -1,11 +1,21 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2016 Simon Stürz * + * Copyright (C) 2018 Simon Stürz * * * - * This file is part of loopd. * + * This file is part of libnymea-networkmanager. * * * - * Loopd can not be copied and/or distributed without the express * - * permission of guh GmbH. * + * libnymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * libnymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with libnymea-networkmanager. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libnymea-networkmanager/networkdevice.cpp b/libnymea-networkmanager/networkdevice.cpp index 9f01981..0c8a35e 100644 --- a/libnymea-networkmanager/networkdevice.cpp +++ b/libnymea-networkmanager/networkdevice.cpp @@ -1,11 +1,21 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2016 Simon Stürz * + * Copyright (C) 2018 Simon Stürz * * * - * This file is part of loopd. * + * This file is part of libnymea-networkmanager. * * * - * Loopd can not be copied and/or distributed without the express * - * permission of guh GmbH. * + * libnymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * libnymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with libnymea-networkmanager. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libnymea-networkmanager/networkdevice.h b/libnymea-networkmanager/networkdevice.h index 5b06c6b..d9494f1 100644 --- a/libnymea-networkmanager/networkdevice.h +++ b/libnymea-networkmanager/networkdevice.h @@ -1,11 +1,21 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2016 Simon Stürz * + * Copyright (C) 2018 Simon Stürz * * * - * This file is part of loopd. * + * This file is part of libnymea-networkmanager. * * * - * Loopd can not be copied and/or distributed without the express * - * permission of guh GmbH. * + * libnymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * libnymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with libnymea-networkmanager. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libnymea-networkmanager/networkmanager.cpp b/libnymea-networkmanager/networkmanager.cpp index b910cd1..b112935 100644 --- a/libnymea-networkmanager/networkmanager.cpp +++ b/libnymea-networkmanager/networkmanager.cpp @@ -1,11 +1,21 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2016 Simon Stürz * + * Copyright (C) 2018 Simon Stürz * * * - * This file is part of loopd. * + * This file is part of libnymea-networkmanager. * * * - * Loopd can not be copied and/or distributed without the express * - * permission of guh GmbH. * + * libnymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * libnymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with libnymea-networkmanager. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libnymea-networkmanager/networkmanager.h b/libnymea-networkmanager/networkmanager.h index 7639acc..6dfca17 100644 --- a/libnymea-networkmanager/networkmanager.h +++ b/libnymea-networkmanager/networkmanager.h @@ -1,11 +1,21 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2016 Simon Stürz * + * Copyright (C) 2018 Simon Stürz * * * - * This file is part of loopd. * + * This file is part of libnymea-networkmanager. * * * - * Loopd can not be copied and/or distributed without the express * - * permission of guh GmbH. * + * libnymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * libnymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with libnymea-networkmanager. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libnymea-networkmanager/networkmanagerutils.cpp b/libnymea-networkmanager/networkmanagerutils.cpp index 1b66447..b3afbae 100644 --- a/libnymea-networkmanager/networkmanagerutils.cpp +++ b/libnymea-networkmanager/networkmanagerutils.cpp @@ -1,3 +1,24 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * * + * Copyright (C) 2018 Simon Stürz * + * * + * This file is part of libnymea-networkmanager. * + * * + * libnymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * libnymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with libnymea-networkmanager. If not, see . * + * * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + #include "networkmanagerutils.h" Q_LOGGING_CATEGORY(dcNetworkManager, "NetworkManager") diff --git a/libnymea-networkmanager/networkmanagerutils.h b/libnymea-networkmanager/networkmanagerutils.h index 8044d72..cb9a269 100644 --- a/libnymea-networkmanager/networkmanagerutils.h +++ b/libnymea-networkmanager/networkmanagerutils.h @@ -1,3 +1,24 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * * + * Copyright (C) 2018 Simon Stürz * + * * + * This file is part of libnymea-networkmanager. * + * * + * libnymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * libnymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with libnymea-networkmanager. If not, see . * + * * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + #ifndef NETWORKMANAGERUTILS_H #define NETWORKMANAGERUTILS_H diff --git a/libnymea-networkmanager/networksettings.cpp b/libnymea-networkmanager/networksettings.cpp index b9307d0..33daa07 100644 --- a/libnymea-networkmanager/networksettings.cpp +++ b/libnymea-networkmanager/networksettings.cpp @@ -1,11 +1,21 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2016 Simon Stürz * + * Copyright (C) 2018 Simon Stürz * * * - * This file is part of loopd. * + * This file is part of libnymea-networkmanager. * * * - * Loopd can not be copied and/or distributed without the express * - * permission of guh GmbH. * + * libnymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * libnymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with libnymea-networkmanager. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libnymea-networkmanager/networksettings.h b/libnymea-networkmanager/networksettings.h index e7c08f8..2a1c0f0 100644 --- a/libnymea-networkmanager/networksettings.h +++ b/libnymea-networkmanager/networksettings.h @@ -1,11 +1,21 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2016 Simon Stürz * + * Copyright (C) 2018 Simon Stürz * * * - * This file is part of loopd. * + * This file is part of libnymea-networkmanager. * * * - * Loopd can not be copied and/or distributed without the express * - * permission of guh GmbH. * + * libnymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * libnymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with libnymea-networkmanager. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libnymea-networkmanager/wirednetworkdevice.cpp b/libnymea-networkmanager/wirednetworkdevice.cpp index 6f02dd9..c2bf35c 100644 --- a/libnymea-networkmanager/wirednetworkdevice.cpp +++ b/libnymea-networkmanager/wirednetworkdevice.cpp @@ -2,10 +2,20 @@ * * * Copyright (C) 2018 Simon Stürz * * * - * This file is part of loopd. * + * This file is part of libnymea-networkmanager. * * * - * Loopd can not be copied and/or distributed without the express * - * permission of guh GmbH. * + * libnymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * libnymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with libnymea-networkmanager. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libnymea-networkmanager/wirednetworkdevice.h b/libnymea-networkmanager/wirednetworkdevice.h index 0570333..4895b62 100644 --- a/libnymea-networkmanager/wirednetworkdevice.h +++ b/libnymea-networkmanager/wirednetworkdevice.h @@ -1,11 +1,21 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2016 Simon Stürz * + * Copyright (C) 2018 Simon Stürz * * * - * This file is part of loopd. * + * This file is part of libnymea-networkmanager. * * * - * Loopd can not be copied and/or distributed without the express * - * permission of guh GmbH. * + * libnymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * libnymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with libnymea-networkmanager. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libnymea-networkmanager/wirelessaccesspoint.cpp b/libnymea-networkmanager/wirelessaccesspoint.cpp index df61dc0..7d5f2b4 100644 --- a/libnymea-networkmanager/wirelessaccesspoint.cpp +++ b/libnymea-networkmanager/wirelessaccesspoint.cpp @@ -1,11 +1,21 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2016 Simon Stürz * + * Copyright (C) 2018 Simon Stürz * * * - * This file is part of loopd. * + * This file is part of libnymea-networkmanager. * * * - * Loopd can not be copied and/or distributed without the express * - * permission of guh GmbH. * + * libnymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * libnymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with libnymea-networkmanager. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libnymea-networkmanager/wirelessaccesspoint.h b/libnymea-networkmanager/wirelessaccesspoint.h index 075f427..83cc800 100644 --- a/libnymea-networkmanager/wirelessaccesspoint.h +++ b/libnymea-networkmanager/wirelessaccesspoint.h @@ -1,11 +1,21 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2016 Simon Stürz * + * Copyright (C) 2018 Simon Stürz * * * - * This file is part of loopd. * + * This file is part of libnymea-networkmanager. * * * - * Loopd can not be copied and/or distributed without the express * - * permission of guh GmbH. * + * libnymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * libnymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with libnymea-networkmanager. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libnymea-networkmanager/wirelessnetworkdevice.cpp b/libnymea-networkmanager/wirelessnetworkdevice.cpp index 4f4b070..eaa5bbf 100644 --- a/libnymea-networkmanager/wirelessnetworkdevice.cpp +++ b/libnymea-networkmanager/wirelessnetworkdevice.cpp @@ -1,11 +1,21 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2016 Simon Stürz * + * Copyright (C) 2018 Simon Stürz * * * - * This file is part of loopd. * + * This file is part of libnymea-networkmanager. * * * - * Loopd can not be copied and/or distributed without the express * - * permission of guh GmbH. * + * libnymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * libnymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with libnymea-networkmanager. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libnymea-networkmanager/wirelessnetworkdevice.h b/libnymea-networkmanager/wirelessnetworkdevice.h index 5732828..ed53380 100644 --- a/libnymea-networkmanager/wirelessnetworkdevice.h +++ b/libnymea-networkmanager/wirelessnetworkdevice.h @@ -1,11 +1,21 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2016 Simon Stürz * + * Copyright (C) 2018 Simon Stürz * * * - * This file is part of loopd. * + * This file is part of libnymea-networkmanager. * * * - * Loopd can not be copied and/or distributed without the express * - * permission of guh GmbH. * + * libnymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * libnymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with libnymea-networkmanager. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/nymea-networkmanager/bluetooth/bluetoothserver.cpp b/nymea-networkmanager/bluetooth/bluetoothserver.cpp index ed6607e..e7a583e 100644 --- a/nymea-networkmanager/bluetooth/bluetoothserver.cpp +++ b/nymea-networkmanager/bluetooth/bluetoothserver.cpp @@ -1,14 +1,25 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2016 Simon Stürz * + * Copyright (C) 2018 Simon Stürz * * * - * This file is part of loopd. * + * This file is part of nymea-networkmanager. * * * - * Loopd can not be copied and/or distributed without the express * - * permission of guh GmbH. * + * nymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * nymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with nymea-networkmanager. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + #include "bluetoothserver.h" #include "loggingcategories.h" #include "bluetoothuuids.h" @@ -200,10 +211,6 @@ void BluetoothServer::onDeviceDisconnected(const QBluetoothAddress &address) void BluetoothServer::onError(const QLowEnergyController::Error &error) { qCWarning(dcBluetoothServer()) << "Bluetooth error occured:" << error << m_controller->errorString(); - if (error == QLowEnergyController::AdvertisingError) { - qCWarning(dcBluetoothServer()) << "Advertising error: enable error mode"; - Loopd::instance()->hardwareManager()->ledController()->setState(LedController::LedStateBlinkingFast); - } } void BluetoothServer::onConnected() diff --git a/nymea-networkmanager/bluetooth/bluetoothserver.h b/nymea-networkmanager/bluetooth/bluetoothserver.h index f3f8044..3186cdc 100644 --- a/nymea-networkmanager/bluetooth/bluetoothserver.h +++ b/nymea-networkmanager/bluetooth/bluetoothserver.h @@ -1,11 +1,21 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2016 Simon Stürz * + * Copyright (C) 2018 Simon Stürz * * * - * This file is part of loopd. * + * This file is part of nymea-networkmanager. * * * - * Loopd can not be copied and/or distributed without the express * - * permission of guh GmbH. * + * nymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * nymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with nymea-networkmanager. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/nymea-networkmanager/bluetooth/bluetoothuuids.h b/nymea-networkmanager/bluetooth/bluetoothuuids.h index bdf420e..ada2589 100644 --- a/nymea-networkmanager/bluetooth/bluetoothuuids.h +++ b/nymea-networkmanager/bluetooth/bluetoothuuids.h @@ -1,11 +1,21 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2016 Simon Stürz * + * Copyright (C) 2018 Simon Stürz * * * - * This file is part of loopd. * + * This file is part of nymea-networkmanager. * * * - * Loopd can not be copied and/or distributed without the express * - * permission of guh GmbH. * + * nymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * nymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with nymea-networkmanager. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/nymea-networkmanager/bluetooth/loggingcategories.cpp b/nymea-networkmanager/bluetooth/loggingcategories.cpp index 8edda73..bc9094d 100644 --- a/nymea-networkmanager/bluetooth/loggingcategories.cpp +++ b/nymea-networkmanager/bluetooth/loggingcategories.cpp @@ -1,3 +1,24 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * * + * Copyright (C) 2018 Simon Stürz * + * * + * This file is part of nymea-networkmanager. * + * * + * nymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * nymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with nymea-networkmanager. If not, see . * + * * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + #include "loggingcategories.h" Q_LOGGING_CATEGORY(dcBluetoothServer, "BluetoothServer") diff --git a/nymea-networkmanager/bluetooth/loggingcategories.h b/nymea-networkmanager/bluetooth/loggingcategories.h index 68462f4..f11f209 100644 --- a/nymea-networkmanager/bluetooth/loggingcategories.h +++ b/nymea-networkmanager/bluetooth/loggingcategories.h @@ -1,3 +1,24 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * * + * Copyright (C) 2018 Simon Stürz * + * * + * This file is part of nymea-networkmanager. * + * * + * nymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * nymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with nymea-networkmanager. If not, see . * + * * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + #ifndef LOGGINGCATEGORIES_H #define LOGGINGCATEGORIES_H diff --git a/nymea-networkmanager/bluetooth/networkservice.cpp b/nymea-networkmanager/bluetooth/networkservice.cpp index 9e4d935..fa49d95 100644 --- a/nymea-networkmanager/bluetooth/networkservice.cpp +++ b/nymea-networkmanager/bluetooth/networkservice.cpp @@ -1,14 +1,25 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2016 Simon Stürz * + * Copyright (C) 2018 Simon Stürz * * * - * This file is part of loopd. * + * This file is part of nymea-networkmanager. * * * - * Loopd can not be copied and/or distributed without the express * - * permission of guh GmbH. * + * nymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * nymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with nymea-networkmanager. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + #include "networkservice.h" #include "bluetoothuuids.h" #include "loggingcategories.h" diff --git a/nymea-networkmanager/bluetooth/networkservice.h b/nymea-networkmanager/bluetooth/networkservice.h index 8ffa062..5a89c04 100644 --- a/nymea-networkmanager/bluetooth/networkservice.h +++ b/nymea-networkmanager/bluetooth/networkservice.h @@ -1,11 +1,21 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2016 Simon Stürz * + * Copyright (C) 2018 Simon Stürz * * * - * This file is part of loopd. * + * This file is part of nymea-networkmanager. * * * - * Loopd can not be copied and/or distributed without the express * - * permission of guh GmbH. * + * nymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * nymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with nymea-networkmanager. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/nymea-networkmanager/bluetooth/wirelessservice.cpp b/nymea-networkmanager/bluetooth/wirelessservice.cpp index e0ab50e..5f6d325 100644 --- a/nymea-networkmanager/bluetooth/wirelessservice.cpp +++ b/nymea-networkmanager/bluetooth/wirelessservice.cpp @@ -1,11 +1,21 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2016 Simon Stürz * + * Copyright (C) 2018 Simon Stürz * * * - * This file is part of loopd. * + * This file is part of nymea-networkmanager. * * * - * Loopd can not be copied and/or distributed without the express * - * permission of guh GmbH. * + * nymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * nymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with nymea-networkmanager. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/nymea-networkmanager/core.cpp b/nymea-networkmanager/core.cpp index 658c6eb..3dadaaa 100644 --- a/nymea-networkmanager/core.cpp +++ b/nymea-networkmanager/core.cpp @@ -1,3 +1,24 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * * + * Copyright (C) 2018 Simon Stürz * + * * + * This file is part of nymea-networkmanager. * + * * + * nymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * nymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with nymea-networkmanager. If not, see . * + * * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + #include "core.h" Core* Core::s_instance = 0; diff --git a/nymea-networkmanager/core.h b/nymea-networkmanager/core.h index d54bf15..f55763e 100644 --- a/nymea-networkmanager/core.h +++ b/nymea-networkmanager/core.h @@ -1,3 +1,24 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * * + * Copyright (C) 2018 Simon Stürz * + * * + * This file is part of nymea-networkmanager. * + * * + * nymea-networkmanager is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, * + * or (at your option) any later version. * + * * + * nymea-networkmanager 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with nymea-networkmanager. If not, see . * + * * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + #ifndef CORE_H #define CORE_H