aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-06-20 07:02:23 +0200
committerMontel Laurent <[email protected]>2017-06-20 07:02:23 +0200
commit447b0fb9fa93f0a2c3b8362d8a078ed30d5ed723 (patch)
tree0944061db7a2c877699aaa7fa9c44e43aee56e97
parentac36ded4d4dbbb3ab9cb94204b16ec46577185b5 (diff)
Move in own directory
-rw-r--r--kcm/CMakeLists.txt4
-rw-r--r--src/CMakeLists.txt318
-rw-r--r--src/akonadi-contacts/CMakeLists.txt317
-rw-r--r--src/akonadi-contacts/abstractcontacteditorwidget_p.h (renamed from src/abstractcontacteditorwidget_p.h)0
-rw-r--r--src/akonadi-contacts/abstractcontactformatter.cpp (renamed from src/abstractcontactformatter.cpp)0
-rw-r--r--src/akonadi-contacts/abstractcontactformatter.h (renamed from src/abstractcontactformatter.h)0
-rw-r--r--src/akonadi-contacts/abstractcontactgroupformatter.cpp (renamed from src/abstractcontactgroupformatter.cpp)0
-rw-r--r--src/akonadi-contacts/abstractcontactgroupformatter.h (renamed from src/abstractcontactgroupformatter.h)0
-rw-r--r--src/akonadi-contacts/actions/contactactionssettings.kcfg.cmake (renamed from src/actions/contactactionssettings.kcfg.cmake)0
-rw-r--r--src/akonadi-contacts/actions/contactactionssettings.kcfgc (renamed from src/actions/contactactionssettings.kcfgc)0
-rw-r--r--src/akonadi-contacts/actions/dialphonenumberaction.cpp (renamed from src/actions/dialphonenumberaction.cpp)0
-rw-r--r--src/akonadi-contacts/actions/dialphonenumberaction.h (renamed from src/actions/dialphonenumberaction.h)0
-rw-r--r--src/akonadi-contacts/actions/qdialer.cpp (renamed from src/actions/qdialer.cpp)0
-rw-r--r--src/akonadi-contacts/actions/qdialer.h (renamed from src/actions/qdialer.h)0
-rw-r--r--src/akonadi-contacts/actions/qekigadialer.cpp (renamed from src/actions/qekigadialer.cpp)0
-rw-r--r--src/akonadi-contacts/actions/qekigadialer.h (renamed from src/actions/qekigadialer.h)0
-rw-r--r--src/akonadi-contacts/actions/qsflphonedialer.cpp (renamed from src/actions/qsflphonedialer.cpp)0
-rw-r--r--src/akonadi-contacts/actions/qsflphonedialer.h (renamed from src/actions/qsflphonedialer.h)0
-rw-r--r--src/akonadi-contacts/actions/qskypedialer.cpp (renamed from src/actions/qskypedialer.cpp)0
-rw-r--r--src/akonadi-contacts/actions/qskypedialer.h (renamed from src/actions/qskypedialer.h)0
-rw-r--r--src/akonadi-contacts/actions/sendsmsaction.cpp (renamed from src/actions/sendsmsaction.cpp)0
-rw-r--r--src/akonadi-contacts/actions/sendsmsaction.h (renamed from src/actions/sendsmsaction.h)0
-rw-r--r--src/akonadi-contacts/actions/showaddressaction.cpp (renamed from src/actions/showaddressaction.cpp)0
-rw-r--r--src/akonadi-contacts/actions/showaddressaction.h (renamed from src/actions/showaddressaction.h)0
-rw-r--r--src/akonadi-contacts/actions/smsdialog.cpp (renamed from src/actions/smsdialog.cpp)0
-rw-r--r--src/akonadi-contacts/actions/smsdialog.h (renamed from src/actions/smsdialog.h)0
-rw-r--r--src/akonadi-contacts/akonadicontact_private_export.h (renamed from src/akonadicontact_private_export.h)0
-rw-r--r--src/akonadi-contacts/attributes/attributeregistrar.cpp (renamed from src/attributes/attributeregistrar.cpp)0
-rw-r--r--src/akonadi-contacts/attributes/contactmetadataattribute.cpp (renamed from src/attributes/contactmetadataattribute.cpp)0
-rw-r--r--src/akonadi-contacts/attributes/contactmetadataattribute_p.h (renamed from src/attributes/contactmetadataattribute_p.h)0
-rw-r--r--src/akonadi-contacts/autoqpointer_p.h (renamed from src/autoqpointer_p.h)0
-rw-r--r--src/akonadi-contacts/collectionfiltermodel.cpp (renamed from src/collectionfiltermodel.cpp)0
-rw-r--r--src/akonadi-contacts/collectionfiltermodel_p.h (renamed from src/collectionfiltermodel_p.h)0
-rw-r--r--src/akonadi-contacts/config-akonadi-contact.h.cmake (renamed from src/config-akonadi-contact.h.cmake)0
-rw-r--r--src/akonadi-contacts/contactcompletionmodel.cpp (renamed from src/contactcompletionmodel.cpp)0
-rw-r--r--src/akonadi-contacts/contactcompletionmodel_p.h (renamed from src/contactcompletionmodel_p.h)0
-rw-r--r--src/akonadi-contacts/contactdefaultactions.cpp (renamed from src/contactdefaultactions.cpp)0
-rw-r--r--src/akonadi-contacts/contactdefaultactions.h (renamed from src/contactdefaultactions.h)0
-rw-r--r--src/akonadi-contacts/contacteditor.cpp (renamed from src/contacteditor.cpp)0
-rw-r--r--src/akonadi-contacts/contacteditor.h (renamed from src/contacteditor.h)0
-rw-r--r--src/akonadi-contacts/contacteditordialog.cpp (renamed from src/contacteditordialog.cpp)0
-rw-r--r--src/akonadi-contacts/contacteditordialog.h (renamed from src/contacteditordialog.h)0
-rw-r--r--src/akonadi-contacts/contacteditorpageplugin.h (renamed from src/contacteditorpageplugin.h)0
-rw-r--r--src/akonadi-contacts/contactgroupeditor.cpp (renamed from src/contactgroupeditor.cpp)0
-rw-r--r--src/akonadi-contacts/contactgroupeditor.h (renamed from src/contactgroupeditor.h)0
-rw-r--r--src/akonadi-contacts/contactgroupeditor.ui (renamed from src/contactgroupeditor.ui)0
-rw-r--r--src/akonadi-contacts/contactgroupeditor_p.h (renamed from src/contactgroupeditor_p.h)0
-rw-r--r--src/akonadi-contacts/contactgroupeditordelegate.cpp (renamed from src/contactgroupeditordelegate.cpp)0
-rw-r--r--src/akonadi-contacts/contactgroupeditordelegate_p.h (renamed from src/contactgroupeditordelegate_p.h)0
-rw-r--r--src/akonadi-contacts/contactgroupeditordialog.cpp (renamed from src/contactgroupeditordialog.cpp)0
-rw-r--r--src/akonadi-contacts/contactgroupeditordialog.h (renamed from src/contactgroupeditordialog.h)0
-rw-r--r--src/akonadi-contacts/contactgroupmodel.cpp (renamed from src/contactgroupmodel.cpp)0
-rw-r--r--src/akonadi-contacts/contactgroupmodel_p.h (renamed from src/contactgroupmodel_p.h)0
-rw-r--r--src/akonadi-contacts/contactgroupviewer.cpp (renamed from src/contactgroupviewer.cpp)0
-rw-r--r--src/akonadi-contacts/contactgroupviewer.h (renamed from src/contactgroupviewer.h)0
-rw-r--r--src/akonadi-contacts/contactgroupviewerdialog.cpp (renamed from src/contactgroupviewerdialog.cpp)0
-rw-r--r--src/akonadi-contacts/contactgroupviewerdialog.h (renamed from src/contactgroupviewerdialog.h)0
-rw-r--r--src/akonadi-contacts/contactmetadataakonadi.cpp (renamed from src/contactmetadataakonadi.cpp)0
-rw-r--r--src/akonadi-contacts/contactmetadataakonadi_p.h (renamed from src/contactmetadataakonadi_p.h)0
-rw-r--r--src/akonadi-contacts/contactmetadatabase.cpp (renamed from src/contactmetadatabase.cpp)0
-rw-r--r--src/akonadi-contacts/contactmetadatabase_p.h (renamed from src/contactmetadatabase_p.h)0
-rw-r--r--src/akonadi-contacts/contactparts.cpp (renamed from src/contactparts.cpp)0
-rw-r--r--src/akonadi-contacts/contactparts.h (renamed from src/contactparts.h)0
-rw-r--r--src/akonadi-contacts/contactsfilterproxymodel.cpp (renamed from src/contactsfilterproxymodel.cpp)0
-rw-r--r--src/akonadi-contacts/contactsfilterproxymodel.h (renamed from src/contactsfilterproxymodel.h)0
-rw-r--r--src/akonadi-contacts/contactstreemodel.cpp (renamed from src/contactstreemodel.cpp)0
-rw-r--r--src/akonadi-contacts/contactstreemodel.h (renamed from src/contactstreemodel.h)0
-rw-r--r--src/akonadi-contacts/contactviewer.cpp (renamed from src/contactviewer.cpp)0
-rw-r--r--src/akonadi-contacts/contactviewer.h (renamed from src/contactviewer.h)0
-rw-r--r--src/akonadi-contacts/contactviewerdialog.cpp (renamed from src/contactviewerdialog.cpp)0
-rw-r--r--src/akonadi-contacts/contactviewerdialog.h (renamed from src/contactviewerdialog.h)0
-rw-r--r--src/akonadi-contacts/customfieldmanager.cpp (renamed from src/customfieldmanager.cpp)0
-rw-r--r--src/akonadi-contacts/customfieldmanager_p.h (renamed from src/customfieldmanager_p.h)0
-rw-r--r--src/akonadi-contacts/customfields.cpp (renamed from src/customfields.cpp)0
-rw-r--r--src/akonadi-contacts/customfields_p.h (renamed from src/customfields_p.h)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/addresseslocationgrantleeformater.cpp (renamed from src/editor/addresseditor/addresseslocationgrantleeformater.cpp)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/addresseslocationgrantleeformater.h (renamed from src/editor/addresseditor/addresseslocationgrantleeformater.h)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/addresseslocationwidget.cpp (renamed from src/editor/addresseditor/addresseslocationwidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/addresseslocationwidget.h (renamed from src/editor/addresseditor/addresseslocationwidget.h)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/addressgrantleeobject.cpp (renamed from src/editor/addresseditor/addressgrantleeobject.cpp)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/addressgrantleeobject.h (renamed from src/editor/addresseditor/addressgrantleeobject.h)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/addresslocationwidget.cpp (renamed from src/editor/addresseditor/addresslocationwidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/addresslocationwidget.h (renamed from src/editor/addresseditor/addresslocationwidget.h)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/addresstypedialog.cpp (renamed from src/editor/addresseditor/addresstypedialog.cpp)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/addresstypedialog.h (renamed from src/editor/addresseditor/addresstypedialog.h)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/autotests/CMakeLists.txt (renamed from src/editor/addresseditor/autotests/CMakeLists.txt)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/autotests/addresseslocationviewertest.cpp (renamed from src/editor/addresseditor/autotests/addresseslocationviewertest.cpp)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/autotests/addresseslocationviewertest.h (renamed from src/editor/addresseditor/autotests/addresseslocationviewertest.h)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/autotests/addresseslocationwidgettest.cpp (renamed from src/editor/addresseditor/autotests/addresseslocationwidgettest.cpp)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/autotests/addresseslocationwidgettest.h (renamed from src/editor/addresseditor/autotests/addresseslocationwidgettest.h)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/autotests/addresslocationwidgettest.cpp (renamed from src/editor/addresseditor/autotests/addresslocationwidgettest.cpp)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/autotests/addresslocationwidgettest.h (renamed from src/editor/addresseditor/autotests/addresslocationwidgettest.h)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/html/CMakeLists.txt (renamed from src/editor/addresseditor/html/CMakeLists.txt)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/html/default/addresseslocation.css (renamed from src/editor/addresseditor/html/default/addresseslocation.css)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/html/default/addresseslocation.html (renamed from src/editor/addresseditor/html/default/addresseslocation.html)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/iconnamecache.cpp (renamed from src/editor/addresseditor/iconnamecache.cpp)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/iconnamecache_p.h (renamed from src/editor/addresseditor/iconnamecache_p.h)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/selectaddresstypecombobox.cpp (renamed from src/editor/addresseditor/selectaddresstypecombobox.cpp)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/selectaddresstypecombobox.h (renamed from src/editor/addresseditor/selectaddresstypecombobox.h)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/tests/CMakeLists.txt (renamed from src/editor/addresseditor/tests/CMakeLists.txt)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/tests/main.cpp (renamed from src/editor/addresseditor/tests/main.cpp)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/webengine/addresseslocationenginepage.cpp (renamed from src/editor/addresseditor/webengine/addresseslocationenginepage.cpp)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/webengine/addresseslocationenginepage.h (renamed from src/editor/addresseditor/webengine/addresseslocationenginepage.h)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/webengine/addresseslocationengineviewer.cpp (renamed from src/editor/addresseditor/webengine/addresseslocationengineviewer.cpp)0
-rw-r--r--src/akonadi-contacts/editor/addresseditor/webengine/addresseslocationengineviewer.h (renamed from src/editor/addresseditor/webengine/addresseslocationengineviewer.h)0
-rw-r--r--src/akonadi-contacts/editor/businesseditor/businesseditorwidget.cpp (renamed from src/editor/businesseditor/businesseditorwidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/businesseditor/businesseditorwidget.h (renamed from src/editor/businesseditor/businesseditorwidget.h)0
-rw-r--r--src/akonadi-contacts/editor/businesseditor/freebusyeditwidget.cpp (renamed from src/editor/businesseditor/freebusyeditwidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/businesseditor/freebusyeditwidget.h (renamed from src/editor/businesseditor/freebusyeditwidget.h)0
-rw-r--r--src/akonadi-contacts/editor/contacteditorwidget.cpp (renamed from src/editor/contacteditorwidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/contacteditorwidget.h (renamed from src/editor/contacteditorwidget.h)0
-rw-r--r--src/akonadi-contacts/editor/customfieldeditor/autotests/CMakeLists.txt (renamed from src/editor/customfieldeditor/autotests/CMakeLists.txt)0
-rw-r--r--src/akonadi-contacts/editor/customfieldeditor/autotests/customfieldeditorwidgettest.cpp (renamed from src/editor/customfieldeditor/autotests/customfieldeditorwidgettest.cpp)0
-rw-r--r--src/akonadi-contacts/editor/customfieldeditor/autotests/customfieldeditorwidgettest.h (renamed from src/editor/customfieldeditor/autotests/customfieldeditorwidgettest.h)0
-rw-r--r--src/akonadi-contacts/editor/customfieldeditor/autotests/customfieldslistwidgettest.cpp (renamed from src/editor/customfieldeditor/autotests/customfieldslistwidgettest.cpp)0
-rw-r--r--src/akonadi-contacts/editor/customfieldeditor/autotests/customfieldslistwidgettest.h (renamed from src/editor/customfieldeditor/autotests/customfieldslistwidgettest.h)0
-rw-r--r--src/akonadi-contacts/editor/customfieldeditor/autotests/customfieldswidgettest.cpp (renamed from src/editor/customfieldeditor/autotests/customfieldswidgettest.cpp)0
-rw-r--r--src/akonadi-contacts/editor/customfieldeditor/autotests/customfieldswidgettest.h (renamed from src/editor/customfieldeditor/autotests/customfieldswidgettest.h)0
-rw-r--r--src/akonadi-contacts/editor/customfieldeditor/customfieldeditorwidget.cpp (renamed from src/editor/customfieldeditor/customfieldeditorwidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/customfieldeditor/customfieldeditorwidget.h (renamed from src/editor/customfieldeditor/customfieldeditorwidget.h)0
-rw-r--r--src/akonadi-contacts/editor/customfieldeditor/customfieldslistdelegate.cpp (renamed from src/editor/customfieldeditor/customfieldslistdelegate.cpp)0
-rw-r--r--src/akonadi-contacts/editor/customfieldeditor/customfieldslistdelegate.h (renamed from src/editor/customfieldeditor/customfieldslistdelegate.h)0
-rw-r--r--src/akonadi-contacts/editor/customfieldeditor/customfieldslistwidget.cpp (renamed from src/editor/customfieldeditor/customfieldslistwidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/customfieldeditor/customfieldslistwidget.h (renamed from src/editor/customfieldeditor/customfieldslistwidget.h)0
-rw-r--r--src/akonadi-contacts/editor/customfieldeditor/customfieldsmodel.cpp (renamed from src/editor/customfieldeditor/customfieldsmodel.cpp)0
-rw-r--r--src/akonadi-contacts/editor/customfieldeditor/customfieldsmodel.h (renamed from src/editor/customfieldeditor/customfieldsmodel.h)0
-rw-r--r--src/akonadi-contacts/editor/customfieldeditor/customfieldswidget.cpp (renamed from src/editor/customfieldeditor/customfieldswidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/customfieldeditor/customfieldswidget.h (renamed from src/editor/customfieldeditor/customfieldswidget.h)0
-rw-r--r--src/akonadi-contacts/editor/customfieldeditor/tests/CMakeLists.txt (renamed from src/editor/customfieldeditor/tests/CMakeLists.txt)0
-rw-r--r--src/akonadi-contacts/editor/customfieldeditor/tests/main.cpp (renamed from src/editor/customfieldeditor/tests/main.cpp)0
-rw-r--r--src/akonadi-contacts/editor/data/zone.tab (renamed from src/editor/data/zone.tab)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/akonadicontactselecttypecombobox.cpp (renamed from src/editor/generalinfoeditor/akonadicontactselecttypecombobox.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/akonadicontactselecttypecombobox.h (renamed from src/editor/generalinfoeditor/akonadicontactselecttypecombobox.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/autotests/CMakeLists.txt (renamed from src/editor/generalinfoeditor/autotests/CMakeLists.txt)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/autotests/akonadicontactselecttypecomboboxtest.cpp (renamed from src/editor/generalinfoeditor/autotests/akonadicontactselecttypecomboboxtest.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/autotests/akonadicontactselecttypecomboboxtest.h (renamed from src/editor/generalinfoeditor/autotests/akonadicontactselecttypecomboboxtest.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/autotests/mailwidgettest.cpp (renamed from src/editor/generalinfoeditor/autotests/mailwidgettest.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/autotests/mailwidgettest.h (renamed from src/editor/generalinfoeditor/autotests/mailwidgettest.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/autotests/messageformattingwidgettest.cpp (renamed from src/editor/generalinfoeditor/autotests/messageformattingwidgettest.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/autotests/messageformattingwidgettest.h (renamed from src/editor/generalinfoeditor/autotests/messageformattingwidgettest.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/autotests/messagingwidgettest.cpp (renamed from src/editor/generalinfoeditor/autotests/messagingwidgettest.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/autotests/messagingwidgettest.h (renamed from src/editor/generalinfoeditor/autotests/messagingwidgettest.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/autotests/nicknamewidgettest.cpp (renamed from src/editor/generalinfoeditor/autotests/nicknamewidgettest.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/autotests/nicknamewidgettest.h (renamed from src/editor/generalinfoeditor/autotests/nicknamewidgettest.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/autotests/phonewidgettest.cpp (renamed from src/editor/generalinfoeditor/autotests/phonewidgettest.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/autotests/phonewidgettest.h (renamed from src/editor/generalinfoeditor/autotests/phonewidgettest.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/categorieseditwidget.cpp (renamed from src/editor/generalinfoeditor/categorieseditwidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/categorieseditwidget.h (renamed from src/editor/generalinfoeditor/categorieseditwidget.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/displaynameeditwidget.cpp (renamed from src/editor/generalinfoeditor/displaynameeditwidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/displaynameeditwidget.h (renamed from src/editor/generalinfoeditor/displaynameeditwidget.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/generalinfowidget.cpp (renamed from src/editor/generalinfoeditor/generalinfowidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/generalinfowidget.h (renamed from src/editor/generalinfoeditor/generalinfowidget.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/mail/maillistwidget.cpp (renamed from src/editor/generalinfoeditor/mail/maillistwidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/mail/maillistwidget.h (renamed from src/editor/generalinfoeditor/mail/maillistwidget.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/mail/mailwidget.cpp (renamed from src/editor/generalinfoeditor/mail/mailwidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/mail/mailwidget.h (renamed from src/editor/generalinfoeditor/mail/mailwidget.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/mail/mailwidgetlister.cpp (renamed from src/editor/generalinfoeditor/mail/mailwidgetlister.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/mail/mailwidgetlister.h (renamed from src/editor/generalinfoeditor/mail/mailwidgetlister.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/messageformattingwidget.cpp (renamed from src/editor/generalinfoeditor/messageformattingwidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/messageformattingwidget.h (renamed from src/editor/generalinfoeditor/messageformattingwidget.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/messaging/messaginglistwidget.cpp (renamed from src/editor/generalinfoeditor/messaging/messaginglistwidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/messaging/messaginglistwidget.h (renamed from src/editor/generalinfoeditor/messaging/messaginglistwidget.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/messaging/messagingwidget.cpp (renamed from src/editor/generalinfoeditor/messaging/messagingwidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/messaging/messagingwidget.h (renamed from src/editor/generalinfoeditor/messaging/messagingwidget.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/messaging/messagingwidgetlister.cpp (renamed from src/editor/generalinfoeditor/messaging/messagingwidgetlister.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/messaging/messagingwidgetlister.h (renamed from src/editor/generalinfoeditor/messaging/messagingwidgetlister.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/nameeditdialog.cpp (renamed from src/editor/generalinfoeditor/nameeditdialog.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/nameeditdialog.h (renamed from src/editor/generalinfoeditor/nameeditdialog.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/namewidget.cpp (renamed from src/editor/generalinfoeditor/namewidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/namewidget.h (renamed from src/editor/generalinfoeditor/namewidget.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/nicknamewidget.cpp (renamed from src/editor/generalinfoeditor/nicknamewidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/nicknamewidget.h (renamed from src/editor/generalinfoeditor/nicknamewidget.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/phone/phonecomboboxtype.cpp (renamed from src/editor/generalinfoeditor/phone/phonecomboboxtype.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/phone/phonecomboboxtype.h (renamed from src/editor/generalinfoeditor/phone/phonecomboboxtype.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/phone/phonelistwidget.cpp (renamed from src/editor/generalinfoeditor/phone/phonelistwidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/phone/phonelistwidget.h (renamed from src/editor/generalinfoeditor/phone/phonelistwidget.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/phone/phonetypedialog.cpp (renamed from src/editor/generalinfoeditor/phone/phonetypedialog.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/phone/phonetypedialog.h (renamed from src/editor/generalinfoeditor/phone/phonetypedialog.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/phone/phonewidget.cpp (renamed from src/editor/generalinfoeditor/phone/phonewidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/phone/phonewidget.h (renamed from src/editor/generalinfoeditor/phone/phonewidget.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/phone/phonewidgetlister.cpp (renamed from src/editor/generalinfoeditor/phone/phonewidgetlister.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/phone/phonewidgetlister.h (renamed from src/editor/generalinfoeditor/phone/phonewidgetlister.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/tests/CMakeLists.txt (renamed from src/editor/generalinfoeditor/tests/CMakeLists.txt)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/tests/main.cpp (renamed from src/editor/generalinfoeditor/tests/main.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/web/weblistwidget.cpp (renamed from src/editor/generalinfoeditor/web/weblistwidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/web/weblistwidget.h (renamed from src/editor/generalinfoeditor/web/weblistwidget.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/web/webwidget.cpp (renamed from src/editor/generalinfoeditor/web/webwidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/web/webwidget.h (renamed from src/editor/generalinfoeditor/web/webwidget.h)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/web/webwidgetlister.cpp (renamed from src/editor/generalinfoeditor/web/webwidgetlister.cpp)0
-rw-r--r--src/akonadi-contacts/editor/generalinfoeditor/web/webwidgetlister.h (renamed from src/editor/generalinfoeditor/web/webwidgetlister.h)0
-rw-r--r--src/akonadi-contacts/editor/im/CMakeLists.txt (renamed from src/editor/im/CMakeLists.txt)0
-rw-r--r--src/akonadi-contacts/editor/im/imaddress.cpp (renamed from src/editor/im/imaddress.cpp)0
-rw-r--r--src/akonadi-contacts/editor/im/imaddress.h (renamed from src/editor/im/imaddress.h)0
-rw-r--r--src/akonadi-contacts/editor/im/improtocols.cpp (renamed from src/editor/im/improtocols.cpp)0
-rw-r--r--src/akonadi-contacts/editor/im/improtocols.h (renamed from src/editor/im/improtocols.h)0
-rw-r--r--src/akonadi-contacts/editor/im/kaddressbookimprotocol.desktop (renamed from src/editor/im/kaddressbookimprotocol.desktop)0
-rw-r--r--src/akonadi-contacts/editor/im/protocols/CMakeLists.txt (renamed from src/editor/im/protocols/CMakeLists.txt)0
-rw-r--r--src/akonadi-contacts/editor/im/protocols/aimprotocol.desktop (renamed from src/editor/im/protocols/aimprotocol.desktop)0
-rw-r--r--src/akonadi-contacts/editor/im/protocols/facebookprotocol.desktop (renamed from src/editor/im/protocols/facebookprotocol.desktop)0
-rw-r--r--src/akonadi-contacts/editor/im/protocols/gaduprotocol.desktop (renamed from src/editor/im/protocols/gaduprotocol.desktop)0
-rw-r--r--src/akonadi-contacts/editor/im/protocols/googletalkprotocol.desktop (renamed from src/editor/im/protocols/googletalkprotocol.desktop)0
-rw-r--r--src/akonadi-contacts/editor/im/protocols/groupwiseprotocol.desktop (renamed from src/editor/im/protocols/groupwiseprotocol.desktop)0
-rw-r--r--src/akonadi-contacts/editor/im/protocols/icqprotocol.desktop (renamed from src/editor/im/protocols/icqprotocol.desktop)0
-rw-r--r--src/akonadi-contacts/editor/im/protocols/ircprotocol.desktop (renamed from src/editor/im/protocols/ircprotocol.desktop)0
-rw-r--r--src/akonadi-contacts/editor/im/protocols/jabberprotocol.desktop (renamed from src/editor/im/protocols/jabberprotocol.desktop)0
-rw-r--r--src/akonadi-contacts/editor/im/protocols/meanwhileprotocol.desktop (renamed from src/editor/im/protocols/meanwhileprotocol.desktop)0
-rw-r--r--src/akonadi-contacts/editor/im/protocols/msnprotocol.desktop (renamed from src/editor/im/protocols/msnprotocol.desktop)0
-rw-r--r--src/akonadi-contacts/editor/im/protocols/skypeprotocol.desktop (renamed from src/editor/im/protocols/skypeprotocol.desktop)0
-rw-r--r--src/akonadi-contacts/editor/im/protocols/smsprotocol.desktop (renamed from src/editor/im/protocols/smsprotocol.desktop)0
-rw-r--r--src/akonadi-contacts/editor/im/protocols/twitterprotocol.desktop (renamed from src/editor/im/protocols/twitterprotocol.desktop)0
-rw-r--r--src/akonadi-contacts/editor/im/protocols/yahooprotocol.desktop (renamed from src/editor/im/protocols/yahooprotocol.desktop)0
-rw-r--r--src/akonadi-contacts/editor/personaleditor/dateeditwidget.cpp (renamed from src/editor/personaleditor/dateeditwidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/personaleditor/dateeditwidget.h (renamed from src/editor/personaleditor/dateeditwidget.h)0
-rw-r--r--src/akonadi-contacts/editor/personaleditor/kdatepickerpopup.cpp (renamed from src/editor/personaleditor/kdatepickerpopup.cpp)0
-rw-r--r--src/akonadi-contacts/editor/personaleditor/kdatepickerpopup_p.h (renamed from src/editor/personaleditor/kdatepickerpopup_p.h)0
-rw-r--r--src/akonadi-contacts/editor/personaleditor/personaleditorwidget.cpp (renamed from src/editor/personaleditor/personaleditorwidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/personaleditor/personaleditorwidget.h (renamed from src/editor/personaleditor/personaleditorwidget.h)0
-rw-r--r--src/akonadi-contacts/editor/pics/world.jpg (renamed from src/editor/pics/world.jpg)bin28526 -> 28526 bytes
-rw-r--r--src/akonadi-contacts/editor/utils/utils.cpp (renamed from src/editor/utils/utils.cpp)0
-rw-r--r--src/akonadi-contacts/editor/utils/utils.h (renamed from src/editor/utils/utils.h)0
-rw-r--r--src/akonadi-contacts/editor/widgets/akonadicontactcombobox.cpp (renamed from src/editor/widgets/akonadicontactcombobox.cpp)0
-rw-r--r--src/akonadi-contacts/editor/widgets/akonadicontactcombobox.h (renamed from src/editor/widgets/akonadicontactcombobox.h)0
-rw-r--r--src/akonadi-contacts/editor/widgets/autotests/CMakeLists.txt (renamed from src/editor/widgets/autotests/CMakeLists.txt)0
-rw-r--r--src/akonadi-contacts/editor/widgets/autotests/preferredlineeditwidgettest.cpp (renamed from src/editor/widgets/autotests/preferredlineeditwidgettest.cpp)0
-rw-r--r--src/akonadi-contacts/editor/widgets/autotests/preferredlineeditwidgettest.h (renamed from src/editor/widgets/autotests/preferredlineeditwidgettest.h)0
-rw-r--r--src/akonadi-contacts/editor/widgets/imagewidget.cpp (renamed from src/editor/widgets/imagewidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/widgets/imagewidget.h (renamed from src/editor/widgets/imagewidget.h)0
-rw-r--r--src/akonadi-contacts/editor/widgets/kwidgetlister.cpp (renamed from src/editor/widgets/kwidgetlister.cpp)0
-rw-r--r--src/akonadi-contacts/editor/widgets/kwidgetlister_p.h (renamed from src/editor/widgets/kwidgetlister_p.h)0
-rw-r--r--src/akonadi-contacts/editor/widgets/preferredlineeditwidget.cpp (renamed from src/editor/widgets/preferredlineeditwidget.cpp)0
-rw-r--r--src/akonadi-contacts/editor/widgets/preferredlineeditwidget.h (renamed from src/editor/widgets/preferredlineeditwidget.h)0
-rw-r--r--src/akonadi-contacts/emailaddressrequester.cpp (renamed from src/emailaddressrequester.cpp)0
-rw-r--r--src/akonadi-contacts/emailaddressrequester.h (renamed from src/emailaddressrequester.h)0
-rw-r--r--src/akonadi-contacts/emailaddressselection.cpp (renamed from src/emailaddressselection.cpp)0
-rw-r--r--src/akonadi-contacts/emailaddressselection.h (renamed from src/emailaddressselection.h)0
-rw-r--r--src/akonadi-contacts/emailaddressselection_p.h (renamed from src/emailaddressselection_p.h)0
-rw-r--r--src/akonadi-contacts/emailaddressselectiondialog.cpp (renamed from src/emailaddressselectiondialog.cpp)0
-rw-r--r--src/akonadi-contacts/emailaddressselectiondialog.h (renamed from src/emailaddressselectiondialog.h)0
-rw-r--r--src/akonadi-contacts/emailaddressselectionmodel.cpp (renamed from src/emailaddressselectionmodel.cpp)0
-rw-r--r--src/akonadi-contacts/emailaddressselectionmodel.h (renamed from src/emailaddressselectionmodel.h)0
-rw-r--r--src/akonadi-contacts/emailaddressselectionproxymodel.cpp (renamed from src/emailaddressselectionproxymodel.cpp)0
-rw-r--r--src/akonadi-contacts/emailaddressselectionproxymodel_p.h (renamed from src/emailaddressselectionproxymodel_p.h)0
-rw-r--r--src/akonadi-contacts/emailaddressselectionwidget.cpp (renamed from src/emailaddressselectionwidget.cpp)0
-rw-r--r--src/akonadi-contacts/emailaddressselectionwidget.h (renamed from src/emailaddressselectionwidget.h)0
-rw-r--r--src/akonadi-contacts/job/contactgroupexpandjob.cpp (renamed from src/job/contactgroupexpandjob.cpp)0
-rw-r--r--src/akonadi-contacts/job/contactgroupexpandjob.h (renamed from src/job/contactgroupexpandjob.h)0
-rw-r--r--src/akonadi-contacts/job/contactgroupsearchjob.cpp (renamed from src/job/contactgroupsearchjob.cpp)0
-rw-r--r--src/akonadi-contacts/job/contactgroupsearchjob.h (renamed from src/job/contactgroupsearchjob.h)0
-rw-r--r--src/akonadi-contacts/job/contactsearchjob.cpp (renamed from src/job/contactsearchjob.cpp)0
-rw-r--r--src/akonadi-contacts/job/contactsearchjob.h (renamed from src/job/contactsearchjob.h)0
-rw-r--r--src/akonadi-contacts/leafextensionproxymodel.cpp (renamed from src/leafextensionproxymodel.cpp)0
-rw-r--r--src/akonadi-contacts/leafextensionproxymodel_p.h (renamed from src/leafextensionproxymodel_p.h)0
-rw-r--r--src/akonadi-contacts/selectaddressbookdialog.cpp (renamed from src/selectaddressbookdialog.cpp)0
-rw-r--r--src/akonadi-contacts/selectaddressbookdialog.h (renamed from src/selectaddressbookdialog.h)0
-rw-r--r--src/akonadi-contacts/standardcontactactionmanager.cpp (renamed from src/standardcontactactionmanager.cpp)0
-rw-r--r--src/akonadi-contacts/standardcontactactionmanager.h (renamed from src/standardcontactactionmanager.h)0
-rw-r--r--src/akonadi-contacts/standardcontactformatter.cpp (renamed from src/standardcontactformatter.cpp)0
-rw-r--r--src/akonadi-contacts/standardcontactformatter.h (renamed from src/standardcontactformatter.h)0
-rw-r--r--src/akonadi-contacts/standardcontactgroupformatter.cpp (renamed from src/standardcontactgroupformatter.cpp)0
-rw-r--r--src/akonadi-contacts/standardcontactgroupformatter.h (renamed from src/standardcontactgroupformatter.h)0
-rw-r--r--src/akonadi-contacts/textbrowser.cpp (renamed from src/textbrowser.cpp)0
-rw-r--r--src/akonadi-contacts/textbrowser_p.h (renamed from src/textbrowser_p.h)0
-rw-r--r--src/akonadi-contacts/waitingoverlay.cpp (renamed from src/waitingoverlay.cpp)0
-rw-r--r--src/akonadi-contacts/waitingoverlay_p.h (renamed from src/waitingoverlay_p.h)0
264 files changed, 320 insertions, 319 deletions
diff --git a/kcm/CMakeLists.txt b/kcm/CMakeLists.txt
index ca4ab16..64c51af 100644
--- a/kcm/CMakeLists.txt
+++ b/kcm/CMakeLists.txt
@@ -7,8 +7,8 @@ set(kcm_akonadicontact_actions_SRCS
ki18n_wrap_ui(kcm_akonadicontact_actions_SRCS akonadicontactactions.ui)
-configure_file( ${Akonadi-Contact_SOURCE_DIR}/src/actions/contactactionssettings.kcfg.cmake ${CMAKE_CURRENT_BINARY_DIR}/contactactionssettings.kcfg @ONLY)
-kconfig_add_kcfg_files(kcm_akonadicontact_actions_SRCS ${Akonadi-Contact_SOURCE_DIR}/src/actions/contactactionssettings.kcfgc)
+configure_file( ${Akonadi-Contact_SOURCE_DIR}/src/akonadi-contacts/actions/contactactionssettings.kcfg.cmake ${CMAKE_CURRENT_BINARY_DIR}/contactactionssettings.kcfg @ONLY)
+kconfig_add_kcfg_files(kcm_akonadicontact_actions_SRCS ${Akonadi-Contact_SOURCE_DIR}/src/akonadi-contacts/actions/contactactionssettings.kcfgc)
add_library(kcm_akonadicontact_actions MODULE ${kcm_akonadicontact_actions_SRCS})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b3bacb8..e18ba8a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,317 +1 @@
-add_definitions(-DTRANSLATION_DOMAIN=\"akonadicontact5\")
-
-set( AKONADI_PHONE_DIAL_DEFAULT "UseSkype" )
-set( AKONADI_SEND_SMS_DEFAULT "UseSkypeSms" )
-
-add_subdirectory(editor/im)
-########### next target ###############
-
-set(akonadicontact_actions_SRCS
- actions/dialphonenumberaction.cpp
- actions/showaddressaction.cpp
- actions/qdialer.cpp
- actions/qskypedialer.cpp
- actions/sendsmsaction.cpp
- actions/smsdialog.cpp
- actions/qsflphonedialer.cpp
- actions/qekigadialer.cpp
- )
-
-configure_file(config-akonadi-contact.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-akonadi-contact.h)
-
-configure_file( actions/contactactionssettings.kcfg.cmake ${CMAKE_CURRENT_BINARY_DIR}/contactactionssettings.kcfg @ONLY)
-kconfig_add_kcfg_files(akonadicontact_actions_SRCS actions/contactactionssettings.kcfgc)
-
-set(akonadicontact_customfieldseditor_SRCS
- editor/customfieldeditor/customfieldswidget.cpp
- editor/customfieldeditor/customfieldeditorwidget.cpp
- editor/customfieldeditor/customfieldslistwidget.cpp
- editor/customfieldeditor/customfieldslistdelegate.cpp
- editor/customfieldeditor/customfieldsmodel.cpp
- )
-
-set(akonadicontact_editor_utils_SRCS
- editor/utils/utils.cpp
- )
-
-set(akonadicontact_editor_widgets_SRCS
- editor/widgets/kwidgetlister.cpp
- editor/widgets/akonadicontactcombobox.cpp
- )
-
-set(akonadicontact_editor_generalinfo_phone_SRCS
- editor/generalinfoeditor/phone/phonewidgetlister.cpp
- editor/generalinfoeditor/phone/phonewidget.cpp
- editor/generalinfoeditor/phone/phonelistwidget.cpp
- editor/generalinfoeditor/phone/phonecomboboxtype.cpp
- editor/generalinfoeditor/phone/phonetypedialog.cpp
- )
-
-set(akonadicontact_editor_generalinfo_web_SRCS
- editor/generalinfoeditor/web/webwidgetlister.cpp
- editor/generalinfoeditor/web/weblistwidget.cpp
- editor/generalinfoeditor/web/webwidget.cpp
- )
-set(akonadicontact_editor_generalinfo_mail_SRCS
- editor/generalinfoeditor/mail/maillistwidget.cpp
- editor/generalinfoeditor/mail/mailwidget.cpp
- editor/generalinfoeditor/mail/mailwidgetlister.cpp
- )
-
-set(akonadicontact_editor_generalinfo_messaging_SRCS
- editor/generalinfoeditor/messaging/messaginglistwidget.cpp
- editor/generalinfoeditor/messaging/messagingwidget.cpp
- editor/generalinfoeditor/messaging/messagingwidgetlister.cpp
- )
-
-
-set(akonadicontact_editor_generalinfo_SRCS
- editor/generalinfoeditor/generalinfowidget.cpp
- editor/generalinfoeditor/namewidget.cpp
- editor/generalinfoeditor/nicknamewidget.cpp
- editor/generalinfoeditor/categorieseditwidget.cpp
- editor/generalinfoeditor/nameeditdialog.cpp
- editor/generalinfoeditor/displaynameeditwidget.cpp
- editor/generalinfoeditor/akonadicontactselecttypecombobox.cpp
- editor/generalinfoeditor/messageformattingwidget.cpp
- ${akonadicontact_editor_generalinfo_messaging_SRCS}
- ${akonadicontact_editor_generalinfo_phone_SRCS}
- ${akonadicontact_editor_generalinfo_web_SRCS}
- ${akonadicontact_editor_generalinfo_mail_SRCS}
- )
-
-set(akonadicontact_addresslocation_web_editor_SRCS
- editor/addresseditor/webengine/addresseslocationengineviewer.cpp
- editor/addresseditor/webengine/addresseslocationenginepage.cpp
- )
-
-set(akonadicontact_addresslocation_editor_SRCS
- ${akonadicontact_addresslocation_web_editor_SRCS}
- editor/addresseditor/addresslocationwidget.cpp
- editor/addresseditor/addresseslocationgrantleeformater.cpp
- editor/addresseditor/addressgrantleeobject.cpp
- editor/addresseditor/iconnamecache.cpp
- editor/addresseditor/addresseslocationwidget.cpp
- editor/addresseditor/selectaddresstypecombobox.cpp
- editor/addresseditor/addresstypedialog.cpp
- )
-
-set(akonadicontact_personal_editor_SRCS
- editor/personaleditor/personaleditorwidget.cpp
- editor/personaleditor/dateeditwidget.cpp
- editor/personaleditor/kdatepickerpopup.cpp
- )
-
-set(akonadicontact_business_editor_SRCS
- editor/businesseditor/businesseditorwidget.cpp
- editor/businesseditor/freebusyeditwidget.cpp
- )
-
-set(akonadicontact_editor_SRCS
- ${akonadicontact_personal_editor_SRCS}
- ${akonadicontact_editor_utils_SRCS}
- ${akonadicontact_business_editor_SRCS}
- editor/contacteditorwidget.cpp
- editor/im/imaddress.cpp
- editor/im/improtocols.cpp
- editor/widgets/imagewidget.cpp
- editor/widgets/preferredlineeditwidget.cpp
- )
-
-set(akonadicontact_attributes_SRCS
- attributes/contactmetadataattribute.cpp
- attributes/attributeregistrar.cpp
-)
-
-set(akonadicontact_job_SRCS
- job/contactgroupexpandjob.cpp
- job/contactgroupsearchjob.cpp
- job/contactsearchjob.cpp
-)
-
-set(akonadicontact_LIB_SRC
- ${akonadicontact_addresslocation_editor_SRCS}
- ${akonadicontact_editor_widgets_SRCS}
- ${akonadicontact_editor_generalinfo_SRCS}
- ${akonadicontact_customfieldseditor_SRCS}
- ${akonadicontact_attributes_SRCS}
- ${akonadicontact_job_SRCS}
- abstractcontactformatter.cpp
- abstractcontactgroupformatter.cpp
- collectionfiltermodel.cpp
- contactcompletionmodel.cpp
- contactdefaultactions.cpp
- contacteditor.cpp
- contacteditordialog.cpp
- contactgroupeditor.cpp
- contactgroupeditordelegate.cpp
- contactgroupeditordialog.cpp
- contactgroupmodel.cpp
- contactgroupviewer.cpp
- contactgroupviewerdialog.cpp
- contactmetadataakonadi.cpp
- contactmetadatabase.cpp
- contactparts.cpp
- contactsfilterproxymodel.cpp
- contactstreemodel.cpp
- contactviewer.cpp
- contactviewerdialog.cpp
- customfields.cpp
- customfieldmanager.cpp
- emailaddressselection.cpp
- emailaddressselectiondialog.cpp
- emailaddressselectionproxymodel.cpp
- emailaddressselectionwidget.cpp
- emailaddressrequester.cpp
- emailaddressselectionmodel.cpp
- textbrowser.cpp
- leafextensionproxymodel.cpp
- standardcontactactionmanager.cpp
- standardcontactformatter.cpp
- standardcontactgroupformatter.cpp
- waitingoverlay.cpp
- selectaddressbookdialog.cpp
- ${akonadicontact_actions_SRCS}
- )
-
-ecm_qt_declare_logging_category(akonadicontact_LIB_SRC HEADER akonadi_contact_debug.h IDENTIFIER AKONADICONTACT_LOG CATEGORY_NAME org.kde.pim.akonadicontact)
-
-set(akonadicontact_LIB_SRC
- ${akonadicontact_LIB_SRC}
- ${akonadicontact_editor_SRCS}
- )
-
-ki18n_wrap_ui(akonadicontact_LIB_SRC contactgroupeditor.ui)
-
-
-add_library(KF5AkonadiContact ${akonadicontact_LIB_SRC})
-
-generate_export_header(KF5AkonadiContact BASE_NAME akonadi-contact)
-
-add_library(KF5::AkonadiContact ALIAS KF5AkonadiContact)
-
-target_include_directories(KF5AkonadiContact INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/Akonadi/Contact;${KDE_INSTALL_INCLUDEDIR_KF5}>")
-target_include_directories(KF5AkonadiContact INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/akonadi/contact>")
-target_include_directories(KF5AkonadiContact PUBLIC "$<BUILD_INTERFACE:${Akonadi-Contact_SOURCE_DIR}/src;${Akonadi-Contact_BINARY_DIR}/src>")
-
-target_link_libraries(KF5AkonadiContact
- PUBLIC
- KF5::AkonadiCore
- KF5::Contacts
- KF5::AkonadiWidgets
- Qt5::Widgets
- PRIVATE
- KF5::Completion
- KF5::ConfigCore
- KF5::ConfigWidgets
- KF5::IconThemes
- KF5::KIOWidgets
- KF5::Mime
- KF5::Codecs
- KF5::DBusAddons
- KF5::I18n
- KF5::Service
- KF5::TextWidgets
- KF5::WidgetsAddons
- KF5::XmlGui
- Grantlee5::Templates
- Qt5::WebEngine
- Qt5::WebEngineWidgets
- )
-
-if(KF5Prison_FOUND)
- target_link_libraries(KF5AkonadiContact PRIVATE KF5::Prison)
-endif()
-
-
-set_target_properties(KF5AkonadiContact PROPERTIES
- VERSION ${AKONADICONTACT_VERSION_STRING}
- SOVERSION ${AKONADICONTACT_SOVERSION}
- EXPORT_NAME AkonadiContact
- )
-
-install(TARGETS
- KF5AkonadiContact
- EXPORT KF5AkonadiContactTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
- )
-
-install(FILES editor/pics/world.jpg DESTINATION ${KDE_INSTALL_DATADIR_KF5}/akonadi/contact/pics)
-install(FILES editor/data/zone.tab DESTINATION ${KDE_INSTALL_DATADIR_KF5}/akonadi/contact/data)
-
-ecm_generate_pri_file(BASE_NAME AkonadiContact
- LIB_NAME KF5AkonadiContact
- DEPS "AkonadiCore Contacts" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/Akonadi/Contact
- )
-
-install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
-
-ecm_generate_headers(AkonadiContactJob_CamelCase_HEADERS
- HEADER_NAMES
- ContactGroupExpandJob
- ContactGroupSearchJob
- ContactSearchJob
- REQUIRED_HEADERS AkonadiContactJob_HEADERS
- PREFIX Akonadi/Contact
- RELATIVE job
- )
-
-
-
-ecm_generate_headers(AkonadiContact_CamelCase_HEADERS
- HEADER_NAMES
- AbstractContactFormatter
- AbstractContactGroupFormatter
- ContactDefaultActions
- ContactEditor
- ContactEditorDialog
- ContactGroupEditor
- ContactGroupEditorDialog
- ContactGroupViewer
- ContactGroupViewerDialog
- ContactsFilterProxyModel
- ContactsTreeModel
- ContactEditorPagePlugin
- ContactParts
- ContactViewer
- ContactViewerDialog
- EmailAddressSelection
- EmailAddressSelectionDialog
- EmailAddressSelectionWidget
- EmailAddressSelectionModel
- EmailAddressRequester
- StandardContactActionManager
- StandardContactFormatter
- StandardContactGroupFormatter
- SelectAddressBookDialog
-
- REQUIRED_HEADERS AkonadiContact_HEADERS
- PREFIX Akonadi/Contact
- )
-
-install( FILES
- ${AkonadiContact_CamelCase_HEADERS}
- ${AkonadiContactJob_CamelCase_HEADERS}
- DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/Akonadi/Contact COMPONENT Devel
- )
-
-install( FILES
- ${AkonadiContact_HEADERS}
- ${AkonadiContactJob_HEADERS}
- ${CMAKE_CURRENT_BINARY_DIR}/akonadi-contact_export.h
- editor/im/improtocols.h
- DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/akonadi/contact COMPONENT Devel
- )
-
-if (BUILD_TESTING)
- add_subdirectory(editor/addresseditor/autotests/)
- add_subdirectory(editor/addresseditor/tests)
- add_subdirectory(editor/generalinfoeditor/autotests/)
- add_subdirectory(editor/generalinfoeditor/tests)
- add_subdirectory(editor/customfieldeditor/autotests/)
- add_subdirectory(editor/customfieldeditor/tests)
- add_subdirectory(editor/widgets/autotests/)
-endif()
-
-
-add_subdirectory(editor/addresseditor/html)
-
+add_subdirectory(akonadi-contacts)
diff --git a/src/akonadi-contacts/CMakeLists.txt b/src/akonadi-contacts/CMakeLists.txt
new file mode 100644
index 0000000..b3bacb8
--- /dev/null
+++ b/src/akonadi-contacts/CMakeLists.txt
@@ -0,0 +1,317 @@
+add_definitions(-DTRANSLATION_DOMAIN=\"akonadicontact5\")
+
+set( AKONADI_PHONE_DIAL_DEFAULT "UseSkype" )
+set( AKONADI_SEND_SMS_DEFAULT "UseSkypeSms" )
+
+add_subdirectory(editor/im)
+########### next target ###############
+
+set(akonadicontact_actions_SRCS
+ actions/dialphonenumberaction.cpp
+ actions/showaddressaction.cpp
+ actions/qdialer.cpp
+ actions/qskypedialer.cpp
+ actions/sendsmsaction.cpp
+ actions/smsdialog.cpp
+ actions/qsflphonedialer.cpp
+ actions/qekigadialer.cpp
+ )
+
+configure_file(config-akonadi-contact.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-akonadi-contact.h)
+
+configure_file( actions/contactactionssettings.kcfg.cmake ${CMAKE_CURRENT_BINARY_DIR}/contactactionssettings.kcfg @ONLY)
+kconfig_add_kcfg_files(akonadicontact_actions_SRCS actions/contactactionssettings.kcfgc)
+
+set(akonadicontact_customfieldseditor_SRCS
+ editor/customfieldeditor/customfieldswidget.cpp
+ editor/customfieldeditor/customfieldeditorwidget.cpp
+ editor/customfieldeditor/customfieldslistwidget.cpp
+ editor/customfieldeditor/customfieldslistdelegate.cpp
+ editor/customfieldeditor/customfieldsmodel.cpp
+ )
+
+set(akonadicontact_editor_utils_SRCS
+ editor/utils/utils.cpp
+ )
+
+set(akonadicontact_editor_widgets_SRCS
+ editor/widgets/kwidgetlister.cpp
+ editor/widgets/akonadicontactcombobox.cpp
+ )
+
+set(akonadicontact_editor_generalinfo_phone_SRCS
+ editor/generalinfoeditor/phone/phonewidgetlister.cpp
+ editor/generalinfoeditor/phone/phonewidget.cpp
+ editor/generalinfoeditor/phone/phonelistwidget.cpp
+ editor/generalinfoeditor/phone/phonecomboboxtype.cpp
+ editor/generalinfoeditor/phone/phonetypedialog.cpp
+ )
+
+set(akonadicontact_editor_generalinfo_web_SRCS
+ editor/generalinfoeditor/web/webwidgetlister.cpp
+ editor/generalinfoeditor/web/weblistwidget.cpp
+ editor/generalinfoeditor/web/webwidget.cpp
+ )
+set(akonadicontact_editor_generalinfo_mail_SRCS
+ editor/generalinfoeditor/mail/maillistwidget.cpp
+ editor/generalinfoeditor/mail/mailwidget.cpp
+ editor/generalinfoeditor/mail/mailwidgetlister.cpp
+ )
+
+set(akonadicontact_editor_generalinfo_messaging_SRCS
+ editor/generalinfoeditor/messaging/messaginglistwidget.cpp
+ editor/generalinfoeditor/messaging/messagingwidget.cpp
+ editor/generalinfoeditor/messaging/messagingwidgetlister.cpp
+ )
+
+
+set(akonadicontact_editor_generalinfo_SRCS
+ editor/generalinfoeditor/generalinfowidget.cpp
+ editor/generalinfoeditor/namewidget.cpp
+ editor/generalinfoeditor/nicknamewidget.cpp
+ editor/generalinfoeditor/categorieseditwidget.cpp
+ editor/generalinfoeditor/nameeditdialog.cpp
+ editor/generalinfoeditor/displaynameeditwidget.cpp
+ editor/generalinfoeditor/akonadicontactselecttypecombobox.cpp
+ editor/generalinfoeditor/messageformattingwidget.cpp
+ ${akonadicontact_editor_generalinfo_messaging_SRCS}
+ ${akonadicontact_editor_generalinfo_phone_SRCS}
+ ${akonadicontact_editor_generalinfo_web_SRCS}
+ ${akonadicontact_editor_generalinfo_mail_SRCS}
+ )
+
+set(akonadicontact_addresslocation_web_editor_SRCS
+ editor/addresseditor/webengine/addresseslocationengineviewer.cpp
+ editor/addresseditor/webengine/addresseslocationenginepage.cpp
+ )
+
+set(akonadicontact_addresslocation_editor_SRCS
+ ${akonadicontact_addresslocation_web_editor_SRCS}
+ editor/addresseditor/addresslocationwidget.cpp
+ editor/addresseditor/addresseslocationgrantleeformater.cpp
+ editor/addresseditor/addressgrantleeobject.cpp
+ editor/addresseditor/iconnamecache.cpp
+ editor/addresseditor/addresseslocationwidget.cpp
+ editor/addresseditor/selectaddresstypecombobox.cpp
+ editor/addresseditor/addresstypedialog.cpp
+ )
+
+set(akonadicontact_personal_editor_SRCS
+ editor/personaleditor/personaleditorwidget.cpp
+ editor/personaleditor/dateeditwidget.cpp
+ editor/personaleditor/kdatepickerpopup.cpp
+ )
+
+set(akonadicontact_business_editor_SRCS
+ editor/businesseditor/businesseditorwidget.cpp
+ editor/businesseditor/freebusyeditwidget.cpp
+ )
+
+set(akonadicontact_editor_SRCS
+ ${akonadicontact_personal_editor_SRCS}
+ ${akonadicontact_editor_utils_SRCS}
+ ${akonadicontact_business_editor_SRCS}
+ editor/contacteditorwidget.cpp
+ editor/im/imaddress.cpp
+ editor/im/improtocols.cpp
+ editor/widgets/imagewidget.cpp
+ editor/widgets/preferredlineeditwidget.cpp
+ )
+
+set(akonadicontact_attributes_SRCS
+ attributes/contactmetadataattribute.cpp
+ attributes/attributeregistrar.cpp
+)
+
+set(akonadicontact_job_SRCS
+ job/contactgroupexpandjob.cpp
+ job/contactgroupsearchjob.cpp
+ job/contactsearchjob.cpp
+)
+
+set(akonadicontact_LIB_SRC
+ ${akonadicontact_addresslocation_editor_SRCS}
+ ${akonadicontact_editor_widgets_SRCS}
+ ${akonadicontact_editor_generalinfo_SRCS}
+ ${akonadicontact_customfieldseditor_SRCS}
+ ${akonadicontact_attributes_SRCS}
+ ${akonadicontact_job_SRCS}
+ abstractcontactformatter.cpp
+ abstractcontactgroupformatter.cpp
+ collectionfiltermodel.cpp
+ contactcompletionmodel.cpp
+ contactdefaultactions.cpp
+ contacteditor.cpp
+ contacteditordialog.cpp
+ contactgroupeditor.cpp
+ contactgroupeditordelegate.cpp
+ contactgroupeditordialog.cpp
+ contactgroupmodel.cpp
+ contactgroupviewer.cpp
+ contactgroupviewerdialog.cpp
+ contactmetadataakonadi.cpp
+ contactmetadatabase.cpp
+ contactparts.cpp
+ contactsfilterproxymodel.cpp
+ contactstreemodel.cpp
+ contactviewer.cpp
+ contactviewerdialog.cpp
+ customfields.cpp
+ customfieldmanager.cpp
+ emailaddressselection.cpp
+ emailaddressselectiondialog.cpp
+ emailaddressselectionproxymodel.cpp
+ emailaddressselectionwidget.cpp
+ emailaddressrequester.cpp
+ emailaddressselectionmodel.cpp
+ textbrowser.cpp
+ leafextensionproxymodel.cpp
+ standardcontactactionmanager.cpp
+ standardcontactformatter.cpp
+ standardcontactgroupformatter.cpp
+ waitingoverlay.cpp
+ selectaddressbookdialog.cpp
+ ${akonadicontact_actions_SRCS}
+ )
+
+ecm_qt_declare_logging_category(akonadicontact_LIB_SRC HEADER akonadi_contact_debug.h IDENTIFIER AKONADICONTACT_LOG CATEGORY_NAME org.kde.pim.akonadicontact)
+
+set(akonadicontact_LIB_SRC
+ ${akonadicontact_LIB_SRC}
+ ${akonadicontact_editor_SRCS}
+ )
+
+ki18n_wrap_ui(akonadicontact_LIB_SRC contactgroupeditor.ui)
+
+
+add_library(KF5AkonadiContact ${akonadicontact_LIB_SRC})
+
+generate_export_header(KF5AkonadiContact BASE_NAME akonadi-contact)
+
+add_library(KF5::AkonadiContact ALIAS KF5AkonadiContact)
+
+target_include_directories(KF5AkonadiContact INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/Akonadi/Contact;${KDE_INSTALL_INCLUDEDIR_KF5}>")
+target_include_directories(KF5AkonadiContact INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/akonadi/contact>")
+target_include_directories(KF5AkonadiContact PUBLIC "$<BUILD_INTERFACE:${Akonadi-Contact_SOURCE_DIR}/src;${Akonadi-Contact_BINARY_DIR}/src>")
+
+target_link_libraries(KF5AkonadiContact
+ PUBLIC
+ KF5::AkonadiCore
+ KF5::Contacts
+ KF5::AkonadiWidgets
+ Qt5::Widgets
+ PRIVATE
+ KF5::Completion
+ KF5::ConfigCore
+ KF5::ConfigWidgets
+ KF5::IconThemes
+ KF5::KIOWidgets
+ KF5::Mime
+ KF5::Codecs
+ KF5::DBusAddons
+ KF5::I18n
+ KF5::Service
+ KF5::TextWidgets
+ KF5::WidgetsAddons
+ KF5::XmlGui
+ Grantlee5::Templates
+ Qt5::WebEngine
+ Qt5::WebEngineWidgets
+ )
+
+if(KF5Prison_FOUND)
+ target_link_libraries(KF5AkonadiContact PRIVATE KF5::Prison)
+endif()
+
+
+set_target_properties(KF5AkonadiContact PROPERTIES
+ VERSION ${AKONADICONTACT_VERSION_STRING}
+ SOVERSION ${AKONADICONTACT_SOVERSION}
+ EXPORT_NAME AkonadiContact
+ )
+
+install(TARGETS
+ KF5AkonadiContact
+ EXPORT KF5AkonadiContactTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
+ )
+
+install(FILES editor/pics/world.jpg DESTINATION ${KDE_INSTALL_DATADIR_KF5}/akonadi/contact/pics)
+install(FILES editor/data/zone.tab DESTINATION ${KDE_INSTALL_DATADIR_KF5}/akonadi/contact/data)
+
+ecm_generate_pri_file(BASE_NAME AkonadiContact
+ LIB_NAME KF5AkonadiContact
+ DEPS "AkonadiCore Contacts" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/Akonadi/Contact
+ )
+
+install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
+
+ecm_generate_headers(AkonadiContactJob_CamelCase_HEADERS
+ HEADER_NAMES
+ ContactGroupExpandJob
+ ContactGroupSearchJob
+ ContactSearchJob
+ REQUIRED_HEADERS AkonadiContactJob_HEADERS
+ PREFIX Akonadi/Contact
+ RELATIVE job
+ )
+
+
+
+ecm_generate_headers(AkonadiContact_CamelCase_HEADERS
+ HEADER_NAMES
+ AbstractContactFormatter
+ AbstractContactGroupFormatter
+ ContactDefaultActions
+ ContactEditor
+ ContactEditorDialog
+ ContactGroupEditor
+ ContactGroupEditorDialog
+ ContactGroupViewer
+ ContactGroupViewerDialog
+ ContactsFilterProxyModel
+ ContactsTreeModel
+ ContactEditorPagePlugin
+ ContactParts
+ ContactViewer
+ ContactViewerDialog
+ EmailAddressSelection
+ EmailAddressSelectionDialog
+ EmailAddressSelectionWidget
+ EmailAddressSelectionModel
+ EmailAddressRequester
+ StandardContactActionManager
+ StandardContactFormatter
+ StandardContactGroupFormatter
+ SelectAddressBookDialog
+
+ REQUIRED_HEADERS AkonadiContact_HEADERS
+ PREFIX Akonadi/Contact
+ )
+
+install( FILES
+ ${AkonadiContact_CamelCase_HEADERS}
+ ${AkonadiContactJob_CamelCase_HEADERS}
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/Akonadi/Contact COMPONENT Devel
+ )
+
+install( FILES
+ ${AkonadiContact_HEADERS}
+ ${AkonadiContactJob_HEADERS}
+ ${CMAKE_CURRENT_BINARY_DIR}/akonadi-contact_export.h
+ editor/im/improtocols.h
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/akonadi/contact COMPONENT Devel
+ )
+
+if (BUILD_TESTING)
+ add_subdirectory(editor/addresseditor/autotests/)
+ add_subdirectory(editor/addresseditor/tests)
+ add_subdirectory(editor/generalinfoeditor/autotests/)
+ add_subdirectory(editor/generalinfoeditor/tests)
+ add_subdirectory(editor/customfieldeditor/autotests/)
+ add_subdirectory(editor/customfieldeditor/tests)
+ add_subdirectory(editor/widgets/autotests/)
+endif()
+
+
+add_subdirectory(editor/addresseditor/html)
+
diff --git a/src/abstractcontacteditorwidget_p.h b/src/akonadi-contacts/abstractcontacteditorwidget_p.h
index 28df363..28df363 100644
--- a/src/abstractcontacteditorwidget_p.h
+++ b/src/akonadi-contacts/abstractcontacteditorwidget_p.h
diff --git a/src/abstractcontactformatter.cpp b/src/akonadi-contacts/abstractcontactformatter.cpp
index 78b9c10..78b9c10 100644
--- a/src/abstractcontactformatter.cpp
+++ b/src/akonadi-contacts/abstractcontactformatter.cpp
diff --git a/src/abstractcontactformatter.h b/src/akonadi-contacts/abstractcontactformatter.h
index 9e20e17..9e20e17 100644
--- a/src/abstractcontactformatter.h
+++ b/src/akonadi-contacts/abstractcontactformatter.h
diff --git a/src/abstractcontactgroupformatter.cpp b/src/akonadi-contacts/abstractcontactgroupformatter.cpp
index 792b1a9..792b1a9 100644
--- a/src/abstractcontactgroupformatter.cpp
+++ b/src/akonadi-contacts/abstractcontactgroupformatter.cpp
diff --git a/src/abstractcontactgroupformatter.h b/src/akonadi-contacts/abstractcontactgroupformatter.h
index b9349a3..b9349a3 100644
--- a/src/abstractcontactgroupformatter.h
+++ b/src/akonadi-contacts/abstractcontactgroupformatter.h
diff --git a/src/actions/contactactionssettings.kcfg.cmake b/src/akonadi-contacts/actions/contactactionssettings.kcfg.cmake
index 80e5f89..80e5f89 100644
--- a/src/actions/contactactionssettings.kcfg.cmake
+++ b/src/akonadi-contacts/actions/contactactionssettings.kcfg.cmake
diff --git a/src/actions/contactactionssettings.kcfgc b/src/akonadi-contacts/actions/contactactionssettings.kcfgc
index 3254b7a..3254b7a 100644
--- a/src/actions/contactactionssettings.kcfgc
+++ b/src/akonadi-contacts/actions/contactactionssettings.kcfgc
diff --git a/src/actions/dialphonenumberaction.cpp b/src/akonadi-contacts/actions/dialphonenumberaction.cpp
index c03ea2f..c03ea2f 100644
--- a/src/actions/dialphonenumberaction.cpp
+++ b/src/akonadi-contacts/actions/dialphonenumberaction.cpp
diff --git a/src/actions/dialphonenumberaction.h b/src/akonadi-contacts/actions/dialphonenumberaction.h
index f4958cf..f4958cf 100644
--- a/src/actions/dialphonenumberaction.h
+++ b/src/akonadi-contacts/actions/dialphonenumberaction.h
diff --git a/src/actions/qdialer.cpp b/src/akonadi-contacts/actions/qdialer.cpp
index bae73de..bae73de 100644
--- a/src/actions/qdialer.cpp
+++ b/src/akonadi-contacts/actions/qdialer.cpp
diff --git a/src/actions/qdialer.h b/src/akonadi-contacts/actions/qdialer.h
index 9692a05..9692a05 100644
--- a/src/actions/qdialer.h
+++ b/src/akonadi-contacts/actions/qdialer.h
diff --git a/src/actions/qekigadialer.cpp b/src/akonadi-contacts/actions/qekigadialer.cpp
index 2ad9b30..2ad9b30 100644
--- a/src/actions/qekigadialer.cpp
+++ b/src/akonadi-contacts/actions/qekigadialer.cpp
diff --git a/src/actions/qekigadialer.h b/src/akonadi-contacts/actions/qekigadialer.h
index 2e3dffc..2e3dffc 100644
--- a/src/actions/qekigadialer.h
+++ b/src/akonadi-contacts/actions/qekigadialer.h
diff --git a/src/actions/qsflphonedialer.cpp b/src/akonadi-contacts/actions/qsflphonedialer.cpp
index a2d4779..a2d4779 100644
--- a/src/actions/qsflphonedialer.cpp
+++ b/src/akonadi-contacts/actions/qsflphonedialer.cpp
diff --git a/src/actions/qsflphonedialer.h b/src/akonadi-contacts/actions/qsflphonedialer.h
index ffba604..ffba604 100644
--- a/src/actions/qsflphonedialer.h
+++ b/src/akonadi-contacts/actions/qsflphonedialer.h
diff --git a/src/actions/qskypedialer.cpp b/src/akonadi-contacts/actions/qskypedialer.cpp
index e358284..e358284 100644
--- a/src/actions/qskypedialer.cpp
+++ b/src/akonadi-contacts/actions/qskypedialer.cpp
diff --git a/src/actions/qskypedialer.h b/src/akonadi-contacts/actions/qskypedialer.h
index cc2fc5e..cc2fc5e 100644
--- a/src/actions/qskypedialer.h
+++ b/src/akonadi-contacts/actions/qskypedialer.h
diff --git a/src/actions/sendsmsaction.cpp b/src/akonadi-contacts/actions/sendsmsaction.cpp
index ba65191..ba65191 100644
--- a/src/actions/sendsmsaction.cpp
+++ b/src/akonadi-contacts/actions/sendsmsaction.cpp
diff --git a/src/actions/sendsmsaction.h b/src/akonadi-contacts/actions/sendsmsaction.h
index 29a0171..29a0171 100644
--- a/src/actions/sendsmsaction.h
+++ b/src/akonadi-contacts/actions/sendsmsaction.h
diff --git a/src/actions/showaddressaction.cpp b/src/akonadi-contacts/actions/showaddressaction.cpp
index 7c0e773..7c0e773 100644
--- a/src/actions/showaddressaction.cpp
+++ b/src/akonadi-contacts/actions/showaddressaction.cpp
diff --git a/src/actions/showaddressaction.h b/src/akonadi-contacts/actions/showaddressaction.h
index 3ee5e83..3ee5e83 100644
--- a/src/actions/showaddressaction.h
+++ b/src/akonadi-contacts/actions/showaddressaction.h
diff --git a/src/actions/smsdialog.cpp b/src/akonadi-contacts/actions/smsdialog.cpp
index 5519375..5519375 100644
--- a/src/actions/smsdialog.cpp
+++ b/src/akonadi-contacts/actions/smsdialog.cpp
diff --git a/src/actions/smsdialog.h b/src/akonadi-contacts/actions/smsdialog.h
index 5f7e025..5f7e025 100644
--- a/src/actions/smsdialog.h
+++ b/src/akonadi-contacts/actions/smsdialog.h
diff --git a/src/akonadicontact_private_export.h b/src/akonadi-contacts/akonadicontact_private_export.h
index 9ee5be3..9ee5be3 100644
--- a/src/akonadicontact_private_export.h
+++ b/src/akonadi-contacts/akonadicontact_private_export.h
diff --git a/src/attributes/attributeregistrar.cpp b/src/akonadi-contacts/attributes/attributeregistrar.cpp
index f337f80..f337f80 100644
--- a/src/attributes/attributeregistrar.cpp
+++ b/src/akonadi-contacts/attributes/attributeregistrar.cpp
diff --git a/src/attributes/contactmetadataattribute.cpp b/src/akonadi-contacts/attributes/contactmetadataattribute.cpp
index cd4ac96..cd4ac96 100644
--- a/src/attributes/contactmetadataattribute.cpp
+++ b/src/akonadi-contacts/attributes/contactmetadataattribute.cpp
diff --git a/src/attributes/contactmetadataattribute_p.h b/src/akonadi-contacts/attributes/contactmetadataattribute_p.h
index 249afc3..249afc3 100644
--- a/src/attributes/contactmetadataattribute_p.h
+++ b/src/akonadi-contacts/attributes/contactmetadataattribute_p.h
diff --git a/src/autoqpointer_p.h b/src/akonadi-contacts/autoqpointer_p.h
index 6a371a6..6a371a6 100644
--- a/src/autoqpointer_p.h
+++ b/src/akonadi-contacts/autoqpointer_p.h
diff --git a/src/collectionfiltermodel.cpp b/src/akonadi-contacts/collectionfiltermodel.cpp
index aa3e3e9..aa3e3e9 100644
--- a/src/collectionfiltermodel.cpp
+++ b/src/akonadi-contacts/collectionfiltermodel.cpp
diff --git a/src/collectionfiltermodel_p.h b/src/akonadi-contacts/collectionfiltermodel_p.h
index 0976203..0976203 100644
--- a/src/collectionfiltermodel_p.h
+++ b/src/akonadi-contacts/collectionfiltermodel_p.h
diff --git a/src/config-akonadi-contact.h.cmake b/src/akonadi-contacts/config-akonadi-contact.h.cmake
index 1b213de..1b213de 100644
--- a/src/config-akonadi-contact.h.cmake
+++ b/src/akonadi-contacts/config-akonadi-contact.h.cmake
diff --git a/src/contactcompletionmodel.cpp b/src/akonadi-contacts/contactcompletionmodel.cpp
index 0461015..0461015 100644
--- a/src/contactcompletionmodel.cpp
+++ b/src/akonadi-contacts/contactcompletionmodel.cpp
diff --git a/src/contactcompletionmodel_p.h b/src/akonadi-contacts/contactcompletionmodel_p.h
index 387fe29..387fe29 100644
--- a/src/contactcompletionmodel_p.h
+++ b/src/akonadi-contacts/contactcompletionmodel_p.h
diff --git a/src/contactdefaultactions.cpp b/src/akonadi-contacts/contactdefaultactions.cpp
index 0d017dd..0d017dd 100644
--- a/src/contactdefaultactions.cpp
+++ b/src/akonadi-contacts/contactdefaultactions.cpp
diff --git a/src/contactdefaultactions.h b/src/akonadi-contacts/contactdefaultactions.h
index e913693..e913693 100644
--- a/src/contactdefaultactions.h
+++ b/src/akonadi-contacts/contactdefaultactions.h
diff --git a/src/contacteditor.cpp b/src/akonadi-contacts/contacteditor.cpp
index 7daeae2..7daeae2 100644
--- a/src/contacteditor.cpp
+++ b/src/akonadi-contacts/contacteditor.cpp
diff --git a/src/contacteditor.h b/src/akonadi-contacts/contacteditor.h
index 616a542..616a542 100644
--- a/src/contacteditor.h
+++ b/src/akonadi-contacts/contacteditor.h
diff --git a/src/contacteditordialog.cpp b/src/akonadi-contacts/contacteditordialog.cpp
index cdc1fe1..cdc1fe1 100644
--- a/src/contacteditordialog.cpp
+++ b/src/akonadi-contacts/contacteditordialog.cpp
diff --git a/src/contacteditordialog.h b/src/akonadi-contacts/contacteditordialog.h
index ca47d1d..ca47d1d 100644
--- a/src/contacteditordialog.h
+++ b/src/akonadi-contacts/contacteditordialog.h
diff --git a/src/contacteditorpageplugin.h b/src/akonadi-contacts/contacteditorpageplugin.h
index a3a6f73..a3a6f73 100644
--- a/src/contacteditorpageplugin.h
+++ b/src/akonadi-contacts/contacteditorpageplugin.h
diff --git a/src/contactgroupeditor.cpp b/src/akonadi-contacts/contactgroupeditor.cpp
index 222609d..222609d 100644
--- a/src/contactgroupeditor.cpp
+++ b/src/akonadi-contacts/contactgroupeditor.cpp
diff --git a/src/contactgroupeditor.h b/src/akonadi-contacts/contactgroupeditor.h
index bc229ee..bc229ee 100644
--- a/src/contactgroupeditor.h
+++ b/src/akonadi-contacts/contactgroupeditor.h
diff --git a/src/contactgroupeditor.ui b/src/akonadi-contacts/contactgroupeditor.ui
index 826ad40..826ad40 100644
--- a/src/contactgroupeditor.ui
+++ b/src/akonadi-contacts/contactgroupeditor.ui
diff --git a/src/contactgroupeditor_p.h b/src/akonadi-contacts/contactgroupeditor_p.h
index 751e048..751e048 100644
--- a/src/contactgroupeditor_p.h
+++ b/src/akonadi-contacts/contactgroupeditor_p.h
diff --git a/src/contactgroupeditordelegate.cpp b/src/akonadi-contacts/contactgroupeditordelegate.cpp
index 759880b..759880b 100644
--- a/src/contactgroupeditordelegate.cpp
+++ b/src/akonadi-contacts/contactgroupeditordelegate.cpp
diff --git a/src/contactgroupeditordelegate_p.h b/src/akonadi-contacts/contactgroupeditordelegate_p.h
index 6e33999..6e33999 100644
--- a/src/contactgroupeditordelegate_p.h
+++ b/src/akonadi-contacts/contactgroupeditordelegate_p.h
diff --git a/src/contactgroupeditordialog.cpp b/src/akonadi-contacts/contactgroupeditordialog.cpp
index 3aad215..3aad215 100644
--- a/src/contactgroupeditordialog.cpp
+++ b/src/akonadi-contacts/contactgroupeditordialog.cpp
diff --git a/src/contactgroupeditordialog.h b/src/akonadi-contacts/contactgroupeditordialog.h
index 3e2e32d..3e2e32d 100644
--- a/src/contactgroupeditordialog.h
+++ b/src/akonadi-contacts/contactgroupeditordialog.h
diff --git a/src/contactgroupmodel.cpp b/src/akonadi-contacts/contactgroupmodel.cpp
index 1b87826..1b87826 100644
--- a/src/contactgroupmodel.cpp
+++ b/src/akonadi-contacts/contactgroupmodel.cpp
diff --git a/src/contactgroupmodel_p.h b/src/akonadi-contacts/contactgroupmodel_p.h
index bb9b364..bb9b364 100644
--- a/src/contactgroupmodel_p.h
+++ b/src/akonadi-contacts/contactgroupmodel_p.h
diff --git a/src/contactgroupviewer.cpp b/src/akonadi-contacts/contactgroupviewer.cpp
index b824e02..b824e02 100644
--- a/src/contactgroupviewer.cpp
+++ b/src/akonadi-contacts/contactgroupviewer.cpp
diff --git a/src/contactgroupviewer.h b/src/akonadi-contacts/contactgroupviewer.h
index b55923f..b55923f 100644
--- a/src/contactgroupviewer.h
+++ b/src/akonadi-contacts/contactgroupviewer.h
diff --git a/src/contactgroupviewerdialog.cpp b/src/akonadi-contacts/contactgroupviewerdialog.cpp
index fc9644a..fc9644a 100644
--- a/src/contactgroupviewerdialog.cpp
+++ b/src/akonadi-contacts/contactgroupviewerdialog.cpp
diff --git a/src/contactgroupviewerdialog.h b/src/akonadi-contacts/contactgroupviewerdialog.h
index a18f43f..a18f43f 100644
--- a/src/contactgroupviewerdialog.h
+++ b/src/akonadi-contacts/contactgroupviewerdialog.h
diff --git a/src/contactmetadataakonadi.cpp b/src/akonadi-contacts/contactmetadataakonadi.cpp
index 902b5b6..902b5b6 100644
--- a/src/contactmetadataakonadi.cpp
+++ b/src/akonadi-contacts/contactmetadataakonadi.cpp
diff --git a/src/contactmetadataakonadi_p.h b/src/akonadi-contacts/contactmetadataakonadi_p.h
index b2d19a8..b2d19a8 100644
--- a/src/contactmetadataakonadi_p.h
+++ b/src/akonadi-contacts/contactmetadataakonadi_p.h
diff --git a/src/contactmetadatabase.cpp b/src/akonadi-contacts/contactmetadatabase.cpp
index c150e3d..c150e3d 100644
--- a/src/contactmetadatabase.cpp
+++ b/src/akonadi-contacts/contactmetadatabase.cpp
diff --git a/src/contactmetadatabase_p.h b/src/akonadi-contacts/contactmetadatabase_p.h
index 41e1231..41e1231 100644
--- a/src/contactmetadatabase_p.h
+++ b/src/akonadi-contacts/contactmetadatabase_p.h
diff --git a/src/contactparts.cpp b/src/akonadi-contacts/contactparts.cpp
index c46ea4d..c46ea4d 100644
--- a/src/contactparts.cpp
+++ b/src/akonadi-contacts/contactparts.cpp
diff --git a/src/contactparts.h b/src/akonadi-contacts/contactparts.h
index ab46d64..ab46d64 100644
--- a/src/contactparts.h
+++ b/src/akonadi-contacts/contactparts.h
diff --git a/src/contactsfilterproxymodel.cpp b/src/akonadi-contacts/contactsfilterproxymodel.cpp
index 70548a7..70548a7 100644
--- a/src/contactsfilterproxymodel.cpp
+++ b/src/akonadi-contacts/contactsfilterproxymodel.cpp
diff --git a/src/contactsfilterproxymodel.h b/src/akonadi-contacts/contactsfilterproxymodel.h
index 4695600..4695600 100644
--- a/src/contactsfilterproxymodel.h
+++ b/src/akonadi-contacts/contactsfilterproxymodel.h
diff --git a/src/contactstreemodel.cpp b/src/akonadi-contacts/contactstreemodel.cpp
index bf50aea..bf50aea 100644
--- a/src/contactstreemodel.cpp
+++ b/src/akonadi-contacts/contactstreemodel.cpp
diff --git a/src/contactstreemodel.h b/src/akonadi-contacts/contactstreemodel.h
index 8735f8a..8735f8a 100644
--- a/src/contactstreemodel.h
+++ b/src/akonadi-contacts/contactstreemodel.h
diff --git a/src/contactviewer.cpp b/src/akonadi-contacts/contactviewer.cpp
index 5636e7d..5636e7d 100644
--- a/src/contactviewer.cpp
+++ b/src/akonadi-contacts/contactviewer.cpp
diff --git a/src/contactviewer.h b/src/akonadi-contacts/contactviewer.h
index 7ee502b..7ee502b 100644
--- a/src/contactviewer.h
+++ b/src/akonadi-contacts/contactviewer.h
diff --git a/src/contactviewerdialog.cpp b/src/akonadi-contacts/contactviewerdialog.cpp
index 8806861..8806861 100644
--- a/src/contactviewerdialog.cpp
+++ b/src/akonadi-contacts/contactviewerdialog.cpp
diff --git a/src/contactviewerdialog.h b/src/akonadi-contacts/contactviewerdialog.h
index af8bc0a..af8bc0a 100644
--- a/src/contactviewerdialog.h
+++ b/src/akonadi-contacts/contactviewerdialog.h
diff --git a/src/customfieldmanager.cpp b/src/akonadi-contacts/customfieldmanager.cpp
index 80eba4f..80eba4f 100644
--- a/src/customfieldmanager.cpp
+++ b/src/akonadi-contacts/customfieldmanager.cpp
diff --git a/src/customfieldmanager_p.h b/src/akonadi-contacts/customfieldmanager_p.h
index 40c4580..40c4580 100644
--- a/src/customfieldmanager_p.h
+++ b/src/akonadi-contacts/customfieldmanager_p.h
diff --git a/src/customfields.cpp b/src/akonadi-contacts/customfields.cpp
index 4645181..4645181 100644
--- a/src/customfields.cpp
+++ b/src/akonadi-contacts/customfields.cpp
diff --git a/src/customfields_p.h b/src/akonadi-contacts/customfields_p.h
index 0dbea06..0dbea06 100644
--- a/src/customfields_p.h
+++ b/src/akonadi-contacts/customfields_p.h
diff --git a/src/editor/addresseditor/addresseslocationgrantleeformater.cpp b/src/akonadi-contacts/editor/addresseditor/addresseslocationgrantleeformater.cpp
index 3b25d26..3b25d26 100644
--- a/src/editor/addresseditor/addresseslocationgrantleeformater.cpp
+++ b/src/akonadi-contacts/editor/addresseditor/addresseslocationgrantleeformater.cpp
diff --git a/src/editor/addresseditor/addresseslocationgrantleeformater.h b/src/akonadi-contacts/editor/addresseditor/addresseslocationgrantleeformater.h
index 1522968..1522968 100644
--- a/src/editor/addresseditor/addresseslocationgrantleeformater.h
+++ b/src/akonadi-contacts/editor/addresseditor/addresseslocationgrantleeformater.h
diff --git a/src/editor/addresseditor/addresseslocationwidget.cpp b/src/akonadi-contacts/editor/addresseditor/addresseslocationwidget.cpp
index a54d8af..a54d8af 100644
--- a/src/editor/addresseditor/addresseslocationwidget.cpp
+++ b/src/akonadi-contacts/editor/addresseditor/addresseslocationwidget.cpp
diff --git a/src/editor/addresseditor/addresseslocationwidget.h b/src/akonadi-contacts/editor/addresseditor/addresseslocationwidget.h
index e4ef0b3..e4ef0b3 100644
--- a/src/editor/addresseditor/addresseslocationwidget.h
+++ b/src/akonadi-contacts/editor/addresseditor/addresseslocationwidget.h
diff --git a/src/editor/addresseditor/addressgrantleeobject.cpp b/src/akonadi-contacts/editor/addresseditor/addressgrantleeobject.cpp
index 11a580e..11a580e 100644
--- a/src/editor/addresseditor/addressgrantleeobject.cpp
+++ b/src/akonadi-contacts/editor/addresseditor/addressgrantleeobject.cpp
diff --git a/src/editor/addresseditor/addressgrantleeobject.h b/src/akonadi-contacts/editor/addresseditor/addressgrantleeobject.h
index 31c8bb7..31c8bb7 100644
--- a/src/editor/addresseditor/addressgrantleeobject.h
+++ b/src/akonadi-contacts/editor/addresseditor/addressgrantleeobject.h
diff --git a/src/editor/addresseditor/addresslocationwidget.cpp b/src/akonadi-contacts/editor/addresseditor/addresslocationwidget.cpp
index 4cf60df..4cf60df 100644
--- a/src/editor/addresseditor/addresslocationwidget.cpp
+++ b/src/akonadi-contacts/editor/addresseditor/addresslocationwidget.cpp
diff --git a/src/editor/addresseditor/addresslocationwidget.h b/src/akonadi-contacts/editor/addresseditor/addresslocationwidget.h
index 45ebb16..45ebb16 100644
--- a/src/editor/addresseditor/addresslocationwidget.h
+++ b/src/akonadi-contacts/editor/addresseditor/addresslocationwidget.h
diff --git a/src/editor/addresseditor/addresstypedialog.cpp b/src/akonadi-contacts/editor/addresseditor/addresstypedialog.cpp
index e47327c..e47327c 100644
--- a/src/editor/addresseditor/addresstypedialog.cpp
+++ b/src/akonadi-contacts/editor/addresseditor/addresstypedialog.cpp
diff --git a/src/editor/addresseditor/addresstypedialog.h b/src/akonadi-contacts/editor/addresseditor/addresstypedialog.h
index ad44345..ad44345 100644
--- a/src/editor/addresseditor/addresstypedialog.h
+++ b/src/akonadi-contacts/editor/addresseditor/addresstypedialog.h
diff --git a/src/editor/addresseditor/autotests/CMakeLists.txt b/src/akonadi-contacts/editor/addresseditor/autotests/CMakeLists.txt
index 0a22492..0a22492 100644
--- a/src/editor/addresseditor/autotests/CMakeLists.txt
+++ b/src/akonadi-contacts/editor/addresseditor/autotests/CMakeLists.txt
diff --git a/src/editor/addresseditor/autotests/addresseslocationviewertest.cpp b/src/akonadi-contacts/editor/addresseditor/autotests/addresseslocationviewertest.cpp
index 8dae75b..8dae75b 100644
--- a/src/editor/addresseditor/autotests/addresseslocationviewertest.cpp
+++ b/src/akonadi-contacts/editor/addresseditor/autotests/addresseslocationviewertest.cpp
diff --git a/src/editor/addresseditor/autotests/addresseslocationviewertest.h b/src/akonadi-contacts/editor/addresseditor/autotests/addresseslocationviewertest.h
index 16615f8..16615f8 100644
--- a/src/editor/addresseditor/autotests/addresseslocationviewertest.h
+++ b/src/akonadi-contacts/editor/addresseditor/autotests/addresseslocationviewertest.h
diff --git a/src/editor/addresseditor/autotests/addresseslocationwidgettest.cpp b/src/akonadi-contacts/editor/addresseditor/autotests/addresseslocationwidgettest.cpp
index b2440a3..b2440a3 100644
--- a/src/editor/addresseditor/autotests/addresseslocationwidgettest.cpp
+++ b/src/akonadi-contacts/editor/addresseditor/autotests/addresseslocationwidgettest.cpp
diff --git a/src/editor/addresseditor/autotests/addresseslocationwidgettest.h b/src/akonadi-contacts/editor/addresseditor/autotests/addresseslocationwidgettest.h
index 3c8eae2..3c8eae2 100644
--- a/src/editor/addresseditor/autotests/addresseslocationwidgettest.h
+++ b/src/akonadi-contacts/editor/addresseditor/autotests/addresseslocationwidgettest.h
diff --git a/src/editor/addresseditor/autotests/addresslocationwidgettest.cpp b/src/akonadi-contacts/editor/addresseditor/autotests/addresslocationwidgettest.cpp
index 8483dc8..8483dc8 100644
--- a/src/editor/addresseditor/autotests/addresslocationwidgettest.cpp
+++ b/src/akonadi-contacts/editor/addresseditor/autotests/addresslocationwidgettest.cpp
diff --git a/src/editor/addresseditor/autotests/addresslocationwidgettest.h b/src/akonadi-contacts/editor/addresseditor/autotests/addresslocationwidgettest.h
index 23be533..23be533 100644
--- a/src/editor/addresseditor/autotests/addresslocationwidgettest.h
+++ b/src/akonadi-contacts/editor/addresseditor/autotests/addresslocationwidgettest.h
diff --git a/src/editor/addresseditor/html/CMakeLists.txt b/src/akonadi-contacts/editor/addresseditor/html/CMakeLists.txt
index 4ab97e7..4ab97e7 100644
--- a/src/editor/addresseditor/html/CMakeLists.txt
+++ b/src/akonadi-contacts/editor/addresseditor/html/CMakeLists.txt
diff --git a/src/editor/addresseditor/html/default/addresseslocation.css b/src/akonadi-contacts/editor/addresseditor/html/default/addresseslocation.css
index 02d83b3..02d83b3 100644
--- a/src/editor/addresseditor/html/default/addresseslocation.css
+++ b/src/akonadi-contacts/editor/addresseditor/html/default/addresseslocation.css
diff --git a/src/editor/addresseditor/html/default/addresseslocation.html b/src/akonadi-contacts/editor/addresseditor/html/default/addresseslocation.html
index 345015b..345015b 100644
--- a/src/editor/addresseditor/html/default/addresseslocation.html
+++ b/src/akonadi-contacts/editor/addresseditor/html/default/addresseslocation.html
diff --git a/src/editor/addresseditor/iconnamecache.cpp b/src/akonadi-contacts/editor/addresseditor/iconnamecache.cpp
index b1f0abc..b1f0abc 100644
--- a/src/editor/addresseditor/iconnamecache.cpp
+++ b/src/akonadi-contacts/editor/addresseditor/iconnamecache.cpp
diff --git a/src/editor/addresseditor/iconnamecache_p.h b/src/akonadi-contacts/editor/addresseditor/iconnamecache_p.h
index 9d320b6..9d320b6 100644
--- a/src/editor/addresseditor/iconnamecache_p.h
+++ b/src/akonadi-contacts/editor/addresseditor/iconnamecache_p.h
diff --git a/src/editor/addresseditor/selectaddresstypecombobox.cpp b/src/akonadi-contacts/editor/addresseditor/selectaddresstypecombobox.cpp
index 3ffb774..3ffb774 100644
--- a/src/editor/addresseditor/selectaddresstypecombobox.cpp
+++ b/src/akonadi-contacts/editor/addresseditor/selectaddresstypecombobox.cpp
diff --git a/src/editor/addresseditor/selectaddresstypecombobox.h b/src/akonadi-contacts/editor/addresseditor/selectaddresstypecombobox.h
index 95fc731..95fc731 100644
--- a/src/editor/addresseditor/selectaddresstypecombobox.h
+++ b/src/akonadi-contacts/editor/addresseditor/selectaddresstypecombobox.h
diff --git a/src/editor/addresseditor/tests/CMakeLists.txt b/src/akonadi-contacts/editor/addresseditor/tests/CMakeLists.txt
index 3cdee48..3cdee48 100644
--- a/src/editor/addresseditor/tests/CMakeLists.txt
+++ b/src/akonadi-contacts/editor/addresseditor/tests/CMakeLists.txt
diff --git a/src/editor/addresseditor/tests/main.cpp b/src/akonadi-contacts/editor/addresseditor/tests/main.cpp
index ff97a9f..ff97a9f 100644
--- a/src/editor/addresseditor/tests/main.cpp
+++ b/src/akonadi-contacts/editor/addresseditor/tests/main.cpp
diff --git a/src/editor/addresseditor/webengine/addresseslocationenginepage.cpp b/src/akonadi-contacts/editor/addresseditor/webengine/addresseslocationenginepage.cpp
index 637e1e3..637e1e3 100644
--- a/src/editor/addresseditor/webengine/addresseslocationenginepage.cpp
+++ b/src/akonadi-contacts/editor/addresseditor/webengine/addresseslocationenginepage.cpp
diff --git a/src/editor/addresseditor/webengine/addresseslocationenginepage.h b/src/akonadi-contacts/editor/addresseditor/webengine/addresseslocationenginepage.h
index 77f3ef8..77f3ef8 100644
--- a/src/editor/addresseditor/webengine/addresseslocationenginepage.h
+++ b/src/akonadi-contacts/editor/addresseditor/webengine/addresseslocationenginepage.h
diff --git a/src/editor/addresseditor/webengine/addresseslocationengineviewer.cpp b/src/akonadi-contacts/editor/addresseditor/webengine/addresseslocationengineviewer.cpp
index d6fddcc..d6fddcc 100644
--- a/src/editor/addresseditor/webengine/addresseslocationengineviewer.cpp
+++ b/src/akonadi-contacts/editor/addresseditor/webengine/addresseslocationengineviewer.cpp
diff --git a/src/editor/addresseditor/webengine/addresseslocationengineviewer.h b/src/akonadi-contacts/editor/addresseditor/webengine/addresseslocationengineviewer.h
index f31af6b..f31af6b 100644
--- a/src/editor/addresseditor/webengine/addresseslocationengineviewer.h
+++ b/src/akonadi-contacts/editor/addresseditor/webengine/addresseslocationengineviewer.h
diff --git a/src/editor/businesseditor/businesseditorwidget.cpp b/src/akonadi-contacts/editor/businesseditor/businesseditorwidget.cpp
index b09afa1..b09afa1 100644
--- a/src/editor/businesseditor/businesseditorwidget.cpp
+++ b/src/akonadi-contacts/editor/businesseditor/businesseditorwidget.cpp
diff --git a/src/editor/businesseditor/businesseditorwidget.h b/src/akonadi-contacts/editor/businesseditor/businesseditorwidget.h
index 768b796..768b796 100644
--- a/src/editor/businesseditor/businesseditorwidget.h
+++ b/src/akonadi-contacts/editor/businesseditor/businesseditorwidget.h
diff --git a/src/editor/businesseditor/freebusyeditwidget.cpp b/src/akonadi-contacts/editor/businesseditor/freebusyeditwidget.cpp
index 0c57c9f..0c57c9f 100644
--- a/src/editor/businesseditor/freebusyeditwidget.cpp
+++ b/src/akonadi-contacts/editor/businesseditor/freebusyeditwidget.cpp
diff --git a/src/editor/businesseditor/freebusyeditwidget.h b/src/akonadi-contacts/editor/businesseditor/freebusyeditwidget.h
index 8527da8..8527da8 100644
--- a/src/editor/businesseditor/freebusyeditwidget.h
+++ b/src/akonadi-contacts/editor/businesseditor/freebusyeditwidget.h
diff --git a/src/editor/contacteditorwidget.cpp b/src/akonadi-contacts/editor/contacteditorwidget.cpp
index 4879b87..4879b87 100644
--- a/src/editor/contacteditorwidget.cpp
+++ b/src/akonadi-contacts/editor/contacteditorwidget.cpp
diff --git a/src/editor/contacteditorwidget.h b/src/akonadi-contacts/editor/contacteditorwidget.h
index 24867f6..24867f6 100644
--- a/src/editor/contacteditorwidget.h
+++ b/src/akonadi-contacts/editor/contacteditorwidget.h
diff --git a/src/editor/customfieldeditor/autotests/CMakeLists.txt b/src/akonadi-contacts/editor/customfieldeditor/autotests/CMakeLists.txt
index f2826e8..f2826e8 100644
--- a/src/editor/customfieldeditor/autotests/CMakeLists.txt
+++ b/src/akonadi-contacts/editor/customfieldeditor/autotests/CMakeLists.txt
diff --git a/src/editor/customfieldeditor/autotests/customfieldeditorwidgettest.cpp b/src/akonadi-contacts/editor/customfieldeditor/autotests/customfieldeditorwidgettest.cpp
index ba07e4c..ba07e4c 100644
--- a/src/editor/customfieldeditor/autotests/customfieldeditorwidgettest.cpp
+++ b/src/akonadi-contacts/editor/customfieldeditor/autotests/customfieldeditorwidgettest.cpp
diff --git a/src/editor/customfieldeditor/autotests/customfieldeditorwidgettest.h b/src/akonadi-contacts/editor/customfieldeditor/autotests/customfieldeditorwidgettest.h
index fb0ebe8..fb0ebe8 100644
--- a/src/editor/customfieldeditor/autotests/customfieldeditorwidgettest.h
+++ b/src/akonadi-contacts/editor/customfieldeditor/autotests/customfieldeditorwidgettest.h
diff --git a/src/editor/customfieldeditor/autotests/customfieldslistwidgettest.cpp b/src/akonadi-contacts/editor/customfieldeditor/autotests/customfieldslistwidgettest.cpp
index ed17f54..ed17f54 100644
--- a/src/editor/customfieldeditor/autotests/customfieldslistwidgettest.cpp
+++ b/src/akonadi-contacts/editor/customfieldeditor/autotests/customfieldslistwidgettest.cpp
diff --git a/src/editor/customfieldeditor/autotests/customfieldslistwidgettest.h b/src/akonadi-contacts/editor/customfieldeditor/autotests/customfieldslistwidgettest.h
index b9cec4a..b9cec4a 100644
--- a/src/editor/customfieldeditor/autotests/customfieldslistwidgettest.h
+++ b/src/akonadi-contacts/editor/customfieldeditor/autotests/customfieldslistwidgettest.h
diff --git a/src/editor/customfieldeditor/autotests/customfieldswidgettest.cpp b/src/akonadi-contacts/editor/customfieldeditor/autotests/customfieldswidgettest.cpp
index 08b0596..08b0596 100644
--- a/src/editor/customfieldeditor/autotests/customfieldswidgettest.cpp
+++ b/src/akonadi-contacts/editor/customfieldeditor/autotests/customfieldswidgettest.cpp
diff --git a/src/editor/customfieldeditor/autotests/customfieldswidgettest.h b/src/akonadi-contacts/editor/customfieldeditor/autotests/customfieldswidgettest.h
index 8c1488e..8c1488e 100644
--- a/src/editor/customfieldeditor/autotests/customfieldswidgettest.h
+++ b/src/akonadi-contacts/editor/customfieldeditor/autotests/customfieldswidgettest.h
diff --git a/src/editor/customfieldeditor/customfieldeditorwidget.cpp b/src/akonadi-contacts/editor/customfieldeditor/customfieldeditorwidget.cpp
index ba271e8..ba271e8 100644
--- a/src/editor/customfieldeditor/customfieldeditorwidget.cpp
+++ b/src/akonadi-contacts/editor/customfieldeditor/customfieldeditorwidget.cpp
diff --git a/src/editor/customfieldeditor/customfieldeditorwidget.h b/src/akonadi-contacts/editor/customfieldeditor/customfieldeditorwidget.h
index 9b8c74b..9b8c74b 100644
--- a/src/editor/customfieldeditor/customfieldeditorwidget.h
+++ b/src/akonadi-contacts/editor/customfieldeditor/customfieldeditorwidget.h
diff --git a/src/editor/customfieldeditor/customfieldslistdelegate.cpp b/src/akonadi-contacts/editor/customfieldeditor/customfieldslistdelegate.cpp
index 9f160ee..9f160ee 100644
--- a/src/editor/customfieldeditor/customfieldslistdelegate.cpp
+++ b/src/akonadi-contacts/editor/customfieldeditor/customfieldslistdelegate.cpp
diff --git a/src/editor/customfieldeditor/customfieldslistdelegate.h b/src/akonadi-contacts/editor/customfieldeditor/customfieldslistdelegate.h
index 812cd79..812cd79 100644
--- a/src/editor/customfieldeditor/customfieldslistdelegate.h
+++ b/src/akonadi-contacts/editor/customfieldeditor/customfieldslistdelegate.h
diff --git a/src/editor/customfieldeditor/customfieldslistwidget.cpp b/src/akonadi-contacts/editor/customfieldeditor/customfieldslistwidget.cpp
index c3f052e..c3f052e 100644
--- a/src/editor/customfieldeditor/customfieldslistwidget.cpp
+++ b/src/akonadi-contacts/editor/customfieldeditor/customfieldslistwidget.cpp
diff --git a/src/editor/customfieldeditor/customfieldslistwidget.h b/src/akonadi-contacts/editor/customfieldeditor/customfieldslistwidget.h
index d5e178e..d5e178e 100644
--- a/src/editor/customfieldeditor/customfieldslistwidget.h
+++ b/src/akonadi-contacts/editor/customfieldeditor/customfieldslistwidget.h
diff --git a/src/editor/customfieldeditor/customfieldsmodel.cpp b/src/akonadi-contacts/editor/customfieldeditor/customfieldsmodel.cpp
index d9b7463..d9b7463 100644
--- a/src/editor/customfieldeditor/customfieldsmodel.cpp
+++ b/src/akonadi-contacts/editor/customfieldeditor/customfieldsmodel.cpp
diff --git a/src/editor/customfieldeditor/customfieldsmodel.h b/src/akonadi-contacts/editor/customfieldeditor/customfieldsmodel.h
index af73142..af73142 100644
--- a/src/editor/customfieldeditor/customfieldsmodel.h
+++ b/src/akonadi-contacts/editor/customfieldeditor/customfieldsmodel.h
diff --git a/src/editor/customfieldeditor/customfieldswidget.cpp b/src/akonadi-contacts/editor/customfieldeditor/customfieldswidget.cpp
index 4284bf3..4284bf3 100644
--- a/src/editor/customfieldeditor/customfieldswidget.cpp
+++ b/src/akonadi-contacts/editor/customfieldeditor/customfieldswidget.cpp
diff --git a/src/editor/customfieldeditor/customfieldswidget.h b/src/akonadi-contacts/editor/customfieldeditor/customfieldswidget.h
index b560ff7..b560ff7 100644
--- a/src/editor/customfieldeditor/customfieldswidget.h
+++ b/src/akonadi-contacts/editor/customfieldeditor/customfieldswidget.h
diff --git a/src/editor/customfieldeditor/tests/CMakeLists.txt b/src/akonadi-contacts/editor/customfieldeditor/tests/CMakeLists.txt
index 3f0b8bb..3f0b8bb 100644
--- a/src/editor/customfieldeditor/tests/CMakeLists.txt
+++ b/src/akonadi-contacts/editor/customfieldeditor/tests/CMakeLists.txt
diff --git a/src/editor/customfieldeditor/tests/main.cpp b/src/akonadi-contacts/editor/customfieldeditor/tests/main.cpp
index d85319c..d85319c 100644
--- a/src/editor/customfieldeditor/tests/main.cpp
+++ b/src/akonadi-contacts/editor/customfieldeditor/tests/main.cpp
diff --git a/src/editor/data/zone.tab b/src/akonadi-contacts/editor/data/zone.tab
index 2bdf923..2bdf923 100644
--- a/src/editor/data/zone.tab
+++ b/src/akonadi-contacts/editor/data/zone.tab
diff --git a/src/editor/generalinfoeditor/akonadicontactselecttypecombobox.cpp b/src/akonadi-contacts/editor/generalinfoeditor/akonadicontactselecttypecombobox.cpp
index cc3b26c..cc3b26c 100644
--- a/src/editor/generalinfoeditor/akonadicontactselecttypecombobox.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/akonadicontactselecttypecombobox.cpp
diff --git a/src/editor/generalinfoeditor/akonadicontactselecttypecombobox.h b/src/akonadi-contacts/editor/generalinfoeditor/akonadicontactselecttypecombobox.h
index 81fd22e..81fd22e 100644
--- a/src/editor/generalinfoeditor/akonadicontactselecttypecombobox.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/akonadicontactselecttypecombobox.h
diff --git a/src/editor/generalinfoeditor/autotests/CMakeLists.txt b/src/akonadi-contacts/editor/generalinfoeditor/autotests/CMakeLists.txt
index 3f0ec00..3f0ec00 100644
--- a/src/editor/generalinfoeditor/autotests/CMakeLists.txt
+++ b/src/akonadi-contacts/editor/generalinfoeditor/autotests/CMakeLists.txt
diff --git a/src/editor/generalinfoeditor/autotests/akonadicontactselecttypecomboboxtest.cpp b/src/akonadi-contacts/editor/generalinfoeditor/autotests/akonadicontactselecttypecomboboxtest.cpp
index 8652faf..8652faf 100644
--- a/src/editor/generalinfoeditor/autotests/akonadicontactselecttypecomboboxtest.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/autotests/akonadicontactselecttypecomboboxtest.cpp
diff --git a/src/editor/generalinfoeditor/autotests/akonadicontactselecttypecomboboxtest.h b/src/akonadi-contacts/editor/generalinfoeditor/autotests/akonadicontactselecttypecomboboxtest.h
index 488f9e7..488f9e7 100644
--- a/src/editor/generalinfoeditor/autotests/akonadicontactselecttypecomboboxtest.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/autotests/akonadicontactselecttypecomboboxtest.h
diff --git a/src/editor/generalinfoeditor/autotests/mailwidgettest.cpp b/src/akonadi-contacts/editor/generalinfoeditor/autotests/mailwidgettest.cpp
index 0216370..0216370 100644
--- a/src/editor/generalinfoeditor/autotests/mailwidgettest.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/autotests/mailwidgettest.cpp
diff --git a/src/editor/generalinfoeditor/autotests/mailwidgettest.h b/src/akonadi-contacts/editor/generalinfoeditor/autotests/mailwidgettest.h
index 9869aba..9869aba 100644
--- a/src/editor/generalinfoeditor/autotests/mailwidgettest.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/autotests/mailwidgettest.h
diff --git a/src/editor/generalinfoeditor/autotests/messageformattingwidgettest.cpp b/src/akonadi-contacts/editor/generalinfoeditor/autotests/messageformattingwidgettest.cpp
index d24bc60..d24bc60 100644
--- a/src/editor/generalinfoeditor/autotests/messageformattingwidgettest.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/autotests/messageformattingwidgettest.cpp
diff --git a/src/editor/generalinfoeditor/autotests/messageformattingwidgettest.h b/src/akonadi-contacts/editor/generalinfoeditor/autotests/messageformattingwidgettest.h
index bfc95c5..bfc95c5 100644
--- a/src/editor/generalinfoeditor/autotests/messageformattingwidgettest.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/autotests/messageformattingwidgettest.h
diff --git a/src/editor/generalinfoeditor/autotests/messagingwidgettest.cpp b/src/akonadi-contacts/editor/generalinfoeditor/autotests/messagingwidgettest.cpp
index c7f4ecf..c7f4ecf 100644
--- a/src/editor/generalinfoeditor/autotests/messagingwidgettest.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/autotests/messagingwidgettest.cpp
diff --git a/src/editor/generalinfoeditor/autotests/messagingwidgettest.h b/src/akonadi-contacts/editor/generalinfoeditor/autotests/messagingwidgettest.h
index 63b7884..63b7884 100644
--- a/src/editor/generalinfoeditor/autotests/messagingwidgettest.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/autotests/messagingwidgettest.h
diff --git a/src/editor/generalinfoeditor/autotests/nicknamewidgettest.cpp b/src/akonadi-contacts/editor/generalinfoeditor/autotests/nicknamewidgettest.cpp
index 3534958..3534958 100644
--- a/src/editor/generalinfoeditor/autotests/nicknamewidgettest.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/autotests/nicknamewidgettest.cpp
diff --git a/src/editor/generalinfoeditor/autotests/nicknamewidgettest.h b/src/akonadi-contacts/editor/generalinfoeditor/autotests/nicknamewidgettest.h
index 13af5bf..13af5bf 100644
--- a/src/editor/generalinfoeditor/autotests/nicknamewidgettest.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/autotests/nicknamewidgettest.h
diff --git a/src/editor/generalinfoeditor/autotests/phonewidgettest.cpp b/src/akonadi-contacts/editor/generalinfoeditor/autotests/phonewidgettest.cpp
index eeac9f6..eeac9f6 100644
--- a/src/editor/generalinfoeditor/autotests/phonewidgettest.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/autotests/phonewidgettest.cpp
diff --git a/src/editor/generalinfoeditor/autotests/phonewidgettest.h b/src/akonadi-contacts/editor/generalinfoeditor/autotests/phonewidgettest.h
index 2142177..2142177 100644
--- a/src/editor/generalinfoeditor/autotests/phonewidgettest.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/autotests/phonewidgettest.h
diff --git a/src/editor/generalinfoeditor/categorieseditwidget.cpp b/src/akonadi-contacts/editor/generalinfoeditor/categorieseditwidget.cpp
index 3f5fdc1..3f5fdc1 100644
--- a/src/editor/generalinfoeditor/categorieseditwidget.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/categorieseditwidget.cpp
diff --git a/src/editor/generalinfoeditor/categorieseditwidget.h b/src/akonadi-contacts/editor/generalinfoeditor/categorieseditwidget.h
index 6dd5490..6dd5490 100644
--- a/src/editor/generalinfoeditor/categorieseditwidget.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/categorieseditwidget.h
diff --git a/src/editor/generalinfoeditor/displaynameeditwidget.cpp b/src/akonadi-contacts/editor/generalinfoeditor/displaynameeditwidget.cpp
index 66de6d5..66de6d5 100644
--- a/src/editor/generalinfoeditor/displaynameeditwidget.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/displaynameeditwidget.cpp
diff --git a/src/editor/generalinfoeditor/displaynameeditwidget.h b/src/akonadi-contacts/editor/generalinfoeditor/displaynameeditwidget.h
index af9955e..af9955e 100644
--- a/src/editor/generalinfoeditor/displaynameeditwidget.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/displaynameeditwidget.h
diff --git a/src/editor/generalinfoeditor/generalinfowidget.cpp b/src/akonadi-contacts/editor/generalinfoeditor/generalinfowidget.cpp
index 0af896f..0af896f 100644
--- a/src/editor/generalinfoeditor/generalinfowidget.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/generalinfowidget.cpp
diff --git a/src/editor/generalinfoeditor/generalinfowidget.h b/src/akonadi-contacts/editor/generalinfoeditor/generalinfowidget.h
index 498b34a..498b34a 100644
--- a/src/editor/generalinfoeditor/generalinfowidget.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/generalinfowidget.h
diff --git a/src/editor/generalinfoeditor/mail/maillistwidget.cpp b/src/akonadi-contacts/editor/generalinfoeditor/mail/maillistwidget.cpp
index a945a44..a945a44 100644
--- a/src/editor/generalinfoeditor/mail/maillistwidget.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/mail/maillistwidget.cpp
diff --git a/src/editor/generalinfoeditor/mail/maillistwidget.h b/src/akonadi-contacts/editor/generalinfoeditor/mail/maillistwidget.h
index 5796ddc..5796ddc 100644
--- a/src/editor/generalinfoeditor/mail/maillistwidget.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/mail/maillistwidget.h
diff --git a/src/editor/generalinfoeditor/mail/mailwidget.cpp b/src/akonadi-contacts/editor/generalinfoeditor/mail/mailwidget.cpp
index ade39a7..ade39a7 100644
--- a/src/editor/generalinfoeditor/mail/mailwidget.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/mail/mailwidget.cpp
diff --git a/src/editor/generalinfoeditor/mail/mailwidget.h b/src/akonadi-contacts/editor/generalinfoeditor/mail/mailwidget.h
index e185feb..e185feb 100644
--- a/src/editor/generalinfoeditor/mail/mailwidget.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/mail/mailwidget.h
diff --git a/src/editor/generalinfoeditor/mail/mailwidgetlister.cpp b/src/akonadi-contacts/editor/generalinfoeditor/mail/mailwidgetlister.cpp
index 6d7436d..6d7436d 100644
--- a/src/editor/generalinfoeditor/mail/mailwidgetlister.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/mail/mailwidgetlister.cpp
diff --git a/src/editor/generalinfoeditor/mail/mailwidgetlister.h b/src/akonadi-contacts/editor/generalinfoeditor/mail/mailwidgetlister.h
index c12877c..c12877c 100644
--- a/src/editor/generalinfoeditor/mail/mailwidgetlister.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/mail/mailwidgetlister.h
diff --git a/src/editor/generalinfoeditor/messageformattingwidget.cpp b/src/akonadi-contacts/editor/generalinfoeditor/messageformattingwidget.cpp
index d52453f..d52453f 100644
--- a/src/editor/generalinfoeditor/messageformattingwidget.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/messageformattingwidget.cpp
diff --git a/src/editor/generalinfoeditor/messageformattingwidget.h b/src/akonadi-contacts/editor/generalinfoeditor/messageformattingwidget.h
index c2f23d3..c2f23d3 100644
--- a/src/editor/generalinfoeditor/messageformattingwidget.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/messageformattingwidget.h
diff --git a/src/editor/generalinfoeditor/messaging/messaginglistwidget.cpp b/src/akonadi-contacts/editor/generalinfoeditor/messaging/messaginglistwidget.cpp
index c66286a..c66286a 100644
--- a/src/editor/generalinfoeditor/messaging/messaginglistwidget.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/messaging/messaginglistwidget.cpp
diff --git a/src/editor/generalinfoeditor/messaging/messaginglistwidget.h b/src/akonadi-contacts/editor/generalinfoeditor/messaging/messaginglistwidget.h
index bd8f482..bd8f482 100644
--- a/src/editor/generalinfoeditor/messaging/messaginglistwidget.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/messaging/messaginglistwidget.h
diff --git a/src/editor/generalinfoeditor/messaging/messagingwidget.cpp b/src/akonadi-contacts/editor/generalinfoeditor/messaging/messagingwidget.cpp
index 970db6b..970db6b 100644
--- a/src/editor/generalinfoeditor/messaging/messagingwidget.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/messaging/messagingwidget.cpp
diff --git a/src/editor/generalinfoeditor/messaging/messagingwidget.h b/src/akonadi-contacts/editor/generalinfoeditor/messaging/messagingwidget.h
index 0327021..0327021 100644
--- a/src/editor/generalinfoeditor/messaging/messagingwidget.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/messaging/messagingwidget.h
diff --git a/src/editor/generalinfoeditor/messaging/messagingwidgetlister.cpp b/src/akonadi-contacts/editor/generalinfoeditor/messaging/messagingwidgetlister.cpp
index f4f4e07..f4f4e07 100644
--- a/src/editor/generalinfoeditor/messaging/messagingwidgetlister.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/messaging/messagingwidgetlister.cpp
diff --git a/src/editor/generalinfoeditor/messaging/messagingwidgetlister.h b/src/akonadi-contacts/editor/generalinfoeditor/messaging/messagingwidgetlister.h
index 57060f7..57060f7 100644
--- a/src/editor/generalinfoeditor/messaging/messagingwidgetlister.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/messaging/messagingwidgetlister.h
diff --git a/src/editor/generalinfoeditor/nameeditdialog.cpp b/src/akonadi-contacts/editor/generalinfoeditor/nameeditdialog.cpp
index 774b955..774b955 100644
--- a/src/editor/generalinfoeditor/nameeditdialog.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/nameeditdialog.cpp
diff --git a/src/editor/generalinfoeditor/nameeditdialog.h b/src/akonadi-contacts/editor/generalinfoeditor/nameeditdialog.h
index 341b330..341b330 100644
--- a/src/editor/generalinfoeditor/nameeditdialog.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/nameeditdialog.h
diff --git a/src/editor/generalinfoeditor/namewidget.cpp b/src/akonadi-contacts/editor/generalinfoeditor/namewidget.cpp
index f1031e9..f1031e9 100644
--- a/src/editor/generalinfoeditor/namewidget.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/namewidget.cpp
diff --git a/src/editor/generalinfoeditor/namewidget.h b/src/akonadi-contacts/editor/generalinfoeditor/namewidget.h
index cb41b3e..cb41b3e 100644
--- a/src/editor/generalinfoeditor/namewidget.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/namewidget.h
diff --git a/src/editor/generalinfoeditor/nicknamewidget.cpp b/src/akonadi-contacts/editor/generalinfoeditor/nicknamewidget.cpp
index e0ef94c..e0ef94c 100644
--- a/src/editor/generalinfoeditor/nicknamewidget.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/nicknamewidget.cpp
diff --git a/src/editor/generalinfoeditor/nicknamewidget.h b/src/akonadi-contacts/editor/generalinfoeditor/nicknamewidget.h
index 9b14812..9b14812 100644
--- a/src/editor/generalinfoeditor/nicknamewidget.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/nicknamewidget.h
diff --git a/src/editor/generalinfoeditor/phone/phonecomboboxtype.cpp b/src/akonadi-contacts/editor/generalinfoeditor/phone/phonecomboboxtype.cpp
index 136e0c7..136e0c7 100644
--- a/src/editor/generalinfoeditor/phone/phonecomboboxtype.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/phone/phonecomboboxtype.cpp
diff --git a/src/editor/generalinfoeditor/phone/phonecomboboxtype.h b/src/akonadi-contacts/editor/generalinfoeditor/phone/phonecomboboxtype.h
index 01a2bb3..01a2bb3 100644
--- a/src/editor/generalinfoeditor/phone/phonecomboboxtype.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/phone/phonecomboboxtype.h
diff --git a/src/editor/generalinfoeditor/phone/phonelistwidget.cpp b/src/akonadi-contacts/editor/generalinfoeditor/phone/phonelistwidget.cpp
index ad66b39..ad66b39 100644
--- a/src/editor/generalinfoeditor/phone/phonelistwidget.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/phone/phonelistwidget.cpp
diff --git a/src/editor/generalinfoeditor/phone/phonelistwidget.h b/src/akonadi-contacts/editor/generalinfoeditor/phone/phonelistwidget.h
index 9558adf..9558adf 100644
--- a/src/editor/generalinfoeditor/phone/phonelistwidget.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/phone/phonelistwidget.h
diff --git a/src/editor/generalinfoeditor/phone/phonetypedialog.cpp b/src/akonadi-contacts/editor/generalinfoeditor/phone/phonetypedialog.cpp
index 6e56799..6e56799 100644
--- a/src/editor/generalinfoeditor/phone/phonetypedialog.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/phone/phonetypedialog.cpp
diff --git a/src/editor/generalinfoeditor/phone/phonetypedialog.h b/src/akonadi-contacts/editor/generalinfoeditor/phone/phonetypedialog.h
index 329e2d1..329e2d1 100644
--- a/src/editor/generalinfoeditor/phone/phonetypedialog.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/phone/phonetypedialog.h
diff --git a/src/editor/generalinfoeditor/phone/phonewidget.cpp b/src/akonadi-contacts/editor/generalinfoeditor/phone/phonewidget.cpp
index 2501fb9..2501fb9 100644
--- a/src/editor/generalinfoeditor/phone/phonewidget.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/phone/phonewidget.cpp
diff --git a/src/editor/generalinfoeditor/phone/phonewidget.h b/src/akonadi-contacts/editor/generalinfoeditor/phone/phonewidget.h
index bf9ed21..bf9ed21 100644
--- a/src/editor/generalinfoeditor/phone/phonewidget.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/phone/phonewidget.h
diff --git a/src/editor/generalinfoeditor/phone/phonewidgetlister.cpp b/src/akonadi-contacts/editor/generalinfoeditor/phone/phonewidgetlister.cpp
index 02afd45..02afd45 100644
--- a/src/editor/generalinfoeditor/phone/phonewidgetlister.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/phone/phonewidgetlister.cpp
diff --git a/src/editor/generalinfoeditor/phone/phonewidgetlister.h b/src/akonadi-contacts/editor/generalinfoeditor/phone/phonewidgetlister.h
index 7eb619c..7eb619c 100644
--- a/src/editor/generalinfoeditor/phone/phonewidgetlister.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/phone/phonewidgetlister.h
diff --git a/src/editor/generalinfoeditor/tests/CMakeLists.txt b/src/akonadi-contacts/editor/generalinfoeditor/tests/CMakeLists.txt
index c64fce9..c64fce9 100644
--- a/src/editor/generalinfoeditor/tests/CMakeLists.txt
+++ b/src/akonadi-contacts/editor/generalinfoeditor/tests/CMakeLists.txt
diff --git a/src/editor/generalinfoeditor/tests/main.cpp b/src/akonadi-contacts/editor/generalinfoeditor/tests/main.cpp
index d8e9eed..d8e9eed 100644
--- a/src/editor/generalinfoeditor/tests/main.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/tests/main.cpp
diff --git a/src/editor/generalinfoeditor/web/weblistwidget.cpp b/src/akonadi-contacts/editor/generalinfoeditor/web/weblistwidget.cpp
index d1be79f..d1be79f 100644
--- a/src/editor/generalinfoeditor/web/weblistwidget.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/web/weblistwidget.cpp
diff --git a/src/editor/generalinfoeditor/web/weblistwidget.h b/src/akonadi-contacts/editor/generalinfoeditor/web/weblistwidget.h
index dc89be5..dc89be5 100644
--- a/src/editor/generalinfoeditor/web/weblistwidget.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/web/weblistwidget.h
diff --git a/src/editor/generalinfoeditor/web/webwidget.cpp b/src/akonadi-contacts/editor/generalinfoeditor/web/webwidget.cpp
index e8c6baa..e8c6baa 100644
--- a/src/editor/generalinfoeditor/web/webwidget.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/web/webwidget.cpp
diff --git a/src/editor/generalinfoeditor/web/webwidget.h b/src/akonadi-contacts/editor/generalinfoeditor/web/webwidget.h
index a5ed46a..a5ed46a 100644
--- a/src/editor/generalinfoeditor/web/webwidget.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/web/webwidget.h
diff --git a/src/editor/generalinfoeditor/web/webwidgetlister.cpp b/src/akonadi-contacts/editor/generalinfoeditor/web/webwidgetlister.cpp
index d1cdc1b..d1cdc1b 100644
--- a/src/editor/generalinfoeditor/web/webwidgetlister.cpp
+++ b/src/akonadi-contacts/editor/generalinfoeditor/web/webwidgetlister.cpp
diff --git a/src/editor/generalinfoeditor/web/webwidgetlister.h b/src/akonadi-contacts/editor/generalinfoeditor/web/webwidgetlister.h
index b7fcd6b..b7fcd6b 100644
--- a/src/editor/generalinfoeditor/web/webwidgetlister.h
+++ b/src/akonadi-contacts/editor/generalinfoeditor/web/webwidgetlister.h
diff --git a/src/editor/im/CMakeLists.txt b/src/akonadi-contacts/editor/im/CMakeLists.txt
index 6506502..6506502 100644
--- a/src/editor/im/CMakeLists.txt
+++ b/src/akonadi-contacts/editor/im/CMakeLists.txt
diff --git a/src/editor/im/imaddress.cpp b/src/akonadi-contacts/editor/im/imaddress.cpp
index c7eafc7..c7eafc7 100644
--- a/src/editor/im/imaddress.cpp
+++ b/src/akonadi-contacts/editor/im/imaddress.cpp
diff --git a/src/editor/im/imaddress.h b/src/akonadi-contacts/editor/im/imaddress.h
index 7f1a64f..7f1a64f 100644
--- a/src/editor/im/imaddress.h
+++ b/src/akonadi-contacts/editor/im/imaddress.h
diff --git a/src/editor/im/improtocols.cpp b/src/akonadi-contacts/editor/im/improtocols.cpp
index 73c8cc1..73c8cc1 100644
--- a/src/editor/im/improtocols.cpp
+++ b/src/akonadi-contacts/editor/im/improtocols.cpp
diff --git a/src/editor/im/improtocols.h b/src/akonadi-contacts/editor/im/improtocols.h
index 924d0a6..924d0a6 100644
--- a/src/editor/im/improtocols.h
+++ b/src/akonadi-contacts/editor/im/improtocols.h
diff --git a/src/editor/im/kaddressbookimprotocol.desktop b/src/akonadi-contacts/editor/im/kaddressbookimprotocol.desktop
index 14723a3..14723a3 100644
--- a/src/editor/im/kaddressbookimprotocol.desktop
+++ b/src/akonadi-contacts/editor/im/kaddressbookimprotocol.desktop
diff --git a/src/editor/im/protocols/CMakeLists.txt b/src/akonadi-contacts/editor/im/protocols/CMakeLists.txt
index b6f11b4..b6f11b4 100644
--- a/src/editor/im/protocols/CMakeLists.txt
+++ b/src/akonadi-contacts/editor/im/protocols/CMakeLists.txt
diff --git a/src/editor/im/protocols/aimprotocol.desktop b/src/akonadi-contacts/editor/im/protocols/aimprotocol.desktop
index 48d80e5..48d80e5 100644
--- a/src/editor/im/protocols/aimprotocol.desktop
+++ b/src/akonadi-contacts/editor/im/protocols/aimprotocol.desktop
diff --git a/src/editor/im/protocols/facebookprotocol.desktop b/src/akonadi-contacts/editor/im/protocols/facebookprotocol.desktop
index 0329331..0329331 100644
--- a/src/editor/im/protocols/facebookprotocol.desktop
+++ b/src/akonadi-contacts/editor/im/protocols/facebookprotocol.desktop
diff --git a/src/editor/im/protocols/gaduprotocol.desktop b/src/akonadi-contacts/editor/im/protocols/gaduprotocol.desktop
index de310c4..de310c4 100644
--- a/src/editor/im/protocols/gaduprotocol.desktop
+++ b/src/akonadi-contacts/editor/im/protocols/gaduprotocol.desktop
diff --git a/src/editor/im/protocols/googletalkprotocol.desktop b/src/akonadi-contacts/editor/im/protocols/googletalkprotocol.desktop
index ebedac3..ebedac3 100644
--- a/src/editor/im/protocols/googletalkprotocol.desktop
+++ b/src/akonadi-contacts/editor/im/protocols/googletalkprotocol.desktop
diff --git a/src/editor/im/protocols/groupwiseprotocol.desktop b/src/akonadi-contacts/editor/im/protocols/groupwiseprotocol.desktop
index 0448882..0448882 100644
--- a/src/editor/im/protocols/groupwiseprotocol.desktop
+++ b/src/akonadi-contacts/editor/im/protocols/groupwiseprotocol.desktop
diff --git a/src/editor/im/protocols/icqprotocol.desktop b/src/akonadi-contacts/editor/im/protocols/icqprotocol.desktop
index d7f42e1..d7f42e1 100644
--- a/src/editor/im/protocols/icqprotocol.desktop
+++ b/src/akonadi-contacts/editor/im/protocols/icqprotocol.desktop
diff --git a/src/editor/im/protocols/ircprotocol.desktop b/src/akonadi-contacts/editor/im/protocols/ircprotocol.desktop
index 3f8f684..3f8f684 100644
--- a/src/editor/im/protocols/ircprotocol.desktop
+++ b/src/akonadi-contacts/editor/im/protocols/ircprotocol.desktop
diff --git a/src/editor/im/protocols/jabberprotocol.desktop b/src/akonadi-contacts/editor/im/protocols/jabberprotocol.desktop
index 24f9399..24f9399 100644
--- a/src/editor/im/protocols/jabberprotocol.desktop
+++ b/src/akonadi-contacts/editor/im/protocols/jabberprotocol.desktop
diff --git a/src/editor/im/protocols/meanwhileprotocol.desktop b/src/akonadi-contacts/editor/im/protocols/meanwhileprotocol.desktop
index 4afc877..4afc877 100644
--- a/src/editor/im/protocols/meanwhileprotocol.desktop
+++ b/src/akonadi-contacts/editor/im/protocols/meanwhileprotocol.desktop
diff --git a/src/editor/im/protocols/msnprotocol.desktop b/src/akonadi-contacts/editor/im/protocols/msnprotocol.desktop
index 16e7797..16e7797 100644
--- a/src/editor/im/protocols/msnprotocol.desktop
+++ b/src/akonadi-contacts/editor/im/protocols/msnprotocol.desktop
diff --git a/src/editor/im/protocols/skypeprotocol.desktop b/src/akonadi-contacts/editor/im/protocols/skypeprotocol.desktop
index 99e82b9..99e82b9 100644
--- a/src/editor/im/protocols/skypeprotocol.desktop
+++ b/src/akonadi-contacts/editor/im/protocols/skypeprotocol.desktop
diff --git a/src/editor/im/protocols/smsprotocol.desktop b/src/akonadi-contacts/editor/im/protocols/smsprotocol.desktop
index c5b4e96..c5b4e96 100644
--- a/src/editor/im/protocols/smsprotocol.desktop
+++ b/src/akonadi-contacts/editor/im/protocols/smsprotocol.desktop
diff --git a/src/editor/im/protocols/twitterprotocol.desktop b/src/akonadi-contacts/editor/im/protocols/twitterprotocol.desktop
index 7e5b512..7e5b512 100644
--- a/src/editor/im/protocols/twitterprotocol.desktop
+++ b/src/akonadi-contacts/editor/im/protocols/twitterprotocol.desktop
diff --git a/src/editor/im/protocols/yahooprotocol.desktop b/src/akonadi-contacts/editor/im/protocols/yahooprotocol.desktop
index 7cbffe9..7cbffe9 100644
--- a/src/editor/im/protocols/yahooprotocol.desktop
+++ b/src/akonadi-contacts/editor/im/protocols/yahooprotocol.desktop
diff --git a/src/editor/personaleditor/dateeditwidget.cpp b/src/akonadi-contacts/editor/personaleditor/dateeditwidget.cpp
index 209eb9a..209eb9a 100644
--- a/src/editor/personaleditor/dateeditwidget.cpp
+++ b/src/akonadi-contacts/editor/personaleditor/dateeditwidget.cpp
diff --git a/src/editor/personaleditor/dateeditwidget.h b/src/akonadi-contacts/editor/personaleditor/dateeditwidget.h
index 292a66f..292a66f 100644
--- a/src/editor/personaleditor/dateeditwidget.h
+++ b/src/akonadi-contacts/editor/personaleditor/dateeditwidget.h
diff --git a/src/editor/personaleditor/kdatepickerpopup.cpp b/src/akonadi-contacts/editor/personaleditor/kdatepickerpopup.cpp
index 191e24f..191e24f 100644
--- a/src/editor/personaleditor/kdatepickerpopup.cpp
+++ b/src/akonadi-contacts/editor/personaleditor/kdatepickerpopup.cpp
diff --git a/src/editor/personaleditor/kdatepickerpopup_p.h b/src/akonadi-contacts/editor/personaleditor/kdatepickerpopup_p.h
index fc3fbac..fc3fbac 100644
--- a/src/editor/personaleditor/kdatepickerpopup_p.h
+++ b/src/akonadi-contacts/editor/personaleditor/kdatepickerpopup_p.h
diff --git a/src/editor/personaleditor/personaleditorwidget.cpp b/src/akonadi-contacts/editor/personaleditor/personaleditorwidget.cpp
index 924e34d..924e34d 100644
--- a/src/editor/personaleditor/personaleditorwidget.cpp
+++ b/src/akonadi-contacts/editor/personaleditor/personaleditorwidget.cpp
diff --git a/src/editor/personaleditor/personaleditorwidget.h b/src/akonadi-contacts/editor/personaleditor/personaleditorwidget.h
index ea1ac8a..ea1ac8a 100644
--- a/src/editor/personaleditor/personaleditorwidget.h
+++ b/src/akonadi-contacts/editor/personaleditor/personaleditorwidget.h
diff --git a/src/editor/pics/world.jpg b/src/akonadi-contacts/editor/pics/world.jpg
index 1447b3d..1447b3d 100644
--- a/src/editor/pics/world.jpg
+++ b/src/akonadi-contacts/editor/pics/world.jpg
Binary files differ
diff --git a/src/editor/utils/utils.cpp b/src/akonadi-contacts/editor/utils/utils.cpp
index 6973750..6973750 100644
--- a/src/editor/utils/utils.cpp
+++ b/src/akonadi-contacts/editor/utils/utils.cpp
diff --git a/src/editor/utils/utils.h b/src/akonadi-contacts/editor/utils/utils.h
index 4bbbecd..4bbbecd 100644
--- a/src/editor/utils/utils.h
+++ b/src/akonadi-contacts/editor/utils/utils.h
diff --git a/src/editor/widgets/akonadicontactcombobox.cpp b/src/akonadi-contacts/editor/widgets/akonadicontactcombobox.cpp
index ca64876..ca64876 100644
--- a/src/editor/widgets/akonadicontactcombobox.cpp
+++ b/src/akonadi-contacts/editor/widgets/akonadicontactcombobox.cpp
diff --git a/src/editor/widgets/akonadicontactcombobox.h b/src/akonadi-contacts/editor/widgets/akonadicontactcombobox.h
index 44a72f8..44a72f8 100644
--- a/src/editor/widgets/akonadicontactcombobox.h
+++ b/src/akonadi-contacts/editor/widgets/akonadicontactcombobox.h
diff --git a/src/editor/widgets/autotests/CMakeLists.txt b/src/akonadi-contacts/editor/widgets/autotests/CMakeLists.txt
index 043d676..043d676 100644
--- a/src/editor/widgets/autotests/CMakeLists.txt
+++ b/src/akonadi-contacts/editor/widgets/autotests/CMakeLists.txt
diff --git a/src/editor/widgets/autotests/preferredlineeditwidgettest.cpp b/src/akonadi-contacts/editor/widgets/autotests/preferredlineeditwidgettest.cpp
index f105520..f105520 100644
--- a/src/editor/widgets/autotests/preferredlineeditwidgettest.cpp
+++ b/src/akonadi-contacts/editor/widgets/autotests/preferredlineeditwidgettest.cpp
diff --git a/src/editor/widgets/autotests/preferredlineeditwidgettest.h b/src/akonadi-contacts/editor/widgets/autotests/preferredlineeditwidgettest.h
index e854952..e854952 100644
--- a/src/editor/widgets/autotests/preferredlineeditwidgettest.h
+++ b/src/akonadi-contacts/editor/widgets/autotests/preferredlineeditwidgettest.h
diff --git a/src/editor/widgets/imagewidget.cpp b/src/akonadi-contacts/editor/widgets/imagewidget.cpp
index 8a5514d..8a5514d 100644
--- a/src/editor/widgets/imagewidget.cpp
+++ b/src/akonadi-contacts/editor/widgets/imagewidget.cpp
diff --git a/src/editor/widgets/imagewidget.h b/src/akonadi-contacts/editor/widgets/imagewidget.h
index 8f9b142..8f9b142 100644
--- a/src/editor/widgets/imagewidget.h
+++ b/src/akonadi-contacts/editor/widgets/imagewidget.h
diff --git a/src/editor/widgets/kwidgetlister.cpp b/src/akonadi-contacts/editor/widgets/kwidgetlister.cpp
index 21921e7..21921e7 100644
--- a/src/editor/widgets/kwidgetlister.cpp
+++ b/src/akonadi-contacts/editor/widgets/kwidgetlister.cpp
diff --git a/src/editor/widgets/kwidgetlister_p.h b/src/akonadi-contacts/editor/widgets/kwidgetlister_p.h
index 91290bb..91290bb 100644
--- a/src/editor/widgets/kwidgetlister_p.h
+++ b/src/akonadi-contacts/editor/widgets/kwidgetlister_p.h
diff --git a/src/editor/widgets/preferredlineeditwidget.cpp b/src/akonadi-contacts/editor/widgets/preferredlineeditwidget.cpp
index 247cdbc..247cdbc 100644
--- a/src/editor/widgets/preferredlineeditwidget.cpp
+++ b/src/akonadi-contacts/editor/widgets/preferredlineeditwidget.cpp
diff --git a/src/editor/widgets/preferredlineeditwidget.h b/src/akonadi-contacts/editor/widgets/preferredlineeditwidget.h
index 5e053d6..5e053d6 100644
--- a/src/editor/widgets/preferredlineeditwidget.h
+++ b/src/akonadi-contacts/editor/widgets/preferredlineeditwidget.h
diff --git a/src/emailaddressrequester.cpp b/src/akonadi-contacts/emailaddressrequester.cpp
index 9ddb5be..9ddb5be 100644
--- a/src/emailaddressrequester.cpp
+++ b/src/akonadi-contacts/emailaddressrequester.cpp
diff --git a/src/emailaddressrequester.h b/src/akonadi-contacts/emailaddressrequester.h
index 568749f..568749f 100644
--- a/src/emailaddressrequester.h
+++ b/src/akonadi-contacts/emailaddressrequester.h
diff --git a/src/emailaddressselection.cpp b/src/akonadi-contacts/emailaddressselection.cpp
index 971c895..971c895 100644
--- a/src/emailaddressselection.cpp
+++ b/src/akonadi-contacts/emailaddressselection.cpp
diff --git a/src/emailaddressselection.h b/src/akonadi-contacts/emailaddressselection.h
index d79bfc9..d79bfc9 100644
--- a/src/emailaddressselection.h
+++ b/src/akonadi-contacts/emailaddressselection.h
diff --git a/src/emailaddressselection_p.h b/src/akonadi-contacts/emailaddressselection_p.h
index 1f7cfd8..1f7cfd8 100644
--- a/src/emailaddressselection_p.h
+++ b/src/akonadi-contacts/emailaddressselection_p.h
diff --git a/src/emailaddressselectiondialog.cpp b/src/akonadi-contacts/emailaddressselectiondialog.cpp
index 5ab7adb..5ab7adb 100644
--- a/src/emailaddressselectiondialog.cpp
+++ b/src/akonadi-contacts/emailaddressselectiondialog.cpp
diff --git a/src/emailaddressselectiondialog.h b/src/akonadi-contacts/emailaddressselectiondialog.h
index fab7257..fab7257 100644
--- a/src/emailaddressselectiondialog.h
+++ b/src/akonadi-contacts/emailaddressselectiondialog.h
diff --git a/src/emailaddressselectionmodel.cpp b/src/akonadi-contacts/emailaddressselectionmodel.cpp
index 66fefd7..66fefd7 100644
--- a/src/emailaddressselectionmodel.cpp
+++ b/src/akonadi-contacts/emailaddressselectionmodel.cpp
diff --git a/src/emailaddressselectionmodel.h b/src/akonadi-contacts/emailaddressselectionmodel.h
index 24cac59..24cac59 100644
--- a/src/emailaddressselectionmodel.h
+++ b/src/akonadi-contacts/emailaddressselectionmodel.h
diff --git a/src/emailaddressselectionproxymodel.cpp b/src/akonadi-contacts/emailaddressselectionproxymodel.cpp
index e47bc6f..e47bc6f 100644
--- a/src/emailaddressselectionproxymodel.cpp
+++ b/src/akonadi-contacts/emailaddressselectionproxymodel.cpp
diff --git a/src/emailaddressselectionproxymodel_p.h b/src/akonadi-contacts/emailaddressselectionproxymodel_p.h
index 1e1582a..1e1582a 100644
--- a/src/emailaddressselectionproxymodel_p.h
+++ b/src/akonadi-contacts/emailaddressselectionproxymodel_p.h
diff --git a/src/emailaddressselectionwidget.cpp b/src/akonadi-contacts/emailaddressselectionwidget.cpp
index 251c41f..251c41f 100644
--- a/src/emailaddressselectionwidget.cpp
+++ b/src/akonadi-contacts/emailaddressselectionwidget.cpp
diff --git a/src/emailaddressselectionwidget.h b/src/akonadi-contacts/emailaddressselectionwidget.h
index 7644c86..7644c86 100644
--- a/src/emailaddressselectionwidget.h
+++ b/src/akonadi-contacts/emailaddressselectionwidget.h
diff --git a/src/job/contactgroupexpandjob.cpp b/src/akonadi-contacts/job/contactgroupexpandjob.cpp
index aa0fe99..aa0fe99 100644
--- a/src/job/contactgroupexpandjob.cpp
+++ b/src/akonadi-contacts/job/contactgroupexpandjob.cpp
diff --git a/src/job/contactgroupexpandjob.h b/src/akonadi-contacts/job/contactgroupexpandjob.h
index b93131f..b93131f 100644
--- a/src/job/contactgroupexpandjob.h
+++ b/src/akonadi-contacts/job/contactgroupexpandjob.h
diff --git a/src/job/contactgroupsearchjob.cpp b/src/akonadi-contacts/job/contactgroupsearchjob.cpp
index 3cb31fc..3cb31fc 100644
--- a/src/job/contactgroupsearchjob.cpp
+++ b/src/akonadi-contacts/job/contactgroupsearchjob.cpp
diff --git a/src/job/contactgroupsearchjob.h b/src/akonadi-contacts/job/contactgroupsearchjob.h
index 76efb1b..76efb1b 100644
--- a/src/job/contactgroupsearchjob.h
+++ b/src/akonadi-contacts/job/contactgroupsearchjob.h
diff --git a/src/job/contactsearchjob.cpp b/src/akonadi-contacts/job/contactsearchjob.cpp
index 9e71151..9e71151 100644
--- a/src/job/contactsearchjob.cpp
+++ b/src/akonadi-contacts/job/contactsearchjob.cpp
diff --git a/src/job/contactsearchjob.h b/src/akonadi-contacts/job/contactsearchjob.h
index 9f3fa1d..9f3fa1d 100644
--- a/src/job/contactsearchjob.h
+++ b/src/akonadi-contacts/job/contactsearchjob.h
diff --git a/src/leafextensionproxymodel.cpp b/src/akonadi-contacts/leafextensionproxymodel.cpp
index 2f4c83d..2f4c83d 100644
--- a/src/leafextensionproxymodel.cpp
+++ b/src/akonadi-contacts/leafextensionproxymodel.cpp
diff --git a/src/leafextensionproxymodel_p.h b/src/akonadi-contacts/leafextensionproxymodel_p.h
index b37aef2..b37aef2 100644
--- a/src/leafextensionproxymodel_p.h
+++ b/src/akonadi-contacts/leafextensionproxymodel_p.h
diff --git a/src/selectaddressbookdialog.cpp b/src/akonadi-contacts/selectaddressbookdialog.cpp
index 054b906..054b906 100644
--- a/src/selectaddressbookdialog.cpp
+++ b/src/akonadi-contacts/selectaddressbookdialog.cpp
diff --git a/src/selectaddressbookdialog.h b/src/akonadi-contacts/selectaddressbookdialog.h
index 04b6b78..04b6b78 100644
--- a/src/selectaddressbookdialog.h
+++ b/src/akonadi-contacts/selectaddressbookdialog.h
diff --git a/src/standardcontactactionmanager.cpp b/src/akonadi-contacts/standardcontactactionmanager.cpp
index e965d53..e965d53 100644
--- a/src/standardcontactactionmanager.cpp
+++ b/src/akonadi-contacts/standardcontactactionmanager.cpp
diff --git a/src/standardcontactactionmanager.h b/src/akonadi-contacts/standardcontactactionmanager.h
index 1edaa4d..1edaa4d 100644
--- a/src/standardcontactactionmanager.h
+++ b/src/akonadi-contacts/standardcontactactionmanager.h
diff --git a/src/standardcontactformatter.cpp b/src/akonadi-contacts/standardcontactformatter.cpp
index 2d01b7e..2d01b7e 100644
--- a/src/standardcontactformatter.cpp
+++ b/src/akonadi-contacts/standardcontactformatter.cpp
diff --git a/src/standardcontactformatter.h b/src/akonadi-contacts/standardcontactformatter.h
index 9a9412c..9a9412c 100644
--- a/src/standardcontactformatter.h
+++ b/src/akonadi-contacts/standardcontactformatter.h
diff --git a/src/standardcontactgroupformatter.cpp b/src/akonadi-contacts/standardcontactgroupformatter.cpp
index c181be4..c181be4 100644
--- a/src/standardcontactgroupformatter.cpp
+++ b/src/akonadi-contacts/standardcontactgroupformatter.cpp
diff --git a/src/standardcontactgroupformatter.h b/src/akonadi-contacts/standardcontactgroupformatter.h
index b8f7ad8..b8f7ad8 100644
--- a/src/standardcontactgroupformatter.h
+++ b/src/akonadi-contacts/standardcontactgroupformatter.h
diff --git a/src/textbrowser.cpp b/src/akonadi-contacts/textbrowser.cpp
index 656b76a..656b76a 100644
--- a/src/textbrowser.cpp
+++ b/src/akonadi-contacts/textbrowser.cpp
diff --git a/src/textbrowser_p.h b/src/akonadi-contacts/textbrowser_p.h
index 15f0e99..15f0e99 100644
--- a/src/textbrowser_p.h
+++ b/src/akonadi-contacts/textbrowser_p.h
diff --git a/src/waitingoverlay.cpp b/src/akonadi-contacts/waitingoverlay.cpp
index e937129..e937129 100644
--- a/src/waitingoverlay.cpp
+++ b/src/akonadi-contacts/waitingoverlay.cpp
diff --git a/src/waitingoverlay_p.h b/src/akonadi-contacts/waitingoverlay_p.h
index f671ab4..f671ab4 100644
--- a/src/waitingoverlay_p.h
+++ b/src/akonadi-contacts/waitingoverlay_p.h