mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-25 06:51:13 +02:00
Code Issues Releases Wiki Activity

use existing TomahawkUtils function to remove directory

Browse Source
This commit is contained in:
Stefan Derkits
2014-09-10 11:01:22 +02:00
parent c910cac76c
commit 10e944b7a7
3 changed files with 2 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libtomahawk/infosystem/InfoSystemCache.cpp
View File

@@ -25,10 +25,6 @@
#include "utils/Logger.h" #include "utils/Logger.h"
#include "Source.h" #include "Source.h"
#if QT_VERSION <= QT_VERSION_CHECK( 5, 0, 0 )
#include "utils/TomahawkCache.h"
#endif
#include <QDir> #include <QDir>
#include <QSettings> #include <QSettings>
#include <QCryptographicHash> #include <QCryptographicHash>
@@ -49,7 +45,7 @@ InfoSystemCache::InfoSystemCache( QObject* parent )
if ( TomahawkSettings::instance()->infoSystemCacheVersion() < INFOSYSTEM_CACHE_VERSION ) if ( TomahawkSettings::instance()->infoSystemCacheVersion() < INFOSYSTEM_CACHE_VERSION )
{ {
#if QT_VERSION <= QT_VERSION_CHECK( 5, 0, 0 ) #if QT_VERSION <= QT_VERSION_CHECK( 5, 0, 0 )
TomahawkUtils::Cache::instance()->removeDirectoryRecursively( m_cacheBaseDir ); TomahawkUtils::removeDirectory( m_cacheBaseDir );
#else #else
QDir(m_cacheBaseDir)::removeRecursively(); QDir(m_cacheBaseDir)::removeRecursively();
#endif #endif

29
src/libtomahawk/utils/TomahawkCache.cpp
View File

@@ -48,7 +48,7 @@ Cache::Cache()
if ( TomahawkSettings::instance()->genericCacheVersion() < CACHE_VERSION ) if ( TomahawkSettings::instance()->genericCacheVersion() < CACHE_VERSION )
{ {
#if QT_VERSION <= QT_VERSION_CHECK( 5, 0, 0 ) #if QT_VERSION <= QT_VERSION_CHECK( 5, 0, 0 )
removeDirectoryRecursively( m_cacheBaseDir ); TomahawkUtils::removeDirectory( m_cacheBaseDir );
#else #else
QDir( m_cacheBaseDir )::removeRecursively(); QDir( m_cacheBaseDir )::removeRecursively();
#endif #endif
@@ -126,33 +126,6 @@ Cache::getData( const QString& identifier, const QString& key )
} }
#if QT_VERSION <= QT_VERSION_CHECK( 5, 0, 0 )
bool
Cache::removeDirectoryRecursively(const QString& dirName)
{
bool result = true;
QDir dir(dirName);
if (dir.exists(dirName)) {
foreach( QFileInfo info, dir.entryInfoList(QDir::NoDotAndDotDot | QDir::System | QDir::Hidden | QDir::AllDirs | QDir::Files, QDir::DirsFirst) ) {
if (info.isDir()) {
result = removeDirectoryRecursively(info.absoluteFilePath());
}
else {
result = QFile::remove(info.absoluteFilePath());
}
if (!result) {
return result;
}
}
result = dir.rmdir(dirName);
}
return result;
}
#endif
void void
Cache::putData( const QString& identifier, qint64 maxAge, const QString& key, const QVariant& value ) Cache::putData( const QString& identifier, qint64 maxAge, const QString& key, const QVariant& value )
{ {

9
src/libtomahawk/utils/TomahawkCache.h
View File

@@ -81,15 +81,6 @@ public:
* @return the data, if found, if not found an invalid QVariant is returned. * @return the data, if found, if not found an invalid QVariant is returned.
*/ */
QVariant getData( const QString& identifier, const QString& key ); QVariant getData( const QString& identifier, const QString& key );
#if QT_VERSION <= QT_VERSION_CHECK( 5, 0, 0 )
/**
* Recursively deletes all files & directories in a folder
* Only needed in Qt4
* @param dirName the directory which should be deleted
* @return if the removal was successfull or not
*/
bool removeDirectoryRecursively( const QString& dirName );
#endif
private slots: private slots:
void pruneTimerFired(); void pruneTimerFired();