[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-3/pwmanager/pwmanager/masterkey
From:       Michael Buesch <mbuesch () freenet ! de>
Date:       2005-01-02 14:16:25
Message-ID: 20050102141625.10BC31B8E5 () office ! kde ! org
[Download RAW message or body]

CVS commit by mbuesch: 

update for PWMCONF_KEYCARD_COMPAT


  M +2 -2      keydata.cpp   1.4
  M +3 -5      keydata.h   1.4


--- kdeextragear-3/pwmanager/pwmanager/masterkey/keydata.cpp  #1.3:1.4
@@ -136,5 +136,5 @@ uint16_t KeyData::toBigEndian(uint16_t i
 #endif // BIG_ENDIAN_HOST
 
-#if KEYCARD_COMPAT != 0
+#if PWMCONF_KEYCARD_COMPAT != 0
 # define KEYCARD_COMPAT_MAGIC           "PWMKEYCARD"
 # define KEYCARD_COMPAT_MAGIC_LENGTH    10 /* byte */
@@ -186,5 +186,5 @@ bool KeyData::setStream_10compat(const Q
         return true;
 }
-#endif // KEYCARD_COMPAT
+#endif // PWMCONF_KEYCARD_COMPAT
 
 bool KeyData::setStream(const QByteArray &s)

--- kdeextragear-3/pwmanager/pwmanager/masterkey/keydata.h  #1.3:1.4
@@ -19,6 +19,4 @@
 #include <stdint.h>
 
-/** enable/disable PwManager-1.0 keycard compatibility code. (1/0) */
-#define KEYCARD_COMPAT          1
 
 /** This class implements the raw key-data-stream.
@@ -73,5 +71,5 @@ public:
 
 protected:
-#if KEYCARD_COMPAT != 0
+#if PWMCONF_KEYCARD_COMPAT != 0
         /** compatibility function for PwManager-1.0 keycards. */
         bool setStream_10compat(const QByteArray &s);
@@ -82,8 +80,8 @@ protected:
         uint32_t toBigEndian(uint32_t i) const;
 # endif // BIG_ENDIAN_HOST
-#else // KEYCARD_COMPAT
+#else // PWMCONF_KEYCARD_COMPAT
         bool setStream_10compat(const QByteArray &)
                         { return false; }
-#endif // KEYCARD_COMPAT
+#endif // PWMCONF_KEYCARD_COMPAT
         unsigned int estimateStreamSize() const;
         void writeToStream(QByteArray *s, unsigned int *offset,


[prev in list] [next in list] [prev in thread] [next in thread]