Permalink
Browse files

qt5: don't use QWeakPointer to track QObject* anymore

  • Loading branch information...
1 parent c98803b commit 17a9ec4e20e57df227afabbf5f156d0af4f1febe @dschmidt dschmidt committed Jan 4, 2013
Showing with 282 additions and 270 deletions.
  1. +1 −1 src/AudioControls.h
  2. +1 −1 src/SettingsDialog.cpp
  3. +9 −9 src/TomahawkApp.cpp
  4. +10 −9 src/TomahawkApp.h
  5. +1 −1 src/TomahawkWindow.cpp
  6. +5 −5 src/accounts/twitter/TwitterAccount.cpp
  7. +5 −5 src/accounts/twitter/TwitterAccount.h
  8. +1 −1 src/accounts/twitter/TwitterInfoPlugin.cpp
  9. +1 −1 src/accounts/twitter/TwitterInfoPlugin.h
  10. +7 −7 src/accounts/twitter/sip/TwitterSip.cpp
  11. +8 −8 src/accounts/twitter/sip/TwitterSip.h
  12. +2 −2 src/accounts/xmpp/XmppAccount.cpp
  13. +3 −3 src/accounts/xmpp/XmppAccount.h
  14. +1 −1 src/accounts/xmpp/XmppInfoPlugin.h
  15. +1 −1 src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp
  16. +1 −1 src/accounts/xmpp/googlewrapper/GoogleWrapper.h
  17. +1 −1 src/accounts/xmpp/sip/XmppSip.cpp
  18. +1 −1 src/accounts/xmpp/sip/XmppSip.h
  19. +1 −1 src/accounts/zeroconf/ZeroconfAccount.cpp
  20. +1 −1 src/accounts/zeroconf/ZeroconfAccount.h
  21. +1 −1 src/infoplugins/generic/charts/ChartsPlugin.h
  22. +1 −1 src/infoplugins/generic/newreleases/NewReleasesPlugin.h
  23. +2 −2 src/infoplugins/mac/adium/AdiumPlugin.h
  24. +4 −4 src/libtomahawk/AlbumPlaylistInterface.cpp
  25. +2 −2 src/libtomahawk/AlbumPlaylistInterface.h
  26. +4 −4 src/libtomahawk/ArtistPlaylistInterface.cpp
  27. +2 −2 src/libtomahawk/ArtistPlaylistInterface.h
  28. +1 −1 src/libtomahawk/FuncTimeout.cpp
  29. +2 −2 src/libtomahawk/FuncTimeout.h
  30. +0 −2 src/libtomahawk/GlobalActionManager.h
  31. +1 −1 src/libtomahawk/LatchManager.cpp
  32. +6 −6 src/libtomahawk/Pipeline.cpp
  33. +2 −2 src/libtomahawk/Pipeline.h
  34. +1 −1 src/libtomahawk/PlaylistPlaylistInterface.cpp
  35. +2 −2 src/libtomahawk/PlaylistPlaylistInterface.h
  36. +1 −1 src/libtomahawk/Query.cpp
  37. +2 −2 src/libtomahawk/Query.h
  38. +2 −2 src/libtomahawk/Result.cpp
  39. +1 −1 src/libtomahawk/Result.h
  40. +2 −2 src/libtomahawk/SourcePlaylistInterface.cpp
  41. +3 −3 src/libtomahawk/SourcePlaylistInterface.h
  42. +3 −1 src/libtomahawk/Typedefs.h
  43. +2 −2 src/libtomahawk/ViewManager.cpp
  44. +7 −7 src/libtomahawk/ViewManager.h
  45. +1 −1 src/libtomahawk/accounts/ResolverAccount.cpp
  46. +3 −1 src/libtomahawk/accounts/ResolverAccount.h
  47. +3 −3 src/libtomahawk/accounts/lastfm/LastFmAccount.cpp
  48. +3 −3 src/libtomahawk/accounts/lastfm/LastFmAccount.h
  49. +1 −1 src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h
  50. +4 −4 src/libtomahawk/accounts/spotify/SpotifyAccount.cpp
  51. +4 −4 src/libtomahawk/accounts/spotify/SpotifyAccount.h
  52. +2 −1 src/libtomahawk/accounts/spotify/SpotifyInfoPlugin.cpp
  53. +3 −2 src/libtomahawk/accounts/spotify/SpotifyInfoPlugin.h
  54. +2 −2 src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.h
  55. +5 −5 src/libtomahawk/database/Database.cpp
  56. +2 −2 src/libtomahawk/database/Database.h
  57. +2 −1 src/libtomahawk/database/DatabaseCommand_UpdateSearchIndex.h
  58. +3 −3 src/libtomahawk/database/DatabaseWorker.cpp
  59. +4 −4 src/libtomahawk/database/DatabaseWorker.h
  60. +1 −1 src/libtomahawk/filemetadata/MusicScanner.cpp
  61. +2 −3 src/libtomahawk/filemetadata/MusicScanner.h
  62. +1 −1 src/libtomahawk/filemetadata/ScanManager.cpp
  63. +2 −2 src/libtomahawk/filemetadata/ScanManager.h
  64. +5 −5 src/libtomahawk/infosystem/InfoSystem.cpp
  65. +4 −4 src/libtomahawk/infosystem/InfoSystem.h
  66. +0 −1 src/libtomahawk/infosystem/InfoSystemWorker.h
  67. +2 −2 src/libtomahawk/jobview/LatchedStatusItem.cpp
  68. +1 −1 src/libtomahawk/jobview/LatchedStatusItem.h
  69. +1 −1 src/libtomahawk/jobview/PipelineStatusItem.cpp
  70. +2 −1 src/libtomahawk/jobview/PipelineStatusItem.h
  71. +1 −1 src/libtomahawk/jobview/TransferStatusItem.cpp
  72. +3 −1 src/libtomahawk/jobview/TransferStatusItem.h
  73. +2 −2 src/libtomahawk/network/PortFwdThread.cpp
  74. +3 −3 src/libtomahawk/network/PortFwdThread.h
  75. +4 −4 src/libtomahawk/network/Servent.cpp
  76. +3 −3 src/libtomahawk/network/Servent.h
  77. +1 −1 src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp
  78. +4 −3 src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h
  79. +1 −1 src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp
  80. +1 −1 src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h
  81. +2 −2 src/libtomahawk/playlist/dynamic/database/DatabaseControl.h
  82. +24 −24 src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp
  83. +3 −2 src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
  84. +5 −5 src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.cpp
  85. +4 −3 src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.h
  86. +1 −1 src/libtomahawk/resolvers/QtScriptResolver.cpp
  87. +1 −1 src/libtomahawk/resolvers/QtScriptResolver.h
  88. +1 −1 src/libtomahawk/resolvers/ScriptResolver.cpp
  89. +1 −1 src/libtomahawk/resolvers/ScriptResolver.h
  90. +3 −2 src/libtomahawk/thirdparty/Qocoa/qtoolbartabdialog.cpp
  91. +1 −1 src/libtomahawk/utils/BinaryInstallerHelper.cpp
  92. +2 −2 src/libtomahawk/utils/BinaryInstallerHelper.h
  93. +2 −2 src/libtomahawk/utils/GuiHelpers.cpp
  94. +3 −3 src/libtomahawk/utils/PixmapDelegateFader.cpp
  95. +4 −4 src/libtomahawk/utils/PixmapDelegateFader.h
  96. +1 −1 src/libtomahawk/utils/WidgetDragFilter.cpp
  97. +5 −4 src/libtomahawk/utils/WidgetDragFilter.h
  98. +2 −2 src/libtomahawk/widgets/AnimatedCounterLabel.h
  99. +3 −3 src/libtomahawk/widgets/FadingPixmap.cpp
  100. +3 −3 src/libtomahawk/widgets/FadingPixmap.h
  101. +1 −1 src/sourcetree/SourceTreeView.cpp
  102. +1 −1 src/sourcetree/SourceTreeView.h
  103. +3 −3 src/widgets/SlideSwitchButton.cpp
  104. +4 −4 src/widgets/SlideSwitchButton.h
  105. +1 −1 src/xmppbot/XmppBot.h
