From 268e69a533c5db110600758366644c9827957364 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Wed, 20 Oct 2004 08:28:39 +0000
Subject: several fixes

---
(limited to 'pwmanager/pwmanager')

diff --git a/pwmanager/pwmanager/compiler.h b/pwmanager/pwmanager/compiler.h
index be08c6d..a942246 100644
--- a/pwmanager/pwmanager/compiler.h
+++ b/pwmanager/pwmanager/compiler.h
@@ -11,6 +11,14 @@
 #ifndef __PWMANAGER_COMPILER_H
 #define __PWMANAGER_COMPILER_H
 
+#ifdef _WIN32_
+#  define __builtin_expect(x, expected_value) (x)
+#define NOREGPARM	__attribute__((regparm(0)))
+#define REGPARM		__attribute__((regparm(3)))
+#define likely(x)	__builtin_expect(!!(x), 1)
+#define unlikely(x)	__builtin_expect(!!(x), 0)
+
+#else
 #ifdef __deprecated
 # undef __deprecated
 #endif
@@ -57,5 +65,5 @@
 # undef REGPARM
 #endif
 #define REGPARM		__attribute__((regparm(3)))
-
+#endif
 #endif // __PWMANAGER_COMPILER_H
diff --git a/pwmanager/pwmanager/pwm.h b/pwmanager/pwmanager/pwm.h
index 116bc66..6ab9d6b 100644
--- a/pwmanager/pwmanager/pwm.h
+++ b/pwmanager/pwmanager/pwm.h
@@ -141,8 +141,7 @@ public slots:
 	//US ENH : changed code to run with older MOC
 	void editPwd_slot();
 	void editPwd_slot1(const QString *category);
-	void editPwd_slot3(const QString *category = 0, const int *index = 0,
-			  PwMDoc *_doc = 0);
+	void editPwd_slot3(const QString *category, const int *index ,PwMDoc *_doc );
 
 	/** manage/delete triggered */
 	void deletePwd_slot();
diff --git a/pwmanager/pwmanager/pwmanager.pro b/pwmanager/pwmanager/pwmanager.pro
index 7f39c76..49c1f46 100644
--- a/pwmanager/pwmanager/pwmanager.pro
+++ b/pwmanager/pwmanager/pwmanager.pro
@@ -1,5 +1,5 @@
 TEMPLATE	= app
-CONFIG		+= qt warn_on
+CONFIG		+= qt warn_off
 DESTDIR= ../../bin
 TARGET		= pwmpi
 include( ../../variables.pri )
@@ -30,7 +30,7 @@ DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 QMAKE_LINK += /NODEFAULTLIB:LIBC
-
+QMAKE_CXXFLAGS += /TP /GX /GR /Ehsc
 }
 
 #INTERFACES = \
diff --git a/pwmanager/pwmanager/pwmdoc.h b/pwmanager/pwmanager/pwmdoc.h
index 635361a..55e3231 100644
--- a/pwmanager/pwmanager/pwmdoc.h
+++ b/pwmanager/pwmanager/pwmdoc.h
@@ -19,7 +19,9 @@
 
 #ifndef __PWMDOC_H
 #define __PWMDOC_H
-
+#ifdef _WIN32_
+#define ssize_t unsigned int
+#endif
 #define PWM_FILE_VER		(static_cast<char>(0x05))
 
 #define PWM_HASH_SHA1		(static_cast<char>(0x01))
diff --git a/pwmanager/pwmanager/randomizer.cpp b/pwmanager/pwmanager/randomizer.cpp
index e1085ff..da4df78 100644
--- a/pwmanager/pwmanager/randomizer.cpp
+++ b/pwmanager/pwmanager/randomizer.cpp
@@ -35,8 +35,12 @@
 #endif
 
 #endif //PWM_EMBEDDED
-
-
+#ifdef _WIN32_
+int rand_r( uint * seed ) {
+  srand(*seed);
+  return rand();
+}
+#endif
 Randomizer * Randomizer::rndObj (0);
 
 Randomizer::Randomizer()
diff --git a/pwmanager/pwmanager/setmasterpwwndimpl.h b/pwmanager/pwmanager/setmasterpwwndimpl.h
index 3203d4d..08f3654 100644
--- a/pwmanager/pwmanager/setmasterpwwndimpl.h
+++ b/pwmanager/pwmanager/setmasterpwwndimpl.h
@@ -29,7 +29,11 @@
 
 #include <klocale.h>
 
+#ifdef _WIN32_
+#define uint32_t Q_UINT32
+#else
 #include <stdint.h>
+#endif
 #include <string>
 using std::string;
 
diff --git a/pwmanager/pwmanager/sha1.h b/pwmanager/pwmanager/sha1.h
index 29442a7..c649bae 100644
--- a/pwmanager/pwmanager/sha1.h
+++ b/pwmanager/pwmanager/sha1.h
@@ -19,12 +19,17 @@
 
 #ifndef SHA1_H
 #define SHA1_H
-
+#ifdef _WIN32_
+#define uint32_t unsigned int
+#define uint8_t	unsigned char
+#define byte	unsigned char
+#else
 #include <stdint.h>
+typedef uint8_t		byte;
+#endif
 #include <string>
 using std::string;
 
-typedef uint8_t		byte;
 
 #define SHA1_HASH_LEN_BIT	160
 #define SHA1_HASH_LEN_BYTE	(SHA1_HASH_LEN_BIT / 8)
--
cgit v0.9.0.2