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

Continue to rename class

parent cb1c9046
......@@ -88,7 +88,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"pimsettingexporter\")
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
configure_file(pimsettingexporter-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/pimsettingexporter-version.h @ONLY)
configure_file(pimdataexporter-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/pimdataexporter-version.h @ONLY)
add_definitions(-DQT_NO_FOREACH)
if(BUILD_TESTING)
......
......@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/
#include "pimsettingexporter-version.h"
#include "pimdataexporter-version.h"
#include "pimdataexporterconsole.h"
#include "pimdataexportconsole_debug.h"
#include <kaboutdata.h>
......
......@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef PIMSETTINGEXPORTERCONSOLE_H
#define PIMSETTINGEXPORTERCONSOLE_H
#ifndef PIMDATAEXPORTERCONSOLE_H
#define PIMDATAEXPORTERCONSOLE_H
#include <QObject>
class PimDataBackupRestore;
......@@ -72,4 +72,4 @@ private:
bool mInProgress = false;
};
#endif // PIMSETTINGEXPORTERCONSOLE_H
#endif // PIMDATAEXPORTERCONSOLE_H
......@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef PIMSETTINGIMPORTDATAINFOFILE_H
#define PIMSETTINGIMPORTDATAINFOFILE_H
#ifndef PIMDATAIMPORTDATAINFOFILE_H
#define PIMDATAIMPORTDATAINFOFILE_H
#include <QObject>
#include <QString>
......@@ -39,4 +39,4 @@ private:
QString mFilename;
};
#endif // PIMSETTINGIMPORTDATAINFOFILE_H
#endif // PIMDATAIMPORTDATAINFOFILE_H
......@@ -75,7 +75,8 @@ QHash<Utils::AppsType, Utils::importExportParameters> TemplateSelection::loadTem
QHash<Utils::AppsType, Utils::importExportParameters> value;
if (mStreamReader->readNextStartElement()) {
if (mStreamReader->name() == QLatin1String("pimsettingexporter")) {
//Compatibility with old version
if ((mStreamReader->name() == QLatin1String("pimsettingexporter")) || (mStreamReader->name() == QLatin1String("pimdataexporter"))) {
while (mStreamReader->readNextStartElement()) {
Utils::AppsType type = Utils::Unknown;
if (mStreamReader->name() == QLatin1String("kmail")) {
......@@ -150,7 +151,7 @@ void TemplateSelection::createTemplate(const QHash<Utils::AppsType, Utils::impor
mStreamWriter->setAutoFormattingIndent(2);
mStreamWriter->writeStartDocument();
mStreamWriter->writeStartElement(QStringLiteral("pimsettingexporter"));
mStreamWriter->writeStartElement(QStringLiteral("pimdataexporter"));
QHash<Utils::AppsType, Utils::importExportParameters>::const_iterator i = stored.constBegin();
while (i != stored.constEnd()) {
......
......@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef PIMSETTINGEXPORTERCONFIGUREDIALOGTEST_H
#define PIMSETTINGEXPORTERCONFIGUREDIALOGTEST_H
#ifndef PIMDATAEXPORTERCONFIGUREDIALOGTEST_H
#define PIMDATAEXPORTERCONFIGUREDIALOGTEST_H
#include <QObject>
......@@ -32,4 +32,4 @@ private Q_SLOTS:
void shouldHaveDefaultValue();
};
#endif // PIMSETTINGEXPORTERCONFIGUREDIALOGTEST_H
#endif // PIMDATAEXPORTERCONFIGUREDIALOGTEST_H
......@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef PIMSETTINGEXPORTERCONFIGUREWIDGETTEST_H
#define PIMSETTINGEXPORTERCONFIGUREWIDGETTEST_H
#ifndef PIMDATAEXPORTERCONFIGUREWIDGETTEST_H
#define PIMDATAEXPORTERCONFIGUREWIDGETTEST_H
#include <QObject>
......@@ -32,4 +32,4 @@ private Q_SLOTS:
void shouldHaveDefaultValue();
};
#endif // PIMSETTINGEXPORTERCONFIGUREWIDGETTEST_H
#endif // PIMDATAEXPORTERCONFIGUREWIDGETTEST_H
......@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef PIMSETTINGEXPORTERCONFIGUREDIALOG_H
#define PIMSETTINGEXPORTERCONFIGUREDIALOG_H
#ifndef PIMDATAEXPORTERCONFIGUREDIALOG_H
#define PIMDATAEXPORTERCONFIGUREDIALOG_H
#include <QDialog>
class PimDataExporterConfigureWidget;
......@@ -35,4 +35,4 @@ private:
PimDataExporterConfigureWidget *mConfigureWidget = nullptr;
};
#endif // PIMSETTINGEXPORTERCONFIGUREDIALOG_H
#endif // PIMDATAEXPORTERCONFIGUREDIALOG_H
......@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef PIMSETTINGSBACKUPRESTOREUI_H
#define PIMSETTINGSBACKUPRESTOREUI_H
#ifndef PIMDATABACKUPRESTOREUI_H
#define PIMDATABACKUPRESTOREUI_H
#include "pimdatabackuprestore.h"
......@@ -36,4 +36,4 @@ private:
QWidget *mParentWidget = nullptr;
};
#endif // PIMSETTINGSBACKUPRESTOREUI_H
#endif // PIMDATABACKUPRESTOREUI_H
......@@ -19,7 +19,7 @@
#include "pimdatacommandlineoption.h"
#include "pimdataexporterwindow.h"
#include "pimdataexportgui_debug.h"
#include "pimsettingexporter-version.h"
#include "pimdataexporter-version.h"
#include <KLocalizedString>
#include <KAboutData>
#include <QCommandLineParser>
......
......@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef PIMSETTINGCOMMANDLINEOPTION_H
#define PIMSETTINGCOMMANDLINEOPTION_H
#ifndef PIMDATACOMMANDLINEOPTION_H
#define PIMDATACOMMANDLINEOPTION_H
#include <QObject>
#include <QCommandLineParser>
......@@ -44,4 +44,4 @@ private:
PimDataExporterWindow *mExporterWindow = nullptr;
};
#endif // PIMSETTINGCOMMANDLINEOPTION_H
#endif // PIMDATACOMMANDLINEOPTION_H
......@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef PIMSETTINGEXPORTERWINDOW_H
#define PIMSETTINGEXPORTERWINDOW_H
#ifndef PIMDATAEXPORTERWINDOW_H
#define PIMDATAEXPORTERWINDOW_H
#include <kxmlguiwindow.h>
#include "utils.h"
class LogWidget;
......@@ -78,4 +78,4 @@ private:
PimDataTrayIcon *mTrayIcon = nullptr;
};
#endif /* PIMSETTINGEXPORTERWINDOW_H */
#endif /* PIMDATAEXPORTERWINDOW_H */
......@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef PIMSETTINGSTRAYICON_H
#define PIMSETTINGSTRAYICON_H
#ifndef PIMDATATRAYICON_H
#define PIMDATATRAYICON_H
#include <KStatusNotifierItem>
......@@ -30,4 +30,4 @@ public:
~PimDataTrayIcon();
};
#endif // PIMSETTINGSTRAYICON_H
#endif // PIMDATATRAYICON_H
......@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef PIMSETTINGEXPORTERCONFIGUREWIDGET_H
#define PIMSETTINGEXPORTERCONFIGUREWIDGET_H
#ifndef PIMDATAEXPORTERCONFIGUREWIDGET_H
#define PIMDATAEXPORTERCONFIGUREWIDGET_H
#include <QWidget>
class QCheckBox;
......@@ -41,4 +41,4 @@ private:
QCheckBox *mAlwaysMergeConfigFile = nullptr;
};
#endif // PIMSETTINGEXPORTERCONFIGUREWIDGET_H
#endif // PIMDATAEXPORTERCONFIGUREWIDGET_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