mirror of
https://gitlab.gnome.org/GNOME/gparted
synced 2024-07-07 19:39:25 +00:00
8979913a3f
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 \
69 lines
1.8 KiB
C++
69 lines
1.8 KiB
C++
/* Copyright (C) 2013 Phillip Susi
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef GPARTED_COPYBLOCKS_H
|
|
#define GPARTED_COPYBLOCKS_H
|
|
|
|
#include "OperationDetail.h"
|
|
#include "Utils.h"
|
|
|
|
#include <glibmm/ustring.h>
|
|
#include <parted/parted.h>
|
|
|
|
namespace GParted {
|
|
|
|
class CopyBlocks
|
|
{
|
|
const Glib::ustring & src_device;
|
|
const Glib::ustring & dst_device;
|
|
Byte_Value length;
|
|
Byte_Value blocksize;
|
|
OperationDetail &operationdetail;
|
|
Byte_Value & total_done;
|
|
Byte_Value total_length;
|
|
char *buf;
|
|
Byte_Value done;
|
|
PedDevice *lp_device_src;
|
|
PedDevice *lp_device_dst;
|
|
Sector offset_src;
|
|
Sector offset_dst;
|
|
bool success;
|
|
Glib::ustring error_message;
|
|
void copy_thread();
|
|
bool cancel;
|
|
bool cancel_safe;
|
|
void set_cancel( bool force );
|
|
void copy_block();
|
|
|
|
public:
|
|
bool set_progress_info();
|
|
CopyBlocks( const Glib::ustring & in_src_device,
|
|
const Glib::ustring & in_dst_device,
|
|
Sector src_start,
|
|
Sector dst_start,
|
|
Byte_Value in_length,
|
|
Byte_Value in_blocksize,
|
|
OperationDetail & in_operationdetail,
|
|
Byte_Value & in_total_done,
|
|
Byte_Value in_total_length,
|
|
bool cancel_safe );
|
|
bool copy();
|
|
};
|
|
|
|
} // namespace GParted
|
|
|
|
#endif /* GPARTED_COPYBLOCKS_H */
|