Merge global.h into keepassx.h

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@335 b624d157-de02-0410-bad0-e51aec6abb33
16 years ago · 9b620089ca
parent 89b4d6032b
commit 9b620089ca
4 changed files with 3 additions and 5 deletions
--- a/src/crypto/blowfish.h
+++ b/src/crypto/blowfish.h
@ -24,7 +24,6 @@
 #ifndef BLOWFISH_H
 #define BLOWFISH_H

-#include "global.h"
 #include <qglobal.h>
 //#include <stdint.h>
 #include <string>
--- a/src/global.h
+++ b/src/global.h
@ -1,3 +0,0 @@
-
-#define KEEPASS_LITTLE_ENDIAN
-//#define KEEPASS_BIG_ENDIAN
--- a/src/keepassx.h
+++ b/src/keepassx.h
@ -30,6 +30,9 @@

 #define BUILTIN_ICONS 69

+#define KEEPASS_LITTLE_ENDIAN
+//#define KEEPASS_BIG_ENDIAN
+
 // often used, stable header files for pch

 #ifdef __cplusplus
--- a/src/src.pro
+++ b/src/src.pro
@ -187,7 +187,6 @@ TRANSLATIONS = $$TRANSLATIONS_KX $$TRANSLATIONS_DISABLED translations/keepassx-x
 #TRANSLATIONS_COMPILE = $$TRANSLATIONS_KX $$TRANSLATIONS_QT

 HEADERS += main.h \
-           global.h \
           mainwindow.h \
           KpxConfig.h \
           Database.h \