From 4d1c7f2d0448f2f7bce63527613d886b007121b2 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 25 Sep 2008 11:53:41 +0000 Subject: [PATCH] Pedantic svn path=/trunk/playground/sysadmin/partitionmanager/; revision=864677 --- src/core/copysource.h | 2 +- src/core/copytarget.h | 2 +- src/core/device.h | 2 +- src/core/libparted.h | 2 +- src/core/operationrunner.h | 2 +- src/core/operationstack.h | 2 +- src/core/partitionrole.h | 4 ++-- src/core/partitiontable.h | 6 +++--- src/fs/filesystem.h | 6 +++--- src/jobs/job.h | 2 +- src/ops/operation.h | 2 +- src/util/externalcommand.h | 2 +- src/util/globallog.h | 2 +- src/util/report.h | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/core/copysource.h b/src/core/copysource.h index d06b492..5f46aa3 100644 --- a/src/core/copysource.h +++ b/src/core/copysource.h @@ -36,7 +36,7 @@ class CopyTarget; */ class CopySource { - Q_DISABLE_COPY(CopySource); + Q_DISABLE_COPY(CopySource) protected: CopySource() {} diff --git a/src/core/copytarget.h b/src/core/copytarget.h index f237166..6c2656c 100644 --- a/src/core/copytarget.h +++ b/src/core/copytarget.h @@ -35,7 +35,7 @@ class QString; */ class CopyTarget { - Q_DISABLE_COPY(CopyTarget); + Q_DISABLE_COPY(CopyTarget) protected: CopyTarget() : m_SectorsWritten(0) {} diff --git a/src/core/device.h b/src/core/device.h index a128a00..5b49d88 100644 --- a/src/core/device.h +++ b/src/core/device.h @@ -40,7 +40,7 @@ class CreatePartitionTableOperation; class Device : public QObject { Q_OBJECT - Q_DISABLE_COPY(Device); + Q_DISABLE_COPY(Device) friend class CreatePartitionTableOperation; diff --git a/src/core/libparted.h b/src/core/libparted.h index a8ed025..0b5c72c 100644 --- a/src/core/libparted.h +++ b/src/core/libparted.h @@ -35,7 +35,7 @@ class OperationStack; */ class LibParted { - Q_DISABLE_COPY(LibParted); + Q_DISABLE_COPY(LibParted) public: LibParted(); diff --git a/src/core/operationrunner.h b/src/core/operationrunner.h index 48e6d98..8345148 100644 --- a/src/core/operationrunner.h +++ b/src/core/operationrunner.h @@ -38,7 +38,7 @@ class Report; class OperationRunner : public QThread { Q_OBJECT - Q_DISABLE_COPY(OperationRunner); + Q_DISABLE_COPY(OperationRunner) public: OperationRunner(OperationStack& ostack); diff --git a/src/core/operationstack.h b/src/core/operationstack.h index 2a78046..c2bfec5 100644 --- a/src/core/operationstack.h +++ b/src/core/operationstack.h @@ -38,7 +38,7 @@ class Operation; */ class OperationStack { - Q_DISABLE_COPY(OperationStack); + Q_DISABLE_COPY(OperationStack) friend class LibParted; diff --git a/src/core/partitionrole.h b/src/core/partitionrole.h index c8578e3..7a4c70e 100644 --- a/src/core/partitionrole.h +++ b/src/core/partitionrole.h @@ -46,7 +46,7 @@ class PartitionRole Any = 255 /**< In case we're looking for a Partition with a PartitionRole, any will do */ }; - Q_DECLARE_FLAGS(Roles, Role); + Q_DECLARE_FLAGS(Roles, Role) public: explicit PartitionRole(Roles r) : m_Roles(r) {} /**< Creates a new PartitionRole object */ @@ -62,6 +62,6 @@ class PartitionRole Roles m_Roles; }; -Q_DECLARE_OPERATORS_FOR_FLAGS(PartitionRole::Roles); +Q_DECLARE_OPERATORS_FOR_FLAGS(PartitionRole::Roles) #endif diff --git a/src/core/partitiontable.h b/src/core/partitiontable.h index 6e3c397..1ccec7e 100644 --- a/src/core/partitiontable.h +++ b/src/core/partitiontable.h @@ -42,7 +42,7 @@ class LibParted; */ class PartitionTable : public PartitionNode { - Q_DISABLE_COPY(PartitionTable); + Q_DISABLE_COPY(PartitionTable) friend class LibParted; @@ -64,7 +64,7 @@ class PartitionTable : public PartitionNode FlagMsftReserved = 1024 }; - Q_DECLARE_FLAGS(Flags, Flag); + Q_DECLARE_FLAGS(Flags, Flag) public: PartitionTable(); @@ -121,7 +121,7 @@ class PartitionTable : public PartitionNode bool m_ReadOnly; }; -Q_DECLARE_OPERATORS_FOR_FLAGS(PartitionTable::Flags); +Q_DECLARE_OPERATORS_FOR_FLAGS(PartitionTable::Flags) #endif diff --git a/src/fs/filesystem.h b/src/fs/filesystem.h index dc2b1d6..12a7f14 100644 --- a/src/fs/filesystem.h +++ b/src/fs/filesystem.h @@ -38,7 +38,7 @@ class Report; */ class FileSystem { - Q_DISABLE_COPY(FileSystem); + Q_DISABLE_COPY(FileSystem) public: /** Supported FileSystem types */ @@ -73,7 +73,7 @@ class FileSystem SupportExternal = 4 /**< supported by some external command */ }; - Q_DECLARE_FLAGS(SupportTypes, SupportType); + Q_DECLARE_FLAGS(SupportTypes, SupportType) protected: FileSystem(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label, FileSystem::Type t); @@ -150,6 +150,6 @@ class FileSystem QString m_Label; }; -Q_DECLARE_OPERATORS_FOR_FLAGS(FileSystem::SupportTypes); +Q_DECLARE_OPERATORS_FOR_FLAGS(FileSystem::SupportTypes) #endif diff --git a/src/jobs/job.h b/src/jobs/job.h index 371a313..65c81c7 100644 --- a/src/jobs/job.h +++ b/src/jobs/job.h @@ -47,7 +47,7 @@ class Report; class Job : public QObject { Q_OBJECT - Q_DISABLE_COPY(Job); + Q_DISABLE_COPY(Job) public: /** Status of this Job */ diff --git a/src/ops/operation.h b/src/ops/operation.h index 08b828f..e499448 100644 --- a/src/ops/operation.h +++ b/src/ops/operation.h @@ -73,7 +73,7 @@ class QIcon; class Operation : public QObject { Q_OBJECT - Q_DISABLE_COPY(Operation); + Q_DISABLE_COPY(Operation) friend class OperationStack; friend class OperationRunner; diff --git a/src/util/externalcommand.h b/src/util/externalcommand.h index bf02124..f51e860 100644 --- a/src/util/externalcommand.h +++ b/src/util/externalcommand.h @@ -37,7 +37,7 @@ class Report; class ExternalCommand : public QProcess { Q_OBJECT - Q_DISABLE_COPY(ExternalCommand); + Q_DISABLE_COPY(ExternalCommand) public: explicit ExternalCommand(const QString& cmd = QString(), const QStringList& args = QStringList()); diff --git a/src/util/globallog.h b/src/util/globallog.h index 33be3d0..0a47c35 100644 --- a/src/util/globallog.h +++ b/src/util/globallog.h @@ -52,7 +52,7 @@ class log class GlobalLog : public QObject { Q_OBJECT - Q_DISABLE_COPY(GlobalLog); + Q_DISABLE_COPY(GlobalLog) friend class log; friend log operator<<(log l, const QString& s); diff --git a/src/util/report.h b/src/util/report.h index 5d5ae91..661dcb4 100644 --- a/src/util/report.h +++ b/src/util/report.h @@ -37,7 +37,7 @@ class ReportLine; class Report : public QObject { Q_OBJECT - Q_DISABLE_COPY(Report); + Q_DISABLE_COPY(Report) friend Report& operator<<(Report& report, const QString& s); friend Report& operator<<(Report& report, qint64 i);