1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00

Change ContolContection* to QPointer

This commit is contained in:
Uwe L. Korn
2013-05-24 10:49:00 +02:00
parent f076ab9988
commit 332b701c56

View File

@@ -25,6 +25,7 @@
#include <QtCore/QVariantMap> #include <QtCore/QVariantMap>
#include "Typedefs.h" #include "Typedefs.h"
#include "network/ControlConnection.h"
#include "network/DbSyncConnection.h" #include "network/DbSyncConnection.h"
#include "collection/Collection.h" #include "collection/Collection.h"
#include "Query.h" #include "Query.h"
@@ -32,7 +33,6 @@
#include "DllMacro.h" #include "DllMacro.h"
class ControlConnection;
class DatabaseCommand_DeleteFiles; class DatabaseCommand_DeleteFiles;
class DatabaseCommand_LoadAllSources; class DatabaseCommand_LoadAllSources;
class DatabaseCommand_LogPlayback; class DatabaseCommand_LogPlayback;
@@ -85,7 +85,7 @@ public:
void removeCollection( const Tomahawk::collection_ptr& c ); void removeCollection( const Tomahawk::collection_ptr& c );
int id() const { return m_id; } int id() const { return m_id; }
ControlConnection* controlConnection() const { return m_cc; } ControlConnection* controlConnection() const { return m_cc.data(); }
void setControlConnection( ControlConnection* cc ); void setControlConnection( ControlConnection* cc );
const QSet< Tomahawk::peerinfo_ptr > peerInfos() const; const QSet< Tomahawk::peerinfo_ptr > peerInfos() const;
@@ -168,7 +168,7 @@ private:
DBSyncConnection::State m_state; DBSyncConnection::State m_state;
QTimer m_currentTrackTimer; QTimer m_currentTrackTimer;
ControlConnection* m_cc; QPointer<ControlConnection> m_cc;
QList< QSharedPointer<DatabaseCommand> > m_cmds; QList< QSharedPointer<DatabaseCommand> > m_cmds;
int m_commandCount; int m_commandCount;
QString m_lastCmdGuid; QString m_lastCmdGuid;