From 0b8686f0948e96ad03d5c461639e0dc781b008d6 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 27 Sep 2022 05:39:08 +0300 Subject: [PATCH 41/41] Qt: Correct order of helpdlg.h includes Also, helpdlg_g.h was being included as extern "C" though it lists gui's own function prototypes, i.e., it's about Qt's C++ functions in this case. See osdn #45694 Signed-off-by: Marko Lindqvist --- client/gui-qt/helpdlg.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/client/gui-qt/helpdlg.h b/client/gui-qt/helpdlg.h index e48a0c96ab..88241cab55 100644 --- a/client/gui-qt/helpdlg.h +++ b/client/gui-qt/helpdlg.h @@ -14,20 +14,20 @@ #ifndef FC__HELPDLG_H #define FC__HELPDLG_H -// common -#include "extras.h" - // Qt #include #include #include +// common +#include "extras.h" + +// client +#include "helpdlg_g.h" + // gui-qt #include "dialogs.h" -extern "C" { -#include "helpdlg_g.h" -} // Forward declarations struct canvas; -- 2.35.1