Overhaul PDF Model code

I used re-structured the code to be more OO compliant. However, the main extraction loop was heavily modified to be readable. Some unused files were deleted and removed from the project file. Project file options were unified and updated for Appveyor.
Robotips · Sep 17, 2023 · 94eda0e · 94eda0e
1 parent b2b2306
commit 94eda0e
Show file tree

Hide file tree

Showing 25 changed files with 146 additions and 536 deletions.
diff --git a/src/autotest/autotest.pro b/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\'"
 }
diff --git a/src/kicad/kicad.pro b/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

diff --git a/src/pdf_extract/controller/pdfloader.cpp b/src/pdf_extract/controller/pdfloader.cpp
diff --git a/src/pdf_extract/controller/pdfloader.h b/src/pdf_extract/controller/pdfloader.h
diff --git a/src/pdf_extract/controller/pdfpackagesearcher.cpp b/src/pdf_extract/controller/pdfpackagesearcher.cpp
diff --git a/src/pdf_extract/controller/pdfpackagesearcher.h b/src/pdf_extract/controller/pdfpackagesearcher.h
diff --git a/src/pdf_extract/datasheet.cpp b/src/pdf_extract/datasheet.cpp
@@ -21,12 +21,11 @@
 #include <QCoreApplication>
 #include <QDebug>
 #include <QDir>
-#include <QDomNamedNodeMap>
+//#include <QDomNamedNodeMap>
 #include <QFile>
 #include <QPainter>
 #include <QRegularExpression>
 
-#include <poppler/qt5/poppler-form.h>
 #include <poppler/qt5/poppler-qt5.h>
 
 using namespace Poppler;

diff --git a/src/pdf_extract/model/pdfcomponent.cpp b/src/pdf_extract/model/pdfcomponent.cpp
diff --git a/src/pdf_extract/model/pdfcomponent.h b/src/pdf_extract/model/pdfcomponent.h