Commit 2e583f11 authored by David Jarvie's avatar David Jarvie
Browse files

Move all resource migration code into src/resources/migration/

parent b23c79bf
Pipeline #149196 failed with stage
in 19 seconds
......@@ -93,14 +93,14 @@ set(resources_SRCS
resources/fileresourceconfigmanager.cpp
resources/fileresourcecreator.cpp
resources/fileresourcedatamodel.cpp
resources/fileresourcemigrator.cpp
resources/fileresourcesettings.cpp
resources/fileresourcecalendarupdater.cpp
resources/singlefileresource.cpp
resources/singlefileresourceconfigdialog.cpp
resources/dirresourceimportdialog.cpp
resources/migration/collectionattribute.cpp
resources/migration/compatibilityattribute.cpp
resources/migration/dirresourceimportdialog.cpp
resources/migration/fileresourcemigrator.cpp
resources/calendarfunctions.h
resources/resourcetype.h
resources/resource.h
......@@ -116,14 +116,14 @@ set(resources_SRCS
resources/fileresourceconfigmanager.h
resources/fileresourcecreator.h
resources/fileresourcedatamodel.h
resources/fileresourcemigrator.h
resources/fileresourcesettings.h
resources/fileresourcecalendarupdater.h
resources/singlefileresource.h
resources/singlefileresourceconfigdialog.h
resources/dirresourceimportdialog.h
resources/migration/collectionattribute.h
resources/migration/compatibilityattribute.h
resources/migration/dirresourceimportdialog.h
resources/migration/fileresourcemigrator.h
)
set(kalarm_bin_SRCS ${libkalarm_SRCS} ${resources_SRCS}
......@@ -238,8 +238,8 @@ set(kalarm_bin_SRCS ${libkalarm_SRCS} ${resources_SRCS}
ki18n_wrap_ui(kalarm_bin_SRCS
wakedlg.ui
resources/singlefileresourceconfigdialog.ui
resources/dirresourceimportdialog_intro.ui
resources/dirresourceimportdialog_type.ui
resources/migration/dirresourceimportdialog_intro.ui
resources/migration/dirresourceimportdialog_type.ui
)
qt_add_dbus_adaptor(kalarm_bin_SRCS data/org.kde.kalarm.kalarm.xml dbushandler.h DBusHandler)
......
......@@ -10,7 +10,7 @@
#include "fileresourcecalendarupdater.h"
#include "fileresourcecreator.h"
#include "fileresourcemigrator.h"
#include "migration/fileresourcemigrator.h"
#include "eventmodel.h"
#include "resourcemodel.h"
#include "resources.h"
......
......@@ -11,8 +11,8 @@
#include "ui_dirresourceimportdialog_intro.h"
#include "ui_dirresourceimportdialog_type.h"
#include "resources.h"
#include "fileresource.h"
#include "resources/resources.h"
#include "resources/fileresource.h"
#include <KFileItem>
#include <KColorScheme>
......
......@@ -8,7 +8,7 @@
#pragma once
#include "resource.h"
#include "resources/resource.h"
#include "kalarmcalendar/kacalendar.h"
#include <KAssistantDialog>
......
......@@ -8,13 +8,13 @@
#include "fileresourcemigrator.h"
#include "collectionattribute.h"
#include "dirresourceimportdialog.h"
#include "fileresourcecalendarupdater.h"
#include "fileresourceconfigmanager.h"
#include "resources.h"
#include "migration/collectionattribute.h"
#include "calendarfunctions.h"
#include "preferences.h"
#include "resources/calendarfunctions.h"
#include "resources/fileresourcecalendarupdater.h"
#include "resources/fileresourceconfigmanager.h"
#include "resources/resources.h"
#include "lib/autoqpointer.h"
#include "lib/desktop.h"
#include "kalarmcalendar/version.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