From 9b620089ca6f4411f5e048849e000020ca294daa Mon Sep 17 00:00:00 2001
From: sniperbeamer <sniperbeamer@b624d157-de02-0410-bad0-e51aec6abb33>
Date: Fri, 28 Aug 2009 17:24:13 +0000
Subject: [PATCH] Merge global.h into keepassx.h

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@335 b624d157-de02-0410-bad0-e51aec6abb33
---
 src/crypto/blowfish.h | 1 -
 src/global.h          | 3 ---
 src/keepassx.h        | 3 +++
 src/src.pro           | 1 -
 4 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100644 src/global.h

diff --git a/src/crypto/blowfish.h b/src/crypto/blowfish.h
index d9d1932..e2afeb9 100644
--- 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>
diff --git a/src/global.h b/src/global.h
deleted file mode 100644
index e9b952f..0000000
--- a/src/global.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#define KEEPASS_LITTLE_ENDIAN
-//#define KEEPASS_BIG_ENDIAN
diff --git a/src/keepassx.h b/src/keepassx.h
index 8670b76..a0524c6 100644
--- 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
diff --git a/src/src.pro b/src/src.pro
index 15f1a7c..4ed8de9 100644
--- 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 \