[paragui-cvs] CVS: paragui/src/core pgapplication.cpp,1.2.4.14,1.2.4.15 pgfile.cpp,1.1.6.3,1.1.6.4 pgfilearchive.cpp,1.2.4.10,1.2.4.11 pglog.cpp,1.1.6.6,1.1.6.7 pgmessageobject.cpp,1.1.6.4,1.1.6.5 pgmsgmap.cpp,1.1.6.1,1.1.6.2 pgnavigator.cpp,1.2.6.2,1.2.6.3 pgsurfacecache.cpp,1.2.4.2,1.2.4.3pgtimerobject.cpp,1.1.2.5,1.1.2.6

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui/src/core
In directory subversions:/tmp/cvs-serv24897/src/core

Modified Files:
      Tag: devel-1-0
        pgapplication.cpp pgfile.cpp pgfilearchive.cpp pglog.cpp 
        pgmessageobject.cpp pgmsgmap.cpp pgnavigator.cpp 
        pgsurfacecache.cpp pgtimerobject.cpp 
Log Message:
- kicked version to 1.0.4
- added "using namespace std;" to paraconfig.h
- removed all std:: prefixes
- removed std:: hacks for gcc, mwerks compilers (no longer needed due to 
default namespace std)



Index: pgapplication.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgapplication.cpp,v
retrieving revision 1.2.4.14
retrieving revision 1.2.4.15
diff -C2 -r1.2.4.14 -r1.2.4.15
*** pgapplication.cpp   22 Nov 2002 17:58:43 -0000      1.2.4.14
--- pgapplication.cpp   4 Jan 2003 21:13:40 -0000       1.2.4.15
***************
*** 55,59 ****
  PG_Application* PG_Application::pGlobalApp = NULL;
  SDL_Surface* PG_Application::screen = NULL;
! std::string PG_Application::app_path = "";
  PG_Theme* PG_Application::my_Theme = NULL;
  bool PG_Application::bulkMode = false;
--- 55,59 ----
  PG_Application* PG_Application::pGlobalApp = NULL;
  SDL_Surface* PG_Application::screen = NULL;
! string PG_Application::app_path = "";
  PG_Theme* PG_Application::my_Theme = NULL;
  bool PG_Application::bulkMode = false;
***************
*** 103,107 ****
        /* Initialize the SDL library */
        if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE) < 0) {
!               std::cerr << "Could not initialize SDL: " << SDL_GetError() << 
std::endl;
                exit(-1);
        }
--- 103,107 ----
        /* Initialize the SDL library */
        if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE) < 0) {
!               cerr << "Could not initialize SDL: " << SDL_GetError() << endl;
                exit(-1);
        }
***************
*** 460,467 ****
  /**  */
  const char* PG_Application::GetRelativePath(const char* file) {
!       static std::string buffer = "";
  
        if(Exists(file)) {
!               buffer = (std::string)GetRealDir(file) + (std::string)file;
        }
  
--- 460,467 ----
  /**  */
  const char* PG_Application::GetRelativePath(const char* file) {
!       static string buffer = "";
  
        if(Exists(file)) {
!               buffer = (string)GetRealDir(file) + (string)file;
        }
  
***************
*** 669,673 ****
        }
        // destroy still existing objects
!       std::vector<PG_MessageObject*>::iterator list = objectList.begin();
  
        while(list != objectList.end()) {
--- 669,673 ----
        }
        // destroy still existing objects
!       vector<PG_MessageObject*>::iterator list = objectList.begin();
  
        while(list != objectList.end()) {

Index: pgfile.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgfile.cpp,v
retrieving revision 1.1.6.3
retrieving revision 1.1.6.4
diff -C2 -r1.1.6.3 -r1.1.6.4
*** pgfile.cpp  30 Jul 2002 20:50:26 -0000      1.1.6.3
--- pgfile.cpp  4 Jan 2003 21:13:40 -0000       1.1.6.4
***************
*** 47,51 ****
  }
  
! int PG_File::write(std::string &buffer) {
        return write(const_cast<char*>(buffer.c_str()), 1, buffer.length());
  }
--- 47,51 ----
  }
  
