[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5
Maximiliano Curia
maxy at moszumanska.debian.org
Fri May 27 23:59:03 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=9fc9565
The following commit has been merged in the master branch:
commit 9fc95650d401392af03db5db9ab4cfdb2bf57c28
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Mon Feb 7 12:09:46 2011 +0000
Remove unused class and an existing reference to it.
---
.../abstract-account-parameters-widget.cpp | 1 -
.../abstract-account-parameters-widget.h | 1 -
src/KCMTelepathyAccounts/account-edit-widget.h | 2 -
.../generic-advanced-options-widget.cpp | 4 -
src/KCMTelepathyAccounts/parameter-edit-model.h | 5 +-
.../protocol-parameter-value.cpp | 104 ---------------------
.../protocol-parameter-value.h | 47 ----------
7 files changed, 3 insertions(+), 161 deletions(-)
diff --git a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
index 9f5b0d4..d28b4f3 100644
--- a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
+++ b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
@@ -21,7 +21,6 @@
*/
#include "abstract-account-parameters-widget.h"
-#include "protocol-parameter-value.h"
#include "parameter-edit-model.h"
#include <KDebug>
diff --git a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h
index ed80752..1e2d5b6 100644
--- a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h
+++ b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h
@@ -32,7 +32,6 @@
#include <TelepathyQt4/ConnectionManager>
class ParameterEditModel;
-class ProtocolParameterValue;
class ParameterEditModel;
typedef QMap<Tp::ProtocolParameter, QWidget*> ParametersWidgetsMap;
diff --git a/src/KCMTelepathyAccounts/account-edit-widget.h b/src/KCMTelepathyAccounts/account-edit-widget.h
index 11d8077..e365195 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.h
+++ b/src/KCMTelepathyAccounts/account-edit-widget.h
@@ -22,8 +22,6 @@
#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>
diff --git a/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp b/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
index b618fba..fae56d1 100644
--- a/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
+++ b/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
@@ -23,12 +23,8 @@
#include <KLocale>
#include <QHBoxLayout>
-
-#include "protocol-parameter-value.h"
-
#include "generic-advanced-options-widget.h"
-
class GenericAdvancedOptionsWidget::Private
{
public:
diff --git a/src/KCMTelepathyAccounts/parameter-edit-model.h b/src/KCMTelepathyAccounts/parameter-edit-model.h
index d904fac..145fc22 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-model.h
+++ b/src/KCMTelepathyAccounts/parameter-edit-model.h
@@ -23,15 +23,16 @@
#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_PARAMETER_EDIT_MODEL_H
#define LIB_KCM_TELEPATHY_ACCOUNTS_PARAMETER_EDIT_MODEL_H
-#include "protocol-parameter-value.h"
+#include "kdemacros.h"
#include <QtCore/QAbstractListModel>
+
#include <TelepathyQt4/Profile>
+#include <TelepathyQt4/ProtocolParameter>
class ParameterItem;
namespace Tp {
- class ProtocolParameter;
class Profile;
class Parameter;
}
diff --git a/src/KCMTelepathyAccounts/protocol-parameter-value.cpp b/src/KCMTelepathyAccounts/protocol-parameter-value.cpp
deleted file mode 100644
index c507a71..0000000
--- a/src/KCMTelepathyAccounts/protocol-parameter-value.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * 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
-{
-public:
- Tp::ProtocolParameter parameter;
- QVariant value;
-};
-
-
-ProtocolParameterValue::ProtocolParameterValue(const Tp::ProtocolParameter ¶meter, const QVariant value)
- :d (new Private)
-{
- d->parameter = parameter;
- d->value = value;
- //make sure we're storing the correct type of QVariant type for this parameter
- d->value.convert(d->parameter.type());
-}
-
-ProtocolParameterValue::ProtocolParameterValue(const ProtocolParameterValue &other)
- :d (new Private(*other.d))
-{
-
-}
-
-ProtocolParameterValue::~ProtocolParameterValue()
-{
- delete d;
-}
-
-ProtocolParameterValue &ProtocolParameterValue::operator=(const ProtocolParameterValue &other)
-{
- *d = *other.d;
- return *this;
-}
-
-
-const Tp::ProtocolParameter ProtocolParameterValue::parameter() const
-{
- return d->parameter;
-}
-
-const QVariant ProtocolParameterValue::value() const
-{
- return d->value;
-}
-
-const QString ProtocolParameterValue::name() const
-{
- QString name;
- if(d->parameter.isValid()) {
- name = d->parameter.name();
- }
- return name;
-}
-
-bool ProtocolParameterValue::shouldSave() const
-{
- if (! d->parameter.isValid()) {
- return false;
- }
-
- if (! d->value.isValid()) {
- return false;
- }
-
- if (d->value.isNull()) {
- return false;
- }
-
- // Don't any parameters where the default value is equal to the current value.
- if (d->parameter.defaultValue() == d->value) {
- return false;
- }
-
- // Don't save any strings where the default is empty, and the value is an empty string
- if (d->parameter.type() == QVariant::String) {
- if ((d->parameter.defaultValue().isNull()) && d->value.toString().isEmpty()) {
- return false;
- }
- }
-
- return true;
-}
diff --git a/src/KCMTelepathyAccounts/protocol-parameter-value.h b/src/KCMTelepathyAccounts/protocol-parameter-value.h
deleted file mode 100644
index f0d1926..0000000
--- a/src/KCMTelepathyAccounts/protocol-parameter-value.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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 <kdemacros.h>
-
-#include <TelepathyQt4/ProtocolParameter>
-
-class KDE_EXPORT ProtocolParameterValue
-{
-public:
- ProtocolParameterValue(const Tp::ProtocolParameter ¶meter, const QVariant value);
- ProtocolParameterValue(const ProtocolParameterValue &other);
- ~ProtocolParameterValue();
- ProtocolParameterValue &operator=(const ProtocolParameterValue &other);
-
- const Tp::ProtocolParameter parameter() const;
- const QString name() const;
- const QVariant value() const;
- /** returns true if the value is different from the parameter default and is non-null*/
- bool shouldSave() const ;
-
-private:
- class Private;
- Private *d;
-};
-
-#endif // PROTOCOLPARAMETERVALUE_H
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list