← Back to branch summary

~noskcaj/ubuntu/saucy/sflphone/merge-1.2.3-2

« back to all changes in this revision

Viewing changes to kde/src/conf/dlgaddressbook.h

  • Committer: Jackson Doak
  • Date: 2013-07-10 21:04:46 UTC
  • mfrom: (20.1.3 sid)
  • Revision ID: noskcaj@ubuntu.com-20130710210446-y8f587vza807icr9
https://launchpad.net/bugs/1196978
Properly merged from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
kde/src/conf/dlgaddressbook.h
1
1
/****************************************************************************
2
 
 *   Copyright (C) 2009 by Savoir-Faire Linux                               *
 
2
 *   Copyright (C) 2009-2013 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
 *                                                                          *
35
35
{
36
36
Q_OBJECT
37
37
public:
38
 
   DlgAddressBook(KConfigDialog* parent = 0);
 
38
   explicit DlgAddressBook(KConfigDialog* parent = nullptr);
39
39
 
40
 
   ~DlgAddressBook();
 
40
   virtual ~DlgAddressBook();
41
41
 
42
42
   bool hasChanged();
43
43
 
46
46
   QHash<QString,QListWidgetItem*> m_mNumbertype;
47
47
   bool m_HasChanged;
48
48
 
49
 
public slots:
 
49
public Q_SLOTS:
50
50
   void updateWidgets ();
51
51
   void updateSettings();
52
52
 
53
 
private slots:
 
53
private Q_SLOTS:
54
54
   void changed();
55
55
 
56
 
signals:
 
56
Q_SIGNALS:
57
57
   ///Emitted when the buttons need to be updated
58
58
   void updateButtons();
59
59
};