X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..85833f5c6c5c136d16ccd01c90cc243d5d025e0a:/src/common/hash.cpp

diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index 1aba64563c..691d70832c 100644
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -33,33 +33,40 @@
 IMPLEMENT_DYNAMIC_CLASS(wxHashTable, wxObject)
 #endif
 
-wxHashTable::wxHashTable (const int the_key_type, const int size)
+wxHashTable::wxHashTable (int the_key_type, int size)
 {
   n = size;
   current_position = -1;
-  current_node = NULL;
+  current_node = (wxNode *) NULL;
 
   key_type = the_key_type;
   hash_table = new wxList *[size];
   int i;
   for (i = 0; i < size; i++)
-    hash_table[i] = NULL;
+    hash_table[i] = (wxList *) NULL;
 }
 
 wxHashTable::~wxHashTable (void)
 {
+  Destroy();
+}
+
+void wxHashTable::Destroy(void)
+{
+  if (!hash_table) return;
   int i;
   for (i = 0; i < n; i++)
     if (hash_table[i])
       delete hash_table[i];
   delete[] hash_table;
+  hash_table = NULL;
 }
 
-bool wxHashTable::Create(const int the_key_type, const int size)
+bool wxHashTable::Create(int the_key_type, int size)
 {
   n = size;
   current_position = -1;
-  current_node = NULL;
+  current_node = (wxNode *) NULL;
 
   key_type = the_key_type;
   if (hash_table)
@@ -67,11 +74,11 @@ bool wxHashTable::Create(const int the_key_type, const int size)
   hash_table = new wxList *[size];
   int i;
   for (i = 0; i < size; i++)
-    hash_table[i] = NULL;
+    hash_table[i] = (wxList *) NULL;
   return TRUE;
 }
 
-void wxHashTable::Put (const long key, const long value, wxObject * object)
+void wxHashTable::Put (long key, long value, wxObject * object)
 {
   // Should NEVER be
   long k = (long) key;
@@ -85,7 +92,7 @@ void wxHashTable::Put (const long key, const long value, wxObject * object)
   hash_table[position]->Append (value, object);
 }
 
-void wxHashTable::Put (const long key, const char *value, wxObject * object)
+void wxHashTable::Put (long key, const wxChar *value, wxObject * object)
 {
   // Should NEVER be
   long k = (long) key;
@@ -99,7 +106,7 @@ void wxHashTable::Put (const long key, const char *value, wxObject * object)
   hash_table[position]->Append (value, object);
 }
 
-void wxHashTable::Put (const long key, wxObject * object)
+void wxHashTable::Put (long key, wxObject * object)
 {
   // Should NEVER be
   long k = (long) key;
@@ -113,7 +120,7 @@ void wxHashTable::Put (const long key, wxObject * object)
   hash_table[position]->Append (k, object);
 }
 
-void wxHashTable::Put (const char *key, wxObject * object)
+void wxHashTable::Put (const wxChar *key, wxObject * object)
 {
   int position = (int) (MakeKey (key) % n);
 
@@ -123,7 +130,7 @@ void wxHashTable::Put (const char *key, wxObject * object)
   hash_table[position]->Append (key, object);
 }
 
-wxObject *wxHashTable::Get (const long key, const long value) const
+wxObject *wxHashTable::Get (long key, long value) const
 {
   // Should NEVER be
   long k = (long) key;
@@ -132,18 +139,18 @@ wxObject *wxHashTable::Get (const long key, const long value) const
 
   int position = (int) (k % n);
   if (!hash_table[position])
-    return NULL;
+    return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (value);
       if (node)
 	return node->Data ();
       else
-	return NULL;
+	return (wxObject *) NULL;
     }
 }
 
-wxObject *wxHashTable::Get (const long key, const char *value) const
+wxObject *wxHashTable::Get (long key, const wxChar *value) const
 {
   // Should NEVER be
   long k = (long) key;
@@ -152,18 +159,18 @@ wxObject *wxHashTable::Get (const long key, const char *value) const
 
   int position = (int) (k % n);
   if (!hash_table[position])
-    return NULL;
+    return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (value);
       if (node)
 	return node->Data ();
       else
-	return NULL;
+	return (wxObject *) NULL;
     }
 }
 
