Dispatch files in core/ gui/ and jobs/ dirs

This commit is contained in:
Aurélien Gâteau 2014-08-08 13:25:56 +02:00
parent 8e2b4050e7
commit 693e9229c8
53 changed files with 127 additions and 120 deletions

View File

@ -21,34 +21,34 @@ calamares_add_plugin( partition
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
BootLoaderModel.cpp
CheckFileSystemJob.cpp
ColorUtils.cpp
CreatePartitionDialog.cpp
CreatePartitionJob.cpp
CreatePartitionTableJob.cpp
DeletePartitionJob.cpp
DeviceModel.cpp
EditExistingPartitionDialog.cpp
FillGlobalStorageJob.cpp
FormatPartitionJob.cpp
MoveFileSystemJob.cpp
PartitionCoreModule.cpp
PartitionInfo.cpp
PartitionIterator.cpp
PartitionJob.cpp
PartitionModel.cpp
PartitionPage.cpp
PartitionPreview.cpp
PartitionSizeController.cpp
PartitionViewStep.cpp
PMUtils.cpp
ResizePartitionJob.cpp
core/BootLoaderModel.cpp
core/ColorUtils.cpp
core/DeviceModel.cpp
core/PartitionCoreModule.cpp
core/PartitionInfo.cpp
core/PartitionIterator.cpp
core/PartitionModel.cpp
core/PMUtils.cpp
gui/CreatePartitionDialog.cpp
gui/EditExistingPartitionDialog.cpp
gui/PartitionPage.cpp
gui/PartitionPreview.cpp
gui/PartitionSizeController.cpp
gui/PartitionViewStep.cpp
jobs/CheckFileSystemJob.cpp
jobs/CreatePartitionJob.cpp
jobs/CreatePartitionTableJob.cpp
jobs/DeletePartitionJob.cpp
jobs/FillGlobalStorageJob.cpp
jobs/FormatPartitionJob.cpp
jobs/MoveFileSystemJob.cpp
jobs/PartitionJob.cpp
jobs/ResizePartitionJob.cpp
UI
CreatePartitionDialog.ui
CreatePartitionTableDialog.ui
EditExistingPartitionDialog.ui
PartitionPage.ui
gui/CreatePartitionDialog.ui
gui/CreatePartitionTableDialog.ui
gui/EditExistingPartitionDialog.ui
gui/PartitionPage.ui
LINK_LIBRARIES
calapm
calamaresui

View File

@ -15,10 +15,10 @@
* You should have received a copy of the GNU General Public License
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <BootLoaderModel.h>
#include <core/BootLoaderModel.h>
#include <PartitionInfo.h>
#include <PMUtils.h>
#include <core/PartitionInfo.h>
#include <core/PMUtils.h>
// CalaPM
#include <core/device.h>

View File

@ -16,9 +16,9 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <ColorUtils.h>
#include <core/ColorUtils.h>
#include <PMUtils.h>
#include <core/PMUtils.h>
// CalaPM
#include <core/partition.h>

View File

@ -15,8 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <DeviceModel.h>
#include <PartitionModel.h>
#include <core/DeviceModel.h>
#include <core/PartitionModel.h>
// CalaPM
#include <core/device.h>

View File

@ -16,10 +16,10 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <PMUtils.h>
#include <core/PMUtils.h>
#include <PartitionInfo.h>
#include <PartitionIterator.h>
#include <core/PartitionInfo.h>
#include <core/PartitionIterator.h>
// CalaPM
#include <core/partition.h>

View File

@ -16,20 +16,21 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <PartitionCoreModule.h>
#include <core/PartitionCoreModule.h>
#include <core/BootLoaderModel.h>
#include <core/DeviceModel.h>
#include <core/PartitionInfo.h>
#include <core/PartitionIterator.h>
#include <core/PartitionModel.h>
#include <core/PMUtils.h>
#include <jobs/CreatePartitionJob.h>
#include <jobs/CreatePartitionTableJob.h>
#include <jobs/DeletePartitionJob.h>
#include <jobs/FillGlobalStorageJob.h>
#include <jobs/FormatPartitionJob.h>
#include <jobs/ResizePartitionJob.h>
#include <BootLoaderModel.h>
#include <CreatePartitionJob.h>
#include <CreatePartitionTableJob.h>
#include <DeletePartitionJob.h>
#include <FillGlobalStorageJob.h>
#include <FormatPartitionJob.h>
#include <DeviceModel.h>
#include <PartitionInfo.h>
#include <PartitionIterator.h>
#include <PartitionModel.h>
#include <PMUtils.h>
#include <ResizePartitionJob.h>
#include <Typedefs.h>
#include <utils/Logger.h>

View File

@ -19,7 +19,7 @@
#ifndef PARTITIONCOREMODULE_H
#define PARTITIONCOREMODULE_H
#include <PartitionModel.h>
#include <core/PartitionModel.h>
#include <Typedefs.h>
// CalaPM

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <PartitionInfo.h>
#include <core/PartitionInfo.h>
// CalaPM
#include <core/partition.h>

View File

@ -16,7 +16,7 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <PartitionIterator.h>
#include <core/PartitionIterator.h>
// CalaPM
#include <core/device.h>

View File

@ -15,11 +15,11 @@
* You should have received a copy of the GNU General Public License
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <PartitionModel.h>
#include <core/PartitionModel.h>
#include <ColorUtils.h>
#include <PartitionInfo.h>
#include <PMUtils.h>
#include <core/ColorUtils.h>
#include <core/PartitionInfo.h>
#include <core/PMUtils.h>
#include <utils/Logger.h>
// CalaPM

View File

@ -16,13 +16,15 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <CreatePartitionDialog.h>
#include <gui/CreatePartitionDialog.h>
#include <core/ColorUtils.h>
#include <core/PartitionInfo.h>
#include <core/PMUtils.h>
#include <gui/PartitionSizeController.h>
#include <ColorUtils.h>
#include <PartitionInfo.h>
#include <PartitionSizeController.h>
#include <PMUtils.h>
#include <ui_CreatePartitionDialog.h>
#include <utils/Logger.h>
// CalaPM

View File

@ -16,14 +16,16 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <EditExistingPartitionDialog.h>
#include <gui/EditExistingPartitionDialog.h>
#include <core/ColorUtils.h>
#include <core/PartitionCoreModule.h>
#include <core/PartitionInfo.h>
#include <core/PMUtils.h>
#include <gui/PartitionSizeController.h>
#include <ColorUtils.h>
#include <PartitionCoreModule.h>
#include <PartitionInfo.h>
#include <PartitionSizeController.h>
#include <PMUtils.h>
#include <ui_EditExistingPartitionDialog.h>
#include <utils/Logger.h>
// CalaPM

View File

@ -19,13 +19,14 @@
#include "PartitionPage.h"
// Local
#include <BootLoaderModel.h>
#include <CreatePartitionDialog.h>
#include <EditExistingPartitionDialog.h>
#include <DeviceModel.h>
#include <PartitionCoreModule.h>
#include <PartitionModel.h>
#include <PMUtils.h>
#include <core/BootLoaderModel.h>
#include <core/DeviceModel.h>
#include <core/PartitionCoreModule.h>
#include <core/PartitionModel.h>
#include <core/PMUtils.h>
#include <gui/CreatePartitionDialog.h>
#include <gui/EditExistingPartitionDialog.h>
#include <ui_PartitionPage.h>
#include <ui_CreatePartitionTableDialog.h>

View File

@ -177,7 +177,7 @@
<customwidget>
<class>PartitionPreview</class>
<extends>QFrame</extends>
<header location="global">PartitionPreview.h</header>
<header location="global">gui/PartitionPreview.h</header>
<container>1</container>
</customwidget>
</customwidgets>

View File

@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <PartitionPreview.h>
#include <gui/PartitionPreview.h>
#include <PartitionModel.h>
#include <core/PartitionModel.h>
// Qt
#include <QDebug>

View File

@ -16,9 +16,9 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <PartitionSizeController.h>
#include <gui/PartitionSizeController.h>
#include <ColorUtils.h>
#include <core/ColorUtils.h>
// Qt
#include <QSpinBox>

View File

@ -16,13 +16,13 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <PartitionViewStep.h>
#include <gui/PartitionViewStep.h>
#include <DeviceModel.h>
#include <PartitionCoreModule.h>
#include <PartitionModel.h>
#include <PartitionPage.h>
#include <PartitionPreview.h>
#include <core/DeviceModel.h>
#include <core/PartitionCoreModule.h>
#include <core/PartitionModel.h>
#include <gui/PartitionPage.h>
#include <gui/PartitionPreview.h>
// Qt
#include <QFormLayout>

View File

@ -16,7 +16,7 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <CheckFileSystemJob.h>
#include <jobs/CheckFileSystemJob.h>
// CalaPM
#include <core/partition.h>

View File

@ -19,7 +19,7 @@
#ifndef CHECKFILESYSTEMJOB_H
#define CHECKFILESYSTEMJOB_H
#include <PartitionJob.h>
#include <jobs/PartitionJob.h>
/**
* Runs a file system check on an existing partition.

View File

@ -16,7 +16,7 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <CreatePartitionJob.h>
#include <jobs/CreatePartitionJob.h>
#include <utils/Logger.h>

View File

@ -19,7 +19,7 @@
#ifndef CREATEPARTITIONJOB_H
#define CREATEPARTITIONJOB_H
#include <PartitionJob.h>
#include <jobs/PartitionJob.h>
class Device;
class Partition;

View File

@ -16,7 +16,7 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <CreatePartitionTableJob.h>
#include <jobs/CreatePartitionTableJob.h>
#include <utils/Logger.h>

View File

@ -16,7 +16,7 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <DeletePartitionJob.h>
#include <jobs/DeletePartitionJob.h>
// CalaPM
#include <backend/corebackend.h>

View File

@ -19,7 +19,7 @@
#ifndef DELETEPARTITIONJOB_H
#define DELETEPARTITIONJOB_H
#include <PartitionJob.h>
#include <jobs/PartitionJob.h>
class Device;
class Partition;

View File

@ -16,13 +16,13 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <FillGlobalStorageJob.h>
#include <jobs/FillGlobalStorageJob.h>
#include <GlobalStorage.h>
#include <JobQueue.h>
#include <PartitionInfo.h>
#include <PartitionIterator.h>
#include <PMUtils.h>
#include <core/PartitionInfo.h>
#include <core/PartitionIterator.h>
#include <core/PMUtils.h>
// CalaPM
#include <core/device.h>

View File

@ -16,7 +16,7 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <FormatPartitionJob.h>
#include <jobs/FormatPartitionJob.h>
#include <utils/Logger.h>

View File

@ -19,7 +19,7 @@
#ifndef FORMATPARTITIONJOB_H
#define FORMATPARTITIONJOB_H
#include <PartitionJob.h>
#include <jobs/PartitionJob.h>
class Device;
class Partition;

View File

@ -40,7 +40,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include <MoveFileSystemJob.h>
#include <jobs/MoveFileSystemJob.h>
#include <utils/Logger.h>

View File

@ -40,7 +40,7 @@
#ifndef MOVEFILESYSTEMJOB_H
#define MOVEFILESYSTEMJOB_H
#include <PartitionJob.h>
#include <jobs/PartitionJob.h>
class CopySourceDevice;
class CopyTargetDevice;

View File

@ -16,7 +16,7 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <PartitionJob.h>
#include <jobs/PartitionJob.h>
PartitionJob::PartitionJob( Partition* partition )
: m_partition( partition )

View File

@ -38,10 +38,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include <ResizePartitionJob.h>
#include <jobs/ResizePartitionJob.h>
#include <CheckFileSystemJob.h>
#include <MoveFileSystemJob.h>
#include <jobs/CheckFileSystemJob.h>
#include <jobs/MoveFileSystemJob.h>
#include <utils/Logger.h>
// CalaPM

View File

@ -19,7 +19,7 @@
#ifndef RESIZEPARTITIONJOB_H
#define RESIZEPARTITIONJOB_H
#include <PartitionJob.h>
#include <jobs/PartitionJob.h>
class Device;
class Partition;

View File

@ -2,16 +2,16 @@ find_package( Qt5 COMPONENTS Test REQUIRED )
include( ECMAddTests )
set( jobtests_SRCS
${PartitionModule_SOURCE_DIR}/CheckFileSystemJob.cpp
${PartitionModule_SOURCE_DIR}/CreatePartitionJob.cpp
${PartitionModule_SOURCE_DIR}/CreatePartitionTableJob.cpp
${PartitionModule_SOURCE_DIR}/DeletePartitionJob.cpp
${PartitionModule_SOURCE_DIR}/MoveFileSystemJob.cpp
${PartitionModule_SOURCE_DIR}/PartitionInfo.cpp
${PartitionModule_SOURCE_DIR}/PartitionIterator.cpp
${PartitionModule_SOURCE_DIR}/PartitionJob.cpp
${PartitionModule_SOURCE_DIR}/PMUtils.cpp
${PartitionModule_SOURCE_DIR}/ResizePartitionJob.cpp
${PartitionModule_SOURCE_DIR}/core/PMUtils.cpp
${PartitionModule_SOURCE_DIR}/core/PartitionInfo.cpp
${PartitionModule_SOURCE_DIR}/core/PartitionIterator.cpp
${PartitionModule_SOURCE_DIR}/jobs/CheckFileSystemJob.cpp
${PartitionModule_SOURCE_DIR}/jobs/CreatePartitionJob.cpp
${PartitionModule_SOURCE_DIR}/jobs/CreatePartitionTableJob.cpp
${PartitionModule_SOURCE_DIR}/jobs/DeletePartitionJob.cpp
${PartitionModule_SOURCE_DIR}/jobs/MoveFileSystemJob.cpp
${PartitionModule_SOURCE_DIR}/jobs/PartitionJob.cpp
${PartitionModule_SOURCE_DIR}/jobs/ResizePartitionJob.cpp
JobTests.cpp
)

View File

@ -1,9 +1,9 @@
#include <JobTests.h>
#include <CreatePartitionJob.h>
#include <CreatePartitionTableJob.h>
#include <ResizePartitionJob.h>
#include <PMUtils.h>
#include <jobs/CreatePartitionJob.h>
#include <jobs/CreatePartitionTableJob.h>
#include <jobs/ResizePartitionJob.h>
#include <core/PMUtils.h>
// CalaPM
#include <CalaPM.h>