diff --git a/src/AudioControls.h b/src/AudioControls.h index 00cc1e9da..a4797c7aa 100644 --- a/src/AudioControls.h +++ b/src/AudioControls.h @@ -95,7 +95,7 @@ private: Ui::AudioControls* ui; - QWeakPointer m_socialWidget; + QPointer m_socialWidget; Tomahawk::result_ptr m_currentTrack; Tomahawk::PlaylistModes::RepeatMode m_repeatMode; diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp index 932fd61ec..3da35d300 100644 --- a/src/SettingsDialog.cpp +++ b/src/SettingsDialog.cpp @@ -423,7 +423,7 @@ SettingsDialog::openAccountFactoryConfig( AccountFactory* factory ) #ifndef Q_OS_MAC AccountFactoryWrapper dialog( factory, 0 ); - QWeakPointer< AccountFactoryWrapper > watcher( &dialog ); + QPointer< AccountFactoryWrapper > watcher( &dialog ); dialog.exec(); #else diff --git a/src/TomahawkApp.cpp b/src/TomahawkApp.cpp index 7ab3ef212..964641f74 100644 --- a/src/TomahawkApp.cpp +++ b/src/TomahawkApp.cpp @@ -185,18 +185,18 @@ TomahawkApp::init() // Cause the creation of the nam, but don't need to address it directly, so prevent warning Q_UNUSED( TomahawkUtils::nam() ); - m_audioEngine = QWeakPointer( new AudioEngine ); + m_audioEngine = QPointer( new AudioEngine ); // init pipeline and resolver factories new Pipeline(); - m_servent = QWeakPointer( new Servent( this ) ); + m_servent = QPointer( new Servent( this ) ); connect( m_servent.data(), SIGNAL( ready() ), SLOT( initSIP() ) ); tDebug() << "Init Database."; initDatabase(); - m_scanManager = QWeakPointer( new ScanManager( this ) ); + m_scanManager = QPointer( new ScanManager( this ) ); #ifndef ENABLE_HEADLESS Pipeline::instance()->addExternalResolverFactory( boost::bind( &QtScriptResolver::factory, _1 ) ); @@ -221,7 +221,7 @@ TomahawkApp::init() // Register shortcut handler for this platform #ifdef Q_WS_MAC - m_shortcutHandler = QWeakPointer( new MacShortcutHandler( this ) ); + m_shortcutHandler = QPointer( new MacShortcutHandler( this ) ); Tomahawk::setShortcutHandler( static_cast( m_shortcutHandler.data() ) ); Tomahawk::setApplicationHandler( this ); @@ -242,10 +242,10 @@ TomahawkApp::init() } tDebug() << "Init InfoSystem."; - m_infoSystem = QWeakPointer( Tomahawk::InfoSystem::InfoSystem::instance() ); + m_infoSystem = QPointer( Tomahawk::InfoSystem::InfoSystem::instance() ); tDebug() << "Init AccountManager."; - m_accountManager = QWeakPointer< Tomahawk::Accounts::AccountManager >( new Tomahawk::Accounts::AccountManager( this ) ); + m_accountManager = QPointer< Tomahawk::Accounts::AccountManager >( new Tomahawk::Accounts::AccountManager( this ) ); connect( m_accountManager.data(), SIGNAL( ready() ), SLOT( accountManagerReady() ) ); Echonest::Config::instance()->setNetworkAccessManager( TomahawkUtils::nam() ); @@ -517,7 +517,7 @@ TomahawkApp::initDatabase() } tDebug( LOGEXTRA ) << "Using database:" << dbpath; - m_database = QWeakPointer( new Database( dbpath, this ) ); + m_database = QPointer( new Database( dbpath, this ) ); Pipeline::instance()->databaseReady(); } @@ -541,8 +541,8 @@ TomahawkApp::initHTTP() return; } - m_session = QWeakPointer< QxtHttpSessionManager >( new QxtHttpSessionManager() ); - m_connector = QWeakPointer< QxtHttpServerConnector >( new QxtHttpServerConnector ); + m_session = QPointer< QxtHttpSessionManager >( new QxtHttpSessionManager() ); + m_connector = QPointer< QxtHttpServerConnector >( new QxtHttpServerConnector ); if ( m_session.isNull() || m_connector.isNull() ) { if ( !m_session.isNull() ) diff --git a/src/TomahawkApp.h b/src/TomahawkApp.h index 5eb342d29..628a74e2d 100644 --- a/src/TomahawkApp.h +++ b/src/TomahawkApp.h @@ -39,6 +39,7 @@ #include #include #include +#include class AudioEngine; class Database; @@ -124,13 +125,13 @@ private: void initLocalCollection(); void initPipeline(); - QWeakPointer m_database; - QWeakPointer m_scanManager; - QWeakPointer m_audioEngine; - QWeakPointer m_servent; - QWeakPointer m_infoSystem; - QWeakPointer m_shortcutHandler; - QWeakPointer< Tomahawk::Accounts::AccountManager > m_accountManager; + QPointer m_database; + QPointer m_scanManager; + QPointer m_audioEngine; + QPointer m_servent; + QPointer m_infoSystem; + QPointer m_shortcutHandler; + QPointer< Tomahawk::Accounts::AccountManager > m_accountManager; bool m_scrubFriendlyName; #ifdef LIBLASTFM_FOUND @@ -143,8 +144,8 @@ private: bool m_headless, m_loaded; - QWeakPointer< QxtHttpServerConnector > m_connector; - QWeakPointer< QxtHttpSessionManager > m_session; + QPointer< QxtHttpServerConnector > m_connector; + QPointer< QxtHttpSessionManager > m_session; }; Q_DECLARE_METATYPE( PairList ) diff --git a/src/TomahawkWindow.cpp b/src/TomahawkWindow.cpp index 095499b37..c0b7532b4 100644 --- a/src/TomahawkWindow.cpp +++ b/src/TomahawkWindow.cpp @@ -924,7 +924,7 @@ TomahawkWindow::loadSpiff() connect( diag, SIGNAL( finished( int ) ), this, SLOT( loadXspfFinished( int ) ) ); diag->show(); #else - QWeakPointer< LoadXSPFDialog > safe( diag ); + QPointer< LoadXSPFDialog > safe( diag ); int ret = diag->exec(); if ( !safe.isNull() && ret == QDialog::Accepted ) diff --git a/src/accounts/twitter/TwitterAccount.cpp b/src/accounts/twitter/TwitterAccount.cpp index cd6859f17..842448539 100644 --- a/src/accounts/twitter/TwitterAccount.cpp +++ b/src/accounts/twitter/TwitterAccount.cpp @@ -54,10 +54,10 @@ TwitterAccount::TwitterAccount( const QString &accountId ) qDebug() << "Got cached peers:" << configuration() << configuration()[ "cachedpeers" ]; - m_configWidget = QWeakPointer< TwitterConfigWidget >( new TwitterConfigWidget( this, 0 ) ); + m_configWidget = QPointer< TwitterConfigWidget >( new TwitterConfigWidget( this, 0 ) ); connect( m_configWidget.data(), SIGNAL( twitterAuthed( bool ) ), SLOT( configDialogAuthedSignalSlot( bool ) ) ); - m_twitterAuth = QWeakPointer< TomahawkOAuthTwitter >( new TomahawkOAuthTwitter( TomahawkUtils::nam(), this ) ); + m_twitterAuth = QPointer< TomahawkOAuthTwitter >( new TomahawkOAuthTwitter( TomahawkUtils::nam(), this ) ); m_onlinePixmap = QPixmap( ":/twitter-icon.png" ); m_offlinePixmap = QPixmap( ":/twitter-offline-icon.png" ); @@ -97,7 +97,7 @@ TwitterAccount::sipPlugin() if ( m_twitterSipPlugin.isNull() ) { qDebug() << "CHECKING:" << configuration() << configuration()[ "cachedpeers" ]; - m_twitterSipPlugin = QWeakPointer< TwitterSipPlugin >( new TwitterSipPlugin( this ) ); + m_twitterSipPlugin = QPointer< TwitterSipPlugin >( new TwitterSipPlugin( this ) ); connect( m_twitterSipPlugin.data(), SIGNAL( stateChanged( Tomahawk::Accounts::Account::ConnectionState ) ), this, SIGNAL( connectionStateChanged( Tomahawk::Accounts::Account::ConnectionState ) ) ); return m_twitterSipPlugin.data(); @@ -110,7 +110,7 @@ Tomahawk::InfoSystem::InfoPluginPtr TwitterAccount::infoPlugin() { if ( m_twitterInfoPlugin.isNull() ) - m_twitterInfoPlugin = QWeakPointer< Tomahawk::InfoSystem::TwitterInfoPlugin >( new Tomahawk::InfoSystem::TwitterInfoPlugin( this ) ); + m_twitterInfoPlugin = QPointer< Tomahawk::InfoSystem::TwitterInfoPlugin >( new Tomahawk::InfoSystem::TwitterInfoPlugin( this ) ); return Tomahawk::InfoSystem::InfoPluginPtr( m_twitterInfoPlugin.data() ); } @@ -191,7 +191,7 @@ TwitterAccount::refreshTwitterAuth() Q_ASSERT( TomahawkUtils::nam() != 0 ); tDebug() << Q_FUNC_INFO << " with nam " << TomahawkUtils::nam(); - m_twitterAuth = QWeakPointer< TomahawkOAuthTwitter >( new TomahawkOAuthTwitter( TomahawkUtils::nam(), this ) ); + m_twitterAuth = QPointer< TomahawkOAuthTwitter >( new TomahawkOAuthTwitter( TomahawkUtils::nam(), this ) ); if( m_twitterAuth.isNull() ) return false; diff --git a/src/accounts/twitter/TwitterAccount.h b/src/accounts/twitter/TwitterAccount.h index 14f7602cb..490f68e4f 100644 --- a/src/accounts/twitter/TwitterAccount.h +++ b/src/accounts/twitter/TwitterAccount.h @@ -80,7 +80,7 @@ public: TomahawkOAuthTwitter* twitterAuth() const { return m_twitterAuth.data(); } signals: - void nowAuthenticated( const QWeakPointer< TomahawkOAuthTwitter >&, const QTweetUser &user ); + void nowAuthenticated( const QPointer< TomahawkOAuthTwitter >&, const QTweetUser &user ); void nowDeauthenticated(); private slots: @@ -92,10 +92,10 @@ private: QIcon m_icon; bool m_isAuthenticated; bool m_isAuthenticating; - QWeakPointer< TomahawkOAuthTwitter > m_twitterAuth; - QWeakPointer< TwitterConfigWidget > m_configWidget; - QWeakPointer< TwitterSipPlugin > m_twitterSipPlugin; - QWeakPointer< Tomahawk::InfoSystem::TwitterInfoPlugin > m_twitterInfoPlugin; + QPointer< TomahawkOAuthTwitter > m_twitterAuth; + QPointer< TwitterConfigWidget > m_configWidget; + QPointer< TwitterSipPlugin > m_twitterSipPlugin; + QPointer< Tomahawk::InfoSystem::TwitterInfoPlugin > m_twitterInfoPlugin; // for settings access friend class TwitterConfigWidget; diff --git a/src/accounts/twitter/TwitterInfoPlugin.cpp b/src/accounts/twitter/TwitterInfoPlugin.cpp index a77846f48..c78cc630b 100644 --- a/src/accounts/twitter/TwitterInfoPlugin.cpp +++ b/src/accounts/twitter/TwitterInfoPlugin.cpp @@ -82,7 +82,7 @@ TwitterInfoPlugin::refreshTwitterAuth() Q_ASSERT( TomahawkUtils::nam() != 0 ); tDebug() << Q_FUNC_INFO << "with nam" << TomahawkUtils::nam() << this; - m_twitterAuth = QWeakPointer< TomahawkOAuthTwitter >( new TomahawkOAuthTwitter( TomahawkUtils::nam(), this ) ); + m_twitterAuth = QPointer< TomahawkOAuthTwitter >( new TomahawkOAuthTwitter( TomahawkUtils::nam(), this ) ); if ( m_twitterAuth.isNull() ) return false; diff --git a/src/accounts/twitter/TwitterInfoPlugin.h b/src/accounts/twitter/TwitterInfoPlugin.h index 0919515b7..893249a84 100644 --- a/src/accounts/twitter/TwitterInfoPlugin.h +++ b/src/accounts/twitter/TwitterInfoPlugin.h @@ -68,7 +68,7 @@ namespace Tomahawk { bool isValid() const; Tomahawk::Accounts::TwitterAccount* m_account; - QWeakPointer< TomahawkOAuthTwitter > m_twitterAuth; + QPointer< TomahawkOAuthTwitter > m_twitterAuth; }; } diff --git a/src/accounts/twitter/sip/TwitterSip.cpp b/src/accounts/twitter/sip/TwitterSip.cpp index 8c59e6a5e..4364199d4 100644 --- a/src/accounts/twitter/sip/TwitterSip.cpp +++ b/src/accounts/twitter/sip/TwitterSip.cpp @@ -60,7 +60,7 @@ TwitterSipPlugin::TwitterSipPlugin( Tomahawk::Accounts::Account* account ) { qDebug() << Q_FUNC_INFO; - connect( account, SIGNAL( nowAuthenticated( const QWeakPointer< TomahawkOAuthTwitter > &, const QTweetUser & ) ), SLOT( accountAuthenticated( const QWeakPointer< TomahawkOAuthTwitter > &, const QTweetUser & ) ) ); + connect( account, SIGNAL( nowAuthenticated( const QPointer< TomahawkOAuthTwitter > &, const QTweetUser & ) ), SLOT( accountAuthenticated( const QPointer< TomahawkOAuthTwitter > &, const QTweetUser & ) ) ); m_configuration = account->configuration(); qDebug() << "SIP configuration:" << m_configuration << m_configuration[ "cachedpeers" ]; @@ -165,7 +165,7 @@ TwitterSipPlugin::disconnectPlugin() } void -TwitterSipPlugin::accountAuthenticated( const QWeakPointer< TomahawkOAuthTwitter > &twitterAuth, const QTweetUser &user ) +TwitterSipPlugin::accountAuthenticated( const QPointer< TomahawkOAuthTwitter > &twitterAuth, const QTweetUser &user ) { Q_UNUSED( user ); @@ -174,11 +174,11 @@ TwitterSipPlugin::accountAuthenticated( const QWeakPointer< TomahawkOAuthTwitter m_cachedTwitterAuth = twitterAuth; - m_friendsTimeline = QWeakPointer( new QTweetFriendsTimeline( m_cachedTwitterAuth.data(), this ) ); - m_mentions = QWeakPointer( new QTweetMentions( m_cachedTwitterAuth.data(), this ) ); - m_directMessages = QWeakPointer( new QTweetDirectMessages( m_cachedTwitterAuth.data(), this ) ); - m_directMessageNew = QWeakPointer( new QTweetDirectMessageNew( m_cachedTwitterAuth.data(), this ) ); - m_directMessageDestroy = QWeakPointer( new QTweetDirectMessageDestroy( m_cachedTwitterAuth.data(), this ) ); + m_friendsTimeline = QPointer( new QTweetFriendsTimeline( m_cachedTwitterAuth.data(), this ) ); + m_mentions = QPointer( new QTweetMentions( m_cachedTwitterAuth.data(), this ) ); + m_directMessages = QPointer( new QTweetDirectMessages( m_cachedTwitterAuth.data(), this ) ); + m_directMessageNew = QPointer( new QTweetDirectMessageNew( m_cachedTwitterAuth.data(), this ) ); + m_directMessageDestroy = QPointer( new QTweetDirectMessageDestroy( m_cachedTwitterAuth.data(), this ) ); connect( m_friendsTimeline.data(), SIGNAL( parsedStatuses(const QList< QTweetStatus > &) ), SLOT( friendsTimelineStatuses(const QList &) ) ); connect( m_mentions.data(), SIGNAL( parsedStatuses(const QList< QTweetStatus > &) ), SLOT( mentionsStatuses(const QList &) ) ); connect( m_directMessages.data(), SIGNAL( parsedDirectMessages(const QList &)), SLOT( directMessages(const QList &) ) ); diff --git a/src/accounts/twitter/sip/TwitterSip.h b/src/accounts/twitter/sip/TwitterSip.h index 325a76181..7086cb21e 100644 --- a/src/accounts/twitter/sip/TwitterSip.h +++ b/src/accounts/twitter/sip/TwitterSip.h @@ -36,7 +36,7 @@ #include #include -#include +#include #include @@ -81,7 +81,7 @@ public slots: void checkSettings(); private slots: - void accountAuthenticated( const QWeakPointer< TomahawkOAuthTwitter > &twitterAuth, const QTweetUser &user ); + void accountAuthenticated( const QPointer< TomahawkOAuthTwitter > &twitterAuth, const QTweetUser &user ); void checkTimerFired(); void connectTimerFired(); void friendsTimelineStatuses( const QList< QTweetStatus > &statuses ); @@ -104,13 +104,13 @@ private: bool refreshTwitterAuth(); void parseGotTomahawk( const QRegExp ®ex, const QString &screenName, const QString &text ); - QWeakPointer< TomahawkOAuthTwitter > m_cachedTwitterAuth; + QPointer< TomahawkOAuthTwitter > m_cachedTwitterAuth; - QWeakPointer< QTweetFriendsTimeline > m_friendsTimeline; - QWeakPointer< QTweetMentions > m_mentions; - QWeakPointer< QTweetDirectMessages > m_directMessages; - QWeakPointer< QTweetDirectMessageNew > m_directMessageNew; - QWeakPointer< QTweetDirectMessageDestroy > m_directMessageDestroy; + QPointer< QTweetFriendsTimeline > m_friendsTimeline; + QPointer< QTweetMentions > m_mentions; + QPointer< QTweetDirectMessages > m_directMessages; + QPointer< QTweetDirectMessageNew > m_directMessageNew; + QPointer< QTweetDirectMessageDestroy > m_directMessageDestroy; QVariantHash m_configuration; diff --git a/src/accounts/xmpp/XmppAccount.cpp b/src/accounts/xmpp/XmppAccount.cpp index d6ee0cf94..b1ae9f278 100644 --- a/src/accounts/xmpp/XmppAccount.cpp +++ b/src/accounts/xmpp/XmppAccount.cpp @@ -44,7 +44,7 @@ XmppAccount::XmppAccount( const QString &accountId ) setAccountServiceName( "Jabber (XMPP)" ); setTypes( SipType ); - m_configWidget = QWeakPointer< QWidget >( new XmppConfigWidget( this, 0 ) ); + m_configWidget = QPointer< QWidget >( new XmppConfigWidget( this, 0 ) ); m_onlinePixmap = QPixmap( ":/xmpp-icon.png" ); m_offlinePixmap = QPixmap( ":/xmpp-offline-icon.png" ); @@ -119,7 +119,7 @@ XmppAccount::sipPlugin() { if ( m_xmppSipPlugin.isNull() ) { - m_xmppSipPlugin = QWeakPointer< XmppSipPlugin >( new XmppSipPlugin( this ) ); + m_xmppSipPlugin = QPointer< XmppSipPlugin >( new XmppSipPlugin( this ) ); connect( m_xmppSipPlugin.data(), SIGNAL( stateChanged( Tomahawk::Accounts::Account::ConnectionState ) ), this, SIGNAL( connectionStateChanged( Tomahawk::Accounts::Account::ConnectionState ) ) ); connect( m_xmppSipPlugin.data(), SIGNAL( error( int, QString ) ), this, SIGNAL( error( int, QString ) ) ); diff --git a/src/accounts/xmpp/XmppAccount.h b/src/accounts/xmpp/XmppAccount.h index 08b5705fd..999a77f6f 100644 --- a/src/accounts/xmpp/XmppAccount.h +++ b/src/accounts/xmpp/XmppAccount.h @@ -80,9 +80,9 @@ public: virtual Tomahawk::Accounts::Account::ConnectionState connectionState() const; protected: - QWeakPointer< QWidget > m_configWidget; // so the google wrapper can change the config dialog a bit - QWeakPointer< XmppSipPlugin > m_xmppSipPlugin; - QWeakPointer< Tomahawk::InfoSystem::XmppInfoPlugin > m_xmppInfoPlugin; + QPointer< QWidget > m_configWidget; // so the google wrapper can change the config dialog a bit + QPointer< XmppSipPlugin > m_xmppSipPlugin; + QPointer< Tomahawk::InfoSystem::XmppInfoPlugin > m_xmppInfoPlugin; QPixmap m_onlinePixmap; QPixmap m_offlinePixmap; diff --git a/src/accounts/xmpp/XmppInfoPlugin.h b/src/accounts/xmpp/XmppInfoPlugin.h index cbb248e6d..84c6c5555 100644 --- a/src/accounts/xmpp/XmppInfoPlugin.h +++ b/src/accounts/xmpp/XmppInfoPlugin.h @@ -55,7 +55,7 @@ namespace Tomahawk { void audioPaused(); private: - QWeakPointer< XmppSipPlugin > m_sipPlugin; + QPointer< XmppSipPlugin > m_sipPlugin; QTimer m_pauseTimer; }; diff --git a/src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp b/src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp index b001f58a3..705f35fd8 100644 --- a/src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp +++ b/src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp @@ -109,7 +109,7 @@ GoogleWrapper::sipPlugin() { if ( m_xmppSipPlugin.isNull() ) { - m_xmppSipPlugin = QWeakPointer< XmppSipPlugin >( new GoogleWrapperSip( const_cast< GoogleWrapper* >( this ) ) ); + m_xmppSipPlugin = QPointer< XmppSipPlugin >( new GoogleWrapperSip( const_cast< GoogleWrapper* >( this ) ) ); connect( m_xmppSipPlugin.data(), SIGNAL( stateChanged( Tomahawk::Accounts::Account::ConnectionState ) ), this, SIGNAL( connectionStateChanged( Tomahawk::Accounts::Account::ConnectionState ) ) ); connect( m_xmppSipPlugin.data(), SIGNAL( error( int, QString ) ), this, SIGNAL( error( int, QString ) ) ); diff --git a/src/accounts/xmpp/googlewrapper/GoogleWrapper.h b/src/accounts/xmpp/googlewrapper/GoogleWrapper.h index 171ad9f19..718d125af 100644 --- a/src/accounts/xmpp/googlewrapper/GoogleWrapper.h +++ b/src/accounts/xmpp/googlewrapper/GoogleWrapper.h @@ -73,7 +73,7 @@ public: virtual SipPlugin* sipPlugin(); private: - QWeakPointer< GoogleWrapperSip > m_sipPlugin; + QPointer< GoogleWrapperSip > m_sipPlugin; }; } diff --git a/src/accounts/xmpp/sip/XmppSip.cpp b/src/accounts/xmpp/sip/XmppSip.cpp index affa15321..646ca3d33 100644 --- a/src/accounts/xmpp/sip/XmppSip.cpp +++ b/src/accounts/xmpp/sip/XmppSip.cpp @@ -202,7 +202,7 @@ InfoSystem::InfoPluginPtr XmppSipPlugin::infoPlugin() { if ( m_infoPlugin.isNull() ) - m_infoPlugin = QWeakPointer< Tomahawk::InfoSystem::XmppInfoPlugin >( new Tomahawk::InfoSystem::XmppInfoPlugin( this ) ); + m_infoPlugin = QPointer< Tomahawk::InfoSystem::XmppInfoPlugin >( new Tomahawk::InfoSystem::XmppInfoPlugin( this ) ); return InfoSystem::InfoPluginPtr( m_infoPlugin.data() ); } diff --git a/src/accounts/xmpp/sip/XmppSip.h b/src/accounts/xmpp/sip/XmppSip.h index 3e244a975..f48f03f14 100644 --- a/src/accounts/xmpp/sip/XmppSip.h +++ b/src/accounts/xmpp/sip/XmppSip.h @@ -132,7 +132,7 @@ private: int m_currentPort; QString m_currentResource; - QWeakPointer< Tomahawk::InfoSystem::XmppInfoPlugin > m_infoPlugin; + QPointer< Tomahawk::InfoSystem::XmppInfoPlugin > m_infoPlugin; Tomahawk::Accounts::Account::ConnectionState m_state; // sort out diff --git a/src/accounts/zeroconf/ZeroconfAccount.cpp b/src/accounts/zeroconf/ZeroconfAccount.cpp index e2cf9a674..0a86fb3d1 100644 --- a/src/accounts/zeroconf/ZeroconfAccount.cpp +++ b/src/accounts/zeroconf/ZeroconfAccount.cpp @@ -120,7 +120,7 @@ SipPlugin* ZeroconfAccount::sipPlugin() { if ( m_sipPlugin.isNull() ) - m_sipPlugin = QWeakPointer< ZeroconfPlugin >( new ZeroconfPlugin( this ) ); + m_sipPlugin = QPointer< ZeroconfPlugin >( new ZeroconfPlugin( this ) ); return m_sipPlugin.data(); } diff --git a/src/accounts/zeroconf/ZeroconfAccount.h b/src/accounts/zeroconf/ZeroconfAccount.h index fc7a939ae..644e1cc3f 100644 --- a/src/accounts/zeroconf/ZeroconfAccount.h +++ b/src/accounts/zeroconf/ZeroconfAccount.h @@ -72,7 +72,7 @@ public: QWidget* aclWidget() { return 0; } private: - QWeakPointer< ZeroconfPlugin > m_sipPlugin; + QPointer< ZeroconfPlugin > m_sipPlugin; }; } diff --git a/src/infoplugins/generic/charts/ChartsPlugin.h b/src/infoplugins/generic/charts/ChartsPlugin.h index 07003a1d9..a4c506f15 100644 --- a/src/infoplugins/generic/charts/ChartsPlugin.h +++ b/src/infoplugins/generic/charts/ChartsPlugin.h @@ -111,7 +111,7 @@ private: uint m_chartsFetchJobs; QList< InfoRequestData > m_cachedRequests; QHash< QString, QString > m_cachedCountries; - QWeakPointer< QNetworkAccessManager > m_nam; + QPointer< QNetworkAccessManager > m_nam; }; } diff --git a/src/infoplugins/generic/newreleases/NewReleasesPlugin.h b/src/infoplugins/generic/newreleases/NewReleasesPlugin.h index 86f0cfbfb..884fac901 100644 --- a/src/infoplugins/generic/newreleases/NewReleasesPlugin.h +++ b/src/infoplugins/generic/newreleases/NewReleasesPlugin.h @@ -92,7 +92,7 @@ private: uint m_nrFetchJobs; QList< InfoRequestData > m_cachedRequests; QHash< QString, QString > m_cachedCountries; - QWeakPointer< QNetworkAccessManager > m_nam; + QPointer< QNetworkAccessManager > m_nam; }; } diff --git a/src/infoplugins/mac/adium/AdiumPlugin.h b/src/infoplugins/mac/adium/AdiumPlugin.h index a4d3d50bf..3687f1ab9 100644 --- a/src/infoplugins/mac/adium/AdiumPlugin.h +++ b/src/infoplugins/mac/adium/AdiumPlugin.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include class QTimer; @@ -80,7 +80,7 @@ private: QUrl m_currentLongUrl; QTimer* m_pauseTimer; - QWeakPointer m_nam; + QPointer m_nam; }; diff --git a/src/libtomahawk/AlbumPlaylistInterface.cpp b/src/libtomahawk/AlbumPlaylistInterface.cpp index d2290e297..aef2aefcd 100644 --- a/src/libtomahawk/AlbumPlaylistInterface.cpp +++ b/src/libtomahawk/AlbumPlaylistInterface.cpp @@ -40,14 +40,14 @@ AlbumPlaylistInterface::AlbumPlaylistInterface( Tomahawk::Album* album, Tomahawk , m_databaseLoaded( false ) , m_mode( mode ) , m_collection( collection ) - , m_album( QWeakPointer< Tomahawk::Album >( album ) ) + , m_album( QPointer< Tomahawk::Album >( album ) ) { } AlbumPlaylistInterface::~AlbumPlaylistInterface() { - m_album.clear(); + m_album = 0; } @@ -133,7 +133,7 @@ AlbumPlaylistInterface::tracks() const else if ( m_mode == DatabaseMode && !m_databaseLoaded ) { DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks( m_collection ); - cmd->setAlbum( m_album ); + cmd->setAlbum( m_album->weakRef() ); cmd->setSortOrder( DatabaseCommand_AllTracks::AlbumPosition ); connect( cmd, SIGNAL( tracks( QList, QVariant ) ), @@ -216,7 +216,7 @@ AlbumPlaylistInterface::infoSystemFinished( const QString& infoId ) if ( m_queries.isEmpty() && m_mode == Mixed ) { DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks( m_collection ); - cmd->setAlbum( m_album ); + cmd->setAlbum( m_album->weakRef() ); //this takes discnumber into account as well cmd->setSortOrder( DatabaseCommand_AllTracks::AlbumPosition ); diff --git a/src/libtomahawk/AlbumPlaylistInterface.h b/src/libtomahawk/AlbumPlaylistInterface.h index a63f41f17..8f6e40c7e 100644 --- a/src/libtomahawk/AlbumPlaylistInterface.h +++ b/src/libtomahawk/AlbumPlaylistInterface.h @@ -21,7 +21,7 @@ #define TOMAHAWKALBUMPLAYLISTINTERFACE_H #include -#include +#include #include "Album.h" #include "Typedefs.h" @@ -81,7 +81,7 @@ private: Tomahawk::ModelMode m_mode; Tomahawk::collection_ptr m_collection; - QWeakPointer< Tomahawk::Album > m_album; + QPointer< Tomahawk::Album > m_album; }; }; // ns diff --git a/src/libtomahawk/ArtistPlaylistInterface.cpp b/src/libtomahawk/ArtistPlaylistInterface.cpp index 451764fe5..f595b8a9c 100644 --- a/src/libtomahawk/ArtistPlaylistInterface.cpp +++ b/src/libtomahawk/ArtistPlaylistInterface.cpp @@ -39,14 +39,14 @@ ArtistPlaylistInterface::ArtistPlaylistInterface( Tomahawk::Artist* artist, Toma , m_databaseLoaded( false ) , m_mode( mode ) , m_collection( collection ) - , m_artist( QWeakPointer< Tomahawk::Artist >( artist ) ) + , m_artist( QPointer< Tomahawk::Artist >( artist ) ) { } ArtistPlaylistInterface::~ArtistPlaylistInterface() { - m_artist.clear(); + m_artist = 0; } @@ -114,7 +114,7 @@ ArtistPlaylistInterface::tracks() const else if ( m_mode == DatabaseMode && !m_databaseLoaded ) { DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks( m_collection ); - cmd->setArtist( m_artist ); + cmd->setArtist( m_artist->weakRef() ); cmd->setSortOrder( DatabaseCommand_AllTracks::AlbumPosition ); connect( cmd, SIGNAL( tracks( QList, QVariant ) ), @@ -196,7 +196,7 @@ ArtistPlaylistInterface::infoSystemFinished( const QString &infoId ) if ( m_queries.isEmpty() && m_mode == Mixed ) { DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks( m_collection ); - cmd->setArtist( m_artist ); + cmd->setArtist( m_artist->weakRef() ); //this takes discnumber into account as well cmd->setSortOrder( DatabaseCommand_AllTracks::AlbumPosition ); diff --git a/src/libtomahawk/ArtistPlaylistInterface.h b/src/libtomahawk/ArtistPlaylistInterface.h index c728f1c2a..5c2e8d89c 100644 --- a/src/libtomahawk/ArtistPlaylistInterface.h +++ b/src/libtomahawk/ArtistPlaylistInterface.h @@ -21,7 +21,7 @@ #define TOMAHAWKARTISTPLAYLISTINTERFACE_H #include -#include +#include #include "Artist.h" #include "Typedefs.h" @@ -80,7 +80,7 @@ private: Tomahawk::ModelMode m_mode; Tomahawk::collection_ptr m_collection; - QWeakPointer< Tomahawk::Artist > m_artist; + QPointer< Tomahawk::Artist > m_artist; }; }; // ns diff --git a/src/libtomahawk/FuncTimeout.cpp b/src/libtomahawk/FuncTimeout.cpp index fb4359fde..3014bc309 100644 --- a/src/libtomahawk/FuncTimeout.cpp +++ b/src/libtomahawk/FuncTimeout.cpp @@ -27,7 +27,7 @@ using namespace Tomahawk; FuncTimeout::FuncTimeout( int ms, boost::function< void() > func, QObject* besafe ) : m_func( func ) - , m_watch( QWeakPointer< QObject >( besafe ) ) + , m_watch( QPointer< QObject >( besafe ) ) { //qDebug() << Q_FUNC_INFO; QTimer::singleShot( ms, this, SLOT( exec() ) ); diff --git a/src/libtomahawk/FuncTimeout.h b/src/libtomahawk/FuncTimeout.h index 83f6f581b..93b5e025a 100644 --- a/src/libtomahawk/FuncTimeout.h +++ b/src/libtomahawk/FuncTimeout.h @@ -20,7 +20,7 @@ #define FUNCTIMEOUT_H #include -#include +#include #include "boost/function.hpp" #include "boost/bind.hpp" @@ -51,7 +51,7 @@ public slots: private: boost::function m_func; - QWeakPointer< QObject > m_watch; + QPointer< QObject > m_watch; }; }; // ns diff --git a/src/libtomahawk/GlobalActionManager.h b/src/libtomahawk/GlobalActionManager.h index 643832b5f..9da83d216 100644 --- a/src/libtomahawk/GlobalActionManager.h +++ b/src/libtomahawk/GlobalActionManager.h @@ -29,8 +29,6 @@ #include #include #include -#include - /** * Handles global actions such as parsing and creation of links, mime data handling, etc diff --git a/src/libtomahawk/LatchManager.cpp b/src/libtomahawk/LatchManager.cpp index 7ceb3594d..a329c39c6 100644 --- a/src/libtomahawk/LatchManager.cpp +++ b/src/libtomahawk/LatchManager.cpp @@ -95,7 +95,7 @@ LatchManager::playlistChanged( Tomahawk::playlistinterface_ptr ) // We're current latched, and the user changed playlist, so stop SourcePlaylistInterface* origsourcepi = dynamic_cast< SourcePlaylistInterface* >( m_latchedInterface.data() ); Q_ASSERT( origsourcepi ); - const source_ptr source = origsourcepi->source(); + const source_ptr source = SourceList::instance()->get( origsourcepi->source()->id() ); DatabaseCommand_SocialAction* cmd = new DatabaseCommand_SocialAction(); cmd->setSource( SourceList::instance()->getLocal() ); diff --git a/src/libtomahawk/Pipeline.cpp b/src/libtomahawk/Pipeline.cpp index a974a8e15..dfd7bd07b 100644 --- a/src/libtomahawk/Pipeline.cpp +++ b/src/libtomahawk/Pipeline.cpp @@ -68,7 +68,7 @@ Pipeline::~Pipeline() m_running = false; // stop script resolvers - foreach ( QWeakPointer< ExternalResolver > r, m_scriptResolvers ) + foreach ( QPointer< ExternalResolver > r, m_scriptResolvers ) if ( !r.isNull() ) r.data()->deleteLater(); @@ -141,7 +141,7 @@ Pipeline::addScriptResolver( const QString& path ) if ( !res ) continue; - m_scriptResolvers << QWeakPointer< ExternalResolver >( res ); + m_scriptResolvers << QPointer< ExternalResolver > ( res ); break; } @@ -153,7 +153,7 @@ Pipeline::addScriptResolver( const QString& path ) void Pipeline::stopScriptResolver( const QString& path ) { - foreach ( QWeakPointer< ExternalResolver > res, m_scriptResolvers ) + foreach ( QPointer< ExternalResolver > res, m_scriptResolvers ) { if ( res.data()->filePath() == path ) res.data()->stop(); @@ -164,8 +164,8 @@ Pipeline::stopScriptResolver( const QString& path ) void Pipeline::removeScriptResolver( const QString& scriptPath ) { - QWeakPointer< ExternalResolver > r; - foreach ( QWeakPointer< ExternalResolver > res, m_scriptResolvers ) + QPointer< ExternalResolver > r; + foreach ( QPointer< ExternalResolver > res, m_scriptResolvers ) { if ( res.isNull() ) continue; @@ -186,7 +186,7 @@ Pipeline::removeScriptResolver( const QString& scriptPath ) ExternalResolver* Pipeline::resolverForPath( const QString& scriptPath ) { - foreach ( QWeakPointer< ExternalResolver > res, m_scriptResolvers ) + foreach ( QPointer< ExternalResolver > res, m_scriptResolvers ) { if ( res.data()->filePath() == scriptPath ) return res.data(); diff --git a/src/libtomahawk/Pipeline.h b/src/libtomahawk/Pipeline.h index f06103bde..a1dcb7258 100644 --- a/src/libtomahawk/Pipeline.h +++ b/src/libtomahawk/Pipeline.h @@ -61,7 +61,7 @@ public: Tomahawk::ExternalResolver* addScriptResolver( const QString& scriptPath ); void stopScriptResolver( const QString& scriptPath ); void removeScriptResolver( const QString& scriptPath ); - QList< QWeakPointer< ExternalResolver > > scriptResolvers() const { return m_scriptResolvers; } + QList< QPointer< ExternalResolver > > scriptResolvers() const { return m_scriptResolvers; } Tomahawk::ExternalResolver* resolverForPath( const QString& scriptPath ); void addResolver( Resolver* r ); @@ -110,7 +110,7 @@ private: int decQIDState( const Tomahawk::query_ptr& query ); QList< Resolver* > m_resolvers; - QList< QWeakPointer > m_scriptResolvers; + QList< QPointer > m_scriptResolvers; QList< ResolverFactoryFunc > m_resolverFactories; QMap< QID, bool > m_qidsTimeout; QMap< QID, unsigned int > m_qidsState; diff --git a/src/libtomahawk/PlaylistPlaylistInterface.cpp b/src/libtomahawk/PlaylistPlaylistInterface.cpp index 7809d6915..490838d52 100644 --- a/src/libtomahawk/PlaylistPlaylistInterface.cpp +++ b/src/libtomahawk/PlaylistPlaylistInterface.cpp @@ -36,7 +36,7 @@ PlaylistPlaylistInterface::PlaylistPlaylistInterface( Tomahawk::Playlist* playli PlaylistPlaylistInterface::~PlaylistPlaylistInterface() { - m_playlist.clear(); + m_playlist = 0; } diff --git a/src/libtomahawk/PlaylistPlaylistInterface.h b/src/libtomahawk/PlaylistPlaylistInterface.h index ff0387ae3..ce5be82e5 100644 --- a/src/libtomahawk/PlaylistPlaylistInterface.h +++ b/src/libtomahawk/PlaylistPlaylistInterface.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include "Typedefs.h" #include "Result.h" @@ -66,7 +66,7 @@ private: PlaylistPlaylistInterface(); Q_DISABLE_COPY( PlaylistPlaylistInterface ) - QWeakPointer< Tomahawk::Playlist > m_playlist; + QPointer< Tomahawk::Playlist > m_playlist; result_ptr m_currentItem; }; diff --git a/src/libtomahawk/Query.cpp b/src/libtomahawk/Query.cpp index 47e5852fc..62dcc9ee6 100644 --- a/src/libtomahawk/Query.cpp +++ b/src/libtomahawk/Query.cpp @@ -389,7 +389,7 @@ Query::currentResolver() const int x = m_resolvers.count(); while ( --x ) { - QWeakPointer< Resolver > r = m_resolvers.at( x ); + QPointer< Resolver > r = m_resolvers.at( x ); if ( r.isNull() ) continue; diff --git a/src/libtomahawk/Query.h b/src/libtomahawk/Query.h index dc9899ed2..956152c47 100644 --- a/src/libtomahawk/Query.h +++ b/src/libtomahawk/Query.h @@ -111,7 +111,7 @@ public: QPair< Tomahawk::source_ptr, unsigned int > playedBy() const; Tomahawk::Resolver* currentResolver() const; - QList< QWeakPointer< Tomahawk::Resolver > > resolvedBy() const { return m_resolvers; } + QList< QPointer< Tomahawk::Resolver > > resolvedBy() const { return m_resolvers; } void setArtist( const QString& artist ) { m_artist = artist; updateSortNames(); } void setComposer( const QString& composer ) { m_composer = composer; updateSortNames(); } @@ -255,7 +255,7 @@ private: mutable Tomahawk::album_ptr m_albumPtr; QPair< Tomahawk::source_ptr, unsigned int > m_playedBy; - QList< QWeakPointer< Tomahawk::Resolver > > m_resolvers; + QList< QPointer< Tomahawk::Resolver > > m_resolvers; bool m_saveResultHint; diff --git a/src/libtomahawk/Result.cpp b/src/libtomahawk/Result.cpp index dfd2cbd78..d4c08e7a6 100644 --- a/src/libtomahawk/Result.cpp +++ b/src/libtomahawk/Result.cpp @@ -117,7 +117,7 @@ Result::onResolverRemoved( Tomahawk::Resolver* resolver ) { if ( m_resolvedBy.data() == resolver ) { - m_resolvedBy.clear(); + m_resolvedBy = 0; emit statusChanged(); } } @@ -384,7 +384,7 @@ Result::resolvedBy() const void Result::setResolvedBy( Tomahawk::Resolver* resolver ) { - m_resolvedBy = QWeakPointer< Tomahawk::Resolver >( resolver ); + m_resolvedBy = QPointer< Tomahawk::Resolver >( resolver ); } diff --git a/src/libtomahawk/Result.h b/src/libtomahawk/Result.h index 3a5143017..18c96632b 100644 --- a/src/libtomahawk/Result.h +++ b/src/libtomahawk/Result.h @@ -141,7 +141,7 @@ private: mutable RID m_rid; collection_ptr m_collection; Tomahawk::query_ptr m_query; - QWeakPointer< Tomahawk::Resolver > m_resolvedBy; + QPointer< Tomahawk::Resolver > m_resolvedBy; Tomahawk::artist_ptr m_artist; Tomahawk::album_ptr m_album; diff --git a/src/libtomahawk/SourcePlaylistInterface.cpp b/src/libtomahawk/SourcePlaylistInterface.cpp index 444ab1d22..1688a6cab 100644 --- a/src/libtomahawk/SourcePlaylistInterface.cpp +++ b/src/libtomahawk/SourcePlaylistInterface.cpp @@ -46,7 +46,7 @@ SourcePlaylistInterface::SourcePlaylistInterface( Tomahawk::Source* source, Toma SourcePlaylistInterface::~SourcePlaylistInterface() { - m_source.clear(); + m_source = 0; } @@ -146,7 +146,7 @@ SourcePlaylistInterface::tracks() const } -QWeakPointer< Tomahawk::Source > +QPointer< Tomahawk::Source > SourcePlaylistInterface::source() const { return m_source; diff --git a/src/libtomahawk/SourcePlaylistInterface.h b/src/libtomahawk/SourcePlaylistInterface.h index 4d0193afe..38fb20cad 100644 --- a/src/libtomahawk/SourcePlaylistInterface.h +++ b/src/libtomahawk/SourcePlaylistInterface.h @@ -21,7 +21,7 @@ #define TOMAHAWKSOURCEPLAYLISTINTERFACE_H #include -#include +#include #include "Typedefs.h" #include "PlaylistInterface.h" @@ -65,7 +65,7 @@ public: virtual bool shuffled() const { return false; } - virtual QWeakPointer< Tomahawk::Source > source() const; + virtual QPointer< Tomahawk::Source > source() const; virtual void reset(); @@ -79,7 +79,7 @@ private slots: void resolvingFinished( bool hasResults ); private: - QWeakPointer< Tomahawk::Source > m_source; + QPointer< Tomahawk::Source > m_source; mutable Tomahawk::result_ptr m_currentItem; mutable bool m_gotNextItem; }; diff --git a/src/libtomahawk/Typedefs.h b/src/libtomahawk/Typedefs.h index 763ae8d32..ebccd41fb 100644 --- a/src/libtomahawk/Typedefs.h +++ b/src/libtomahawk/Typedefs.h @@ -21,9 +21,11 @@ #define TYPEDEFS_H #include +#include #include #include #include + #include //template class QSharedPointer; @@ -203,7 +205,7 @@ namespace Tomahawk typedef QHash< QString, QString > InfoStringHash; typedef QPair< QVariantMap, QVariant > PushInfoPair; - typedef QWeakPointer< InfoPlugin > InfoPluginPtr; + typedef QPointer< InfoPlugin > InfoPluginPtr; } }; // ns diff --git a/src/libtomahawk/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp index 387f9eb53..9356e8697 100644 --- a/src/libtomahawk/ViewManager.cpp +++ b/src/libtomahawk/ViewManager.cpp @@ -739,7 +739,7 @@ ViewManager::currentPage() const Tomahawk::playlist_ptr ViewManager::playlistForInterface( Tomahawk::playlistinterface_ptr interface ) const { - foreach ( QWeakPointer view, m_playlistViews.values() ) + foreach ( QPointer view, m_playlistViews.values() ) { if ( !view.isNull() && view.data()->playlistInterface() == interface ) { @@ -754,7 +754,7 @@ ViewManager::playlistForInterface( Tomahawk::playlistinterface_ptr interface ) c Tomahawk::dynplaylist_ptr ViewManager::dynamicPlaylistForInterface( Tomahawk::playlistinterface_ptr interface ) const { - foreach ( QWeakPointer view, m_dynamicWidgets.values() ) + foreach ( QPointer view, m_dynamicWidgets.values() ) { if ( !view.isNull() && view.data()->playlistInterface() == interface ) { diff --git a/src/libtomahawk/ViewManager.h b/src/libtomahawk/ViewManager.h index d42c25b34..d8466a601 100644 --- a/src/libtomahawk/ViewManager.h +++ b/src/libtomahawk/ViewManager.h @@ -188,13 +188,13 @@ private: QList< Tomahawk::collection_ptr > m_superCollections; - QHash< Tomahawk::dynplaylist_ptr, QWeakPointer > m_dynamicWidgets; - QHash< Tomahawk::collection_ptr, QWeakPointer > m_treeViews; - QHash< Tomahawk::artist_ptr, QWeakPointer > m_artistViews; - QHash< Tomahawk::album_ptr, QWeakPointer > m_albumViews; - QHash< Tomahawk::query_ptr, QWeakPointer > m_trackViews; - QHash< Tomahawk::playlist_ptr, QWeakPointer > m_playlistViews; - QHash< Tomahawk::source_ptr, QWeakPointer > m_sourceViews; + QHash< Tomahawk::dynplaylist_ptr, QPointer > m_dynamicWidgets; + QHash< Tomahawk::collection_ptr, QPointer > m_treeViews; + QHash< Tomahawk::artist_ptr, QPointer > m_artistViews; + QHash< Tomahawk::album_ptr, QPointer > m_albumViews; + QHash< Tomahawk::query_ptr, QPointer > m_trackViews; + QHash< Tomahawk::playlist_ptr, QPointer > m_playlistViews; + QHash< Tomahawk::source_ptr, QPointer > m_sourceViews; QList m_pageHistoryBack; QList m_pageHistoryFwd; diff --git a/src/libtomahawk/accounts/ResolverAccount.cpp b/src/libtomahawk/accounts/ResolverAccount.cpp index 26b38eea3..caf25c4eb 100644 --- a/src/libtomahawk/accounts/ResolverAccount.cpp +++ b/src/libtomahawk/accounts/ResolverAccount.cpp @@ -127,7 +127,7 @@ ResolverAccount::hookupResolver() { tDebug() << "Hooking up resolver:" << configuration().value( "path" ).toString() << enabled(); - m_resolver = QWeakPointer< ExternalResolverGui >( qobject_cast< ExternalResolverGui* >( Pipeline::instance()->addScriptResolver( configuration().value( "path" ).toString() ) ) ); + m_resolver = QPointer< ExternalResolverGui >( qobject_cast< ExternalResolverGui* >( Pipeline::instance()->addScriptResolver( configuration().value( "path" ).toString() ) ) ); connect( m_resolver.data(), SIGNAL( changed() ), this, SLOT( resolverChanged() ) ); // What resolver do we have here? Should only be types that are 'real' resolvers diff --git a/src/libtomahawk/accounts/ResolverAccount.h b/src/libtomahawk/accounts/ResolverAccount.h index e977931f5..83b005c76 100644 --- a/src/libtomahawk/accounts/ResolverAccount.h +++ b/src/libtomahawk/accounts/ResolverAccount.h @@ -22,6 +22,8 @@ #include "accounts/Account.h" #include "DllMacro.h" +#include + namespace Tomahawk { class ExternalResolverGui; @@ -93,7 +95,7 @@ protected: void hookupResolver(); - QWeakPointer m_resolver; + QPointer m_resolver; private: void init( const QString& path ); diff --git a/src/libtomahawk/accounts/lastfm/LastFmAccount.cpp b/src/libtomahawk/accounts/lastfm/LastFmAccount.cpp index 5712d692c..54d1cad93 100644 --- a/src/libtomahawk/accounts/lastfm/LastFmAccount.cpp +++ b/src/libtomahawk/accounts/lastfm/LastFmAccount.cpp @@ -141,7 +141,7 @@ QWidget* LastFmAccount::configurationWidget() { if ( m_configWidget.isNull() ) - m_configWidget = QWeakPointer( new LastFmConfig( this ) ); + m_configWidget = QPointer( new LastFmConfig( this ) ); return m_configWidget.data(); } @@ -165,7 +165,7 @@ InfoPluginPtr LastFmAccount::infoPlugin() { if ( m_infoPlugin.isNull() ) - m_infoPlugin = QWeakPointer< LastFmInfoPlugin >( new LastFmInfoPlugin( this ) ); + m_infoPlugin = QPointer< LastFmInfoPlugin >( new LastFmInfoPlugin( this ) ); return InfoPluginPtr( m_infoPlugin.data() ); } @@ -286,7 +286,7 @@ LastFmAccount::hookupResolver() const AtticaManager::Resolver data = AtticaManager::instance()->resolverData( res.id() ); - m_resolver = QWeakPointer< ExternalResolverGui >( qobject_cast< ExternalResolverGui* >( Pipeline::instance()->addScriptResolver( data.scriptPath ) ) ); + m_resolver = QPointer< ExternalResolverGui >( qobject_cast< ExternalResolverGui* >( Pipeline::instance()->addScriptResolver( data.scriptPath ) ) ); connect( m_resolver.data(), SIGNAL( changed() ), this, SLOT( resolverChanged() ) ); } diff --git a/src/libtomahawk/accounts/lastfm/LastFmAccount.h b/src/libtomahawk/accounts/lastfm/LastFmAccount.h index 2be052cb0..50d9fe8f0 100644 --- a/src/libtomahawk/accounts/lastfm/LastFmAccount.h +++ b/src/libtomahawk/accounts/lastfm/LastFmAccount.h @@ -104,9 +104,9 @@ private slots: private: void hookupResolver(); - QWeakPointer m_resolver; - QWeakPointer m_infoPlugin; - QWeakPointer m_configWidget; + QPointer m_resolver; + QPointer m_infoPlugin; + QPointer m_configWidget; }; } diff --git a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h index a6bce22c2..3df617da6 100644 --- a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h +++ b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h @@ -87,7 +87,7 @@ private: void dataError( Tomahawk::InfoSystem::InfoRequestData requestData ); - QWeakPointer< Accounts::LastFmAccount > m_account; + QPointer< Accounts::LastFmAccount > m_account; QList parseTrackList( QNetworkReply* reply ); lastfm::MutableTrack m_track; diff --git a/src/libtomahawk/accounts/spotify/SpotifyAccount.cpp b/src/libtomahawk/accounts/spotify/SpotifyAccount.cpp index 99701a764..08c530882 100644 --- a/src/libtomahawk/accounts/spotify/SpotifyAccount.cpp +++ b/src/libtomahawk/accounts/spotify/SpotifyAccount.cpp @@ -217,7 +217,7 @@ SpotifyAccount::hookupResolver() // Since the resolver in 0.4.x used an incompatible version of kdsingleappguard, we can't auto-kill old resolvers on the // 0.4.x->0.5.x upgrade. So we do it manually for a while killExistingResolvers(); - m_spotifyResolver = QWeakPointer< ScriptResolver >( qobject_cast< ScriptResolver* >( Pipeline::instance()->addScriptResolver( path ) ) ); + m_spotifyResolver = QPointer< ScriptResolver >( qobject_cast< ScriptResolver* >( Pipeline::instance()->addScriptResolver( path ) ) ); m_spotifyResolver.data()->setIcon( TomahawkUtils::defaultPixmap( TomahawkUtils::SpotifyIcon ) ); connect( m_spotifyResolver.data(), SIGNAL( changed() ), this, SLOT( resolverChanged() ) ); @@ -352,7 +352,7 @@ SpotifyAccount::infoPlugin() { if ( m_infoPlugin.isNull() ) { - m_infoPlugin = QWeakPointer< InfoSystem::SpotifyInfoPlugin >( new InfoSystem::SpotifyInfoPlugin( this ) ); + m_infoPlugin = QPointer< InfoSystem::SpotifyInfoPlugin >( new InfoSystem::SpotifyInfoPlugin( this ) ); } return InfoSystem::InfoPluginPtr( m_infoPlugin.data() ); @@ -1112,7 +1112,7 @@ SpotifyAccount::configurationWidget() { if ( m_configWidget.isNull() ) { - m_configWidget = QWeakPointer< SpotifyAccountConfig >( new SpotifyAccountConfig( this ) ); + m_configWidget = QPointer< SpotifyAccountConfig >( new SpotifyAccountConfig( this ) ); connect( m_configWidget.data(), SIGNAL( login( QString,QString ) ), this, SLOT( login( QString,QString ) ) ); connect( m_configWidget.data(), SIGNAL( logout() ), this, SLOT( logout() ) ); m_configWidget.data()->setPlaylists( m_allSpotifyPlaylists.values() ); @@ -1141,7 +1141,7 @@ SpotifyAccount::aboutWidget() l->addWidget( pm ); l->addWidget( text ); w->setLayout( l ); - m_aboutWidget = QWeakPointer< QWidget >( w ); + m_aboutWidget = QPointer< QWidget >( w ); } return m_aboutWidget.data(); diff --git a/src/libtomahawk/accounts/spotify/SpotifyAccount.h b/src/libtomahawk/accounts/spotify/SpotifyAccount.h index 59527afe2..0e2f7041a 100644 --- a/src/libtomahawk/accounts/spotify/SpotifyAccount.h +++ b/src/libtomahawk/accounts/spotify/SpotifyAccount.h @@ -163,10 +163,10 @@ private: SpotifyPlaylistUpdater* getPlaylistUpdater( QObject* sender ); static SpotifyAccount* s_instance; - QWeakPointer m_configWidget; - QWeakPointer m_aboutWidget; - QWeakPointer m_spotifyResolver; - QWeakPointer< InfoSystem::SpotifyInfoPlugin > m_infoPlugin; + QPointer m_configWidget; + QPointer m_aboutWidget; + QPointer m_spotifyResolver; + QPointer< InfoSystem::SpotifyInfoPlugin > m_infoPlugin; QMap > m_qidToSlotMap; QMap m_qidToExtraData; diff --git a/src/libtomahawk/accounts/spotify/SpotifyInfoPlugin.cpp b/src/libtomahawk/accounts/spotify/SpotifyInfoPlugin.cpp index 60872a9cc..150a19ffc 100644 --- a/src/libtomahawk/accounts/spotify/SpotifyInfoPlugin.cpp +++ b/src/libtomahawk/accounts/spotify/SpotifyInfoPlugin.cpp @@ -22,13 +22,14 @@ #include "utils/Closure.h" #include "utils/Logger.h" + using namespace Tomahawk; using namespace Tomahawk::InfoSystem; SpotifyInfoPlugin::SpotifyInfoPlugin( Accounts::SpotifyAccount* account ) : InfoPlugin() - , m_account( QWeakPointer< Accounts::SpotifyAccount >( account ) ) + , m_account( QPointer< Accounts::SpotifyAccount >( account ) ) { if ( !m_account.isNull() ) { diff --git a/src/libtomahawk/accounts/spotify/SpotifyInfoPlugin.h b/src/libtomahawk/accounts/spotify/SpotifyInfoPlugin.h index 26757cac2..4383df5b1 100644 --- a/src/libtomahawk/accounts/spotify/SpotifyInfoPlugin.h +++ b/src/libtomahawk/accounts/spotify/SpotifyInfoPlugin.h @@ -22,7 +22,7 @@ #include "infosystem/InfoSystem.h" #include "DllMacro.h" -#include +#include class QNetworkReply; @@ -62,7 +62,8 @@ private: void dataError( InfoRequestData ); void trackListResult( const QStringList& trackNameList, const Tomahawk::InfoSystem::InfoRequestData& requestData ); void sendLoveSong( const InfoType type, QVariant input ); - QWeakPointer< Tomahawk::Accounts::SpotifyAccount > m_account; + + QPointer< Tomahawk::Accounts::SpotifyAccount > m_account; }; } diff --git a/src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.h b/src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.h index bcd7c7f36..df1320a3d 100644 --- a/src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.h +++ b/src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.h @@ -109,7 +109,7 @@ private: static QVariant queryToVariant( const Tomahawk::query_ptr& query ); static QList< Tomahawk::query_ptr > variantToQueries( const QVariantList& list ); - QWeakPointer m_spotify; + QPointer m_spotify; QString m_latestRev, m_spotifyId; QList< Tomahawk::plentry_ptr > m_waitingForIds; @@ -137,7 +137,7 @@ public: virtual QString type() const { return "spotify"; } private: - QWeakPointer m_account; + QPointer m_account; }; #endif // SPOTIFYPLAYLISTUPDATER_H diff --git a/src/libtomahawk/database/Database.cpp b/src/libtomahawk/database/Database.cpp index a73072473..016702bfd 100644 --- a/src/libtomahawk/database/Database.cpp +++ b/src/libtomahawk/database/Database.cpp @@ -64,7 +64,7 @@ Database::Database( const QString& dbname, QObject* parent ) while ( m_workerThreads.count() < m_maxConcurrentThreads ) { - QWeakPointer< DatabaseWorkerThread > workerThread( new DatabaseWorkerThread( this, false ) ); + QPointer< DatabaseWorkerThread > workerThread( new DatabaseWorkerThread( this, false ) ); Q_ASSERT( workerThread ); workerThread.data()->start(); m_workerThreads << workerThread; @@ -82,7 +82,7 @@ Database::~Database() if ( m_workerRW ) m_workerRW.data()->quit(); - foreach ( QWeakPointer< DatabaseWorkerThread > workerThread, m_workerThreads ) + foreach ( QPointer< DatabaseWorkerThread > workerThread, m_workerThreads ) { if ( workerThread && workerThread.data()->worker() ) workerThread.data()->quit(); @@ -93,7 +93,7 @@ Database::~Database() m_workerRW.data()->wait( 60000 ); delete m_workerRW.data(); } - foreach ( QWeakPointer< DatabaseWorkerThread > workerThread, m_workerThreads ) + foreach ( QPointer< DatabaseWorkerThread > workerThread, m_workerThreads ) { if ( workerThread ) { @@ -140,8 +140,8 @@ Database::enqueue( const QSharedPointer& lc ) { // find thread for commandname with lowest amount of outstanding jobs and enqueue job int busyThreads = 0; - QWeakPointer< DatabaseWorkerThread > workerThread; - QWeakPointer< DatabaseWorker > happyWorker; + QPointer< DatabaseWorkerThread > workerThread; + QPointer< DatabaseWorker > happyWorker; for ( int i = 0; i < m_workerThreads.count(); i++ ) { workerThread = m_workerThreads.at( i ); diff --git a/src/libtomahawk/database/Database.h b/src/libtomahawk/database/Database.h index f499e8b98..73b2ea368 100644 --- a/src/libtomahawk/database/Database.h +++ b/src/libtomahawk/database/Database.h @@ -77,8 +77,8 @@ private: bool m_ready; DatabaseImpl* m_impl; - QWeakPointer< DatabaseWorkerThread > m_workerRW; - QList< QWeakPointer< DatabaseWorkerThread > > m_workerThreads; + QPointer< DatabaseWorkerThread > m_workerRW; + QList< QPointer< DatabaseWorkerThread > > m_workerThreads; IdThreadWorker* m_idWorker; int m_maxConcurrentThreads; diff --git a/src/libtomahawk/database/DatabaseCommand_UpdateSearchIndex.h b/src/libtomahawk/database/DatabaseCommand_UpdateSearchIndex.h index 6353aeffb..90537b998 100644 --- a/src/libtomahawk/database/DatabaseCommand_UpdateSearchIndex.h +++ b/src/libtomahawk/database/DatabaseCommand_UpdateSearchIndex.h @@ -21,6 +21,7 @@ #include "DatabaseCommand.h" #include "DllMacro.h" +#include class IndexingJobItem; @@ -36,7 +37,7 @@ public: virtual void exec( DatabaseImpl* db ); private: - QWeakPointer m_statusJob; + QPointer m_statusJob; }; #endif // DATABASECOMMAND_UPDATESEARCHINDEX_H diff --git a/src/libtomahawk/database/DatabaseWorker.cpp b/src/libtomahawk/database/DatabaseWorker.cpp index 48fee65b9..0e9c01044 100644 --- a/src/libtomahawk/database/DatabaseWorker.cpp +++ b/src/libtomahawk/database/DatabaseWorker.cpp @@ -47,8 +47,8 @@ void DatabaseWorkerThread::run() { tDebug() << Q_FUNC_INFO << "DatabaseWorkerThread starting..."; - m_worker = QWeakPointer< DatabaseWorker >( new DatabaseWorker( m_db, m_mutates ) ); - exec(); + m_worker = QPointer< DatabaseWorker >( new DatabaseWorker( m_db, m_mutates ) ); + exec(); tDebug() << Q_FUNC_INFO << "DatabaseWorkerThread finishing..."; if ( m_worker ) delete m_worker.data(); @@ -60,7 +60,7 @@ DatabaseWorkerThread::~DatabaseWorkerThread() } -QWeakPointer< DatabaseWorker > +QPointer< DatabaseWorker > DatabaseWorkerThread::worker() const { return m_worker; diff --git a/src/libtomahawk/database/DatabaseWorker.h b/src/libtomahawk/database/DatabaseWorker.h index cccfddf58..6f2caf12d 100644 --- a/src/libtomahawk/database/DatabaseWorker.h +++ b/src/libtomahawk/database/DatabaseWorker.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include @@ -71,13 +71,13 @@ public: DatabaseWorkerThread( Database* db, bool mutates ); ~DatabaseWorkerThread(); - QWeakPointer< DatabaseWorker > worker() const; - + QPointer< DatabaseWorker > worker() const; + protected: void run(); private: - QWeakPointer< DatabaseWorker > m_worker; + QPointer< DatabaseWorker > m_worker; Database* m_db; bool m_mutates; }; diff --git a/src/libtomahawk/filemetadata/MusicScanner.cpp b/src/libtomahawk/filemetadata/MusicScanner.cpp index 2a2fd65e3..5f90dfcbb 100644 --- a/src/libtomahawk/filemetadata/MusicScanner.cpp +++ b/src/libtomahawk/filemetadata/MusicScanner.cpp @@ -184,7 +184,7 @@ MusicScanner::scan() m_dirListerThreadController = new QThread( this ); - m_dirLister = QWeakPointer< DirLister >( new DirLister( m_paths ) ); + m_dirLister = QPointer< DirLister >( new DirLister( m_paths ) ); m_dirLister.data()->moveToThread( m_dirListerThreadController ); connect( m_dirLister.data(), SIGNAL( fileToScan( QFileInfo ) ), diff --git a/src/libtomahawk/filemetadata/MusicScanner.h b/src/libtomahawk/filemetadata/MusicScanner.h index 7c95f79ec..029d52852 100644 --- a/src/libtomahawk/filemetadata/MusicScanner.h +++ b/src/libtomahawk/filemetadata/MusicScanner.h @@ -37,7 +37,6 @@ #include #include #include -#include #include // descend dir tree comparing dir mtimes to last known mtime @@ -109,7 +108,7 @@ private slots: private: void scanFilePaths(); - + ScanManager::ScanMode m_scanMode; QStringList m_paths; QMap m_ext2mime; // eg: mp3 -> audio/mpeg @@ -125,7 +124,7 @@ private: QVariantList m_filesToDelete; quint32 m_batchsize; - QWeakPointer< DirLister > m_dirLister; + QPointer< DirLister > m_dirLister; QThread* m_dirListerThreadController; }; diff --git a/src/libtomahawk/filemetadata/ScanManager.cpp b/src/libtomahawk/filemetadata/ScanManager.cpp index ec0f3ae28..4feeaf55f 100644 --- a/src/libtomahawk/filemetadata/ScanManager.cpp +++ b/src/libtomahawk/filemetadata/ScanManager.cpp @@ -255,7 +255,7 @@ ScanManager::runScan() if ( m_musicScannerThreadController && m_scanner.isNull() ) { - m_scanner = QWeakPointer< MusicScanner >( new MusicScanner( m_currScanMode, paths ) ); + m_scanner = QPointer< MusicScanner >( new MusicScanner( m_currScanMode, paths ) ); m_scanner.data()->moveToThread( m_musicScannerThreadController ); connect( m_scanner.data(), SIGNAL( finished() ), SLOT( scannerFinished() ) ); m_musicScannerThreadController->start( QThread::IdlePriority ); diff --git a/src/libtomahawk/filemetadata/ScanManager.h b/src/libtomahawk/filemetadata/ScanManager.h index 1c4a5105d..564b64f8d 100644 --- a/src/libtomahawk/filemetadata/ScanManager.h +++ b/src/libtomahawk/filemetadata/ScanManager.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include class MusicScanner; @@ -72,7 +72,7 @@ private: static ScanManager* s_instance; ScanMode m_currScanMode; - QWeakPointer< MusicScanner > m_scanner; + QPointer< MusicScanner > m_scanner; QThread* m_musicScannerThreadController; QSet< QString > m_currScannerPaths; QStringList m_cachedScannerDirs; diff --git a/src/libtomahawk/infosystem/InfoSystem.cpp b/src/libtomahawk/infosystem/InfoSystem.cpp index af5a06b25..dcfd8aa2f 100644 --- a/src/libtomahawk/infosystem/InfoSystem.cpp +++ b/src/libtomahawk/infosystem/InfoSystem.cpp @@ -294,13 +294,13 @@ InfoSystem::removeInfoPlugin( Tomahawk::InfoSystem::InfoPluginPtr plugin ) } -QWeakPointer< QThread > +QPointer< QThread > InfoSystem::workerThread() const { if ( m_infoSystemWorkerThreadController->isRunning() && m_infoSystemWorkerThreadController->worker() ) - return QWeakPointer< QThread >( m_infoSystemWorkerThreadController->worker()->thread() ); + return QPointer< QThread >( m_infoSystemWorkerThreadController->worker()->thread() ); - return QWeakPointer< QThread >(); + return QPointer< QThread >(); } @@ -320,7 +320,7 @@ InfoSystemCacheThread::~InfoSystemCacheThread() void InfoSystemCacheThread::InfoSystemCacheThread::run() { - m_cache = QWeakPointer< InfoSystemCache >( new InfoSystemCache() ); + m_cache = QPointer< InfoSystemCache >( new InfoSystemCache() ); exec(); if ( !m_cache.isNull() ) delete m_cache.data(); @@ -350,7 +350,7 @@ InfoSystemWorkerThread::~InfoSystemWorkerThread() void InfoSystemWorkerThread::InfoSystemWorkerThread::run() { - m_worker = QWeakPointer< InfoSystemWorker >( new InfoSystemWorker() ); + m_worker = QPointer< InfoSystemWorker >( new InfoSystemWorker() ); exec(); if( !m_worker.isNull() ) delete m_worker.data(); diff --git a/src/libtomahawk/infosystem/InfoSystem.h b/src/libtomahawk/infosystem/InfoSystem.h index b5376c798..08fa9cf7b 100644 --- a/src/libtomahawk/infosystem/InfoSystem.h +++ b/src/libtomahawk/infosystem/InfoSystem.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -153,7 +153,7 @@ public: InfoSystemCache* cache() const; private: - QWeakPointer< InfoSystemCache > m_cache; + QPointer< InfoSystemCache > m_cache; }; @@ -169,7 +169,7 @@ public: InfoSystemWorker* worker() const; private: - QWeakPointer< InfoSystemWorker > m_worker; + QPointer< InfoSystemWorker > m_worker; }; @@ -189,7 +189,7 @@ public: bool pushInfo( InfoPushData pushData ); bool pushInfo( const QString &caller, const InfoTypeMap &input, const PushInfoFlags pushFlags ); - QWeakPointer< QThread > workerThread() const; + QPointer< QThread > workerThread() const; public slots: // InfoSystem takes ownership of InfoPlugins diff --git a/src/libtomahawk/infosystem/InfoSystemWorker.h b/src/libtomahawk/infosystem/InfoSystemWorker.h index 930f0d2e4..e19bd0179 100644 --- a/src/libtomahawk/infosystem/InfoSystemWorker.h +++ b/src/libtomahawk/infosystem/InfoSystemWorker.h @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/src/libtomahawk/jobview/LatchedStatusItem.cpp b/src/libtomahawk/jobview/LatchedStatusItem.cpp index c87e58632..3759cd730 100644 --- a/src/libtomahawk/jobview/LatchedStatusItem.cpp +++ b/src/libtomahawk/jobview/LatchedStatusItem.cpp @@ -92,7 +92,7 @@ LatchedStatusManager::sourceOffline() if ( m_jobs.contains( s->userName() ) ) { - QWeakPointer< LatchedStatusItem> job = m_jobs.take( s->userName() ).data(); + QPointer< LatchedStatusItem> job = m_jobs.take( s->userName() ).data(); if ( !job.isNull() ) job.data()->stop(); } @@ -107,7 +107,7 @@ LatchedStatusManager::latchedOff( const Tomahawk::source_ptr& from, const Tomaha if ( to->isLocal() && m_jobs.contains( from->userName() ) ) { - QWeakPointer< LatchedStatusItem > item = m_jobs.take( from->userName() ); + QPointer< LatchedStatusItem > item = m_jobs.take( from->userName() ); if ( !item.isNull() ) item.data()->stop(); } diff --git a/src/libtomahawk/jobview/LatchedStatusItem.h b/src/libtomahawk/jobview/LatchedStatusItem.h index 5d6560007..3509e2466 100644 --- a/src/libtomahawk/jobview/LatchedStatusItem.h +++ b/src/libtomahawk/jobview/LatchedStatusItem.h @@ -61,7 +61,7 @@ private slots: void sourceOffline(); private: - QHash< QString, QWeakPointer< LatchedStatusItem > > m_jobs; + QHash< QString, QPointer< LatchedStatusItem > > m_jobs; }; #endif // LATCHEDSTATUSITEM_H diff --git a/src/libtomahawk/jobview/PipelineStatusItem.cpp b/src/libtomahawk/jobview/PipelineStatusItem.cpp index d343e88b4..874e7d318 100644 --- a/src/libtomahawk/jobview/PipelineStatusItem.cpp +++ b/src/libtomahawk/jobview/PipelineStatusItem.cpp @@ -101,7 +101,7 @@ PipelineStatusManager::resolving( const Tomahawk::query_ptr& p ) if ( m_curItem.isNull() ) { // No current query item and we're resolving something, so show it - m_curItem = QWeakPointer< PipelineStatusItem >( new PipelineStatusItem( p ) ); + m_curItem = QPointer< PipelineStatusItem >( new PipelineStatusItem( p ) ); JobStatusView::instance()->model()->addJob( m_curItem.data() ); } } diff --git a/src/libtomahawk/jobview/PipelineStatusItem.h b/src/libtomahawk/jobview/PipelineStatusItem.h index 5a37a5d77..75ebef348 100644 --- a/src/libtomahawk/jobview/PipelineStatusItem.h +++ b/src/libtomahawk/jobview/PipelineStatusItem.h @@ -23,6 +23,7 @@ #include "Query.h" #include +#include class PipelineStatusItem : public JobStatusItem { @@ -58,7 +59,7 @@ private slots: void resolving( const Tomahawk::query_ptr& p ); private: - QWeakPointer m_curItem; + QPointer m_curItem; }; diff --git a/src/libtomahawk/jobview/TransferStatusItem.cpp b/src/libtomahawk/jobview/TransferStatusItem.cpp index ea6fa319d..0bb9f5ef8 100644 --- a/src/libtomahawk/jobview/TransferStatusItem.cpp +++ b/src/libtomahawk/jobview/TransferStatusItem.cpp @@ -30,7 +30,7 @@ TransferStatusItem::TransferStatusItem( TransferStatusManager* p, StreamConnection* sc ) : m_parent( p ) - , m_stream( QWeakPointer< StreamConnection >( sc ) ) + , m_stream( QPointer< StreamConnection >( sc ) ) { if ( m_stream.data()->type() == StreamConnection::RECEIVING ) m_type = "receive"; diff --git a/src/libtomahawk/jobview/TransferStatusItem.h b/src/libtomahawk/jobview/TransferStatusItem.h index 4b916a72b..ecbb652d6 100644 --- a/src/libtomahawk/jobview/TransferStatusItem.h +++ b/src/libtomahawk/jobview/TransferStatusItem.h @@ -22,6 +22,8 @@ #include "JobStatusItem.h" #include +#include + class StreamConnection; @@ -58,7 +60,7 @@ private slots: private: TransferStatusManager* m_parent; QString m_type, m_main, m_right; - QWeakPointer< StreamConnection > m_stream; + QPointer< StreamConnection > m_stream; }; #endif // TRANSFERSTATUSITEM_H diff --git a/src/libtomahawk/network/PortFwdThread.cpp b/src/libtomahawk/network/PortFwdThread.cpp index c42cf0ad5..e1fcfbaf1 100644 --- a/src/libtomahawk/network/PortFwdThread.cpp +++ b/src/libtomahawk/network/PortFwdThread.cpp @@ -45,7 +45,7 @@ PortFwdThread::~PortFwdThread() void PortFwdThread::run() { - m_worker = QWeakPointer< PortFwdWorker >( new PortFwdWorker( m_port ) ); + m_worker = QPointer< PortFwdWorker >( new PortFwdWorker( m_port ) ); Q_ASSERT( m_worker ); connect( m_worker.data(), SIGNAL( externalAddressDetected( QHostAddress, unsigned int ) ), this, SIGNAL( externalAddressDetected( QHostAddress, unsigned int ) ) ); QTimer::singleShot( 0, m_worker.data(), SLOT( work() ) ); @@ -62,7 +62,7 @@ PortFwdThread::run() } -QWeakPointer< PortFwdWorker > +QPointer< PortFwdWorker > PortFwdThread::worker() const { return m_worker; diff --git a/src/libtomahawk/network/PortFwdThread.h b/src/libtomahawk/network/PortFwdThread.h index 093065ff7..cbcdb1e17 100644 --- a/src/libtomahawk/network/PortFwdThread.h +++ b/src/libtomahawk/network/PortFwdThread.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include class Portfwd; @@ -59,7 +59,7 @@ public: explicit PortFwdThread( unsigned int port ); ~PortFwdThread(); - QWeakPointer< PortFwdWorker > worker() const; + QPointer< PortFwdWorker > worker() const; signals: void externalAddressDetected( QHostAddress ha, unsigned int port ); @@ -68,7 +68,7 @@ protected: void run(); private: - QWeakPointer< PortFwdWorker > m_worker; + QPointer< PortFwdWorker > m_worker; unsigned int m_port; }; diff --git a/src/libtomahawk/network/Servent.cpp b/src/libtomahawk/network/Servent.cpp index 148f0c173..48ec76f26 100644 --- a/src/libtomahawk/network/Servent.cpp +++ b/src/libtomahawk/network/Servent.cpp @@ -150,7 +150,7 @@ Servent::startListening( QHostAddress ha, bool upnp, int port ) } // TODO check if we have a public/internet IP on this machine directly tLog() << "External address mode set to upnp..."; - m_portfwd = QWeakPointer< PortFwdThread >( new PortFwdThread( m_port ) ); + m_portfwd = QPointer< PortFwdThread >( new PortFwdThread( m_port ) ); Q_ASSERT( m_portfwd ); connect( m_portfwd.data(), SIGNAL( externalAddressDetected( QHostAddress, unsigned int ) ), SLOT( setExternalAddress( QHostAddress, unsigned int ) ) ); @@ -243,7 +243,7 @@ Servent::setExternalAddress( QHostAddress ha, unsigned int port ) void Servent::registerOffer( const QString& key, Connection* conn ) { - m_offers[key] = QWeakPointer(conn); + m_offers[key] = QPointer(conn); } @@ -304,7 +304,7 @@ void Servent::readyRead() { Q_ASSERT( this->thread() == QThread::currentThread() ); - QWeakPointer< QTcpSocketExtra > sock = (QTcpSocketExtra*)sender(); + QPointer< QTcpSocketExtra > sock = (QTcpSocketExtra*)sender(); if( sock.isNull() || sock.data()->_disowned ) { @@ -667,7 +667,7 @@ Servent::claimOffer( ControlConnection* cc, const QString &nodeid, const QString if( m_offers.contains( key ) ) { - QWeakPointer conn = m_offers.value( key ); + QPointer conn = m_offers.value( key ); if( conn.isNull() ) { // This can happen if it's a streamconnection, but the audioengine has diff --git a/src/libtomahawk/network/Servent.h b/src/libtomahawk/network/Servent.h index 8fa679a6d..7608da544 100644 --- a/src/libtomahawk/network/Servent.h +++ b/src/libtomahawk/network/Servent.h @@ -64,7 +64,7 @@ public: QTimer::singleShot( AUTH_TIMEOUT, this, SLOT( authTimeout() ) ) ; } - QWeakPointer _conn; + QPointer _conn; bool _outbound; bool _disowned; msg_ptr _msg; @@ -159,7 +159,7 @@ private: QJson::Parser parser; QList< ControlConnection* > m_controlconnections; // canonical list of authed peers - QMap< QString, QWeakPointer< Connection > > m_offers; + QMap< QString, QPointer< Connection > > m_offers; QStringList m_connectedNodes; int m_port, m_externalPort; @@ -174,7 +174,7 @@ private: QMap< QString,boost::function< QSharedPointer< QIODevice >(Tomahawk::result_ptr) > > m_iofactories; - QWeakPointer< PortFwdThread > m_portfwd; + QPointer< PortFwdThread > m_portfwd; static Servent* s_instance; }; diff --git a/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp index 218e07089..86d1cf289 100644 --- a/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp +++ b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp @@ -46,7 +46,7 @@ PlayableProxyModelPlaylistInterface::PlayableProxyModelPlaylistInterface( Playab PlayableProxyModelPlaylistInterface::~PlayableProxyModelPlaylistInterface() { tDebug() << Q_FUNC_INFO; - m_proxyModel.clear(); + m_proxyModel = 0; } diff --git a/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h index f134d2293..1f57a1db2 100644 --- a/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h +++ b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h @@ -20,13 +20,14 @@ #ifndef TRACKPROXYMODELPLAYLISTINTERFACE_H #define TRACKPROXYMODELPLAYLISTINTERFACE_H -#include - #include "PlaylistInterface.h" #include "playlist/PlayableModel.h" #include "DllMacro.h" +#include +#include + class PlayableProxyModel; namespace Tomahawk { @@ -65,7 +66,7 @@ private slots: void onCurrentIndexChanged(); protected: - QWeakPointer< PlayableProxyModel > m_proxyModel; + QPointer< PlayableProxyModel > m_proxyModel; PlaylistModes::RepeatMode m_repeatMode; bool m_shuffled; diff --git a/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp index 079b4821f..cfe4e6a08 100644 --- a/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp +++ b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp @@ -43,7 +43,7 @@ TreeProxyModelPlaylistInterface::TreeProxyModelPlaylistInterface( TreeProxyModel TreeProxyModelPlaylistInterface::~TreeProxyModelPlaylistInterface() { - m_proxyModel.clear(); + m_proxyModel = 0; } diff --git a/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h index b02696239..f87d7f95d 100644 --- a/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h +++ b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h @@ -67,7 +67,7 @@ public slots: virtual void setShuffled( bool enabled ) { m_shuffled = enabled; emit shuffleModeChanged( enabled ); } private: - QWeakPointer< TreeProxyModel > m_proxyModel; + QPointer< TreeProxyModel > m_proxyModel; PlaylistModes::RepeatMode m_repeatMode; bool m_shuffled; diff --git a/src/libtomahawk/playlist/dynamic/database/DatabaseControl.h b/src/libtomahawk/playlist/dynamic/database/DatabaseControl.h index 257b50c14..dca17b0c9 100644 --- a/src/libtomahawk/playlist/dynamic/database/DatabaseControl.h +++ b/src/libtomahawk/playlist/dynamic/database/DatabaseControl.h @@ -62,8 +62,8 @@ namespace Tomahawk // utility void calculateSummary(); - QWeakPointer< QWidget > m_input; - QWeakPointer< QWidget > m_match; + QPointer< QWidget > m_input; + QPointer< QWidget > m_match; QString m_matchData; QString m_matchString; QString m_summary; diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp index 2320c4dfe..158087b55 100644 --- a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp +++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp @@ -181,8 +181,8 @@ Tomahawk::EchonestControl::updateWidgets() match->hide(); input->hide(); - m_match = QWeakPointer< QWidget >( match ); - m_input = QWeakPointer< QWidget >( input ); + m_match = QPointer< QWidget >( match ); + m_input = QPointer< QWidget >( input ); m_data.first = m_currentType; } else if( selectedType() == "Artist Description" ) { m_currentType = Echonest::DynamicPlaylist::Description; @@ -200,8 +200,8 @@ Tomahawk::EchonestControl::updateWidgets() match->hide(); input->hide(); - m_match = QWeakPointer< QWidget >( match ); - m_input = QWeakPointer< QWidget >( input ); + m_match = QPointer< QWidget >( match ); + m_input = QPointer< QWidget >( input ); m_data.first = m_currentType; } else if( selectedType() == "User Radio" ) { m_currentType = Echonest::DynamicPlaylist::SourceCatalog; @@ -229,8 +229,8 @@ Tomahawk::EchonestControl::updateWidgets() match->hide(); combo->hide(); - m_match = QWeakPointer< QWidget >( match ); - m_input = QWeakPointer< QWidget >( combo ); + m_match = QPointer< QWidget >( match ); + m_input = QPointer< QWidget >( combo ); } else if( selectedType() == "Song" ) { m_currentType = Echonest::DynamicPlaylist::SongId; @@ -248,8 +248,8 @@ Tomahawk::EchonestControl::updateWidgets() match->hide(); input->hide(); - m_match = QWeakPointer< QWidget >( match ); - m_input = QWeakPointer< QWidget >( input ); + m_match = QPointer< QWidget >( match ); + m_input = QPointer< QWidget >( input ); m_data.first = m_currentType; } else if( selectedType() == "Variety" ) { m_currentType = Echonest::DynamicPlaylist::Variety; @@ -269,8 +269,8 @@ Tomahawk::EchonestControl::updateWidgets() match->hide(); input->hide(); - m_match = QWeakPointer< QWidget >( match ); - m_input = QWeakPointer< QWidget >( input ); + m_match = QPointer< QWidget >( match ); + m_input = QPointer< QWidget >( input ); m_data.first = m_currentType; } else if( selectedType() == "Adventurousness" ) { m_currentType = Echonest::DynamicPlaylist::Adventurousness; @@ -291,8 +291,8 @@ Tomahawk::EchonestControl::updateWidgets() match->hide(); input->hide(); - m_match = QWeakPointer< QWidget >( match ); - m_input = QWeakPointer< QWidget >( input ); + m_match = QPointer< QWidget >( match ); + m_input = QPointer< QWidget >( input ); m_data.first = m_currentType; } else if( selectedType() == "Tempo" ) { m_currentType = Echonest::DynamicPlaylist::MinTempo; @@ -354,8 +354,8 @@ Tomahawk::EchonestControl::updateWidgets() match->hide(); combo->hide(); - m_match = QWeakPointer< QWidget >( match ); - m_input = QWeakPointer< QWidget >( combo ); + m_match = QPointer< QWidget >( match ); + m_input = QPointer< QWidget >( combo ); } else if( selectedType() == "Key" ) { m_currentType = Echonest::DynamicPlaylist::Key; @@ -383,8 +383,8 @@ Tomahawk::EchonestControl::updateWidgets() match->hide(); combo->hide(); - m_match = QWeakPointer< QWidget >( match ); - m_input = QWeakPointer< QWidget >( combo ); + m_match = QPointer< QWidget >( match ); + m_input = QPointer< QWidget >( combo ); } else if( selectedType() == "Sorting" ) { m_currentType = Echonest::DynamicPlaylist::Sort; @@ -416,8 +416,8 @@ Tomahawk::EchonestControl::updateWidgets() match->hide(); combo->hide(); - m_match = QWeakPointer< QWidget >( match ); - m_input = QWeakPointer< QWidget >( combo ); + m_match = QPointer< QWidget >( match ); + m_input = QPointer< QWidget >( combo ); } else if( selectedType() == "Mood" || selectedType() == "Style" ) { if( selectedType() == "Mood" ) m_currentType = Echonest::DynamicPlaylist::Mood; @@ -437,13 +437,13 @@ Tomahawk::EchonestControl::updateWidgets() match->hide(); combo->hide(); - m_match = QWeakPointer< QWidget >( match ); - m_input = QWeakPointer< QWidget >( combo ); + m_match = QPointer< QWidget >( match ); + m_input = QPointer< QWidget >( combo ); insertMoodsAndStyles(); } else { - m_match = QWeakPointer( new QWidget ); - m_input = QWeakPointer( new QWidget ); + m_match = QPointer( new QWidget ); + m_input = QPointer( new QWidget ); } updateData(); calculateSummary(); @@ -472,8 +472,8 @@ Tomahawk::EchonestControl::setupMinMaxWidgets( Echonest::DynamicPlaylist::Playli match->hide(); input->hide(); - m_match = QWeakPointer< QWidget >( match ); - m_input = QWeakPointer< QWidget >( input ); + m_match = QPointer< QWidget >( match ); + m_input = QPointer< QWidget >( input ); } diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h index b4839834f..d40a87c5e 100644 --- a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h +++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h @@ -24,6 +24,7 @@ #include #include +#include namespace Tomahawk { @@ -81,8 +82,8 @@ private: Echonest::DynamicPlaylist::PlaylistParam m_currentType; int m_overrideType; - QWeakPointer< QWidget > m_input; - QWeakPointer< QWidget > m_match; + QPointer< QWidget > m_input; + QPointer< QWidget > m_match; QString m_matchData; QString m_matchString; QString m_summary; diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.cpp index 6a412dd0a..30e7c7941 100644 --- a/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.cpp +++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.cpp @@ -40,12 +40,12 @@ DynamicControlWrapper::DynamicControlWrapper( const Tomahawk::dyncontrol_ptr& co , m_minusButton( 0 ) , m_control( control ) , m_typeSelector( 0 ) - , m_layout( QWeakPointer< QGridLayout >( layout ) ) + , m_layout( QPointer< QGridLayout >( layout ) ) { m_typeSelector = new QComboBox( m_parent ); - m_matchSelector = QWeakPointer( control->matchSelector() ); - m_entryWidget = QWeakPointer( control->inputField() ); + m_matchSelector = QPointer( control->matchSelector() ); + m_entryWidget = QPointer( control->inputField() ); m_minusButton = initButton( m_parent ); m_minusButton->setIcon( TomahawkUtils::defaultPixmap( TomahawkUtils::ListRemove ) ); @@ -157,12 +157,12 @@ DynamicControlWrapper::typeSelectorChanged( const QString& type, bool firstLoad if( m_control->matchSelector() ) { - m_matchSelector = QWeakPointer( m_control->matchSelector() ); + m_matchSelector = QPointer( m_control->matchSelector() ); m_layout.data()->addWidget( m_matchSelector.data(), m_row, 1, Qt::AlignCenter ); m_matchSelector.data()->show(); } if( m_control->inputField() ) { - m_entryWidget = QWeakPointer( m_control->inputField() ); + m_entryWidget = QPointer( m_control->inputField() ); m_layout.data()->addWidget( m_entryWidget.data(), m_row, 2 ); m_entryWidget.data()->show(); } diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.h b/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.h index 7fc2f4537..ed70f08e3 100644 --- a/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.h +++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.h @@ -20,6 +20,7 @@ #define DYNAMIC_CONTROL_WRAPPER_H #include +#include #include "Typedefs.h" @@ -70,9 +71,9 @@ private: dyncontrol_ptr m_control; QComboBox* m_typeSelector; - QWeakPointer m_matchSelector; - QWeakPointer m_entryWidget; - QWeakPointer m_layout; + QPointer m_matchSelector; + QPointer m_entryWidget; + QPointer m_layout; }; }; diff --git a/src/libtomahawk/resolvers/QtScriptResolver.cpp b/src/libtomahawk/resolvers/QtScriptResolver.cpp index c0c631e71..51f8fd517 100644 --- a/src/libtomahawk/resolvers/QtScriptResolver.cpp +++ b/src/libtomahawk/resolvers/QtScriptResolver.cpp @@ -523,7 +523,7 @@ QtScriptResolver::loadUi() if( m.contains( "images" ) ) uiData = fixDataImagePaths( uiData, compressed, images ); - m_configWidget = QWeakPointer< QWidget >( widgetFromData( uiData, 0 ) ); + m_configWidget = QPointer< QWidget >( widgetFromData( uiData, 0 ) ); emit changed(); } diff --git a/src/libtomahawk/resolvers/QtScriptResolver.h b/src/libtomahawk/resolvers/QtScriptResolver.h index f2624f200..78cc2b9ce 100644 --- a/src/libtomahawk/resolvers/QtScriptResolver.h +++ b/src/libtomahawk/resolvers/QtScriptResolver.h @@ -176,7 +176,7 @@ private: ExternalResolver::ErrorState m_error; QtScriptResolverHelper* m_resolverHelper; - QWeakPointer< QWidget > m_configWidget; + QPointer< QWidget > m_configWidget; QList< QVariant > m_dataWidgets; }; diff --git a/src/libtomahawk/resolvers/ScriptResolver.cpp b/src/libtomahawk/resolvers/ScriptResolver.cpp index b254dde32..8a4046470 100644 --- a/src/libtomahawk/resolvers/ScriptResolver.cpp +++ b/src/libtomahawk/resolvers/ScriptResolver.cpp @@ -427,7 +427,7 @@ ScriptResolver::setupConfWidget( const QVariantMap& m ) if ( m.contains( "images" ) ) uiData = fixDataImagePaths( uiData, compressed, m[ "images" ].toMap() ); - m_configWidget = QWeakPointer< QWidget >( widgetFromData( uiData, 0 ) ); + m_configWidget = QPointer< QWidget >( widgetFromData( uiData, 0 ) ); emit changed(); } diff --git a/src/libtomahawk/resolvers/ScriptResolver.h b/src/libtomahawk/resolvers/ScriptResolver.h index 5f7f89888..b975768a5 100644 --- a/src/libtomahawk/resolvers/ScriptResolver.h +++ b/src/libtomahawk/resolvers/ScriptResolver.h @@ -87,7 +87,7 @@ private: QString m_name; QPixmap m_icon; unsigned int m_weight, m_preference, m_timeout, m_num_restarts; - QWeakPointer< QWidget > m_configWidget; + QPointer< QWidget > m_configWidget; quint32 m_msgsize; QByteArray m_msg; diff --git a/src/libtomahawk/thirdparty/Qocoa/qtoolbartabdialog.cpp b/src/libtomahawk/thirdparty/Qocoa/qtoolbartabdialog.cpp index f9feed636..df63ff3df 100644 --- a/src/libtomahawk/thirdparty/Qocoa/qtoolbartabdialog.cpp +++ b/src/libtomahawk/thirdparty/Qocoa/qtoolbartabdialog.cpp @@ -7,6 +7,7 @@ #include #include #include +#include class QToolbarTabDialogPrivate : public QObject { Q_OBJECT @@ -45,8 +46,8 @@ public slots: } public: - QWeakPointer dialog; - QWeakPointer q; + QPointer dialog; + QPointer q; QVBoxLayout* layout; QToolBar* toolbar; diff --git a/src/libtomahawk/utils/BinaryInstallerHelper.cpp b/src/libtomahawk/utils/BinaryInstallerHelper.cpp index d061053ca..23bbcd5aa 100644 --- a/src/libtomahawk/utils/BinaryInstallerHelper.cpp +++ b/src/libtomahawk/utils/BinaryInstallerHelper.cpp @@ -27,7 +27,7 @@ BinaryInstallerHelper::BinaryInstallerHelper( QTemporaryFile* tempFile, const QS , m_tempFile( tempFile ) , m_resolverId( resolverId ) , m_createAccount( createAccount ) - , m_manager( QWeakPointer< AtticaManager >( manager ) ) + , m_manager( QPointer< AtticaManager >( manager ) ) { Q_ASSERT( m_tempFile ); Q_ASSERT( !m_resolverId.isEmpty() ); diff --git a/src/libtomahawk/utils/BinaryInstallerHelper.h b/src/libtomahawk/utils/BinaryInstallerHelper.h index 33fbba7ce..d87562d6b 100644 --- a/src/libtomahawk/utils/BinaryInstallerHelper.h +++ b/src/libtomahawk/utils/BinaryInstallerHelper.h @@ -20,7 +20,7 @@ #include "AtticaManager.h" -#include +#include class QTemporaryFile; class BinaryInstallerHelper : public QObject @@ -39,7 +39,7 @@ private: QTemporaryFile* m_tempFile; QString m_resolverId; bool m_createAccount; - QWeakPointer m_manager; + QPointer m_manager; }; #endif \ No newline at end of file diff --git a/src/libtomahawk/utils/GuiHelpers.cpp b/src/libtomahawk/utils/GuiHelpers.cpp index 2342c5344..645271beb 100644 --- a/src/libtomahawk/utils/GuiHelpers.cpp +++ b/src/libtomahawk/utils/GuiHelpers.cpp @@ -111,7 +111,7 @@ createAccountFromFactory( Tomahawk::Accounts::AccountFactory* factory, QWidget* dialog->show(); #else DelegateConfigWrapper dialog( account->configurationWidget(), account->aboutWidget(), QObject::tr( "%1 Config" ).arg( account->accountFriendlyName() ), parent ); - QWeakPointer< DelegateConfigWrapper > watcher( &dialog ); + QPointer< DelegateConfigWrapper > watcher( &dialog ); if( account->configurationWidget()->metaObject()->indexOfSignal( "dataError(bool)" ) > -1 ) QObject::connect( account->configurationWidget(), SIGNAL( dataError( bool ) ), &dialog, SLOT( toggleOkButton( bool ) ), Qt::UniqueConnection ); @@ -141,7 +141,7 @@ openAccountConfig( Tomahawk::Accounts::Account* account, QWidget* parent, bool s #ifndef Q_OS_MAC DelegateConfigWrapper dialog( account->configurationWidget(), account->aboutWidget(), QObject::tr("%1 Configuration" ).arg( account->accountFriendlyName() ), parent ); dialog.setShowDelete( showDelete ); - QWeakPointer< DelegateConfigWrapper > watcher( &dialog ); + QPointer< DelegateConfigWrapper > watcher( &dialog ); int ret = dialog.exec(); if ( !watcher.isNull() && dialog.deleted() ) { diff --git a/src/libtomahawk/utils/PixmapDelegateFader.cpp b/src/libtomahawk/utils/PixmapDelegateFader.cpp index 9b0bd418d..f7c892772 100644 --- a/src/libtomahawk/utils/PixmapDelegateFader.cpp +++ b/src/libtomahawk/utils/PixmapDelegateFader.cpp @@ -31,14 +31,14 @@ using namespace Tomahawk; -QWeakPointer< TomahawkUtils::SharedTimeLine > PixmapDelegateFader::s_stlInstance = QWeakPointer< TomahawkUtils::SharedTimeLine >(); +QPointer< TomahawkUtils::SharedTimeLine > PixmapDelegateFader::s_stlInstance = QPointer< TomahawkUtils::SharedTimeLine >(); -QWeakPointer< TomahawkUtils::SharedTimeLine > +QPointer< TomahawkUtils::SharedTimeLine > PixmapDelegateFader::stlInstance() { if ( s_stlInstance.isNull() ) - s_stlInstance = QWeakPointer< TomahawkUtils::SharedTimeLine> ( new TomahawkUtils::SharedTimeLine() ); + s_stlInstance = QPointer< TomahawkUtils::SharedTimeLine> ( new TomahawkUtils::SharedTimeLine() ); return s_stlInstance; } diff --git a/src/libtomahawk/utils/PixmapDelegateFader.h b/src/libtomahawk/utils/PixmapDelegateFader.h index 04df7db1b..385c65430 100644 --- a/src/libtomahawk/utils/PixmapDelegateFader.h +++ b/src/libtomahawk/utils/PixmapDelegateFader.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include namespace Tomahawk { @@ -43,8 +43,8 @@ class PixmapDelegateFader : public QObject { Q_OBJECT - static QWeakPointer< TomahawkUtils::SharedTimeLine > stlInstance(); - + static QPointer< TomahawkUtils::SharedTimeLine > stlInstance(); + public: PixmapDelegateFader( const artist_ptr& artist, const QSize& size, TomahawkUtils::ImageMode mode = TomahawkUtils::Original, bool forceLoad = true ); PixmapDelegateFader( const album_ptr& album, const QSize& size, TomahawkUtils::ImageMode mode = TomahawkUtils::Original, bool forceLoad = true ); @@ -88,7 +88,7 @@ private: QPixmap m_currentReference, m_oldReference, m_current; - static QWeakPointer< TomahawkUtils::SharedTimeLine > s_stlInstance; + static QPointer< TomahawkUtils::SharedTimeLine > s_stlInstance; }; } diff --git a/src/libtomahawk/utils/WidgetDragFilter.cpp b/src/libtomahawk/utils/WidgetDragFilter.cpp index 76ca5b105..7a540e5b7 100644 --- a/src/libtomahawk/utils/WidgetDragFilter.cpp +++ b/src/libtomahawk/utils/WidgetDragFilter.cpp @@ -30,7 +30,7 @@ WidgetDragFilter::WidgetDragFilter( QObject* parent ) , m_dragStarted( false ) { Q_ASSERT( parent->isWidgetType() ); - m_target = QWeakPointer(static_cast(parent)); + m_target = QPointer(static_cast(parent)); m_target.data()->installEventFilter( this ); } diff --git a/src/libtomahawk/utils/WidgetDragFilter.h b/src/libtomahawk/utils/WidgetDragFilter.h index caea1951f..33ff4450d 100644 --- a/src/libtomahawk/utils/WidgetDragFilter.h +++ b/src/libtomahawk/utils/WidgetDragFilter.h @@ -19,11 +19,12 @@ #ifndef WIDGET_DRAG_FILTER_H #define WIDGET_DRAG_FILTER_H +#include "DllMacro.h" + #include #include #include - -#include "DllMacro.h" +#include class QMouseEvent; class QEvent; @@ -41,8 +42,8 @@ public: virtual bool eventFilter(QObject* , QEvent* ); private: bool canDrag( QObject* obj, QMouseEvent* ev ) const; - - QWeakPointer m_target; // in case it's deleted under us + + QPointer m_target; // in case it's deleted under us QPoint m_dragPoint; bool m_dragStarted; }; diff --git a/src/libtomahawk/widgets/AnimatedCounterLabel.h b/src/libtomahawk/widgets/AnimatedCounterLabel.h index cadd842ff..6e34736e0 100644 --- a/src/libtomahawk/widgets/AnimatedCounterLabel.h +++ b/src/libtomahawk/widgets/AnimatedCounterLabel.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include "DllMacro.h" @@ -52,7 +52,7 @@ private: unsigned int m_val, m_oldval; QString m_format; - QWeakPointer m_diff; + QPointer m_diff; }; #endif // ANIMATEDCOUNTERLABEL_H diff --git a/src/libtomahawk/widgets/FadingPixmap.cpp b/src/libtomahawk/widgets/FadingPixmap.cpp index 362cbba7e..0aa17c5f2 100644 --- a/src/libtomahawk/widgets/FadingPixmap.cpp +++ b/src/libtomahawk/widgets/FadingPixmap.cpp @@ -27,13 +27,13 @@ #define ANIMATION_TIME 1000 -QWeakPointer< TomahawkUtils::SharedTimeLine > FadingPixmap::s_stlInstance = QWeakPointer< TomahawkUtils::SharedTimeLine >(); +QPointer< TomahawkUtils::SharedTimeLine > FadingPixmap::s_stlInstance = QPointer< TomahawkUtils::SharedTimeLine >(); -QWeakPointer< TomahawkUtils::SharedTimeLine > +QPointer< TomahawkUtils::SharedTimeLine > FadingPixmap::stlInstance() { if ( s_stlInstance.isNull() ) - s_stlInstance = QWeakPointer< TomahawkUtils::SharedTimeLine> ( new TomahawkUtils::SharedTimeLine() ); + s_stlInstance = QPointer< TomahawkUtils::SharedTimeLine> ( new TomahawkUtils::SharedTimeLine() ); return s_stlInstance; } diff --git a/src/libtomahawk/widgets/FadingPixmap.h b/src/libtomahawk/widgets/FadingPixmap.h index 5e4928817..aa57ef4e5 100644 --- a/src/libtomahawk/widgets/FadingPixmap.h +++ b/src/libtomahawk/widgets/FadingPixmap.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "DllMacro.h" @@ -38,7 +38,7 @@ class DLLEXPORT FadingPixmap : public QLabel { Q_OBJECT - static QWeakPointer< TomahawkUtils::SharedTimeLine > stlInstance(); + static QPointer< TomahawkUtils::SharedTimeLine > stlInstance(); public: FadingPixmap( QWidget* parent = 0 ); @@ -70,7 +70,7 @@ private: int m_startFrame; bool m_isDefault; - static QWeakPointer< TomahawkUtils::SharedTimeLine > s_stlInstance; + static QPointer< TomahawkUtils::SharedTimeLine > s_stlInstance; }; #endif diff --git a/src/sourcetree/SourceTreeView.cpp b/src/sourcetree/SourceTreeView.cpp index 8708ab222..fce8978c7 100644 --- a/src/sourcetree/SourceTreeView.cpp +++ b/src/sourcetree/SourceTreeView.cpp @@ -385,7 +385,7 @@ SourceTreeView::deletePlaylist( const QModelIndex& idxIn ) { if ( m_popupDialog.isNull() ) { - m_popupDialog = QWeakPointer< SourceTreePopupDialog >( new SourceTreePopupDialog() ); + m_popupDialog = QPointer< SourceTreePopupDialog >( new SourceTreePopupDialog() ); connect( m_popupDialog.data(), SIGNAL( result( bool ) ), this, SLOT( onDeletePlaylistResult( bool ) ) ); } diff --git a/src/sourcetree/SourceTreeView.h b/src/sourcetree/SourceTreeView.h index 699b9fdf5..b8f2608b8 100644 --- a/src/sourcetree/SourceTreeView.h +++ b/src/sourcetree/SourceTreeView.h @@ -110,7 +110,7 @@ private: QModelIndex m_contextMenuIndex; SourceDelegate* m_delegate; Tomahawk::LatchManager* m_latchManager; - QWeakPointer m_popupDialog; + QPointer m_popupDialog; QMenu m_playlistMenu; QMenu m_roPlaylistMenu; diff --git a/src/widgets/SlideSwitchButton.cpp b/src/widgets/SlideSwitchButton.cpp index 8fb66e9b2..95271bf2a 100644 --- a/src/widgets/SlideSwitchButton.cpp +++ b/src/widgets/SlideSwitchButton.cpp @@ -220,7 +220,7 @@ SlideSwitchButton::onCheckedStateChanged() if ( !m_knobAnimation.isNull() ) m_knobAnimation.data()->stop(); - m_knobAnimation = QWeakPointer( new QPropertyAnimation( this, "knobX" ) ); + m_knobAnimation = QPointer( new QPropertyAnimation( this, "knobX" ) ); m_knobAnimation.data()->setDuration( 50 ); m_knobAnimation.data()->setStartValue( m_knobX ); @@ -241,8 +241,8 @@ SlideSwitchButton::setBackChecked( bool state ) m_backBottomAnimation.data()->stop(); m_backChecked = state; - m_backTopAnimation = QWeakPointer( new QPropertyAnimation( this, "baseColorTop" ) ); - m_backBottomAnimation = QWeakPointer( new QPropertyAnimation( this, "baseColorBottom" ) ); + m_backTopAnimation = QPointer( new QPropertyAnimation( this, "baseColorTop" ) ); + m_backBottomAnimation = QPointer( new QPropertyAnimation( this, "baseColorBottom" ) ); m_backTopAnimation.data()->setDuration( 300 ); m_backBottomAnimation.data()->setDuration( 300 ); diff --git a/src/widgets/SlideSwitchButton.h b/src/widgets/SlideSwitchButton.h index 496993bcd..718ee666b 100644 --- a/src/widgets/SlideSwitchButton.h +++ b/src/widgets/SlideSwitchButton.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include class QMouseEvent; class QMouseEvent; @@ -87,9 +87,9 @@ private: QPoint m_mouseDownPos; - QWeakPointer m_backTopAnimation; - QWeakPointer m_backBottomAnimation; - QWeakPointer m_knobAnimation; + QPointer m_backTopAnimation; + QPointer m_backBottomAnimation; + QPointer m_knobAnimation; }; #endif // SLIDESWITCHBUTTON_H diff --git a/src/xmppbot/XmppBot.h b/src/xmppbot/XmppBot.h index 200f9aafd..330617885 100644 --- a/src/xmppbot/XmppBot.h +++ b/src/xmppbot/XmppBot.h @@ -86,7 +86,7 @@ private slots: void onResultsAdded( const QList& result ); private: - QWeakPointer m_client; + QPointer m_client; Tomahawk::result_ptr m_currTrack; Tomahawk::InfoSystem::InfoTypeMap m_currInfoMap; QString m_currReturnMessage;