History

Fix non self-sufficient headers

Clement committed 8 years ago

Commit da9fb9c1 parent ec35462263 files · +629 −600Browse files

Showing the changes to interface/src/commerce/Wallet.cpp (1 of 263 files). Show all

Unified · Split

interface/src/commerce/Wallet.cpp+16−16
@@ -9,22 +9,7 @@ · 8 unmodified lines
9// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html9// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
10//10//
11 11
12#include "CommerceLogging.h"
13#include "Ledger.h"
14#include "Wallet.h"12#include "Wallet.h"
15#include "Application.h"
16#include "ui/SecurityImageProvider.h"
17#include "scripting/HMDScriptingInterface.h"
18#include <ui/TabletScriptingInterface.h>
19
20#include <PathUtils.h>
21#include <OffscreenUi.h>
22#include <AccountManager.h>
23
24#include <QFile>
25#include <QCryptographicHash>
26#include <QQmlContext>
27#include <QBuffer>
28 13
29#include <openssl/ssl.h>14#include <openssl/ssl.h>
30#include <openssl/err.h>15#include <openssl/err.h>
@@ -33,7 +18,6 @@ · 2 unmodified lines
33#include <openssl/evp.h>18#include <openssl/evp.h>
34#include <openssl/aes.h>19#include <openssl/aes.h>
35#include <openssl/ecdsa.h>20#include <openssl/ecdsa.h>
36
37// I know, right? But per https://www.openssl.org/docs/faq.html21// I know, right? But per https://www.openssl.org/docs/faq.html
38// this avoids OPENSSL_Uplink(00007FF847238000,08): no OPENSSL_Applink22// this avoids OPENSSL_Uplink(00007FF847238000,08): no OPENSSL_Applink
39// at runtime.23// at runtime.
@@ -41,6 +25,22 @@ · 1 unmodified line
41#include <openssl/applink.c>25#include <openssl/applink.c>
42#endif26#endif
43 27
28#include <QFile>
29#include <QCryptographicHash>
30#include <QQmlContext>
31#include <QBuffer>
32
33#include <PathUtils.h>
34#include <OffscreenUi.h>
35#include <AccountManager.h>
36#include <ui/TabletScriptingInterface.h>
37
38#include "Application.h"
39#include "CommerceLogging.h"
40#include "Ledger.h"
41#include "ui/SecurityImageProvider.h"
42#include "scripting/HMDScriptingInterface.h"
43
44static const char* KEY_FILE = "hifikey";44static const char* KEY_FILE = "hifikey";
45static const char* INSTRUCTIONS_FILE = "backup_instructions.html";45static const char* INSTRUCTIONS_FILE = "backup_instructions.html";
46static const char* IMAGE_HEADER = "-----BEGIN SECURITY IMAGE-----\n";46static const char* IMAGE_HEADER = "-----BEGIN SECURITY IMAGE-----\n";