[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:57:51 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=74832dd
The following commit has been merged in the master branch:
commit 74832dde0085caa8a997e246be9d7b0928582f35
Author: George Goldberg <grundleborg at googlemail.com>
Date: Mon Aug 3 13:18:32 2009 +0000
Add optional-parameter-edit-widget and mandatory-parameter-edit-widget classes to handle the parameter value validation in the generic parameter editing UI.
svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1006311
---
src/CMakeLists.txt | 2 ++
.../mandatory-parameter-edit-widget.cpp} | 28 +++++++++-------------
...-widget.h => mandatory-parameter-edit-widget.h} | 21 +++++++---------
.../optional-parameter-edit-widget.cpp} | 28 +++++++++-------------
...ger-edit.h => optional-parameter-edit-widget.h} | 28 ++++++++++------------
src/defaultaccountui/parameter-edit-widget.h | 2 +-
6 files changed, 45 insertions(+), 64 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 84caab7..9a00cca 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,6 +23,8 @@ set (telepathy_accounts_kcm_SRCS
defaultaccountui/parameter-item.cpp
defaultaccountui/integer-edit.cpp
defaultaccountui/unsigned-integer-edit.cpp
+ defaultaccountui/mandatory-parameter-edit-widget.cpp
+ defaultaccountui/optional-parameter-edit-widget.cpp
dictionary.cpp
plugin-manager.cpp
)
diff --git a/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.cpp b/src/defaultaccountui/mandatory-parameter-edit-widget.cpp
similarity index 59%
copy from src/libkcmtelepathyaccounts/abstract-account-parameters-widget.cpp
copy to src/defaultaccountui/mandatory-parameter-edit-widget.cpp
index d85b50e..a39d840 100644
--- a/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.cpp
+++ b/src/defaultaccountui/mandatory-parameter-edit-widget.cpp
@@ -18,48 +18,42 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "abstract-account-parameters-widget.h"
+#include "mandatory-parameter-edit-widget.h"
#include <KDebug>
-class AbstractAccountParametersWidget::Private
+class MandatoryParameterEditWidget::Private
{
public:
Private()
{
kDebug();
}
-
- Tp::ProtocolParameterList parameters;
};
-AbstractAccountParametersWidget::AbstractAccountParametersWidget(Tp::ProtocolParameterList parameters,
- QWidget *parent)
- : QWidget(parent),
- d(new Private)
+MandatoryParameterEditWidget::MandatoryParameterEditWidget(Tp::ProtocolParameterList parameters,
+ QWidget *parent)
+ : ParameterEditWidget(parameters, parent),
+ d(new Private)
{
kDebug();
-
- d->parameters = parameters;
}
-AbstractAccountParametersWidget::~AbstractAccountParametersWidget()
+MandatoryParameterEditWidget::~MandatoryParameterEditWidget()
{
kDebug();
delete d;
}
-Tp::ProtocolParameterList AbstractAccountParametersWidget::parameters() const
+bool MandatoryParameterEditWidget::validateParameterValues()
{
- return d->parameters;
-}
+ kDebug();
-bool AbstractAccountParametersWidget::validateParameterValues()
-{
+ // TODO: Implement me!
return true;
}
-#include "abstract-account-parameters-widget.moc"
+#include "mandatory-parameter-edit-widget.moc"
diff --git a/src/defaultaccountui/parameter-edit-widget.h b/src/defaultaccountui/mandatory-parameter-edit-widget.h
similarity index 63%
copy from src/defaultaccountui/parameter-edit-widget.h
copy to src/defaultaccountui/mandatory-parameter-edit-widget.h
index 8c24823..a2c08c7 100644
--- a/src/defaultaccountui/parameter-edit-widget.h
+++ b/src/defaultaccountui/mandatory-parameter-edit-widget.h
@@ -18,28 +18,23 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef TELEPATHY_ACCOUNTS_KCM_PARAMETER_EDIT_WIDGET_H
-#define TELEPATHY_ACCOUNTS_KCM_PARAMETER_EDIT_WIDGET_H
+#ifndef TELEPATHY_ACCOUNTS_KCM_MANDATORY_PARAMETER_EDIT_WIDGET_H
+#define TELEPATHY_ACCOUNTS_KCM_MANDATORY_PARAMETER_EDIT_WIDGET_H
-#include "libkcmtelepathyaccounts/abstract-account-parameters-widget.h"
+#include "parameter-edit-widget.h"
-#include <TelepathyQt4/ConnectionManager>
-
-class ParameterEditWidget : public AbstractAccountParametersWidget
+class MandatoryParameterEditWidget : public ParameterEditWidget
{
Q_OBJECT
public:
- explicit ParameterEditWidget(Tp::ProtocolParameterList parameters,
+ explicit MandatoryParameterEditWidget(Tp::ProtocolParameterList parameters,
QWidget *parent = 0);
- ~ParameterEditWidget();
-
- virtual QMap<Tp::ProtocolParameter*, QVariant> parameterValues() const;
+ ~MandatoryParameterEditWidget();
-private Q_SLOTS:
- void onDelegateDataChanged(const QModelIndex &index, const QVariant &value, int role);
+ virtual bool validateParameterValues();
-protected:
+private:
class Private;
Private * const d;
};
diff --git a/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.cpp b/src/defaultaccountui/optional-parameter-edit-widget.cpp
similarity index 59%
copy from src/libkcmtelepathyaccounts/abstract-account-parameters-widget.cpp
copy to src/defaultaccountui/optional-parameter-edit-widget.cpp
index d85b50e..6582266 100644
--- a/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.cpp
+++ b/src/defaultaccountui/optional-parameter-edit-widget.cpp
@@ -18,48 +18,42 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "abstract-account-parameters-widget.h"
+#include "optional-parameter-edit-widget.h"
#include <KDebug>
-class AbstractAccountParametersWidget::Private
+class OptionalParameterEditWidget::Private
{
public:
Private()
{
kDebug();
}
-
- Tp::ProtocolParameterList parameters;
};
-AbstractAccountParametersWidget::AbstractAccountParametersWidget(Tp::ProtocolParameterList parameters,
- QWidget *parent)
- : QWidget(parent),
- d(new Private)
+OptionalParameterEditWidget::OptionalParameterEditWidget(Tp::ProtocolParameterList parameters,
+ QWidget *parent)
+ : ParameterEditWidget(parameters, parent),
+ d(new Private)
{
kDebug();
-
- d->parameters = parameters;
}
-AbstractAccountParametersWidget::~AbstractAccountParametersWidget()
+OptionalParameterEditWidget::~OptionalParameterEditWidget()
{
kDebug();
delete d;
}
-Tp::ProtocolParameterList AbstractAccountParametersWidget::parameters() const
+bool OptionalParameterEditWidget::validateParameterValues()
{
- return d->parameters;
-}
+ kDebug();
-bool AbstractAccountParametersWidget::validateParameterValues()
-{
+ // TODO: Implement me!
return true;
}
-#include "abstract-account-parameters-widget.moc"
+#include "optional-parameter-edit-widget.moc"
diff --git a/src/defaultaccountui/integer-edit.h b/src/defaultaccountui/optional-parameter-edit-widget.h
similarity index 63%
copy from src/defaultaccountui/integer-edit.h
copy to src/defaultaccountui/optional-parameter-edit-widget.h
index 85f5cac..0716bee 100644
--- a/src/defaultaccountui/integer-edit.h
+++ b/src/defaultaccountui/optional-parameter-edit-widget.h
@@ -18,31 +18,27 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef TELEPATHY_ACCOUNTS_KCM_INTEGER_EDIT_H
-#define TELEPATHY_ACCOUNTS_KCM_INTEGER_EDIT_H
+#ifndef TELEPATHY_ACCOUNTS_KCM_OPTIONAL_PARAMETER_EDIT_WIDGET_H
+#define TELEPATHY_ACCOUNTS_KCM_OPTIONAL_PARAMETER_EDIT_WIDGET_H
-#include <QtGui/QLineEdit>
+#include "parameter-edit-widget.h"
-class IntegerEdit : public QLineEdit
+class OptionalParameterEditWidget : public ParameterEditWidget
{
Q_OBJECT
public:
- explicit IntegerEdit(QWidget *parent = 0);
- virtual ~IntegerEdit();
+ explicit OptionalParameterEditWidget(Tp::ProtocolParameterList parameters,
+ QWidget *parent = 0);
+ ~OptionalParameterEditWidget();
- void setValue(int integer);
+ virtual bool validateParameterValues();
-protected:
- void keyPressEvent(QKeyEvent *event);
-
-Q_SIGNALS:
- void integerChanged(int integer);
-
-private Q_SLOTS:
- void onTextChanged(const QString &text);
+private:
+ class Private;
+ Private * const d;
};
-#endif // header guard
+#endif // Header guard
diff --git a/src/defaultaccountui/parameter-edit-widget.h b/src/defaultaccountui/parameter-edit-widget.h
index 8c24823..77fa911 100644
--- a/src/defaultaccountui/parameter-edit-widget.h
+++ b/src/defaultaccountui/parameter-edit-widget.h
@@ -39,7 +39,7 @@ public:
private Q_SLOTS:
void onDelegateDataChanged(const QModelIndex &index, const QVariant &value, int role);
-protected:
+private:
class Private;
Private * const d;
};
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list