From 0d44933432b9a323658247c34aeb793236fef952 Mon Sep 17 00:00:00 2001 From: plc-user <74435298+plc-user@users.noreply.github.com> Date: Wed, 24 Apr 2024 18:02:00 +0200 Subject: [PATCH] correct more indentations / whitespace --- sources/ElementsCollection/ui/renamedialog.h | 2 +- .../ui/replaceconductordialog.cpp | 4 +- sources/editor/ui/ellipseeditor.cpp | 2 +- sources/editor/ui/ellipseeditor.h | 2 +- sources/editor/ui/lineeditor.h | 10 +- sources/editor/ui/qetelementeditor.cpp | 6 +- sources/editor/ui/terminaleditor.cpp | 30 ++--- sources/editor/ui/terminaleditor.h | 36 +++--- sources/editor/ui/texteditor.cpp | 106 +++++++++--------- sources/ui/aboutqetdialog.cpp | 22 ++-- .../configpage/generalconfigurationpage.cpp | 30 ++--- .../ui/configpage/generalconfigurationpage.h | 4 +- sources/ui/linksingleelementwidget.cpp | 4 +- sources/ui/projectpropertiesdialog.cpp | 6 +- sources/ui/projectpropertiesdialog.h | 4 +- .../ui/shapegraphicsitempropertieswidget.cpp | 64 +++++------ .../ui/shapegraphicsitempropertieswidget.h | 4 +- 17 files changed, 168 insertions(+), 168 deletions(-) diff --git a/sources/ElementsCollection/ui/renamedialog.h b/sources/ElementsCollection/ui/renamedialog.h index c43a42d10..f6bef1901 100644 --- a/sources/ElementsCollection/ui/renamedialog.h +++ b/sources/ElementsCollection/ui/renamedialog.h @@ -23,7 +23,7 @@ #include namespace Ui { - class RenameDialog; + class RenameDialog; } class RenameDialog : public QDialog diff --git a/sources/SearchAndReplace/ui/replaceconductordialog.cpp b/sources/SearchAndReplace/ui/replaceconductordialog.cpp index 387c92d2f..00ea72b55 100644 --- a/sources/SearchAndReplace/ui/replaceconductordialog.cpp +++ b/sources/SearchAndReplace/ui/replaceconductordialog.cpp @@ -124,7 +124,7 @@ void ReplaceConductorDialog::setProperties(const ConductorProperties &properties ui->m_pen_cb ->setChecked (m_properties.singleLineProperties.isPen()); ui->m_phase_cb ->setChecked (m_properties.singleLineProperties.phasesCount()); ui->m_phase_slider->setValue (m_properties.singleLineProperties.phasesCount()); - + updatePreview(false); } @@ -252,7 +252,7 @@ void ReplaceConductorDialog::setColorButton2(const QColor &color) void ReplaceConductorDialog::on_m_erase_formula_cb_clicked() { - ui->m_formula_le->setText(ui->m_erase_formula_cb->isChecked() + ui->m_formula_le->setText(ui->m_erase_formula_cb->isChecked() ? SearchAndReplaceWorker::eraseText() : QString()); ui->m_formula_le->setDisabled(ui->m_erase_formula_cb->isChecked()); diff --git a/sources/editor/ui/ellipseeditor.cpp b/sources/editor/ui/ellipseeditor.cpp index 308264e33..393de0ba4 100644 --- a/sources/editor/ui/ellipseeditor.cpp +++ b/sources/editor/ui/ellipseeditor.cpp @@ -34,7 +34,7 @@ EllipseEditor::EllipseEditor(QETElementEditor *editor, PartEllipse *part, QWidge ui(new Ui::EllipseEditor), m_part(part) { - ui->setupUi(this); + ui->setupUi(this); m_style = new StyleEditor(editor); ui->m_main_layout->insertWidget(0, m_style); updateForm(); diff --git a/sources/editor/ui/ellipseeditor.h b/sources/editor/ui/ellipseeditor.h index 2567ad4c8..36cf50328 100644 --- a/sources/editor/ui/ellipseeditor.h +++ b/sources/editor/ui/ellipseeditor.h @@ -33,7 +33,7 @@ class StyleEditor; */ class EllipseEditor : public ElementItemEditor { - Q_OBJECT + Q_OBJECT public: explicit EllipseEditor (QETElementEditor *editor, PartEllipse *part = nullptr, QWidget *parent = nullptr); diff --git a/sources/editor/ui/lineeditor.h b/sources/editor/ui/lineeditor.h index 9e386adeb..0c6a8b104 100644 --- a/sources/editor/ui/lineeditor.h +++ b/sources/editor/ui/lineeditor.h @@ -21,7 +21,7 @@ #include "../elementitemeditor.h" namespace Ui { - class LineEditor; + class LineEditor; } class PartLine; @@ -33,11 +33,11 @@ class StyleEditor; */ class LineEditor : public ElementItemEditor { - Q_OBJECT + Q_OBJECT - public: - explicit LineEditor(QETElementEditor *editor, PartLine *part = nullptr, QWidget *parent = nullptr); - ~LineEditor() override; + public: + explicit LineEditor(QETElementEditor *editor, PartLine *part = nullptr, QWidget *parent = nullptr); + ~LineEditor() override; bool setPart(CustomElementPart *part) override; bool setParts(QList parts) override; diff --git a/sources/editor/ui/qetelementeditor.cpp b/sources/editor/ui/qetelementeditor.cpp index 79b9e27c2..684a5ca48 100644 --- a/sources/editor/ui/qetelementeditor.cpp +++ b/sources/editor/ui/qetelementeditor.cpp @@ -106,7 +106,7 @@ void QETElementEditor::contextMenu(QPoint p, QList actions) menu.addAction(ui->m_delete_action); menu.addAction(ui->m_cut_action); menu.addAction(ui->m_copy_action); - menu.addAction((ui->m_rotate_action)); + menu.addAction((ui->m_rotate_action)); menu.addSeparator(); menu.addAction(ui->m_paste_action); menu.addAction(ui->m_paste_in_area_action); @@ -1026,10 +1026,10 @@ void QETElementEditor::setupActions() depth_toolbar -> addActions(m_depth_action_group -> actions()); addToolBar(Qt::TopToolBarArea, depth_toolbar); - //Rotate action + //Rotate action connect(ui->m_rotate_action, &QAction::triggered, [this]() {this -> elementScene() -> undoStack().push(new RotateElementsCommand(this->elementScene()));}); - //Zoom action + //Zoom action ui->m_zoom_in_action -> setShortcut(QKeySequence::ZoomIn); ui->m_zoom_out_action -> setShortcut(QKeySequence::ZoomOut); ui->m_zoom_fit_best_action -> setShortcut(QKeySequence(tr("Ctrl+9"))); diff --git a/sources/editor/ui/terminaleditor.cpp b/sources/editor/ui/terminaleditor.cpp index 685aa5174..c84ae5ecf 100644 --- a/sources/editor/ui/terminaleditor.cpp +++ b/sources/editor/ui/terminaleditor.cpp @@ -1,19 +1,19 @@ /* - Copyright 2006-2024 The QElectroTech Team - This file is part of QElectroTech. + Copyright 2006-2024 The QElectroTech Team + This file is part of QElectroTech. - QElectroTech is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + QElectroTech is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. - QElectroTech is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + QElectroTech is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with QElectroTech. If not, see . + You should have received a copy of the GNU General Public License + along with QElectroTech. If not, see . */ #include "terminaleditor.h" #include "ui_terminaleditor.h" @@ -114,9 +114,9 @@ CustomElementPart *TerminalEditor::currentPart() const */ void TerminalEditor::init() { - ui->m_orientation_cb->addItem(QET::Icons::North, tr("Nord"), Qet::North); - ui->m_orientation_cb->addItem(QET::Icons::East, tr("Est"), Qet::East); - ui->m_orientation_cb->addItem(QET::Icons::South, tr("Sud"), Qet::South); + ui->m_orientation_cb->addItem(QET::Icons::North, tr("Nord"), Qet::North); + ui->m_orientation_cb->addItem(QET::Icons::East, tr("Est"), Qet::East); + ui->m_orientation_cb->addItem(QET::Icons::South, tr("Sud"), Qet::South); ui->m_orientation_cb->addItem(QET::Icons::West, tr("Ouest"), Qet::West); ui->m_type_cb->addItem(tr("Générique"), TerminalData::Generic); diff --git a/sources/editor/ui/terminaleditor.h b/sources/editor/ui/terminaleditor.h index 9d1a6929a..83013fb74 100644 --- a/sources/editor/ui/terminaleditor.h +++ b/sources/editor/ui/terminaleditor.h @@ -1,19 +1,19 @@ /* - Copyright 2006-2024 The QElectroTech Team - This file is part of QElectroTech. + Copyright 2006-2024 The QElectroTech Team + This file is part of QElectroTech. - QElectroTech is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + QElectroTech is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. - QElectroTech is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + QElectroTech is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with QElectroTech. If not, see . + You should have received a copy of the GNU General Public License + along with QElectroTech. If not, see . */ #ifndef TERMINALEDITOR_H #define TERMINALEDITOR_H @@ -33,18 +33,18 @@ class PartTerminal; */ class TerminalEditor : public ElementItemEditor { - Q_OBJECT + Q_OBJECT - public: + public: TerminalEditor(QETElementEditor *editor, QWidget *parent = nullptr); ~TerminalEditor() override; - void updateForm() override; + void updateForm() override; bool setPart(CustomElementPart *new_part) override; CustomElementPart *currentPart() const override; QList currentParts() const override {return QList();} - private: + private: void init(); void posEdited(); void orientationEdited(); @@ -53,8 +53,8 @@ class TerminalEditor : public ElementItemEditor void activeConnections(bool active); void activeChangeConnections(bool active); - private: - Ui::TerminalEditor *ui; + private: + Ui::TerminalEditor *ui; QVector m_editor_connections, m_change_connections; PartTerminal *m_part = nullptr; diff --git a/sources/editor/ui/texteditor.cpp b/sources/editor/ui/texteditor.cpp index 2ed2e3960..feb34df51 100644 --- a/sources/editor/ui/texteditor.cpp +++ b/sources/editor/ui/texteditor.cpp @@ -295,83 +295,83 @@ void TextEditor::setUpWidget(QWidget *parent) setWindowTitle(tr("Form")); resize(378, 133); QGridLayout *gridLayout = new QGridLayout(parent); - gridLayout->setObjectName(QString::fromUtf8("gridLayout")); - m_y_sb = new QSpinBox(parent); - m_y_sb->setObjectName(QString::fromUtf8("m_y_sb")); - m_y_sb->setMinimum(-10000); - m_y_sb->setMaximum(10000); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + m_y_sb = new QSpinBox(parent); + m_y_sb->setObjectName(QString::fromUtf8("m_y_sb")); + m_y_sb->setMinimum(-10000); + m_y_sb->setMaximum(10000); - gridLayout->addWidget(m_y_sb, 1, 3, 1, 1); + gridLayout->addWidget(m_y_sb, 1, 3, 1, 1); - QLabel*label_2 = new QLabel(tr("Y :"),parent); + QLabel*label_2 = new QLabel(tr("Y :"),parent); - gridLayout->addWidget(label_2, 1, 2, 1, 1); + gridLayout->addWidget(label_2, 1, 2, 1, 1); - QLabel*label_4 = new QLabel(tr("Police :"),parent); + QLabel*label_4 = new QLabel(tr("Police :"),parent); - gridLayout->addWidget(label_4, 2, 0, 1, 1); + gridLayout->addWidget(label_4, 2, 0, 1, 1); - m_rotation_sb = new QSpinBox(parent); - m_rotation_sb->setSuffix(tr("\302\260")); - m_rotation_sb->setWrapping(true); - m_rotation_sb->setMaximum(360); + m_rotation_sb = new QSpinBox(parent); + m_rotation_sb->setSuffix(tr("\302\260")); + m_rotation_sb->setWrapping(true); + m_rotation_sb->setMaximum(360); - gridLayout->addWidget(m_rotation_sb, 1, 5, 1, 1); + gridLayout->addWidget(m_rotation_sb, 1, 5, 1, 1); - QLabel *label_3 = new QLabel(tr("Rotation :"),parent); + QLabel *label_3 = new QLabel(tr("Rotation :"),parent); - gridLayout->addWidget(label_3, 1, 4, 1, 1); + gridLayout->addWidget(label_3, 1, 4, 1, 1); - m_x_sb = new QSpinBox(parent); - m_x_sb->setObjectName(QString::fromUtf8("m_x_sb")); - m_x_sb->setMinimum(-10000); - m_x_sb->setMaximum(10000); + m_x_sb = new QSpinBox(parent); + m_x_sb->setObjectName(QString::fromUtf8("m_x_sb")); + m_x_sb->setMinimum(-10000); + m_x_sb->setMaximum(10000); - gridLayout->addWidget(m_x_sb, 1, 1, 1, 1); + gridLayout->addWidget(m_x_sb, 1, 1, 1, 1); - QLabel *label = new QLabel(tr("X :"),parent); + QLabel *label = new QLabel(tr("X :"),parent); - gridLayout->addWidget(label, 1, 0, 1, 1); + gridLayout->addWidget(label, 1, 0, 1, 1); - m_size_sb = new QSpinBox(parent); - m_size_sb->setObjectName(QString::fromUtf8("m_size_sb")); + m_size_sb = new QSpinBox(parent); + m_size_sb->setObjectName(QString::fromUtf8("m_size_sb")); - gridLayout->addWidget(m_size_sb, 2, 1, 1, 1); + gridLayout->addWidget(m_size_sb, 2, 1, 1, 1); - m_line_edit = new QLineEdit(parent); - m_line_edit->setObjectName(QString::fromUtf8("m_line_edit")); - m_line_edit->setClearButtonEnabled(true); - m_line_edit->setPlaceholderText(tr("Entrer votre texte ici")); + m_line_edit = new QLineEdit(parent); + m_line_edit->setObjectName(QString::fromUtf8("m_line_edit")); + m_line_edit->setClearButtonEnabled(true); + m_line_edit->setPlaceholderText(tr("Entrer votre texte ici")); - gridLayout->addWidget(m_line_edit, 0, 0, 1, 6); + gridLayout->addWidget(m_line_edit, 0, 0, 1, 6); #ifdef BUILD_WITHOUT_KF5 #else - m_color_pb = new KColorButton(parent); - m_color_pb->setObjectName(QString::fromUtf8("m_color_pb")); + m_color_pb = new KColorButton(parent); + m_color_pb->setObjectName(QString::fromUtf8("m_color_pb")); - connect( - m_color_pb, - &KColorButton::changed, - this, - &TextEditor::on_m_color_pb_changed); + connect( + m_color_pb, + &KColorButton::changed, + this, + &TextEditor::on_m_color_pb_changed); - gridLayout->addWidget(m_color_pb, 2, 5, 1, 1); - #endif - QLabel *label_5 = new QLabel(parent); - label_5->setObjectName(QString::fromUtf8("label_5")); + gridLayout->addWidget(m_color_pb, 2, 5, 1, 1); +#endif + QLabel *label_5 = new QLabel(parent); + label_5->setObjectName(QString::fromUtf8("label_5")); - gridLayout->addWidget(label_5, 2, 4, 1, 1); + gridLayout->addWidget(label_5, 2, 4, 1, 1); - m_font_pb = new QPushButton(tr("Couleur :"),parent); - connect(m_font_pb, - &QPushButton::pressed, - this, - &TextEditor::on_m_font_pb_clicked); + m_font_pb = new QPushButton(tr("Couleur :"),parent); + connect(m_font_pb, + &QPushButton::pressed, + this, + &TextEditor::on_m_font_pb_clicked); - gridLayout->addWidget(m_font_pb, 2, 2, 1, 2); + gridLayout->addWidget(m_font_pb, 2, 2, 1, 2); - QSpacerItem *verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding); + QSpacerItem *verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding); - gridLayout->addItem(verticalSpacer, 3, 2, 1, 1); - setLayout(gridLayout); + gridLayout->addItem(verticalSpacer, 3, 2, 1, 1); + setLayout(gridLayout); } diff --git a/sources/ui/aboutqetdialog.cpp b/sources/ui/aboutqetdialog.cpp index 336122263..b45b10ff7 100644 --- a/sources/ui/aboutqetdialog.cpp +++ b/sources/ui/aboutqetdialog.cpp @@ -64,17 +64,17 @@ void AboutQETDialog::setAbout() tr(" Les développeurs de QElectroTech", "about tab, developers line") + "

