Overhaul PDF Model code

src/autotest/autotest.pro

@@ -1,6 +1,13 @@
-QT += testlib xml
+QT += testlib
+CONFIG += c++11 strict_c++
+CONFIG(release, debug|release):CONFIG += optimize_full
+
+# For Appveyor because it dumps includes in the project root
+APPVEYOR_BUILD_FOLDER=$$(APPVEYOR_BUILD_FOLDER)
+!isEmpty(APPVEYOR_BUILD_FOLDER) {
+    INCLUDEPATH += $$APPVEYOR_BUILD_FOLDER
+}
 
-CONFIG += optimize_full c++11
 CONFIG += qt console warn_on depend_includepath testcase
 CONFIG -= app_bundle
 
@@ -20,7 +27,7 @@ DEPENDPATH += $$SOURCE_ROOT/kicad $$SOURCE_ROOT/pdf_extract
 
 SOURCES += tst_pdf_extract.cpp
 
-unix:{
+unix {
     QMAKE_LFLAGS_RPATH=
     QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\'"
 }

src/autotest/tst_pdf_extract.cpp

@@ -1,9 +1,9 @@
 #include <QCoreApplication>
 #include <QtTest>
 
-#include "datasheet.h"
+#include <datasheet.h>
 
-#include "model/lib.h"
+#include <model/lib.h>
 
 class PdfExtract : public QObject
 {

src/kicad/itemmodel/componentlibitemmodel.cpp

@@ -22,18 +22,17 @@
 #include <QFont>
 
 ComponentLibItemModel::ComponentLibItemModel(Lib *lib, QObject *parent)
-    : QAbstractItemModel(parent)
+    : QAbstractItemModel(parent),
+      _lib(nullptr),
+      _activeComponent(nullptr),
+      _selectedMode(false)
 {
-    if (lib != nullptr)
+    if (lib == nullptr)
     {
-        _lib = lib;
+        lib = new Lib();
     }
-    else
-    {
-        _lib = new Lib();
-    }
-    _selectedMode = false;
-    _activeComponent = nullptr;
+
+    _lib = lib;
 }
 
 Lib *ComponentLibItemModel::lib() const
@@ -47,7 +46,10 @@ void ComponentLibItemModel::setLib(Lib *lib)
     _activeComponent = nullptr;
     beginResetModel();
     resetInternalData();
-    // delete _lib;
+    if(lib != nullptr)
+    {
+       delete _lib;
+    }
     _lib = lib;
     endResetModel();
     emit layoutChanged();

src/kicad/itemmodel/componentlibitemmodel.h

@@ -22,7 +22,7 @@
 #include <QAbstractItemModel>
 #include <QtCore/qglobal.h>
 
-#include "model/lib.h"
+#include <model/lib.h>
 
 class KICAD_EXPORT ComponentLibItemModel : public QAbstractItemModel
 {

src/kicad/itemmodel/componentlibtreeview.cpp

@@ -24,17 +24,19 @@
 #include <QMouseEvent>
 
 ComponentLibTreeView::ComponentLibTreeView(Lib *lib, QWidget *parent)
-    : QTreeView(parent)
+    : QTreeView(parent),
+      _model(nullptr),
+      _sortProxy(nullptr),
+      _editMode(false),
+      _removeAction(nullptr)
 {
-    if (lib != nullptr)
+    if (lib == nullptr)
     {
-        _model = new ComponentLibItemModel(lib);
-    }
-    else
-    {
-        _model = new ComponentLibItemModel(new Lib());
+        lib = new Lib();
     }
 
+    _model = new ComponentLibItemModel(lib);
+
     setSelectionMode(QAbstractItemView::ExtendedSelection);
     _editMode = false;
 
@@ -55,13 +57,12 @@ Lib *ComponentLibTreeView::lib() const
 
 void ComponentLibTreeView::setLib(Lib *lib)
 {
-    _model->setLib(lib);
-    if (lib == _model->lib())
+    if (lib != _model->lib())
     {
-        return;
+        _model->setLib(lib);
+        resizeColumnToContents(0);
+        resizeColumnToContents(1);
     }
-    resizeColumnToContents(0);
-    resizeColumnToContents(1);
 }
 
 void ComponentLibTreeView::setActiveComponent(Component *component)
@@ -129,7 +130,7 @@ void ComponentLibTreeView::remove()
             return;
         }
         QList<QPersistentModelIndex> pindex;
-        for (QModelIndex selected : selection)
+        for (QModelIndex selected : qAsConst(selection))
         {
             const QModelIndex &indexComponent = _sortProxy->mapToSource(selected);
             if (!indexComponent.isValid() || indexComponent.column() != 0)

src/kicad/itemmodel/componentpinsitemmodel.cpp

@@ -24,11 +24,12 @@
 #include <QDebug>
 
 ComponentPinsItemModel::ComponentPinsItemModel(Component *component, QObject *parent)
-    : QAbstractItemModel(parent)
+    : QAbstractItemModel(parent),
+      _component(nullptr),
+      _isExpendable(true)
 {
     setComponent(component);
-    _isExpendable = true;
-    _higherPin = QString();
+    _higherPin.clear();
 }
 
 Component *ComponentPinsItemModel::component() const
@@ -299,7 +300,7 @@ QString ComponentPinsItemModel::toNumeric(const QString &str)
 {
     QString sortPatern = str;
 
-    QRegularExpression numPattern("([^0-9]*)([0-9]+)([^0-9]*)", QRegularExpression::CaseInsensitiveOption);
+    static QRegularExpression numPattern("([^0-9]*)([0-9]+)([^0-9]*)", QRegularExpression::CaseInsensitiveOption);
 
     QRegularExpressionMatchIterator numMatchIt = numPattern.globalMatch(str);
     if (numMatchIt.hasNext())
@@ -317,11 +318,11 @@ QString ComponentPinsItemModel::toNumeric(const QString &str)
 
 void ComponentPinsItemModel::updateHigherPin()
 {
-    _higherPin = QString();
-    QString higherNumPin = QString();
+    QString higherNumPin;
+    _higherPin.clear();
     if (_component != nullptr)
     {
-        for (Pin *pin : _component->pins())
+        for (Pin *pin : qAsConst(_component->pins()))
         {
             QString numPin = toNumeric(pin->padName());
             if (numPin > higherNumPin)
@@ -330,7 +331,7 @@ void ComponentPinsItemModel::updateHigherPin()
                 higherNumPin = numPin;
             }
         }
-        QRegularExpression higherNumPinPattern("([A-Z]*0*)([1-9][0-9]*)", QRegularExpression::CaseInsensitiveOption);
+        static QRegularExpression higherNumPinPattern("([A-Z]*0*)([1-9][0-9]*)", QRegularExpression::CaseInsensitiveOption);
         QRegularExpressionMatchIterator higherNumPinMatchIt = higherNumPinPattern.globalMatch(_higherPin);
         if (higherNumPinMatchIt.hasNext())
         {

src/kicad/itemmodel/componentpinsitemmodel.h

@@ -21,7 +21,7 @@
 
 #include <QAbstractItemModel>
 
-#include "model/component.h"
+#include <model/component.h>
 
 class KICAD_EXPORT ComponentPinsItemModel : public QAbstractItemModel
 {

src/kicad/itemmodel/componentpinstableview.cpp

@@ -25,7 +25,12 @@
 #include <QMouseEvent>
 
 ComponentPinsTableView::ComponentPinsTableView(Component *component, QWidget *parent)
-    : QTableView(parent)
+    : QTableView(parent),
+      _model(nullptr),
+      _delegate(nullptr),
+      _sortProxy(nullptr),
+      _removeAction(nullptr),
+      _copyAction(nullptr)
 {
     _model = new ComponentPinsItemModel(component);
 
@@ -126,7 +131,7 @@ void ComponentPinsTableView::remove()
     if (!selection.empty())
     {
         QList<QPersistentModelIndex> pindex;
-        for (QModelIndex selected : selection)
+        for (QModelIndex selected : qAsConst(selection))
         {
             const QModelIndex &indexComponent = _sortProxy->mapToSource(selected);
             if (!indexComponent.isValid())
@@ -174,7 +179,8 @@ void ComponentPinsTableView::updateSelect(const QItemSelection &selected, const
     Q_UNUSED(deselected)
 
     QSet<Pin *> selectedPins;
-    for (const QModelIndex &index : selectionModel()->selectedIndexes())
+    const auto& selected_idx = selectionModel()->selectedIndexes();
+    for (const QModelIndex &index : selected_idx)
     {
         if (!index.isValid())
         {

src/kicad/itemmodel/pinlisteditor.cpp

@@ -22,7 +22,9 @@
 #include <QVBoxLayout>
 
 PinListEditor::PinListEditor(QWidget *parent)
-    : QWidget(parent)
+    : QWidget(parent),
+      _componentPinsTableView(nullptr),
+      _nameFilterEdit(nullptr)
 {
     createWidgets();
 }

src/kicad/kicad.pro

@@ -1,13 +1,15 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2014-08-05T17:49:45
-#
-#-------------------------------------------------
+QT += core gui widgets
+QT += printsupport
+# printer support is for PDF output
 
-QT       += gui printsupport
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+CONFIG += c++11 strict_c++
+CONFIG(release, debug|release):CONFIG += optimize_full
 
-CONFIG += optimize_full c++11
+# For Appveyor because it dumps includes in the project root
+APPVEYOR_BUILD_FOLDER=$$(APPVEYOR_BUILD_FOLDER)
+!isEmpty(APPVEYOR_BUILD_FOLDER) {
+    INCLUDEPATH += $$APPVEYOR_BUILD_FOLDER
+}
 
 TARGET = kicad
 TEMPLATE = lib

src/kicad/ksseditor/ksseditor.cpp

@@ -22,7 +22,10 @@
 #include <QPainter>
 
 KssEditor::KssEditor(QWidget *parent)
-    : QPlainTextEdit(parent)
+    : QPlainTextEdit(parent),
+      _syntax(nullptr),
+      _kssEditorMargin(nullptr),
+      _lineError(-1)
 {
     _syntax = new KSSSyntax(this->document());
 
@@ -36,7 +39,6 @@ KssEditor::KssEditor(QWidget *parent)
     font.setStyleHint(QFont::Monospace);
     setFont(font);
 
-    _lineError = -1;
     updateExtraSelection();
 }
 

src/kicad/ksseditor/ksssyntax.cpp

@@ -46,7 +46,7 @@ KSSSyntax::KSSSyntax(QTextDocument *parent)
                     << "label"
                     << "rect"
                     << "priority";
-    for (const QString &pattern : keywordPatterns)
+    for (const QString &pattern : qAsConst(keywordPatterns))
     {
         rule.pattern.setPattern("\\b(" + pattern + ")\\b");
         rule.format = keywordFormat;
@@ -89,7 +89,7 @@ KSSSyntax::KSSSyntax(QTextDocument *parent)
                        << "faledge"
                        << "nologic";
 
-    for (const QString &pattern : enumvaluesPatterns)
+    for (const QString &pattern : qAsConst(enumvaluesPatterns))
     {
         rule.pattern.setPattern("\\b(" + pattern + ")\\b");
         rule.format = enumvaluesFormat;
@@ -117,7 +117,7 @@ void KSSSyntax::highlightBlock(const QString &text)
     PartToHighlight highlight;
 
     partsToHighlight.clear();
-    for (const HighlightingRule &rule : highlightingRules)
+    for (const HighlightingRule &rule : qAsConst(highlightingRules))
     {
         QRegularExpressionMatch match = rule.pattern.match(text);
         if (match.hasMatch())

src/kicad/model/component.cpp

@@ -29,11 +29,15 @@
  * @param name optionally specify the component name at the creation
  */
 Component::Component(const QString &name)
-    : _prefix("U")
+    : _prefix("U"),
+      _showPinName(true),
+      _showPadName(true),
+      _unitCount(1),
+      _refText(nullptr),
+      _nameText(nullptr),
+      _packageText(nullptr),
+      _docText(nullptr)
 {
-    _showPinName = true;
-    _showPadName = true;
-    _unitCount = 1;
     _refText = new DrawText("U");
     _nameText = new DrawText();
     _packageText = new DrawText();
@@ -80,15 +84,24 @@ Component::~Component()
     for (auto &pin : _pins)
     {
         delete pin;
+        pin = nullptr;
     }
     for (auto &draw : _draws)
     {
         delete draw;
+        draw = nullptr;
     }
     delete _refText;
+    _refText = nullptr;
+
     delete _nameText;
+    _nameText = nullptr;
+
     delete _packageText;
+    _packageText = nullptr;
+
     delete _docText;
+    _docText = nullptr;
 }
 
 /**
@@ -149,6 +162,7 @@ void Component::removePin(Pin *pin)
     if (_pins.removeOne(pin))
     {
         delete pin;
+        pin = nullptr;
     }
 }
 
@@ -160,6 +174,7 @@ void Component::clearPins()
     for (auto &pin : _pins)
     {
         delete pin;
+        pin = nullptr;
     }
     _pins.clear();
 }
@@ -211,6 +226,7 @@ void Component::removeDraw(Draw *draw)
     if (_draws.removeOne(draw))
     {
         delete draw;
+        draw = nullptr;
     }
 }
 
@@ -222,6 +238,7 @@ void Component::clearDraws()
     for (auto &draw : _draws)
     {
         delete draw;
+        draw = nullptr;
     }
     _draws.clear();
 }

src/kicad/model/drawarc.cpp

@@ -19,6 +19,9 @@
 #include "drawarc.h"
 
 DrawArc::DrawArc()
+    : _radius(0),
+      _startAngle(0),
+      _endAngle(0)
 {
 }