Compilo.

[wxWidgets.git] / src / common / hash.cpp

diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index d2a71fa8d31d35bda0606aeb2ef36f3b12d0c739..ed736b1c5b5a33f188255b4ff64df7d75f8dda73 100644 (file)
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -34,7 +34,7 @@
 
 #include "wx/hash.h"
 
 
 #include "wx/hash.h"
 

-#if !wxUSE_STL
+#if wxUSE_OLD_HASH_TABLE

 
 #include <string.h>
 #include <stdarg.h>
 
 #include <string.h>
 #include <stdarg.h>


@@ -55,7 +55,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxHashTable, wxObject)
 
 wxHashTableBase::wxHashTableBase()
 {
 
 wxHashTableBase::wxHashTableBase()
 {

-    m_deleteContents = FALSE;
+    m_deleteContents = false;

     m_hashTable = (wxListBase **)NULL;
     m_hashSize = 0;
     m_count = 0;
     m_hashTable = (wxListBase **)NULL;
     m_hashSize = 0;
     m_count = 0;


@@ -301,7 +301,7 @@ wxString wxStringHashTable::Get(long key, bool *wasFound) const
             if ( keys->Item(n) == key )
             {
                 if ( wasFound )
             if ( keys->Item(n) == key )
             {
                 if ( wasFound )

-                    *wasFound = TRUE;
+                    *wasFound = true;

 
                 return m_values[slot]->Item(n);
             }
 
                 return m_values[slot]->Item(n);
             }


@@ -309,14 +309,14 @@ wxString wxStringHashTable::Get(long key, bool *wasFound) const
     }
 
     if ( wasFound )
     }
 
     if ( wasFound )

-        *wasFound = FALSE;
+        *wasFound = false;

 
     return _T("");
 }
 
 bool wxStringHashTable::Delete(long key) const
 {
 
     return _T("");
 }
 
 bool wxStringHashTable::Delete(long key) const
 {

-    wxCHECK_MSG( m_hashSize, FALSE, _T("must call Create() first") );
+    wxCHECK_MSG( m_hashSize, false, _T("must call Create() first") );

 
     size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
 
 
     size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
 


@@ -330,12 +330,12 @@ bool wxStringHashTable::Delete(long key) const
             {
                 keys->RemoveAt(n);
                 m_values[slot]->RemoveAt(n);
             {
                 keys->RemoveAt(n);
                 m_values[slot]->RemoveAt(n);

-                return TRUE;
+                return true;

             }
         }
     }
 
             }
         }
     }
 

-    return FALSE;
+    return false;

 }
 
 #endif // WXWIN_COMPATIBILITY_2_4
 }
 
 #endif // WXWIN_COMPATIBILITY_2_4


@@ -350,7 +350,7 @@ wxHashTable::wxHashTable (int the_key_type, int size)
   hash_table = (wxList**) NULL;
   Create(the_key_type, size);
   m_count = 0;
   hash_table = (wxList**) NULL;
   Create(the_key_type, size);
   m_count = 0;

