1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-13 09:34:53 +02:00

* Style fixes.

This commit is contained in:
Christian Muehlhaeuser
2012-11-28 04:57:00 +01:00
parent ed1541ba8d
commit 500c774c36
12 changed files with 29 additions and 24 deletions

View File

@@ -75,16 +75,16 @@ JreenMessageHandler( QtMsgType type, const char *msg )
switch ( type ) switch ( type )
{ {
case QtDebugMsg: case QtDebugMsg:
tDebug( LOGTHIRDPARTY ).nospace() << JREEN_LOG_INFIX << ": " << "Debug: " << msg; tDebug( LOGTHIRDPARTY ).nospace() << JREEN_LOG_INFIX << ":" << "Debug:" << msg;
break; break;
case QtWarningMsg: case QtWarningMsg:
tDebug( LOGTHIRDPARTY ).nospace() << JREEN_LOG_INFIX << ": " << "Warning: " << msg; tDebug( LOGTHIRDPARTY ).nospace() << JREEN_LOG_INFIX << ":" << "Warning:" << msg;
break; break;
case QtCriticalMsg: case QtCriticalMsg:
tDebug( LOGTHIRDPARTY ).nospace() << JREEN_LOG_INFIX << ": " << "Critical: " << msg; tDebug( LOGTHIRDPARTY ).nospace() << JREEN_LOG_INFIX << ":" << "Critical:" << msg;
break; break;
case QtFatalMsg: case QtFatalMsg:
tDebug( LOGTHIRDPARTY ).nospace() << JREEN_LOG_INFIX << ": " << "Fatal: " << msg; tDebug( LOGTHIRDPARTY ).nospace() << JREEN_LOG_INFIX << ":" << "Fatal:" << msg;
abort(); abort();
} }
} }

View File

@@ -568,7 +568,6 @@ MprisPlugin::onTrackCountChanged( unsigned int tracks )
Q_UNUSED( tracks ); Q_UNUSED( tracks );
notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "CanGoNext" ); notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "CanGoNext" );
notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "CanGoPrevious" ); notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "CanGoPrevious" );
} }

View File

@@ -69,6 +69,7 @@ public:
void setWeakRef( QWeakPointer< Tomahawk::Album > weakRef ) { m_ownRef = weakRef; } void setWeakRef( QWeakPointer< Tomahawk::Album > weakRef ) { m_ownRef = weakRef; }
void loadId( bool autoCreate ); void loadId( bool autoCreate );
signals: signals:
void tracksAdded( const QList<Tomahawk::query_ptr>& tracks, Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection ); void tracksAdded( const QList<Tomahawk::query_ptr>& tracks, Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection );
void updated(); void updated();

View File

