Commit 7c75e2b1 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

astyle-kdelibs

parent 7891ffb4
...@@ -365,7 +365,7 @@ QStringList AbstractImportExportJob::restoreResourceFile(const QString &resource ...@@ -365,7 +365,7 @@ QStringList AbstractImportExportJob::restoreResourceFile(const QString &resource
const KArchiveEntry *dataResouceEntry = mArchiveDirectory->entry(dataFile); const KArchiveEntry *dataResouceEntry = mArchiveDirectory->entry(dataFile);
if (dataResouceEntry->isFile()) { if (dataResouceEntry->isFile()) {
const KArchiveFile *file = static_cast<const KArchiveFile *>(dataResouceEntry); const KArchiveFile *file = static_cast<const KArchiveFile *>(dataResouceEntry);
file->copyTo(newUrl.adjusted(QUrl::RemoveFilename|QUrl::StripTrailingSlash).path()); file->copyTo(newUrl.adjusted(QUrl::RemoveFilename | QUrl::StripTrailingSlash).path());
} }
settings.insert(QLatin1String("Path"), newUrl.path()); settings.insert(QLatin1String("Path"), newUrl.path());
......
...@@ -172,4 +172,3 @@ void ShowArchiveStructureDialog::readConfig() ...@@ -172,4 +172,3 @@ void ShowArchiveStructureDialog::readConfig()
} }
} }
...@@ -809,7 +809,7 @@ void ImportMailJob::restoreConfig() ...@@ -809,7 +809,7 @@ void ImportMailJob::restoreConfig()
copyToFile(entry, QString(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/") + QLatin1String("kmail2/adblockrules_local")), QLatin1String("adblockrules_local"), Utils::dataPath() + QLatin1String("kmail2/")); copyToFile(entry, QString(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/") + QLatin1String("kmail2/adblockrules_local")), QLatin1String("adblockrules_local"), Utils::dataPath() + QLatin1String("kmail2/"));
} }
} else { } else {
copyToFile(entry, QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + QLatin1String("kmail2/adblockrules_local"),QLatin1String("adblockrules_local"), Utils::dataPath() + QLatin1String("kmail2/") ); copyToFile(entry, QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + QLatin1String("kmail2/adblockrules_local"), QLatin1String("adblockrules_local"), Utils::dataPath() + QLatin1String("kmail2/"));
} }
} }
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include "pimsettingexporterwindow.h" #include "pimsettingexporterwindow.h"
#include <kaboutdata.h> #include <kaboutdata.h>
#include <KLocalizedString> #include <KLocalizedString>
#include <KDBusService> #include <KDBusService>
...@@ -38,8 +37,8 @@ int main(int argc, char *argv[]) ...@@ -38,8 +37,8 @@ int main(int argc, char *argv[])
migrate.migrate(); migrate.migrate();
KAboutData aboutData(QLatin1String("pimsettingexporter"), i18n("PIM Setting Exporter"), KAboutData aboutData(QLatin1String("pimsettingexporter"), i18n("PIM Setting Exporter"),
QLatin1String(KDEPIM_VERSION), i18n("PIM Setting Exporter"), KAboutLicense::GPL_V2, QLatin1String(KDEPIM_VERSION), i18n("PIM Setting Exporter"), KAboutLicense::GPL_V2,
i18n("Copyright © 2012-2014 pimsettingexporter authors")); i18n("Copyright © 2012-2014 pimsettingexporter authors"));
aboutData.addAuthor(i18n("Laurent Montel"), i18n("Maintainer"), QStringLiteral("montel@kde.org")); aboutData.addAuthor(i18n("Laurent Montel"), i18n("Maintainer"), QStringLiteral("montel@kde.org"));
QApplication::setWindowIcon(QIcon::fromTheme(QLatin1String("kontact"))); QApplication::setWindowIcon(QIcon::fromTheme(QLatin1String("kontact")));
QApplication app(argc, argv); QApplication app(argc, argv);
......
...@@ -79,4 +79,3 @@ void SynchronizeResourceJob::setListResources(const QStringList &resources) ...@@ -79,4 +79,3 @@ void SynchronizeResourceJob::setListResources(const QStringList &resources)
mListResources = resources; mListResources = resources;
} }
...@@ -123,9 +123,9 @@ QUrl Utils::adaptResourcePath(KSharedConfigPtr resourceConfig, const QString &st ...@@ -123,9 +123,9 @@ QUrl Utils::adaptResourcePath(KSharedConfigPtr resourceConfig, const QString &st
if (QFile(newUrl.path()).exists()) { if (QFile(newUrl.path()).exists()) {
QString newFileName = newUrl.path(); QString newFileName = newUrl.path();
for (int i = 0;; ++i) { for (int i = 0;; ++i) {
newFileName = newUrl.adjusted(QUrl::RemoveFilename|QUrl::StripTrailingSlash).path() + QLatin1Char('/') + QString::number(i) + QLatin1Char('/') + newUrl.fileName(); newFileName = newUrl.adjusted(QUrl::RemoveFilename | QUrl::StripTrailingSlash).path() + QLatin1Char('/') + QString::number(i) + QLatin1Char('/') + newUrl.fileName();
if (!QFile(newFileName).exists()) { if (!QFile(newFileName).exists()) {
QDir dir(newUrl.adjusted(QUrl::RemoveFilename|QUrl::StripTrailingSlash).path()); QDir dir(newUrl.adjusted(QUrl::RemoveFilename | QUrl::StripTrailingSlash).path());
dir.mkdir(QString::number(i)); dir.mkdir(QString::number(i));
break; break;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment