diff options
| author | saturneric <[email protected]> | 2024-04-21 19:49:04 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2024-04-21 19:49:04 +0000 |
| commit | 571a2906063739067e40a02aadd8c265082359de (patch) | |
| tree | 5ac57f777ec38f6a5f328da4e3df6ad6cc010aff /src/ui/UserInterfaceUtils.cpp | |
| parent | fix: could not determine the path to the executable based on the desktop file (diff) | |
| parent | feat: adapt linux appimage of modules loading (diff) | |
| download | GpgFrontend-571a2906063739067e40a02aadd8c265082359de.tar.gz GpgFrontend-571a2906063739067e40a02aadd8c265082359de.zip | |
Merge branch 'dev/2.1.2/module' into develop
Diffstat (limited to 'src/ui/UserInterfaceUtils.cpp')
| -rw-r--r-- | src/ui/UserInterfaceUtils.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ui/UserInterfaceUtils.cpp b/src/ui/UserInterfaceUtils.cpp index 9daca57b..1fd5c3bb 100644 --- a/src/ui/UserInterfaceUtils.cpp +++ b/src/ui/UserInterfaceUtils.cpp @@ -30,25 +30,25 @@ #include <cstddef> -#include "GpgFrontendBuildInfo.h" #include "core/GpgConstants.h" #include "core/function/CoreSignalStation.h" #include "core/function/gpg/GpgKeyGetter.h" +#include "core/model/CacheObject.h" #include "core/model/GpgImportInformation.h" +#include "core/model/SettingsObject.h" #include "core/module/ModuleManager.h" #include "core/thread/Task.h" #include "core/thread/TaskRunnerGetter.h" #include "core/typedef/GpgTypedef.h" +#include "core/utils/BuildInfoUtils.h" #include "core/utils/GpgUtils.h" #include "core/utils/IOUtils.h" #include "thread/KeyServerImportTask.h" #include "ui/UISignalStation.h" #include "ui/dialog/WaitingDialog.h" -#include "ui/dialog/gnupg/GnuPGControllerDialog.h" +#include "ui/dialog/controller/GnuPGControllerDialog.h" #include "ui/dialog/import_export/KeyServerImportDialog.h" -#include "ui/struct/CacheObject.h" -#include "ui/struct/SettingsObject.h" -#include "ui/struct/settings/KeyServerSO.h" +#include "ui/struct/settings_object/KeyServerSO.h" #include "ui/widgets/TextEdit.h" namespace GpgFrontend::UI { @@ -431,7 +431,7 @@ void CommonUtils::SlotImportKeyFromKeyServer( // Waiting for reply auto request = QNetworkRequest(req_url); request.setHeader(QNetworkRequest::UserAgentHeader, - HTTP_REQUEST_USER_AGENT); + GetHttpRequestUserAgent()); QNetworkReply *reply = network_manager->get(request); QEventLoop loop; |