Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Pointer cleanup (#242)

Browse Source 
- Made greater use of smart pointers, eliminating many instances of manual memory management
- Do not use pointers at all for many non-polymorphic classes
- Assorted other code cleanup
This commit is contained in:
Jaye Evins
2025-10-31 16:11:28 -04:00
committed by GitHub
parent fd10d88be5
commit 8c8e447336
159 changed files with 3364 additions and 4045 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/MainWindow.cpp
+17 -36
View File
@@ -29,7 +29,6 @@
#include "PrintView.h"
#include "PropertiesView.h"
#include "StartupView.h"
#include "UndoRedoModel.h"
#include "VariablesView.h"
#include "model/Db.h"
@@ -63,7 +62,7 @@ namespace glabels
///
/// Constructor
///
MainWindow::MainWindow() : mModel(nullptr), mUndoRedoModel(nullptr)
MainWindow::MainWindow()
{
setWindowIcon( QIcon::fromTheme( "glabels" ) );
@@ -204,30 +203,12 @@ namespace glabels
}
///
/// Destructor
///
MainWindow::~MainWindow()
{
if ( mUndoRedoModel )
{
delete mUndoRedoModel;
}
if ( mModel )
{
delete mModel->merge(); // Ownership of final Merge instance is ours
delete mModel->variables(); // Ownership of Variables instance is ours
delete mModel;
}
}
///
/// Get model accessor
///
model::Model* MainWindow::model() const
{
return mModel;
return mModel.get();
}
@@ -236,15 +217,15 @@ namespace glabels
///
void MainWindow::setModel( model::Model* model )
{
mModel = model; // Ownership passes to us
mUndoRedoModel = new UndoRedoModel( mModel );
mModel.reset( model );
mUndoRedoModel = std::make_unique<UndoRedoModel>( mModel.get() );
mPropertiesView->setModel( mModel, mUndoRedoModel );
mLabelEditor->setModel( mModel, mUndoRedoModel );
mObjectEditor->setModel( mModel, mUndoRedoModel );
mMergeView->setModel( mModel, mUndoRedoModel );
mVariablesView->setModel( mModel, mUndoRedoModel );
mPrintView->setModel( mModel );
mPropertiesView->setModel( mModel.get(), mUndoRedoModel.get() );
mLabelEditor->setModel( mModel.get(), mUndoRedoModel.get() );
mObjectEditor->setModel( mModel.get(), mUndoRedoModel.get() );
mMergeView->setModel( mModel.get(), mUndoRedoModel.get() );
mVariablesView->setModel( mModel.get(), mUndoRedoModel.get() );
mPrintView->setModel( mModel.get() );
mEditorButton->setChecked( true );
mPages->setCurrentIndex( EDITOR_PAGE_INDEX );
@@ -253,11 +234,11 @@ namespace glabels
setTitle();
connect( mLabelEditor, SIGNAL(contextMenuActivate(model::Point)), this, SLOT(onContextMenuActivate(model::Point)) );
connect( mModel, SIGNAL(nameChanged()), this, SLOT(onNameChanged()) );
connect( mModel, SIGNAL(modifiedChanged()), this, SLOT(onModifiedChanged()) );
connect( mModel, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()) );
connect( mModel, SIGNAL(changed()), this, SLOT(onLabelChanged()) );
connect( mUndoRedoModel, SIGNAL(changed()), this, SLOT(onUndoRedoChanged()) );
connect( mModel.get(), SIGNAL(nameChanged()), this, SLOT(onNameChanged()) );
connect( mModel.get(), SIGNAL(modifiedChanged()), this, SLOT(onModifiedChanged()) );
connect( mModel.get(), SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()) );
connect( mModel.get(), SIGNAL(changed()), this, SLOT(onLabelChanged()) );
connect( mUndoRedoModel.get(), SIGNAL(changed()), this, SLOT(onUndoRedoChanged()) );
}
@@ -266,7 +247,7 @@ namespace glabels
///
bool MainWindow::isEmpty() const
{
return mModel == nullptr;
return !mModel;
}
@@ -1032,7 +1013,7 @@ namespace glabels
///
void MainWindow::setTitle()
{
if ( mModel == nullptr )
if ( !mModel )
{
setWindowTitle( "gLabels" );
}