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 \
48 lines
1.6 KiB
C++
48 lines
1.6 KiB
C++
/* Copyright (C) 2015 Michael Zimmermann
|
|
*
|
|
* 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_OPERATIONNAMEPARTITION_H
|
|
#define GPARTED_OPERATIONNAMEPARTITION_H
|
|
|
|
#include "Operation.h"
|
|
#include "Partition.h"
|
|
#include "PartitionVector.h"
|
|
|
|
namespace GParted
|
|
{
|
|
|
|
class OperationNamePartition: public Operation
|
|
{
|
|
public:
|
|
OperationNamePartition( const Device & device,
|
|
const Partition & partition_orig,
|
|
const Partition & partition_new );
|
|
virtual ~OperationNamePartition();
|
|
|
|
void apply_to_visual( PartitionVector & partitions );
|
|
|
|
private:
|
|
OperationNamePartition( const OperationNamePartition & src ); // Not implemented copy constructor
|
|
OperationNamePartition & operator=( const OperationNamePartition & rhs ); // Not implemented copy assignment operator
|
|
|
|
void create_description();
|
|
bool merge_operations( const Operation & candidate );
|
|
};
|
|
|
|
} //GParted
|
|
|
|
#endif /* GPARTED_OPERATIONNAMEPARTITION_H */
|