Remove "../include/" from GParted header #includes

It made the code look a little messy, is easily resolved in the build
system and made the dependencies more complicated than needed.  Each
GParted header was tracked via multiple different names (different
numbers of "../include/" prefixes).  For example just looking at how
DialogFeatures.o depends on Utils.h:

    $ cd src
    $ make DialogFeatures.o
    $ egrep ' [^ ]*Utils.h' .deps/DialogFeatures.Po
     ../include/DialogFeatures.h ../include/../include/Utils.h \
     ../include/../include/../include/../include/../include/../include/Utils.h \
     ../include/../include/../include/Utils.h \

After removing "../include/" from the GParted header #includes, just
need to add "-I../include" to the compile command via the AM_CPPFLAGS in
src/Makefile.am.  Now the dependencies on GParted header files are
tracked under a single name (with a single "../include/" prefix).  Now
DialogFeatures.o only depends on a single name to Utils.h:

    $ make DialogFeatures.o
    $ egrep ' [^ ]*Utils.h' .deps/DialogFeatures.Po
     ../include/DialogFeatures.h ../include/Utils.h ../include/i18n.h \
This commit is contained in:
Mike Fleetwood 2016-10-18 23:45:28 +01:00 committed by Curtis Gedak
parent 683b4da0e4
commit 8979913a3f
125 changed files with 395 additions and 411 deletions

View File

@ -17,8 +17,8 @@
#ifndef GPARTED_COPYBLOCKS_H #ifndef GPARTED_COPYBLOCKS_H
#define GPARTED_COPYBLOCKS_H #define GPARTED_COPYBLOCKS_H
#include "../include/OperationDetail.h" #include "OperationDetail.h"
#include "../include/Utils.h" #include "Utils.h"
#include <glibmm/ustring.h> #include <glibmm/ustring.h>
#include <parted/parted.h> #include <parted/parted.h>

View File

@ -26,9 +26,9 @@
#ifndef GPARTED_DMRAID_H #ifndef GPARTED_DMRAID_H
#define GPARTED_DMRAID_H #define GPARTED_DMRAID_H
#include "../include/Utils.h" #include "Utils.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/OperationDetail.h" #include "OperationDetail.h"
#include <vector> #include <vector>

View File

