summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-10-12 06:56:34 (GMT)
committerMontel Laurent <montel@kde.org>2016-10-12 06:56:34 (GMT)
commitedfee3a1fb7b7dcfb08e24977a8c25aac5bf52cf (patch)
tree381bfbaadc223e679ae482eaf6406aaebf0a4709
parent9130ef86aa523f6b02f3071ed7f1aaaf0ea76280 (diff)
Astyle kdelibs
-rw-r--r--kaddressbook/importexportplugins/csv/csvimportexportplugin.cpp2
-rw-r--r--kaddressbook/importexportplugins/csv/csvimportexportplugin.h1
-rw-r--r--kaddressbook/importexportplugins/csv/csvimportexportplugininterface.cpp6
-rw-r--r--kaddressbook/importexportplugins/csv/csvimportexportplugininterface.h1
-rw-r--r--kaddressbook/importexportplugins/gmx/gmximportexportplugin.cpp2
-rw-r--r--kaddressbook/importexportplugins/gmx/gmximportexportplugin.h1
-rw-r--r--kaddressbook/importexportplugins/gmx/gmximportexportplugininterface.cpp5
-rw-r--r--kaddressbook/importexportplugins/ldap/ldapimportexportplugin.cpp2
-rw-r--r--kaddressbook/importexportplugins/ldap/ldapimportexportplugin.h1
-rw-r--r--kaddressbook/importexportplugins/ldap/ldapimportexportplugininterface.cpp3
-rw-r--r--kaddressbook/importexportplugins/ldif/ldifimportexportplugin.cpp2
-rw-r--r--kaddressbook/importexportplugins/ldif/ldifimportexportplugin.h1
-rw-r--r--kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.cpp5
-rw-r--r--kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.h2
-rw-r--r--kaddressbook/importexportplugins/vcards/vcardimportexportplugin.cpp2
-rw-r--r--kaddressbook/importexportplugins/vcards/vcardimportexportplugin.h1
-rw-r--r--kaddressbook/importexportplugins/vcards/vcardimportexportplugininterface.cpp15
17 files changed, 9 insertions, 43 deletions
diff --git a/kaddressbook/importexportplugins/csv/csvimportexportplugin.cpp b/kaddressbook/importexportplugins/csv/csvimportexportplugin.cpp
index c2d3dd6..dcf1c23 100644
--- a/kaddressbook/importexportplugins/csv/csvimportexportplugin.cpp
+++ b/kaddressbook/importexportplugins/csv/csvimportexportplugin.cpp
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#include "csvimportexportplugin.h"
#include "csvimportexportplugininterface.h"
#include <kpluginfactory.h>
@@ -35,7 +34,6 @@ CSVImportExportPlugin::~CSVImportExportPlugin()
}
-
PimCommon::AbstractGenericPluginInterface *CSVImportExportPlugin::createInterface(KActionCollection *ac, QObject *parent)
{
CSVImportExportPluginInterface *interface = new CSVImportExportPluginInterface(parent);
diff --git a/kaddressbook/importexportplugins/csv/csvimportexportplugin.h b/kaddressbook/importexportplugins/csv/csvimportexportplugin.h
index 51eaf68..903c9a4 100644
--- a/kaddressbook/importexportplugins/csv/csvimportexportplugin.h
+++ b/kaddressbook/importexportplugins/csv/csvimportexportplugin.h
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#ifndef CSVIMPORTEXPORTPLUGIN_H
#define CSVIMPORTEXPORTPLUGIN_H
#include <KAddressBookImportExport/KAddressBookImportExportPlugin>
diff --git a/kaddressbook/importexportplugins/csv/csvimportexportplugininterface.cpp b/kaddressbook/importexportplugins/csv/csvimportexportplugininterface.cpp
index bf7d9bd..ecf95ea 100644
--- a/kaddressbook/importexportplugins/csv/csvimportexportplugininterface.cpp
+++ b/kaddressbook/importexportplugins/csv/csvimportexportplugininterface.cpp
@@ -46,7 +46,6 @@ CSVImportExportPluginInterface::~CSVImportExportPluginInterface()
}
-
void CSVImportExportPluginInterface::createAction(KActionCollection *ac)
{
QAction *action = ac->addAction(QStringLiteral("file_export_csv"));
@@ -62,10 +61,9 @@ void CSVImportExportPluginInterface::createAction(KActionCollection *ac)
connect(action, &QAction::triggered, this, &CSVImportExportPluginInterface::slotImportCVS);
}
-
void CSVImportExportPluginInterface::exec()
{
- switch(mImportExportAction) {
+ switch (mImportExportAction) {
case Import:
importCSV();
break;
@@ -226,13 +224,11 @@ void CSVImportExportPluginInterface::exportCSV()
}
}
-
bool CSVImportExportPluginInterface::canImportFileType(const QUrl &url)
{
return url.path().endsWith(QStringLiteral(".csv"));
}
-
void CSVImportExportPluginInterface::importFile(const QUrl &url)
{
//TODO
diff --git a/kaddressbook/importexportplugins/csv/csvimportexportplugininterface.h b/kaddressbook/importexportplugins/csv/csvimportexportplugininterface.h
index 4f2be22..97cec3f 100644
--- a/kaddressbook/importexportplugins/csv/csvimportexportplugininterface.h
+++ b/kaddressbook/importexportplugins/csv/csvimportexportplugininterface.h
@@ -44,7 +44,6 @@ private:
void exportToFile(QFile *file, const KContacts::Addressee::List &contacts) const;
void importCSV();
-
};
#endif // CSVIMPORTEXPORTPLUGININTERFACE_H
diff --git a/kaddressbook/importexportplugins/gmx/gmximportexportplugin.cpp b/kaddressbook/importexportplugins/gmx/gmximportexportplugin.cpp
index 2ef9a7a..50705cd 100644
--- a/kaddressbook/importexportplugins/gmx/gmximportexportplugin.cpp
+++ b/kaddressbook/importexportplugins/gmx/gmximportexportplugin.cpp
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#include "gmximportexportplugin.h"
#include "gmximportexportplugininterface.h"
#include <kpluginfactory.h>
@@ -35,7 +34,6 @@ GMXImportExportPlugin::~GMXImportExportPlugin()
}
-
PimCommon::AbstractGenericPluginInterface *GMXImportExportPlugin::createInterface(KActionCollection *ac, QObject *parent)
{
GMXImportExportPluginInterface *interface = new GMXImportExportPluginInterface(parent);
diff --git a/kaddressbook/importexportplugins/gmx/gmximportexportplugin.h b/kaddressbook/importexportplugins/gmx/gmximportexportplugin.h
index 930f021..af8fdd7 100644
--- a/kaddressbook/importexportplugins/gmx/gmximportexportplugin.h
+++ b/kaddressbook/importexportplugins/gmx/gmximportexportplugin.h
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#ifndef GMXIMPORTEXPORTPLUGIN_H
#define GMXIMPORTEXPORTPLUGIN_H
#include <KAddressBookImportExport/KAddressBookImportExportPlugin>
diff --git a/kaddressbook/importexportplugins/gmx/gmximportexportplugininterface.cpp b/kaddressbook/importexportplugins/gmx/gmximportexportplugininterface.cpp
index 74ae665..cb0ac9c 100644
--- a/kaddressbook/importexportplugins/gmx/gmximportexportplugininterface.cpp
+++ b/kaddressbook/importexportplugins/gmx/gmximportexportplugininterface.cpp
@@ -49,7 +49,6 @@ GMXImportExportPluginInterface::~GMXImportExportPluginInterface()
}
-
void GMXImportExportPluginInterface::createAction(KActionCollection *ac)
{
QAction *action = ac->addAction(QStringLiteral("file_import_gmx"));
@@ -67,7 +66,7 @@ void GMXImportExportPluginInterface::createAction(KActionCollection *ac)
void GMXImportExportPluginInterface::exec()
{
- switch(mImportExportAction) {
+ switch (mImportExportAction) {
case Import:
importGMX();
break;
@@ -445,7 +444,6 @@ void GMXImportExportPluginInterface::doExport(QFile *fp, const KContacts::Addres
t << "####" << endl;
}
-
void GMXImportExportPluginInterface::importGMX()
{
KAddressBookImportExport::KAddressBookImportExportContactList contactList;
@@ -672,7 +670,6 @@ void GMXImportExportPluginInterface::importGMX()
}
-
bool GMXImportExportPluginInterface::canImportFileType(const QUrl &url)
{
return url.path().endsWith(QStringLiteral(".gmx"));
diff --git a/kaddressbook/importexportplugins/ldap/ldapimportexportplugin.cpp b/kaddressbook/importexportplugins/ldap/ldapimportexportplugin.cpp
index 8b928e3..81257a4 100644
--- a/kaddressbook/importexportplugins/ldap/ldapimportexportplugin.cpp
+++ b/kaddressbook/importexportplugins/ldap/ldapimportexportplugin.cpp
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#include "ldapimportexportplugin.h"
#include "ldapimportexportplugininterface.h"
#include <kpluginfactory.h>
@@ -35,7 +34,6 @@ LDapImportExportPlugin::~LDapImportExportPlugin()
}
-
PimCommon::AbstractGenericPluginInterface *LDapImportExportPlugin::createInterface(KActionCollection *ac, QObject *parent)
{
LDapImportExportPluginInterface *interface = new LDapImportExportPluginInterface(parent);
diff --git a/kaddressbook/importexportplugins/ldap/ldapimportexportplugin.h b/kaddressbook/importexportplugins/ldap/ldapimportexportplugin.h
index 1d73315..9627839 100644
--- a/kaddressbook/importexportplugins/ldap/ldapimportexportplugin.h
+++ b/kaddressbook/importexportplugins/ldap/ldapimportexportplugin.h
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#ifndef LDAPIMPORTEXPORTPLUGIN_H
#define LDAPIMPORTEXPORTPLUGIN_H
#include <KAddressBookImportExport/KAddressBookImportExportPlugin>
diff --git a/kaddressbook/importexportplugins/ldap/ldapimportexportplugininterface.cpp b/kaddressbook/importexportplugins/ldap/ldapimportexportplugininterface.cpp
index f5ba4e8..2106275 100644
--- a/kaddressbook/importexportplugins/ldap/ldapimportexportplugininterface.cpp
+++ b/kaddressbook/importexportplugins/ldap/ldapimportexportplugininterface.cpp
@@ -37,7 +37,6 @@ LDapImportExportPluginInterface::~LDapImportExportPluginInterface()
}
-
void LDapImportExportPluginInterface::createAction(KActionCollection *ac)
{
QAction *action = ac->addAction(QStringLiteral("file_import_ldap"));
@@ -49,7 +48,7 @@ void LDapImportExportPluginInterface::createAction(KActionCollection *ac)
void LDapImportExportPluginInterface::exec()
{
- switch(mImportExportAction) {
+ switch (mImportExportAction) {
case Import:
importLdap();
break;
diff --git a/kaddressbook/importexportplugins/ldif/ldifimportexportplugin.cpp b/kaddressbook/importexportplugins/ldif/ldifimportexportplugin.cpp
index b230eda..d79b33f 100644
--- a/kaddressbook/importexportplugins/ldif/ldifimportexportplugin.cpp
+++ b/kaddressbook/importexportplugins/ldif/ldifimportexportplugin.cpp
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#include "ldifimportexportplugin.h"
#include "ldifimportexportplugininterface.h"
#include <kpluginfactory.h>
@@ -35,7 +34,6 @@ LDifImportExportPlugin::~LDifImportExportPlugin()
}
-
PimCommon::AbstractGenericPluginInterface *LDifImportExportPlugin::createInterface(KActionCollection *ac, QObject *parent)
{
LDifImportExportPluginInterface *interface = new LDifImportExportPluginInterface(parent);
diff --git a/kaddressbook/importexportplugins/ldif/ldifimportexportplugin.h b/kaddressbook/importexportplugins/ldif/ldifimportexportplugin.h
index dc02a9c..221d136 100644
--- a/kaddressbook/importexportplugins/ldif/ldifimportexportplugin.h
+++ b/kaddressbook/importexportplugins/ldif/ldifimportexportplugin.h
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#ifndef LDIFIMPORTEXPORTPLUGIN_H
#define LDIFIMPORTEXPORTPLUGIN_H
#include <KAddressBookImportExport/KAddressBookImportExportPlugin>
diff --git a/kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.cpp b/kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.cpp
index db48fd2..edac74e 100644
--- a/kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.cpp
+++ b/kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.cpp
@@ -46,7 +46,6 @@ LDifImportExportPluginInterface::~LDifImportExportPluginInterface()
}
-
void LDifImportExportPluginInterface::createAction(KActionCollection *ac)
{
QAction *action = ac->addAction(QStringLiteral("file_import_ldif"));
@@ -64,7 +63,7 @@ void LDifImportExportPluginInterface::createAction(KActionCollection *ac)
void LDifImportExportPluginInterface::exec()
{
- switch(mImportExportAction) {
+ switch (mImportExportAction) {
case Import:
importLdif();
break;
@@ -86,7 +85,6 @@ void LDifImportExportPluginInterface::slotExportLdif()
Q_EMIT emitPluginActivated(this);
}
-
void LDifImportExportPluginInterface::importLdif()
{
KAddressBookImportExport::KAddressBookImportExportContactList contactList;
@@ -206,7 +204,6 @@ void LDifImportExportPluginInterface::exportLdif()
}
}
-
bool LDifImportExportPluginInterface::canImportFileType(const QUrl &url)
{
return url.path().endsWith(QStringLiteral(".ldif"));
diff --git a/kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.h b/kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.h
index 863d874..ad63417 100644
--- a/kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.h
+++ b/kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.h
@@ -36,7 +36,7 @@ private:
void slotImportLdif();
void slotExportLdif();
void importLdif();
- void exportLdif();
+ void exportLdif();
};
diff --git a/kaddressbook/importexportplugins/vcards/vcardimportexportplugin.cpp b/kaddressbook/importexportplugins/vcards/vcardimportexportplugin.cpp
index 6b48d42..86c2497 100644
--- a/kaddressbook/importexportplugins/vcards/vcardimportexportplugin.cpp
+++ b/kaddressbook/importexportplugins/vcards/vcardimportexportplugin.cpp
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#include "vcardimportexportplugin.h"
#include "vcardimportexportplugininterface.h"
#include <kpluginfactory.h>
@@ -34,7 +33,6 @@ VCardImportExportPlugin::~VCardImportExportPlugin()
}
-
PimCommon::AbstractGenericPluginInterface *VCardImportExportPlugin::createInterface(KActionCollection *ac, QObject *parent)
{
VCardImportExportPluginInterface *interface = new VCardImportExportPluginInterface(parent);
diff --git a/kaddressbook/importexportplugins/vcards/vcardimportexportplugin.h b/kaddressbook/importexportplugins/vcards/vcardimportexportplugin.h
index 70564dd..0347379 100644
--- a/kaddressbook/importexportplugins/vcards/vcardimportexportplugin.h
+++ b/kaddressbook/importexportplugins/vcards/vcardimportexportplugin.h
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#ifndef VCARDIMPORTEXPORTPLUGIN_H
#define VCARDIMPORTEXPORTPLUGIN_H
#include <KAddressBookImportExport/KAddressBookImportExportPlugin>
diff --git a/kaddressbook/importexportplugins/vcards/vcardimportexportplugininterface.cpp b/kaddressbook/importexportplugins/vcards/vcardimportexportplugininterface.cpp
index 0951e22..9859885 100644
--- a/kaddressbook/importexportplugins/vcards/vcardimportexportplugininterface.cpp
+++ b/kaddressbook/importexportplugins/vcards/vcardimportexportplugininterface.cpp
@@ -51,7 +51,6 @@ VCardImportExportPluginInterface::~VCardImportExportPluginInterface()
}
-
void VCardImportExportPluginInterface::createAction(KActionCollection *ac)
{
QAction *action = ac->addAction(QStringLiteral("file_import_vcard"));
@@ -105,7 +104,7 @@ void VCardImportExportPluginInterface::slotExportVCard2()
void VCardImportExportPluginInterface::exec()
{
- switch(mImportExportAction) {
+ switch (mImportExportAction) {
case Import:
importVCard();
break;
@@ -408,7 +407,6 @@ bool VCardImportExportPluginInterface::doExport(const QUrl &url, const QByteArra
return job->exec();
}
-
void VCardImportExportPluginInterface::exportVCard()
{
QPointer<KAddressBookImportExport::KAddressBookContactSelectionDialog> dlg =
@@ -429,7 +427,6 @@ void VCardImportExportPluginInterface::exportVCard()
return;
}
-
KContacts::VCardConverter converter;
QUrl url;
@@ -449,8 +446,7 @@ void VCardImportExportPluginInterface::exportVCard()
return;
}
- switch(mExportVCardType)
- {
+ switch (mExportVCardType) {
case VCard2_1:
ok = doExport(url, converter.exportVCards(list, KContacts::VCardConverter::v2_1));
break;
@@ -486,8 +482,7 @@ void VCardImportExportPluginInterface::exportVCard()
bool tmpOk = false;
- switch(mExportVCardType)
- {
+ switch (mExportVCardType) {
case VCard2_1:
tmpOk = doExport(url, converter.exportVCards(list, KContacts::VCardConverter::v2_1));
break;
@@ -508,8 +503,7 @@ void VCardImportExportPluginInterface::exportVCard()
return; // user canceled export
}
- switch(mExportVCardType)
- {
+ switch (mExportVCardType) {
case VCard2_1:
ok = doExport(url, converter.exportVCards(list, KContacts::VCardConverter::v2_1));
break;
@@ -529,7 +523,6 @@ void VCardImportExportPluginInterface::exportVCard()
}
}
-
bool VCardImportExportPluginInterface::canImportFileType(const QUrl &url)
{
return url.path().endsWith(QStringLiteral(".vcf"));