[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=4904093

The following commit has been merged in the master branch:
commit 49040939a914d30722518c62c5f73757b5aa11a2
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Feb 9 18:02:04 2012 +0100

    Remove filterBar line edit properties and expose it instead
---
 KTp/Widgets/contact-grid-widget.cpp | 38 ++++---------------------------------
 KTp/Widgets/contact-grid-widget.h   | 14 ++------------
 2 files changed, 6 insertions(+), 46 deletions(-)

diff --git a/KTp/Widgets/contact-grid-widget.cpp b/KTp/Widgets/contact-grid-widget.cpp
index 8aa2ab9..eb25d7e 100644
--- a/KTp/Widgets/contact-grid-widget.cpp
+++ b/KTp/Widgets/contact-grid-widget.cpp
@@ -207,40 +207,6 @@ KTp::ContactGridWidget::~ContactGridWidget()
     delete d;
 }
 
-bool KTp::ContactGridWidget::isDisplayNameFilterBarShown() const
-{
-    return !d->contactFilterLineEdit->isHidden();
-}
-
-bool KTp::ContactGridWidget::isDisplayNameFilterBarHidden() const
-{
-    return !isDisplayNameFilterBarShown();
-}
-
-void KTp::ContactGridWidget::setDisplayNameFilterBarShown(bool displayNameFilterBarShown)
-{
-    if (displayNameFilterBarShown != isDisplayNameFilterBarShown()) {
-        clearDisplayNameFilter();
-        d->contactFilterLineEdit->setShown(displayNameFilterBarShown);
-        Q_EMIT displayNameFilterBarShownChanged(displayNameFilterBarShown);
-    }
-}
-
-void KTp::ContactGridWidget::setDisplayNameFilterBarHidden(bool displayNameFilterBarHidden)
-{
-    setDisplayNameFilterBarShown(!displayNameFilterBarHidden);
-}
-
-void KTp::ContactGridWidget::showDisplayNameFilterBar()
-{
-    setDisplayNameFilterBarShown(true);
-}
-
-void KTp::ContactGridWidget::hideDisplayNameFilterBar()
-{
-    setDisplayNameFilterBarShown(false);
-}
-
 QString KTp::ContactGridWidget::displayNameFilter() const
 {
     return d->contactFilterLineEdit->text();
@@ -293,6 +259,10 @@ AccountsFilterModel* KTp::ContactGridWidget::filter() const
     return d->filterModel;
 }
 
+KLineEdit* KTp::ContactGridWidget::contactFilterLineEdit() const
+{
+    return d->contactFilterLineEdit;
+}
 
 #include "contact-grid-widget.moc"
 #include "moc_contact-grid-widget.cpp"
diff --git a/KTp/Widgets/contact-grid-widget.h b/KTp/Widgets/contact-grid-widget.h
index 62291cd..58b6121 100644
--- a/KTp/Widgets/contact-grid-widget.h
+++ b/KTp/Widgets/contact-grid-widget.h
@@ -26,6 +26,7 @@
 #include <TelepathyQt/Types>
 #include <KTp/ktp-export.h>
 
+class KLineEdit;
 class AccountsModel;
 class AccountsFilterModel;
 namespace KTp
@@ -36,10 +37,6 @@ class KTP_EXPORT ContactGridWidget : public QWidget
     Q_OBJECT
     Q_DISABLE_COPY(ContactGridWidget)
 
-    Q_PROPERTY(bool displayNameFilterBarShown
-               READ isDisplayNameFilterBarShown
-               WRITE setDisplayNameFilterBarShown
-               NOTIFY displayNameFilterBarShownChanged)
     Q_PROPERTY(QString displayNameFilter
                READ displayNameFilter
                RESET clearDisplayNameFilter
@@ -53,14 +50,6 @@ public:
     explicit ContactGridWidget(AccountsModel *model, QWidget *parent = 0);
     virtual ~ContactGridWidget();
 
-    virtual bool isDisplayNameFilterBarShown() const;
-    virtual bool isDisplayNameFilterBarHidden() const;
-    Q_SLOT virtual void setDisplayNameFilterBarShown(bool displayNameFilterBarShown);
-    Q_SLOT virtual void setDisplayNameFilterBarHidden(bool displayNameFilterBarHidden);
-    Q_SLOT virtual void showDisplayNameFilterBar();
-    Q_SLOT virtual void hideDisplayNameFilterBar();
-    Q_SIGNAL void displayNameFilterBarShownChanged(bool displayNameFilterBarShown);
-
     virtual QString displayNameFilter() const;
     Q_SLOT virtual void clearDisplayNameFilter();
     Q_SLOT virtual void setDisplayNameFilter(const QString &displayNameFilter);
@@ -71,6 +60,7 @@ public:
     Q_SIGNAL void iconSizeChanged(const QSize &iconSize);
 
     virtual AccountsFilterModel* filter() const;
+    virtual KLineEdit* contactFilterLineEdit() const;
 
     virtual bool hasSelection() const;
     virtual Tp::AccountPtr selectedAccount() const;

-- 
ktp-common-internals packaging