! int PG_File::write(string &buffer) {
        return write(const_cast<char*>(buffer.c_str()), 1, buffer.length());
  }
***************
*** 88,93 ****
  }
        
! std::string PG_File::getline() {
!       std::string result;
        char c = 0;
  
--- 88,93 ----
  }
        
! string PG_File::getline() {
!       string result;
        char c = 0;
  
***************
*** 103,107 ****
  }
  
! void PG_File::putline(const std::string& line) {
        // write characters
        write((void*)line.c_str(), line.size());
--- 103,107 ----
  }
  
! void PG_File::putline(const string& line) {
        // write characters
        write((void*)line.c_str(), line.size());

Index: pgfilearchive.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgfilearchive.cpp,v
retrieving revision 1.2.4.10
retrieving revision 1.2.4.11
diff -C2 -r1.2.4.10 -r1.2.4.11
*** pgfilearchive.cpp   18 Aug 2002 01:16:04 -0000      1.2.4.10
--- pgfilearchive.cpp   4 Jan 2003 21:13:40 -0000       1.2.4.11
***************
*** 50,54 ****
        if(my_instance_count == 1) {
                if(PHYSFS_init("paragui") == 0) {
!                       std::cerr << "Unable to initialize PhysicsFS !" << 
std::endl;
                        return;
                }
--- 50,54 ----
        if(my_instance_count == 1) {
                if(PHYSFS_init("paragui") == 0) {
!                       cerr << "Unable to initialize PhysicsFS !" << endl;
                        return;
                }
***************
*** 75,83 ****
  }
  
! std::string *PG_FileArchive::PathToPlatform(const char *path) {
!       std::string *newpath;
        const char* sep = GetDirSeparator();
!       std::string::size_type pos = 0, incr;
!       newpath = new std::string(path);
        incr = strlen(sep);
        if(incr == 1 && sep[0] == '/')
--- 75,83 ----
  }
  
! string *PG_FileArchive::PathToPlatform(const char *path) {
!       string *newpath;
        const char* sep = GetDirSeparator();
!       string::size_type pos = 0, incr;
!       newpath = new string(path);
        incr = strlen(sep);
        if(incr == 1 && sep[0] == '/')
***************
*** 85,91 ****
  
  #ifdef __MACOS__
!       while( (pos = newpath->find(":", pos)) != std::string::npos) {
  #else
!       while( (pos = newpath->find("/", pos)) != std::string::npos) {
  #endif
                newpath->replace(pos, 1, sep);
--- 85,91 ----
  
  #ifdef __MACOS__
!       while( (pos = newpath->find(":", pos)) != string::npos) {
  #else
!       while( (pos = newpath->find("/", pos)) != string::npos) {
  #endif
                newpath->replace(pos, 1, sep);
***************
*** 97,101 ****
  
  bool PG_FileArchive::AddArchive(const char* arch, bool append) {
!       std::string *newpath = PathToPlatform(arch);
        bool ret = (PHYSFS_addToSearchPath(newpath->c_str(),  append) != 0);
        delete newpath;
--- 97,101 ----
  
  bool PG_FileArchive::AddArchive(const char* arch, bool append) {
!       string *newpath = PathToPlatform(arch);
        bool ret = (PHYSFS_addToSearchPath(newpath->c_str(),  append) != 0);
        delete newpath;
***************
*** 104,108 ****
  
  bool PG_FileArchive::RemoveArchive(const char* arch) {
!       std::string *newpath = PathToPlatform(arch);
        bool ret = (PHYSFS_removeFromSearchPath(newpath->c_str()) != 0);
        delete newpath;
--- 104,108 ----
  
  bool PG_FileArchive::RemoveArchive(const char* arch) {
!       string *newpath = PathToPlatform(arch);
        bool ret = (PHYSFS_removeFromSearchPath(newpath->c_str()) != 0);
        delete newpath;
***************
*** 125,129 ****
        for( char** i = tempList; *i != NULL; i++) {
                if(fnmatch(wildcard, *i, FNM_PATHNAME) == 0) {
!                       retVal->push_back(std::string(*i));
                }
        }
--- 125,129 ----
        for( char** i = tempList; *i != NULL; i++) {
                if(fnmatch(wildcard, *i, FNM_PATHNAME) == 0) {
!                       retVal->push_back(string(*i));
                }
        }
***************
*** 261,265 ****
        }
  
!       std::string fn = filename;
  
        if(fn == "none") {
--- 261,265 ----
        }
  
!       string fn = filename;
  
        if(fn == "none") {
***************
*** 355,362 ****
        
        // Now we're ready to initialize everything.
!       retVal = new std::vector< std::string >;
        retVal->reserve( size );
        for( Uint32 i = 0; i < size; ++i ) {
!               retVal->push_back(std::string(tempList[ i ]));
        }
        
--- 355,362 ----
        
        // Now we're ready to initialize everything.
!       retVal = new vector< string >;
        retVal->reserve( size );
        for( Uint32 i = 0; i < size; ++i ) {
!               retVal->push_back(string(tempList[ i ]));
        }
        

Index: pglog.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pglog.cpp,v
retrieving revision 1.1.6.6
retrieving revision 1.1.6.7
diff -C2 -r1.1.6.6 -r1.1.6.7
*** pglog.cpp   22 Nov 2002 17:58:43 -0000      1.1.6.6
--- pglog.cpp   4 Jan 2003 21:13:40 -0000       1.1.6.7
***************
*** 50,54 ****
        PG_LOG_LEVEL    Id;
        time_t  TimeStamp;
!       std::string     Text;
  
        PG_LogMessage_t(PG_LOG_LEVEL _id, const char* txt)
--- 50,54 ----
        PG_LOG_LEVEL    Id;
        time_t  TimeStamp;
!       string  Text;
  
        PG_LogMessage_t(PG_LOG_LEVEL _id, const char* txt)
***************
*** 58,67 ****
  ;
  
! inline std::ostream& operator<<(std::ostream& os, PG_LogMessage_t *msg) {
        os << msg->Text;
        return os;
  }
  
! static std::list<PG_LogMessage_t*> PG_LogMessages;
  static PG_Window* PG_LogWindow = NULL;
  static PG_RichEdit* PG_LogWindowData = NULL;
--- 58,67 ----
  ;
  
! inline ostream& operator<<(ostream& os, PG_LogMessage_t *msg) {
        os << msg->Text;
        return os;
  }
  
! static list<PG_LogMessage_t*> PG_LogMessages;
  static PG_Window* PG_LogWindow = NULL;
  static PG_RichEdit* PG_LogWindowData = NULL;
***************
*** 105,129 ****
                switch (NewMsg->Id) {
                        case PG_LOG_MSG :
!                               std::cout << "MESSAGE [";
                                break;
  
                        case PG_LOG_ERR :
!                               std::cout << "ERROR [";
                                break;
  
                        case PG_LOG_WRN :
!                               std::cout << "WARNING [";
                                break;
  
                        case PG_LOG_DBG :
!                               std::cout << "DEBUG [";
                                break;
  
                        default :
!                               std::cout << "??? [";
                }
  
                strftime(buffer, sizeof(buffer), "%m/%d/%Y %X", 
localtime(&NewMsg->TimeStamp));
!               std::cout << buffer << "] > " << NewMsg << std::endl;
        }
  
--- 105,129 ----
                switch (NewMsg->Id) {
                        case PG_LOG_MSG :
!                               cout << "MESSAGE [";
                                break;
  
                        case PG_LOG_ERR :
!                               cout << "ERROR [";
                                break;
  
                        case PG_LOG_WRN :
!                               cout << "WARNING [";
                                break;
  
                        case PG_LOG_DBG :
!                               cout << "DEBUG [";
                                break;
  
                        default :
!                               cout << "??? [";
                }
  
                strftime(buffer, sizeof(buffer), "%m/%d/%Y %X", 
localtime(&NewMsg->TimeStamp));
!               cout << buffer << "] > " << NewMsg << endl;
        }
  
***************
*** 132,156 ****
                switch (NewMsg->Id) {
                        case PG_LOG_MSG :
!                               std::cerr << "MESSAGE [";
                                break;
  
                        case PG_LOG_ERR :
!                               std::cerr << "ERROR [";
                                break;
  
                        case PG_LOG_WRN :
!                               std::cerr << "WARNING [";
                                break;
  
                        case PG_LOG_DBG :
!                               std::cerr << "DEBUG [";
                                break;
  
                        default :
!                               std::cerr << "??? [";
                }
  
                strftime(buffer, sizeof(buffer), "%m/%d/%Y %X", 
localtime(&NewMsg->TimeStamp));
!               std::cerr << buffer << "] > " << NewMsg << std::endl;
        }
  
--- 132,156 ----
                switch (NewMsg->Id) {
                        case PG_LOG_MSG :
!                               cerr << "MESSAGE [";
                                break;
  
                        case PG_LOG_ERR :
!                               cerr << "ERROR [";
                                break;
  
                        case PG_LOG_WRN :
!                               cerr << "WARNING [";
                                break;
  
                        case PG_LOG_DBG :
!                               cerr << "DEBUG [";
                                break;
  
                        default :
!                               cerr << "??? [";
                }
  
                strftime(buffer, sizeof(buffer), "%m/%d/%Y %X", 
localtime(&NewMsg->TimeStamp));
!               cerr << buffer << "] > " << NewMsg << endl;
        }
  
***************
*** 159,163 ****
  
  void PG_LogConsole::Done() {
!       std::list<PG_LogMessage_t*>::iterator it = PG_LogMessages.begin();
  
        while (it!=PG_LogMessages.end()) {
--- 159,163 ----
  
  void PG_LogConsole::Done() {
!       list<PG_LogMessage_t*>::iterator it = PG_LogMessages.begin();
  
        while (it!=PG_LogMessages.end()) {
***************
*** 183,188 ****
        }
  
!       std::string buffer;
!       for(std::list<PG_LogMessage_t*>::reverse_iterator it = 
PG_LogMessages.rbegin();
                it != PG_LogMessages.rend(); it++) {
                PG_LogMessage_t *Msg = *it;
--- 183,188 ----
        }
  
!       string buffer;
!       for(list<PG_LogMessage_t*>::reverse_iterator it = 
PG_LogMessages.rbegin();
                it != PG_LogMessages.rend(); it++) {
                PG_LogMessage_t *Msg = *it;

Index: pgmessageobject.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgmessageobject.cpp,v
retrieving revision 1.1.6.4
retrieving revision 1.1.6.5
diff -C2 -r1.1.6.4 -r1.1.6.5
*** pgmessageobject.cpp 1 Nov 2002 15:00:59 -0000       1.1.6.4
--- pgmessageobject.cpp 4 Jan 2003 21:13:40 -0000       1.1.6.5
***************
*** 36,40 ****
  
  // static variables for message processing
! std::vector<PG_MessageObject*> PG_MessageObject::objectList;
  PG_MessageObject* PG_MessageObject::captureObject = NULL;
  PG_MessageObject* PG_MessageObject::inputFocusObject = NULL;
--- 36,40 ----
  
  // static variables for message processing
! vector<PG_MessageObject*> PG_MessageObject::objectList;
  PG_MessageObject* PG_MessageObject::captureObject = NULL;
  PG_MessageObject* PG_MessageObject::inputFocusObject = NULL;
***************
*** 361,365 ****
        // send to all receivers
        bool processed = false;
!       std::vector<PG_MessageObject*>::iterator list = objectList.begin();
        while(list != objectList.end()) {
                if((*list)->ProcessEvent(event)) {
--- 361,365 ----
        // send to all receivers
        bool processed = false;
!       vector<PG_MessageObject*>::iterator list = objectList.begin();
        while(list != objectList.end()) {
                if((*list)->ProcessEvent(event)) {
***************
*** 402,409 ****
  
  bool PG_MessageObject::RemoveObject(PG_MessageObject* obj) {
!       std::vector<PG_MessageObject*>::iterator list = objectList.begin();
  
        // search the object
!       list = std::find(objectList.begin(), objectList.end(), obj);
  
        // check if object was found
--- 402,409 ----
  
  bool PG_MessageObject::RemoveObject(PG_MessageObject* obj) {
!       vector<PG_MessageObject*>::iterator list = objectList.begin();
  
        // search the object
!       list = find(objectList.begin(), objectList.end(), obj);
  
        // check if object was found

Index: pgmsgmap.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/Attic/pgmsgmap.cpp,v
retrieving revision 1.1.6.1
retrieving revision 1.1.6.2
diff -C2 -r1.1.6.1 -r1.1.6.2
*** pgmsgmap.cpp        18 Jun 2002 08:10:23 -0000      1.1.6.1
--- pgmsgmap.cpp        4 Jan 2003 21:13:40 -0000       1.1.6.2
***************
*** 34,38 ****
  #include <iostream>
  
! void PG_DisplayEventMap(std::string message = "");
  
  // the PG_MessageObject -> callback function pair definition
--- 34,38 ----
  #include <iostream>
  
! void PG_DisplayEventMap(string message = "");
  
  // the PG_MessageObject -> callback function pair definition
***************
*** 44,49 ****
  };
  
! typedef std::map<PG_MessageObject*, PG_EVENTHANDLERDATA*, objcb_cmp> OBJCBMAP;
! typedef std::map<PG_MessageObject*, PG_EVENTHANDLERDATA*, 
objcb_cmp>::iterator OBJCBMAP_ITERATOR;
  
  // the messagetype <-> messageobject pair definition
--- 44,49 ----
  };
  
! typedef map<PG_MessageObject*, PG_EVENTHANDLERDATA*, objcb_cmp> OBJCBMAP;
! typedef map<PG_MessageObject*, PG_EVENTHANDLERDATA*, objcb_cmp>::iterator 
OBJCBMAP_ITERATOR;
  
  // the messagetype <-> messageobject pair definition
***************
*** 55,60 ****
  };
  
! typedef std::map<PG_MSG_TYPE, OBJCBMAP*, msgobj_cmp> MSGOBJMAP;
! typedef std::map<PG_MSG_TYPE, OBJCBMAP*, msgobj_cmp>::iterator 
MSGOBJMAP_ITERATOR;
  
  // the global eventmap
--- 55,60 ----
  };
  
! typedef map<PG_MSG_TYPE, OBJCBMAP*, msgobj_cmp> MSGOBJMAP;
! typedef map<PG_MSG_TYPE, OBJCBMAP*, msgobj_cmp>::iterator MSGOBJMAP_ITERATOR;
  
  // the global eventmap
***************
*** 88,92 ****
  }
  
! void PG_DisplayEventMap(std::string message) {
        MSGOBJMAP_ITERATOR i;
  
--- 88,92 ----
  }
  
! void PG_DisplayEventMap(string message) {
        MSGOBJMAP_ITERATOR i;
  

Index: pgnavigator.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgnavigator.cpp,v
retrieving revision 1.2.6.2
retrieving revision 1.2.6.3
diff -C2 -r1.2.6.2 -r1.2.6.3
*** pgnavigator.cpp     1 Nov 2002 10:43:36 -0000       1.2.6.2
--- pgnavigator.cpp     4 Jan 2003 21:13:40 -0000       1.2.6.3
***************
*** 37,41 ****
  
  void PG_Navigator::Add(PG_Widget* widget) {
!       iterator i = std::find(begin(), end(), widget);
  
        if(i != end()) {
--- 37,41 ----
  
  void PG_Navigator::Add(PG_Widget* widget) {
!       iterator i = find(begin(), end(), widget);
  
        if(i != end()) {
***************
*** 47,51 ****
  
  void PG_Navigator::Remove(PG_Widget* widget) {
!       iterator i = std::find(begin(), end(), widget);
  
        if(i == end()) {
--- 47,51 ----
  
  void PG_Navigator::Remove(PG_Widget* widget) {
!       iterator i = find(begin(), end(), widget);
  
        if(i == end()) {
***************
*** 65,69 ****
  
  PG_Widget* PG_Navigator::Goto(PG_Widget* widget) {
!       iterator i = std::find(begin(), end(), widget);
  
        if(i == end()) {
--- 65,69 ----
  
  PG_Widget* PG_Navigator::Goto(PG_Widget* widget) {
!       iterator i = find(begin(), end(), widget);
  
        if(i == end()) {
***************
*** 104,108 ****
  
  PG_Widget* PG_Navigator::GotoNext() {
!       iterator i = std::find(begin(), end(), my_currentWidget);
  
        if(i == end()) {
--- 104,108 ----
  
  PG_Widget* PG_Navigator::GotoNext() {
!       iterator i = find(begin(), end(), my_currentWidget);
  
        if(i == end()) {
***************
*** 115,119 ****
  
  PG_Widget* PG_Navigator::GotoPrev() {
!       iterator i = std::find(begin(), end(), my_currentWidget);
  
        if(i == begin()) {
--- 115,119 ----
  
  PG_Widget* PG_Navigator::GotoPrev() {
!       iterator i = find(begin(), end(), my_currentWidget);
  
        if(i == begin()) {

Index: pgsurfacecache.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgsurfacecache.cpp,v
retrieving revision 1.2.4.2
retrieving revision 1.2.4.3
diff -C2 -r1.2.4.2 -r1.2.4.3
*** pgsurfacecache.cpp  18 Jun 2002 08:10:23 -0000      1.2.4.2
--- pgsurfacecache.cpp  4 Jan 2003 21:13:40 -0000       1.2.4.3
***************
*** 48,52 ****
  
  struct pg_surface_hash {
!       size_t operator()(std::string s1) const {
                unsigned long hash = 0;
                for(Uint32 i = 0; i < s1.length(); i++) {
--- 48,52 ----
  
  struct pg_surface_hash {
!       size_t operator()(string s1) const {
                unsigned long hash = 0;
                for(Uint32 i = 0; i < s1.length(); i++) {
***************
*** 58,62 ****
  
  // Don't need custom comparision for strings.
! typedef STL_MAP<std::string, pg_surface_cache_t*, pg_surface_hash> 
pg_surfacemap_t;
  // Don't need custom hash or comparision functions when the key is a long.
  typedef STL_MAP<unsigned long, pg_surface_cache_t* > pg_surfacemap_index_t;
--- 58,62 ----
  
  // Don't need custom comparision for strings.
! typedef STL_MAP<string, pg_surface_cache_t*, pg_surface_hash> pg_surfacemap_t;
  // Don't need custom hash or comparision functions when the key is a long.
  typedef STL_MAP<unsigned long, pg_surface_cache_t* > pg_surfacemap_index_t;
***************
*** 66,72 ****
  #else
  // Don't need custom comparisions for strings.
! typedef std::map<std::string, pg_surface_cache_t*> pg_surfacemap_t;
  // Don't need a custom comparision function when the key is a long
! typedef std::map<unsigned long, pg_surface_cache_t*> pg_surfacemap_index_t;
  
  typedef pg_surfacemap_t::iterator pg_surfacemap_iter_t;
--- 66,72 ----
  #else
  // Don't need custom comparisions for strings.
! typedef map<string, pg_surface_cache_t*> pg_surfacemap_t;
  // Don't need a custom comparision function when the key is a long
! typedef map<unsigned long, pg_surface_cache_t*> pg_surfacemap_index_t;
  
  typedef pg_surfacemap_t::iterator pg_surfacemap_iter_t;
***************
*** 110,114 ****
  }
  
! void PG_SurfaceCache::CreateKey(std::string &key, Uint16 w, Uint16 h,
                                  PG_Gradient* gradient, SDL_Surface* 
background,
                                  Sint8 bkmode, Uint8 blend) {
--- 110,114 ----
  }
  
! void PG_SurfaceCache::CreateKey(string &key, Uint16 w, Uint16 h,
                                  PG_Gradient* gradient, SDL_Surface* 
background,
                                  Sint8 bkmode, Uint8 blend) {
***************
*** 166,173 ****
                (unsigned int)background,  bkmode, blend);
  
!       key = std::string(tmpkey, 24);*/
  }
  
! pg_surface_cache_t* PG_SurfaceCache::FindByKey(const std::string &key) {
        return (*MY_SURFACEMAP)[key];
  }
--- 166,173 ----
                (unsigned int)background,  bkmode, blend);
  
!       key = string(tmpkey, 24);*/
  }
  
! pg_surface_cache_t* PG_SurfaceCache::FindByKey(const string &key) {
        return (*MY_SURFACEMAP)[key];
  }
***************
*** 177,181 ****
  }
  
! SDL_Surface* PG_SurfaceCache::FindSurface(const std::string &key) {
        pg_surface_cache_t* t = (*MY_SURFACEMAP)[key];
  
--- 177,181 ----
  }
  
! SDL_Surface* PG_SurfaceCache::FindSurface(const string &key) {
        pg_surface_cache_t* t = (*MY_SURFACEMAP)[key];
  
***************
*** 187,191 ****
  }
  
! SDL_Surface* PG_SurfaceCache::AddSurface(const std::string &key, SDL_Surface* 
surface) {
        pg_surface_cache_t* t = NULL;
  
--- 187,191 ----
  }
  
! SDL_Surface* PG_SurfaceCache::AddSurface(const string &key, SDL_Surface* 
surface) {
        pg_surface_cache_t* t = NULL;
  
***************
*** 247,251 ****
  }
  
! void PG_SurfaceCache::IncRef(const std::string &key) {
        pg_surface_cache_t* t = FindByKey(key);
  
--- 247,251 ----
  }
  
! void PG_SurfaceCache::IncRef(const string &key) {
        pg_surface_cache_t* t = FindByKey(key);
  

Index: pgtimerobject.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgtimerobject.cpp,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -r1.1.2.5 -r1.1.2.6
*** pgtimerobject.cpp   3 Jul 2002 18:28:02 -0000       1.1.2.5
--- pgtimerobject.cpp   4 Jan 2003 21:13:40 -0000       1.1.2.6
***************
*** 3,7 ****
  Uint32 PG_TimerObject::objectcount = 0;
  PG_TimerID PG_TimerObject::globalTimerID = 0;
! std::map<PG_TimerID, PG_TimerObject*> PG_TimerObject::timermap;
  PG_TimerObject* PG_TimerObject::objSingleTimer = NULL;
  
--- 3,7 ----
  Uint32 PG_TimerObject::objectcount = 0;
  PG_TimerID PG_TimerObject::globalTimerID = 0;
! map<PG_TimerID, PG_TimerObject*> PG_TimerObject::timermap;
  PG_TimerObject* PG_TimerObject::objSingleTimer = NULL;
  
***************
*** 20,24 ****
        
        // remove all timers of this object
!       std::map<PG_TimerID, SDL_TimerID>::iterator i;
        
        for(i = my_timermap.begin(); i != my_timermap.end(); ) {
--- 20,24 ----
        
        // remove all timers of this object
!       map<PG_TimerID, SDL_TimerID>::iterator i;
        
        for(i = my_timermap.begin(); i != my_timermap.end(); ) {