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

* Style fixes.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-12-23 05:55:34 +01:00
parent 12bea3708b
commit 394bda7aca
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/breakpad/CrashReporter/main.cpp
View File

@@ -18,11 +18,11 @@
#include "CrashReporter.h" #include "CrashReporter.h"
#include <QTranslator>
#include <iostream>
#include "utils/TomahawkUtils.h" #include "utils/TomahawkUtils.h"
#include <QTranslator>
#include <iostream>
const char* k_usage = const char* k_usage =
"Usage:\n" "Usage:\n"
@@ -37,7 +37,6 @@ int main( int argc, char* argv[] )
QCoreApplication::setOrganizationDomain( "tomahawk-player.org" ); QCoreApplication::setOrganizationDomain( "tomahawk-player.org" );
QApplication app( argc, argv ); QApplication app( argc, argv );
TomahawkUtils::installTranslator( &app ); TomahawkUtils::installTranslator( &app );
if ( app.arguments().size() != 4 ) if ( app.arguments().size() != 4 )

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

@@ -18,12 +18,12 @@
* along with Tomahawk. If not, see <http://www.gnu.org/licenses/>. * along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "utils/TomahawkUtils.h"
#include "TomahawkVersion.h" #include "TomahawkVersion.h"
#include "config.h" #include "config.h"
#include "TomahawkSettings.h" #include "TomahawkSettings.h"
#include "utils/TomahawkUtils.h"
#include "utils/Logger.h"
#include "Source.h" #include "Source.h"
#include "BinaryExtractWorker.h" #include "BinaryExtractWorker.h"
#include "SharedTimeLine.h" #include "SharedTimeLine.h"
@@ -35,7 +35,6 @@
#include <quazip.h> #include <quazip.h>
#include <quazipfile.h> #include <quazipfile.h>
#include <QNetworkConfiguration> #include <QNetworkConfiguration>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QNetworkProxy> #include <QNetworkProxy>
@@ -62,6 +61,8 @@
#include <QtCrypto> #include <QtCrypto>
#endif #endif
#include "Logger.h"
namespace TomahawkUtils namespace TomahawkUtils
{ {
static quint64 s_infosystemRequestId = 0; static quint64 s_infosystemRequestId = 0;
@@ -774,6 +775,7 @@ crash()
*a = 1; *a = 1;
} }
void void
installTranslator( QObject* parent ) installTranslator( QObject* parent )
{ {
@@ -813,6 +815,7 @@ installTranslator(QObject* parent)
QCoreApplication::installTranslator( translator ); QCoreApplication::installTranslator( translator );
} }
bool bool
verifyFile( const QString& filePath, const QString& signature ) verifyFile( const QString& filePath, const QString& signature )
{ {

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

@@ -169,6 +169,8 @@ namespace TomahawkUtils
DLLEXPORT QDir appDataDir(); DLLEXPORT QDir appDataDir();
DLLEXPORT QDir appLogDir(); DLLEXPORT QDir appLogDir();
DLLEXPORT void installTranslator( QObject* parent );
DLLEXPORT QString timeToString( int seconds ); DLLEXPORT QString timeToString( int seconds );
DLLEXPORT QString ageToString( const QDateTime& time, bool appendAgoString = false ); DLLEXPORT QString ageToString( const QDateTime& time, bool appendAgoString = false );
DLLEXPORT QString filesizeToString( unsigned int size ); DLLEXPORT QString filesizeToString( unsigned int size );
@@ -212,8 +214,6 @@ namespace TomahawkUtils
DLLEXPORT QList< Tomahawk::query_ptr > mergePlaylistChanges( const QList< Tomahawk::query_ptr >& orig, const QList< Tomahawk::query_ptr >& newTracks, bool& changed ); DLLEXPORT QList< Tomahawk::query_ptr > mergePlaylistChanges( const QList< Tomahawk::query_ptr >& orig, const QList< Tomahawk::query_ptr >& newTracks, bool& changed );
DLLEXPORT void crash(); DLLEXPORT void crash();
DLLEXPORT void installTranslator(QObject *parent);
} }
#endif // TOMAHAWKUTILS_H #endif // TOMAHAWKUTILS_H