X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..3f659fd6b10a8a5c899eaa99adc76a55322b33fd:/src/common/hash.cpp diff --git a/src/common/hash.cpp b/src/common/hash.cpp index 1aba64563c..f4139dd5f9 100644 --- a/src/common/hash.cpp +++ b/src/common/hash.cpp @@ -33,17 +33,17 @@ 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) @@ -55,11 +55,11 @@ wxHashTable::~wxHashTable (void) delete[] hash_table; } -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 +67,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 +85,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 char *value, wxObject * object) { // Should NEVER be long k = (long) key; @@ -99,7 +99,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; @@ -123,7 +123,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 +132,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 char *value) const { // Should NEVER be long k = (long) key; @@ -152,18 +152,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 +172,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); @@ -185,7 +185,7 @@ wxObject *wxHashTable::Get (const char *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 +193,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 +202,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,7 +213,7 @@ wxObject *wxHashTable::Delete (const long key) return data; } else - return NULL; + return (wxObject *) NULL; } } @@ -221,7 +221,7 @@ wxObject *wxHashTable::Delete (const char *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 +232,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 +245,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 +256,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 char *value) { int position = (int) (key % n); if (!hash_table[position]) - return NULL; + return (wxObject *) NULL; else { wxNode *node = hash_table[position]->Find (value); @@ -275,7 +275,7 @@ wxObject *wxHashTable::Delete (const long key, const char *value) return data; } else - return NULL; + return (wxObject *) NULL; } } @@ -292,12 +292,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 +307,7 @@ wxNode *wxHashTable::Next (void) if (current_position >= n) { current_position = -1; - current_node = NULL; + current_node = (wxNode *) NULL; end = TRUE; } else @@ -328,7 +328,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++)