Commit a467c4b3 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

GIT_SILENT: coding style

parent 970b19ed
......@@ -125,7 +125,6 @@ protected:
int mIndex = -1;
static int sArchiveVersion;
void convertCollectionListStrToAkonadiId(const KSharedConfig::Ptr &config, const QString &groupName, const QString &key, bool addCollectionPrefix);
void convertRealPathToCollectionList(KConfigGroup &group, const QString &currentKey, bool addCollectionPrefix = true);
virtual Q_REQUIRED_RESULT Akonadi::Collection::Id convertFolderPathToCollectionId(const QString &path);
......
......@@ -58,7 +58,6 @@ void ExportAddressbookJobInterface::slotCheckBackupResource()
exportArchiveResource();
}
void ExportAddressbookJobInterface::slotCheckBackupConfig()
{
if (mTypeSelected & Utils::Config) {
......@@ -72,7 +71,6 @@ void ExportAddressbookJobInterface::slotCheckBackupConfig()
Q_EMIT jobFinished();
}
void ExportAddressbookJobInterface::backupConfig()
{
setProgressDialogLabel(i18n("Backing up config..."));
......@@ -118,4 +116,3 @@ void ExportAddressbookJobInterface::backupConfig()
Q_EMIT info(i18n("Config backup done."));
}
......@@ -41,7 +41,6 @@ ExportAddressbookJobInterfaceImpl::~ExportAddressbookJobInterfaceImpl()
{
}
void ExportAddressbookJobInterfaceImpl::exportArchiveResource()
{
QTimer::singleShot(0, this, &ExportAddressbookJobInterfaceImpl::slotWriteNextArchiveResource);
......
......@@ -30,7 +30,6 @@
#include <QDir>
#include <QStandardPaths>
ImportAddressbookJobInterface::ImportAddressbookJobInterface(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep)
: AbstractImportExportJob(parent, archiveStorage, typeSelected, numberOfStep)
{
......
......@@ -124,4 +124,3 @@ void ImportAddressbookJobInterfaceImpl::restoreResources()
//It's maildir support. Need to add support
startSynchronizeResources(listResource);
}
......@@ -73,7 +73,6 @@ void ExportAlarmJobInterface::slotCheckBackupConfig()
Q_EMIT jobFinished();
}
void ExportAlarmJobInterface::backupConfig()
{
setProgressDialogLabel(i18n("Backing up config..."));
......
......@@ -96,8 +96,6 @@ void ExportAlarmJobInterfaceImpl::slotWriteNextArchiveResource()
}
}
void ExportAlarmJobInterfaceImpl::exportArchiveResource()
{
QTimer::singleShot(0, this, &ExportAlarmJobInterfaceImpl::slotWriteNextArchiveResource);
......
......@@ -33,7 +33,6 @@
#include <QStandardPaths>
#include <QTimer>
ImportAlarmJobInterface::ImportAlarmJobInterface(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep)
: AbstractImportExportJob(parent, archiveStorage, typeSelected, numberOfStep)
{
......@@ -72,7 +71,6 @@ void ImportAlarmJobInterface::slotNextStep()
}
}
bool ImportAlarmJobInterface::isAConfigFile(const QString &name) const
{
return name.endsWith(QLatin1String("rc")) && (name.contains(QLatin1String("akonadi_kalarm_resource_"))
......
......@@ -115,4 +115,3 @@ void ImportAlarmJobInterfaceImpl::restoreResources()
//It's maildir support. Need to add support
startSynchronizeResources(listResource);
}
......@@ -30,7 +30,6 @@ QTEST_MAIN(ExportAddressbookJobInterfaceTest)
ExportAddressbookJobInterfaceTestImpl::ExportAddressbookJobInterfaceTestImpl(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep)
: ExportAddressbookJobInterface(parent, typeSelected, archiveStorage, numberOfStep)
{
}
ExportAddressbookJobInterfaceTestImpl::~ExportAddressbookJobInterfaceTestImpl()
......@@ -87,7 +86,3 @@ void ExportAddressbookJobInterfaceTest::exportAddressBookConfigTest1()
compareExportFile.setListFilePath(QStringLiteral(PIMDATAEXPORTER_DIR "/export/test1"));
compareExportFile.compareFiles();
}
......@@ -39,7 +39,6 @@ protected:
void convertCollectionListToRealPath(KConfigGroup &group, const QString &currentKey) override;
};
class ExportAddressbookJobInterfaceTest : public QObject
{
Q_OBJECT
......
......@@ -30,7 +30,6 @@ QTEST_MAIN(ExportAkregatorJobInterfaceTest)
ExportAkregatorJobInterfaceTestImpl::ExportAkregatorJobInterfaceTestImpl(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep)
: ExportAkregatorJobInterface(parent, typeSelected, archiveStorage, numberOfStep)
{
}
ExportAkregatorJobInterfaceTestImpl::~ExportAkregatorJobInterfaceTestImpl()
......@@ -71,7 +70,3 @@ void ExportAkregatorJobInterfaceTest::exportAkregatorConfigTest1()
compareExportFile.setListFilePath(QStringLiteral(PIMDATAEXPORTER_DIR "/export/test1"));
compareExportFile.compareFiles();
}
......@@ -32,7 +32,6 @@ public:
~ExportAkregatorJobInterfaceTestImpl();
};
class ExportAkregatorJobInterfaceTest : public QObject
{
Q_OBJECT
......
......@@ -30,7 +30,6 @@ QTEST_MAIN(ExportAlarmJobInterfaceTest)
ExportAlarmJobInterfaceTestImpl::ExportAlarmJobInterfaceTestImpl(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep)
: ExportAlarmJobInterface(parent, typeSelected, archiveStorage, numberOfStep)
{
}
ExportAlarmJobInterfaceTestImpl::~ExportAlarmJobInterfaceTestImpl()
......@@ -76,7 +75,3 @@ void ExportAlarmJobInterfaceTest::exportAlarmConfigTest1()
compareExportFile.setListFilePath(QStringLiteral(PIMDATAEXPORTER_DIR "/export/test1"));
compareExportFile.compareFiles();
}
......@@ -35,7 +35,6 @@ protected:
void exportArchiveResource() override;
};
class ExportAlarmJobInterfaceTest : public QObject
{
Q_OBJECT
......
......@@ -30,7 +30,6 @@ QTEST_MAIN(ExportCalendarsJobInterfaceTest)
ExportCalendarsJobInterfaceTestImpl::ExportCalendarsJobInterfaceTestImpl(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep)
: ExportCalendarJobInterface(parent, typeSelected, archiveStorage, numberOfStep)
{
}
ExportCalendarsJobInterfaceTestImpl::~ExportCalendarsJobInterfaceTestImpl()
......@@ -76,5 +75,3 @@ void ExportCalendarsJobInterfaceTest::exportCalendarConfigTest1()
compareExportFile.setListFilePath(QStringLiteral(PIMDATAEXPORTER_DIR "/export/test1"));
compareExportFile.compareFiles();
}
......@@ -35,7 +35,6 @@ protected:
void exportArchiveResource() override;
};
class ExportCalendarsJobInterfaceTest : public QObject
{
Q_OBJECT
......
......@@ -26,7 +26,6 @@
CompareExportFile::CompareExportFile()
{
}
CompareExportFile::~CompareExportFile()
......@@ -56,16 +55,15 @@ void CompareExportFile::compareFile(const QString &referenceFile, const QString
{
QProcess proc;
const QStringList args = QStringList()
<< QStringLiteral("-u")
<< referenceFile
<< archiveFile;
<< QStringLiteral("-u")
<< referenceFile
<< archiveFile;
proc.setProcessChannelMode(QProcess::ForwardedChannels);
proc.start(QStringLiteral("diff"), args);
QVERIFY(proc.waitForFinished());
QCOMPARE(proc.exitCode(), 0);
}
QString CompareExportFile::tempFilePath() const
{
return mTempFilePath;
......
......@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
#include "compareimportfile.h"
#include <QProcess>
......@@ -25,21 +24,19 @@
CompareImportFile::CompareImportFile()
{
}
CompareImportFile::~CompareImportFile()
{
}
void CompareImportFile::compareFile()
{
QProcess proc;
const QStringList args = QStringList()
<< QStringLiteral("-u")
<< mReferenceFilePath
<< mTempFilePath;
<< QStringLiteral("-u")
<< mReferenceFilePath
<< mTempFilePath;
proc.setProcessChannelMode(QProcess::ForwardedChannels);
proc.start(QStringLiteral("diff"), args);
QVERIFY(proc.waitForFinished());
......
......@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
#ifndef COMPAREIMPORTFILE_H
#define COMPAREIMPORTFILE_H
......
Markdown is supported
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