Changeset 6217

Show
Ignore:
Timestamp:
05/26/08 03:39:31 (6 months ago)
Author:
flynd
Message:

Removed 'using' from headers.

Location:
trunk/licq
Files:
7 modified

Legend:

Unmodified
Added
Removed

  • trunk/licq/include/licq_events.h

    r6199 r6217  
    77 
    88#include <stdlib.h> 
    9 #include <vector> 
    10  
    11 using std::vector; 
     9 
    1210 
    1311class CPacket; 

  • trunk/licq/include/licq_icqd.h

    r6181 r6217  
    1515#include <list> 
    1616#include <map> 
    17 #include <deque> 
    1817#include <string> 
    1918#include <algorithm> 
    20 #include <stdarg.h> 
    21 #include <stdio.h> 
     19#include <cstdarg> 
     20#include <cstdio> 
    2221 
    2322#include "licq_events.h" 
    … …  
    2928#include "licq_protoplugind.h" 
    3029 
    31 using std::string; 
    3230 
    3331class CProtoPlugin; 
    … …  
    131129  unsigned long CID()   { return m_nCID; } 
    132130 
    133   string GetUser(int n) { return m_vUsers[n]; } 
     131  std::string GetUser(int n) { return m_vUsers[n]; } 
    134132 
    135133private: 
    … …  
    143141  unsigned long m_nPPID; 
    144142  unsigned long m_nCID; 
    145   vector<string> m_vUsers; 
     143  std::vector<std::string> m_vUsers; 
    146144 
    147145  static unsigned long s_nCID; 

  • trunk/licq/include/licq_translate.h

    r6119 r6217  
    1111#include <string> 
    1212 
    13 using namespace std; 
    1413 
    1514class CTranslator 
    … …  
    4443  char* RNToN(const char* array); 
    4544 
    46   bool utf16to8(unsigned long c, string &s); 
     45  bool utf16to8(unsigned long c, std::string &s); 
    4746 
    4847protected: 

  • trunk/licq/include/licq_user.h

    r6181 r6217  
    33 
    44#include <cstdlib> 
    5 #include <vector> 
     5#include <cstring> 
     6#include <ctime> 
    67#include <list> 
    78#include <map> 
    89#include <string> 
    9 #include <cstring> 
    10  
    11 #include <time.h> 
     10#include <vector> 
     11 
    1212 
    1313#include "pthread_rdwr.h" 
    … …  
    1717#include "licq_file.h" 
    1818#include "licq_icq.h" 
    19  
    20 using std::map; 
    21 using std::string; 
    2219 
    2320class TCPSocket; 
    … …  
    522519 
    523520  // Dynamic info fields for protocol plugins 
    524   string GetPPField(const string &); 
     521  std::string GetPPField(const std::string &); 
    525522 
    526523  // Licq Info 
    … …  
    693690 
    694691  // Dynamic info fields for protocol plugins 
    695   bool SetPPField(const string &, const string &); 
     692  bool SetPPField(const std::string &, const std::string &); 
    696693 
    697694  // Status 
    … …  
    959956 
    960957  // Dynamic info fields for protocol plugins 
    961   map<string, string> m_mPPFields; 
     958  std::map<std::string, std::string> m_mPPFields; 
    962959 
    963960  // Protocol ID 

  • trunk/licq/src/icqd-srv.cpp

    r6196 r6217  
    4242#include "licq_countrycodes.h" 
    4343#include "licq_protoplugind.h" 
     44 
     45using namespace std; 
    4446 
    4547void CICQDaemon::ProtoAddUser(const char *_szId, unsigned long _nPPID, 

  • trunk/licq/src/translate.cpp

    r6195 r6217  
    2929#include "licq_log.h" 
    3030#include "licq_icq.h" 
     31 
     32using namespace std; 
    3133 
    3234CTranslator gTranslator; 

  • trunk/licq/src/user.cpp

    r6214 r6217  
    4343#include "pthread_rdwr.h" 
    4444 
    45 using std::vector; 
     45using namespace std; 
    4646 
    4747ICQUserCategory::ICQUserCategory(UserCat uc)