From ddb1790dd43f7fc2c888438feddcaa7c1bf918fe Mon Sep 17 00:00:00 2001 From: Volker Lanz Date: Mon, 1 Mar 2010 23:08:53 +0000 Subject: [PATCH] move the backend plugins to a src subdir of their own fix the gazillion arg-unused warnings in the dummy plugin with plenty of Q_UNUSED usage until the dummy plugin gets a little meatier. svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=1097717 --- src/CMakeLists.txt | 9 +++-- src/{backend => plugins}/dummy/CMakeLists.txt | 0 .../dummy/dummybackend.cpp | 4 +-- src/{backend => plugins}/dummy/dummybackend.h | 0 .../dummy/dummydevice.cpp | 15 +++++++-- src/{backend => plugins}/dummy/dummydevice.h | 0 .../dummy/dummypartition.cpp | 8 +++-- .../dummy/dummypartition.h | 0 .../dummy/dummypartitiontable.cpp | 33 +++++++++++++++++-- .../dummy/dummypartitiontable.h | 0 .../libparted/CMakeLists.txt | 0 .../libparted/libpartedbackend.cpp | 4 +-- .../libparted/libpartedbackend.h | 0 .../libparted/libparteddevice.cpp | 4 +-- .../libparted/libparteddevice.h | 0 .../libparted/libpartedpartition.cpp | 4 +-- .../libparted/libpartedpartition.h | 0 .../libparted/libpartedpartitiontable.cpp | 6 ++-- .../libparted/libpartedpartitiontable.h | 0 19 files changed, 64 insertions(+), 23 deletions(-) rename src/{backend => plugins}/dummy/CMakeLists.txt (100%) rename src/{backend => plugins}/dummy/dummybackend.cpp (97%) rename src/{backend => plugins}/dummy/dummybackend.h (100%) rename src/{backend => plugins}/dummy/dummydevice.cpp (90%) rename src/{backend => plugins}/dummy/dummydevice.h (100%) rename src/{backend => plugins}/dummy/dummypartition.cpp (91%) rename src/{backend => plugins}/dummy/dummypartition.h (100%) rename src/{backend => plugins}/dummy/dummypartitiontable.cpp (84%) rename src/{backend => plugins}/dummy/dummypartitiontable.h (100%) rename src/{backend => plugins}/libparted/CMakeLists.txt (100%) rename src/{backend => plugins}/libparted/libpartedbackend.cpp (99%) rename src/{backend => plugins}/libparted/libpartedbackend.h (100%) rename src/{backend => plugins}/libparted/libparteddevice.cpp (97%) rename src/{backend => plugins}/libparted/libparteddevice.h (100%) rename src/{backend => plugins}/libparted/libpartedpartition.cpp (96%) rename src/{backend => plugins}/libparted/libpartedpartition.h (100%) rename src/{backend => plugins}/libparted/libpartedpartitiontable.cpp (98%) rename src/{backend => plugins}/libparted/libpartedpartitiontable.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 267c08d..a8b370c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,11 +17,6 @@ ############################################ -add_subdirectory(backend/libparted) -add_subdirectory(backend/dummy) - -############################################ - file(GLOB partitionmanagerprivate_SRCS backend/*.cpp core/*.cpp @@ -91,3 +86,7 @@ if(PARTMAN_KPART) endif(PARTMAN_KPART) +############################################ + +add_subdirectory(plugins) + diff --git a/src/backend/dummy/CMakeLists.txt b/src/plugins/dummy/CMakeLists.txt similarity index 100% rename from src/backend/dummy/CMakeLists.txt rename to src/plugins/dummy/CMakeLists.txt diff --git a/src/backend/dummy/dummybackend.cpp b/src/plugins/dummy/dummybackend.cpp similarity index 97% rename from src/backend/dummy/dummybackend.cpp rename to src/plugins/dummy/dummybackend.cpp index 7989ab0..8dd85a5 100644 --- a/src/backend/dummy/dummybackend.cpp +++ b/src/plugins/dummy/dummybackend.cpp @@ -20,8 +20,8 @@ /** @file */ -#include "backend/dummy/dummybackend.h" -#include "backend/dummy/dummydevice.h" +#include "plugins/dummy/dummybackend.h" +#include "plugins/dummy/dummydevice.h" #include "core/device.h" #include "core/partition.h" diff --git a/src/backend/dummy/dummybackend.h b/src/plugins/dummy/dummybackend.h similarity index 100% rename from src/backend/dummy/dummybackend.h rename to src/plugins/dummy/dummybackend.h diff --git a/src/backend/dummy/dummydevice.cpp b/src/plugins/dummy/dummydevice.cpp similarity index 90% rename from src/backend/dummy/dummydevice.cpp rename to src/plugins/dummy/dummydevice.cpp index 04a53a0..2fb4152 100644 --- a/src/backend/dummy/dummydevice.cpp +++ b/src/plugins/dummy/dummydevice.cpp @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include "backend/dummy/dummydevice.h" -#include "backend/dummy/dummypartitiontable.h" +#include "plugins/dummy/dummydevice.h" +#include "plugins/dummy/dummypartitiontable.h" #include "core/partitiontable.h" @@ -67,11 +67,18 @@ CoreBackendPartitionTable* DummyDevice::openPartitionTable() bool DummyDevice::createPartitionTable(Report& report, const PartitionTable& ptable) { + Q_UNUSED(report); + Q_UNUSED(ptable); + return true; } bool DummyDevice::readSectors(void* buffer, qint64 offset, qint64 numSectors) { + Q_UNUSED(buffer); + Q_UNUSED(offset); + Q_UNUSED(numSectors); + if (!isExclusive()) return false; @@ -80,6 +87,10 @@ bool DummyDevice::readSectors(void* buffer, qint64 offset, qint64 numSectors) bool DummyDevice::writeSectors(void* buffer, qint64 offset, qint64 numSectors) { + Q_UNUSED(buffer); + Q_UNUSED(offset); + Q_UNUSED(numSectors); + if (!isExclusive()) return false; diff --git a/src/backend/dummy/dummydevice.h b/src/plugins/dummy/dummydevice.h similarity index 100% rename from src/backend/dummy/dummydevice.h rename to src/plugins/dummy/dummydevice.h diff --git a/src/backend/dummy/dummypartition.cpp b/src/plugins/dummy/dummypartition.cpp similarity index 91% rename from src/backend/dummy/dummypartition.cpp rename to src/plugins/dummy/dummypartition.cpp index b8f2200..556e524 100644 --- a/src/backend/dummy/dummypartition.cpp +++ b/src/plugins/dummy/dummypartition.cpp @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include "backend/dummy/dummypartition.h" -#include "backend/dummy/dummybackend.h" +#include "plugins/dummy/dummypartition.h" +#include "plugins/dummy/dummybackend.h" #include "util/report.h" @@ -32,6 +32,10 @@ DummyPartition::DummyPartition() : bool DummyPartition::setFlag(Report& report, PartitionTable::Flag partitionManagerFlag, bool state) { + Q_UNUSED(report); + Q_UNUSED(partitionManagerFlag); + Q_UNUSED(state); + return true; } diff --git a/src/backend/dummy/dummypartition.h b/src/plugins/dummy/dummypartition.h similarity index 100% rename from src/backend/dummy/dummypartition.h rename to src/plugins/dummy/dummypartition.h diff --git a/src/backend/dummy/dummypartitiontable.cpp b/src/plugins/dummy/dummypartitiontable.cpp similarity index 84% rename from src/backend/dummy/dummypartitiontable.cpp rename to src/plugins/dummy/dummypartitiontable.cpp index 9782e50..4a67998 100644 --- a/src/backend/dummy/dummypartitiontable.cpp +++ b/src/plugins/dummy/dummypartitiontable.cpp @@ -17,9 +17,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include "backend/dummy/dummypartitiontable.h" -#include "backend/dummy/dummypartition.h" -#include "backend/dummy/dummybackend.h" +#include "plugins/dummy/dummypartitiontable.h" +#include "plugins/dummy/dummypartition.h" +#include "plugins/dummy/dummybackend.h" #include "core/partition.h" #include "core/device.h" @@ -50,6 +50,8 @@ bool DummyPartitionTable::open() bool DummyPartitionTable::commit(quint32 timeout) { + Q_UNUSED(timeout); + return true; } @@ -60,36 +62,61 @@ CoreBackendPartition* DummyPartitionTable::getExtendedPartition() CoreBackendPartition* DummyPartitionTable::getPartitionBySector(qint64 sector) { + Q_UNUSED(sector); + return new DummyPartition(); } bool DummyPartitionTable::createPartition(Report& report, const Partition& partition, quint32& new_number) { + Q_UNUSED(report); + Q_UNUSED(partition); + Q_UNUSED(new_number); + return true; } bool DummyPartitionTable::deletePartition(Report& report, const Partition& partition) { + Q_UNUSED(report); + Q_UNUSED(partition); + return true; } bool DummyPartitionTable::updateGeometry(Report& report, const Partition& partition, qint64 sector_start, qint64 sector_end) { + Q_UNUSED(report); + Q_UNUSED(partition); + Q_UNUSED(sector_start); + Q_UNUSED(sector_end); + return true; } bool DummyPartitionTable::clobberFileSystem(Report& report, const Partition& partition) { + Q_UNUSED(report); + Q_UNUSED(partition); + return true; } bool DummyPartitionTable::resizeFileSystem(Report& report, const Partition& partition, qint64 newLength) { + Q_UNUSED(report); + Q_UNUSED(partition); + Q_UNUSED(newLength); + return true; } FileSystem::Type DummyPartitionTable::detectFileSystemBySector(Report& report, const Device& device, qint64 sector) { + Q_UNUSED(report); + Q_UNUSED(device); + Q_UNUSED(sector); + FileSystem::Type rval = FileSystem::Unknown; return rval; } diff --git a/src/backend/dummy/dummypartitiontable.h b/src/plugins/dummy/dummypartitiontable.h similarity index 100% rename from src/backend/dummy/dummypartitiontable.h rename to src/plugins/dummy/dummypartitiontable.h diff --git a/src/backend/libparted/CMakeLists.txt b/src/plugins/libparted/CMakeLists.txt similarity index 100% rename from src/backend/libparted/CMakeLists.txt rename to src/plugins/libparted/CMakeLists.txt diff --git a/src/backend/libparted/libpartedbackend.cpp b/src/plugins/libparted/libpartedbackend.cpp similarity index 99% rename from src/backend/libparted/libpartedbackend.cpp rename to src/plugins/libparted/libpartedbackend.cpp index 4c26c6c..48bcfd6 100644 --- a/src/backend/libparted/libpartedbackend.cpp +++ b/src/plugins/libparted/libpartedbackend.cpp @@ -20,8 +20,8 @@ /** @file */ -#include "backend/libparted/libpartedbackend.h" -#include "backend/libparted/libparteddevice.h" +#include "plugins/libparted/libpartedbackend.h" +#include "plugins/libparted/libparteddevice.h" #include "core/device.h" #include "core/partition.h" diff --git a/src/backend/libparted/libpartedbackend.h b/src/plugins/libparted/libpartedbackend.h similarity index 100% rename from src/backend/libparted/libpartedbackend.h rename to src/plugins/libparted/libpartedbackend.h diff --git a/src/backend/libparted/libparteddevice.cpp b/src/plugins/libparted/libparteddevice.cpp similarity index 97% rename from src/backend/libparted/libparteddevice.cpp rename to src/plugins/libparted/libparteddevice.cpp index a9dbe5d..16f6026 100644 --- a/src/backend/libparted/libparteddevice.cpp +++ b/src/plugins/libparted/libparteddevice.cpp @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include "backend/libparted/libparteddevice.h" -#include "backend/libparted/libpartedpartitiontable.h" +#include "plugins/libparted/libparteddevice.h" +#include "plugins/libparted/libpartedpartitiontable.h" #include "core/partitiontable.h" diff --git a/src/backend/libparted/libparteddevice.h b/src/plugins/libparted/libparteddevice.h similarity index 100% rename from src/backend/libparted/libparteddevice.h rename to src/plugins/libparted/libparteddevice.h diff --git a/src/backend/libparted/libpartedpartition.cpp b/src/plugins/libparted/libpartedpartition.cpp similarity index 96% rename from src/backend/libparted/libpartedpartition.cpp rename to src/plugins/libparted/libpartedpartition.cpp index cb0c191..ad0c1aa 100644 --- a/src/backend/libparted/libpartedpartition.cpp +++ b/src/plugins/libparted/libpartedpartition.cpp @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include "backend/libparted/libpartedpartition.h" -#include "backend/libparted/libpartedbackend.h" +#include "plugins/libparted/libpartedpartition.h" +#include "plugins/libparted/libpartedbackend.h" #include "util/report.h" diff --git a/src/backend/libparted/libpartedpartition.h b/src/plugins/libparted/libpartedpartition.h similarity index 100% rename from src/backend/libparted/libpartedpartition.h rename to src/plugins/libparted/libpartedpartition.h diff --git a/src/backend/libparted/libpartedpartitiontable.cpp b/src/plugins/libparted/libpartedpartitiontable.cpp similarity index 98% rename from src/backend/libparted/libpartedpartitiontable.cpp rename to src/plugins/libparted/libpartedpartitiontable.cpp index 2ed7bea..0b48cbd 100644 --- a/src/backend/libparted/libpartedpartitiontable.cpp +++ b/src/plugins/libparted/libpartedpartitiontable.cpp @@ -17,9 +17,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include "backend/libparted/libpartedpartitiontable.h" -#include "backend/libparted/libpartedpartition.h" -#include "backend/libparted/libpartedbackend.h" +#include "plugins/libparted/libpartedpartitiontable.h" +#include "plugins/libparted/libpartedpartition.h" +#include "plugins/libparted/libpartedbackend.h" #include "core/partition.h" #include "core/device.h" diff --git a/src/backend/libparted/libpartedpartitiontable.h b/src/plugins/libparted/libpartedpartitiontable.h similarity index 100% rename from src/backend/libparted/libpartedpartitiontable.h rename to src/plugins/libparted/libpartedpartitiontable.h