thooge
/
keepassx1
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge global.h into keepassx.h

Browse Source 
git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@335 b624d157-de02-0410-bad0-e51aec6abb33
master
sniperbeamer 16 years ago
parent 89b4d6032b
commit 9b620089ca
4 changed files with 3 additions and 5 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      src/crypto/blowfish.h
  2. 3
      src/global.h
  3. 3
      src/keepassx.h
  4. 1
      src/src.pro

1
src/crypto/blowfish.h
Unescape View File

@ -24,7 +24,6 @@
#ifndef BLOWFISH_H #ifndef BLOWFISH_H
#define BLOWFISH_H #define BLOWFISH_H
#include "global.h"
#include <qglobal.h> #include <qglobal.h>
//#include <stdint.h> //#include <stdint.h>
#include <string> #include <string>

3
src/global.h
Unescape View File

@ -1,3 +0,0 @@
#define KEEPASS_LITTLE_ENDIAN
//#define KEEPASS_BIG_ENDIAN

3
src/keepassx.h
Unescape View File

@ -30,6 +30,9 @@
#define BUILTIN_ICONS 69 #define BUILTIN_ICONS 69
#define KEEPASS_LITTLE_ENDIAN
//#define KEEPASS_BIG_ENDIAN
// often used, stable header files for pch // often used, stable header files for pch
#ifdef __cplusplus #ifdef __cplusplus

1
src/src.pro
Unescape View File

@ -187,7 +187,6 @@ TRANSLATIONS = $$TRANSLATIONS_KX $$TRANSLATIONS_DISABLED translations/keepassx-x
#TRANSLATIONS_COMPILE = $$TRANSLATIONS_KX $$TRANSLATIONS_QT #TRANSLATIONS_COMPILE = $$TRANSLATIONS_KX $$TRANSLATIONS_QT
HEADERS += main.h \ HEADERS += main.h \
global.h \
mainwindow.h \ mainwindow.h \
KpxConfig.h \ KpxConfig.h \
Database.h \ Database.h \