diff --git a/sources/bordertitleblock.cpp b/sources/bordertitleblock.cpp index f16a25c96..741b5e31e 100644 --- a/sources/bordertitleblock.cpp +++ b/sources/bordertitleblock.cpp @@ -411,6 +411,7 @@ void BorderTitleBlock::draw(QPainter *qp, qreal x, qreal y) { } void BorderTitleBlock::drawDxf(int width, int height, bool keep_aspect_ratio, QString &file_path, int color) { + Q_UNUSED (width); Q_UNUSED (height); Q_UNUSED (keep_aspect_ratio); // Transform to DXF scale. columns_header_height_ *= Createdxf::yScale; diff --git a/sources/conductorproperties.cpp b/sources/conductorproperties.cpp index ea1ff9c08..f65e69a7a 100644 --- a/sources/conductorproperties.cpp +++ b/sources/conductorproperties.cpp @@ -223,11 +223,10 @@ ConductorProperties::ConductorProperties() : text_size(9), verti_rotate_text(270), horiz_rotate_text(0), - style(Qt::SolidLine), m_show_text(true), - m_one_text_per_folio(false) -{ -} + m_one_text_per_folio(false), + style(Qt::SolidLine) +{} /** Destructeur diff --git a/sources/createdxf.cpp b/sources/createdxf.cpp index f904448a5..03c0c2836 100644 --- a/sources/createdxf.cpp +++ b/sources/createdxf.cpp @@ -662,6 +662,8 @@ void Createdxf::drawText(QString fileName, QString text,double x, double y, doub void Createdxf::drawTextAligned(QString fileName, QString text,double x, double y, double height, double rotation, double oblique,int hAlign, int vAlign, double xAlign,int colour, bool leftAlign, float scale) { + Q_UNUSED(scale); + if (!fileName.isEmpty()) { QFile file(fileName); if (!file.open(QFile::Append)) { diff --git a/sources/editor/elementscene.cpp b/sources/editor/elementscene.cpp index 2f21a2ecf..a0ce86d42 100644 --- a/sources/editor/elementscene.cpp +++ b/sources/editor/elementscene.cpp @@ -39,10 +39,10 @@ */ ElementScene::ElementScene(QETElementEditor *editor, QObject *parent) : QGraphicsScene(parent), + m_elmt_type("simple"), qgi_manager(this), element_editor(editor), - decorator_(0), - m_elmt_type("simple") + decorator_(0) { setItemIndexMethod(NoIndex); current_polygon = NULL; diff --git a/sources/editor/partline.cpp b/sources/editor/partline.cpp index f35edec0d..23f5f8e6d 100644 --- a/sources/editor/partline.cpp +++ b/sources/editor/partline.cpp @@ -25,8 +25,8 @@ @param scene La scene sur laquelle figure cette ligne */ PartLine::PartLine(QETElementEditor *editor, QGraphicsItem *parent, QGraphicsScene *scene) : - QGraphicsLineItem(parent, scene), CustomElementGraphicPart(editor), + QGraphicsLineItem(parent, scene), first_end(Qet::None), first_length(1.5), second_end(Qet::None), diff --git a/sources/exportdialog.cpp b/sources/exportdialog.cpp index 7d0d94ece..1ae7c5c1c 100644 --- a/sources/exportdialog.cpp +++ b/sources/exportdialog.cpp @@ -425,7 +425,7 @@ void ExportDialog::generateDxf(Diagram *diagram, int width, int height, bool kee QList list_shapes; DiagramFolioList *ptr; - if (ptr = dynamic_cast(diagram)) { + if ((ptr = dynamic_cast(diagram))) { list_lines = ptr -> lines(); list_rectangles = ptr -> rectangles(); diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index 99252ed72..3ecdd5a6c 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -50,14 +50,14 @@ */ QETDiagramEditor::QETDiagramEditor(const QStringList &files, QWidget *parent) : QETMainWindow(parent), - open_dialog_dir(QDesktopServices::storageLocation(QDesktopServices::DesktopLocation)), - can_update_actions(true), - m_add_item_actions_group(this), - m_zoom_actions_group(this), - m_select_actions_group(this), - m_selection_actions_group(this), - m_row_column_actions_group(this), - m_file_actions_group(this) + m_add_item_actions_group (this), + m_zoom_actions_group (this), + m_select_actions_group (this), + m_selection_actions_group (this), + m_row_column_actions_group (this), + m_file_actions_group (this), + open_dialog_dir (QDesktopServices::storageLocation(QDesktopServices::DesktopLocation)), + can_update_actions (true) { // mise en place de l'interface MDI au centre de l'application setCentralWidget(&workspace); @@ -1820,7 +1820,7 @@ void QETDiagramEditor::removeDiagramFromProject() { bool isFolioList = false; // if diagram to remove is a "folio list sheet", then set a flag. - if (DiagramFolioList *ptr = dynamic_cast(current_diagram -> diagram())) + if (dynamic_cast(current_diagram -> diagram())) isFolioList = true; current_project -> removeDiagram(current_diagram); @@ -1828,7 +1828,7 @@ void QETDiagramEditor::removeDiagramFromProject() { // if the removed diagram was a folio sheet, then delete all the remaining folio sheets also. if (isFolioList) { foreach (DiagramView *diag, current_project -> diagrams()) { - if (DiagramFolioList *ptr = dynamic_cast(diag -> diagram())) { + if (dynamic_cast(diag -> diagram())) { current_project -> removeDiagram(diag); } } diff --git a/sources/qetgraphicsitem/diagramimageitem.cpp b/sources/qetgraphicsitem/diagramimageitem.cpp index 07a3767c3..7c7e7089c 100644 --- a/sources/qetgraphicsitem/diagramimageitem.cpp +++ b/sources/qetgraphicsitem/diagramimageitem.cpp @@ -67,6 +67,8 @@ DiagramImageItem::~DiagramImageItem() { void DiagramImageItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { painter -> drawPixmap(pixmap_.rect(),pixmap_); + Q_UNUSED(option); Q_UNUSED(widget); + if (isSelected()) { painter -> save(); // Annulation des renderhints diff --git a/sources/qetgraphicsitem/element.cpp b/sources/qetgraphicsitem/element.cpp index 69da34913..f1671d36b 100644 --- a/sources/qetgraphicsitem/element.cpp +++ b/sources/qetgraphicsitem/element.cpp @@ -35,6 +35,8 @@ Element::Element(QGraphicsItem *parent, Diagram *scene) : internal_connections_(false), must_highlight_(false) { + Q_UNUSED(scene); + link_type_ = Simple; uuid_ = QUuid::createUuid(); setZValue(10); diff --git a/sources/qetproject.h b/sources/qetproject.h index 8555f0122..6d42962f1 100644 --- a/sources/qetproject.h +++ b/sources/qetproject.h @@ -196,8 +196,6 @@ class QETProject : public QObject { QDomDocument document_root_; /// Diagrams carried by the project QList diagrams_; - /// Folio List Sheets quantity for this project. - int folioSheetsQuantity; /// Embedded elements collection XmlElementsCollection *collection_; /// Project title @@ -230,6 +228,8 @@ class QETProject : public QObject { QUndoStack *undo_stack_; /// Conductor auto numerotation QHash m_conductor_autonum; + /// Folio List Sheets quantity for this project. + int folioSheetsQuantity; }; Q_DECLARE_METATYPE(QETProject *) #endif diff --git a/sources/ui/diagramselection.cpp b/sources/ui/diagramselection.cpp index 0ba22b36b..4f7576c80 100644 --- a/sources/ui/diagramselection.cpp +++ b/sources/ui/diagramselection.cpp @@ -100,7 +100,7 @@ QList diagramselection::list_of_DiagramSelected() { void diagramselection::on_tableDiagram_customContextMenuRequested(const QPoint &pos){ QMenu menu(this); QAction *desl = menu.addAction( tr("D\351s\351lectionner tout") ); - QAction *sel = menu.addAction(QIcon(":/ico/16x16/dialog-ok.png"), tr("S\351lectionner tout") ); + menu.addAction(QIcon(":/ico/16x16/dialog-ok.png"), tr("S\351lectionner tout") ); // Exec Menu QAction *ret = menu.exec(ui -> tableDiagram -> viewport() -> mapToGlobal(pos)); diff --git a/sources/ui/dialogautonum.cpp b/sources/ui/dialogautonum.cpp index 040e41a4b..1b066be0a 100644 --- a/sources/ui/dialogautonum.cpp +++ b/sources/ui/dialogautonum.cpp @@ -94,7 +94,7 @@ void DialogAutoNum::on_pushButton_annotation_clicked(){ if(i+1 < listDiag.count()) diagramsTitle += ", "; } // Ask if user is sure to numerate the conductor - QMessageBox::StandardButton answer = QET::MessageBox::warning( + QET::MessageBox::warning( this, tr("Annotation des conducteurs", "Attention"), QString( @@ -103,14 +103,6 @@ void DialogAutoNum::on_pushButton_annotation_clicked(){ QMessageBox::Yes | QMessageBox::No, QMessageBox::No ); - - // if yes numerate all - if( answer == QMessageBox::Yes) { - foreach (Diagram *d, listDiag) { - /*ConductorAutoNumerotation can(d); - can.numerateDiagram();*/ - } - } } /**