Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DMC warning fix, code cleaning

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-06-01 15:20:14 +00:00
parent fa7de3b09a
commit f803b25b44
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/common/hash.cpp
View File

@@ -55,7 +55,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxHashTable, wxObject)
wxHashTableBase::wxHashTableBase() wxHashTableBase::wxHashTableBase()
{ {
m_deleteContents = FALSE; m_deleteContents = false;
m_hashTable = (wxListBase **)NULL; m_hashTable = (wxListBase **)NULL;
m_hashSize = 0; m_hashSize = 0;
m_count = 0; m_count = 0;
@@ -301,7 +301,7 @@ wxString wxStringHashTable::Get(long key, bool *wasFound) const
if ( keys->Item(n) == key ) if ( keys->Item(n) == key )
{ {
if ( wasFound ) 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(""); return _T("");
} }
bool wxStringHashTable::Delete(long key) const 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); keys->RemoveAt(n);
m_values[slot]->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; hash_table = (wxList**) NULL;
Create(the_key_type, size); Create(the_key_type, size);
m_count = 0; m_count = 0;
m_deleteContents = FALSE; m_deleteContents = false;
/* /*
n = size; n = size;
current_position = -1; current_position = -1;
@@ -393,7 +393,7 @@ bool wxHashTable::Create(int the_key_type, int size)
int i; int i;
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
hash_table[i] = (wxList *) NULL; 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]) if (!hash_table[position])
{ {
hash_table[position] = new wxList (wxKEY_INTEGER); 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]) if (!hash_table[position])
{ {
hash_table[position] = new wxList (wxKEY_STRING); 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]) if (!hash_table[position])
{ {
hash_table[position] = new wxList (wxKEY_INTEGER); 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]) if (!hash_table[position])
{ {
hash_table[position] = new wxList (wxKEY_STRING); 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 () wxHashTable::Node* wxHashTable::Next ()
{ {
wxNode *found = (wxNode *) NULL; wxNode *found = (wxNode *) NULL;
bool end = FALSE; bool end = false;
while (!end && !found) while (!end && !found)
{ {
if (!current_node) if (!current_node)
@@ -679,7 +679,7 @@ wxHashTable::Node* wxHashTable::Next ()
{ {
current_position = -1; current_position = -1;
current_node = (wxNode *) NULL; current_node = (wxNode *) NULL;
end = TRUE; end = true;
} }
else else
{ {
@@ -808,7 +808,7 @@ void wxHashTableBase::DoRemoveNode( wxHashTableBase_Node* node )
Node* prev = start; Node* prev = start;
for( curr = prev->GetNext(); curr != node; for( curr = prev->GetNext(); curr != node;
prev = curr, curr = curr->GetNext() ); prev = curr, curr = curr->GetNext() ) ;
DoUnlinkNode( bucket, node, prev ); DoUnlinkNode( bucket, node, prev );
} }