Convert new/delete to shared_ptr.
This commit is contained in:
@@ -40,6 +40,7 @@
|
||||
#include "completeterminal.h"
|
||||
#include "networktransport.h"
|
||||
#include "user.h"
|
||||
#include "shared.h"
|
||||
#include "terminaloverlay.h"
|
||||
|
||||
class STMClient {
|
||||
@@ -60,7 +61,9 @@ private:
|
||||
|
||||
Terminal::Framebuffer local_framebuffer, new_state;
|
||||
Overlay::OverlayManager overlays;
|
||||
Network::Transport< Network::UserStream, Terminal::Complete > *network;
|
||||
typedef Network::Transport< Network::UserStream, Terminal::Complete > NetworkType;
|
||||
typedef shared::shared_ptr< NetworkType > NetworkPointer;
|
||||
NetworkPointer network;
|
||||
Terminal::Display display;
|
||||
|
||||
std::wstring connecting_notification;
|
||||
@@ -94,7 +97,7 @@ public:
|
||||
local_framebuffer( 1, 1 ),
|
||||
new_state( 1, 1 ),
|
||||
overlays(),
|
||||
network( NULL ),
|
||||
network(),
|
||||
display( true ), /* use TERM environment var to initialize display */
|
||||
connecting_notification(),
|
||||
repaint_requested( false ),
|
||||
@@ -126,13 +129,6 @@ public:
|
||||
void shutdown( void );
|
||||
bool main( void );
|
||||
|
||||
~STMClient()
|
||||
{
|
||||
if ( network != NULL ) {
|
||||
delete network;
|
||||
}
|
||||
}
|
||||
|
||||
/* unused */
|
||||
STMClient( const STMClient & );
|
||||
STMClient & operator=( const STMClient & );
|
||||
|
||||
Reference in New Issue
Block a user