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

fix merge leftovers

Browse Source
This commit is contained in:
Leo Franchi
2011-01-17 10:00:18 -05:00
parent fdf5e1c56c
commit b321bdea9a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp
View File

@@ -9,6 +9,7 @@
#include "network/servent.h" #include "network/servent.h"
#include "tomahawk/tomahawkapp.h" #include "tomahawk/tomahawkapp.h"
#include "playlist/playlistmanager.h"
using namespace Tomahawk; using namespace Tomahawk;
@@ -84,7 +85,7 @@ DatabaseCommand_CreateDynamicPlaylist::postCommitHook()
qDebug() << Q_FUNC_INFO << "..reporting.."; qDebug() << Q_FUNC_INFO << "..reporting..";
if( m_playlist.isNull() ) { if( m_playlist.isNull() ) {
source_ptr src = source(); source_ptr src = source();
QMetaObject::invokeMethod( TomahawkApp::instance()->mainWindow(), QMetaObject::invokeMethod( PlaylistManager::instance(),
"createDynamicPlaylist", "createDynamicPlaylist",
Qt::BlockingQueuedConnection, Qt::BlockingQueuedConnection,
QGenericArgument( "Tomahawk::source_ptr", (const void*)&src ), QGenericArgument( "Tomahawk::source_ptr", (const void*)&src ),

3
src/libtomahawk/database/databasecommand_createplaylist.cpp
View File

@@ -4,6 +4,7 @@
#include "network/servent.h" #include "network/servent.h"
#include "tomahawk/tomahawkapp.h" #include "tomahawk/tomahawkapp.h"
#include "playlist/playlistmanager.h"
using namespace Tomahawk; using namespace Tomahawk;
@@ -43,7 +44,7 @@ DatabaseCommand_CreatePlaylist::postCommitHook()
qDebug() << Q_FUNC_INFO << "..reporting.."; qDebug() << Q_FUNC_INFO << "..reporting..";
if( m_playlist.isNull() ) { if( m_playlist.isNull() ) {
source_ptr src = source(); source_ptr src = source();
QMetaObject::invokeMethod( TomahawkApp::instance()->mainWindow(), QMetaObject::invokeMethod( PlaylistManager::instance(),
"createPlaylist", "createPlaylist",
Qt::BlockingQueuedConnection, Qt::BlockingQueuedConnection,
QGenericArgument( "Tomahawk::source_ptr", (const void*)&src ), QGenericArgument( "Tomahawk::source_ptr", (const void*)&src ),