[kde-doc-english] [amarok] /: Merge DeviceHandler{, Factory} to SqlCollection (were: plugins)
Matěj Laitl
matej at laitl.cz
Sat Sep 29 11:18:53 UTC 2012
Git commit b6a6a49762425566f10e8f67b8ccf3ff6bf1dcfe by Matěj Laitl.
Committed on 08/02/2012 at 12:21.
Pushed by laitl into branch 'master'.
Merge DeviceHandler{,Factory} to SqlCollection (were: plugins)
And move MountPointManager to SqlCollection target, too.
MountPointManager was only used in SqlCollection and DeviceHandlers are
an implementation detail of the "Dynamic Collection" feature - they
should have never been selectable or even visible to users.
Only thing that prevented this change earlier was a nasty bug that
caused statistics data loss when you toggled the Mass Storage Local
Collection Backends plugin. This bug was fixed in 2.6.
All former Local Collection file backends are now enabled by default.
GUI: The "Local Collection Backends" in Config -> Plugins will
disappear in 2.7, please update Manual/ConfiguringAmarok
CCMAIL: amarok-promo at kde.org
M +2 -0 ChangeLog
M +0 -1 src/CMakeLists.txt
M +0 -17 src/PluginManager.cpp
M +0 -1 src/PluginManager.h
M +0 -4 src/configdialog/dialogs/PluginsConfig.cpp
R +17 -35 src/core-impl/collections/db/MountPointManager.cpp [from: src/MountPointManager.cpp - 091% similarity]
R +13 -19 src/core-impl/collections/db/MountPointManager.h [from: src/MountPointManager.h - 093% similarity]
M +5 -3 src/core-impl/collections/db/sql/CMakeLists.txt
M +3 -1 src/core-impl/collections/db/sql/SqlCollection.cpp
M +2 -2 src/core-impl/collections/db/sql/SqlCollectionFactory.cpp
M +3 -4 src/core-impl/collections/db/sql/SqlCollectionLocation.cpp
M +0 -1 src/core-impl/collections/db/sql/SqlRegistry.h
M +0 -1 src/core-impl/collections/db/sql/amarok_sqlcollection_export.h
D +0 -7 src/core-impl/collections/db/sql/device/CMakeLists.txt
D +0 -24 src/core-impl/collections/db/sql/device/massstorage/CMakeLists.txt
M +4 -20 src/core-impl/collections/db/sql/device/massstorage/MassStorageDeviceHandler.cpp
M +2 -7 src/core-impl/collections/db/sql/device/massstorage/MassStorageDeviceHandler.h
D +0 -82 src/core-impl/collections/db/sql/device/massstorage/amarok_device_massstorage.desktop
D +0 -26 src/core-impl/collections/db/sql/device/nfs/CMakeLists.txt
M +1 -16 src/core-impl/collections/db/sql/device/nfs/NfsDeviceHandler.cpp
M +2 -4 src/core-impl/collections/db/sql/device/nfs/NfsDeviceHandler.h
D +0 -82 src/core-impl/collections/db/sql/device/nfs/amarok_device_nfs.desktop
D +0 -26 src/core-impl/collections/db/sql/device/smb/CMakeLists.txt
M +1 -16 src/core-impl/collections/db/sql/device/smb/SmbDeviceHandler.cpp
M +2 -4 src/core-impl/collections/db/sql/device/smb/SmbDeviceHandler.h
D +0 -81 src/core-impl/collections/db/sql/device/smb/amarok_device_smb.desktop
M +1 -1 src/core/support/PluginFactory.h
M +1 -1 src/dialogs/CollectionSetup.cpp
M +0 -1 src/dialogs/DiagnosticDialog.cpp
M +2 -2 tests/core-impl/collections/db/sql/SqlMountPointManagerMock.h
http://commits.kde.org/amarok/b6a6a49762425566f10e8f67b8ccf3ff6bf1dcfe
diff --git a/ChangeLog b/ChangeLog
index 7744168..7e0612e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@ VERSION 2.7-Beta 1
* Amazon store: We now ship a utility to handle downloads from Amazon.
CHANGES:
+ * The confusing "Local Collection Backends" category of plugins was removed
+ from the Configure dialog. All backends are enabled from now on.
* Statistics of tracks outside of collections are only read/saved to file
tags (if enabled) instead of being kept in the database.
* Last.fm Skip button removed; Last.fm API no longer provides it. (BR 305576)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8ae1ab4..9efeb20 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -631,7 +631,6 @@ set(amaroklib_LIB_SRCS
MainWindow.cpp
MediaDeviceCache.cpp
MediaDeviceMonitor.cpp
- MountPointManager.cpp
PluginManager.cpp
QStringx.cpp
ScriptManager.cpp
diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp
index 977c241..e7e751a 100644
--- a/src/PluginManager.cpp
+++ b/src/PluginManager.cpp
@@ -21,7 +21,6 @@
#include "core/support/Amarok.h"
#include "core/support/Debug.h"
#include "core-impl/collections/db/sql/SqlCollection.h"
-#include "MountPointManager.h"
#include "services/ServicePluginManager.h"
#include <KBuildSycocaProgressDialog>
@@ -89,22 +88,6 @@ Plugins::PluginManager::init()
m_factories[ key ] = createFactories( key );
m_servicePluginManager->init( m_factories.value( key ) );
PERF_LOG( "Loaded service plugins" )
-
- PERF_LOG( "Loading device plugins" )
- key = QLatin1String( "Device" );
- Collections::Collection *coll = CollectionManager::instance()->primaryCollection();
- if( !coll )
- {
- error() << "No primary collection available. You might have problems with your installation. Amarok will not be usable like this.";
- }
- else
- {
- MountPointManager *mountPointManager;
- mountPointManager = static_cast<Collections::SqlCollection*>( coll )->mountPointManager();
- m_factories[ key ] = createFactories( key );
- mountPointManager->loadDevicePlugins( m_factories.value( key ) );
- }
- PERF_LOG( "Loaded device plugins" )
}
QList<Plugins::PluginFactory*>
diff --git a/src/PluginManager.h b/src/PluginManager.h
index a1c5aa0..9f2fe83 100644
--- a/src/PluginManager.h
+++ b/src/PluginManager.h
@@ -20,7 +20,6 @@
#include "amarok_export.h"
#include "core/support/PluginFactory.h"
-class MountPointManager;
class ServicePluginManager;
namespace Plugins {
diff --git a/src/configdialog/dialogs/PluginsConfig.cpp b/src/configdialog/dialogs/PluginsConfig.cpp
index c5c7932..d5011b8 100644
--- a/src/configdialog/dialogs/PluginsConfig.cpp
+++ b/src/configdialog/dialogs/PluginsConfig.cpp
@@ -47,10 +47,6 @@ PluginsConfig::PluginsConfig( QWidget *parent )
m_selector->addPlugins( The::pluginManager()->plugins( key ),
KPluginSelector::ReadConfigFile, i18n("Internet Services"), key );
- key = QLatin1String( "Device" );
- m_selector->addPlugins( The::pluginManager()->plugins( key ),
- KPluginSelector::ReadConfigFile, i18n("Local Collection Backends"), key );
-
connect( m_selector, SIGNAL(changed(bool)), SLOT(slotConfigChanged(bool)) );
connect( m_selector, SIGNAL(changed(bool)), parent, SLOT(updateButtons()) );
}
diff --git a/src/MountPointManager.cpp b/src/core-impl/collections/db/MountPointManager.cpp
similarity index 91%
rename from src/MountPointManager.cpp
rename to src/core-impl/collections/db/MountPointManager.cpp
index 30af4f3..feeb020 100644
--- a/src/MountPointManager.cpp
+++ b/src/core-impl/collections/db/MountPointManager.cpp
@@ -19,20 +19,16 @@
#include "MountPointManager.h"
#include "MediaDeviceCache.h"
-
#include "core/support/Amarok.h"
#include "core/support/Debug.h"
#include "core/collections/support/SqlStorage.h"
+#include "core-impl/collections/db/sql/device/massstorage/MassStorageDeviceHandler.h"
+#include "core-impl/collections/db/sql/device/nfs/NfsDeviceHandler.h"
+#include "core-impl/collections/db/sql/device/smb/SmbDeviceHandler.h"
-//solid stuff
-#include <solid/predicate.h>
-#include <solid/device.h>
-#include <solid/deviceinterface.h>
-#include <solid/devicenotifier.h>
-#include <solid/storageaccess.h>
-
-#include <threadweaver/Job.h>
-#include <threadweaver/ThreadWeaver.h>
+#include <KConfigGroup>
+#include <Solid/Predicate>
+#include <Solid/Device>
#include <QDesktopServices>
#include <QDir>
@@ -41,12 +37,6 @@
#include <QStringList>
#include <QTimer>
-DeviceHandlerFactory::DeviceHandlerFactory( QObject *parent, const QVariantList &args )
- : Plugins::PluginFactory( parent, args )
-{
- m_type = Plugins::PluginFactory::Device;
-}
-
MountPointManager::MountPointManager( QObject *parent, SqlStorage *storage )
: QObject( parent )
, m_storage( storage )
@@ -63,6 +53,8 @@ MountPointManager::MountPointManager( QObject *parent, SqlStorage *storage )
connect( MediaDeviceCache::instance(), SIGNAL( deviceAdded( QString ) ), SLOT( deviceAdded( QString ) ) );
connect( MediaDeviceCache::instance(), SIGNAL( deviceRemoved( QString ) ), SLOT( deviceRemoved( QString ) ) );
+
+ createDeviceFactories();
}
@@ -73,33 +65,23 @@ MountPointManager::~MountPointManager()
m_handlerMapMutex.lock();
foreach( DeviceHandler *dh, m_handlerMap )
delete dh;
-
- while( !m_mediumFactories.isEmpty() )
- delete m_mediumFactories.takeFirst();
- while( !m_remoteFactories.isEmpty() )
- delete m_remoteFactories.takeFirst();
m_handlerMapMutex.unlock();
+
+ // DeviceHandlerFactories are memory managed using QObject parentship
}
void
-MountPointManager::loadDevicePlugins( const QList<Plugins::PluginFactory*> &factories )
+MountPointManager::createDeviceFactories()
{
DEBUG_BLOCK
- foreach( Plugins::PluginFactory *pFactory, factories )
+ QList<DeviceHandlerFactory*> factories;
+ factories << new MassStorageDeviceHandlerFactory( this );
+ factories << new NfsDeviceHandlerFactory( this );
+ factories << new SmbDeviceHandlerFactory( this );
+ foreach( DeviceHandlerFactory *factory, factories )
{
- DeviceHandlerFactory *factory = qobject_cast<DeviceHandlerFactory*>( pFactory );
- if( !factory )
- continue;
-
- KPluginInfo info = factory->info();
- QString name = info.pluginName();
- bool enabled = Amarok::config( "Plugins" ).readEntry( name + "Enabled", info.isPluginEnabledByDefault() );
- if( !enabled )
- continue;
-
- debug() << "initializing:" << name;
- factory->init();
+ debug() << "Initializing DeviceHandlerFactory of type:" << factory->type();
if( factory->canCreateFromMedium() )
m_mediumFactories.append( factory );
else if (factory->canCreateFromConfig() )
diff --git a/src/MountPointManager.h b/src/core-impl/collections/db/MountPointManager.h
similarity index 93%
rename from src/MountPointManager.h
rename to src/core-impl/collections/db/MountPointManager.h
index 1135120..8c6bf95 100644
--- a/src/MountPointManager.h
+++ b/src/core-impl/collections/db/MountPointManager.h
@@ -17,34 +17,32 @@
#ifndef AMAROK_MOUNTPOINTMANAGER_H
#define AMAROK_MOUNTPOINTMANAGER_H
-#include "amarok_export.h"
-#include "core/support/Amarok.h"
-#include "core/support/PluginFactory.h"
+#include "core-impl/collections/db/sql/amarok_sqlcollection_export.h"
-#include <KConfigGroup>
-#include <KUrl>
-#include <KPluginInfo>
-#include <solid/device.h>
-#include <threadweaver/Job.h>
+#include <KSharedConfig>
#include <QMap>
#include <QMutex>
-#include <QStringList>
+#include <QObject>
class DeviceHandler;
class DeviceHandlerFactory;
class SqlStorage;
+class KUrl;
+namespace Solid {
+ class Device;
+}
typedef QList<int> IdList;
typedef QList<DeviceHandlerFactory*> FactoryList;
typedef QMap<int, DeviceHandler*> HandlerMap;
-class AMAROK_EXPORT DeviceHandlerFactory : public Plugins::PluginFactory
+class DeviceHandlerFactory : public QObject
{
Q_OBJECT
public:
- DeviceHandlerFactory( QObject *parent, const QVariantList &args );
+ DeviceHandlerFactory( QObject *parent ) : QObject( parent ) {}
virtual ~DeviceHandlerFactory() {}
/**
@@ -81,11 +79,7 @@ public:
virtual QString type() const = 0;
};
-/**
- *
- *
- */
-class AMAROK_EXPORT DeviceHandler
+class DeviceHandler
{
public:
DeviceHandler() {}
@@ -141,7 +135,7 @@ public:
/**
* @author Maximilian Kossick <maximilian.kossick at googlemail.com>
*/
-class AMAROK_EXPORT MountPointManager : public QObject
+class AMAROK_SQLCOLLECTION_EXPORT MountPointManager : public QObject
{
Q_OBJECT
@@ -189,13 +183,13 @@ public:
virtual QStringList collectionFolders() const;
virtual void setCollectionFolders( const QStringList &folders );
- void loadDevicePlugins( const QList<Plugins::PluginFactory*> &factories );
-
signals:
void deviceAdded( int id );
void deviceRemoved( int id );
private:
+ void createDeviceFactories();
+
/**
* checks whether a medium identified by its unique database id is currently mounted.
* Note: does not handle deviceId = -1! It only checks real devices
diff --git a/src/core-impl/collections/db/sql/CMakeLists.txt b/src/core-impl/collections/db/sql/CMakeLists.txt
index 9cf0673..d6ba891 100644
--- a/src/core-impl/collections/db/sql/CMakeLists.txt
+++ b/src/core-impl/collections/db/sql/CMakeLists.txt
@@ -1,8 +1,9 @@
set( amarok_collection-sqlcollection_SRCS
CapabilityDelegateImpl.cpp
DatabaseUpdater.cpp
- ../ScanManager.cpp
../DatabaseCollection.cpp
+ ../MountPointManager.cpp
+ ../ScanManager.cpp
../ScanResultProcessor.cpp
SqlCollection.cpp
SqlCollectionFactory.cpp
@@ -15,6 +16,9 @@ set( amarok_collection-sqlcollection_SRCS
SqlMeta.cpp
SqlWriteLabelCapability.cpp
SqlScanResultProcessor.cpp
+ device/massstorage/MassStorageDeviceHandler.cpp
+ device/nfs/NfsDeviceHandler.cpp
+ device/smb/SmbDeviceHandler.cpp
${CMAKE_SOURCE_DIR}/shared/FileType.cpp
)
@@ -41,8 +45,6 @@ endif(APPLE)
set_target_properties(amarok-sqlcollection PROPERTIES VERSION 1.0.0 SOVERSION 1 )
install(TARGETS amarok-sqlcollection ${INSTALL_TARGETS_DEFAULT_ARGS} )
-add_subdirectory( device )
-
if( BUILD_MYSQLE_COLLECTION )
add_subdirectory( mysqlecollection )
endif( BUILD_MYSQLE_COLLECTION )
diff --git a/src/core-impl/collections/db/sql/SqlCollection.cpp b/src/core-impl/collections/db/sql/SqlCollection.cpp
index 70f0336..54ad56d 100644
--- a/src/core-impl/collections/db/sql/SqlCollection.cpp
+++ b/src/core-impl/collections/db/sql/SqlCollection.cpp
@@ -22,12 +22,13 @@
#include "CapabilityDelegate.h"
#include "CapabilityDelegateImpl.h"
#include "DatabaseUpdater.h"
+#include "core/support/Amarok.h"
#include "core/support/Debug.h"
#include "core/capabilities/TranscodeCapability.h"
#include "core/transcoding/TranscodingController.h"
+#include "core-impl/collections/db/MountPointManager.h"
#include "core-impl/collections/db/ScanManager.h"
#include "dialogs/OrganizeCollectionDialog.h"
-#include "MountPointManager.h"
#include "SqlCollectionLocation.h"
#include "SqlQueryMaker.h"
#include "SqlScanResultProcessor.h"
@@ -38,6 +39,7 @@
#include <KMessageBox>
#include <QApplication>
+#include <QDir>
namespace Collections {
diff --git a/src/core-impl/collections/db/sql/SqlCollectionFactory.cpp b/src/core-impl/collections/db/sql/SqlCollectionFactory.cpp
index e551bdb..3a49472 100644
--- a/src/core-impl/collections/db/sql/SqlCollectionFactory.cpp
+++ b/src/core-impl/collections/db/sql/SqlCollectionFactory.cpp
@@ -16,8 +16,8 @@
#include "SqlCollectionFactory.h"
-#include "SqlCollection.h"
-#include "MountPointManager.h"
+#include "core-impl/collections/db/MountPointManager.h"
+#include "core-impl/collections/db/sql/SqlCollection.h"
#include <KLocale>
diff --git a/src/core-impl/collections/db/sql/SqlCollectionLocation.cpp b/src/core-impl/collections/db/sql/SqlCollectionLocation.cpp
index c3ff894..0b794db 100644
--- a/src/core-impl/collections/db/sql/SqlCollectionLocation.cpp
+++ b/src/core-impl/collections/db/sql/SqlCollectionLocation.cpp
@@ -22,7 +22,6 @@
#include "SqlCollectionLocation.h"
#include "MetaTagLib.h" // for getting the uid
-#include "MountPointManager.h"
#include "core/collections/CollectionLocationDelegate.h"
#include "core/collections/support/SqlStorage.h"
#include "core/interfaces/Logger.h"
@@ -31,9 +30,10 @@
#include "core/meta/Meta.h"
#include "core/meta/support/MetaUtility.h"
#include "core/transcoding/TranscodingController.h"
+#include "core-impl/collections/db/MountPointManager.h"
#include "core-impl/collections/db/ScanManager.h"
-#include "SqlCollection.h"
-#include "SqlMeta.h"
+#include "core-impl/collections/db/sql/SqlCollection.h"
+#include "core-impl/collections/db/sql/SqlMeta.h"
#include "transcoding/TranscodingJob.h"
#include <QDir>
@@ -47,7 +47,6 @@
#include <kio/jobclasses.h>
#include <kio/deletejob.h>
-
using namespace Collections;
SqlCollectionLocation::SqlCollectionLocation( SqlCollection *collection )
diff --git a/src/core-impl/collections/db/sql/SqlRegistry.h b/src/core-impl/collections/db/sql/SqlRegistry.h
index f64b30c..afa1c66 100644
--- a/src/core-impl/collections/db/sql/SqlRegistry.h
+++ b/src/core-impl/collections/db/sql/SqlRegistry.h
@@ -18,7 +18,6 @@
#define SQLREGISTRY_H
#include "SqlMeta.h"
-#include "MountPointManager.h"
#include "amarok_sqlcollection_export.h"
#include <QHash>
diff --git a/src/core-impl/collections/db/sql/amarok_sqlcollection_export.h b/src/core-impl/collections/db/sql/amarok_sqlcollection_export.h
index 4495d0c..9258e6d 100644
--- a/src/core-impl/collections/db/sql/amarok_sqlcollection_export.h
+++ b/src/core-impl/collections/db/sql/amarok_sqlcollection_export.h
@@ -50,4 +50,3 @@
# endif
#endif
-
diff --git a/src/core-impl/collections/db/sql/device/CMakeLists.txt b/src/core-impl/collections/db/sql/device/CMakeLists.txt
deleted file mode 100644
index a60c1ea..0000000
--- a/src/core-impl/collections/db/sql/device/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
-
-add_subdirectory( massstorage )
-if(${KDE_VERSION} VERSION_GREATER "4.4.99")
- add_subdirectory( nfs )
- add_subdirectory( smb )
-endif()
diff --git a/src/core-impl/collections/db/sql/device/massstorage/CMakeLists.txt b/src/core-impl/collections/db/sql/device/massstorage/CMakeLists.txt
deleted file mode 100644
index 2a0a03a..0000000
--- a/src/core-impl/collections/db/sql/device/massstorage/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-include_directories(
- ${KDE4_INCLUDE_DIR}
- ${QT_INCLUDES}
- )
-
-########### next target ###############
-
-set(amarok_device_massstorage_PART_SRCS MassStorageDeviceHandler.cpp )
-
-kde4_add_plugin(amarok_device_massstorage ${amarok_device_massstorage_PART_SRCS})
-
-target_link_libraries(amarok_device_massstorage
- amarok-sqlcollection
- amaroklib
- amarokcore
- ${KDE4_KDECORE_LIBS}
- ${KDE4_SOLID_LIBS} )
-
-install(TARGETS amarok_device_massstorage DESTINATION ${PLUGIN_INSTALL_DIR} )
-
-########### install files ###############
-
-install(FILES amarok_device_massstorage.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-
diff --git a/src/core-impl/collections/db/sql/device/massstorage/MassStorageDeviceHandler.cpp b/src/core-impl/collections/db/sql/device/massstorage/MassStorageDeviceHandler.cpp
index 16c72a0..3eaff00 100644
--- a/src/core-impl/collections/db/sql/device/massstorage/MassStorageDeviceHandler.cpp
+++ b/src/core-impl/collections/db/sql/device/massstorage/MassStorageDeviceHandler.cpp
@@ -20,14 +20,11 @@
#include "core/support/Debug.h"
#include "core/collections/support/SqlStorage.h"
-#include "PluginManager.h"
-#include <kconfig.h>
-#include <kurl.h>
-#include <solid/storagevolume.h>
-#include <solid/storageaccess.h>
-
-AMAROK_EXPORT_DEVICE_PLUGIN( massstorage, MassStorageDeviceHandlerFactory )
+#include <KUrl>
+#include <Solid/Device>
+#include <Solid/StorageAccess>
+#include <Solid/StorageVolume>
MassStorageDeviceHandler::MassStorageDeviceHandler(): DeviceHandler()
{
@@ -122,23 +119,10 @@ bool MassStorageDeviceHandlerFactory::canHandle( const Solid::Device &device ) c
&& !volume->isIgnored() && !excludedFilesystem( volume->fsType() );
}
-MassStorageDeviceHandlerFactory::MassStorageDeviceHandlerFactory( QObject *parent, const QVariantList &args )
- : DeviceHandlerFactory( parent, args )
-{
- KPluginInfo pluginInfo( "amarok_device_massstorage.desktop", "services" );
- pluginInfo.setConfig( Amarok::config("Device_MassiveStorage") );
- m_info = pluginInfo;
-}
-
MassStorageDeviceHandlerFactory::~MassStorageDeviceHandlerFactory( )
{
}
-void MassStorageDeviceHandlerFactory::init()
-{
- m_initialized = true;
-}
-
DeviceHandler * MassStorageDeviceHandlerFactory::createHandler( KSharedConfigPtr, SqlStorage* ) const
{
return 0;
diff --git a/src/core-impl/collections/db/sql/device/massstorage/MassStorageDeviceHandler.h b/src/core-impl/collections/db/sql/device/massstorage/MassStorageDeviceHandler.h
index bf80e55..5320c3c 100644
--- a/src/core-impl/collections/db/sql/device/massstorage/MassStorageDeviceHandler.h
+++ b/src/core-impl/collections/db/sql/device/massstorage/MassStorageDeviceHandler.h
@@ -17,16 +17,14 @@
#ifndef MASSSTORAGEDEVICEHANDLER_H
#define MASSSTORAGEDEVICEHANDLER_H
-#include <MountPointManager.h>
-
-#include <solid/device.h>
+#include "core-impl/collections/db/MountPointManager.h"
class SqlStorage;
class MassStorageDeviceHandlerFactory : public DeviceHandlerFactory
{
public:
- MassStorageDeviceHandlerFactory( QObject *parent, const QVariantList &args );
+ MassStorageDeviceHandlerFactory( QObject *parent ) : DeviceHandlerFactory( parent ) {}
virtual ~MassStorageDeviceHandlerFactory();
virtual bool canHandle( const Solid::Device &device ) const;
@@ -41,8 +39,6 @@ public:
virtual QString type() const;
- virtual void init();
-
private:
bool excludedFilesystem( const QString &fstype ) const;
};
@@ -71,7 +67,6 @@ private:
int m_deviceID;
const QString m_mountPoint;
QString m_udi;
-
};
#endif
diff --git a/src/core-impl/collections/db/sql/device/massstorage/amarok_device_massstorage.desktop b/src/core-impl/collections/db/sql/device/massstorage/amarok_device_massstorage.desktop
deleted file mode 100644
index 9174bba..0000000
--- a/src/core-impl/collections/db/sql/device/massstorage/amarok_device_massstorage.desktop
+++ /dev/null
@@ -1,82 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=Local Files & USB Mass Storage Backend
-Name[ca]=Fitxers locals i dorsal d'emmagatzematge massiu USB
-Name[cs]=Podpůrná vrstva pro lokální soubory a velkokapacitní úložné zařízení USB
-Name[da]=Motor til lokale filer og USB Mass Storage
-Name[de]=Backend für lokale Dateien und USB-Massenspeicher
-Name[el]=Τοπικά αρχεία & σύστημα υποστήριξης μαζικής αποθήκευσης USB
-Name[es]=Motor de archivos locales y almacenamiento USB
-Name[et]=Kohalike failide ja USB-pulkade taustaprogramm
-Name[fr]=Prise en charge des fichiers locaux & stockage de masse USB
-Name[hu]=Helyi fájlok és USB tömeges tároló modul
-Name[it]=Motore dei file locali e archiviazione USB di massa
-Name[ja]=ローカルファイルと USB マス・ストレージのバックエンド
-Name[km]=កំណត់ទីតាំងរក្សា និងកម្មវិធីខាងក្រោយនៃឧបករណ៍ផ្ទុក
-Name[lv]=Lokālo failu un USB lielapjoma glabātuvju aizmugure
-Name[nl]=Backend voor lokale bestanden & USB-massa-opslag
-Name[pl]=Silnik lokalnych plików & i pamięć masowa USB
-Name[pt]=Infra-Estrutura de Ficheiros Locais & Dispositivos USB
-Name[pt_BR]=Infraestrutura de arquivos locais e dispositivos USB
-Name[ru]=Локальные файлы и USB-устройства хранения данных
-Name[sk]=Miestne súbory & USB backend Mass Storage
-Name[sl]=Zaledje za krajevne datoteke in hranilnike podatkov USB
-Name[sr]=Позадина за локалне фајлове и УСБ масовна складишта
-Name[sr at ijekavian]=Позадина за локалне фајлове и УСБ масовна складишта
-Name[sr at ijekavianlatin]=Pozadina za lokalne fajlove i USB masovna skladišta
-Name[sr at latin]=Pozadina za lokalne fajlove i USB masovna skladišta
-Name[sv]=Gränssnitt för lokala filer och USB-masslagring
-Name[tr]=Yerel Dosyalar, USB Yığın Depolama Arka Ucu
-Name[uk]=Модуль локальних файлів та файлів на носіях з протоколом USB
-Name[x-test]=xxLocal Files & USB Mass Storage Backendxx
-Name[zh_TW]=本地檔案與 USB 儲存裝置後端介面
-Icon=drive-harddisk
-Comment=Local Collection folders on local and pluggable disks
-Comment[ca]=Carpetes de col·leccions locals en discs locals o extraïbles
-Comment[cs]=Složky místní sbírky na lokálních a vyměnitelných discích
-Comment[da]=Mapper med lokal samling på lokale og flytbare diske
-Comment[de]=Ordner der lokalen Sammlung auf lokalen und Wechseldatenträgern
-Comment[el]=Φάκελοι τοπικών συλλογών σε τοπικούς και αυτοπροσαρτώμενους δίσκους
-Comment[es]=Carpetas de la colección local y discos conectables
-Comment[et]=Kohaliku kogu kataloogid kohalikel ja ühendatavatel ketastel
-Comment[fr]=Collection de dossiers locaux sur les disques locaux et amovibles
-Comment[hu]=Helyi gyűjteménymappák helyi vagy csatlakoztatható lemezeken
-Comment[it]=Cartelle della collezione locale su dischi locali e rimovibili
-Comment[ja]=ローカルディスク、または取り外し可能なディスク内にあるローカルコレクションフォルダ
-Comment[km]=ថតសម្រាំងមូលដ្ឋាននៅលើថាតដែលអាចដក/ដោតបាន និងនៅក្នុងថាសមូលដ្ឋាន
-Comment[lv]=Lokālās kolekcijas mapes uz lokāliem un pievienotiem diskiem
-Comment[nl]=Mappen voor lokale verzameling op lokale en in te pluggen schijven
-Comment[pl]=Lokalne katalogi kolekcji na lokalnych i wymiennych dyskach
-Comment[pt]=Pastas de colecções locais nos discos locais e removíveis
-Comment[pt_BR]=Pastas da coleção local nos discos locais e removíveis
-Comment[ru]=Папки локальной коллекции на локальных и подключаемых дисках
-Comment[sk]=Priečinky miestnej kolekcie na lokálnych a pripojiteľných diskoch
-Comment[sl]=Mape krajevne zbirke na krajevnih in odstranljivih diskih
-Comment[sr]=Фасцикле локалне збирке на локалном и уклоњивим дисковима
-Comment[sr at ijekavian]=Фасцикле локалне збирке на локалном и уклоњивим дисковима
-Comment[sr at ijekavianlatin]=Fascikle lokalne zbirke na lokalnom i uklonjivim diskovima
-Comment[sr at latin]=Fascikle lokalne zbirke na lokalnom i uklonjivim diskovima
-Comment[sv]=Lokala samlingskataloger på lokala och inkopplingsbara diskar
-Comment[tr]=Yerel ve çıkarılabilir disklerdeki Yerel Koleksiyon dizinleri
-Comment[uk]=Теки локальної збірки на локальних та портативних дисках
-Comment[x-test]=xxLocal Collection folders on local and pluggable disksxx
-Comment[zh_TW]=在本機與可插拔磁碟上的本地收藏資料夾
-
-ServiceTypes=Amarok/Plugin
-
-X-KDE-Amarok-authors=Maximilian Kossick
-X-KDE-Amarok-email=maximilian.kossick at googlemail.com
-X-KDE-Amarok-framework-version=69
-X-KDE-Amarok-name=massstorage-device
-X-KDE-Amarok-plugintype=device
-X-KDE-Amarok-rank=100
-X-KDE-Amarok-version=1
-
-X-KDE-PluginInfo-Author=Maximilian Kossick
-X-KDE-PluginInfo-Email=maximilian.kossick at googlemail.com
-X-KDE-PluginInfo-Version=1.0
-X-KDE-PluginInfo-Category=Device
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
-X-KDE-Library=amarok_device_massstorage
-X-KDE-PluginInfo-Name=amarok_device_massstorage
diff --git a/src/core-impl/collections/db/sql/device/nfs/CMakeLists.txt b/src/core-impl/collections/db/sql/device/nfs/CMakeLists.txt
deleted file mode 100644
index 2686b4b..0000000
--- a/src/core-impl/collections/db/sql/device/nfs/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-include_directories(
- ${KDE4_INCLUDE_DIR}
- ${QT_INCLUDES}
- )
-
-########### next target ###############
-
-set(amarok_device_nfs_PART_SRCS NfsDeviceHandler.cpp )
-
-kde4_add_plugin(amarok_device_nfs
-${amarok_device_nfs_PART_SRCS})
-
-target_link_libraries(amarok_device_nfs
- amarok-sqlcollection
- amaroklib
- amarokcore
- ${KDE4_KDECORE_LIBS}
- ${KDE4_SOLID_LIBS} )
-
-install(TARGETS amarok_device_nfs DESTINATION ${PLUGIN_INSTALL_DIR} )
-
-
-########### install files ###############
-
-install(FILES amarok_device_nfs.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-
diff --git a/src/core-impl/collections/db/sql/device/nfs/NfsDeviceHandler.cpp b/src/core-impl/collections/db/sql/device/nfs/NfsDeviceHandler.cpp
index acbfa46..2684708 100644
--- a/src/core-impl/collections/db/sql/device/nfs/NfsDeviceHandler.cpp
+++ b/src/core-impl/collections/db/sql/device/nfs/NfsDeviceHandler.cpp
@@ -19,13 +19,11 @@
#include "NfsDeviceHandler.h"
-AMAROK_EXPORT_DEVICE_PLUGIN( nfs, NfsDeviceHandlerFactory )
-
#include "core/support/Debug.h"
#include "core/collections/support/SqlStorage.h"
-#include <KConfig>
#include <KUrl>
+#include <Solid/Device>
#include <Solid/StorageAccess>
#include <Solid/NetworkShare>
@@ -103,11 +101,6 @@ QString NfsDeviceHandlerFactory::type( ) const
return "nfs";
}
-void NfsDeviceHandlerFactory::init()
-{
- m_initialized = true;
-}
-
bool NfsDeviceHandlerFactory::canCreateFromMedium( ) const
{
return true;
@@ -147,14 +140,6 @@ bool NfsDeviceHandlerFactory::canHandle( const Solid::Device &device ) const
return true;
}
-NfsDeviceHandlerFactory::NfsDeviceHandlerFactory( QObject *parent, const QVariantList &args )
- : DeviceHandlerFactory( parent, args )
-{
- KPluginInfo pluginInfo( "amarok_device_nfs.desktop", "services" );
- pluginInfo.setConfig( Amarok::config("Device_MassiveStorage") );
- m_info = pluginInfo;
-}
-
NfsDeviceHandlerFactory::~NfsDeviceHandlerFactory( )
{
}
diff --git a/src/core-impl/collections/db/sql/device/nfs/NfsDeviceHandler.h b/src/core-impl/collections/db/sql/device/nfs/NfsDeviceHandler.h
index c1d62b0..702f8c1 100644
--- a/src/core-impl/collections/db/sql/device/nfs/NfsDeviceHandler.h
+++ b/src/core-impl/collections/db/sql/device/nfs/NfsDeviceHandler.h
@@ -18,12 +18,12 @@
#ifndef NFSDEVICEHANDLER_H
#define NFSDEVICEHANDLER_H
-#include <MountPointManager.h>
+#include "core-impl/collections/db/MountPointManager.h"
class NfsDeviceHandlerFactory : public DeviceHandlerFactory
{
public:
- NfsDeviceHandlerFactory( QObject *parent, const QVariantList &args );
+ NfsDeviceHandlerFactory( QObject *parent ) : DeviceHandlerFactory( parent ) {}
virtual ~NfsDeviceHandlerFactory();
virtual bool canHandle( const Solid::Device &device ) const;
@@ -37,8 +37,6 @@ public:
virtual DeviceHandler* createHandler( KSharedConfigPtr c, SqlStorage *s ) const;
virtual QString type() const;
-
- virtual void init();
};
/**
diff --git a/src/core-impl/collections/db/sql/device/nfs/amarok_device_nfs.desktop b/src/core-impl/collections/db/sql/device/nfs/amarok_device_nfs.desktop
deleted file mode 100644
index dbe5dac..0000000
--- a/src/core-impl/collections/db/sql/device/nfs/amarok_device_nfs.desktop
+++ /dev/null
@@ -1,82 +0,0 @@
-[Desktop Entry]
-Type=Service
-Icon=network-server
-Name=NFS Share Backend
-Name[ca]=Dorsal de compartició NFS
-Name[cs]=Podpůrná vrstva pro sdílené složky NFS
-Name[da]=Motor til delt NFS-ressource
-Name[de]=Backend für NFS-Freigaben
-Name[el]=Σύστημα υποστήριξης διαμοιρασμού NFS
-Name[es]=Motor de compartición NFS
-Name[et]=NFS-ressursi taustaprogramm
-Name[fr]=Prise en charge du partage NFS
-Name[hu]=NFS megosztás modul
-Name[it]=Motore condivisione NFS
-Name[ja]=NFS 共有バックエンド
-Name[km]=កម្មវិធីខាងក្រោយនៃការចែករំលែក NFS
-Name[lv]=NFS koplietošanas aizmugure
-Name[nl]=Backend voor NFS-share
-Name[pa]=NFS ਸ਼ੇਅਰ ਬੈਕਐਂਡ
-Name[pl]=Silnik udziałów NFS
-Name[pt]=Infra-Estrutura de Partilha NFS
-Name[pt_BR]=Infraestrutura de compartilhamento NFS
-Name[ru]=Серверы NFS
-Name[sk]=Backend zdieľania NFS
-Name[sl]=Zaledje za deljene mape NFS
-Name[sr]=Позадина за НФС дељења
-Name[sr at ijekavian]=Позадина за НФС дељења
-Name[sr at ijekavianlatin]=Pozadina za NFS deljenja
-Name[sr at latin]=Pozadina za NFS deljenja
-Name[sv]=Gränssnitt för delade NFS kataloger
-Name[tr]=NFS Paylaşımı Arka Ucu
-Name[uk]=Модуль спільних ресурсів NFS
-Name[x-test]=xxNFS Share Backendxx
-Name[zh_TW]=NFS 分享後端介面
-Comment=Local Collection folders on remote NFS shares
-Comment[ca]=Carpetes de col·leccions locals en comparticions NFS remotes
-Comment[cs]=Složky místní sbírky na vzdálených sdílených složkách NFS
-Comment[da]=Mapper med lokal samling på eksterne delte NFS-ressourcer
-Comment[de]=Ordner der lokalen Sammlung auf entfernten NFS-Freigaben
-Comment[el]=Φάκελοι τοπικών συλλογών σε απομακρυσμένα συστήματα διαμοιρασμού NFS
-Comment[es]=Carpetas de colecciones locales en comparticiones remotas NFS
-Comment[et]=Kohaliku kogu kataloogid NFS-võrguressurssidel
-Comment[fr]=Collection de dossiers locaux sur les réseaux de partages NFS distants
-Comment[hu]=Helyi gyűjteménymappák távoli NFS megosztásokon
-Comment[it]=Cartelle della collezione locale su condivisioni remote NFS
-Comment[ja]=リモートの NFS 共有内にあるローカルコレクションフォルダ
-Comment[km]=ថតសម្រាំងមូលដ្ឋាននៅលើការចែករំលែក NFS ពីចម្ងាយ
-Comment[lv]=Lokālās kolekcijas mapes uz attālinātām NFS mapēm
-Comment[nl]=Mappen voor lokale verzameling op NFS-shares op afstand
-Comment[pl]=Lokalne katalogi kolekcji na zdalnych udziałach NFS
-Comment[pt]=Pastas de colecções locais em partilhas NFS remotas
-Comment[pt_BR]=Pastas da coleção local em compartilhamentos remotos NFS
-Comment[ru]=Папки локальной коллекции на удалённых серверах NFS
-Comment[sk]=Priečinky miestnej kolekcie na vzdialených NFS zdieľaniach
-Comment[sl]=Mape krajevne zbirke na oddaljenih deljenih mapah NFS
-Comment[sr]=Фасцикле локалне збирке на удаљеним НФС дељењима
-Comment[sr at ijekavian]=Фасцикле локалне збирке на удаљеним НФС дељењима
-Comment[sr at ijekavianlatin]=Fascikle lokalne zbirke na udaljenim NFS deljenjima
-Comment[sr at latin]=Fascikle lokalne zbirke na udaljenim NFS deljenjima
-Comment[sv]=Lokala samlingskataloger på delade NFS fjärrkataloger
-Comment[tr]=Uzak NFS paylaşımlarındaki Yerel Koleksiyon dizinleri
-Comment[uk]=Теки локальної збірки на віддалених спільних ресурсах NFS
-Comment[x-test]=xxLocal Collection folders on remote NFS sharesxx
-Comment[zh_TW]=在遠端 NFS 分享中的本地收藏資料夾
-ServiceTypes=Amarok/Plugin
-
-X-KDE-Amarok-authors=Maximilian Kossick, Peter C. Ndikuwera
-X-KDE-Amarok-email=maximilian.kossick at googlemail.com, pndiku at gmail.com
-X-KDE-Amarok-framework-version=69
-X-KDE-Amarok-name=nfs-device
-X-KDE-Amarok-plugintype=device
-X-KDE-Amarok-rank=100
-X-KDE-Amarok-version=1
-
-X-KDE-PluginInfo-Author=Maximilian Kossick, Peter C. Ndikuwera
-X-KDE-PluginInfo-Email=maximilian.kossick at googlemail.com, pndiku at gmail.com
-X-KDE-PluginInfo-Version=1.0
-X-KDE-PluginInfo-Category=Device
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
-X-KDE-Library=amarok_device_nfs
-X-KDE-PluginInfo-Name=amarok_device_nfs
diff --git a/src/core-impl/collections/db/sql/device/smb/CMakeLists.txt b/src/core-impl/collections/db/sql/device/smb/CMakeLists.txt
deleted file mode 100644
index 5d5577c..0000000
--- a/src/core-impl/collections/db/sql/device/smb/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-include_directories(
- ${KDE4_INCLUDE_DIR}
- ${QT_INCLUDES}
- )
-
-########### next target ###############
-
-set(amarok_device_smb_PART_SRCS SmbDeviceHandler.cpp )
-
-kde4_add_plugin(amarok_device_smb
-${amarok_device_smb_PART_SRCS})
-
-target_link_libraries(amarok_device_smb
- amarok-sqlcollection
- amaroklib
- amarokcore
- ${KDE4_KDECORE_LIBS}
- ${KDE4_SOLID_LIBS} )
-
-install(TARGETS amarok_device_smb DESTINATION ${PLUGIN_INSTALL_DIR} )
-
-
-########### install files ###############
-
-install(FILES amarok_device_smb.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-
diff --git a/src/core-impl/collections/db/sql/device/smb/SmbDeviceHandler.cpp b/src/core-impl/collections/db/sql/device/smb/SmbDeviceHandler.cpp
index 5b46686..900b7b1 100644
--- a/src/core-impl/collections/db/sql/device/smb/SmbDeviceHandler.cpp
+++ b/src/core-impl/collections/db/sql/device/smb/SmbDeviceHandler.cpp
@@ -19,13 +19,11 @@
#include "SmbDeviceHandler.h"
-AMAROK_EXPORT_DEVICE_PLUGIN( smb, SmbDeviceHandlerFactory )
-
#include "core/support/Debug.h"
#include "core/collections/support/SqlStorage.h"
-#include <KConfig>
#include <KUrl>
+#include <Solid/Device>
#include <Solid/StorageAccess>
#include <Solid/NetworkShare>
@@ -103,11 +101,6 @@ QString SmbDeviceHandlerFactory::type( ) const
return "smb";
}
-void SmbDeviceHandlerFactory::init()
-{
- m_initialized = true;
-}
-
bool SmbDeviceHandlerFactory::canCreateFromMedium( ) const
{
return true;
@@ -147,14 +140,6 @@ bool SmbDeviceHandlerFactory::canHandle( const Solid::Device &device ) const
return true;
}
-SmbDeviceHandlerFactory::SmbDeviceHandlerFactory( QObject *parent, const QVariantList &args )
- : DeviceHandlerFactory( parent, args )
-{
- KPluginInfo pluginInfo( "amarok_device_smb.desktop", "services" );
- pluginInfo.setConfig( Amarok::config("Device_MassiveStorage") );
- m_info = pluginInfo;
-}
-
SmbDeviceHandlerFactory::~SmbDeviceHandlerFactory( )
{
}
diff --git a/src/core-impl/collections/db/sql/device/smb/SmbDeviceHandler.h b/src/core-impl/collections/db/sql/device/smb/SmbDeviceHandler.h
index a4f7f12..c5a0103 100644
--- a/src/core-impl/collections/db/sql/device/smb/SmbDeviceHandler.h
+++ b/src/core-impl/collections/db/sql/device/smb/SmbDeviceHandler.h
@@ -18,12 +18,12 @@
#ifndef SMBDEVICEHANDLER_H
#define SMBDEVICEHANDLER_H
-#include <MountPointManager.h>
+#include "core-impl/collections/db/MountPointManager.h"
class SmbDeviceHandlerFactory : public DeviceHandlerFactory
{
public:
- SmbDeviceHandlerFactory( QObject *parent, const QVariantList &args );
+ SmbDeviceHandlerFactory( QObject *parent ) : DeviceHandlerFactory( parent ) {}
virtual ~SmbDeviceHandlerFactory();
virtual bool canHandle( const Solid::Device &device ) const;
@@ -37,8 +37,6 @@ public:
virtual DeviceHandler* createHandler( KSharedConfigPtr c, SqlStorage *s ) const;
virtual QString type() const;
-
- virtual void init();
};
/**
diff --git a/src/core-impl/collections/db/sql/device/smb/amarok_device_smb.desktop b/src/core-impl/collections/db/sql/device/smb/amarok_device_smb.desktop
deleted file mode 100644
index 5d54706..0000000
--- a/src/core-impl/collections/db/sql/device/smb/amarok_device_smb.desktop
+++ /dev/null
@@ -1,81 +0,0 @@
-[Desktop Entry]
-Type=Service
-Icon=network-server
-Name=SMB (Windows) Share Backend
-Name[ca]=Dorsal de compartició SMB (Windows)
-Name[cs]=Podpůrná vrstva pro sdílené složky SMB (Windows)
-Name[da]=Motor til delte SMB-ressourcer (Windows)
-Name[de]=Backend für SMB-(Windows-)Freigaben
-Name[el]=Σύστημα υποστήριξης διαμοιρασμού SMB (Windows)
-Name[es]=Motor de compartición SMB (Windows)
-Name[et]=SMB (Windows) ressursi taustaprogramm
-Name[fr]=Prise en charge du partage SMB (Windows)
-Name[hu]=SMB (Windows) megosztás modul
-Name[it]=Motore condivisione SMB (Windows)
-Name[ja]=SMB (Windows) 共有バックエンド
-Name[km]=កម្មវិធីខាងក្រោយនៃការចែករំលែក SMB (Windows)
-Name[lv]=SMB (Windows) kopīgojumu aizmugure
-Name[nl]=Backend voor SMB (Windows)-share
-Name[pl]=Silnik udziałów SMB (Windows)
-Name[pt]=Infra-Estrutura de Partilha SMB (Windows)
-Name[pt_BR]=Infraestrutura de compartilhamento SMB (Windows)
-Name[ru]=Общие папки Windows (SMB)
-Name[sk]=Backend zdieľania SMB (Windows)
-Name[sl]=Zaledje za deljene mape SMB (Windows)
-Name[sr]=Позадина за СМБ (виндоуз) дељења
-Name[sr at ijekavian]=Позадина за СМБ (виндоуз) дељења
-Name[sr at ijekavianlatin]=Pozadina za SMB (windows) deljenja
-Name[sr at latin]=Pozadina za SMB (windows) deljenja
-Name[sv]=Gränssnitt för delade SMB (Windows) kataloger
-Name[tr]=SMB (Windows) Paylaşımı Arka Ucu
-Name[uk]=Модуль спільних ресурсів SMB (Windows)
-Name[x-test]=xxSMB (Windows) Share Backendxx
-Name[zh_TW]=SMB (Windows) 分享後端介面
-Comment=Local Collection folders on remote Samba (Windows) shares
-Comment[ca]=Carpetes de col·leccions locals en comparticions Samba (Windows) remotes
-Comment[cs]=Složky místní sbírky na vzdálených sdílených složkách Samba (Windows)
-Comment[da]=Mapper med lokal samling på eksterne delte Samba-ressourcer (Windows)
-Comment[de]=Ordner der lokalen Sammlung auf entfernten Samba-(Windows-)Freigaben
-Comment[el]=Φάκελοι τοπικών συλλογών σε απομακρυσμένα συστήματα διαμοιρασμού Samba (Windows)
-Comment[es]=Carpetas de colecciones locales en comparticiones remotas Samba (Windows)
-Comment[et]=Kohaliku kogu kataloogid Samba (Windowsi) võrguressurssidel
-Comment[fr]=Collection de dossiers locaux sur les réseaux de partages Samba (Windows)
-Comment[hu]=Helyi gyűjteménymappák távoli Samba (Windows) megosztásokon
-Comment[it]=Cartelle della collezione locale su condivisioni remote Samba (Windows)
-Comment[ja]=リモートの Samba (Windows) 共有内にあるローカルコレクションフォルダ
-Comment[km]=ថតសម្រាំងមូលដ្ឋាននៅលើការចែករំលែកតាមរយៈ Samba (Windows) ពីចម្ងាយ
-Comment[lv]=Lokālās kolekcijas mapes uz attālinātām Samba (Windows) mapēm
-Comment[nl]=Mappen voor lokale verzameling op Samba (Windows)-shares op afstand
-Comment[pl]=Lokalne katalogi kolekcji na zdalnych udziałach Samba (Windows)
-Comment[pt]=Pastas de colecções locais em partilhas de Samba (Windows) remotas
-Comment[pt_BR]=Pastas da coleção local em compartilhamentos remotos do Samba (Windows)
-Comment[ru]=Папки локальной коллекции на удалённых серверах Samba или общих папок Windows
-Comment[sk]=Priečinky miestnej kolekcie na vzdialených Samba (Windows) zdieľaniach
-Comment[sl]=Mape krajevne zbirke na oddaljenih deljenih mapah Samba (Windows)
-Comment[sr]=Фасцикле локалне збирке на удаљеним СМБ (виндоуз) дељењима
-Comment[sr at ijekavian]=Фасцикле локалне збирке на удаљеним СМБ (виндоуз) дељењима
-Comment[sr at ijekavianlatin]=Fascikle lokalne zbirke na udaljenim SMB (windows) deljenjima
-Comment[sr at latin]=Fascikle lokalne zbirke na udaljenim SMB (windows) deljenjima
-Comment[sv]=Lokala samlingskataloger på delade Samba (Windows) fjärrkataloger
-Comment[tr]=Uzak Samba (Windows) paylaşımlarındaki Yerel Koleksiyon dizinleri
-Comment[uk]=Теки локальної збірки на віддалених спільних ресурсах Samba (Windows)
-Comment[x-test]=xxLocal Collection folders on remote Samba (Windows) sharesxx
-Comment[zh_TW]=在遠端 Samba (Windows) 分享中的本地收藏資料夾
-ServiceTypes=Amarok/Plugin
-
-X-KDE-Amarok-authors=Maximilian Kossick, Peter C. Ndikuwera
-X-KDE-Amarok-email=maximilian.kossick at googlemail.com, pndiku at gmail.com
-X-KDE-Amarok-framework-version=69
-X-KDE-Amarok-name=smb-device
-X-KDE-Amarok-plugintype=device
-X-KDE-Amarok-rank=100
-X-KDE-Amarok-version=1
-
-X-KDE-PluginInfo-Author=Maximilian Kossick, Peter C. Ndikuwera
-X-KDE-PluginInfo-Email=maximilian.kossick at googlemail.com, pndiku at gmail.com
-X-KDE-PluginInfo-Version=1.0
-X-KDE-PluginInfo-Category=Device
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
-X-KDE-Library=amarok_device_smb
-X-KDE-PluginInfo-Name=amarok_device_smb
diff --git a/src/core/support/PluginFactory.h b/src/core/support/PluginFactory.h
index d59ceb6..a16259a 100644
--- a/src/core/support/PluginFactory.h
+++ b/src/core/support/PluginFactory.h
@@ -33,7 +33,7 @@ class AMAROK_CORE_EXPORT PluginFactory : public QObject
Q_PROPERTY( Type pluginType READ pluginType )
public:
- enum Type { Unknown, Collection, Device, Service };
+ enum Type { Unknown, Collection, Service };
PluginFactory( QObject *parent, const QVariantList &args );
virtual ~PluginFactory() = 0;
diff --git a/src/dialogs/CollectionSetup.cpp b/src/dialogs/CollectionSetup.cpp
index cc3b756..5ae0294 100644
--- a/src/dialogs/CollectionSetup.cpp
+++ b/src/dialogs/CollectionSetup.cpp
@@ -239,7 +239,7 @@ CollectionSetup::writeConfig()
if( primaryCollection )
primaryCollection->setProperty( "collectionFolders", m_model->directories() );
- debug() << "MountPointManager collection folders: " << collectionFolders;
+ debug() << "Old collection folders: " << collectionFolders;
CollectionManager::instance()->startFullScan();
}
}
diff --git a/src/dialogs/DiagnosticDialog.cpp b/src/dialogs/DiagnosticDialog.cpp
index e5561b3..047d715 100644
--- a/src/dialogs/DiagnosticDialog.cpp
+++ b/src/dialogs/DiagnosticDialog.cpp
@@ -83,7 +83,6 @@ DiagnosticDialog::generateReport( const KAboutData *aboutData )
const Plugins::PluginManager *aPluginManager = Plugins::PluginManager::instance();
aPlugins.append( aPluginManager->plugins( QLatin1String( "Collection" ) ) );
aPlugins.append( aPluginManager->plugins( QLatin1String( "Service" ) ) );
- aPlugins.append( aPluginManager->plugins( QLatin1String( "Device" ) ) );
QString aPluginString;
foreach( KPluginInfo aInfo, aPlugins )
diff --git a/tests/core-impl/collections/db/sql/SqlMountPointManagerMock.h b/tests/core-impl/collections/db/sql/SqlMountPointManagerMock.h
index 2a9d72e..c700040 100644
--- a/tests/core-impl/collections/db/sql/SqlMountPointManagerMock.h
+++ b/tests/core-impl/collections/db/sql/SqlMountPointManagerMock.h
@@ -17,8 +17,8 @@
#ifndef SQLMOUNTPOINTMANAGERMOCK_H
#define SQLMOUNTPOINTMANAGERMOCK_H
-#include <core-impl/collections/db/sql/SqlCollection.h>
-#include <MountPointManager.h>
+#include "core-impl/collections/db/MountPointManager.h"
+#include "core-impl/collections/db/sql/SqlCollection.h"
#include <QMap>
#include <QString>
More information about the kde-doc-english
mailing list