Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
PIM
Akonadi Contacts
Commits
7675441f
Commit
7675441f
authored
Feb 20, 2017
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Astyle kdelibs
parent
a8059a80
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
3 additions
and
16 deletions
+3
-16
src/contactgroupeditordelegate.cpp
src/contactgroupeditordelegate.cpp
+1
-2
src/contactgroupeditordialog.cpp
src/contactgroupeditordialog.cpp
+1
-1
src/editor/generalinfoeditor/autotests/akonadicontactselecttypecomboboxtest.h
...foeditor/autotests/akonadicontactselecttypecomboboxtest.h
+0
-1
src/editor/generalinfoeditor/displaynameeditwidget.cpp
src/editor/generalinfoeditor/displaynameeditwidget.cpp
+0
-1
src/editor/generalinfoeditor/messaging/messagingwidgetlister.cpp
...tor/generalinfoeditor/messaging/messagingwidgetlister.cpp
+0
-1
src/editor/generalinfoeditor/nameeditdialog.cpp
src/editor/generalinfoeditor/nameeditdialog.cpp
+0
-2
src/editor/im/improtocols.cpp
src/editor/im/improtocols.cpp
+1
-1
src/editor/personaleditor/dateeditwidget.cpp
src/editor/personaleditor/dateeditwidget.cpp
+0
-1
src/editor/personaleditor/kdatepickerpopup.cpp
src/editor/personaleditor/kdatepickerpopup.cpp
+0
-1
src/emailaddressselectionmodel.cpp
src/emailaddressselectionmodel.cpp
+0
-2
src/emailaddressselectionmodel.h
src/emailaddressselectionmodel.h
+0
-1
src/kcm/kcmakonadicontactactions.cpp
src/kcm/kcmakonadicontactactions.cpp
+0
-1
src/standardcontactactionmanager.cpp
src/standardcontactactionmanager.cpp
+0
-1
No files found.
src/contactgroupeditordelegate.cpp
View file @
7675441f
...
...
@@ -27,7 +27,6 @@
#include <entitytreemodel.h>
#include <KComboBox>
#include <QtCore/QTimer>
#include <QIcon>
#include <QAbstractItemView>
...
...
@@ -155,7 +154,7 @@ QWidget *ContactGroupEditorDelegate::createEditor(QWidget *parent, const QStyleO
return
comboBox
;
}
else
{
auto
edit
=
new
ContactLineEdit
(
isReference
,
ContactCompletionModel
::
EmailColumn
,
parent
);
connect
(
edit
,
static_cast
<
void
(
ContactLineEdit
::*
)(
QWidget
*
)
>
(
&
ContactLineEdit
::
completed
),
connect
(
edit
,
static_cast
<
void
(
ContactLineEdit
::*
)(
QWidget
*
)
>
(
&
ContactLineEdit
::
completed
),
this
,
&
ContactGroupEditorDelegate
::
completed
);
return
edit
;
}
...
...
src/contactgroupeditordialog.cpp
View file @
7675441f
...
...
@@ -89,7 +89,7 @@ ContactGroupEditorDialog::ContactGroupEditorDialog(Mode mode, QWidget *parent)
setWindowTitle
(
mode
==
CreateMode
?
i18n
(
"New Contact Group"
)
:
i18n
(
"Edit Contact Group"
));
QVBoxLayout
*
mainLayout
=
new
QVBoxLayout
(
this
);
QDialogButtonBox
*
buttonBox
=
new
QDialogButtonBox
(
QDialogButtonBox
::
Ok
|
QDialogButtonBox
::
Cancel
,
this
);
QDialogButtonBox
*
buttonBox
=
new
QDialogButtonBox
(
QDialogButtonBox
::
Ok
|
QDialogButtonBox
::
Cancel
,
this
);
d
->
okButton
=
buttonBox
->
button
(
QDialogButtonBox
::
Ok
);
d
->
okButton
->
setDefault
(
true
);
d
->
okButton
->
setShortcut
(
Qt
::
CTRL
|
Qt
::
Key_Return
);
...
...
src/editor/generalinfoeditor/autotests/akonadicontactselecttypecomboboxtest.h
View file @
7675441f
...
...
@@ -19,7 +19,6 @@
02110-1301, USA.
*/
#ifndef AKONADICONTACTSELECTTYPECOMBOBOXTEST_H
#define AKONADICONTACTSELECTTYPECOMBOBOXTEST_H
...
...
src/editor/generalinfoeditor/displaynameeditwidget.cpp
View file @
7675441f
...
...
@@ -32,7 +32,6 @@
#include <KComboBox>
#include <KLocalizedString>
// Tries to guess the display type that is used for the passed contact
static
DisplayNameEditWidget
::
DisplayType
guessedDisplayType
(
const
KContacts
::
Addressee
&
contact
)
{
...
...
src/editor/generalinfoeditor/messaging/messagingwidgetlister.cpp
View file @
7675441f
...
...
@@ -42,7 +42,6 @@ MessagingWidgetLister::~MessagingWidgetLister()
}
void
MessagingWidgetLister
::
loadContact
(
const
KContacts
::
Addressee
&
contact
)
{
IMAddress
::
List
imaddresses
;
...
...
src/editor/generalinfoeditor/nameeditdialog.cpp
View file @
7675441f
...
...
@@ -58,10 +58,8 @@ NameEditDialog::NameEditDialog(QWidget *parent)
mSuffixCombo
->
setDuplicatesEnabled
(
false
);
mSuffixCombo
->
setEditable
(
true
);
mDisplayNameEdit
=
new
DisplayNameEditWidget
(
this
);
layout
->
addRow
(
i18n
(
"Honorific prefixes:"
),
mPrefixCombo
);
layout
->
addRow
(
i18n
(
"Given name:"
),
mGivenNameEdit
);
layout
->
addRow
(
i18n
(
"Additional names:"
),
mAdditionalNameEdit
);
...
...
src/editor/im/improtocols.cpp
View file @
7675441f
...
...
@@ -41,7 +41,7 @@ IMProtocols::IMProtocols()
QMap
<
QString
,
QString
>::
const_iterator
sortedIt
=
sortingMap
.
cbegin
();
const
QMap
<
QString
,
QString
>::
const_iterator
sortedItEnd
=
sortingMap
.
cend
();
for
(;
sortedIt
!=
sortedItEnd
;
++
sortedIt
)
{
for
(;
sortedIt
!=
sortedItEnd
;
++
sortedIt
)
{
mSortedProtocols
.
append
(
sortedIt
.
value
());
}
}
...
...
src/editor/personaleditor/dateeditwidget.cpp
View file @
7675441f
...
...
@@ -25,7 +25,6 @@
#include <kdatepicker.h>
#include <QContextMenuEvent>
#include <QHBoxLayout>
#include <QToolButton>
...
...
src/editor/personaleditor/kdatepickerpopup.cpp
View file @
7675441f
...
...
@@ -114,7 +114,6 @@ void KDatePickerPopup::setDate(const QDate &date)
mDatePicker
->
setDate
(
date
);
}
void
KDatePickerPopup
::
slotDateChanged
(
const
QDate
&
date
)
{
if
(
date
!=
mDate
)
{
...
...
src/emailaddressselectionmodel.cpp
View file @
7675441f
...
...
@@ -19,7 +19,6 @@
02110-1301, USA.
*/
#include "emailaddressselectionmodel.h"
#include <AkonadiCore/Session>
#include <AkonadiCore/ItemFetchScope>
...
...
@@ -29,7 +28,6 @@
#include <KContacts/Addressee>
#include <KContacts/ContactGroup>
using
namespace
Akonadi
;
EmailAddressSelectionModel
::
EmailAddressSelectionModel
(
QObject
*
parent
)
...
...
src/emailaddressselectionmodel.h
View file @
7675441f
...
...
@@ -19,7 +19,6 @@
02110-1301, USA.
*/
#ifndef EMAILADDRESSSELECTIONMODEL_H
#define EMAILADDRESSSELECTIONMODEL_H
...
...
src/kcm/kcmakonadicontactactions.cpp
View file @
7675441f
...
...
@@ -24,7 +24,6 @@
#include "contactactionssettings.h"
#include <kaboutdata.h>
#include <kconfigdialogmanager.h>
#include <kpluginfactory.h>
...
...
src/standardcontactactionmanager.cpp
View file @
7675441f
...
...
@@ -582,7 +582,6 @@ QAction *StandardContactActionManager::createAction(Type type)
return
action
;
}
switch
(
type
)
{
case
CreateContact
:
action
=
new
QAction
(
d
->
mParentWidget
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment