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

hook up

Browse Source
This commit is contained in:
Leo Franchi
2012-05-13 20:48:55 -04:00
parent bb5e5c33ca
commit 81575c68e8
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libtomahawk/AtticaManager.cpp
View File

@@ -66,6 +66,8 @@ public slots:
TomahawkSettingsGui::instanceGui()->setAtticaResolverStates( m_manager.data()->m_resolverStates ); TomahawkSettingsGui::instanceGui()->setAtticaResolverStates( m_manager.data()->m_resolverStates );
emit m_manager.data()->resolverInstalled( m_resolverId ); emit m_manager.data()->resolverInstalled( m_resolverId );
emit m_manager.data()->resolverStateChanged( m_resolverId ); emit m_manager.data()->resolverStateChanged( m_resolverId );
deleteLater();
} }
void extractFailed() void extractFailed()
{ {
@@ -73,6 +75,8 @@ public slots:
return; return;
m_manager.data()->resolverInstallationFailed( m_resolverId ); m_manager.data()->resolverInstallationFailed( m_resolverId );
deleteLater();
} }
private: private:
@@ -574,7 +578,7 @@ AtticaManager::payloadFetched()
return; return;
} }
TomahawkUtils::extractBinaryResolver( f.fileName(), resolverId, 0 ); TomahawkUtils::extractBinaryResolver( f.fileName(), new BinaryInstallerHelper( resolverId, this ) );
} }
else else
{ {

2
src/libtomahawk/utils/TomahawkUtils.cpp
View File

@@ -845,7 +845,7 @@ unzipFileInFolder( const QString &zipFileName, const QDir &folder )
void void
extractBinaryResolver( const QString& zipFilename, const QString& resolverId, QObject* ) extractBinaryResolver( const QString& zipFilename, QObject* )
{ {
#if !defined(Q_OS_MAC) && !defined (Q_OS_WIN) #if !defined(Q_OS_MAC) && !defined (Q_OS_WIN)
Q_ASSERT( false ); Q_ASSERT( false );

6
src/libtomahawk/utils/TomahawkUtils.h
View File

@@ -115,7 +115,7 @@ namespace TomahawkUtils
QStringList m_noProxyHosts; QStringList m_noProxyHosts;
QNetworkProxy m_proxy; QNetworkProxy m_proxy;
}; };
DLLEXPORT QString appFriendlyVersion(); DLLEXPORT QString appFriendlyVersion();
@@ -138,7 +138,7 @@ namespace TomahawkUtils
DLLEXPORT QString md5( const QByteArray& data ); DLLEXPORT QString md5( const QByteArray& data );
DLLEXPORT bool removeDirectory( const QString& dir ); DLLEXPORT bool removeDirectory( const QString& dir );
DLLEXPORT bool verifyFile( const QString& filePath, const QString& signature ); DLLEXPORT bool verifyFile( const QString& filePath, const QString& signature );
DLLEXPORT QString extractScriptPayload( const QString& filename, const QString& resolverId ); DLLEXPORT QString extractScriptPayload( const QString& filename, const QString& resolverId );
DLLEXPORT bool unzipFileInFolder( const QString& zipFileName, const QDir& folder ); DLLEXPORT bool unzipFileInFolder( const QString& zipFileName, const QDir& folder );
@@ -146,7 +146,7 @@ namespace TomahawkUtils
// Extracting may be asynchronous, pass in a receiver object with the following slots: // Extracting may be asynchronous, pass in a receiver object with the following slots:
// extractSucceeded( const QString& path ) and extractFailed() to be notified/ // extractSucceeded( const QString& path ) and extractFailed() to be notified/
DLLEXPORT void extractBinaryResolver( const QString& zipFilename, const QString& resolverId, QObject* receiver ); DLLEXPORT void extractBinaryResolver( const QString& zipFilename, QObject* receiver );
// Used by the above, not exported // Used by the above, not exported
void copyWithAuthentication( const QString& srcFile, const QDir dest, QObject* receiver ); void copyWithAuthentication( const QString& srcFile, const QDir dest, QObject* receiver );