[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=a580571

The following commit has been merged in the master branch:
commit a58057118c263eab2f7bb6ae79f791edd033bfd6
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Tue Aug 20 14:05:22 2013 +0200

    Wrong copyright headers and other silly stuff
---
 daemon/plugins/notifications/notification.cpp      |  8 +++----
 daemon/plugins/notifications/notification.h        |  6 ++---
 .../notifications/notificationsdbusinterface.cpp   |  4 +---
 test/backendtests.cpp                              | 27 ++++++++++++----------
 test/backendtests.h                                | 27 ++++++++++++----------
 5 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/daemon/plugins/notifications/notification.cpp b/daemon/plugins/notifications/notification.cpp
index 501fa04..7cd39bc 100644
--- a/daemon/plugins/notifications/notification.cpp
+++ b/daemon/plugins/notifications/notification.cpp
@@ -1,6 +1,5 @@
-/*
- * <one line to give the library's name and an idea of what it does.>
- * Copyright 2013  <copyright holder> <email>
+/**
+ * Copyright 2013 Albert Vaca <albertvaka at gmail.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -17,7 +16,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #include "notification.h"
@@ -36,7 +34,7 @@ Notification::Notification(const NetworkPackage& np, QObject* parent)
 
 Notification::~Notification()
 {
-    qDebug() << "Destroying notification" << mId;
+
 }
 
 void Notification::dismiss()
diff --git a/daemon/plugins/notifications/notification.h b/daemon/plugins/notifications/notification.h
index 50898e7..1aaa2d8 100644
--- a/daemon/plugins/notifications/notification.h
+++ b/daemon/plugins/notifications/notification.h
@@ -1,6 +1,5 @@
-/*
- * <one line to give the library's name and an idea of what it does.>
- * Copyright 2013  <copyright holder> <email>
+/**
+ * Copyright 2013 Albert Vaca <albertvaka at gmail.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -17,7 +16,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #ifndef NOTIFICATION_H
diff --git a/daemon/plugins/notifications/notificationsdbusinterface.cpp b/daemon/plugins/notifications/notificationsdbusinterface.cpp
index e3a578d..1a6c49e 100644
--- a/daemon/plugins/notifications/notificationsdbusinterface.cpp
+++ b/daemon/plugins/notifications/notificationsdbusinterface.cpp
@@ -90,12 +90,11 @@ void NotificationsDbusInterface::removeNotification(const QString& internalId)
     Notification* noti = mNotifications[publicId];
     mNotifications.remove(publicId);
 
-    //Deleting the notification will unregister it automatically?
+    //Deleting the notification will unregister it automatically
     //QDBusConnection::sessionBus().unregisterObject(mDevice->dbusPath()+"/notifications/"+publicId);
     noti->deleteLater();
 
     Q_EMIT notificationRemoved(publicId);
-
 }
 
 void NotificationsDbusInterface::dismissRequested(Notification* notification)
@@ -115,4 +114,3 @@ QString NotificationsDbusInterface::newId()
     return QString::number(++mLastId);
 }
 
-
diff --git a/test/backendtests.cpp b/test/backendtests.cpp
index 53f53a9..098fbdc 100644
--- a/test/backendtests.cpp
+++ b/test/backendtests.cpp
@@ -1,18 +1,21 @@
-/*
- * Copyright 2013 <copyright holder> <email>
+/**
+ * Copyright 2013 Albert Vaca <albertvaka at gmail.com>
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program 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 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "backendtests.h"
diff --git a/test/backendtests.h b/test/backendtests.h
index d0b59e1..2ed22e8 100644
--- a/test/backendtests.h
+++ b/test/backendtests.h
@@ -1,18 +1,21 @@
-/*
- * Copyright 2013 <copyright holder> <email>
+/**
+ * Copyright 2013 Albert Vaca <albertvaka at gmail.com>
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program 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 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef BACKENDTESTS_H

-- 
kdeconnect packaging