From eeb0a55222fe3123adcb57bf2edd005fbd7e5253 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 23 Oct 2014 16:09:21 +0200 Subject: [PATCH] No need for MusicScanner's showProgress setting. --- src/libtomahawk/filemetadata/MusicScanner.cpp | 17 ----------------- src/libtomahawk/filemetadata/MusicScanner.h | 4 ---- src/tools/tomahawk-test-musicscan/main.cpp | 2 -- 3 files changed, 23 deletions(-) diff --git a/src/libtomahawk/filemetadata/MusicScanner.cpp b/src/libtomahawk/filemetadata/MusicScanner.cpp index 490d7b3fd..5e50911b2 100644 --- a/src/libtomahawk/filemetadata/MusicScanner.cpp +++ b/src/libtomahawk/filemetadata/MusicScanner.cpp @@ -35,8 +35,6 @@ #include "config.h" -#include - using namespace Tomahawk; void @@ -139,7 +137,6 @@ MusicScanner::MusicScanner( MusicScanner::ScanMode scanMode, const QStringList& , m_scanMode( scanMode ) , m_paths( paths ) , m_scanned( 0 ) - , m_showProgress( true ) , m_dryRun( false ) , m_verbose( false ) , m_cmdQueue( 0 ) @@ -164,20 +161,6 @@ MusicScanner::~MusicScanner() } -void -MusicScanner::showProgress( bool _showProgress ) -{ - m_showProgress = _showProgress; -} - - -bool -MusicScanner::showingProgress() -{ - return m_showProgress; -} - - void MusicScanner::setDryRun( bool _dryRun ) { diff --git a/src/libtomahawk/filemetadata/MusicScanner.h b/src/libtomahawk/filemetadata/MusicScanner.h index 6dcd6039a..bfd48729a 100644 --- a/src/libtomahawk/filemetadata/MusicScanner.h +++ b/src/libtomahawk/filemetadata/MusicScanner.h @@ -107,9 +107,6 @@ public: MusicScanner( MusicScanner::ScanMode scanMode, const QStringList& paths, quint32 bs = 0 ); ~MusicScanner(); - void showProgress( bool _showProgress ); - bool showingProgress(); - /** * Specify if we want a dry run, i.e. not change any of the internal data stores. * @@ -153,7 +150,6 @@ private: QStringList m_paths; unsigned int m_scanned; unsigned int m_skipped; - bool m_showProgress; bool m_dryRun; bool m_verbose; diff --git a/src/tools/tomahawk-test-musicscan/main.cpp b/src/tools/tomahawk-test-musicscan/main.cpp index 752e6e150..ccf48f54c 100644 --- a/src/tools/tomahawk-test-musicscan/main.cpp +++ b/src/tools/tomahawk-test-musicscan/main.cpp @@ -47,7 +47,6 @@ main( int argc, char* argv[] ) MusicScanner scanner( MusicScanner::DirScan, paths, 0 ); // We want a dry-run of the scanner and not update any internal data. - scanner.showProgress( false ); scanner.setDryRun( true ); scanner.setVerbose( true ); @@ -68,4 +67,3 @@ main( int argc, char* argv[] ) std::cerr << "Unknown path (type) given, cannot handle this." << std::endl; } } -