-  m_deleteContents = FALSE;
+  m_deleteContents = false;

 /*
   n = size;
   current_position = -1;
 /*
   n = size;
   current_position = -1;


@@ -393,7 +393,7 @@ bool wxHashTable::Create(int the_key_type, int size)
   int i;
   for (i = 0; i < size; i++)
     hash_table[i] = (wxList *) NULL;
   int i;
   for (i = 0; i < size; i++)
     hash_table[i] = (wxList *) NULL;

-  return TRUE;
+  return true;

 }
 
 
 }
 
 


@@ -427,7 +427,7 @@ void wxHashTable::Put (long key, long value, wxObject * object)
   if (!hash_table[position])
   {
     hash_table[position] = new wxList (wxKEY_INTEGER);
   if (!hash_table[position])
   {
     hash_table[position] = new wxList (wxKEY_INTEGER);

-    if (m_deleteContents) hash_table[position]->DeleteContents(TRUE);
+    if (m_deleteContents) hash_table[position]->DeleteContents(true);

   }
 
   hash_table[position]->Append (value, object);
   }
 
   hash_table[position]->Append (value, object);


@@ -445,7 +445,7 @@ void wxHashTable::Put (long key, const wxChar *value, wxObject * object)
   if (!hash_table[position])
   {
     hash_table[position] = new wxList (wxKEY_STRING);
   if (!hash_table[position])
   {
     hash_table[position] = new wxList (wxKEY_STRING);

-    if (m_deleteContents) hash_table[position]->DeleteContents(TRUE);
+    if (m_deleteContents) hash_table[position]->DeleteContents(true);

   }
 
   hash_table[position]->Append (value, object);
   }
 
   hash_table[position]->Append (value, object);


@@ -463,7 +463,7 @@ void wxHashTable::Put (long key, wxObject * object)
   if (!hash_table[position])
   {
     hash_table[position] = new wxList (wxKEY_INTEGER);
   if (!hash_table[position])
   {
     hash_table[position] = new wxList (wxKEY_INTEGER);

-    if (m_deleteContents) hash_table[position]->DeleteContents(TRUE);
+    if (m_deleteContents) hash_table[position]->DeleteContents(true);

   }
 
   hash_table[position]->Append (k, object);
   }
 
   hash_table[position]->Append (k, object);


@@ -478,7 +478,7 @@ void wxHashTable::Put (const wxChar *key, wxObject * object)
   if (!hash_table[position])
   {
     hash_table[position] = new wxList (wxKEY_STRING);
   if (!hash_table[position])
   {
     hash_table[position] = new wxList (wxKEY_STRING);

-    if (m_deleteContents) hash_table[position]->DeleteContents(TRUE);
+    if (m_deleteContents) hash_table[position]->DeleteContents(true);

   }
 
   hash_table[position]->Append (key, object);
   }
 
   hash_table[position]->Append (key, object);


@@ -669,7 +669,7 @@ void wxHashTable::BeginFind ()
 wxHashTable::Node* wxHashTable::Next ()
 {
   wxNode *found = (wxNode *) NULL;
 wxHashTable::Node* wxHashTable::Next ()
 {
   wxNode *found = (wxNode *) NULL;

-  bool end = FALSE;
+  bool end = false;

   while (!end && !found)
     {
       if (!current_node)
   while (!end && !found)
     {
       if (!current_node)


@@ -679,7 +679,7 @@ wxHashTable::Node* wxHashTable::Next ()
             {
               current_position = -1;
               current_node = (wxNode *) NULL;
             {
               current_position = -1;
               current_node = (wxNode *) NULL;

-              end = TRUE;
+              end = true;

             }
           else
             {
             }
           else
             {


@@ -724,9 +724,7 @@ void wxHashTable::Clear ()
   m_count = 0;
 }
 
   m_count = 0;
 }
 

-#else // if wxUSE_STL
-
-#include "wx/object.h"
+#else // if !wxUSE_OLD_HASH_TABLE

 
 wxHashTableBase_Node::wxHashTableBase_Node( long key, void* value,
                                             wxHashTableBase* table )
 
 wxHashTableBase_Node::wxHashTableBase_Node( long key, void* value,
                                             wxHashTableBase* table )


@@ -755,11 +753,6 @@ wxHashTableBase::wxHashTableBase()
 {
 }
 
 {
 }
 

-wxHashTableBase::~wxHashTableBase()
-{
-    Destroy();
-}
-

 void wxHashTableBase::Create( wxKeyType keyType, size_t size )
 {
     m_keyType = keyType;
 void wxHashTableBase::Create( wxKeyType keyType, size_t size )
 {
     m_keyType = keyType;


@@ -815,7 +808,7 @@ void wxHashTableBase::DoRemoveNode( wxHashTableBase_Node* node )
         Node* prev = start;
 
         for( curr = prev->GetNext(); curr != node;
         Node* prev = start;
 
         for( curr = prev->GetNext(); curr != node;

-             prev = curr, curr = curr->GetNext() );
+             prev = curr, curr = curr->GetNext() ) ;

 
         DoUnlinkNode( bucket, node, prev );
     }
 
         DoUnlinkNode( bucket, node, prev );
     }


@@ -1040,7 +1033,7 @@ const wxHashTable& wxHashTable::operator=( const wxHashTable& table )
     return *this;
 }
 
     return *this;
 }
 

-void wxHashTable::DoCopy( const wxHashTable& table )
+void wxHashTable::DoCopy( const wxHashTable& WXUNUSED(table) )

 {
     Create( m_keyType, m_size );
 
 {
     Create( m_keyType, m_size );
 


@@ -1083,4 +1076,4 @@ wxHashTable::Node* wxHashTable::Next()
     return m_curr;
 }
 
     return m_curr;
 }
 

-#endif // wxUSE_STL
+#endif // !wxUSE_OLD_HASH_TABLE