diff options
Diffstat (limited to 'mappingtreewidget.cpp')
| -rw-r--r-- | mappingtreewidget.cpp | 63 |
1 files changed, 32 insertions, 31 deletions
diff --git a/mappingtreewidget.cpp b/mappingtreewidget.cpp index 076f7d6..7ad16a1 100644 --- a/mappingtreewidget.cpp +++ b/mappingtreewidget.cpp @@ -44,19 +44,19 @@ MappingTreeWidget::MappingTreeWidget(QWidget *parent) : QWidget(parent){ mTree->setColumnHidden(4, true); mTree->setAlternatingRowColors(true); mTree->expandAll(); - connect(mModel, SIGNAL(needExpansion()), mTree, SLOT(expandAll())); - connect(mTree->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(selectionChanged())); + connect(mModel, &MappingTreeModel::needExpansion, mTree, &MappingTreeView::expandAll); + connect(mTree->selectionModel(), &QItemSelectionModel::selectionChanged, this, &MappingTreeWidget::selectionChanged); /* Hide buttons, this doesn't really work, * but keep them for future use :) */ mTypeBox = new QComboBox; mTypeBox->setModel(mTypesModel); - connect(mTypeBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(typeChanged(QString))); + connect(mTypeBox, QOverload<const QString &>::of(&QComboBox::currentIndexChanged), this, &MappingTreeWidget::typeChanged); mTypeBox->setHidden(true); mAddType = new QPushButton(tr("Add &type")); - connect(mAddType, SIGNAL(clicked()), this, SLOT(addType())); + connect(mAddType, &QPushButton::clicked, this, &MappingTreeWidget::addType); mAddType->setHidden(true); mDeleteType = new QPushButton(tr("Delete type")); - connect(mDeleteType, SIGNAL(clicked()), this, SLOT(deleteType())); + connect(mDeleteType, &QPushButton::clicked, this, &MappingTreeWidget::deleteType); mDeleteType->setHidden(true); QHBoxLayout *typesButtonLayout = new QHBoxLayout; typesButtonLayout->addWidget(mDeleteType); @@ -79,14 +79,14 @@ MappingTreeWidget::MappingTreeWidget(QWidget *parent) : QWidget(parent){ // filter + refresh mFilter = new QLineEdit; - connect(mFilter, SIGNAL(returnPressed()), this, SLOT(filter())); + connect(mFilter, &QLineEdit::returnPressed, this, &MappingTreeWidget::filter); mDoFilter = new QPushButton(tr("Filter")); - connect(mDoFilter, SIGNAL(clicked()), this, SLOT(filter())); + connect(mDoFilter, &QPushButton::clicked, this, &MappingTreeWidget::filter); mClearFilter = new QPushButton(tr("Clear")); - connect(mClearFilter, SIGNAL(clicked()), this, SLOT(clearFilter())); + connect(mClearFilter, &QPushButton::clicked, this, &MappingTreeWidget::clearFilter); mRefresh = new QPushButton; mRefresh->setIcon(QIcon(":/refresh.png")); - connect(mRefresh, SIGNAL(clicked()), mModel, SLOT(populate())); + connect(mRefresh, &QPushButton::clicked, mModel, &MappingTreeModel::populate); QLabel *filterLabel = new QLabel(tr("Filter")); QHBoxLayout *filterLayout = new QHBoxLayout; filterLayout->addWidget(filterLabel); @@ -97,17 +97,17 @@ MappingTreeWidget::MappingTreeWidget(QWidget *parent) : QWidget(parent){ //setup actions mAddChildA = new QAction(tr("Add child..."), this); - connect(mAddChildA, SIGNAL(triggered()), this, SLOT(addChild())); + connect(mAddChildA, &QAction::triggered, this, &MappingTreeWidget::addChild); mTree->addAction(mAddChildA); mAddActorA = new QAction(tr("Add actor..."), this); mAddActorA->setShortcut(Qt::CTRL + Qt::Key_A); - connect(mAddActorA, SIGNAL(triggered()), this, SLOT(addActor())); + connect(mAddActorA, &QAction::triggered, this, &MappingTreeWidget::addActor); mTree->addAction(mAddActorA); mDeleteChildA = new QAction(tr("Delete..."), this); - connect(mDeleteChildA, SIGNAL(triggered()), this, SLOT(deleteChild())); + connect(mDeleteChildA, &QAction::triggered, this, &MappingTreeWidget::deleteChild); mTree->addAction(mDeleteChildA); mEditChildA = new QAction(tr("Edit..."), this); - connect(mEditChildA, SIGNAL(triggered()), this, SLOT(editChild())); + connect(mEditChildA, &QAction::triggered, this, &MappingTreeWidget::editChild); mTree->addAction(mEditChildA); //widget layout and misc @@ -137,7 +137,8 @@ QList<MappingData> MappingTreeWidget::selectedTree() const { QList<MappingData> MappingTreeWidget::selectedTreeRecursive(const QModelIndex &start) const{ QList<MappingData> retval; - QModelIndex curChild = start.child(0,0); + const QAbstractItemModel *startModel = start.model(); + QModelIndex curChild = startModel->index(0, 0, start); if(!curChild.isValid()){ QModelIndex real = mProxy->mapToSource(start); retval << mModel->mappingDataFromIndex(real); @@ -147,7 +148,7 @@ QList<MappingData> MappingTreeWidget::selectedTreeRecursive(const QModelIndex &s while(curChild.isValid()){ retval << selectedTreeRecursive(curChild); ++row; - curChild = start.child(row, 0); + curChild = startModel->index(row, 0, start); } return retval; } @@ -378,21 +379,21 @@ MappingEditWidget::MappingEditWidget(QWidget *parent) : QWidget(parent){ mMappingResult->setColumnHidden(1, true); mMappingResult->setColumnHidden(2, true); mMappingResult->setColumnHidden(3, true); - connect(mMappingTree->mappingTreeView(), SIGNAL(addMapping()), this, SLOT(addMapping())); - connect(mMappingTree->mappingTreeView(), SIGNAL(clearMappings()), this, SLOT(clearMapping())); - connect(mMappingTree->mappingTreeView(), SIGNAL(shiftFocus()), this, SLOT(shiftFocusResult())); - connect(mMappingResult, SIGNAL(shiftFocus()), this, SLOT(shiftFocusMappings())); - connect(mMappingResult, SIGNAL(removeMapping()), this, SLOT(removeMapping())); + connect(mMappingTree->mappingTreeView(), &MappingTreeView::addMapping, this, &MappingEditWidget::addMapping); + connect(mMappingTree->mappingTreeView(), &MappingTreeView::clearMappings, this, &MappingEditWidget::clearMapping); + connect(mMappingTree->mappingTreeView(), &MappingTreeView::shiftFocus, this, &MappingEditWidget::shiftFocusResult); + connect(mMappingResult, &MappingTreeResultView::shiftFocus, this, &MappingEditWidget::shiftFocusMappings); + connect(mMappingResult, &MappingTreeResultView::removeMapping, this, &MappingEditWidget::removeMapping); //buttons mAddMapping = new QPushButton(tr(">>")); - connect(mAddMapping, SIGNAL(clicked()), this, SLOT(addMapping())); + connect(mAddMapping, &QPushButton::clicked, this, &MappingEditWidget::addMapping); mRemoveMapping = new QPushButton(tr("<<")); - connect(mRemoveMapping, SIGNAL(clicked()), this, SLOT(removeMapping())); + connect(mRemoveMapping, &QPushButton::clicked, this, &MappingEditWidget::removeMapping); mClearMapping = new QPushButton(tr("&Clear")); - connect(mClearMapping, SIGNAL(clicked()), this, SLOT(clearMapping())); + connect(mClearMapping, &QPushButton::clicked, this, &MappingEditWidget::clearMapping); mAddTree = new QPushButton(tr(">>>>")); - connect(mAddTree, SIGNAL(clicked()), this, SLOT(addTree())); + connect(mAddTree, &QPushButton::clicked, this, &MappingEditWidget::addTree); //layout QHBoxLayout *mainLayout = new QHBoxLayout; @@ -419,7 +420,7 @@ void MappingEditWidget::addMapping(){ void MappingEditWidget::addTree(){ QList<MappingData> retval = mMappingTree->selectedTree(); - foreach(MappingData md, retval){ + for(const MappingData &md : retval){ mResultModel->addItem(md); } mMappingResult->expandAll(); @@ -449,7 +450,7 @@ void MappingEditWidget::setMappings(const QList<MappingData> &mappings){ return; } mResultModel->clearData(); - foreach(MappingData d, mappings){ + for(const MappingData &d : mappings){ mResultModel->addItem(d); } mMappingResult->expandAll(); @@ -471,7 +472,7 @@ void MappingEditWidget::saveMappings(QString where){ const QList<MappingData> mappingData = model()->mappingData(); QByteArray saveVal; QDataStream in(&saveVal, QIODevice::WriteOnly); - foreach(MappingData md, mappingData){ + for(const MappingData &md : mappingData){ in << md; } QSettings s; @@ -492,9 +493,9 @@ void MappingEditWidget::loadMappings(QString from){ MappingInputDialog::MappingInputDialog(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f){ mOk = new QPushButton(tr("Ok")); - connect(mOk, SIGNAL(clicked()), this, SLOT(accept())); + connect(mOk, &QPushButton::clicked, this, &MappingInputDialog::accept); mCancel = new QPushButton(tr("Cancel")); - connect(mCancel, SIGNAL(clicked()), this, SLOT(reject())); + connect(mCancel, &QPushButton::clicked, this, &MappingInputDialog::reject); mIsRoot = new QCheckBox(tr("Create root item")); mEditor = new QLineEdit; @@ -530,9 +531,9 @@ bool MappingInputDialog::createRoot() const { MappingEditDialog::MappingEditDialog(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f){ mEditWidget = new MappingEditWidget; mOk = new QPushButton(tr("Ok")); - connect(mOk, SIGNAL(clicked()), this, SLOT(accept())); + connect(mOk, &QPushButton::clicked, this, &MappingEditDialog::accept); mCancel = new QPushButton(tr("Cancel")); - connect(mCancel, SIGNAL(clicked()), this, SLOT(reject())); + connect(mCancel, &QPushButton::clicked, this, &MappingEditDialog::reject); QHBoxLayout *buttonLayout = new QHBoxLayout; buttonLayout->addStretch(); |