author | zautrix <zautrix> | 2006-02-24 19:41:06 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2006-02-24 19:41:06 (UTC) |
commit | 4e2553b95b2787ed7917073f6b628819b1f017c3 (patch) (unidiff) | |
tree | da5cb746bf3373cb2a368afda082999e6c22751f | |
parent | 08605356c77351d64e14e0fdd69bdb769f933909 (diff) | |
download | kdepimpi-4e2553b95b2787ed7917073f6b628819b1f017c3.zip kdepimpi-4e2553b95b2787ed7917073f6b628819b1f017c3.tar.gz kdepimpi-4e2553b95b2787ed7917073f6b628819b1f017c3.tar.bz2 |
gcc4 fixes
-rw-r--r-- | bin/kdepim/WhatsNew.txt | 5 | ||||
-rw-r--r-- | gammu/emb/common/phone/alcatel/alcatel.c | 2 | ||||
-rw-r--r-- | gammu/emb/gammu/depend/nokia/dct3.c | 2 | ||||
-rw-r--r-- | gammu/emb/gammu/depend/nokia/dct3trac/wmx.c | 2 | ||||
-rw-r--r-- | gammu/emb/gammu/depend/nokia/dct4.c | 2 | ||||
-rw-r--r-- | gammu/emb/gammu/depend/siemens/dsiemens.c | 2 | ||||
-rw-r--r-- | kaddressbook/addresseeeditorwidget.h | 1 | ||||
-rw-r--r-- | pwmanager/libcrypt/cipher/serpent.c | 4 | ||||
-rw-r--r-- | pwmanager/pwmanager/binentrygen.cpp | 5 | ||||
-rw-r--r-- | pwmanager/pwmanager/binentrygen.h | 2 | ||||
-rw-r--r-- | pwmanager/pwmanager/blowfish.cpp | 2 | ||||
-rw-r--r-- | pwmanager/pwmanager/blowfish.h | 4 | ||||
-rw-r--r-- | pwmanager/pwmanager/genpasswd.cpp | 1 | ||||
-rw-r--r-- | pwmanager/pwmanager/libgcryptif.h | 4 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwmexception.h | 3 | ||||
-rw-r--r-- | pwmanager/pwmanager/randomizer.h | 1 |
16 files changed, 28 insertions, 14 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index cd37aac..9879ef0 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -12,6 +12,11 @@ KA/Pi uses popup menu now for quick category selection in contact edit dialog. | |||
12 | In the Pi-syc mode of KO/Pi it is now possible to define specific resources which can be synced with the remote pi-sync server. | 12 | In the Pi-syc mode of KO/Pi it is now possible to define specific resources which can be synced with the remote pi-sync server. |
13 | This feature must be considered as unstable - it still needs some more testing. | 13 | This feature must be considered as unstable - it still needs some more testing. |
14 | 14 | ||
15 | On Wintendo now KA/Pi can sync with Outlook. The configuration of the sync needs some moer tweking. | ||
16 | Fixed some gcc 4.xx compilation probs. | ||
17 | Fixed an annoying cursor focus reset problem when editing and (auto-)saving journal enries in KO/Pi. | ||
18 | |||
19 | |||
15 | ********** VERSION 2.2.7 ************ | 20 | ********** VERSION 2.2.7 ************ |
16 | 21 | ||
17 | Added for Desktop Versions (Windows + Linux) the possibility to specify an email client to call if the user clicks on an emailaddress. | 22 | Added for Desktop Versions (Windows + Linux) the possibility to specify an email client to call if the user clicks on an emailaddress. |
diff --git a/gammu/emb/common/phone/alcatel/alcatel.c b/gammu/emb/common/phone/alcatel/alcatel.c index b75077f..718d91e 100644 --- a/gammu/emb/common/phone/alcatel/alcatel.c +++ b/gammu/emb/common/phone/alcatel/alcatel.c | |||
@@ -56,7 +56,7 @@ | |||
56 | 56 | ||
57 | /* We need lot of ATGEN functions, because Alcatel is an AT device. */ | 57 | /* We need lot of ATGEN functions, because Alcatel is an AT device. */ |
58 | 58 | ||
59 | extern GSM_Reply_Function ALCATELReplyFunctions[]; | 59 | static GSM_Reply_Function ALCATELReplyFunctions[]; |
60 | extern GSM_Reply_Function ATGENReplyFunctions[]; | 60 | extern GSM_Reply_Function ATGENReplyFunctions[]; |
61 | 61 | ||
62 | extern GSM_Error ATGEN_Initialise (GSM_StateMachine *s); | 62 | extern GSM_Error ATGEN_Initialise (GSM_StateMachine *s); |
diff --git a/gammu/emb/gammu/depend/nokia/dct3.c b/gammu/emb/gammu/depend/nokia/dct3.c index b9e47ea..bda7532 100644 --- a/gammu/emb/gammu/depend/nokia/dct3.c +++ b/gammu/emb/gammu/depend/nokia/dct3.c | |||
@@ -15,7 +15,7 @@ | |||
15 | #include "../../../common/phone/pfunc.h" | 15 | #include "../../../common/phone/pfunc.h" |
16 | #include "../../gammu.h" | 16 | #include "../../gammu.h" |
17 | 17 | ||
18 | extern GSM_Reply_Function UserReplyFunctions3[]; | 18 | static GSM_Reply_Function UserReplyFunctions3[]; |
19 | 19 | ||
20 | /* ------- some usefull functions ----------------------------------------- */ | 20 | /* ------- some usefull functions ----------------------------------------- */ |
21 | 21 | ||
diff --git a/gammu/emb/gammu/depend/nokia/dct3trac/wmx.c b/gammu/emb/gammu/depend/nokia/dct3trac/wmx.c index 64eda37..e46d9dd 100644 --- a/gammu/emb/gammu/depend/nokia/dct3trac/wmx.c +++ b/gammu/emb/gammu/depend/nokia/dct3trac/wmx.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include "wmx-sim.h" | 28 | #include "wmx-sim.h" |
29 | #include "wmx-list.h" | 29 | #include "wmx-list.h" |
30 | 30 | ||
31 | extern GSM_Reply_Function UserReplyFunctionsX[]; | 31 | static GSM_Reply_Function UserReplyFunctionsX[]; |
32 | 32 | ||
33 | /* Global variables suck */ | 33 | /* Global variables suck */ |
34 | GSMDecoder *gsmdec; | 34 | GSMDecoder *gsmdec; |
diff --git a/gammu/emb/gammu/depend/nokia/dct4.c b/gammu/emb/gammu/depend/nokia/dct4.c index 4bf958d..43d8f09 100644 --- a/gammu/emb/gammu/depend/nokia/dct4.c +++ b/gammu/emb/gammu/depend/nokia/dct4.c | |||
@@ -13,7 +13,7 @@ | |||
13 | #include "../../../common/phone/nokia/dct4/dct4func.h" | 13 | #include "../../../common/phone/nokia/dct4/dct4func.h" |
14 | #include "../../../common/misc/coding/coding.h" | 14 | #include "../../../common/misc/coding/coding.h" |
15 | 15 | ||
16 | extern GSM_Reply_Function UserReplyFunctions4[]; | 16 | static GSM_Reply_Function UserReplyFunctions4[]; |
17 | 17 | ||
18 | /* ------- some usefull functions ----------------------------------------- */ | 18 | /* ------- some usefull functions ----------------------------------------- */ |
19 | 19 | ||
diff --git a/gammu/emb/gammu/depend/siemens/dsiemens.c b/gammu/emb/gammu/depend/siemens/dsiemens.c index dc54102..a34bc3b 100644 --- a/gammu/emb/gammu/depend/siemens/dsiemens.c +++ b/gammu/emb/gammu/depend/siemens/dsiemens.c | |||
@@ -17,7 +17,7 @@ | |||
17 | extern GSM_Error ATGEN_GetSIMIMSI (GSM_StateMachine *s, char *IMSI); | 17 | extern GSM_Error ATGEN_GetSIMIMSI (GSM_StateMachine *s, char *IMSI); |
18 | extern GSM_Error ATGEN_GetMemoryStatus (GSM_StateMachine *s, GSM_MemoryStatus *status); | 18 | extern GSM_Error ATGEN_GetMemoryStatus (GSM_StateMachine *s, GSM_MemoryStatus *status); |
19 | extern GSM_Error ATGEN_SetMemory (GSM_StateMachine *s, GSM_MemoryEntry *pbk); | 19 | extern GSM_Error ATGEN_SetMemory (GSM_StateMachine *s, GSM_MemoryEntry *pbk); |
20 | extern GSM_Reply_Function UserReplyFunctionsAtS[]; | 20 | static GSM_Reply_Function UserReplyFunctionsAtS[]; |
21 | 21 | ||
22 | bool new_variable; | 22 | bool new_variable; |
23 | GSM_Error CheckSiemens() | 23 | GSM_Error CheckSiemens() |
diff --git a/kaddressbook/addresseeeditorwidget.h b/kaddressbook/addresseeeditorwidget.h index df9965d..816bbb5 100644 --- a/kaddressbook/addresseeeditorwidget.h +++ b/kaddressbook/addresseeeditorwidget.h | |||
@@ -26,6 +26,7 @@ | |||
26 | 26 | ||
27 | #include <qdatetime.h> | 27 | #include <qdatetime.h> |
28 | #include <qpopupmenu.h> | 28 | #include <qpopupmenu.h> |
29 | #include <qcombobox.h> | ||
29 | 30 | ||
30 | #include <kabc/addressee.h> | 31 | #include <kabc/addressee.h> |
31 | #include <kdialogbase.h> | 32 | #include <kdialogbase.h> |
diff --git a/pwmanager/libcrypt/cipher/serpent.c b/pwmanager/libcrypt/cipher/serpent.c index d606d9f..fb5df20 100644 --- a/pwmanager/libcrypt/cipher/serpent.c +++ b/pwmanager/libcrypt/cipher/serpent.c | |||
@@ -673,7 +673,7 @@ serpent_setkey_internal (serpent_context_t *context, | |||
673 | serpent_subkeys_generate (key_prepared, context->keys); | 673 | serpent_subkeys_generate (key_prepared, context->keys); |
674 | _gcry_burn_stack (272 * sizeof (u32_t)); | 674 | _gcry_burn_stack (272 * sizeof (u32_t)); |
675 | } | 675 | } |
676 | 676 | static const char *serpent_test (void); | |
677 | /* Initialize CTX with the key KEY of KEY_LENGTH bytes. */ | 677 | /* Initialize CTX with the key KEY of KEY_LENGTH bytes. */ |
678 | static gcry_err_code_t | 678 | static gcry_err_code_t |
679 | serpent_setkey (void *ctx, | 679 | serpent_setkey (void *ctx, |
@@ -687,7 +687,7 @@ serpent_setkey (void *ctx, | |||
687 | if (! serpent_init_done) | 687 | if (! serpent_init_done) |
688 | { | 688 | { |
689 | /* Execute a self-test the first time, Serpent is used. */ | 689 | /* Execute a self-test the first time, Serpent is used. */ |
690 | static const char *serpent_test (void); | 690 | |
691 | 691 | ||
692 | serpent_test_ret = serpent_test (); | 692 | serpent_test_ret = serpent_test (); |
693 | if (serpent_test_ret) | 693 | if (serpent_test_ret) |
diff --git a/pwmanager/pwmanager/binentrygen.cpp b/pwmanager/pwmanager/binentrygen.cpp index 7d5ae45..f156a5e 100644 --- a/pwmanager/pwmanager/binentrygen.cpp +++ b/pwmanager/pwmanager/binentrygen.cpp | |||
@@ -17,11 +17,11 @@ | |||
17 | * $Id$ | 17 | * $Id$ |
18 | **************************************************************************/ | 18 | **************************************************************************/ |
19 | 19 | ||
20 | |||
21 | #include "binentrygen.h" | 20 | #include "binentrygen.h" |
22 | #include "base64.h" | 21 | #include "base64.h" |
23 | #include "pwmexception.h" | ||
24 | 22 | ||
23 | #include "pwmexception.h" | ||
24 | #include "globalstuff.h" | ||
25 | 25 | ||
26 | void BinEntryGen::encode(const QByteArray &data, | 26 | void BinEntryGen::encode(const QByteArray &data, |
27 | PwMDataItem *ret, | 27 | PwMDataItem *ret, |
@@ -69,3 +69,4 @@ BinEntryGen::DataType BinEntryGen::binType(const PwMDataItem &data) | |||
69 | int type = strtol(data.name.c_str(), 0, 10); | 69 | int type = strtol(data.name.c_str(), 0, 10); |
70 | return (static_cast<DataType>(type)); | 70 | return (static_cast<DataType>(type)); |
71 | } | 71 | } |
72 | |||
diff --git a/pwmanager/pwmanager/binentrygen.h b/pwmanager/pwmanager/binentrygen.h index a58cd42..49288aa 100644 --- a/pwmanager/pwmanager/binentrygen.h +++ b/pwmanager/pwmanager/binentrygen.h | |||
@@ -20,10 +20,10 @@ | |||
20 | #ifndef __BINENTRYGEN_H | 20 | #ifndef __BINENTRYGEN_H |
21 | #define __BINENTRYGEN_H | 21 | #define __BINENTRYGEN_H |
22 | 22 | ||
23 | #include "pwmdoc.h" | ||
24 | 23 | ||
25 | #include <qcstring.h> | 24 | #include <qcstring.h> |
26 | 25 | ||
26 | #include "pwmdoc.h" | ||
27 | 27 | ||
28 | /** Binary entry generator. | 28 | /** Binary entry generator. |
29 | * This generator generates a normal struct PwMDataItem | 29 | * This generator generates a normal struct PwMDataItem |
diff --git a/pwmanager/pwmanager/blowfish.cpp b/pwmanager/pwmanager/blowfish.cpp index 2ca58ce..ee29756 100644 --- a/pwmanager/pwmanager/blowfish.cpp +++ b/pwmanager/pwmanager/blowfish.cpp | |||
@@ -43,9 +43,9 @@ | |||
43 | #include <string.h> | 43 | #include <string.h> |
44 | #include <stdlib.h> | 44 | #include <stdlib.h> |
45 | 45 | ||
46 | #include "blowfish.h" | ||
47 | #include "globalstuff.h" | 46 | #include "globalstuff.h" |
48 | 47 | ||
48 | #include "blowfish.h" | ||
49 | 49 | ||
50 | /* precomputed S boxes */ | 50 | /* precomputed S boxes */ |
51 | static const uint32_t ks0[256] = { | 51 | static const uint32_t ks0[256] = { |
diff --git a/pwmanager/pwmanager/blowfish.h b/pwmanager/pwmanager/blowfish.h index 5129eab..862cccb 100644 --- a/pwmanager/pwmanager/blowfish.h +++ b/pwmanager/pwmanager/blowfish.h | |||
@@ -23,7 +23,7 @@ | |||
23 | #ifndef BLOWFISH_H | 23 | #ifndef BLOWFISH_H |
24 | #define BLOWFISH_H | 24 | #define BLOWFISH_H |
25 | 25 | ||
26 | #include "pwmexception.h" | 26 | //#include "pwmexception.h" |
27 | #ifndef _WIN32_ | 27 | #ifndef _WIN32_ |
28 | #include <stdint.h> | 28 | #include <stdint.h> |
29 | #else | 29 | #else |
@@ -44,6 +44,8 @@ typedef uint8_t byte; | |||
44 | #define uint32_t Q_UINT32 | 44 | #define uint32_t Q_UINT32 |
45 | #endif | 45 | #endif |
46 | 46 | ||
47 | //#include "pwmexception.h" | ||
48 | |||
47 | /** blowfish encryption algorithm. | 49 | /** blowfish encryption algorithm. |
48 | * Derived from libgcrypt-1.1.12 | 50 | * Derived from libgcrypt-1.1.12 |
49 | */ | 51 | */ |
diff --git a/pwmanager/pwmanager/genpasswd.cpp b/pwmanager/pwmanager/genpasswd.cpp index b0cceff..41078b3 100644 --- a/pwmanager/pwmanager/genpasswd.cpp +++ b/pwmanager/pwmanager/genpasswd.cpp | |||
@@ -20,6 +20,7 @@ | |||
20 | #include "genpasswd.h" | 20 | #include "genpasswd.h" |
21 | #include "pwmexception.h" | 21 | #include "pwmexception.h" |
22 | #include "randomizer.h" | 22 | #include "randomizer.h" |
23 | #include "globalstuff.h" | ||
23 | 24 | ||
24 | 25 | ||
25 | /* how often can a char of the same charset be reused in order */ | 26 | /* how often can a char of the same charset be reused in order */ |
diff --git a/pwmanager/pwmanager/libgcryptif.h b/pwmanager/pwmanager/libgcryptif.h index 9a987a2..a08d678 100644 --- a/pwmanager/pwmanager/libgcryptif.h +++ b/pwmanager/pwmanager/libgcryptif.h | |||
@@ -24,7 +24,6 @@ | |||
24 | #ifndef __LIBGCRYPTIF_H | 24 | #ifndef __LIBGCRYPTIF_H |
25 | #define __LIBGCRYPTIF_H | 25 | #define __LIBGCRYPTIF_H |
26 | 26 | ||
27 | #include "pwmexception.h" | ||
28 | 27 | ||
29 | //#undef CONFIG_PWMANAGER_GCRY // for debugging only. | 28 | //#undef CONFIG_PWMANAGER_GCRY // for debugging only. |
30 | #ifdef CONFIG_PWMANAGER_GCRY | 29 | #ifdef CONFIG_PWMANAGER_GCRY |
@@ -40,6 +39,9 @@ | |||
40 | #endif | 39 | #endif |
41 | #define STRING2KEY_SALTLEN8 | 40 | #define STRING2KEY_SALTLEN8 |
42 | 41 | ||
42 | #include "pwmexception.h" | ||
43 | |||
44 | |||
43 | /** interface class for the libgcrypt cipher and hash algorithms | 45 | /** interface class for the libgcrypt cipher and hash algorithms |
44 | * NOTE: Always allocate 1024 extra bytes for the inBuf (for padding) | 46 | * NOTE: Always allocate 1024 extra bytes for the inBuf (for padding) |
45 | */ | 47 | */ |
diff --git a/pwmanager/pwmanager/pwmexception.h b/pwmanager/pwmanager/pwmexception.h index 301ebd7..7f5a3a6 100644 --- a/pwmanager/pwmanager/pwmexception.h +++ b/pwmanager/pwmanager/pwmexception.h | |||
@@ -20,7 +20,7 @@ | |||
20 | #ifndef __PWMEXCEPTION_H | 20 | #ifndef __PWMEXCEPTION_H |
21 | #define __PWMEXCEPTION_H | 21 | #define __PWMEXCEPTION_H |
22 | 22 | ||
23 | #include "globalstuff.h" | 23 | //#include "globalstuff.h" |
24 | 24 | ||
25 | #include <iostream> | 25 | #include <iostream> |
26 | #include <string> | 26 | #include <string> |
@@ -214,4 +214,5 @@ void __printError(const string &msg); | |||
214 | #define printWarn(x)__printWarn(x) | 214 | #define printWarn(x)__printWarn(x) |
215 | #define printError(x)__printError(x) | 215 | #define printError(x)__printError(x) |
216 | 216 | ||
217 | #include "globalstuff.h" | ||
217 | #endif // __PWMEXCEPTION_H | 218 | #endif // __PWMEXCEPTION_H |
diff --git a/pwmanager/pwmanager/randomizer.h b/pwmanager/pwmanager/randomizer.h index f2a6015..44cc28e 100644 --- a/pwmanager/pwmanager/randomizer.h +++ b/pwmanager/pwmanager/randomizer.h | |||
@@ -21,6 +21,7 @@ | |||
21 | #define __RANDOMIZER_H | 21 | #define __RANDOMIZER_H |
22 | 22 | ||
23 | #include "pwmexception.h" | 23 | #include "pwmexception.h" |
24 | #include "globalstuff.h" | ||
24 | 25 | ||
25 | #ifndef PWM_EMBEDDED | 26 | #ifndef PWM_EMBEDDED |
26 | #include <qmutex.h> | 27 | #include <qmutex.h> |