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

Revert "Remove one of the parenting warnings."

Browse Source 
This reverts commit a1146fbe53.
This commit is contained in:
Jeff Mitchell
2012-06-21 16:13:24 -04:00
parent a1146fbe53
commit e3783b58e4
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,9 +138,7 @@ Database::impl()
QThread* thread = QThread::currentThread(); QThread* thread = QThread::currentThread();
if ( !m_implHash.contains( thread ) ) if ( !m_implHash.contains( thread ) )
{ {
QPair< QString, QString > args = m_impl->cloneArgs(); DatabaseImpl* impl = m_impl->clone();
DatabaseImpl* impl = new DatabaseImpl( args.first, args.second );
impl->setFuzzyIndex( m_impl->fuzzyIndex() );
m_implHash.insert( thread, impl ); m_implHash.insert( thread, impl );
} }

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

@@ -85,12 +85,12 @@ DatabaseImpl::DatabaseImpl( const QString& dbname )
} }
DatabaseImpl::DatabaseImpl( const QString &dbname, const QString &dbid ) DatabaseImpl::DatabaseImpl( const QString& dbname, bool internal )
: QObject( (QObject*) QThread::currentThread() ) : QObject( (QObject*) QThread::currentThread() )
{ {
Q_UNUSED( internal );
openDatabase( dbname, false ); openDatabase( dbname, false );
init(); init();
m_dbid = dbid;
} }
@@ -142,12 +142,15 @@ DatabaseImpl::database()
} }
QPair< QString, QString > DatabaseImpl*
DatabaseImpl::cloneArgs() const DatabaseImpl::clone() const
{ {
QMutexLocker lock( &m_mutex ); QMutexLocker lock( &m_mutex );
QPair< QString, QString > args( m_db.databaseName(), m_dbid );
return args; DatabaseImpl* impl = new DatabaseImpl( m_db.databaseName(), true );
impl->setDatabaseID( m_dbid );
impl->setFuzzyIndex( m_fuzzyIndex );
return impl;
} }

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

@@ -48,7 +48,7 @@ public:
DatabaseImpl( const QString& dbname ); DatabaseImpl( const QString& dbname );
~DatabaseImpl(); ~DatabaseImpl();
QPair< QString, QString > cloneArgs() const; DatabaseImpl* clone() const;
TomahawkSqlQuery newquery(); TomahawkSqlQuery newquery();
QSqlDatabase& database(); QSqlDatabase& database();
@@ -82,9 +82,9 @@ signals:
void indexReady(); void indexReady();
private: private:
DatabaseImpl( const QString &dbname, const QString &dbid ); DatabaseImpl( const QString& dbname, bool internal );
FuzzyIndex* fuzzyIndex() const { return m_fuzzyIndex; }
void setFuzzyIndex( FuzzyIndex* fi ) { m_fuzzyIndex = fi; } void setFuzzyIndex( FuzzyIndex* fi ) { m_fuzzyIndex = fi; }
void setDatabaseID( const QString& dbid ) { m_dbid = dbid; }
void init(); void init();
bool openDatabase( const QString& dbname, bool checkSchema = true ); bool openDatabase( const QString& dbname, bool checkSchema = true );
@@ -101,8 +101,6 @@ private:
QString m_dbid; QString m_dbid;
FuzzyIndex* m_fuzzyIndex; FuzzyIndex* m_fuzzyIndex;
mutable QMutex m_mutex; mutable QMutex m_mutex;
friend class Database;
}; };
#endif // DATABASEIMPL_H #endif // DATABASEIMPL_H