Changeset 6439 for trunk/console

Timestamp:

07/09/08 17:46:23 (5 months ago)

Author:

flynd

Message:

Removed using clause from plugin headers.

Location:

trunk/console/src

Files:

• console.h (modified) (5 diffs)
• console_menu.cpp (modified) (1 diff)
• console_print.cpp (modified) (1 diff)

trunk/console/src/console.h

@@ -6 +6 @@
 #endif
 
-#include "licq_icqd.h"
-#include "licq_log.h"
+#include <list>
+#include <string>
+#include <vector>
+
+#include <licq_icqd.h>
+#include <licq_log.h>
+#include <licq_user.h>
+
 #include "window.h"
-#include "licq_user.h"
-
-#include <string>
-using namespace std;
+
+class CFileTransferManager;
 
 #define MAX_CON 8
@@ -54 +58 @@
   char szCommand[128];
 };
-typedef list<SMacro *> MacroList;
+typedef std::list<SMacro*> MacroList;
 
 
@@ -69 +73 @@
   bool m_bExit;
   fd_set fdSet;
-  list <SUser *> m_lUsers;
-  list <SScrollUser *> m_lScrollUsers;
-          
+  std::list<SUser*> m_lUsers;
+  std::list<SScrollUser*> m_lScrollUsers;
+
   // Set'able variables
   bool m_bShowOffline, m_bShowDividers;
@@ -88 +92 @@
   unsigned short m_nCurrentGroup, m_nCon;
   GroupType m_nGroupType;
-  list<char *> m_lCmdHistory;
-  list<char *>::iterator m_lCmdHistoryIter;
-  list<CFileTransferManager *> m_lFileStat;
+  std::list<char*> m_lCmdHistory;
+  std::list<char*>::iterator m_lCmdHistoryIter;
+  std::list<CFileTransferManager*> m_lFileStat;
   MacroList listMacros;
 
@@ -218 +222 @@
 struct STabCompletion
 {
-  vector <char *> vszPartialMatch;
+  std::vector<char*> vszPartialMatch;
   char *szPartialMatch;
 };

trunk/console/src/console_menu.cpp

@@ -1 +1 @@
 #include "console.h"
+
+#include <cctype>
+#include <string>
+
 #include "event_data.h"
 
-#include <ctype.h>
-#include <string>
-
-using std::string;
+using namespace std;
 
 const unsigned short NUM_COMMANDS = 24;

trunk/console/src/console_print.cpp

@@ -1 +1 @@
 #include "console.h"
-#include "licq_countrycodes.h"
-#include "licq_languagecodes.h"
-#include "licq_filetransfer.h"
-
-#include <string.h>
-#include <time.h>
+
+#include <cstring>
+#include <ctime>
+
+#include <licq_countrycodes.h>
+#include <licq_languagecodes.h>
+#include <licq_filetransfer.h>
+
+using namespace std;
 
 //======Utilities============================================================