Avoid copying QSharedPointers when not needed
This commit is contained in:
committed by
Jonathan White
parent
6df9c6f9b2
commit
39b96c13e8
@@ -113,7 +113,7 @@ void EditWidgetIcons::reset()
|
||||
}
|
||||
|
||||
void EditWidgetIcons::load(const QUuid& currentUuid,
|
||||
QSharedPointer<Database> database,
|
||||
const QSharedPointer<Database>& database,
|
||||
const IconStruct& iconStruct,
|
||||
const QString& url)
|
||||
{
|
||||
|
||||
@@ -60,7 +60,7 @@ public:
|
||||
IconStruct state();
|
||||
void reset();
|
||||
void load(const QUuid& currentUuid,
|
||||
QSharedPointer<Database> database,
|
||||
const QSharedPointer<Database>& database,
|
||||
const IconStruct& iconStruct,
|
||||
const QString& url = "");
|
||||
|
||||
|
||||
@@ -105,7 +105,7 @@ DatabaseSettingsDialog::~DatabaseSettingsDialog()
|
||||
{
|
||||
}
|
||||
|
||||
void DatabaseSettingsDialog::load(QSharedPointer<Database> db)
|
||||
void DatabaseSettingsDialog::load(const QSharedPointer<Database>& db)
|
||||
{
|
||||
m_ui->categoryList->setCurrentCategory(0);
|
||||
m_generalWidget->load(db);
|
||||
|
||||
@@ -61,7 +61,7 @@ public:
|
||||
~DatabaseSettingsDialog() override;
|
||||
Q_DISABLE_COPY(DatabaseSettingsDialog);
|
||||
|
||||
void load(QSharedPointer<Database> db);
|
||||
void load(const QSharedPointer<Database>& db);
|
||||
void addSettingsPage(IDatabaseSettingsPage* page);
|
||||
void showMasterKeySettings();
|
||||
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
#include "DatabaseSettingsWidget.h"
|
||||
#include "core/Database.h"
|
||||
|
||||
#include <utility>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QWidget>
|
||||
|
||||
@@ -38,6 +40,6 @@ DatabaseSettingsWidget::~DatabaseSettingsWidget()
|
||||
*/
|
||||
void DatabaseSettingsWidget::load(QSharedPointer<Database> db)
|
||||
{
|
||||
m_db = db;
|
||||
m_db = std::move(db);
|
||||
initialize();
|
||||
}
|
||||
|
||||
@@ -91,7 +91,7 @@ EditGroupWidget::~EditGroupWidget()
|
||||
{
|
||||
}
|
||||
|
||||
void EditGroupWidget::loadGroup(Group* group, bool create, QSharedPointer<Database> database)
|
||||
void EditGroupWidget::loadGroup(Group* group, bool create, const QSharedPointer<Database>& database)
|
||||
{
|
||||
m_group = group;
|
||||
m_db = database;
|
||||
|
||||
@@ -55,7 +55,7 @@ public:
|
||||
explicit EditGroupWidget(QWidget* parent = nullptr);
|
||||
~EditGroupWidget();
|
||||
|
||||
void loadGroup(Group* group, bool create, QSharedPointer<Database> database);
|
||||
void loadGroup(Group* group, bool create, const QSharedPointer<Database>& database);
|
||||
void clear();
|
||||
|
||||
void addEditPage(IEditGroupPage* page);
|
||||
|
||||
@@ -50,7 +50,7 @@ GroupView::GroupView(Database* db, QWidget* parent)
|
||||
setDefaultDropAction(Qt::MoveAction);
|
||||
}
|
||||
|
||||
void GroupView::changeDatabase(QSharedPointer<Database> newDb)
|
||||
void GroupView::changeDatabase(const QSharedPointer<Database>& newDb)
|
||||
{
|
||||
m_model->changeDatabase(newDb.data());
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ class GroupView : public QTreeView
|
||||
|
||||
public:
|
||||
explicit GroupView(Database* db, QWidget* parent = nullptr);
|
||||
void changeDatabase(QSharedPointer<Database> newDb);
|
||||
void changeDatabase(const QSharedPointer<Database>& newDb);
|
||||
void setModel(QAbstractItemModel* model) override;
|
||||
Group* currentGroup();
|
||||
void setCurrentGroup(Group* group);
|
||||
|
||||
@@ -38,7 +38,7 @@ class NewDatabaseWizardPage : public QWizardPage
|
||||
|
||||
public:
|
||||
explicit NewDatabaseWizardPage(QWidget* parent = nullptr);
|
||||
Q_DISABLE_COPY(NewDatabaseWizardPage);
|
||||
Q_DISABLE_COPY(NewDatabaseWizardPage)
|
||||
~NewDatabaseWizardPage() override;
|
||||
|
||||
void setPageWidget(DatabaseSettingsWidget* page);
|
||||
|
||||
Reference in New Issue
Block a user