kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-21 00:30:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use QSharedPointer instead of QWeakPointer + remove unused include

Browse Source
This commit is contained in:
joshua
2021-12-26 18:48:11 +01:00
parent 1572fafabe
commit 09694ddec9
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sources/TerminalStrip/UndoCommand/groupterminalscommand.cpp
View File

@@ -16,7 +16,6 @@
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>. along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "groupterminalscommand.h" #include "groupterminalscommand.h"
#include "../../utils/qetutils.h"
#include "../physicalterminal.h" #include "../physicalterminal.h"
/** /**

1
sources/TerminalStrip/UndoCommand/sortterminalstripcommand.cpp
View File

@@ -19,7 +19,6 @@
#include "../terminalstrip.h" #include "../terminalstrip.h"
#include "../physicalterminal.h" #include "../physicalterminal.h"
#include "../realterminal.h" #include "../realterminal.h"
#include "../../utils/qetutils.h"
SortTerminalStripCommand::SortTerminalStripCommand(TerminalStrip *strip, QUndoCommand *parent) : SortTerminalStripCommand::SortTerminalStripCommand(TerminalStrip *strip, QUndoCommand *parent) :
QUndoCommand(parent), QUndoCommand(parent),

14
sources/TerminalStrip/ui/terminalstripeditor.cpp
View File

@@ -34,7 +34,6 @@
#include "../UndoCommand/groupterminalscommand.h" #include "../UndoCommand/groupterminalscommand.h"
#include "../UndoCommand/changeterminallevel.h" #include "../UndoCommand/changeterminallevel.h"
#include "../UndoCommand/bridgeterminalscommand.h" #include "../UndoCommand/bridgeterminalscommand.h"
#include "../../utils/qetutils.h"
#include "../physicalterminal.h" #include "../physicalterminal.h"
#include "../realterminal.h" #include "../realterminal.h"
#include "../terminalstripbridge.h" #include "../terminalstripbridge.h"
@@ -683,13 +682,13 @@ void TerminalStripEditor::on_m_group_terminals_pb_clicked()
{ {
auto receiver_ = m_current_strip->physicalTerminal(mrtd_vector.takeFirst().real_terminal); auto receiver_ = m_current_strip->physicalTerminal(mrtd_vector.takeFirst().real_terminal);
QVector<QWeakPointer<RealTerminal>> vector_; QVector<QSharedPointer<RealTerminal>> vector_;
for (const auto & mrtd : mrtd_vector) { for (const auto & mrtd : mrtd_vector) {
vector_.append(mrtd.real_terminal); vector_.append(mrtd.real_terminal.toStrongRef());
} }
m_project->undoStack()->push(new GroupTerminalsCommand(m_current_strip, m_project->undoStack()->push(new GroupTerminalsCommand(m_current_strip,
receiver_, receiver_,
QETUtils::weakVectorToShared(vector_))); vector_));
} }
} }
} }
@@ -703,12 +702,11 @@ void TerminalStripEditor::on_m_ungroup_pb_clicked()
{ {
const auto mrtd_vector = m_model->modelRealTerminalDataForIndex(ui->m_table_widget->selectionModel()->selectedIndexes()); const auto mrtd_vector = m_model->modelRealTerminalDataForIndex(ui->m_table_widget->selectionModel()->selectedIndexes());
QVector<QWeakPointer<RealTerminal>> vector_; QVector<QSharedPointer<RealTerminal>> vector_;
for (const auto &mrtd : mrtd_vector) { for (const auto &mrtd : mrtd_vector) {
vector_.append(mrtd.real_terminal); vector_.append(mrtd.real_terminal.toStrongRef());
} }
m_project->undoStack()->push(new UnGroupTerminalsCommand(m_current_strip, m_project->undoStack()->push(new UnGroupTerminalsCommand(m_current_strip,vector_));
QETUtils::weakVectorToShared(vector_)));
} }
} }