Changeset 6218 for trunk/qt-gui

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

Fixed everything that broke in r6217.

Location:
trunk/qt-gui/src
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/qt-gui/src/usereventdlg.cpp

    r6180 r6218  
    101101#include <X11/Xutil.h> 
    102102 
    103 using std::pair; 
    104 using std::make_pair; 
     103using namespace std; 
    105104 
    106105const size_t SHOW_RECENT_NUM = 5; 

  • trunk/qt-gui/src/usereventdlg.h

    r6180 r6218  
    3030#include <utility> 
    3131 
    32 using std::list; 
    33  
    3432#include "licq_color.h" 
    3533#include "licq_filetransfer.h" 
    … …  
    127125  unsigned long PPID()  { return m_nPPID; } 
    128126  unsigned long ConvoId() { return m_nConvoId; } 
    129   list<string>& ConvoUsers() { return m_lUsers; } 
     127  std::list<std::string>& ConvoUsers() { return m_lUsers; } 
    130128  void SetConvoId(unsigned long n)  { m_nConvoId = n; } 
    131129   
    … …  
    147145  bool m_bOwner; 
    148146  char *m_szId; 
    149   list<string> m_lUsers; 
     147  std::list<std::string> m_lUsers; 
    150148  unsigned long m_nPPID; 
    151149  QBoxLayout* top_lay, *top_hlay;