From 2389770d8a0e3b6acaca67b990165a49a21342e4 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 7 Jun 2012 13:25:33 +0200 Subject: [PATCH] * Moved reindexing to FuzzyIndex. --- src/libtomahawk/database/DatabaseImpl.cpp | 11 ----------- src/libtomahawk/database/DatabaseImpl.h | 3 --- 2 files changed, 14 deletions(-) diff --git a/src/libtomahawk/database/DatabaseImpl.cpp b/src/libtomahawk/database/DatabaseImpl.cpp index 1119f58a8..ff65e8cc5 100644 --- a/src/libtomahawk/database/DatabaseImpl.cpp +++ b/src/libtomahawk/database/DatabaseImpl.cpp @@ -27,7 +27,6 @@ #include #include "database/Database.h" -#include "DatabaseCommand_UpdateSearchIndex.h" #include "SourceList.h" #include "Result.h" #include "Artist.h" @@ -75,8 +74,6 @@ DatabaseImpl::DatabaseImpl( const QString& dbname, Database* parent ) query.exec( "UPDATE source SET isonline = 'false'" ); m_fuzzyIndex = new FuzzyIndex( this, schemaUpdated ); - if ( schemaUpdated ) - QTimer::singleShot( 0, this, SLOT( updateIndex() ) ); tDebug( LOGVERBOSE ) << "Loaded index:" << t.elapsed(); if ( qApp->arguments().contains( "--dumpdb" ) ) @@ -774,11 +771,3 @@ DatabaseImpl::openDatabase( const QString& dbname, bool checkSchema ) return schemaUpdated; } - - -void -DatabaseImpl::updateIndex() -{ - DatabaseCommand* cmd = new DatabaseCommand_UpdateSearchIndex(); - Database::instance()->enqueue( QSharedPointer( cmd ) ); -} diff --git a/src/libtomahawk/database/DatabaseImpl.h b/src/libtomahawk/database/DatabaseImpl.h index 671c86018..9dfe213e5 100644 --- a/src/libtomahawk/database/DatabaseImpl.h +++ b/src/libtomahawk/database/DatabaseImpl.h @@ -81,9 +81,6 @@ public: signals: void indexReady(); -private slots: - void updateIndex(); - private: DatabaseImpl( Database* parent, const QString& dbname ); void setFuzzyIndex( FuzzyIndex* fi ) { m_fuzzyIndex = fi; }