Changeset 6504

Show
Ignore:
Timestamp:
09/06/08 03:43:24 (3 months ago)
Author:
flynd
Message:

Since time_t is long on some systems it might be better to not deprecate the long ReadNum/WriteNum? functions.

Location:
trunk/licq
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/licq/include/licq_file.h

    r6503 r6504  
    6060  bool CreateSection(const char *_szSectionName); 
    6161  bool ReadStr(const std::string& Key, char* data, const char* defValue = NULL, bool trim = true, int maxLength = 0); 
     62  bool ReadNum(const std::string& key, unsigned long &data, unsigned long defValue = 0); 
     63  bool ReadNum(const std::string& key, signed long &data, signed long defValue = 0); 
    6264  bool ReadNum(const std::string& key, unsigned int &data, unsigned int defValue = 0); 
    6365  bool ReadNum(const std::string& key, signed int &data, signed int defValue = 0); 
    … …  
    6870 
    6971  bool WriteStr(const std::string& key, const char* data); 
     72  bool WriteNum(const std::string& key, unsigned long data); 
     73  bool WriteNum(const std::string& key, signed long data); 
    7074  bool WriteNum(const std::string& key, unsigned int data); 
    7175  bool WriteNum(const std::string& key, signed int data); 
    … …  
    7781  int Error()  { return (m_nError); } 
    7882  const char *FileName()  { return m_szFilename; } 
    79  
    80   // Long differs in size between 32 bit systems and 64 bit systems so int 
    81   // should be used instead. This function is kept to keep old code working but 
    82   // since it is unlikely that we need to save any 64 bit integers these 
    83   // function is declared as deprecated. 
    84   LICQ_DEPRECATED bool ReadNum(const std::string& key, unsigned long &data, unsigned long defValue = 0); 
    85   LICQ_DEPRECATED bool WriteNum(const std::string& key, unsigned long data); 
    8683 
    8784protected: 

  • trunk/licq/src/file.cpp

    r6503 r6504  
    709709 
    710710MAKE_READNUM(unsigned long, strtoul(strData, (char**)NULL, 10)) 
     711MAKE_READNUM(signed long, strtoul(strData, (char**)NULL, 10)) 
    711712MAKE_READNUM(unsigned int, strtoul(strData, (char**)NULL, 10)) 
    712713MAKE_READNUM(signed int, atoi(strData)) 
    … …  
    849850 
    850851MAKE_WRITENUM(unsigned long, "%lu") 
     852MAKE_WRITENUM(signed long, "%lu") 
    851853MAKE_WRITENUM(unsigned int, "%u") 
    852854MAKE_WRITENUM(signed int, "%i") 

  • trunk/licq/src/user.cpp

    r6473 r6504  
    39273927  m_fConf.ReadNum("RCG", m_nRandomChatGroup, ICQ_RANDOMxCHATxGROUP_NONE); 
    39283928  m_fConf.ReadStr("AutoResponse", szTemp, ""); 
    3929   m_fConf.ReadNum("SSTime", (unsigned long&)m_nSSTime, 0L); 
     3929  m_fConf.ReadNum("SSTime", m_nSSTime, 0L); 
    39303930  m_fConf.ReadNum("SSCount", m_nSSCount, 0); 
    39313931  m_fConf.ReadNum("PDINFO", m_nPDINFO, 0);