Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-06 21:44:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

Make C++11 mandatory.

Browse source
This commit is contained in:
Felix Geyer 2015-07-24 18:28:12 +02:00
parent 0e85c98d02
commit 7fa0eddc5f
112 changed files with 332 additions and 411 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/gui/group/EditGroupWidget.cpp
View file

@ -28,8 +28,8 @@ EditGroupWidget::EditGroupWidget(QWidget* parent)
, m_editGroupWidgetMain(new QWidget())
, m_editGroupWidgetIcons(new EditWidgetIcons())
, m_editWidgetProperties(new EditWidgetProperties())
, m_group(Q_NULLPTR)
, m_database(Q_NULLPTR)
, m_group(nullptr)
, m_database(nullptr)
{
m_mainUi->setupUi(m_editGroupWidgetMain);
@ -142,8 +142,8 @@ void EditGroupWidget::cancel()
void EditGroupWidget::clear()
{
m_group = Q_NULLPTR;
m_database = Q_NULLPTR;
m_group = nullptr;
m_database = nullptr;
}
void EditGroupWidget::addTriStateItems(QComboBox* comboBox, bool inheritDefault)

2
src/gui/group/EditGroupWidget.h
View file

@ -37,7 +37,7 @@ class EditGroupWidget : public EditWidget
Q_OBJECT
public:
explicit EditGroupWidget(QWidget* parent = Q_NULLPTR);
explicit EditGroupWidget(QWidget* parent = nullptr);
~EditGroupWidget();
void loadGroup(Group* group, bool create, Database* database);

6
src/gui/group/GroupModel.cpp
View file

@ -28,7 +28,7 @@
GroupModel::GroupModel(Database* db, QObject* parent)
: QAbstractItemModel(parent)
, m_db(Q_NULLPTR)
, m_db(nullptr)
{
changeDatabase(db);
}
@ -329,7 +329,7 @@ QStringList GroupModel::mimeTypes() const
QMimeData* GroupModel::mimeData(const QModelIndexList& indexes) const
{
if (indexes.isEmpty()) {
return Q_NULLPTR;
return nullptr;
}
QMimeData* data = new QMimeData();
@ -354,7 +354,7 @@ QMimeData* GroupModel::mimeData(const QModelIndexList& indexes) const
if (seenGroups.isEmpty()) {
delete data;
return Q_NULLPTR;
return nullptr;
}
else {
data->setData(mimeTypes().first(), encoded);

22
src/gui/group/GroupModel.h
View file

@ -20,8 +20,6 @@
#include <QAbstractItemModel>
#include "core/Global.h"
class Database;
class Group;
@ -30,23 +28,23 @@ class GroupModel : public QAbstractItemModel
Q_OBJECT
public:
explicit GroupModel(Database* db, QObject* parent = Q_NULLPTR);
explicit GroupModel(Database* db, QObject* parent = nullptr);
void changeDatabase(Database* newDb);
QModelIndex index(Group* group) const;
Group* groupFromIndex(const QModelIndex& index) const;
int rowCount(const QModelIndex& parent = QModelIndex()) const;
int columnCount(const QModelIndex& parent = QModelIndex()) const;
QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
QModelIndex parent(const QModelIndex& index) const Q_DECL_OVERRIDE;
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE;
Qt::ItemFlags flags(const QModelIndex& modelIndex) const Q_DECL_OVERRIDE;
QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
QModelIndex parent(const QModelIndex& index) const override;
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
Qt::DropActions supportedDropActions() const override;
Qt::ItemFlags flags(const QModelIndex& modelIndex) const override;
bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column,
const QModelIndex& parent) Q_DECL_OVERRIDE;
QStringList mimeTypes() const Q_DECL_OVERRIDE;
QMimeData* mimeData(const QModelIndexList& indexes) const Q_DECL_OVERRIDE;
const QModelIndex& parent) override;
QStringList mimeTypes() const override;
QMimeData* mimeData(const QModelIndexList& indexes) const override;
private:
QModelIndex parent(Group* group) const;

2
src/gui/group/GroupView.cpp
View file

@ -75,7 +75,7 @@ void GroupView::dragMoveEvent(QDragMoveEvent* event)
Group* GroupView::currentGroup()
{
if (currentIndex() == QModelIndex()) {
return Q_NULLPTR;
return nullptr;
}
else {
return m_model->groupFromIndex(currentIndex());

6
src/gui/group/GroupView.h
View file

@ -20,8 +20,6 @@
#include <QTreeView>
#include "core/Global.h"
class Database;
class Group;
class GroupModel;
@ -31,9 +29,9 @@ class GroupView : public QTreeView
Q_OBJECT
public:
explicit GroupView(Database* db, QWidget* parent = Q_NULLPTR);
explicit GroupView(Database* db, QWidget* parent = nullptr);
void changeDatabase(Database* newDb);
void setModel(QAbstractItemModel* model) Q_DECL_OVERRIDE;
void setModel(QAbstractItemModel* model) override;
Group* currentGroup();
void setCurrentGroup(Group* group);
void expandGroup(Group* group, bool expand = true);