View
@@ -95,7 +95,7 @@ private slots:
Ui::AudioControls* ui;
- QWeakPointer<SocialWidget> m_socialWidget;
+ QPointer<SocialWidget> m_socialWidget;
Tomahawk::result_ptr m_currentTrack;
Tomahawk::PlaylistModes::RepeatMode m_repeatMode;
View
@@ -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
View
@@ -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<AudioEngine>( new AudioEngine );
+ m_audioEngine = QPointer<AudioEngine>( new AudioEngine );
// init pipeline and resolver factories
new Pipeline();
- m_servent = QWeakPointer<Servent>( new Servent( this ) );
+ m_servent = QPointer<Servent>( new Servent( this ) );
connect( m_servent.data(), SIGNAL( ready() ), SLOT( initSIP() ) );
tDebug() << "Init Database.";
initDatabase();
- m_scanManager = QWeakPointer<ScanManager>( new ScanManager( this ) );
+ m_scanManager = QPointer<ScanManager>( 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<Tomahawk::ShortcutHandler>( new MacShortcutHandler( this ) );
+ m_shortcutHandler = QPointer<Tomahawk::ShortcutHandler>( new MacShortcutHandler( this ) );
Tomahawk::setShortcutHandler( static_cast<MacShortcutHandler*>( m_shortcutHandler.data() ) );
Tomahawk::setApplicationHandler( this );
@@ -242,10 +242,10 @@ TomahawkApp::init()
}
tDebug() << "Init InfoSystem.";
- m_infoSystem = QWeakPointer<Tomahawk::InfoSystem::InfoSystem>( Tomahawk::InfoSystem::InfoSystem::instance() );
+ m_infoSystem = QPointer<Tomahawk::InfoSystem::InfoSystem>( 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<Database>( new Database( dbpath, this ) );
+ m_database = QPointer<Database>( 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() )
View
@@ -39,6 +39,7 @@
#include <QSettings>
#include <QDir>
#include <QPersistentModelIndex>
+#include <QPointer>
class AudioEngine;
class Database;
@@ -124,13 +125,13 @@ private slots:
void initLocalCollection();
void initPipeline();
- QWeakPointer<Database> m_database;
- QWeakPointer<ScanManager> m_scanManager;
- QWeakPointer<AudioEngine> m_audioEngine;
- QWeakPointer<Servent> m_servent;
- QWeakPointer<Tomahawk::InfoSystem::InfoSystem> m_infoSystem;
- QWeakPointer<Tomahawk::ShortcutHandler> m_shortcutHandler;
- QWeakPointer< Tomahawk::Accounts::AccountManager > m_accountManager;
+ QPointer<Database> m_database;
+ QPointer<ScanManager> m_scanManager;
+ QPointer<AudioEngine> m_audioEngine;
+ QPointer<Servent> m_servent;
+ QPointer<Tomahawk::InfoSystem::InfoSystem> m_infoSystem;
+ QPointer<Tomahawk::ShortcutHandler> m_shortcutHandler;
+ QPointer< Tomahawk::Accounts::AccountManager > m_accountManager;
bool m_scrubFriendlyName;
#ifdef LIBLASTFM_FOUND
@@ -143,8 +144,8 @@ private slots:
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 )
View
@@ -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 )
@@ -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;
@@ -80,7 +80,7 @@ class ACCOUNTDLLEXPORT TwitterAccount : public Account
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 slots:
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;
@@ -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;
@@ -68,7 +68,7 @@ namespace Tomahawk {
bool isValid() const;
Tomahawk::Accounts::TwitterAccount* m_account;
- QWeakPointer< TomahawkOAuthTwitter > m_twitterAuth;
+ QPointer< TomahawkOAuthTwitter > m_twitterAuth;
};
}
@@ -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<QTweetFriendsTimeline>( new QTweetFriendsTimeline( m_cachedTwitterAuth.data(), this ) );
- m_mentions = QWeakPointer<QTweetMentions>( new QTweetMentions( m_cachedTwitterAuth.data(), this ) );
- m_directMessages = QWeakPointer<QTweetDirectMessages>( new QTweetDirectMessages( m_cachedTwitterAuth.data(), this ) );
- m_directMessageNew = QWeakPointer<QTweetDirectMessageNew>( new QTweetDirectMessageNew( m_cachedTwitterAuth.data(), this ) );
- m_directMessageDestroy = QWeakPointer<QTweetDirectMessageDestroy>( new QTweetDirectMessageDestroy( m_cachedTwitterAuth.data(), this ) );
+ m_friendsTimeline = QPointer<QTweetFriendsTimeline>( new QTweetFriendsTimeline( m_cachedTwitterAuth.data(), this ) );
+ m_mentions = QPointer<QTweetMentions>( new QTweetMentions( m_cachedTwitterAuth.data(), this ) );
+ m_directMessages = QPointer<QTweetDirectMessages>( new QTweetDirectMessages( m_cachedTwitterAuth.data(), this ) );
+ m_directMessageNew = QPointer<QTweetDirectMessageNew>( new QTweetDirectMessageNew( m_cachedTwitterAuth.data(), this ) );
+ m_directMessageDestroy = QPointer<QTweetDirectMessageDestroy>( new QTweetDirectMessageDestroy( m_cachedTwitterAuth.data(), this ) );
connect( m_friendsTimeline.data(), SIGNAL( parsedStatuses(const QList< QTweetStatus > &) ), SLOT( friendsTimelineStatuses(const QList<QTweetStatus> &) ) );
connect( m_mentions.data(), SIGNAL( parsedStatuses(const QList< QTweetStatus > &) ), SLOT( mentionsStatuses(const QList<QTweetStatus> &) ) );
connect( m_directMessages.data(), SIGNAL( parsedDirectMessages(const QList<QTweetDMStatus> &)), SLOT( directMessages(const QList<QTweetDMStatus> &) ) );
@@ -36,7 +36,7 @@
#include <QTweetLib/qtweetdmstatus.h>
#include <QTimer>
-#include <QWeakPointer>
+#include <QPointer>
#include <QSet>
@@ -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 slots:
bool refreshTwitterAuth();
void parseGotTomahawk( const QRegExp &regex, 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;
@@ -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 ) ) );
@@ -80,9 +80,9 @@ class ACCOUNTDLLEXPORT XmppAccount : public Account
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;
@@ -55,7 +55,7 @@ namespace Tomahawk {
void audioPaused();
private:
- QWeakPointer< XmppSipPlugin > m_sipPlugin;
+ QPointer< XmppSipPlugin > m_sipPlugin;
QTimer m_pauseTimer;
};
@@ -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 ) ) );
@@ -73,7 +73,7 @@ class ACCOUNTDLLEXPORT GoogleWrapper : public XmppAccount
virtual SipPlugin* sipPlugin();
private:
- QWeakPointer< GoogleWrapperSip > m_sipPlugin;
+ QPointer< GoogleWrapperSip > m_sipPlugin;
};
}
@@ -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() );
}
@@ -132,7 +132,7 @@ private slots:
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
@@ -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();
}
@@ -72,7 +72,7 @@ class ACCOUNTDLLEXPORT ZeroconfAccount : public Account
QWidget* aclWidget() { return 0; }
private:
- QWeakPointer< ZeroconfPlugin > m_sipPlugin;
+ QPointer< ZeroconfPlugin > m_sipPlugin;
};
}
@@ -111,7 +111,7 @@ protected slots:
uint m_chartsFetchJobs;
QList< InfoRequestData > m_cachedRequests;
QHash< QString, QString > m_cachedCountries;
- QWeakPointer< QNetworkAccessManager > m_nam;
+ QPointer< QNetworkAccessManager > m_nam;
};
}
@@ -92,7 +92,7 @@ protected slots:
uint m_nrFetchJobs;
QList< InfoRequestData > m_cachedRequests;
QHash< QString, QString > m_cachedCountries;
- QWeakPointer< QNetworkAccessManager > m_nam;
+ QPointer< QNetworkAccessManager > m_nam;
};
}
Oops, something went wrong.

0 comments on commit 17a9ec4

Please sign in to comment.