" "https://qelectrotech.org/" - "

" + - "The program is provided AS IS with NO WARRANTY OF ANY KIND," - "
" - " INCLUDING THE WARRANTY OF DESIGN, " - "
" - "MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE."; - "
" + "

" + + "The program is provided AS IS with NO WARRANTY OF ANY KIND," + "
" + " INCLUDING THE WARRANTY OF DESIGN, " + "
" + "MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE."; + "
" "

" + tr("Contact : qet@lists.tuxfamily.org", "about tab, contact line"); - - + + ui->m_about_label->setText(str); } @@ -91,7 +91,7 @@ void AboutQETDialog::setAuthors() addAuthor(ui->m_author_label, "Ronny Desmedt", "r.desmedt@live.be", tr("Convertisseur DXF")); addAuthor(ui->m_author_label, "Raul Roda", "raulroda8@gmail.com", tr("Plugin Bornier")); addAuthor(ui->m_author_label, "Abhishek Bansal", "abhishek@qelectrotech.org", tr("Développement")); - addAuthor(ui->m_author_label, "Simon De Backer", "debacker@qelectrotech.org", tr("Développement")); + addAuthor(ui->m_author_label, "Simon De Backer", "debacker@qelectrotech.org", tr("Développement")); addAuthor(ui->m_author_label, "David Varley", "David.Varley@cborn.com", tr("Développement")); addAuthor(ui->m_author_label, "Damian Caceres", "damiancaceresmoreno@yahoo.es", tr("Développement")); addAuthor(ui->m_author_label, "Martin Marmsoler", "martin.marmsoler@gmail.com", tr("Développement")); @@ -166,7 +166,7 @@ void AboutQETDialog::setContributors() void AboutQETDialog::setVersion() { QString str = "QElectroTech V " - + QetVersion::displayedVersion() + + QetVersion::displayedVersion() + ""; ui->m_version_label->setText(str + MachineInfo::instance()->compilation_info()); } diff --git a/sources/ui/configpage/generalconfigurationpage.cpp b/sources/ui/configpage/generalconfigurationpage.cpp index bddc89b65..79adbd550 100644 --- a/sources/ui/configpage/generalconfigurationpage.cpp +++ b/sources/ui/configpage/generalconfigurationpage.cpp @@ -122,12 +122,12 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) : ui->m_highlight_integrated_elements->setChecked(settings.value("diagrameditor/highlight-integrated-elements", true).toBool()); ui->m_default_elements_info->setPlainText(settings.value("elementeditor/default-informations", "").toString()); - /* - Nombre maximum de primitives affichees par la "liste des parties" - Au-dela, un petit message est affiche, indiquant que ce nombre a ete depasse - et que la liste ne sera donc pas mise a jour. - */ - ui->MaxPartsElementEditorList_sb->setValue(settings.value("elementeditor/max-parts-element-editor-list", 200).toInt()); + /* + Nombre maximum de primitives affichees par la "liste des parties" + Au-dela, un petit message est affiche, indiquant que ce nombre a ete depasse + et que la liste ne sera donc pas mise a jour. + */ + ui->MaxPartsElementEditorList_sb->setValue(settings.value("elementeditor/max-parts-element-editor-list", 200).toInt()); QString path = settings.value("elements-collections/common-collection-path", "default").toString(); if (path != "default") @@ -209,7 +209,7 @@ void GeneralConfigurationPage::applyConf() //ELEMENT EDITOR settings.setValue("elementeditor/default-informations", ui->m_default_elements_info->toPlainText()); - settings.setValue("elementeditor/max-parts-element-editor-list", ui->MaxPartsElementEditorList_sb->value()); + settings.setValue("elementeditor/max-parts-element-editor-list", ui->MaxPartsElementEditorList_sb->value()); //DIAGRAM VIEW settings.setValue("diagramview/gestures", ui->m_use_gesture_trackpad->isChecked()); @@ -223,7 +223,7 @@ void GeneralConfigurationPage::applyConf() //NOMENCLATURE settings.setValue("nomenclature/terminal-exportlist",ui->m_export_terminal->isChecked()); - + //DIAGRAM EDITOR QString view_mode = ui->m_use_tab_mode_rb->isChecked() ? "tabbed" : "windowed"; settings.setValue("diagrameditor/viewmode", view_mode) ; @@ -520,11 +520,11 @@ void GeneralConfigurationPage::on_m_indi_text_font_pb_clicked() void GeneralConfigurationPage::on_MaxPartsElementEditorList_sb_valueChanged(int value) { - if (value > 500) { - ui->MaxPartsElementEditorList_sb->setToolTip(tr("To high values might lead to crashes of the application.")); - ui->MaxPartsElementEditorList_sb->setStyleSheet("background-color: orange"); - } else { - ui->MaxPartsElementEditorList_sb->setToolTip(""); - ui->MaxPartsElementEditorList_sb->setStyleSheet(""); - } + if (value > 500) { + ui->MaxPartsElementEditorList_sb->setToolTip(tr("To high values might lead to crashes of the application.")); + ui->MaxPartsElementEditorList_sb->setStyleSheet("background-color: orange"); + } else { + ui->MaxPartsElementEditorList_sb->setToolTip(""); + ui->MaxPartsElementEditorList_sb->setStyleSheet(""); + } } diff --git a/sources/ui/configpage/generalconfigurationpage.h b/sources/ui/configpage/generalconfigurationpage.h index ae6bda52f..48877a8f0 100644 --- a/sources/ui/configpage/generalconfigurationpage.h +++ b/sources/ui/configpage/generalconfigurationpage.h @@ -1,4 +1,4 @@ -/* +/* Copyright 2006-2024 The QElectroTech Team This file is part of QElectroTech. @@ -47,7 +47,7 @@ class GeneralConfigurationPage : public ConfigPage void on_m_company_tbt_path_cb_currentIndexChanged(int index); void on_m_custom_tbt_path_cb_currentIndexChanged(int index); void on_m_indi_text_font_pb_clicked(); - void on_MaxPartsElementEditorList_sb_valueChanged(int value); + void on_MaxPartsElementEditorList_sb_valueChanged(int value); private: void fillLang(); diff --git a/sources/ui/linksingleelementwidget.cpp b/sources/ui/linksingleelementwidget.cpp index 20802064f..367f2a5c6 100644 --- a/sources/ui/linksingleelementwidget.cpp +++ b/sources/ui/linksingleelementwidget.cpp @@ -296,7 +296,7 @@ void LinkSingleElementWidget::buildTree() QStringList search_list; QStringList str_list; - if (!elmt->conductors().isEmpty()) + if (!elmt->conductors().isEmpty()) { ConductorProperties cp = elmt->conductors().first()->properties(); str_list << cp.text; @@ -316,7 +316,7 @@ void LinkSingleElementWidget::buildTree() search_list << str_list.last(); } else - str_list << "" << "" << "" << "" << ""; + str_list << "" << "" << "" << "" << ""; if (Diagram *diag = elmt->diagram()) { diff --git a/sources/ui/projectpropertiesdialog.cpp b/sources/ui/projectpropertiesdialog.cpp index 6d4bf0e6c..da15eba97 100644 --- a/sources/ui/projectpropertiesdialog.cpp +++ b/sources/ui/projectpropertiesdialog.cpp @@ -36,13 +36,13 @@ ProjectPropertiesDialog::ProjectPropertiesDialog(QETProject *project, QWidget *p m_properties_dialog -> setWindowTitle(QObject::tr("Propriétés du projet", "window title")); m_properties_dialog -> addPage(new ProjectMainConfigPage(project)); - NewDiagramPage *newDiagramPage = new NewDiagramPage(project,parent,this); + NewDiagramPage *newDiagramPage = new NewDiagramPage(project,parent,this); m_properties_dialog -> addPage(newDiagramPage); - ProjectAutoNumConfigPage *projectAutoNumConfigPage = new ProjectAutoNumConfigPage (project); + ProjectAutoNumConfigPage *projectAutoNumConfigPage = new ProjectAutoNumConfigPage (project); m_properties_dialog -> addPage(projectAutoNumConfigPage); - m_properties_dialog->addPage(new TerminalStripProjectConfigPage { project, parent }); + m_properties_dialog->addPage(new TerminalStripProjectConfigPage { project, parent }); connect(projectAutoNumConfigPage,SIGNAL(setAutoNum(QString)),newDiagramPage,SLOT(setFolioAutonum(QString))); connect(projectAutoNumConfigPage,SIGNAL(saveCurrentTbp()),newDiagramPage,SLOT(saveCurrentTbp())); diff --git a/sources/ui/projectpropertiesdialog.h b/sources/ui/projectpropertiesdialog.h index a4bd45e95..3f9bfaad3 100644 --- a/sources/ui/projectpropertiesdialog.h +++ b/sources/ui/projectpropertiesdialog.h @@ -32,8 +32,8 @@ class ProjectPropertiesDialog : public QObject { enum Page { Main = 0, Diagram = 1, - Autonum = 2, - TerminalStrip = 3 + Autonum = 2, + TerminalStrip = 3 }; ProjectPropertiesDialog(QETProject *project, QWidget *parent = nullptr); diff --git a/sources/ui/shapegraphicsitempropertieswidget.cpp b/sources/ui/shapegraphicsitempropertieswidget.cpp index df6282344..1f8a19634 100644 --- a/sources/ui/shapegraphicsitempropertieswidget.cpp +++ b/sources/ui/shapegraphicsitempropertieswidget.cpp @@ -64,8 +64,8 @@ ShapeGraphicsItemPropertiesWidget::~ShapeGraphicsItemPropertiesWidget() */ void ShapeGraphicsItemPropertiesWidget::setItem(QetShapeItem *shape) { - if (m_shape != shape) { - clearEditConnection(); + if (m_shape != shape) { + clearEditConnection(); } if (!shape) { return; @@ -75,7 +75,7 @@ void ShapeGraphicsItemPropertiesWidget::setItem(QetShapeItem *shape) ui->m_close_polygon->setVisible(m_shape->shapeType() == QetShapeItem::Polygon); ui->m_filling_gb->setHidden(m_shape->shapeType() == QetShapeItem::Line); - updateUi(); + updateUi(); setUpEditConnection(); } @@ -86,11 +86,11 @@ void ShapeGraphicsItemPropertiesWidget::setItem(QetShapeItem *shape) */ void ShapeGraphicsItemPropertiesWidget::setItems(QList shapes_list) { - clearEditConnection(); + clearEditConnection(); m_shapes_list.clear(); m_shape = nullptr; - if (shapes_list.isEmpty()) { + if (shapes_list.isEmpty()) { updateUi(); } else if (shapes_list.size() == 1) @@ -357,7 +357,7 @@ void ShapeGraphicsItemPropertiesWidget::updateUi() //Disconnect every connections of editor widgets //to avoid an unwanted edition (QSpinBox emit valueChanged no matter if changer by user or by program) - clearEditConnection(); + clearEditConnection(); if (m_shape) { @@ -455,8 +455,8 @@ bool ShapeGraphicsItemPropertiesWidget::setLiveEdit(bool live_edit) if (m_live_edit) { setUpEditConnection(); - } else { - clearEditConnection(); + } else { + clearEditConnection(); } return true; } @@ -468,46 +468,46 @@ bool ShapeGraphicsItemPropertiesWidget::setLiveEdit(bool live_edit) */ void ShapeGraphicsItemPropertiesWidget::setUpEditConnection() { - clearEditConnection(); + clearEditConnection(); if (m_shape || !m_shapes_list.isEmpty()) { - m_edit_connection << connect (ui->m_style_cb, QOverload::of(&QComboBox::activated), - this, &ShapeGraphicsItemPropertiesWidget::apply); + m_edit_connection << connect (ui->m_style_cb, QOverload::of(&QComboBox::activated), + this, &ShapeGraphicsItemPropertiesWidget::apply); - m_edit_connection << connect (ui->m_size_dsb, QOverload::of(&QDoubleSpinBox::valueChanged), - this, &ShapeGraphicsItemPropertiesWidget::apply); + m_edit_connection << connect (ui->m_size_dsb, QOverload::of(&QDoubleSpinBox::valueChanged), + this, &ShapeGraphicsItemPropertiesWidget::apply); - m_edit_connection << connect (ui->m_color_kpb, &KColorButton::changed, - this, &ShapeGraphicsItemPropertiesWidget::apply); + m_edit_connection << connect (ui->m_color_kpb, &KColorButton::changed, + this, &ShapeGraphicsItemPropertiesWidget::apply); - m_edit_connection << connect (ui->m_brush_style_cb, QOverload::of(&QComboBox::activated), - this, &ShapeGraphicsItemPropertiesWidget::apply); + m_edit_connection << connect (ui->m_brush_style_cb, QOverload::of(&QComboBox::activated), + this, &ShapeGraphicsItemPropertiesWidget::apply); - m_edit_connection << connect (ui->m_brush_color_kpb, &KColorButton::changed, - this, &ShapeGraphicsItemPropertiesWidget::apply); + m_edit_connection << connect (ui->m_brush_color_kpb, &KColorButton::changed, + this, &ShapeGraphicsItemPropertiesWidget::apply); - m_edit_connection << connect (ui->m_close_polygon, &QCheckBox::clicked, - this, &ShapeGraphicsItemPropertiesWidget::apply); + m_edit_connection << connect (ui->m_close_polygon, &QCheckBox::clicked, + this, &ShapeGraphicsItemPropertiesWidget::apply); - m_edit_connection << connect (m_shape, &QetShapeItem::penChanged, - this, &ShapeGraphicsItemPropertiesWidget::updateUi); + m_edit_connection << connect (m_shape, &QetShapeItem::penChanged, + this, &ShapeGraphicsItemPropertiesWidget::updateUi); - m_edit_connection << connect (m_shape, &QetShapeItem::closeChanged, - this, &ShapeGraphicsItemPropertiesWidget::updateUi); + m_edit_connection << connect (m_shape, &QetShapeItem::closeChanged, + this, &ShapeGraphicsItemPropertiesWidget::updateUi); - m_edit_connection << connect (m_shape, &QetShapeItem::brushChanged, - this, &ShapeGraphicsItemPropertiesWidget::updateUi); + m_edit_connection << connect (m_shape, &QetShapeItem::brushChanged, + this, &ShapeGraphicsItemPropertiesWidget::updateUi); - } + } } void ShapeGraphicsItemPropertiesWidget::clearEditConnection() { - for (const auto &c : qAsConst(m_edit_connection)) { - disconnect(c); - } - m_edit_connection.clear(); + for (const auto &c : qAsConst(m_edit_connection)) { + disconnect(c); + } + m_edit_connection.clear(); } void ShapeGraphicsItemPropertiesWidget::on_m_lock_pos_cb_clicked() diff --git a/sources/ui/shapegraphicsitempropertieswidget.h b/sources/ui/shapegraphicsitempropertieswidget.h index 6853262d7..9094f20d1 100644 --- a/sources/ui/shapegraphicsitempropertieswidget.h +++ b/sources/ui/shapegraphicsitempropertieswidget.h @@ -53,12 +53,12 @@ class ShapeGraphicsItemPropertiesWidget : public PropertiesEditorWidget private: void setUpEditConnection(); - void clearEditConnection(); + void clearEditConnection(); private slots: void on_m_lock_pos_cb_clicked(); - private: + private: Ui::ShapeGraphicsItemPropertiesWidget *ui; QetShapeItem *m_shape; QList > m_shapes_list;