aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/GpgFrontend.h7
-rw-r--r--include/GpgFrontend.h.in1
-rw-r--r--include/MainWindow.h24
-rw-r--r--include/Mime.h7
-rw-r--r--include/gpg/GpgConstants.h6
-rw-r--r--include/gpg/GpgContext.h4
-rw-r--r--include/ui/EditorPage.h3
-rw-r--r--include/ui/FindWidget.h1
-rwxr-xr-xinclude/ui/KeyMgmt.h1
-rw-r--r--include/ui/KeyServerImportDialog.h5
-rwxr-xr-xinclude/ui/QuitDialog.h2
-rwxr-xr-xinclude/ui/SettingsDialog.h1
-rw-r--r--include/ui/keygen/KeygenThread.h1
-rw-r--r--include/ui/keygen/SubkeyGenerateThread.h2
-rw-r--r--include/ui/widgets/InfoBoardWidget.h2
15 files changed, 15 insertions, 52 deletions
diff --git a/include/GpgFrontend.h b/include/GpgFrontend.h
index e7d8c269..fcad90af 100644
--- a/include/GpgFrontend.h
+++ b/include/GpgFrontend.h
@@ -7,6 +7,7 @@
#include <clocale>
#include <cerrno>
#include <utility>
+#include <list>
#include <QtCore>
#include <QtWidgets>
@@ -17,15 +18,15 @@
#define PROJECT_NAME "GPGFrontend"
#define BUILD_VERSION "1.0.0_Windows-10.0.19042_AMD64_Debug"
-#define GIT_VERSION "develop_8842a0fa57dbc31e5ef8524323fb22dd88dbd039"
+#define GIT_VERSION "develop_55316c75051e1b488f05a57c4d4a7695bb178322"
#define VERSION_MAJOR 1
#define VERSION_MINOR 0
#define VERSION_PATCH 0
-#define BUILD_TIMESTAMP "2021-06-18 17:03:56"
+#define BUILD_TIMESTAMP "2021-06-19 18:07:40"
#define GIT_BRANCH_NAME "develop"
-#define GIT_COMMIT_HASH "8842a0fa57dbc31e5ef8524323fb22dd88dbd039"
+#define GIT_COMMIT_HASH "55316c75051e1b488f05a57c4d4a7695bb178322"
#endif //GPGFRONTEND_H_IN
diff --git a/include/GpgFrontend.h.in b/include/GpgFrontend.h.in
index 6cf6c7af..cec3be69 100644
--- a/include/GpgFrontend.h.in
+++ b/include/GpgFrontend.h.in
@@ -7,6 +7,7 @@
#include <clocale>
#include <cerrno>
#include <utility>
+#include <list>
#include <QtCore>
#include <QtWidgets>
diff --git a/include/MainWindow.h b/include/MainWindow.h
index 14f91dbc..48d77d25 100644
--- a/include/MainWindow.h
+++ b/include/MainWindow.h
@@ -180,31 +180,11 @@ private slots:
void slotOpenSettingsDialog();
/**
- * @details Open online-tutorial in default browser.
- */
- static void slotOpenTutorial();
-
- /**
- * @details Open integrated help in new tab.
- */
- void slotOpenHelp();
-
- /**
- * @details Open integrated help in new tab with the specified page.
- */
- void slotOpenHelp(const QString& page);
-
- /**
* @details Show a warn message in status bar, if there are files in attachment folder.
*/
void slotCheckAttachmentFolder();
/**
- * @details Open online translation tutorial in default browser.
- */
- static void slotOpenTranslate();
-
- /**
* @details Replace double linebreaks by single linebreaks in currently active tab.
*/
void slotCleanDoubleLinebreaks();
@@ -302,7 +282,6 @@ private:
QDockWidget *keylistDock; /** Encrypt Dock*/
QDockWidget *attachmentDock; /** Attachment Dock */
QDockWidget *infoBoardDock;
- [[maybe_unused]] QDialog *genkeyDialog; /** Dialog for key generation */
QAction *newTabAct; /** Action to create new tab */
QAction *switchTabUpAct; /** Action to switch tab up*/
@@ -341,9 +320,6 @@ private:
QAction *fileSignAct; /** Action to open dialog for signing file */
QAction *fileVerifyAct; /** Action to open dialog for verifying file */
QAction *openSettingsAct; /** Action to open settings dialog */
- QAction *openTranslateAct; /** Action to open translate doc*/
- QAction *openTutorialAct; /** Action to open tutorial */
- QAction *openHelpAct; /** Action to open tutorial */
QAction *showKeyDetailsAct; /** Action to open key-details dialog */
QAction *refreshKeysFromKeyserverAct; /** Action to refresh a key from keyserver */
QAction *uploadKeyToServerAct; /** Action to append selected keys to edit */
diff --git a/include/Mime.h b/include/Mime.h
index 63c00e2f..c86ac630 100644
--- a/include/Mime.h
+++ b/include/Mime.h
@@ -64,7 +64,7 @@ public:
return "";
}
- [[maybe_unused]] QHash<QString, QString> getParams(const QString &key) {
+ QHash<QString, QString> getParams(const QString &key) {
foreach(HeadElem tmp, headElems) {
//qDebug() << "gv: " << tmp.name << ":" << tmp.value;
if (tmp.name == key)
@@ -107,7 +107,7 @@ class Mime {
public:
explicit Mime(QByteArray *message); // Constructor
~Mime(); // Destructor
- [[maybe_unused]] static bool isMultipart(QByteArray *message);
+ static bool isMultipart(QByteArray *message);
static bool isMime(const QByteArray *message);
@@ -124,10 +124,7 @@ public:
static void quotedPrintableDecode(const QByteArray &in, QByteArray &out);
private:
- [[maybe_unused]] QByteArray *mMessage;
- [[maybe_unused]] QByteArray *mBoundary;
QList<MimePart> mPartList;
-
};
#endif // __MIME_H__
diff --git a/include/gpg/GpgConstants.h b/include/gpg/GpgConstants.h
index 6db7721f..64286ca4 100644
--- a/include/gpg/GpgConstants.h
+++ b/include/gpg/GpgConstants.h
@@ -22,8 +22,8 @@
*
*/
-#ifndef GPGCONSTANTS_H
-#define GPGCONSTANTS_H
+#ifndef GPG_CONSTANTS_H
+#define GPG_CONSTANTS_H
class QString;
@@ -39,4 +39,4 @@ public:
static const char *PGP_SIGNATURE_END;
};
-#endif // GPGCONSTANTS_H
+#endif // CONSTANTS_H
diff --git a/include/gpg/GpgContext.h b/include/gpg/GpgContext.h
index fb2762f3..eed7afe2 100644
--- a/include/gpg/GpgContext.h
+++ b/include/gpg/GpgContext.h
@@ -31,7 +31,7 @@
#include "GpgGenKeyInfo.h"
#include "GpgKey.h"
-using GpgKeyList = QLinkedList<GpgKey>;
+using GpgKeyList = std::list<GpgKey>;
class GpgImportedKey {
public:
@@ -39,7 +39,7 @@ public:
int importStatus;
};
-typedef QLinkedList<GpgImportedKey> GpgImportedKeyList;
+typedef std::list<GpgImportedKey> GpgImportedKeyList;
class GpgImportInformation {
public:
diff --git a/include/ui/EditorPage.h b/include/ui/EditorPage.h
index 53d4625c..a06d6cd6 100644
--- a/include/ui/EditorPage.h
+++ b/include/ui/EditorPage.h
@@ -92,10 +92,7 @@ public:
private:
QTextEdit *textPage; /** The textedit of the tab */
QVBoxLayout *mainLayout; /** The layout for the tab */
- [[maybe_unused]] QWidget *notificationWidget{}; /** The notification widget shown at the buttom of the tab */
- [[maybe_unused]] QMenu *verifyMenu{}; /** The menu in the notifiaction widget */
QString fullFilePath; /** The path to the file handled in the tab */
- [[maybe_unused]] QLabel *verifyLabel{}; /** The label of the verify-notification widget */
bool signMarked{}; /** true, if the signed header is marked, false if not */
private slots:
diff --git a/include/ui/FindWidget.h b/include/ui/FindWidget.h
index ad98682c..2e9c67b0 100644
--- a/include/ui/FindWidget.h
+++ b/include/ui/FindWidget.h
@@ -52,7 +52,6 @@ private:
QTextEdit *mTextpage; /** Textedit associated to the notification */
QLineEdit *findEdit; /** Label holding the text shown in infoBoard */
- [[maybe_unused]] QTextCharFormat cursorFormat;
private slots:
diff --git a/include/ui/KeyMgmt.h b/include/ui/KeyMgmt.h
index c11280af..864413db 100755
--- a/include/ui/KeyMgmt.h
+++ b/include/ui/KeyMgmt.h
@@ -96,7 +96,6 @@ private:
QAction *generateKeyDialogAct{};
QAction *closeAct{};
QAction *showKeyDetailsAct{};
- [[maybe_unused]] QMessageBox msgbox;
KeyServerImportDialog *importDialog{};
protected:
diff --git a/include/ui/KeyServerImportDialog.h b/include/ui/KeyServerImportDialog.h
index f514368b..74ae864e 100644
--- a/include/ui/KeyServerImportDialog.h
+++ b/include/ui/KeyServerImportDialog.h
@@ -59,8 +59,10 @@ private:
QPushButton *createButton(const QString &text, const char *member);
- static QComboBox *createComboBox();
+ QComboBox *createComboBox();
+ QString appPath;
+ QSettings settings;
GpgME::GpgContext *mCtx;
KeyList *mKeyList;
QLineEdit *searchLineEdit;
@@ -73,7 +75,6 @@ private:
QPushButton *importButton;
QPushButton *searchButton;
QTableWidget *keysTable{};
- [[maybe_unused]] QUrl url;
QNetworkAccessManager *qnam{};
};
diff --git a/include/ui/QuitDialog.h b/include/ui/QuitDialog.h
index 308a41fe..8d69cfd2 100755
--- a/include/ui/QuitDialog.h
+++ b/include/ui/QuitDialog.h
@@ -39,8 +39,6 @@ private slots:
void slotMyDiscard();
private:
- [[maybe_unused]] QAction *closeAct{};
- [[maybe_unused]] QLabel *nameLabel{};
bool discarded;
QTableWidget *mFileList;
};
diff --git a/include/ui/SettingsDialog.h b/include/ui/SettingsDialog.h
index d2139a2e..5cb526f9 100755
--- a/include/ui/SettingsDialog.h
+++ b/include/ui/SettingsDialog.h
@@ -43,7 +43,6 @@ private:
QSettings settings;
QCheckBox *rememberPasswordCheckBox;
- [[maybe_unused]] QCheckBox *importConfirmationcheckBox{};
QCheckBox *saveCheckedKeysCheckBox;
QCheckBox *importConfirmationCheckBox;
QComboBox *langSelectBox;
diff --git a/include/ui/keygen/KeygenThread.h b/include/ui/keygen/KeygenThread.h
index fad67e01..30478050 100644
--- a/include/ui/keygen/KeygenThread.h
+++ b/include/ui/keygen/KeygenThread.h
@@ -39,7 +39,6 @@ signals:
private:
GenKeyInfo *keyGenParams;
GpgME::GpgContext *mCtx;
- [[maybe_unused]] bool abort;
QMutex mutex;
protected:
diff --git a/include/ui/keygen/SubkeyGenerateThread.h b/include/ui/keygen/SubkeyGenerateThread.h
index 2441faa4..b442acea 100644
--- a/include/ui/keygen/SubkeyGenerateThread.h
+++ b/include/ui/keygen/SubkeyGenerateThread.h
@@ -41,8 +41,6 @@ private:
const GpgKey mKey;
GenKeyInfo *keyGenParams;
GpgME::GpgContext *mCtx;
- [[maybe_unused]] bool abort;
- QMutex mutex;
protected:
diff --git a/include/ui/widgets/InfoBoardWidget.h b/include/ui/widgets/InfoBoardWidget.h
index 4fdbdf9f..88c7cb04 100644
--- a/include/ui/widgets/InfoBoardWidget.h
+++ b/include/ui/widgets/InfoBoardWidget.h
@@ -97,8 +97,6 @@ private:
KeyList *mKeyList; /** Table holding the keys */
QTextEdit *mTextPage{ nullptr }; /** Textedit associated to the notification */
QHBoxLayout *actionButtonLayout;
- [[maybe_unused]] QVector<QString> verifyDetailStringVector; /** Vector containing the text for labels in verifydetaildialog */
- [[maybe_unused]] QVector<InfoBoardStatus> verifyDetailStatusVector; /** Vector containing the status for labels in verifydetaildialog */
};
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-30 12:02:36 +0000