← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to kde/src/conf/dlgdisplay.cpp

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2014-01-28 18:23:36 UTC
  • mfrom: (1.1.11)
  • mto: This revision was merged to the branch mainline in revision 24.
  • Revision ID: package-import@ubuntu.com-20140128182336-3xenud1kbnwmf3mz
http://bugs.debian.org/735846
http://bugs.debian.org/727164
http://bugs.debian.org/718178
http://bugs.debian.org/736583
http://bugs.debian.org/722040
http://bugs.debian.org/736746
* New upstream release 
  - Fixes "New Upstream Release" (Closes: #735846)
  - Fixes "Ringtone does not stop" (Closes: #727164)
  - Fixes "[sflphone-kde] crash on startup" (Closes: #718178)
  - Fixes "sflphone GUI crashes when call is hung up" (Closes: #736583)
* Build-Depends: ensure GnuTLS 2.6
  - libucommon-dev (>= 6.0.7-1.1), libccrtp-dev (>= 2.0.6-3)
  - Fixes "FTBFS Build-Depends libgnutls{26,28}-dev" (Closes: #722040)
* Fix "boost 1.49 is going away" unversioned Build-Depends: (Closes: #736746)
* Add Build-Depends: libsndfile-dev, nepomuk-core-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
kde/src/conf/dlgdisplay.cpp
1
1
/****************************************************************************
2
 
 *   Copyright (C) 2009-2013 by Savoir-Faire Linux                          *
 
2
 *   Copyright (C) 2009-2014 by Savoir-Faire Linux                          *
3
3
 *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
4
4
 *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
5
5
 *                                                                          *
18
18
 ***************************************************************************/
19
19
 
20
20
#include "dlgdisplay.h"
21
 
#include "klib/configurationskeleton.h"
 
21
#include "klib/kcfg_settings.h"
22
22
 
23
23
//KDE
24
24
#include <KConfigDialog>
 
25
#include <KLocale>
25
26
 
26
27
///Constructor
27
28
DlgDisplay::DlgDisplay(KConfigDialog *parent)
28
 
 : QWidget(parent)
 
29
 : QWidget(parent),m_HasChanged(false)
29
30
{
30
31
   setupUi(this);
31
32
   kcfg_minimumRowHeight->setEnabled(ConfigurationSkeleton::limitMinimumRowHeight());
44
45
   QMutableMapIterator<QString, QString> iter(m_lCallDetails);
45
46
   while (iter.hasNext()) {
46
47
      iter.next();
47
 
      bool checked = ConfigurationSkeleton::self()->findItem(iter.value())->isEqual(true);
 
48
      const bool checked = ConfigurationSkeleton::self()->findItem(iter.value())->isEqual(true);
48
49
      QListWidgetItem* i = new QListWidgetItem(i18n(iter.key().toAscii()));
49
50
      i->setFlags      (Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
50
51
      i->setCheckState ((checked)?Qt::Checked:Qt::Unchecked        );