Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 3923d109 authored by Laurent Montel's avatar Laurent Montel 😁

Move gui class to gui directory

parent bb7ce5aa
......@@ -44,17 +44,6 @@ set(pimsettingexporter_notes_SRCS
notes/importnotesjob.cpp
)
set(pimsettingexporter_dialog_SRCS
dialog/selectiontypedialog.cpp
dialog/backupfilestructureinfodialog.cpp
dialog/showarchivestructuredialog.cpp
)
set(pimsettingexporter_widget_SRCS
widgets/selectiontypetreewidget.cpp
widgets/logwidget.cpp
)
set(pimsettingexporter_xml_SRCS
xml/templateselection.cpp
)
......@@ -75,7 +64,6 @@ set(pimsettingexporter_blogilo_SRCS
)
set(pimsettingexporter_LIB_SRCS
${pimsettingexporter_widget_SRCS}
${pimsettingexporter_xml_SRCS}
${pimsettingexporter_notes_SRCS}
${pimsettingexporter_alarm_SRCS}
......@@ -83,7 +71,6 @@ set(pimsettingexporter_LIB_SRCS
${pimsettingexporter_mail_SRCS}
${pimsettingexporter_calendar_SRCS}
${pimsettingexporter_addressbook_SRCS}
${pimsettingexporter_dialog_SRCS}
${pimsettingexporter_jot_SRCS}
${pimsettingexporter_akregator_SRCS}
${pimsettingexporter_blogilo_SRCS}
......
......@@ -28,12 +28,9 @@
#include <KZip>
#include <KTempDir>
#include <KLocalizedString>
#include <KMessageBox>
#include <KStandardDirs>
#include <KTemporaryFile>
#include <QWidget>
#include <QProgressDialog>
#include <QFile>
#include <QDir>
......
......@@ -9,7 +9,21 @@ include_directories(${AKONADI_INCLUDE_DIR}
)
set(pimsettingexporter_widget_SRCS
widgets/selectiontypetreewidget.cpp
widgets/logwidget.cpp
)
set(pimsettingexporter_dialog_SRCS
dialog/selectiontypedialog.cpp
dialog/backupfilestructureinfodialog.cpp
dialog/showarchivestructuredialog.cpp
)
set(pimsettingexporter_SRCS
${pimsettingexporter_widget_SRCS}
${pimsettingexporter_dialog_SRCS}
pimsettingsbackuprestoreui.cpp
importexportprogressindicatorgui.cpp
pimsettingexporterwindow.cpp
......
......@@ -16,7 +16,7 @@
*/
#include "selectiontypedialog.h"
#include "widgets/selectiontypetreewidget.h"
#include "gui/widgets/selectiontypetreewidget.h"
#include <KLocalizedString>
#include <QHBoxLayout>
......
......@@ -2,7 +2,7 @@ include_directories(${CMAKE_SOURCE_DIR}/pimcommon/
)
set(selectiontreewidget_gui_SRCS selectiontreewidget_gui.cpp ../dialog/selectiontypedialog.cpp ../widgets/selectiontypetreewidget.cpp ../utils.cpp ../xml/templateselection.cpp)
set(selectiontreewidget_gui_SRCS selectiontreewidget_gui.cpp ../gui/dialog/selectiontypedialog.cpp ../gui/widgets/selectiontypetreewidget.cpp ../utils.cpp ../xml/templateselection.cpp)
kde4_add_executable(selectiontreewidget_gui TEST ${selectiontreewidget_gui_SRCS})
target_link_libraries(selectiontreewidget_gui
${QT_QTCORE_LIBRARY}
......@@ -17,7 +17,7 @@ target_link_libraries(selectiontreewidget_gui
pimcommon
)
set(showarchivestructuredialog_gui_SRCS showarchivestructuredialog_gui.cpp ../dialog/showarchivestructuredialog.cpp ../utils.cpp ../xml/templateselection.cpp)
set(showarchivestructuredialog_gui_SRCS showarchivestructuredialog_gui.cpp ../gui/dialog/showarchivestructuredialog.cpp ../utils.cpp ../xml/templateselection.cpp)
kde4_add_executable(showarchivestructuredialog_gui TEST ${showarchivestructuredialog_gui_SRCS})
target_link_libraries(showarchivestructuredialog_gui
${QT_QTCORE_LIBRARY}
......
......@@ -15,7 +15,7 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "../dialog/selectiontypedialog.h"
#include "../gui/dialog/selectiontypedialog.h"
#include <kdebug.h>
#include <kapplication.h>
......
......@@ -15,7 +15,7 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "../dialog/showarchivestructuredialog.h"
#include "../gui/dialog/showarchivestructuredialog.h"
#include <kdebug.h>
#include <kapplication.h>
......
......@@ -82,38 +82,38 @@ struct importExportParameters
KUrl resourcePath(KSharedConfigPtr resourceConfig, const QString &defaultPath = QString());
QString transportsPath();
QString resourcesPath();
QString identitiesPath();
QString mailsPath();
QString configsPath();
QString akonadiPath();
QString dataPath();
QString calendarPath();
QString addressbookPath();
QString alarmPath();
QString jotPath();
QString infoPath();
QString notePath();
QString prefixAkonadiConfigFile();
QString akonadiAgentName(const QString &configPath);
void convertCollectionListToRealPath(KConfigGroup &group, const QString &currentKey);
void convertCollectionToRealPath(KConfigGroup &group, const QString &currentKey);
void convertCollectionIdsToRealPath(KConfigGroup &group, const QString &currentKey);
KUrl resourcePath(const Akonadi::AgentInstance &agent, const QString &defaultPath = QString());
KUrl adaptResourcePath(KSharedConfigPtr resourceConfig, const QString &storedData);
QString storeResources(KZip *archive, const QString &identifier, const QString &path);
KUrl akonadiAgentConfigPath(const QString &identifier);
KZip *openZip(const QString &filename, QString &errorMsg);
PIMSETTINGEXPORT_EXPORT QString transportsPath();
PIMSETTINGEXPORT_EXPORT QString resourcesPath();
PIMSETTINGEXPORT_EXPORT QString identitiesPath();
PIMSETTINGEXPORT_EXPORT QString mailsPath();
PIMSETTINGEXPORT_EXPORT QString configsPath();
PIMSETTINGEXPORT_EXPORT QString akonadiPath();
PIMSETTINGEXPORT_EXPORT QString dataPath();
PIMSETTINGEXPORT_EXPORT QString calendarPath();
PIMSETTINGEXPORT_EXPORT QString addressbookPath();
PIMSETTINGEXPORT_EXPORT QString alarmPath();
PIMSETTINGEXPORT_EXPORT QString jotPath();
PIMSETTINGEXPORT_EXPORT QString infoPath();
PIMSETTINGEXPORT_EXPORT QString notePath();
PIMSETTINGEXPORT_EXPORT QString prefixAkonadiConfigFile();
PIMSETTINGEXPORT_EXPORT QString akonadiAgentName(const QString &configPath);
PIMSETTINGEXPORT_EXPORT void convertCollectionListToRealPath(KConfigGroup &group, const QString &currentKey);
PIMSETTINGEXPORT_EXPORT void convertCollectionToRealPath(KConfigGroup &group, const QString &currentKey);
PIMSETTINGEXPORT_EXPORT void convertCollectionIdsToRealPath(KConfigGroup &group, const QString &currentKey);
PIMSETTINGEXPORT_EXPORT KUrl resourcePath(const Akonadi::AgentInstance &agent, const QString &defaultPath = QString());
PIMSETTINGEXPORT_EXPORT KUrl adaptResourcePath(KSharedConfigPtr resourceConfig, const QString &storedData);
PIMSETTINGEXPORT_EXPORT QString storeResources(KZip *archive, const QString &identifier, const QString &path);
PIMSETTINGEXPORT_EXPORT KUrl akonadiAgentConfigPath(const QString &identifier);
PIMSETTINGEXPORT_EXPORT KZip *openZip(const QString &filename, QString &errorMsg);
PIMSETTINGEXPORT_EXPORT void addVersion(KZip *archive);
PIMSETTINGEXPORT_EXPORT int archiveVersion(KZip *archive);
PIMSETTINGEXPORT_EXPORT int currentArchiveVersion();
QString appTypeToI18n(AppsType type);
QString storedTypeToI18n(StoredType type);
PIMSETTINGEXPORT_EXPORT QString appTypeToI18n(AppsType type);
PIMSETTINGEXPORT_EXPORT QString storedTypeToI18n(StoredType type);
}
#endif // UTILS_H
......@@ -18,11 +18,12 @@
#ifndef TEMPLATESELECTION_H
#define TEMPLATESELECTION_H
#include "pimsettingexporter_export.h"
#include <QHash>
#include <QDomDocument>
#include "utils.h"
class TemplateSelection
class PIMSETTINGEXPORT_EXPORT TemplateSelection
{
public:
TemplateSelection(const QString &path = QString());
......
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