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

* Style fixes in JSResolver.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-09-17 16:21:14 +02:00
parent 66487ff985
commit 761b694e07
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/libtomahawk/resolvers/JSResolver.cpp
View File

@@ -176,7 +176,7 @@ JSResolver::reload()
void void
JSResolver::setIcon( const QPixmap &icon ) JSResolver::setIcon( const QPixmap& icon )
{ {
Q_D( JSResolver ); Q_D( JSResolver );
@@ -197,7 +197,7 @@ JSResolver::init()
} }
QFile scriptFile( filePath() ); QFile scriptFile( filePath() );
if( !scriptFile.open( QIODevice::ReadOnly ) ) if ( !scriptFile.open( QIODevice::ReadOnly ) )
{ {
qWarning() << "Failed to read contents of file:" << filePath() << scriptFile.errorString(); qWarning() << "Failed to read contents of file:" << filePath() << scriptFile.errorString();
return; return;
@@ -243,7 +243,7 @@ JSResolver::init()
foreach ( const QString& s, d->requiredScriptPaths ) foreach ( const QString& s, d->requiredScriptPaths )
{ {
QFile reqFile( s ); QFile reqFile( s );
if( !reqFile.open( QIODevice::ReadOnly ) ) if ( !reqFile.open( QIODevice::ReadOnly ) )
{ {
qWarning() << "Failed to read contents of file:" << s << reqFile.errorString(); qWarning() << "Failed to read contents of file:" << s << reqFile.errorString();
return; return;
@@ -678,7 +678,7 @@ JSResolver::loadUi()
QByteArray uiData = m[ "widget" ].toByteArray(); QByteArray uiData = m[ "widget" ].toByteArray();
if( compressed ) if ( compressed )
uiData = qUncompress( QByteArray::fromBase64( uiData ) ); uiData = qUncompress( QByteArray::fromBase64( uiData ) );
else else
uiData = QByteArray::fromBase64( uiData ); uiData = QByteArray::fromBase64( uiData );
@@ -691,7 +691,7 @@ JSResolver::loadUi()
images[key] = value; images[key] = value;
} }
if( m.contains( "images" ) ) if ( m.contains( "images" ) )
uiData = fixDataImagePaths( uiData, compressed, images ); uiData = fixDataImagePaths( uiData, compressed, images );
d->configWidget = QPointer< AccountConfigWidget >( widgetFromData( uiData, 0 ) ); d->configWidget = QPointer< AccountConfigWidget >( widgetFromData( uiData, 0 ) );
@@ -705,7 +705,7 @@ JSResolver::configUI() const
{ {
Q_D( const JSResolver ); Q_D( const JSResolver );
if( d->configWidget.isNull() ) if ( d->configWidget.isNull() )
return 0; return 0;
else else
return d->configWidget.data(); return d->configWidget.data();
@@ -726,11 +726,11 @@ JSResolver::saveConfig()
QVariant QVariant
JSResolver::widgetData(QWidget* widget, const QString& property) JSResolver::widgetData( QWidget* widget, const QString& property )
{ {
for( int i = 0; i < widget->metaObject()->propertyCount(); i++ ) for ( int i = 0; i < widget->metaObject()->propertyCount(); i++ )
{ {
if( widget->metaObject()->property( i ).name() == property ) if ( widget->metaObject()->property( i ).name() == property )
{ {
return widget->property( property.toLatin1() ); return widget->property( property.toLatin1() );
} }
@@ -741,13 +741,13 @@ JSResolver::widgetData(QWidget* widget, const QString& property)
void void
JSResolver::setWidgetData(const QVariant& value, QWidget* widget, const QString& property) JSResolver::setWidgetData( const QVariant& value, QWidget* widget, const QString& property )
{ {
for( int i = 0; i < widget->metaObject()->propertyCount(); i++ ) for ( int i = 0; i < widget->metaObject()->propertyCount(); i++ )
{ {
if( widget->metaObject()->property( i ).name() == property ) if ( widget->metaObject()->property( i ).name() == property )
{ {
widget->metaObject()->property( i ).write( widget, value); widget->metaObject()->property( i ).write( widget, value );
return; return;
} }
} }
@@ -785,7 +785,7 @@ JSResolver::fillDataInWidgets( const QVariantMap& data )
{ {
QString widgetName = dataWidget.toMap()["widget"].toString(); QString widgetName = dataWidget.toMap()["widget"].toString();
QWidget* widget= d->configWidget.data()->findChild<QWidget*>( widgetName ); QWidget* widget= d->configWidget.data()->findChild<QWidget*>( widgetName );
if( !widget ) if ( !widget )
{ {
tLog() << Q_FUNC_INFO << "Widget specified in resolver was not found:" << widgetName; tLog() << Q_FUNC_INFO << "Widget specified in resolver was not found:" << widgetName;
Q_ASSERT(false); Q_ASSERT(false);

1
src/libtomahawk/resolvers/JSResolver.h
View File

@@ -102,7 +102,6 @@ private:
Q_DECLARE_PRIVATE( JSResolver ) Q_DECLARE_PRIVATE( JSResolver )
QScopedPointer<JSResolverPrivate> d_ptr; QScopedPointer<JSResolverPrivate> d_ptr;
}; };
#endif // JSRESOLVER_H #endif // JSRESOLVER_H