1 files changed, 15 insertions, 40 deletions

diff --git a/src/chat/gcol.h b/src/chat/gcol.h
index ab84269..4936ded 100644..100755
--- a/src/chat/gcol.h
+++ b/src/chat/gcol.h
@@ -1,67 +1,42 @@
-/*:*
- *: File: ./src/chat/gcol.h
- *: 
- *: yChat; Homepage: www.yChat.org; Version 0.7.9.5-RELEASE
- *: 
- *: Copyright (C) 2003 Paul C. Buetow, Volker Richter
- *: Copyright (C) 2004 Paul C. Buetow
- *: Copyright (C) 2005 EXA Digital Solutions GbR
- *: 
- *: This program is free software; you can redistribute it and/or
- *: modify it under the terms of the GNU General Public License
- *: as published by the Free Software Foundation; either version 2
- *: of the License, or (at your option) any later version.
- *: 
- *: This program is distributed in the hope that it will be useful,
- *: but WITHOUT ANY WARRANTY; without even the implied warranty of
- *: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *: GNU General Public License for more details.
- *: 
- *: You should have received a copy of the GNU General Public License
- *: along with this program; if not, write to the Free Software
- *: Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *:*/
-
-// garbage collector
+// garbage collector 
 #include "../incl.h"
 
 #ifndef GCOL_H
 #define GCOL_H
 
-#include <vector>
+#include <vector> 
 #include "room.h"
 #include "user.h"
-#include "../maps/shashmap.h"
+#include "../maps/smap.h"
 
 using namespace std;
 
 class gcol
 {
-private:
-  vector<room*> vec_rooms;
-  shashmap<user*>* p_map_users;
+ private:
+  vector<room*> vec_rooms; 
+  smap<user*,string>* p_map_users; 
 
   pthread_mutex_t mut_vec_rooms;
 
   static void delete_users_( user* user_obj  );
 
 #ifdef NCURSES
-
   void print_garbage( );
 #endif
 
-public:
+ public:
   gcol();
   ~gcol();
 
-  bool remove_garbage();
-  void add_room_to_garbage( room* p_room );
-  void add_user_to_garbage( user* p_user );
-  virtual room* get_room_from_garbage();
-  virtual room* get_room_from_garbage_or_new( string s_room );
-  user* get_user_from_garbage( string s_user );
-  virtual void lock_mutex();
-  virtual void unlock_mutex();
+ bool remove_garbage();
+ void add_room_to_garbage( room* p_room );
+ void add_user_to_garbage( user* p_user );
+ virtual room* get_room_from_garbage();
+ virtual room* get_room_from_garbage_or_new( string s_room );
+ user* get_user_from_garbage( string s_user );
+ virtual void lock_mutex();
+ virtual void unlock_mutex();
 };
 
 #endif