transformed a class method into a generic function

flavio · Nov 6, 2009 · 3fc7e5d · 3fc7e5d
1 parent 72e71f9
commit 3fc7e5d
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 16 deletions.
diff --git a/src/app/devicewidget.cpp b/src/app/devicewidget.cpp
@@ -44,8 +44,7 @@ void DeviceWidget::slotRefresh()
 
   foreach (const Device &device, Device::listFromType(DeviceInterface::StorageDrive, QString()))
   {
-    StorageDrive* storage = (StorageDrive*) device.asDeviceInterface(DeviceInterface::StorageDrive);
-    if (isStorageDeviceValid(storage))
+    if (isDeviceInteresting(device.udi()))
       addDevice(&device);
   }
 }
@@ -62,17 +61,6 @@ void DeviceWidget::slotDeviceRemoved(QString udi)
   slotRefresh();
 }
 
-bool DeviceWidget::isStorageDeviceValid(StorageDrive* storage)
-{
-  if (storage == 0) {
-    return false;
-  } else {
-    return (storage->driveType() == StorageDrive::HardDisk) &&
-              ((storage->bus() == StorageDrive::Usb) ||
-               (storage->bus() == StorageDrive::Ieee1394));
-  }
-}
-
 void DeviceWidget::slotCurrentItemChanged(QTreeWidgetItem* curr,QTreeWidgetItem* prev)
 {
   Q_UNUSED(prev)

diff --git a/src/app/devicewidget.h b/src/app/devicewidget.h
@@ -5,7 +5,6 @@
 
 namespace Solid {
   class Device;
-  class StorageDrive;
 }
 
 class DeviceWidget : public QWidget, private Ui::DeviceWidget {
@@ -25,7 +24,6 @@ class DeviceWidget : public QWidget, private Ui::DeviceWidget {
     void slotItemSelectionChanged();
 
   private:
-    bool isStorageDeviceValid(Solid::StorageDrive* storage);
     void addDevice(const Solid::Device* device);
 
   signals:

diff --git a/src/utils/common.cpp b/src/utils/common.cpp
@@ -29,6 +29,15 @@
 #include <QtCore/QMap>
 #include <QtNetwork/QHostInfo>
 
+//solid specific includes
+#include <solid/devicenotifier.h>
+#include <solid/device.h>
+#include <solid/deviceinterface.h>
+#include <solid/storagedrive.h>
+#include <solid/storagevolume.h>
+
+using namespace Solid;
+
 const QString bytesToHuman(qulonglong bytes)
 {
   QString size;
@@ -218,3 +227,16 @@ const QStringList findBackupDirectoriesToDelete(const QStringList& dirs)
   return directoriesToRemove;
 }
 
+bool isDeviceInteresting(const QString& udi)
+{
+  Device device (udi);
+  StorageDrive* storage = (StorageDrive*) device.asDeviceInterface(DeviceInterface::StorageDrive);
+  if (storage == 0) {
+    return false;
+  } else {
+    return (storage->driveType() == StorageDrive::HardDisk) &&
+              ((storage->bus() == StorageDrive::Usb) ||
+               (storage->bus() == StorageDrive::Ieee1394));
+  }
+}
+
diff --git a/src/utils/common.h b/src/utils/common.h
@@ -39,12 +39,19 @@ const QString calculateBackupDestination(const QString& mount, const QString& re
 const QString calculateBackupDestination(const QString& mount);
 
 /*!
-  Function used for finding the old backup directories to remove.
+  Function used to find the old backup directories to remove.
   Kaveau keeps:
   \li hourly backups for the past 24 hours
   \li daily backups for the past month
   \li weekly backups until the external disk is full
 */
 const QStringList findBackupDirectoriesToDelete(const QStringList& dirs);
 
+
+/*!
+  Function used to check if a certain device can be used by kaveau.
+  \param udi the udi of the device to check
+*/
+bool isDeviceInteresting(const QString& udi);
+
 #endif // COMMON_H