Fix build

Signed-off-by: Raul Metsma <raul@metsma.ee>

Author: metsma

.github/workflows/build.yml

@@ -189,7 +189,7 @@ jobs:
     - name: Build
       run: |
         cmake "-GNinja" -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo `
-          -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake `
+          -DCMAKE_TOOLCHAIN_FILE=${{ env.RUNVCPKG_VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake `
           -DVCPKG_MANIFEST_DIR=${{ github.workspace }}/client/libcdoc
         cmake --build build --target msi
         cmake --build build --target msishellext

.gitmodules

@@ -3,4 +3,4 @@
 	url = ../qt-common
 [submodule "client/libcdoc"]
 	path = client/libcdoc
-	url = git@github.com:open-eid/libcdoc.git
+	url = ../libcdoc

client/CMakeLists.txt

@@ -41,6 +41,8 @@ add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE
 	main.cpp
 	Application.cpp
 	Application.h
+	CDocSupport.cpp
+	CDocSupport.h
 	CheckConnection.cpp
 	CheckConnection.h
 	CryptoDoc.cpp
@@ -84,8 +86,6 @@ add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE
 	TokenData.cpp
 	TokenData.h
 	Utils.h
-	dialogs/PasswordDialog.h dialogs/PasswordDialog.cpp dialogs/PasswordDialog.ui
-	CDocSupport.cpp CDocSupport.h
 )
 qt_add_translations(${PROJECT_NAME} TS_FILES
 	translations/en.ts
@@ -129,7 +129,6 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
 	MACOSX_BUNDLE_ICON_FILE Icon.icns
 	MACOSX_BUNDLE_GUI_IDENTIFIER "ee.ria.${PROJECT_NAME}"
 )
-target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR})
 
 target_compile_definitions(${PROJECT_NAME} PRIVATE
 	CDOC2_GET_URL="${CDOC2_GET_URL}"

client/CheckConnection.cpp

@@ -86,7 +86,7 @@ QNetworkAccessManager* CheckConnection::setupNAM(QNetworkRequest &req, const QBy
 				qDebug() << "SSL Error:" << error.error() << error.certificate().subjectInfo(QSslCertificate::CommonName);
 			}
 		}
-		reply->ignoreSslErrors(errors);
+		reply->ignoreSslErrors(ignore);
 	});
 	return nam;
 }

client/dialogs/AddRecipients.cpp

@@ -160,9 +160,6 @@ void AddRecipients::addRecipient(const QSslCertificate& cert, bool select)
 	AddressItem *leftItem = itemListValue(ui->leftPane, key);
 	if(!leftItem)
 	{
-		QByteArray qder = cert.toDer();
-		std::vector<uint8_t> sder = std::vector<uint8_t>(qder.cbegin(), qder.cend());
-
 		leftItem = new AddressItem(key, AddressItem::Add, ui->leftPane);
 		ui->leftPane->addWidget(leftItem);
 

client/widgets/AddressItem.cpp

@@ -17,17 +17,15 @@
  *
  */
 
-#include <QDebug>
-#include <qsslcertificate.h>
-#include <qsslkey.h>
-
 #include "AddressItem.h"
 #include "ui_AddressItem.h"
 
 #include "CryptoDoc.h"
 #include "SslCertificate.h"
 #include "dialogs/KeyDialog.h"
 
+#include <QSslKey>
+
 using namespace ria::qdigidoc4;
 
 class AddressItem::Private: public Ui::AddressItem

client/widgets/AddressItem.h

@@ -19,13 +19,12 @@
 
 #pragma once
 
-#include <memory>
-
 #include "widgets/Item.h"
-#include "cdoc/Lock.h"
 
 struct CDKey;
 
+namespace libcdoc { struct Lock; }
+
 class AddressItem final : public Item
 {
 	Q_OBJECT

client/widgets/AddressItem.ui

@@ -154,7 +154,7 @@ icon: url(:/images/icon_remove_clicked.svg);
     </spacer>
    </item>
    <item row="0" column="4" rowspan="2">
-    <widget class="QToolButton" name="remove">
+    <widget class="QPushButton" name="remove">
      <property name="maximumSize">
       <size>
        <width>24</width>
@@ -168,7 +168,7 @@ icon: url(:/images/icon_remove_clicked.svg);
       <string>Remove</string>
      </property>
      <property name="styleSheet">
-      <string notr="true">border: none; background: none;</string>
+      <string notr="true">border: none</string>
      </property>
      <property name="icon">
       <iconset resource="../images/images.qrc">

client/widgets/ContainerPage.cpp

@@ -33,6 +33,7 @@
 #include "dialogs/SmartIDDialog.h"
 #include "dialogs/WarningDialog.h"
 #include "widgets/AddressItem.h"
+#include "widgets/MainAction.h"
 #include "widgets/SignatureItem.h"
 #include "widgets/WarningItem.h"
 
@@ -534,4 +535,3 @@ void ContainerPage::translateLabels()
 	ui->cancel->setText(tr(cancelText));
 	ui->convert->setText(tr(convertText));
 }
-

client/widgets/ContainerPage.h

@@ -19,16 +19,16 @@
 
 #pragma once
 
+#include <QWidget>
+
 #include "common_enums.h"
-#include "widgets/MainAction.h"
-#include "CryptoDoc.h"
 
-namespace Ui {
-class ContainerPage;
-}
+namespace libcdoc { struct Lock; }
+namespace Ui { class ContainerPage; }
 
 class CryptoDoc;
 class DigiDoc;
+class MainAction;
 class QSslCertificate;
 class SignatureItem;
 class SslCertificate;