andrius
/
partitionmanager
1
0
Fork 0
Code Pull Requests Releases Activity

rename method and make description property non const; it might change, after 

all, during the lifetime of the object if some other operation is merged with
this operation (generally speaking, not necessarily true for copyops)

svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=1129885
This commit is contained in:
Volker Lanz 2010-05-24 03:28:16 +00:00
parent 0c15c050da
commit ed05e673e0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ops/copyoperation.cpp
View File

@ -57,7 +57,7 @@ CopyOperation::CopyOperation(Device& targetdevice, Partition* copiedpartition, D
m_CopyFSJob(NULL), m_CopyFSJob(NULL),
m_CheckTargetJob(NULL), m_CheckTargetJob(NULL),
m_MaximizeJob(NULL), m_MaximizeJob(NULL),
m_Description(makeDescription()) m_Description(updateDescription())
{ {
Q_ASSERT(targetDevice().partitionTable()); Q_ASSERT(targetDevice().partitionTable());
@ -196,7 +196,7 @@ bool CopyOperation::execute(Report& parent)
return rval; return rval;
} }
QString CopyOperation::makeDescription() const QString CopyOperation::updateDescription() const
{ {
if (overwrittenPartition()) if (overwrittenPartition())
{ {

4
src/ops/copyoperation.h
View File

@ -97,7 +97,7 @@ class CopyOperation : public Operation
CheckFileSystemJob* checkTargetJob() { return m_CheckTargetJob; } CheckFileSystemJob* checkTargetJob() { return m_CheckTargetJob; }
ResizeFileSystemJob* maximizeJob() { return m_MaximizeJob; } ResizeFileSystemJob* maximizeJob() { return m_MaximizeJob; }
QString makeDescription() const; QString updateDescription() const;
private: private:
Device& m_TargetDevice; Device& m_TargetDevice;
@ -113,7 +113,7 @@ class CopyOperation : public Operation
CheckFileSystemJob* m_CheckTargetJob; CheckFileSystemJob* m_CheckTargetJob;
ResizeFileSystemJob* m_MaximizeJob; ResizeFileSystemJob* m_MaximizeJob;
const QString m_Description; QString m_Description;
}; };
#endif #endif