-wxObject *wxHashTable::Get (const long key) const
+wxObject *wxHashTable::Get (long key) const
 {
   // Should NEVER be
   long k = (long) key;
@@ -172,7 +179,7 @@ wxObject *wxHashTable::Get (const long key) const
 
   int position = (int) (k % n);
   if (!hash_table[position])
-    return NULL;
+    return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (k);
@@ -180,12 +187,12 @@ wxObject *wxHashTable::Get (const long key) const
     }
 }
 
-wxObject *wxHashTable::Get (const char *key) const
+wxObject *wxHashTable::Get (const wxChar *key) const
 {
   int position = (int) (MakeKey (key) % n);
 
   if (!hash_table[position])
-    return NULL;
+    return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (key);
@@ -193,7 +200,7 @@ wxObject *wxHashTable::Get (const char *key) const
     }
 }
 
-wxObject *wxHashTable::Delete (const long key)
+wxObject *wxHashTable::Delete (long key)
 {
   // Should NEVER be
   long k = (long) key;
@@ -202,7 +209,7 @@ wxObject *wxHashTable::Delete (const long key)
 
   int position = (int) (k % n);
   if (!hash_table[position])
-    return NULL;
+    return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (k);
@@ -213,15 +220,15 @@ wxObject *wxHashTable::Delete (const long key)
 	  return data;
 	}
       else
-	return NULL;
+	return (wxObject *) NULL;
     }
 }
 
-wxObject *wxHashTable::Delete (const char *key)
+wxObject *wxHashTable::Delete (const wxChar *key)
 {
   int position = (int) (MakeKey (key) % n);
   if (!hash_table[position])
-    return NULL;
+    return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (key);
@@ -232,11 +239,11 @@ wxObject *wxHashTable::Delete (const char *key)
 	  return data;
 	}
       else
-	return NULL;
+	return (wxObject *) NULL;
     }
 }
 
-wxObject *wxHashTable::Delete (const long key, const int value)
+wxObject *wxHashTable::Delete (long key, int value)
 {
   // Should NEVER be
   long k = (long) key;
@@ -245,7 +252,7 @@ wxObject *wxHashTable::Delete (const long key, const int value)
 
   int position = (int) (k % n);
   if (!hash_table[position])
-    return NULL;
+    return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (value);
@@ -256,15 +263,15 @@ wxObject *wxHashTable::Delete (const long key, const int value)
 	  return data;
 	}
       else
-	return NULL;
+	return (wxObject *) NULL;
     }
 }
 
-wxObject *wxHashTable::Delete (const long key, const char *value)
+wxObject *wxHashTable::Delete (long key, const wxChar *value)
 {
   int position = (int) (key % n);
   if (!hash_table[position])
-    return NULL;
+    return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (value);
@@ -275,16 +282,16 @@ wxObject *wxHashTable::Delete (const long key, const char *value)
 	  return data;
 	}
       else
-	return NULL;
+	return (wxObject *) NULL;
     }
 }
 
-long wxHashTable::MakeKey (const char *string) const
+long wxHashTable::MakeKey (const wxChar *string) const
 {
   long int_key = 0;
 
   while (*string)
-    int_key += (unsigned char) *string++;
+    int_key += (wxUChar) *string++;
 
   return int_key;
 }
@@ -292,12 +299,12 @@ long wxHashTable::MakeKey (const char *string) const
 void wxHashTable::BeginFind (void)
 {
   current_position = -1;
-  current_node = NULL;
+  current_node = (wxNode *) NULL;
 }
 
 wxNode *wxHashTable::Next (void)
 {
-  wxNode *found = NULL;
+  wxNode *found = (wxNode *) NULL;
   bool end = FALSE;
   while (!end && !found)
     {
@@ -307,7 +314,7 @@ wxNode *wxHashTable::Next (void)
 	  if (current_position >= n)
 	    {
 	      current_position = -1;
-	      current_node = NULL;
+	      current_node = (wxNode *) NULL;
 	      end = TRUE;
 	    }
 	  else
@@ -328,7 +335,7 @@ wxNode *wxHashTable::Next (void)
   return found;
 }
 
-void wxHashTable::DeleteContents (const bool flag)
+void wxHashTable::DeleteContents (bool flag)
 {
   int i;
   for (i = 0; i < n; i++)