gcc4 fixes

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.
 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.
 This feature must be considered as unstable - it still needs some more testing.
 
+On Wintendo now KA/Pi can sync with Outlook. The configuration of the sync needs some moer tweking.
+Fixed some gcc 4.xx compilation probs.
+Fixed an annoying cursor focus reset problem when editing and (auto-)saving journal enries in KO/Pi.
+
+
 ********** VERSION 2.2.7 ************
 
 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 @@
 
 /* We need lot of ATGEN functions, because Alcatel is an AT device. */
 
-extern GSM_Reply_Function ALCATELReplyFunctions[];
+static GSM_Reply_Function ALCATELReplyFunctions[];
 extern GSM_Reply_Function ATGENReplyFunctions[];
 
         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 @@
 #include "../../../common/phone/pfunc.h"
 #include "../../gammu.h"
 
-extern GSM_Reply_Function UserReplyFunctions3[];
+static GSM_Reply_Function UserReplyFunctions3[];
 
 /* ------- some usefull functions ----------------------------------------- */
 
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 @@
 #include "wmx-sim.h"
 #include "wmx-list.h"
 
-extern GSM_Reply_Function UserReplyFunctionsX[];
+static GSM_Reply_Function UserReplyFunctionsX[];
 
 /* Global variables suck */
         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 @@
 #include "../../../common/phone/nokia/dct4/dct4func.h"
 #include "../../../common/misc/coding/coding.h"
 
-extern GSM_Reply_Function UserReplyFunctions4[];
+static GSM_Reply_Function UserReplyFunctions4[];
 
 /* ------- some usefull functions ----------------------------------------- */
 
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 @@
 extern GSM_Error  ATGEN_GetSIMIMSI (GSM_StateMachine *s, char *IMSI);
 extern GSM_Error  ATGEN_GetMemoryStatus (GSM_StateMachine *s, GSM_MemoryStatus *status);
 extern GSM_Error  ATGEN_SetMemory (GSM_StateMachine *s, GSM_MemoryEntry *pbk);
-extern GSM_Reply_Function UserReplyFunctionsAtS[];
+static GSM_Reply_Function UserReplyFunctionsAtS[];
 
         bool new_variable;
 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 @@
 
 #include <qdatetime.h>
 #include <qpopupmenu.h>
+#include <qcombobox.h>
 
 #include <kabc/addressee.h>
 #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,
   serpent_subkeys_generate (key_prepared, context->keys);
   _gcry_burn_stack (272 * sizeof (u32_t));
 }
-
+ static const char *serpent_test (void);
 /* Initialize CTX with the key KEY of KEY_LENGTH bytes.  */
 static gcry_err_code_t
 serpent_setkey (void *ctx,
@@ -687,7 +687,7 @@ serpent_setkey (void *ctx,
   if (! serpent_init_done)
     {
       /* Execute a self-test the first time, Serpent is used.  */
-      static const char *serpent_test (void);
+     
       
       serpent_test_ret = serpent_test ();
       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 @@
  * $Id$
  **************************************************************************/  
 
-
 #include "binentrygen.h"
 #include "base64.h"
-#include "pwmexception.h"
 
+#include "pwmexception.h"
+#include "globalstuff.h"
 
 void BinEntryGen::encode(const QByteArray &data,
                          PwMDataItem *ret,
@@ -69,3 +69,4 @@ BinEntryGen::DataType BinEntryGen::binType(const PwMDataItem &data)
         int type = strtol(data.name.c_str(), 0, 10);
         return (static_cast<DataType>(type));
 }
+
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 @@
 #ifndef __BINENTRYGEN_H
 #define __BINENTRYGEN_H
 
-#include "pwmdoc.h"
 
 #include <qcstring.h>
 
+#include "pwmdoc.h"
 
 /** Binary entry generator.
   * 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 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "blowfish.h"
 #include "globalstuff.h"
 
+#include "blowfish.h"
 
 /* precomputed S boxes */
 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 @@
 #ifndef BLOWFISH_H
 #define BLOWFISH_H
 
-#include "pwmexception.h"
+//#include "pwmexception.h"
 #ifndef _WIN32_
 #include <stdint.h>
 #else
@@ -44,6 +44,8 @@ typedef uint8_t		byte;
 #define  uint32_t Q_UINT32
 #endif
 
+//#include "pwmexception.h"
+
 /** blowfish encryption algorithm.
   * Derived from libgcrypt-1.1.12
   */
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 @@
 #include "genpasswd.h"
 #include "pwmexception.h"
 #include "randomizer.h"
+#include "globalstuff.h"
 
 
 /* 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 @@
 #ifndef __LIBGCRYPTIF_H
 #define __LIBGCRYPTIF_H
 
-#include "pwmexception.h"
 
 //#undef CONFIG_PWMANAGER_GCRY // for debugging only.
 #ifdef CONFIG_PWMANAGER_GCRY
@@ -40,6 +39,9 @@
 #endif
         #define STRING2KEY_SALTLEN8
 
+#include "pwmexception.h"
+
+
 /** interface class for the libgcrypt cipher and hash algorithms
   * NOTE: Always allocate 1024 extra bytes for the inBuf (for padding)
   */
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 @@
 #ifndef __PWMEXCEPTION_H
 #define __PWMEXCEPTION_H
 
-#include "globalstuff.h"
+//#include "globalstuff.h"
 
 #include <iostream>
 #include <string>
@@ -214,4 +214,5 @@ void __printError(const string &msg);
         #define printWarn(x)__printWarn(x)
         #define printError(x)__printError(x)
 
+#include "globalstuff.h"
 #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 @@
 #define __RANDOMIZER_H
 
 #include "pwmexception.h"
+#include "globalstuff.h"
 
 #ifndef PWM_EMBEDDED
 #include <qmutex.h>