Ownership of Platform in part of the code.
This commit is contained in:
@ -257,7 +257,7 @@ Layout::Anchor::~Anchor ()
|
||||
|
||||
Layout::Layout (std::unique_ptr< Platform > platform, bool limit)
|
||||
{
|
||||
this->platform = platform.release();
|
||||
this->platform = std::move( platform );
|
||||
view = NULL;
|
||||
topLevel = NULL;
|
||||
widgetAtPoint = NULL;
|
||||
@ -292,7 +292,7 @@ Layout::Layout (std::unique_ptr< Platform > platform, bool limit)
|
||||
DBG_OBJ_ASSOC_CHILD (&findtextState);
|
||||
DBG_OBJ_ASSOC_CHILD (&selectionState);
|
||||
|
||||
platform->setLayout (this);
|
||||
this->platform->setLayout (this);
|
||||
|
||||
selectionState.setLayout(this);
|
||||
|
||||
@ -329,7 +329,6 @@ Layout::~Layout ()
|
||||
topLevel.reset();
|
||||
}
|
||||
|
||||
delete platform;
|
||||
delete view;
|
||||
delete textZone;
|
||||
|
||||
|
||||
@ -157,7 +157,7 @@ private:
|
||||
~Anchor ();
|
||||
};
|
||||
|
||||
Platform *platform;
|
||||
std::unique_ptr< Platform > platform;
|
||||
View *view;
|
||||
std::unique_ptr< Widget > topLevel;
|
||||
Widget *widgetAtPoint;
|
||||
@ -349,7 +349,7 @@ public:
|
||||
|
||||
inline Platform *getPlatform ()
|
||||
{
|
||||
return platform;
|
||||
return platform.get();
|
||||
}
|
||||
|
||||
/* delegated */
|
||||
|
||||
Reference in New Issue
Block a user