rendered paste bodydiff -U 3 -H -d -r -N -- pm.orig/CMakeLists.txt pm.new/CMakeLists.txt
--- pm.orig/CMakeLists.txt 2010-09-20 18:36:42.352405831 -0400
+++ pm.new/CMakeLists.txt 2010-10-22 05:45:38.245083627 -0400
@@ -46,11 +46,10 @@
include(KDE4Defaults)
include(MacroLibrary)
-include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${UUID_INCLUDE_DIRS} ${BLKID_INCLUDE_DIRS} lib/ src/)
+include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${UUID_INCLUDE_DIRS} ${BLKID_INCLUDE_DIRS} lib/ src/ build/)
add_subdirectory(lib)
add_subdirectory(src)
-add_subdirectory(icons)
message(STATUS "KDE Partition Manager ${VERSION} will be built for install into ${CMAKE_INSTALL_PREFIX}")
diff -U 3 -H -d -r -N -- pm.orig/icons/CMakeLists.txt pm.new/icons/CMakeLists.txt
--- pm.orig/icons/CMakeLists.txt 2010-08-21 19:31:29.870442376 -0400
+++ pm.new/icons/CMakeLists.txt 1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-kde4_install_icons(${ICON_INSTALL_DIR})
Binary files pm.orig/icons/hi128-apps-partitionmanager.png and pm.new/icons/hi128-apps-partitionmanager.png differ
Binary files pm.orig/icons/hi16-apps-partitionmanager.png and pm.new/icons/hi16-apps-partitionmanager.png differ
Binary files pm.orig/icons/hi22-apps-partitionmanager.png and pm.new/icons/hi22-apps-partitionmanager.png differ
Binary files pm.orig/icons/hi32-apps-partitionmanager.png and pm.new/icons/hi32-apps-partitionmanager.png differ
Binary files pm.orig/icons/hi48-apps-partitionmanager.png and pm.new/icons/hi48-apps-partitionmanager.png differ
Binary files pm.orig/icons/hi64-apps-partitionmanager.png and pm.new/icons/hi64-apps-partitionmanager.png differ
diff -U 3 -H -d -r -N -- pm.orig/lib.kdev4 pm.new/lib.kdev4
--- pm.orig/lib.kdev4 1969-12-31 19:00:00.000000000 -0500
+++ pm.new/lib.kdev4 2010-10-22 05:14:13.437363380 -0400
@@ -0,0 +1,3 @@
+[Project]
+Manager=KDevCMakeManager
+Name=libpartitionmanager
diff -U 3 -H -d -r -N -- pm.orig/src/CMakeLists.txt pm.new/src/CMakeLists.txt
--- pm.orig/src/CMakeLists.txt 2010-08-21 19:31:29.727116448 -0400
+++ pm.new/src/CMakeLists.txt 2010-10-12 19:13:44.752453579 -0400
@@ -28,37 +28,35 @@
config/*.cpp
)
+file(GLOB partitionmanagerprivate_core_HDRS
+ core/*.h
+)
+file(GLOB partitionmanagerprivate_fs_HDRS
+ fs/*.h
+)
+file(GLOB partitionmanagerprivate_util_HDRS
+ util/*.h
+)
+file(GLOB partitionmanagerprivate_ops_HDRS
+ ops/*.h
+)
+
file(GLOB partitionmanagerprivate_UIFILES config/*.ui gui/*.ui)
kde4_add_ui_files(partitionmanagerprivate_SRCS ${partitionmanagerprivate_UIFILES})
kde4_add_kcfg_files(partitionmanagerprivate_SRCS config.kcfgc)
-kde4_add_library(partitionmanagerprivate SHARED ${partitionmanagerprivate_SRCS})
-
-target_link_libraries(partitionmanagerprivate libfatlabel ${KDE4_KDECORE_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} ${UUID_LIBRARIES} ${BLKID_LIBRARIES} ${LIBATASMART_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS})
-
-install(TARGETS partitionmanagerprivate ${INSTALL_TARGETS_DEFAULT_ARGS})
-
-############################################
-
-file(GLOB partitionmanager-bin_SRCS main.cpp)
-
-kde4_add_app_icon(partitionmanager-bin_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-apps-partitionmanager.png")
-
-kde4_add_executable(partitionmanager-bin ${partitionmanager-bin_SRCS})
+kde4_add_library(tribepartitionmanager SHARED ${partitionmanagerprivate_SRCS})
-target_link_libraries(partitionmanager-bin partitionmanagerprivate ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS})
+target_link_libraries(tribepartitionmanager libfatlabel ${KDE4_KDECORE_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS}
+ ${UUID_LIBRARIES} ${BLKID_LIBRARIES} ${LIBATASMART_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS})
-if(UNIX)
- add_custom_target(partitionmanager ALL
- COMMAND sed -e 's,@INSTALL_PATH@,${BIN_INSTALL_DIR},g' < ${CMAKE_CURRENT_SOURCE_DIR}/partitionmanager.in > ${CMAKE_CURRENT_BINARY_DIR}/partitionmanager
- )
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/partitionmanager DESTINATION ${BIN_INSTALL_DIR})
-endif(UNIX)
-install(TARGETS partitionmanager-bin ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES gui/partitionmanagerui.rc DESTINATION ${DATA_INSTALL_DIR}/partitionmanager)
-install(FILES partitionmanager.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install(TARGETS tribepartitionmanager ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(FILES ${partitionmanagerprivate_core_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/tribepartitionmanager/core)
+install(FILES ${partitionmanagerprivate_fs_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/tribepartitionmanager/fs)
+install(FILES ${partitionmanagerprivate_util_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/tribepartitionmanager/util)
+install(FILES ${partitionmanagerprivate_ops_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/tribepartitionmanager/ops)
############################################
diff -U 3 -H -d -r -N -- pm.orig/src/backend/corebackendmanager.cpp pm.new/src/backend/corebackendmanager.cpp
--- pm.orig/src/backend/corebackendmanager.cpp 2010-08-21 19:31:28.681280269 -0400
+++ pm.new/src/backend/corebackendmanager.cpp 2010-10-22 05:23:57.057256441 -0400
@@ -17,9 +17,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-#include "backend/corebackendmanager.h"
-#include "backend/corebackend.h"
-
#include <QStringList>
#include <QString>
@@ -31,6 +28,9 @@
#include <kservice.h>
#include <kservicetypetrader.h>
+#include <backend/corebackendmanager.h>
+#include <backend/corebackend.h>
+
#include <config.h>
CoreBackendManager::CoreBackendManager() :
@@ -66,11 +66,11 @@
{
m_Backend = factory->create<CoreBackend>(NULL);
backend()->setAboutData(factory->componentData().aboutData());
- kDebug() << "Loaded backend plugin: " << backend()->about().programName() << ", " << backend()->about().version();
+ qDebug() << "Loaded backend plugin: " << backend()->about().programName() << ", " << backend()->about().version();
return true;
}
- kWarning() << "Could not load plugin for core backend " << name << ": " << loader.errorString();
+ qWarning() << "Could not load plugin for core backend " << name << ": " << loader.errorString();
return false;
}
diff -U 3 -H -d -r -N -- pm.orig/src/backend/corebackendmanager.h pm.new/src/backend/corebackendmanager.h
--- pm.orig/src/backend/corebackendmanager.h 2010-08-21 19:31:28.677941627 -0400
+++ pm.new/src/backend/corebackendmanager.h 2010-10-22 05:37:27.043598816 -0400
@@ -21,6 +21,8 @@
#define COREBACKENDMANAGER__H
+#include <QDebug>
+
#include "util/libpartitionmanagerexport.h"
#include <kservice.h>
@@ -50,7 +52,7 @@
/**
* @return the name of the default backend plugin
*/
- static QString defaultBackendName() { return "pmlibpartedbackendplugin"; }
+ static QString defaultBackendName() { return "plugintribepmlibparted"; }
/**
* @return a list of available backend plugins
@@ -72,7 +74,7 @@
/**
* @return a pointer to the currently loaded backend
*/
- CoreBackend* backend() { return m_Backend; }
+ CoreBackend* backend() { return m_Backend; }
private:
CoreBackend* m_Backend;
diff -U 3 -H -d -r -N -- pm.orig/src/core/devicescanner.cpp pm.new/src/core/devicescanner.cpp
--- pm.orig/src/core/devicescanner.cpp 2010-08-21 19:31:28.971274471 -0400
+++ pm.new/src/core/devicescanner.cpp 2010-10-22 05:50:58.316960805 -0400
@@ -40,6 +40,7 @@
void DeviceScanner::setupConnections()
{
+ CoreBackendManager::self()->load("plugintribepmlibparted");
connect(CoreBackendManager::self()->backend(), SIGNAL(scanProgress(QString,int)), SIGNAL(progress(QString,int)));
}
diff -U 3 -H -d -r -N -- pm.orig/src/core/devicescanner.h pm.new/src/core/devicescanner.h
--- pm.orig/src/core/devicescanner.h 2010-08-21 19:31:28.967117774 -0400
+++ pm.new/src/core/devicescanner.h 2010-10-12 20:44:49.000000000 -0400
@@ -22,15 +22,17 @@
#include <QThread>
+#include "util/libpartitionmanagerexport.h"
+
class OperationStack;
-/** Thread to scan for all available Devices on this computer.
+/** @brief Thread to scan for all available Devices on this computer.
This class is used to find all Devices on the computer and to create new Device instances for each of them. It's subclassing QThread to run asynchronously.
@author Volker Lanz <vl@fidra.de>
*/
-class DeviceScanner : public QThread
+class LIBPARTITIONMANAGERPRIVATE_EXPORT DeviceScanner : public QThread
{
Q_OBJECT
diff -U 3 -H -d -r -N -- pm.orig/src/core/operationrunner.h pm.new/src/core/operationrunner.h
--- pm.orig/src/core/operationrunner.h 2010-08-21 19:31:28.964686305 -0400
+++ pm.new/src/core/operationrunner.h 2010-10-12 20:42:26.000000000 -0400
@@ -24,18 +24,19 @@
#include <QThread>
#include <QMutex>
#include <qglobal.h>
+#include "util/libpartitionmanagerexport.h"
class Operation;
class OperationStack;
class Report;
-/** Thread to run the Operations in the OperationStack.
+/** @brief Thread to run the Operations in the OperationStack.
Runs the OperationStack when the user applies operations.
@author Volker Lanz <vl@fidra.de>
*/
-class OperationRunner : public QThread
+class LIBPARTITIONMANAGERPRIVATE_EXPORT OperationRunner : public QThread
{
Q_OBJECT
Q_DISABLE_COPY(OperationRunner)
diff -U 3 -H -d -r -N -- pm.orig/src/core/operationstack.h pm.new/src/core/operationstack.h
--- pm.orig/src/core/operationstack.h 2010-08-21 19:31:28.967117774 -0400
+++ pm.new/src/core/operationstack.h 2010-10-12 20:40:35.000000000 -0400
@@ -26,20 +26,21 @@
#include <QReadWriteLock>
#include <qglobal.h>
+#include "util/libpartitionmanagerexport.h"
class Device;
class Partition;
class Operation;
class DeviceScanner;
-/** The list of Operations the user wants to have performed.
+/** @brief The list of Operations the user wants to have performed.
OperationStack also handles the Devices that were found on this computer and the merging of
Operations, e.g., when the user first creates a Partition, then deletes it.
@author Volker Lanz <vl@fidra.de>
*/
-class OperationStack : public QObject
+class LIBPARTITIONMANAGERPRIVATE_EXPORT OperationStack : public QObject
{
Q_OBJECT
Q_DISABLE_COPY(OperationStack)
diff -U 3 -H -d -r -N -- pm.orig/src/core/partition.h pm.new/src/core/partition.h
--- pm.orig/src/core/partition.h 2010-08-21 19:31:28.971274471 -0400
+++ pm.new/src/core/partition.h 2010-10-12 19:18:11.804522855 -0400
@@ -101,6 +101,9 @@
friend class SetPartFlagsJob;
friend class RestoreFileSystemJob;
+ friend class PartitionManager;
+ friend class PartitionPage;
+
friend QTextStream& operator<<(QTextStream& stream, const Partition& p);
public:
diff -U 3 -H -d -r -N -- pm.orig/src/fs/filesystem.h pm.new/src/fs/filesystem.h
--- pm.orig/src/fs/filesystem.h 2010-08-21 19:31:29.553774663 -0400
+++ pm.new/src/fs/filesystem.h 2010-10-12 20:46:04.000000000 -0400
@@ -27,18 +27,19 @@
#include <QStringList>
#include <QString>
#include <QList>
+#include "util/libpartitionmanagerexport.h"
class Device;
class Report;
-/** Base class for all FileSystems.
+/** @brief Base class for all FileSystems.
Represents a file system and handles support for various types of operations that can
be performed on those.
@author Volker Lanz <vl@fidra.de>
*/
-class FileSystem
+class LIBPARTITIONMANAGERPRIVATE_EXPORT FileSystem
{
Q_DISABLE_COPY(FileSystem)
diff -U 3 -H -d -r -N -- pm.orig/src/ops/createfilesystemoperation.h pm.new/src/ops/createfilesystemoperation.h
--- pm.orig/src/ops/createfilesystemoperation.h 2010-08-21 19:31:29.170441189 -0400
+++ pm.new/src/ops/createfilesystemoperation.h 2010-10-12 20:57:40.000000000 -0400
@@ -21,6 +21,8 @@
#define CREATEFILESYSTEMOPERATION__H
+#include "util/libpartitionmanagerexport.h"
+
#include "ops/operation.h"
#include "fs/filesystem.h"
@@ -34,13 +36,13 @@
class CreateFileSystemJob;
class CheckFileSystemJob;
-/** Create a FileSystem.
+/** @brief Create a FileSystem.
Creates a FileSystem on a given Partition and Device.
@author Volker Lanz <vl@fidra.de>
*/
-class CreateFileSystemOperation : public Operation
+class LIBPARTITIONMANAGERPRIVATE_EXPORT CreateFileSystemOperation : public Operation
{
friend class OperationStack;
diff -U 3 -H -d -r -N -- pm.orig/src/ops/deleteoperation.h pm.new/src/ops/deleteoperation.h
--- pm.orig/src/ops/deleteoperation.h 2010-08-21 19:31:29.173775570 -0400
+++ pm.new/src/ops/deleteoperation.h 2010-10-22 06:02:52.000000000 -0400
@@ -22,6 +22,7 @@
#define DELETEOPERATION__H
#include "ops/operation.h"
+#include "util/libpartitionmanagerexport.h"
#include <QString>
@@ -35,7 +36,7 @@
/** Delete a Partition.
@author Volker Lanz <vl@fidra.de>
*/
-class DeleteOperation : public Operation
+class LIBPARTITIONMANAGERPRIVATE_EXPORT DeleteOperation : public Operation
{
friend class OperationStack;
diff -U 3 -H -d -r -N -- pm.orig/src/ops/newoperation.h pm.new/src/ops/newoperation.h
--- pm.orig/src/ops/newoperation.h 2010-08-21 19:31:29.170441189 -0400
+++ pm.new/src/ops/newoperation.h 2010-10-12 20:43:20.000000000 -0400
@@ -22,6 +22,7 @@
#define NEWOPERATION__H
#include "ops/operation.h"
+#include "util/libpartitionmanagerexport.h"
#include <QString>
@@ -33,13 +34,13 @@
class SetFileSystemLabelJob;
class CheckFileSystemJob;
-/** Create a Partition.
+/** @brief Create a Partition.
Creates the given Partition on the given Device.
@author Volker Lanz <vl@fidra.de>
*/
-class NewOperation : public Operation
+class LIBPARTITIONMANAGERPRIVATE_EXPORT NewOperation : public Operation
{
friend class OperationStack;
diff -U 3 -H -d -r -N -- pm.orig/src/ops/resizeoperation.h pm.new/src/ops/resizeoperation.h
--- pm.orig/src/ops/resizeoperation.h 2010-08-21 19:31:29.173775570 -0400
+++ pm.new/src/ops/resizeoperation.h 2010-10-22 06:03:57.000000000 -0400
@@ -24,6 +24,7 @@
#include "ops/operation.h"
#include "core/partition.h"
+#include "util/libpartitionmanagerexport.h"
#include <QString>
@@ -47,7 +48,7 @@
@author Volker Lanz <vl@fidra.de>
*/
-class ResizeOperation : public Operation
+class LIBPARTITIONMANAGERPRIVATE_EXPORT ResizeOperation : public Operation
{
friend class OperationStack;
diff -U 3 -H -d -r -N -- pm.orig/src/plugins/dummy/CMakeLists.txt pm.new/src/plugins/dummy/CMakeLists.txt
--- pm.orig/src/plugins/dummy/CMakeLists.txt 2010-08-21 19:31:27.683792194 -0400
+++ pm.new/src/plugins/dummy/CMakeLists.txt 2010-10-12 19:13:45.363462889 -0400
@@ -19,7 +19,7 @@
kde4_add_plugin(pmdummybackendplugin ${pmdummybackendplugin_SRCS})
-target_link_libraries(pmdummybackendplugin partitionmanagerprivate ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${LIBPARTED_LIBS} ${BLKID_LIBRARIES} ${KDE4_SOLID_LIBS})
+target_link_libraries(pmdummybackendplugin tribepartitionmanager ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${LIBPARTED_LIBS} ${BLKID_LIBRARIES} ${KDE4_SOLID_LIBS})
install(TARGETS pmdummybackendplugin DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES pmdummybackendplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff -U 3 -H -d -r -N -- pm.orig/src/plugins/libparted/CMakeLists.txt pm.new/src/plugins/libparted/CMakeLists.txt
--- pm.orig/src/plugins/libparted/CMakeLists.txt 2010-08-21 19:31:27.667108834 -0400
+++ pm.new/src/plugins/libparted/CMakeLists.txt 2010-10-22 05:33:31.011002213 -0400
@@ -17,9 +17,11 @@
file (GLOB pmlibpartedbackendplugin_SRCS *.cpp)
-kde4_add_plugin(pmlibpartedbackendplugin ${pmlibpartedbackendplugin_SRCS})
+kde4_add_library(plugintribepmlibparted SHARED ${pmlibpartedbackendplugin_SRCS})
-target_link_libraries(pmlibpartedbackendplugin partitionmanagerprivate ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${LIBPARTED_LIBS} ${BLKID_LIBRARIES} ${KDE4_SOLID_LIBS})
+target_link_libraries(plugintribepmlibparted tribepartitionmanager ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${LIBPARTED_LIBS} ${BLKID_LIBRARIES} ${KDE4_SOLID_LIBS})
-install(TARGETS pmlibpartedbackendplugin DESTINATION ${PLUGIN_INSTALL_DIR})
+set_target_properties(plugintribepmlibparted PROPERTIES PREFIX "")
+
+install(TARGETS plugintribepmlibparted DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES pmlibpartedbackendplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff -U 3 -H -d -r -N -- pm.orig/src/plugins/libparted/libpartedbackend.cpp pm.new/src/plugins/libparted/libpartedbackend.cpp
--- pm.orig/src/plugins/libparted/libpartedbackend.cpp 2010-08-21 19:31:27.663775990 -0400
+++ pm.new/src/plugins/libparted/libpartedbackend.cpp 2010-10-22 05:49:27.877582712 -0400
@@ -20,6 +20,8 @@
/** @file
*/
+#include <QDebug>
+
#include "plugins/libparted/libpartedbackend.h"
#include "plugins/libparted/libparteddevice.h"
@@ -57,6 +59,9 @@
#include <unistd.h>
#include <blkid/blkid.h>
+#include "../../config.h"
+
+
K_PLUGIN_FACTORY(LibPartedBackendFactory, registerPlugin<LibPartedBackend>(); )
static KAboutData createPluginAboutData()
@@ -366,7 +371,9 @@
d.partitionTable()->updateUnallocated(d);
- if (d.partitionTable()->isSectorBased(d))
+ Config::instance("partitionmanagerrc");
+
+ if (d.partitionTable()->isSectorBased(d))
d.partitionTable()->setType(d, PartitionTable::msdos_sectorbased);
foreach(const Partition* part, partitions)
diff -U 3 -H -d -r -N -- pm.orig/src/plugins/libparted/pmlibpartedbackendplugin.desktop pm.new/src/plugins/libparted/pmlibpartedbackendplugin.desktop
--- pm.orig/src/plugins/libparted/pmlibpartedbackendplugin.desktop 2010-09-20 18:36:42.315738532 -0400
+++ pm.new/src/plugins/libparted/pmlibpartedbackendplugin.desktop 2010-10-12 19:13:45.375463074 -0400
@@ -54,8 +54,8 @@
ServiceTypes=PartitionManager/Plugin
Icon=preferences-plugin
-X-KDE-Library=pmlibpartedbackendplugin
-X-KDE-PluginInfo-Name=pmlibpartedbackendplugin
+X-KDE-Library=plugintribepmlibparted
+X-KDE-PluginInfo-Name=plugintribepmlibparted
X-KDE-PluginInfo-Author=Volker Lanz
X-KDE-PluginInfo-Email=vl@fidra.de
X-KDE-PluginInfo-License=GPL
diff -U 3 -H -d -r -N -- pm.orig/src/util/capacity.h pm.new/src/util/capacity.h
--- pm.orig/src/util/capacity.h 2010-08-21 19:31:29.660743954 -0400
+++ pm.new/src/util/capacity.h 2010-10-12 20:55:32.000000000 -0400
@@ -25,15 +25,16 @@
class Device;
#include <qglobal.h>
+#include "util/libpartitionmanagerexport.h"
-/** Represent any kind of capacity.
+/** @brief Represent any kind of capacity.
Any kind of capacity that can be expressed in units of Byte, KiB, MiB and so on. Also prints
capacities in nicely formatted ways.
@author Volker Lanz <vl@fidra.de>
*/
-class Capacity
+class LIBPARTITIONMANAGERPRIVATE_EXPORT Capacity
{
public:
/** Units we can deal with */
diff -U 3 -H -d -r -N -- pm.orig/src/util/helpers.cpp pm.new/src/util/helpers.cpp
--- pm.orig/src/util/helpers.cpp 2010-08-21 19:31:29.663783533 -0400
+++ pm.new/src/util/helpers.cpp 2010-10-22 05:36:16.342521490 -0400
@@ -185,14 +185,14 @@
bool loadBackend()
{
- if (CoreBackendManager::self()->load(Config::backend()) == false)
+ if (CoreBackendManager::self()->load("plugintribepmlibparted") == false)
{
if (CoreBackendManager::self()->load(CoreBackendManager::defaultBackendName()))
{
KMessageBox::sorry(NULL,
i18nc("@info", "<para>The configured backend plugin \"%1\" could not be loaded.</para>"
"<para>Loading the default backend plugin \"%2\" instead.</para>",
- Config::backend(), CoreBackendManager::defaultBackendName()),
+ "tribepmlibparted", CoreBackendManager::defaultBackendName()),
i18nc("@title:window", "Error: Could Not Load Backend Plugin"));
Config::setBackend(CoreBackendManager::defaultBackendName());
}
@@ -201,7 +201,7 @@
KMessageBox::error(NULL,
i18nc("@info", "<para>Neither the configured (\"%1\") nor the default (\"%2\") backend "
"plugin could be loaded.</para><para>Please check your installation.</para>",
- Config::backend(), CoreBackendManager::defaultBackendName()),
+ "tribepmlibparted", CoreBackendManager::defaultBackendName()),
i18nc("@title:window", "Error: Could Not Load Backend Plugin"));
return false;
}
@@ -214,27 +214,27 @@
{
QString predicate = "StorageDrive.driveType == 'HardDisk'";
- KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
- if (args->count() > 0)
- {
- predicate = " [ " + predicate + " AND ";
-
- if (args->count() > 1)
- predicate += "[ ";
-
- for (qint32 i = 0; i < args->count(); i++)
- {
- predicate += QString("Block.device == '%1' ").arg(args->arg(i));
-
- if (i < args->count() - 1)
- predicate += "OR ";
- }
-
- if (args->count() > 1)
- predicate += "] ";
-
- predicate += ']';
- }
+// KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+// if (args->count() > 0)
+// {
+// predicate = " [ " + predicate + " AND ";
+//
+// if (args->count() > 1)
+// predicate += "[ ";
+//
+// for (qint32 i = 0; i < args->count(); i++)
+// {
+// predicate += QString("Block.device == '%1' ").arg(args->arg(i));
+//
+// if (i < args->count() - 1)
+// predicate += "OR ";
+// }
+//
+// if (args->count() > 1)
+// predicate += "] ";
+//
+// predicate += ']';
+// }
kDebug() << predicate;