@ -18,8 +18,8 @@
#ifndef GPARTED_DEVICE_H #ifndef GPARTED_DEVICE_H
#define GPARTED_DEVICE_H #define GPARTED_DEVICE_H
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
namespace GParted namespace GParted
{ {

View File

@ -18,7 +18,7 @@
#ifndef GPARTED_DIALOGFEATURES_H #ifndef GPARTED_DIALOGFEATURES_H
#define GPARTED_DIALOGFEATURES_H #define GPARTED_DIALOGFEATURES_H
#include "../include/Utils.h" #include "Utils.h"
#include <gtkmm/dialog.h> #include <gtkmm/dialog.h>
#include <gtkmm/frame.h> #include <gtkmm/frame.h>

View File

@ -18,7 +18,7 @@
#ifndef GPARTED_DIALOGMANAGEFLAGS_H #ifndef GPARTED_DIALOGMANAGEFLAGS_H
#define GPARTED_DIALOGMANAGEFLAGS_H #define GPARTED_DIALOGMANAGEFLAGS_H
#include "../include/Partition.h" #include "Partition.h"
#include <gtkmm/dialog.h> #include <gtkmm/dialog.h>
#include <gtkmm/treeview.h> #include <gtkmm/treeview.h>

View File

@ -18,8 +18,8 @@
#ifndef GPARTED_DIALOG_BASE_PARTITION_H #ifndef GPARTED_DIALOG_BASE_PARTITION_H
#define GPARTED_DIALOG_BASE_PARTITION_H #define GPARTED_DIALOG_BASE_PARTITION_H
#include "../include/Frame_Resizer_Extended.h" #include "Frame_Resizer_Extended.h"
#include "../include/Partition.h" #include "Partition.h"
#include <gtkmm/dialog.h> #include <gtkmm/dialog.h>
#include <gtkmm/stock.h> #include <gtkmm/stock.h>

View File

@ -18,8 +18,8 @@
#ifndef GPARTED_DIALOG_DISKLABEL_H #ifndef GPARTED_DIALOG_DISKLABEL_H
#define GPARTED_DIALOG_DISKLABEL_H #define GPARTED_DIALOG_DISKLABEL_H
#include "../include/Utils.h" #include "Utils.h"
#include "../include/Device.h" #include "Device.h"
#include <gtkmm/dialog.h> #include <gtkmm/dialog.h>
#include <gtkmm/button.h> #include <gtkmm/button.h>

View File

@ -17,8 +17,8 @@
#ifndef GPARTED_DIALOG_FILESYSTEM_LABEL_H #ifndef GPARTED_DIALOG_FILESYSTEM_LABEL_H
#define GPARTED_DIALOG_FILESYSTEM_LABEL_H #define GPARTED_DIALOG_FILESYSTEM_LABEL_H
#include "../include/Partition.h" #include "Partition.h"
#include "../include/i18n.h" #include "i18n.h"
#include <gtkmm/dialog.h> #include <gtkmm/dialog.h>
#include <gtkmm/stock.h> #include <gtkmm/stock.h>

View File

@ -18,8 +18,8 @@
#ifndef GPARTED_DIALOG_PARTITION_COPY_H #ifndef GPARTED_DIALOG_PARTITION_COPY_H
#define GPARTED_DIALOG_PARTITION_COPY_H #define GPARTED_DIALOG_PARTITION_COPY_H
#include "../include/Dialog_Base_Partition.h" #include "Dialog_Base_Partition.h"
#include "../include/Partition.h" #include "Partition.h"
namespace GParted namespace GParted
{ {

View File

@ -20,8 +20,8 @@
//what kind of info would one prefer to see here? //what kind of info would one prefer to see here?
//my guess is, it's best to keep the amount of info minimal and wait for users requests //my guess is, it's best to keep the amount of info minimal and wait for users requests
#include "../include/Partition.h" #include "Partition.h"
#include "../include/i18n.h" #include "i18n.h"
#include <gtkmm/dialog.h> #include <gtkmm/dialog.h>
#include <gtkmm/stock.h> #include <gtkmm/stock.h>

View File

@ -17,8 +17,8 @@
#ifndef GPARTED_DIALOG_PARTITION_NAME_H #ifndef GPARTED_DIALOG_PARTITION_NAME_H
#define GPARTED_DIALOG_PARTITION_NAME_H #define GPARTED_DIALOG_PARTITION_NAME_H
#include "../include/Partition.h" #include "Partition.h"
#include "../include/i18n.h" #include "i18n.h"
#include <gtkmm/dialog.h> #include <gtkmm/dialog.h>
#include <gtkmm/stock.h> #include <gtkmm/stock.h>

View File

@ -18,9 +18,9 @@
#ifndef GPARTED_DIALOG_PARTITION_NEW_H #ifndef GPARTED_DIALOG_PARTITION_NEW_H
#define GPARTED_DIALOG_PARTITION_NEW_H #define GPARTED_DIALOG_PARTITION_NEW_H
#include "../include/Dialog_Base_Partition.h" #include "Dialog_Base_Partition.h"
#include "../include/Device.h" #include "Device.h"
#include "../include/Partition.h" #include "Partition.h"
#include <gtkmm/optionmenu.h> #include <gtkmm/optionmenu.h>

View File

@ -17,9 +17,9 @@
#ifndef GPARTED_DIALOG_PARTITION_RESIZE_MOVE_H #ifndef GPARTED_DIALOG_PARTITION_RESIZE_MOVE_H
#define GPARTED_DIALOG_PARTITION_RESIZE_MOVE_H #define GPARTED_DIALOG_PARTITION_RESIZE_MOVE_H
#include "../include/Dialog_Base_Partition.h" #include "Dialog_Base_Partition.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
namespace GParted namespace GParted
{ {

View File

@ -18,9 +18,9 @@
#ifndef GPARTED_DIALOG_PROGRESS_H #ifndef GPARTED_DIALOG_PROGRESS_H
#define GPARTED_DIALOG_PROGRESS_H #define GPARTED_DIALOG_PROGRESS_H
#include "../include/i18n.h" #include "i18n.h"
#include "../include/Utils.h" #include "Utils.h"
#include "../include/Operation.h" #include "Operation.h"
#include <gtkmm/dialog.h> #include <gtkmm/dialog.h>
#include <gtkmm/progressbar.h> #include <gtkmm/progressbar.h>

View File

@ -22,9 +22,9 @@
#ifndef GPARTED_DIALOG_RESCUE_DATA_H #ifndef GPARTED_DIALOG_RESCUE_DATA_H
#define GPARTED_DIALOG_RESCUE_DATA_H #define GPARTED_DIALOG_RESCUE_DATA_H
#include "../include/Device.h" #include "Device.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
#include <gtkmm/dialog.h> #include <gtkmm/dialog.h>
#include <gtkmm/frame.h> #include <gtkmm/frame.h>

View File

@ -17,8 +17,8 @@
#ifndef GPARTED_DRAWINGAREAVISUALDISK_H #ifndef GPARTED_DRAWINGAREAVISUALDISK_H
#define GPARTED_DRAWINGAREAVISUALDISK_H #define GPARTED_DRAWINGAREAVISUALDISK_H
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
#include <gtkmm/drawingarea.h> #include <gtkmm/drawingarea.h>

View File

@ -17,7 +17,7 @@
#ifndef GPARTED_FS_INFO_H #ifndef GPARTED_FS_INFO_H
#define GPARTED_FS_INFO_H #define GPARTED_FS_INFO_H
#include "../include/BlockSpecial.h" #include "BlockSpecial.h"
#include <glibmm/ustring.h> #include <glibmm/ustring.h>
#include <vector> #include <vector>

View File

@ -19,9 +19,9 @@
#ifndef GPARTED_FILESYSTEM_H #ifndef GPARTED_FILESYSTEM_H
#define GPARTED_FILESYSTEM_H #define GPARTED_FILESYSTEM_H
#include "../include/Operation.h" #include "Operation.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PipeCapture.h" #include "PipeCapture.h"
#include <fstream> #include <fstream>
#include <sys/stat.h> #include <sys/stat.h>

View File

@ -18,7 +18,7 @@
#ifndef GPARTED_FRAME_RESIZER_EXTENDED_H #ifndef GPARTED_FRAME_RESIZER_EXTENDED_H
#define GPARTED_FRAME_RESIZER_EXTENDED_H #define GPARTED_FRAME_RESIZER_EXTENDED_H
#include "../include/Frame_Resizer_Base.h" #include "Frame_Resizer_Base.h"
class Frame_Resizer_Extended : public Frame_Resizer_Base class Frame_Resizer_Extended : public Frame_Resizer_Base
{ {

View File

@ -18,12 +18,12 @@
#ifndef GPARTED_GPARTED_CORE_H #ifndef GPARTED_GPARTED_CORE_H
#define GPARTED_GPARTED_CORE_H #define GPARTED_GPARTED_CORE_H
#include "../include/BlockSpecial.h" #include "BlockSpecial.h"
#include "../include/FileSystem.h" #include "FileSystem.h"
#include "../include/Operation.h" #include "Operation.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionLUKS.h" #include "PartitionLUKS.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
#include <parted/parted.h> #include <parted/parted.h>
#include <vector> #include <vector>

View File

@ -17,7 +17,7 @@
#ifndef GPARTED_HBOXOPERATIONS_H #ifndef GPARTED_HBOXOPERATIONS_H
#define GPARTED_HBOXOPERATIONS_H #define GPARTED_HBOXOPERATIONS_H
#include "../include/Operation.h" #include "Operation.h"
#include <gtkmm/box.h> #include <gtkmm/box.h>
#include <gtkmm/liststore.h> #include <gtkmm/liststore.h>

View File

@ -25,8 +25,8 @@
#ifndef GPARTED_LUKS_INFO_H #ifndef GPARTED_LUKS_INFO_H
#define GPARTED_LUKS_INFO_H #define GPARTED_LUKS_INFO_H
#include "../include/BlockSpecial.h" #include "BlockSpecial.h"
#include "../include/Utils.h" #include "Utils.h"
#include <glibmm/ustring.h> #include <glibmm/ustring.h>
#include <vector> #include <vector>

View File

@ -25,8 +25,8 @@
#ifndef GPARTED_LVM2_PV_INFO_H #ifndef GPARTED_LVM2_PV_INFO_H
#define GPARTED_LVM2_PV_INFO_H #define GPARTED_LVM2_PV_INFO_H
#include "../include/BlockSpecial.h" #include "BlockSpecial.h"
#include "../include/Utils.h" #include "Utils.h"
#include <glibmm/ustring.h> #include <glibmm/ustring.h>
#include <vector> #include <vector>

View File

@ -24,7 +24,7 @@
#ifndef GPARTED_MOUNT_INFO_H #ifndef GPARTED_MOUNT_INFO_H
#define GPARTED_MOUNT_INFO_H #define GPARTED_MOUNT_INFO_H
#include "../include/BlockSpecial.h" #include "BlockSpecial.h"
#include <glibmm/ustring.h> #include <glibmm/ustring.h>
#include <map> #include <map>

View File

@ -18,10 +18,10 @@
#ifndef GPARTED_OPERATION_H #ifndef GPARTED_OPERATION_H
#define GPARTED_OPERATION_H #define GPARTED_OPERATION_H
#include "../include/Device.h" #include "Device.h"
#include "../include/OperationDetail.h" #include "OperationDetail.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
namespace GParted namespace GParted
{ {

View File

@ -17,9 +17,9 @@
#ifndef GPARTED_OPERATIONCHANGEUUID_H #ifndef GPARTED_OPERATIONCHANGEUUID_H
#define GPARTED_OPERATIONCHANGEUUID_H #define GPARTED_OPERATIONCHANGEUUID_H
#include "../include/Operation.h" #include "Operation.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
namespace GParted namespace GParted
{ {

View File

@ -17,9 +17,9 @@
#ifndef GPARTED_OPERATIONCHECK_H #ifndef GPARTED_OPERATIONCHECK_H
#define GPARTED_OPERATIONCHECK_H #define GPARTED_OPERATIONCHECK_H
#include "../include/Operation.h" #include "Operation.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
namespace GParted namespace GParted
{ {

View File

@ -17,9 +17,9 @@
#ifndef GPARTED_OPERATIONCOPY_H #ifndef GPARTED_OPERATIONCOPY_H
#define GPARTED_OPERATIONCOPY_H #define GPARTED_OPERATIONCOPY_H
#include "../include/Operation.h" #include "Operation.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
namespace GParted namespace GParted
{ {

View File

@ -17,9 +17,9 @@
#ifndef GPARTED_OPERATIONCREATE_H #ifndef GPARTED_OPERATIONCREATE_H
#define GPARTED_OPERATIONCREATE_H #define GPARTED_OPERATIONCREATE_H
#include "../include/Operation.h" #include "Operation.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
namespace GParted namespace GParted
{ {

View File

@ -17,9 +17,9 @@
#ifndef GPARTED_OPERATIONDELETE_H #ifndef GPARTED_OPERATIONDELETE_H
#define GPARTED_OPERATIONDELETE_H #define GPARTED_OPERATIONDELETE_H
#include "../include/Operation.h" #include "Operation.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
namespace GParted namespace GParted
{ {

View File

@ -18,7 +18,7 @@
#ifndef GPARTED_OPERATIONDETAIL_H #ifndef GPARTED_OPERATIONDETAIL_H
#define GPARTED_OPERATIONDETAIL_H #define GPARTED_OPERATIONDETAIL_H
#include "../include/ProgressBar.h" #include "ProgressBar.h"
#include <glibmm/ustring.h> #include <glibmm/ustring.h>
#include <glibmm/markup.h> #include <glibmm/markup.h>

View File

@ -17,9 +17,9 @@
#ifndef GPARTED_OPERATIONFORMAT_H #ifndef GPARTED_OPERATIONFORMAT_H
#define GPARTED_OPERATIONFORMAT_H #define GPARTED_OPERATIONFORMAT_H
#include "../include/Operation.h" #include "Operation.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
namespace GParted namespace GParted
{ {

View File

@ -17,9 +17,9 @@
#ifndef GPARTED_OPERATIONLABELFILESYSTEM_H #ifndef GPARTED_OPERATIONLABELFILESYSTEM_H
#define GPARTED_OPERATIONLABELFILESYSTEM_H #define GPARTED_OPERATIONLABELFILESYSTEM_H
#include "../include/Operation.h" #include "Operation.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
namespace GParted namespace GParted
{ {

View File

@ -17,9 +17,9 @@
#ifndef GPARTED_OPERATIONNAMEPARTITION_H #ifndef GPARTED_OPERATIONNAMEPARTITION_H
#define GPARTED_OPERATIONNAMEPARTITION_H #define GPARTED_OPERATIONNAMEPARTITION_H
#include "../include/Operation.h" #include "Operation.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
namespace GParted namespace GParted
{ {

View File

@ -17,9 +17,9 @@
#ifndef GPARTED_OPERATIONRESIZEMOVE_H #ifndef GPARTED_OPERATIONRESIZEMOVE_H
#define GPARTED_OPERATIONRESIZEMOVE_H #define GPARTED_OPERATIONRESIZEMOVE_H
#include "../include/Operation.h" #include "Operation.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
namespace GParted namespace GParted
{ {

View File

@ -23,8 +23,8 @@
#ifndef GPARTED_PARTITION_H #ifndef GPARTED_PARTITION_H
#define GPARTED_PARTITION_H #define GPARTED_PARTITION_H
#include "../include/Utils.h" #include "Utils.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
#include <glibmm/ustring.h> #include <glibmm/ustring.h>

View File

@ -18,8 +18,8 @@
#ifndef GPARTED_PARTITIONLUKS_H #ifndef GPARTED_PARTITIONLUKS_H
#define GPARTED_PARTITIONLUKS_H #define GPARTED_PARTITIONLUKS_H
#include "../include/Partition.h" #include "Partition.h"
#include "../include/Utils.h" #include "Utils.h"
#include <glibmm/ustring.h> #include <glibmm/ustring.h>

View File

@ -25,7 +25,7 @@
#ifndef GPARTED_PARTITIONVECTOR_H #ifndef GPARTED_PARTITIONVECTOR_H
#define GPARTED_PARTITIONVECTOR_H #define GPARTED_PARTITIONVECTOR_H
#include "../include/Partition.h" #include "Partition.h"
#include <cstddef> #include <cstddef>
#include <vector> #include <vector>

View File

@ -24,7 +24,7 @@
#ifndef GPARTED_SWRAID_INFO_H #ifndef GPARTED_SWRAID_INFO_H
#define GPARTED_SWRAID_INFO_H #define GPARTED_SWRAID_INFO_H
#include "../include/BlockSpecial.h" #include "BlockSpecial.h"
#include <glibmm/ustring.h> #include <glibmm/ustring.h>
#include <vector> #include <vector>

View File

@ -17,8 +17,8 @@
#ifndef GPARTED_TREEVIEW_DETAIL_H #ifndef GPARTED_TREEVIEW_DETAIL_H
#define GPARTED_TREEVIEW_DETAIL_H #define GPARTED_TREEVIEW_DETAIL_H
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
#include <gtkmm/treeview.h> #include <gtkmm/treeview.h>
#include <gtkmm/treestore.h> #include <gtkmm/treestore.h>

View File

@ -24,7 +24,7 @@
#ifndef GPARTED_UTILS_H #ifndef GPARTED_UTILS_H
#define GPARTED_UTILS_H #define GPARTED_UTILS_H
#include "../include/i18n.h" #include "i18n.h"
#include <gtkmm/label.h> #include <gtkmm/label.h>
#include <glibmm/ustring.h> #include <glibmm/ustring.h>

View File

@ -18,13 +18,13 @@
#ifndef GPARTED_WIN_GPARTED_H #ifndef GPARTED_WIN_GPARTED_H
#define GPARTED_WIN_GPARTED_H #define GPARTED_WIN_GPARTED_H
#include "../include/Device.h" #include "Device.h"
#include "../include/DrawingAreaVisualDisk.h" #include "DrawingAreaVisualDisk.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
#include "../include/TreeView_Detail.h" #include "TreeView_Detail.h"
#include "../include/GParted_Core.h" #include "GParted_Core.h"
#include "../include/HBoxOperations.h" #include "HBoxOperations.h"
#include <gtkmm/paned.h> #include <gtkmm/paned.h>
#include <gtkmm/toolbar.h> #include <gtkmm/toolbar.h>

View File

@ -19,9 +19,9 @@
#ifndef GPARTED_BTRFS_H #ifndef GPARTED_BTRFS_H
#define GPARTED_BTRFS_H #define GPARTED_BTRFS_H
#include "../include/FileSystem.h" #include "FileSystem.h"
#include "../include/BlockSpecial.h" #include "BlockSpecial.h"
#include "../include/Partition.h" #include "Partition.h"
namespace GParted namespace GParted
{ {

View File

@ -18,7 +18,7 @@
#ifndef GPARTED_EXFAT_H #ifndef GPARTED_EXFAT_H
#define GPARTED_EXFAT_H #define GPARTED_EXFAT_H
#include "../include/FileSystem.h" #include "FileSystem.h"
namespace GParted namespace GParted
{ {

View File

@ -19,10 +19,10 @@
#ifndef GPARTED_EXT2_H #ifndef GPARTED_EXT2_H
#define GPARTED_EXT2_H #define GPARTED_EXT2_H
#include "../include/FileSystem.h" #include "FileSystem.h"
#include "../include/OperationDetail.h" #include "OperationDetail.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/Utils.h" #include "Utils.h"
#include <glibmm/ustring.h> #include <glibmm/ustring.h>

View File

@ -18,8 +18,8 @@
#ifndef GPARTED_F2FS_H #ifndef GPARTED_F2FS_H
#define GPARTED_F2FS_H #define GPARTED_F2FS_H
#include "../include/FileSystem.h" #include "FileSystem.h"
#include "../include/Partition.h" #include "Partition.h"
namespace GParted namespace GParted
{ {

View File

@ -19,8 +19,8 @@
#ifndef GPARTED_FAT16_H #ifndef GPARTED_FAT16_H
#define GPARTED_FAT16_H #define GPARTED_FAT16_H
#include "../include/FileSystem.h" #include "FileSystem.h"
#include "../include/Partition.h" #include "Partition.h"
namespace GParted namespace GParted
{ {

View File

@ -19,8 +19,8 @@
#ifndef GPARTED_HFS_H #ifndef GPARTED_HFS_H
#define GPARTED_HFS_H #define GPARTED_HFS_H
#include "../include/FileSystem.h" #include "FileSystem.h"
#include "../include/Partition.h" #include "Partition.h"
namespace GParted namespace GParted
{ {

View File

@ -19,8 +19,8 @@
#ifndef GPARTED_HFSPLUS_H #ifndef GPARTED_HFSPLUS_H
#define GPARTED_HFSPLUS_H #define GPARTED_HFSPLUS_H
#include "../include/FileSystem.h" #include "FileSystem.h"
#include "../include/Partition.h" #include "Partition.h"
namespace GParted namespace GParted
{ {

View File

@ -19,8 +19,8 @@
#ifndef GPARTED_JFS_H #ifndef GPARTED_JFS_H
#define GPARTED_JFS_H #define GPARTED_JFS_H
#include "../include/FileSystem.h" #include "FileSystem.h"
#include "../include/Partition.h" #include "Partition.h"
namespace GParted namespace GParted
{ {

View File

@ -19,8 +19,8 @@
#ifndef GPARTED_LINUX_SWAP_H #ifndef GPARTED_LINUX_SWAP_H
#define GPARTED_LINUX_SWAP_H #define GPARTED_LINUX_SWAP_H
#include "../include/FileSystem.h" #include "FileSystem.h"
#include "../include/Partition.h" #include "Partition.h"
namespace GParted namespace GParted
{ {

View File

@ -18,8 +18,8 @@
#ifndef GPARTED_LUKS_H #ifndef GPARTED_LUKS_H
#define GPARTED_LUKS_H #define GPARTED_LUKS_H
#include "../include/FileSystem.h" #include "FileSystem.h"
#include "../include/Partition.h" #include "Partition.h"
namespace GParted namespace GParted
{ {

View File

@ -18,8 +18,8 @@
#ifndef GPARTED_LVM2_PV_H #ifndef GPARTED_LVM2_PV_H
#define GPARTED_LVM2_PV_H #define GPARTED_LVM2_PV_H
#include "../include/FileSystem.h" #include "FileSystem.h"
#include "../include/Partition.h" #include "Partition.h"
namespace GParted namespace GParted
{ {

View File

@ -18,8 +18,8 @@
#ifndef GPARTED_NILFS2_H #ifndef GPARTED_NILFS2_H
#define GPARTED_NILFS2_H #define GPARTED_NILFS2_H
#include "../include/FileSystem.h" #include "FileSystem.h"
#include "../include/Partition.h" #include "Partition.h"
namespace GParted namespace GParted
{ {

View File

@ -19,8 +19,8 @@
#ifndef GPARTED_NTFS_H #ifndef GPARTED_NTFS_H
#define GPARTED_NTFS_H #define GPARTED_NTFS_H
#include "../include/FileSystem.h" #include "FileSystem.h"
#include "../include/Partition.h" #include "Partition.h"
namespace GParted namespace GParted
{ {

View File

@ -19,8 +19,8 @@
#ifndef GPARTED_REISER4_H #ifndef GPARTED_REISER4_H
#define GPARTED_REISER4_H #define GPARTED_REISER4_H
#include "../include/FileSystem.h" #include "FileSystem.h"
#include "../include/Partition.h" #include "Partition.h"
namespace GParted namespace GParted
{ {

View File

@ -19,8 +19,8 @@
#ifndef GPARTED_REISERFS_H #ifndef GPARTED_REISERFS_H
#define GPARTED_REISERFS_H #define GPARTED_REISERFS_H
#include "../include/FileSystem.h" #include "FileSystem.h"
#include "../include/Partition.h" #include "Partition.h"
namespace GParted namespace GParted
{ {

View File

@ -19,7 +19,7 @@
#ifndef GPARTED_UFS_H #ifndef GPARTED_UFS_H
#define GPARTED_UFS_H #define GPARTED_UFS_H
#include "../include/FileSystem.h" #include "FileSystem.h"
namespace GParted namespace GParted
{ {

View File

@ -19,10 +19,10 @@
#ifndef GPARTED_XFS_H #ifndef GPARTED_XFS_H
#define GPARTED_XFS_H #define GPARTED_XFS_H
#include "../include/FileSystem.h" #include "FileSystem.h"
#include "../include/OperationDetail.h" #include "OperationDetail.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/Utils.h" #include "Utils.h"
#include <glibmm/ustring.h> #include <glibmm/ustring.h>

View File

@ -14,7 +14,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/BlockSpecial.h" #include "BlockSpecial.h"
#include <glibmm/ustring.h> #include <glibmm/ustring.h>
#include <sys/types.h> #include <sys/types.h>

View File

@ -16,10 +16,10 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/CopyBlocks.h" #include "CopyBlocks.h"
#include "../include/OperationDetail.h" #include "OperationDetail.h"
#include "../include/ProgressBar.h" #include "ProgressBar.h"
#include "../include/Utils.h" #include "Utils.h"
#include <glibmm/ustring.h> #include <glibmm/ustring.h>
#include <gtkmm/main.h> #include <gtkmm/main.h>

View File

@ -14,8 +14,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/DMRaid.h" #include "DMRaid.h"
#include "../include/Partition.h" #include "Partition.h"
#include <limits.h> #include <limits.h>
#include <stdlib.h> //atoi function #include <stdlib.h> //atoi function

View File

@ -15,7 +15,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/Device.h" #include "Device.h"
namespace GParted namespace GParted
{ {

View File

@ -15,8 +15,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/DialogFeatures.h" #include "DialogFeatures.h"
#include "../include/GParted_Core.h" #include "GParted_Core.h"
#include <gtkmm/stock.h> #include <gtkmm/stock.h>

View File

@ -14,8 +14,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/DialogManageFlags.h" #include "DialogManageFlags.h"
#include "../include/Partition.h" #include "Partition.h"
#include <gtkmm/main.h> #include <gtkmm/main.h>
#include <gtkmm/stock.h> #include <gtkmm/stock.h>

View File

@ -15,8 +15,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/Dialog_Base_Partition.h" #include "Dialog_Base_Partition.h"
#include "../include/Partition.h" #include "Partition.h"
namespace GParted namespace GParted
{ {

View File

@ -15,8 +15,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/Dialog_Disklabel.h" #include "Dialog_Disklabel.h"
#include "../include/GParted_Core.h" #include "GParted_Core.h"
namespace GParted namespace GParted
{ {

View File

@ -14,8 +14,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/Dialog_FileSystem_Label.h" #include "Dialog_FileSystem_Label.h"
#include "../include/Partition.h" #include "Partition.h"
namespace GParted namespace GParted
{ {

View File

@ -15,10 +15,10 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/Dialog_Partition_Copy.h" #include "Dialog_Partition_Copy.h"
#include "../include/GParted_Core.h" #include "GParted_Core.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/Utils.h" #include "Utils.h"
namespace GParted namespace GParted
{ {

View File

@ -15,12 +15,12 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/Dialog_Partition_Info.h" #include "Dialog_Partition_Info.h"
#include "../include/LVM2_PV_Info.h" #include "LVM2_PV_Info.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionLUKS.h" #include "PartitionLUKS.h"
#include "../include/Utils.h" #include "Utils.h"
#include "../include/btrfs.h" #include "btrfs.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gtkmm/alignment.h> #include <gtkmm/alignment.h>

View File

@ -14,8 +14,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/Dialog_Partition_Name.h" #include "Dialog_Partition_Name.h"
#include "../include/Partition.h" #include "Partition.h"
namespace GParted namespace GParted
{ {

View File

@ -15,9 +15,9 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/Dialog_Partition_New.h" #include "Dialog_Partition_New.h"
#include "../include/GParted_Core.h" #include "GParted_Core.h"
#include "../include/Partition.h" #include "Partition.h"
namespace GParted namespace GParted
{ {

View File

@ -15,11 +15,11 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/Dialog_Partition_Resize_Move.h" #include "Dialog_Partition_Resize_Move.h"
#include "../include/GParted_Core.h" #include "GParted_Core.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
#include "../include/Utils.h" #include "Utils.h"
namespace GParted namespace GParted
{ {

View File

@ -15,9 +15,9 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/Dialog_Progress.h" #include "Dialog_Progress.h"
#include "../include/OperationDetail.h" #include "OperationDetail.h"
#include "../include/ProgressBar.h" #include "ProgressBar.h"
#include <gtkmm/stock.h> #include <gtkmm/stock.h>
#include <gtkmm/main.h> #include <gtkmm/main.h>

View File

@ -15,9 +15,9 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/Utils.h" #include "Utils.h"
#include "../include/Dialog_Rescue_Data.h" #include "Dialog_Rescue_Data.h"
#include "../include/Partition.h" #include "Partition.h"
#include <gtkmm/messagedialog.h> #include <gtkmm/messagedialog.h>
#include <gtkmm/stock.h> #include <gtkmm/stock.h>

View File

@ -15,11 +15,11 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/DrawingAreaVisualDisk.h" #include "DrawingAreaVisualDisk.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionLUKS.h" #include "PartitionLUKS.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
#include "../include/Utils.h" #include "Utils.h"
#define MAIN_BORDER 5 #define MAIN_BORDER 5
#define BORDER 4 #define BORDER 4

View File

@ -14,9 +14,9 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/FS_Info.h" #include "FS_Info.h"
#include "../include/BlockSpecial.h" #include "BlockSpecial.h"
#include "../include/Utils.h" #include "Utils.h"
#include <glibmm/ustring.h> #include <glibmm/ustring.h>
#include <vector> #include <vector>

View File

@ -14,9 +14,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "FileSystem.h"
#include "../include/FileSystem.h" #include "GParted_Core.h"
#include "../include/GParted_Core.h"
#include <cerrno> #include <cerrno>
#include <iostream> #include <iostream>

View File

@ -15,7 +15,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/Frame_Resizer_Base.h" #include "Frame_Resizer_Base.h"
Frame_Resizer_Base::Frame_Resizer_Base() Frame_Resizer_Base::Frame_Resizer_Base()
{ {

View File

@ -15,7 +15,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/Frame_Resizer_Extended.h" #include "Frame_Resizer_Extended.h"
Frame_Resizer_Extended::Frame_Resizer_Extended() Frame_Resizer_Extended::Frame_Resizer_Extended()
{ {

View File

@ -15,40 +15,40 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/Win_GParted.h" #include "Win_GParted.h"
#include "../include/GParted_Core.h" #include "GParted_Core.h"
#include "../include/BlockSpecial.h" #include "CopyBlocks.h"
#include "../include/DMRaid.h" #include "BlockSpecial.h"
#include "../include/FS_Info.h" #include "DMRaid.h"
#include "../include/LVM2_PV_Info.h" #include "FS_Info.h"
#include "../include/LUKS_Info.h" #include "LVM2_PV_Info.h"
#include "../include/Mount_Info.h" #include "LUKS_Info.h"
#include "../include/Operation.h" #include "Mount_Info.h"
#include "../include/OperationCopy.h" #include "Operation.h"
#include "../include/Partition.h" #include "OperationCopy.h"
#include "../include/PartitionLUKS.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionLUKS.h"
#include "../include/Proc_Partitions_Info.h" #include "PartitionVector.h"
#include "../include/SWRaid_Info.h" #include "Proc_Partitions_Info.h"
#include "SWRaid_Info.h"
#include "../include/btrfs.h" #include "btrfs.h"
#include "../include/exfat.h" #include "exfat.h"
#include "../include/ext2.h" #include "ext2.h"
#include "../include/f2fs.h" #include "f2fs.h"
#include "../include/fat16.h" #include "fat16.h"
#include "../include/linux_swap.h" #include "linux_swap.h"
#include "../include/lvm2_pv.h" #include "lvm2_pv.h"
#include "../include/luks.h" #include "luks.h"
#include "../include/reiserfs.h" #include "reiserfs.h"
#include "../include/nilfs2.h" #include "nilfs2.h"
#include "../include/ntfs.h" #include "ntfs.h"
#include "../include/xfs.h" #include "xfs.h"
#include "../include/jfs.h" #include "jfs.h"
#include "../include/hfs.h" #include "hfs.h"
#include "../include/hfsplus.h" #include "hfsplus.h"
#include "../include/reiser4.h" #include "reiser4.h"
#include "../include/ufs.h" #include "ufs.h"
#include "../include/CopyBlocks.h"
#include <cerrno> #include <cerrno>
#include <cstring> #include <cstring>

View File

@ -14,7 +14,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/HBoxOperations.h" #include "HBoxOperations.h"
#include <gtkmm/stock.h> #include <gtkmm/stock.h>

View File

@ -14,9 +14,9 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/LUKS_Info.h" #include "LUKS_Info.h"
#include "../include/BlockSpecial.h" #include "BlockSpecial.h"
#include "../include/Utils.h" #include "Utils.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

View File

@ -14,8 +14,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/LVM2_PV_Info.h" #include "LVM2_PV_Info.h"
#include "../include/BlockSpecial.h" #include "BlockSpecial.h"
namespace GParted namespace GParted
{ {

View File

@ -1,4 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \
$(GTHREAD_CFLAGS) \ $(GTHREAD_CFLAGS) \
$(GTKMM_CFLAGS) \ $(GTKMM_CFLAGS) \
-DGPARTED_DATADIR=\""$(datadir)"\" \ -DGPARTED_DATADIR=\""$(datadir)"\" \

View File

@ -14,9 +14,9 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/Mount_Info.h" #include "Mount_Info.h"
#include "../include/FS_Info.h" #include "FS_Info.h"
#include "../include/Utils.h" #include "Utils.h"
#include <glibmm/ustring.h> #include <glibmm/ustring.h>
#include <stdio.h> #include <stdio.h>

View File

@ -15,10 +15,10 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/Operation.h" #include "Operation.h"
#include "../include/GParted_Core.h" #include "GParted_Core.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
namespace GParted namespace GParted
{ {

View File

@ -14,9 +14,9 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/OperationChangeUUID.h" #include "OperationChangeUUID.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
namespace GParted namespace GParted
{ {

View File

@ -14,9 +14,9 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/OperationCheck.h" #include "OperationCheck.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
namespace GParted namespace GParted
{ {

View File

@ -15,9 +15,9 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/OperationCopy.h" #include "OperationCopy.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
namespace GParted namespace GParted
{ {

View File

@ -15,11 +15,11 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/OperationCreate.h" #include "OperationCreate.h"
#include "../include/OperationFormat.h" #include "OperationFormat.h"
#include "../include/OperationResizeMove.h" #include "OperationResizeMove.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
namespace GParted namespace GParted
{ {

View File

@ -15,9 +15,9 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/OperationDelete.h" #include "OperationDelete.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
namespace GParted namespace GParted
{ {

View File

@ -15,9 +15,9 @@
*/ */
#include "../include/OperationDetail.h" #include "OperationDetail.h"
#include "../include/ProgressBar.h" #include "ProgressBar.h"
#include "../include/Utils.h" #include "Utils.h"
namespace GParted namespace GParted
{ {

View File

@ -14,9 +14,9 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/OperationFormat.h" #include "OperationFormat.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
namespace GParted namespace GParted
{ {

View File

@ -14,9 +14,9 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/OperationLabelFileSystem.h" #include "OperationLabelFileSystem.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
namespace GParted namespace GParted
{ {

View File

@ -14,9 +14,9 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/OperationNamePartition.h" #include "OperationNamePartition.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
namespace GParted namespace GParted
{ {

View File

@ -15,9 +15,9 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/OperationResizeMove.h" #include "OperationResizeMove.h"
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
namespace GParted namespace GParted
{ {

View File

@ -15,7 +15,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/Partition.h" #include "Partition.h"
namespace GParted namespace GParted
{ {

View File

@ -14,8 +14,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/PartitionLUKS.h" #include "PartitionLUKS.h"
#include "../include/Utils.h" #include "Utils.h"
namespace GParted namespace GParted
{ {

View File

@ -14,8 +14,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/Partition.h" #include "Partition.h"
#include "../include/PartitionVector.h" #include "PartitionVector.h"
#include <algorithm> #include <algorithm>

Some files were not shown because too many files have changed in this diff Show More