@@ -42,6 +42,7 @@ LatchManager::~LatchManager()
} }
bool bool
LatchManager::isLatched( const source_ptr& src ) LatchManager::isLatched( const source_ptr& src )
{ {
@@ -58,9 +59,10 @@ LatchManager::latchRequest( const source_ptr& source )
m_state = Latching; m_state = Latching;
m_waitingForLatch = source; m_waitingForLatch = source;
AudioEngine::instance()->playItem( source->playlistInterface(), source->playlistInterface()->nextItem() ); AudioEngine::instance()->playItem( source->playlistInterface(), source->playlistInterface()->nextResult() );
} }
void void
LatchManager::playlistChanged( Tomahawk::playlistinterface_ptr ) LatchManager::playlistChanged( Tomahawk::playlistinterface_ptr )
{ {

View File

@@ -213,7 +213,7 @@ DBSyncConnection::handleMsg( msg_ptr msg )
if ( m.value( "method" ).toString() == "fetchops" ) if ( m.value( "method" ).toString() == "fetchops" )
{ {
++m_fetchCount; ++m_fetchCount;
tDebug() << "Fetching new dbops:" << m["lastop"].toString() << m_fetchCount; tDebug( LOGVERBOSE ) << "Fetching new dbops:" << m["lastop"].toString() << m_fetchCount;
m_uscache = m; m_uscache = m;
sendOps(); sendOps();
return; return;

View File

@@ -107,6 +107,7 @@ DynamicWidget::~DynamicWidget()
{ {
} }
dynplaylist_ptr dynplaylist_ptr
DynamicWidget::playlist() DynamicWidget::playlist()
{ {
@@ -154,7 +155,6 @@ DynamicWidget::loadDynamicPlaylist( const Tomahawk::dynplaylist_ptr& playlist )
disconnect( m_playlist.data(), SIGNAL( changed() ), this, SLOT( onChanged() ) ); disconnect( m_playlist.data(), SIGNAL( changed() ), this, SLOT( onChanged() ) );
} }
m_playlist = playlist; m_playlist = playlist;
m_view->setOnDemand( m_playlist->mode() == OnDemand ); m_view->setOnDemand( m_playlist->mode() == OnDemand );
m_view->setReadOnly( !m_playlist->author()->isLocal() ); m_view->setReadOnly( !m_playlist->author()->isLocal() );
@@ -414,6 +414,7 @@ DynamicWidget::controlChanged( const Tomahawk::dyncontrol_ptr& control )
emit descriptionChanged( m_playlist->generator()->sentenceSummary() ); emit descriptionChanged( m_playlist->generator()->sentenceSummary() );
} }
void void
DynamicWidget::steeringChanged() DynamicWidget::steeringChanged()
{ {
@@ -497,18 +498,21 @@ DynamicWidget::paintRoundedFilledRect( QPainter& p, QPalette& /* pal */, QRect&
p.drawRoundedRect( r, 10, 10 ); p.drawRoundedRect( r, 10, 10 );
} }
QString QString
DynamicWidget::description() const DynamicWidget::description() const
{ {
return m_model->description(); return m_model->description();
} }
QString QString
DynamicWidget::title() const DynamicWidget::title() const
{ {
return m_model->title(); return m_model->title();
} }
QPixmap QPixmap
DynamicWidget::pixmap() const DynamicWidget::pixmap() const
{ {

View File

@@ -19,6 +19,14 @@
#include "QtScriptResolver.h" #include "QtScriptResolver.h"
#include <QtGui/QMessageBox>
#include <QtNetwork/QNetworkRequest>
#include <QtNetwork/QNetworkReply>
#include <QtCore/QMetaProperty>
#include <QtCore/QCryptographicHash>
#include "Artist.h" #include "Artist.h"
#include "Album.h" #include "Album.h"
#include "config.h" #include "config.h"
@@ -30,15 +38,6 @@
#include "utils/TomahawkUtils.h" #include "utils/TomahawkUtils.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include <QtGui/QMessageBox>
#include <QtNetwork/QNetworkRequest>
#include <QtNetwork/QNetworkReply>
#include <QtCore/QMetaProperty>
#include <QtCore/QCryptographicHash>
// FIXME: bloody hack, remove this for 0.3 // FIXME: bloody hack, remove this for 0.3
// this one adds new functionality to old resolvers // this one adds new functionality to old resolvers
#define RESOLVER_LEGACY_CODE "var resolver = Tomahawk.resolver.instance ? Tomahawk.resolver.instance : TomahawkResolver;" #define RESOLVER_LEGACY_CODE "var resolver = Tomahawk.resolver.instance ? Tomahawk.resolver.instance : TomahawkResolver;"

View File

@@ -244,7 +244,7 @@ PixmapDelegateFader::onAnimationStep( int step )
} }
Q_ASSERT( !m_currentReference.isNull() ); Q_ASSERT( !m_currentReference.isNull() );
if ( !m_currentReference.isNull() ) // Should never be null.. if ( !m_currentReference.isNull() ) // Should never be null...
{ {
p.setOpacity( opacity ); p.setOpacity( opacity );
p.drawPixmap( 0, 0, m_currentReference ); p.drawPixmap( 0, 0, m_currentReference );

View File

@@ -361,7 +361,7 @@ void
WhatsHotWidget::leftCrumbIndexChanged( QModelIndex index ) WhatsHotWidget::leftCrumbIndexChanged( QModelIndex index )
{ {
tDebug( LOGVERBOSE ) << "WhatsHot:: left crumb changed" << index.data(); tDebug( LOGVERBOSE ) << "WhatsHot: left crumb changed" << index.data();
QStandardItem* item = m_crumbModelLeft->itemFromIndex( m_sortedProxy->mapToSource( index ) ); QStandardItem* item = m_crumbModelLeft->itemFromIndex( m_sortedProxy->mapToSource( index ) );
if ( !item ) if ( !item )
@@ -454,7 +454,7 @@ QStandardItem*
WhatsHotWidget::parseNode( QStandardItem* parentItem, const QString &label, const QVariant &data ) WhatsHotWidget::parseNode( QStandardItem* parentItem, const QString &label, const QVariant &data )
{ {
Q_UNUSED( parentItem ); Q_UNUSED( parentItem );
// tDebug( LOGVERBOSE ) << "WhatsHot:: parsing " << label; // tDebug( LOGVERBOSE ) << "WhatsHot: parsing " << label;
QStandardItem *sourceItem = new QStandardItem( label ); QStandardItem *sourceItem = new QStandardItem( label );