[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=9e306e2

The following commit has been merged in the master branch:
commit 9e306e2c698f12edc0b815e267dd1316a85661be
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Jan 5 23:32:06 2011 +0000

    Incorporated review comments from George Goldberg
    Added missing license header.
---
 src/KCMTelepathyAccounts/account-edit-widget.cpp   |  2 +-
 src/KCMTelepathyAccounts/account-edit-widget.h     |  3 ++-
 src/KCMTelepathyAccounts/parameter-edit-model.h    |  3 ++-
 src/KCMTelepathyAccounts/parameter-item.cpp        |  2 +-
 src/KCMTelepathyAccounts/parameter-item.h          |  2 +-
 .../protocol-parameter-value.cpp                   | 20 +++++++++++++++++++
 .../protocol-parameter-value.h                     | 23 +++++++++++++++++++++-
 7 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/src/KCMTelepathyAccounts/account-edit-widget.cpp b/src/KCMTelepathyAccounts/account-edit-widget.cpp
index 3f79fec..6a9aff2 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.cpp
+++ b/src/KCMTelepathyAccounts/account-edit-widget.cpp
@@ -130,7 +130,7 @@ void AccountEditWidget::loadWidgets()
         bool paramFound = false;
         while(paramIter != params.constEnd()) {
             paramFound = false;
-            foreach (Tp::ProtocolParameter parameter, d->parameters) {
+            foreach (const Tp::ProtocolParameter &parameter, d->parameters) {
                 if ((parameter.name() == paramIter.key()) &&
                     (parameter.type() == paramIter.value())) {
                     mandatoryParameters.removeAll(parameter);
diff --git a/src/KCMTelepathyAccounts/account-edit-widget.h b/src/KCMTelepathyAccounts/account-edit-widget.h
index fbe6fac..8724820 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.h
+++ b/src/KCMTelepathyAccounts/account-edit-widget.h
@@ -21,13 +21,14 @@
 #ifndef KCM_TELEPATHY_ACCOUNTS_ACCOUNT_EDIT_WIDGET_H
 #define KCM_TELEPATHY_ACCOUNTS_ACCOUNT_EDIT_WIDGET_H
 
+#include "protocol-parameter-value.h"
+
 #include <kdemacros.h>
 
 #include <QWidget>
 
 #include <TelepathyQt4/ConnectionManager>
 
-#include "protocol-parameter-value.h"
 
 class KDE_EXPORT AccountEditWidget : public QWidget
 {
diff --git a/src/KCMTelepathyAccounts/parameter-edit-model.h b/src/KCMTelepathyAccounts/parameter-edit-model.h
index 7b497b7..4eac5a7 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-model.h
+++ b/src/KCMTelepathyAccounts/parameter-edit-model.h
@@ -21,9 +21,10 @@
 #ifndef LIB_KCM_TELEPATHY_ACCOUNTS_PARAMETER_EDIT_MODEL_H
 #define LIB_KCM_TELEPATHY_ACCOUNTS_PARAMETER_EDIT_MODEL_H
 
-#include <QtCore/QAbstractListModel>
 #include "protocol-parameter-value.h"
 
+#include <QtCore/QAbstractListModel>
+
 class ParameterItem;
 
 namespace Tp {
diff --git a/src/KCMTelepathyAccounts/parameter-item.cpp b/src/KCMTelepathyAccounts/parameter-item.cpp
index 1ed8ee9..8f907f7 100644
--- a/src/KCMTelepathyAccounts/parameter-item.cpp
+++ b/src/KCMTelepathyAccounts/parameter-item.cpp
@@ -24,7 +24,7 @@
 
 #include <KDebug>
 
-ParameterItem::ParameterItem(Tp::ProtocolParameter parameter,
+ParameterItem::ParameterItem(const Tp::ProtocolParameter &parameter,
                              const QVariant &originalValue,
                              QObject *parent)
  : QObject(parent),
diff --git a/src/KCMTelepathyAccounts/parameter-item.h b/src/KCMTelepathyAccounts/parameter-item.h
index f1bc910..047aa57 100644
--- a/src/KCMTelepathyAccounts/parameter-item.h
+++ b/src/KCMTelepathyAccounts/parameter-item.h
@@ -33,7 +33,7 @@ class ParameterItem : public QObject
     Q_DISABLE_COPY(ParameterItem);
 
 public:
-    ParameterItem(Tp::ProtocolParameter parameter,
+    ParameterItem(const Tp::ProtocolParameter &parameter,
                   const QVariant &originalValue,
                   QObject *parent = 0);
     virtual ~ParameterItem();
diff --git a/src/KCMTelepathyAccounts/protocol-parameter-value.cpp b/src/KCMTelepathyAccounts/protocol-parameter-value.cpp
index bfe9f0b..c507a71 100644
--- a/src/KCMTelepathyAccounts/protocol-parameter-value.cpp
+++ b/src/KCMTelepathyAccounts/protocol-parameter-value.cpp
@@ -1,3 +1,23 @@
+/*
+ * This file is part of telepathy-accounts-kcm
+ *
+ * Copyright (C) 2011 David Edmundson. <kde at davidedmundson.co.uk>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
 #include "protocol-parameter-value.h"
 
 class ProtocolParameterValue::Private
diff --git a/src/KCMTelepathyAccounts/protocol-parameter-value.h b/src/KCMTelepathyAccounts/protocol-parameter-value.h
index ee82c1b..f0d1926 100644
--- a/src/KCMTelepathyAccounts/protocol-parameter-value.h
+++ b/src/KCMTelepathyAccounts/protocol-parameter-value.h
@@ -1,9 +1,30 @@
+/*
+ * This file is part of telepathy-accounts-kcm
+ *
+ * Copyright (C) 2011 David Edmundson. <kde at davidedmundson.co.uk>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
 #ifndef PROTOCOLPARAMETERVALUE_H
 #define PROTOCOLPARAMETERVALUE_H
 
-#include "TelepathyQt4/ProtocolParameter"
 #include <kdemacros.h>
 
+#include <TelepathyQt4/ProtocolParameter>
+
 class KDE_EXPORT ProtocolParameterValue
 {
 public:

-- 
ktp-accounts-kcm packaging