Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
Akonadi Contacts
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PIM
Akonadi Contacts
Commits
7beb2d61
Commit
7beb2d61
authored
Jul 09, 2015
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Astyle kdelibs
parent
4f612674
Changes
78
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
78 changed files
with
614 additions
and
563 deletions
+614
-563
akonadi-contact/src/abstractcontacteditorwidget_p.h
akonadi-contact/src/abstractcontacteditorwidget_p.h
+4
-2
akonadi-contact/src/abstractcontactformatter.h
akonadi-contact/src/abstractcontactformatter.h
+4
-2
akonadi-contact/src/abstractcontactgroupformatter.h
akonadi-contact/src/abstractcontactgroupformatter.h
+4
-2
akonadi-contact/src/actions/dialphonenumberaction.h
akonadi-contact/src/actions/dialphonenumberaction.h
+4
-2
akonadi-contact/src/actions/sendsmsaction.h
akonadi-contact/src/actions/sendsmsaction.h
+2
-1
akonadi-contact/src/actions/showaddressaction.h
akonadi-contact/src/actions/showaddressaction.h
+4
-2
akonadi-contact/src/actions/smsdialog.h
akonadi-contact/src/actions/smsdialog.h
+2
-1
akonadi-contact/src/akonadi_contact_debug.cpp
akonadi-contact/src/akonadi_contact_debug.cpp
+0
-1
akonadi-contact/src/akonadi_contact_debug.h
akonadi-contact/src/akonadi_contact_debug.h
+1
-1
akonadi-contact/src/attributeregistrar.cpp
akonadi-contact/src/attributeregistrar.cpp
+2
-1
akonadi-contact/src/contactcompletionmodel_p.h
akonadi-contact/src/contactcompletionmodel_p.h
+2
-1
akonadi-contact/src/contactdefaultactions.h
akonadi-contact/src/contactdefaultactions.h
+4
-2
akonadi-contact/src/contacteditor.h
akonadi-contact/src/contacteditor.h
+4
-2
akonadi-contact/src/contacteditordialog.h
akonadi-contact/src/contacteditordialog.h
+2
-1
akonadi-contact/src/contacteditorpageplugin.h
akonadi-contact/src/contacteditorpageplugin.h
+4
-2
akonadi-contact/src/contactgroupeditor.h
akonadi-contact/src/contactgroupeditor.h
+4
-2
akonadi-contact/src/contactgroupeditor_p.h
akonadi-contact/src/contactgroupeditor_p.h
+2
-1
akonadi-contact/src/contactgroupeditordelegate.cpp
akonadi-contact/src/contactgroupeditordelegate.cpp
+1
-1
akonadi-contact/src/contactgroupeditordelegate_p.h
akonadi-contact/src/contactgroupeditordelegate_p.h
+2
-1
akonadi-contact/src/contactgroupeditordialog.cpp
akonadi-contact/src/contactgroupeditordialog.cpp
+2
-2
akonadi-contact/src/contactgroupeditordialog.h
akonadi-contact/src/contactgroupeditordialog.h
+2
-1
akonadi-contact/src/contactgroupexpandjob.h
akonadi-contact/src/contactgroupexpandjob.h
+2
-1
akonadi-contact/src/contactgroupmodel.cpp
akonadi-contact/src/contactgroupmodel.cpp
+1
-2
akonadi-contact/src/contactgroupmodel_p.h
akonadi-contact/src/contactgroupmodel_p.h
+2
-1
akonadi-contact/src/contactgroupsearchjob.h
akonadi-contact/src/contactgroupsearchjob.h
+2
-1
akonadi-contact/src/contactgroupviewer.h
akonadi-contact/src/contactgroupviewer.h
+2
-1
akonadi-contact/src/contactgroupviewerdialog.h
akonadi-contact/src/contactgroupviewerdialog.h
+2
-1
akonadi-contact/src/contactmetadata.cpp
akonadi-contact/src/contactmetadata.cpp
+32
-32
akonadi-contact/src/contactmetadata_p.h
akonadi-contact/src/contactmetadata_p.h
+2
-1
akonadi-contact/src/contactmetadataattribute.cpp
akonadi-contact/src/contactmetadataattribute.cpp
+1
-1
akonadi-contact/src/contactmetadataattribute_p.h
akonadi-contact/src/contactmetadataattribute_p.h
+2
-1
akonadi-contact/src/contactparts.h
akonadi-contact/src/contactparts.h
+4
-2
akonadi-contact/src/contactsearchjob.h
akonadi-contact/src/contactsearchjob.h
+2
-1
akonadi-contact/src/contactsfilterproxymodel.h
akonadi-contact/src/contactsfilterproxymodel.h
+2
-1
akonadi-contact/src/contactstreemodel.h
akonadi-contact/src/contactstreemodel.h
+2
-1
akonadi-contact/src/contactviewer.cpp
akonadi-contact/src/contactviewer.cpp
+6
-8
akonadi-contact/src/contactviewer.h
akonadi-contact/src/contactviewer.h
+4
-2
akonadi-contact/src/contactviewerdialog.h
akonadi-contact/src/contactviewerdialog.h
+4
-2
akonadi-contact/src/editor/addresseditwidget.cpp
akonadi-contact/src/editor/addresseditwidget.cpp
+6
-7
akonadi-contact/src/editor/autotests/emaileditdialogtest.cpp
akonadi-contact/src/editor/autotests/emaileditdialogtest.cpp
+1
-1
akonadi-contact/src/editor/autotests/emaileditdialogtest.h
akonadi-contact/src/editor/autotests/emaileditdialogtest.h
+0
-1
akonadi-contact/src/editor/autotests/emaileditwidgettest.cpp
akonadi-contact/src/editor/autotests/emaileditwidgettest.cpp
+0
-1
akonadi-contact/src/editor/categorieseditwidget.h
akonadi-contact/src/editor/categorieseditwidget.h
+2
-1
akonadi-contact/src/editor/contacteditorwidget.cpp
akonadi-contact/src/editor/contacteditorwidget.cpp
+1
-2
akonadi-contact/src/editor/contacteditorwidget.h
akonadi-contact/src/editor/contacteditorwidget.h
+2
-1
akonadi-contact/src/editor/customfieldseditwidget.h
akonadi-contact/src/editor/customfieldseditwidget.h
+2
-1
akonadi-contact/src/editor/emaileditwidget.cpp
akonadi-contact/src/editor/emaileditwidget.cpp
+4
-5
akonadi-contact/src/editor/emaileditwidget.h
akonadi-contact/src/editor/emaileditwidget.h
+2
-2
akonadi-contact/src/editor/freebusyeditwidget.h
akonadi-contact/src/editor/freebusyeditwidget.h
+2
-1
akonadi-contact/src/editor/geoeditwidget.cpp
akonadi-contact/src/editor/geoeditwidget.cpp
+3
-3
akonadi-contact/src/editor/geoeditwidget.h
akonadi-contact/src/editor/geoeditwidget.h
+3
-3
akonadi-contact/src/editor/im/imdelegate.h
akonadi-contact/src/editor/im/imdelegate.h
+2
-2
akonadi-contact/src/editor/im/imeditordialog.cpp
akonadi-contact/src/editor/im/imeditordialog.cpp
+8
-7
akonadi-contact/src/editor/im/improtocols.cpp
akonadi-contact/src/editor/im/improtocols.cpp
+1
-3
akonadi-contact/src/editor/imagewidget.cpp
akonadi-contact/src/editor/imagewidget.cpp
+3
-3
akonadi-contact/src/editor/imagewidget.h
akonadi-contact/src/editor/imagewidget.h
+2
-1
akonadi-contact/src/editor/kdatepickerpopup.cpp
akonadi-contact/src/editor/kdatepickerpopup.cpp
+4
-5
akonadi-contact/src/editor/secrecyeditwidget.h
akonadi-contact/src/editor/secrecyeditwidget.h
+2
-1
akonadi-contact/src/editor/soundeditwidget.h
akonadi-contact/src/editor/soundeditwidget.h
+2
-1
akonadi-contact/src/emailaddressselection.cpp
akonadi-contact/src/emailaddressselection.cpp
+26
-26
akonadi-contact/src/emailaddressselection.h
akonadi-contact/src/emailaddressselection.h
+2
-1
akonadi-contact/src/emailaddressselection_p.h
akonadi-contact/src/emailaddressselection_p.h
+2
-1
akonadi-contact/src/emailaddressselectiondialog.h
akonadi-contact/src/emailaddressselectiondialog.h
+2
-1
akonadi-contact/src/emailaddressselectionproxymodel_p.h
akonadi-contact/src/emailaddressselectionproxymodel_p.h
+2
-1
akonadi-contact/src/emailaddressselectionwidget.cpp
akonadi-contact/src/emailaddressselectionwidget.cpp
+3
-3
akonadi-contact/src/emailaddressselectionwidget.h
akonadi-contact/src/emailaddressselectionwidget.h
+2
-1
akonadi-contact/src/leafextensionproxymodel_p.h
akonadi-contact/src/leafextensionproxymodel_p.h
+2
-1
akonadi-contact/src/recentcontactscollectionrequestjob.h
akonadi-contact/src/recentcontactscollectionrequestjob.h
+2
-1
akonadi-contact/src/recentcontactscollections_p.h
akonadi-contact/src/recentcontactscollections_p.h
+2
-1
akonadi-contact/src/standardcontactactionmanager.cpp
akonadi-contact/src/standardcontactactionmanager.cpp
+4
-4
akonadi-contact/src/standardcontactactionmanager.h
akonadi-contact/src/standardcontactactionmanager.h
+2
-1
akonadi-contact/src/standardcontactformatter.cpp
akonadi-contact/src/standardcontactformatter.cpp
+288
-287
akonadi-contact/src/standardcontactformatter.h
akonadi-contact/src/standardcontactformatter.h
+2
-1
akonadi-contact/src/standardcontactgroupformatter.cpp
akonadi-contact/src/standardcontactgroupformatter.cpp
+85
-85
akonadi-contact/src/standardcontactgroupformatter.h
akonadi-contact/src/standardcontactgroupformatter.h
+2
-1
akonadi-contact/src/textbrowser.cpp
akonadi-contact/src/textbrowser.cpp
+1
-1
akonadi-contact/src/textbrowser_p.h
akonadi-contact/src/textbrowser_p.h
+2
-1
akonadi-contact/src/waitingoverlay.cpp
akonadi-contact/src/waitingoverlay.cpp
+3
-3
No files found.
akonadi-contact/src/abstractcontacteditorwidget_p.h
View file @
7beb2d61
...
...
@@ -24,11 +24,13 @@
#include <QWidget>
namespace
KContacts
{
namespace
KContacts
{
class
Addressee
;
}
namespace
Akonadi
{
namespace
Akonadi
{
class
ContactMetaData
;
...
...
akonadi-contact/src/abstractcontactformatter.h
View file @
7beb2d61
...
...
@@ -26,11 +26,13 @@
#include <QtCore/QVariantMap>
namespace
KContacts
{
namespace
KContacts
{
class
Addressee
;
}
namespace
Akonadi
{
namespace
Akonadi
{
class
Item
;
/**
...
...
akonadi-contact/src/abstractcontactgroupformatter.h
View file @
7beb2d61
...
...
@@ -26,11 +26,13 @@
#include <QtCore/QVariant>
namespace
KContacts
{
namespace
KContacts
{
class
ContactGroup
;
}
namespace
Akonadi
{
namespace
Akonadi
{
class
Item
;
/**
...
...
akonadi-contact/src/actions/dialphonenumberaction.h
View file @
7beb2d61
...
...
@@ -22,11 +22,13 @@
#ifndef AKONADI_DIALPHONENUMBERACTION_H
#define AKONADI_DIALPHONENUMBERACTION_H
namespace
KContacts
{
namespace
KContacts
{
class
PhoneNumber
;
}
namespace
Akonadi
{
namespace
Akonadi
{
/**
* @short An action to dial the phone number of a contact.
...
...
akonadi-contact/src/actions/sendsmsaction.h
View file @
7beb2d61
...
...
@@ -22,7 +22,8 @@
#ifndef SENDSMSACTION_H
#define SENDSMSACTION_H
namespace
KContacts
{
namespace
KContacts
{
class
PhoneNumber
;
}
...
...
akonadi-contact/src/actions/showaddressaction.h
View file @
7beb2d61
...
...
@@ -22,11 +22,13 @@
#ifndef AKONADI_SHOWADDRESSACTION_H
#define AKONADI_SHOWADDRESSACTION_H
namespace
KContacts
{
namespace
KContacts
{
class
Address
;
}
namespace
Akonadi
{
namespace
Akonadi
{
/**
* @short A contact action to show the address of a contact on a map.
...
...
akonadi-contact/src/actions/smsdialog.h
View file @
7beb2d61
...
...
@@ -28,7 +28,8 @@ class QLabel;
class
KTextEdit
;
namespace
KContacts
{
namespace
KContacts
{
class
PhoneNumber
;
}
...
...
akonadi-contact/src/akonadi_contact_debug.cpp
View file @
7beb2d61
...
...
@@ -20,4 +20,3 @@
#include "akonadi_contact_debug.h"
Q_LOGGING_CATEGORY
(
AKONADICONTACT_LOG
,
"log_akonadi_contact"
)
akonadi-contact/src/akonadi_contact_debug.h
View file @
7beb2d61
...
...
@@ -23,5 +23,5 @@
#include <QLoggingCategory>
Q_DECLARE_LOGGING_CATEGORY
(
AKONADICONTACT_LOG
)
#endif
#endif
akonadi-contact/src/attributeregistrar.cpp
View file @
7beb2d61
...
...
@@ -23,7 +23,8 @@
#include <attributefactory.h>
namespace
{
namespace
{
// Anonymous namespace; function is invisible outside this file.
bool
dummy
()
...
...
akonadi-contact/src/contactcompletionmodel_p.h
View file @
7beb2d61
...
...
@@ -24,7 +24,8 @@
#include <entitytreemodel.h>
namespace
Akonadi
{
namespace
Akonadi
{
class
ContactCompletionModel
:
public
EntityTreeModel
{
...
...
akonadi-contact/src/contactdefaultactions.h
View file @
7beb2d61
...
...
@@ -28,12 +28,14 @@
class
QUrl
;
namespace
KContacts
{
namespace
KContacts
{
class
Address
;
class
PhoneNumber
;
}
namespace
Akonadi
{
namespace
Akonadi
{
/**
* @short A convenience class that handles different contact related actions.
...
...
akonadi-contact/src/contacteditor.h
View file @
7beb2d61
...
...
@@ -26,11 +26,13 @@
#include <QWidget>
namespace
KContacts
{
namespace
KContacts
{
class
Addressee
;
}
namespace
Akonadi
{
namespace
Akonadi
{
class
AbstractContactEditorWidget
;
class
Collection
;
...
...
akonadi-contact/src/contacteditordialog.h
View file @
7beb2d61
...
...
@@ -26,7 +26,8 @@
#include <QDialog>
namespace
Akonadi
{
namespace
Akonadi
{
class
AbstractContactEditorWidget
;
class
ContactEditor
;
...
...
akonadi-contact/src/contacteditorpageplugin.h
View file @
7beb2d61
...
...
@@ -24,11 +24,13 @@
#include <QWidget>
namespace
KContacts
{
namespace
KContacts
{
class
Addressee
;
}
namespace
Akonadi
{
namespace
Akonadi
{
/**
* @short The base class for custom ContactEditor page plugins.
...
...
akonadi-contact/src/contactgroupeditor.h
View file @
7beb2d61
...
...
@@ -26,11 +26,13 @@
#include <QWidget>
namespace
KContacts
{
namespace
KContacts
{
class
ContactGroup
;
}
namespace
Akonadi
{
namespace
Akonadi
{
class
Collection
;
class
Item
;
...
...
akonadi-contact/src/contactgroupeditor_p.h
View file @
7beb2d61
...
...
@@ -31,7 +31,8 @@
class
KJob
;
namespace
Akonadi
{
namespace
Akonadi
{
class
ContactGroupModel
;
class
Monitor
;
...
...
akonadi-contact/src/contactgroupeditordelegate.cpp
View file @
7beb2d61
...
...
@@ -139,7 +139,7 @@ ContactGroupEditorDelegate::~ContactGroupEditorDelegate()
}
QWidget
*
ContactGroupEditorDelegate
::
createEditor
(
QWidget
*
parent
,
const
QStyleOptionViewItem
&
option
,
const
QModelIndex
&
index
)
const
const
QModelIndex
&
index
)
const
{
Q_UNUSED
(
option
)
if
(
index
.
column
()
==
0
)
{
...
...
akonadi-contact/src/contactgroupeditordelegate_p.h
View file @
7beb2d61
...
...
@@ -28,7 +28,8 @@
#include <item.h>
namespace
Akonadi
{
namespace
Akonadi
{
class
ContactLineEdit
:
public
QLineEdit
{
...
...
akonadi-contact/src/contactgroupeditordialog.cpp
View file @
7beb2d61
...
...
@@ -107,8 +107,8 @@ ContactGroupEditorDialog::ContactGroupEditorDialog(Mode mode, QWidget *parent)
QGridLayout
*
layout
=
new
QGridLayout
(
mainWidget
);
d
->
mEditor
=
new
Akonadi
::
ContactGroupEditor
(
mode
==
CreateMode
?
Akonadi
::
ContactGroupEditor
::
CreateMode
:
Akonadi
::
ContactGroupEditor
::
EditMode
,
this
);
Akonadi
::
ContactGroupEditor
::
CreateMode
:
Akonadi
::
ContactGroupEditor
::
EditMode
,
this
);
if
(
mode
==
CreateMode
)
{
QLabel
*
label
=
new
QLabel
(
i18n
(
"Add to:"
),
mainWidget
);
...
...
akonadi-contact/src/contactgroupeditordialog.h
View file @
7beb2d61
...
...
@@ -26,7 +26,8 @@
#include <QDialog>
namespace
Akonadi
{
namespace
Akonadi
{
class
Item
;
class
Collection
;
...
...
akonadi-contact/src/contactgroupexpandjob.h
View file @
7beb2d61
...
...
@@ -28,7 +28,8 @@
#include <kcontacts/contactgroup.h>
#include <kjob.h>
namespace
Akonadi
{
namespace
Akonadi
{
/**
* @short Job that expands a ContactGroup to a list of contacts.
...
...
akonadi-contact/src/contactgroupmodel.cpp
View file @
7beb2d61
...
...
@@ -32,8 +32,7 @@
using
namespace
Akonadi
;
struct
GroupMember
{
struct
GroupMember
{
GroupMember
()
:
isReference
(
false
)
,
loadingError
(
false
)
...
...
akonadi-contact/src/contactgroupmodel_p.h
View file @
7beb2d61
...
...
@@ -26,7 +26,8 @@
#include <kcontacts/contactgroup.h>
namespace
Akonadi
{
namespace
Akonadi
{
class
ContactGroupModel
:
public
QAbstractItemModel
{
...
...
akonadi-contact/src/contactgroupsearchjob.h
View file @
7beb2d61
...
...
@@ -28,7 +28,8 @@
#include <itemsearchjob.h>
#include <kcontacts/contactgroup.h>
namespace
Akonadi
{
namespace
Akonadi
{
/**
* @short Job that searches for contact groups in the Akonadi storage.
...
...
akonadi-contact/src/contactgroupviewer.h
View file @
7beb2d61
...
...
@@ -28,7 +28,8 @@
#include <QWidget>
namespace
Akonadi
{
namespace
Akonadi
{
class
AbstractContactGroupFormatter
;
...
...
akonadi-contact/src/contactgroupviewerdialog.h
View file @
7beb2d61
...
...
@@ -26,7 +26,8 @@
#include <QDialog>
namespace
Akonadi
{
namespace
Akonadi
{
class
Item
;
...
...
akonadi-contact/src/contactmetadata.cpp
View file @
7beb2d61
...
...
@@ -29,9 +29,9 @@ using namespace Akonadi;
class
ContactMetaData
::
Private
{
public:
public:
Private
()
:
mDisplayNameMode
(
-
1
)
:
mDisplayNameMode
(
-
1
)
{
}
...
...
@@ -40,65 +40,65 @@ class ContactMetaData::Private
};
ContactMetaData
::
ContactMetaData
()
:
d
(
new
Private
)
:
d
(
new
Private
)
{
}
ContactMetaData
::~
ContactMetaData
()
{
delete
d
;
delete
d
;
}
void
ContactMetaData
::
load
(
const
Akonadi
::
Item
&
contact
)
void
ContactMetaData
::
load
(
const
Akonadi
::
Item
&
contact
)
{
if
(
!
contact
.
hasAttribute
(
"contactmetadata"
)
)
{
return
;
}
if
(
!
contact
.
hasAttribute
(
"contactmetadata"
)
)
{
return
;
}
ContactMetaDataAttribute
*
attribute
=
contact
.
attribute
<
ContactMetaDataAttribute
>
();
const
QVariantMap
metaData
=
attribute
->
metaData
();
ContactMetaDataAttribute
*
attribute
=
contact
.
attribute
<
ContactMetaDataAttribute
>
();
const
QVariantMap
metaData
=
attribute
->
metaData
();
if
(
metaData
.
contains
(
QLatin1String
(
"DisplayNameMode"
)
)
)
{
d
->
mDisplayNameMode
=
metaData
.
value
(
QLatin1String
(
"DisplayNameMode"
)
).
toInt
();
}
else
{
d
->
mDisplayNameMode
=
-
1
;
}
if
(
metaData
.
contains
(
QLatin1String
(
"DisplayNameMode"
))
)
{
d
->
mDisplayNameMode
=
metaData
.
value
(
QLatin1String
(
"DisplayNameMode"
)
).
toInt
();
}
else
{
d
->
mDisplayNameMode
=
-
1
;
}
d
->
mCustomFieldDescriptions
=
metaData
.
value
(
QLatin1String
(
"CustomFieldDescriptions"
)
).
toList
();
d
->
mCustomFieldDescriptions
=
metaData
.
value
(
QLatin1String
(
"CustomFieldDescriptions"
)
).
toList
();
}
void
ContactMetaData
::
store
(
Akonadi
::
Item
&
contact
)
void
ContactMetaData
::
store
(
Akonadi
::
Item
&
contact
)
{
ContactMetaDataAttribute
*
attribute
=
contact
.
attribute
<
ContactMetaDataAttribute
>
(
Item
::
AddIfMissing
);
ContactMetaDataAttribute
*
attribute
=
contact
.
attribute
<
ContactMetaDataAttribute
>
(
Item
::
AddIfMissing
);
QVariantMap
metaData
;
if
(
d
->
mDisplayNameMode
!=
-
1
)
{
metaData
.
insert
(
QLatin1String
(
"DisplayNameMode"
),
QVariant
(
d
->
mDisplayNameMode
)
);
}
QVariantMap
metaData
;
if
(
d
->
mDisplayNameMode
!=
-
1
)
{
metaData
.
insert
(
QLatin1String
(
"DisplayNameMode"
),
QVariant
(
d
->
mDisplayNameMode
)
);
}
if
(
!
d
->
mCustomFieldDescriptions
.
isEmpty
()
)
{
metaData
.
insert
(
QLatin1String
(
"CustomFieldDescriptions"
),
d
->
mCustomFieldDescriptions
);
}
if
(
!
d
->
mCustomFieldDescriptions
.
isEmpty
()
)
{
metaData
.
insert
(
QLatin1String
(
"CustomFieldDescriptions"
),
d
->
mCustomFieldDescriptions
);
}
attribute
->
setMetaData
(
metaData
);
attribute
->
setMetaData
(
metaData
);
}
void
ContactMetaData
::
setDisplayNameMode
(
int
mode
)
void
ContactMetaData
::
setDisplayNameMode
(
int
mode
)
{
d
->
mDisplayNameMode
=
mode
;
d
->
mDisplayNameMode
=
mode
;
}
int
ContactMetaData
::
displayNameMode
()
const
{
return
d
->
mDisplayNameMode
;
return
d
->
mDisplayNameMode
;
}
void
ContactMetaData
::
setCustomFieldDescriptions
(
const
QVariantList
&
descriptions
)
void
ContactMetaData
::
setCustomFieldDescriptions
(
const
QVariantList
&
descriptions
)
{
d
->
mCustomFieldDescriptions
=
descriptions
;
d
->
mCustomFieldDescriptions
=
descriptions
;
}
QVariantList
ContactMetaData
::
customFieldDescriptions
()
const
{
return
d
->
mCustomFieldDescriptions
;
return
d
->
mCustomFieldDescriptions
;
}
akonadi-contact/src/contactmetadata_p.h
View file @
7beb2d61
...
...
@@ -25,7 +25,8 @@
#include <QtCore/QStringList>
#include <QtCore/QVariant>
namespace
Akonadi
{
namespace
Akonadi
{
class
Item
;
...
...
akonadi-contact/src/contactmetadataattribute.cpp
View file @
7beb2d61
...
...
@@ -53,7 +53,7 @@ QVariantMap ContactMetaDataAttribute::metaData() const
QByteArray
ContactMetaDataAttribute
::
type
()
const
{
static
const
QByteArray
sType
(
"contactmetadata"
);
static
const
QByteArray
sType
(
"contactmetadata"
);
return
sType
;
}
...
...
akonadi-contact/src/contactmetadataattribute_p.h
View file @
7beb2d61
...
...
@@ -28,7 +28,8 @@
#include <QtCore/QVariant>
namespace
Akonadi
{
namespace
Akonadi
{
/**
* @short Attribute to store contact specific meta data.
...
...
akonadi-contact/src/contactparts.h
View file @
7beb2d61
...
...
@@ -22,14 +22,16 @@
#include "akonadi-contact_export.h"
namespace
Akonadi
{
namespace
Akonadi
{
/**
* @short Contains predefined part identifiers.
*
* This namespace contains identifiers of item parts that are used for
* handling contact items.
*/
namespace
ContactPart
{
namespace
ContactPart
{
/**
* The part identifier for a small contact version,
* that contains only name and email addresses.
...
...
akonadi-contact/src/contactsearchjob.h
View file @
7beb2d61
...
...
@@ -28,7 +28,8 @@
#include <itemsearchjob.h>
#include <kcontacts/addressee.h>
namespace
Akonadi
{
namespace
Akonadi
{
/**
* @short Job that searches for contacts in the Akonadi storage.
...
...
akonadi-contact/src/contactsfilterproxymodel.h
View file @
7beb2d61
...
...
@@ -26,7 +26,8 @@
#include <QSortFilterProxyModel>
namespace
Akonadi
{
namespace
Akonadi
{
/**
* @short A proxy model for \a ContactsTreeModel models.
...
...
akonadi-contact/src/contactstreemodel.h
View file @
7beb2d61
...
...
@@ -27,7 +27,8 @@
#include <entitytreemodel.h>
namespace
Akonadi
{
namespace
Akonadi
{
/**
* @short A model for contacts and contact groups as available in Akonadi.
...
...
akonadi-contact/src/contactviewer.cpp
View file @
7beb2d61
...
...
@@ -77,9 +77,8 @@ public:
void
updateView
(
const
QVariantList
&
localCustomFieldDescriptions
=
QVariantList
(),
const
QString
&
addressBookName
=
QString
())
{
static
QPixmap
defaultPixmap
=
QIcon
::
fromTheme
(
QStringLiteral
(
"user-identity"
)).
pixmap
(
QSize
(
100
,
100
));
static
QPixmap
defaultMapPixmap
=
QIcon
::
fromTheme
(
QLatin1String
(
"document-open-remote"
)
).
pixmap
(
QSize
(
16
,
16
)
);
static
QPixmap
defaultSmsPixmap
=
QIcon
::
fromTheme
(
IMProtocols
::
self
()
->
icon
(
QString
::
fromLatin1
(
"messaging/sms"
)
)
).
pixmap
(
QSize
(
16
,
16
)
);
static
QPixmap
defaultMapPixmap
=
QIcon
::
fromTheme
(
QLatin1String
(
"document-open-remote"
)).
pixmap
(
QSize
(
16
,
16
));
static
QPixmap
defaultSmsPixmap
=
QIcon
::
fromTheme
(
IMProtocols
::
self
()
->
icon
(
QString
::
fromLatin1
(
"messaging/sms"
))).
pixmap
(
QSize
(
16
,
16
));
mParent
->
setWindowTitle
(
i18n
(
"Contact %1"
,
mCurrentContact
.
assembledName
()));
...
...
@@ -88,9 +87,9 @@ public:
QUrl
(
QLatin1String
(
"contact_photo"
)),
mCurrentContact
.
photo
().
data
());
}
else
if
(
!
mCurrentContact
.
photo
().
url
().
isEmpty
())
{
mBrowser
->
document
()
->
addResource
(
QTextDocument
::
ImageResource
,
QUrl
(
QLatin1String
(
"contact_photo"
)
),
defaultPixmap
);
mBrowser
->
document
()
->
addResource
(
QTextDocument
::
ImageResource
,
QUrl
(
QLatin1String
(
"contact_photo"
)
),
defaultPixmap
);
}
else
{
mBrowser
->
document
()
->
addResource
(
QTextDocument
::
ImageResource
,
QUrl
(
QLatin1String
(
"contact_photo"
)),
...
...
@@ -105,7 +104,6 @@ public:
//TODO
}
mBrowser
->
document
()
->
addResource
(
QTextDocument
::
ImageResource
,
QUrl
(
QLatin1String
(
"map_icon"
)),
defaultMapPixmap
);
...
...
@@ -175,7 +173,7 @@ public:
{
const
QString
urlScheme
(
url
.
scheme
());
if
(
urlScheme
==
QLatin1String
(
"http"
)
||
urlScheme
==
QLatin1String
(
"https"
))
{
urlScheme
==
QLatin1String
(
"https"
))
{
emit
mParent
->
urlClicked
(
url
);
}
else
if
(
urlScheme
==
QLatin1String
(
"phone"
))
{
const
int
pos
=
url
.
queryItemValue
(
QLatin1String
(
"index"
)).
toInt
();
...
...
akonadi-contact/src/contactviewer.h
View file @
7beb2d61
...
...
@@ -28,13 +28,15 @@
#include <QWidget>
namespace
KContacts
{
namespace
KContacts
{
class
Address
;
class
Addressee
;
class
PhoneNumber
;
}
namespace
Akonadi
{
namespace
Akonadi
{
class
AbstractContactFormatter
;
...
...
akonadi-contact/src/contactviewerdialog.h
View file @
7beb2d61
...
...
@@ -26,10 +26,12 @@
#include <QDialog>
namespace
KContacts
{
namespace
KContacts
{
}
namespace
Akonadi
{
namespace
Akonadi
{
class
Item
;