mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-11 00:24:12 +02:00
Code Issues Releases Wiki Activity

Remove confusing and obsolete parent parameter

Browse Source
This commit is contained in:
Jeff Mitchell
2012-06-20 17:58:26 -04:00
parent 0c613cbcbe
commit d687bdb54f
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libtomahawk/database/Database.cpp
View File

@@ -41,7 +41,7 @@ Database::instance()
Database::Database( const QString& dbname, QObject* parent ) Database::Database( const QString& dbname, QObject* parent )
: QObject( parent ) : QObject( parent )
, m_ready( false ) , m_ready( false )
, m_impl( new DatabaseImpl( dbname, this ) ) , m_impl( new DatabaseImpl( dbname ) )
, m_workerRW( new DatabaseWorker( this, true ) ) , m_workerRW( new DatabaseWorker( this, true ) )
{ {
s_instance = this; s_instance = this;

11
src/libtomahawk/database/DatabaseImpl.cpp
View File

@@ -43,9 +43,8 @@
#define CURRENT_SCHEMA_VERSION 28 #define CURRENT_SCHEMA_VERSION 28
DatabaseImpl::DatabaseImpl( const QString& dbname, Database* parent ) DatabaseImpl::DatabaseImpl( const QString& dbname )
: QObject( (QObject*) parent ) : QObject( (QObject*) QThread::currentThread() )
, m_parent( parent )
{ {
QTime t; QTime t;
t.start(); t.start();
@@ -86,10 +85,10 @@ DatabaseImpl::DatabaseImpl( const QString& dbname, Database* parent )
} }
DatabaseImpl::DatabaseImpl( Database* parent, const QString& dbname ) DatabaseImpl::DatabaseImpl( const QString& dbname, bool internal )
: QObject( (QObject*) QThread::currentThread() ) : QObject( (QObject*) QThread::currentThread() )
, m_parent( parent )
{ {
Q_UNUSED( internal );
openDatabase( dbname, false ); openDatabase( dbname, false );
init(); init();
} }
@@ -132,7 +131,7 @@ DatabaseImpl::clone() const
{ {
QMutexLocker lock( &m_mutex ); QMutexLocker lock( &m_mutex );
DatabaseImpl* impl = new DatabaseImpl( m_parent, m_db.databaseName() ); DatabaseImpl* impl = new DatabaseImpl( m_db.databaseName(), true );
impl->setDatabaseID( m_dbid ); impl->setDatabaseID( m_dbid );
impl->setFuzzyIndex( m_fuzzyIndex ); impl->setFuzzyIndex( m_fuzzyIndex );
return impl; return impl;

5
src/libtomahawk/database/DatabaseImpl.h
View File

@@ -45,7 +45,7 @@ friend class FuzzyIndex;
friend class DatabaseCommand_UpdateSearchIndex; friend class DatabaseCommand_UpdateSearchIndex;
public: public:
DatabaseImpl( const QString& dbname, Database* parent = 0 ); DatabaseImpl( const QString& dbname );
~DatabaseImpl(); ~DatabaseImpl();
DatabaseImpl* clone() const; DatabaseImpl* clone() const;
@@ -82,7 +82,7 @@ signals:
void indexReady(); void indexReady();
private: private:
DatabaseImpl( Database* parent, const QString& dbname ); DatabaseImpl( const QString& dbname, bool internal );
void setFuzzyIndex( FuzzyIndex* fi ) { m_fuzzyIndex = fi; } void setFuzzyIndex( FuzzyIndex* fi ) { m_fuzzyIndex = fi; }
void setDatabaseID( const QString& dbid ) { m_dbid = dbid; } void setDatabaseID( const QString& dbid ) { m_dbid = dbid; }
@@ -92,7 +92,6 @@ private:
void dumpDatabase(); void dumpDatabase();
QString cleanSql( const QString& sql ); QString cleanSql( const QString& sql );
Database* m_parent;
bool m_ready; bool m_ready;
QSqlDatabase m_db; QSqlDatabase m_db;