adrien/netradiant-custom
1
Fork 0
mirror of https://github.com/Garux/netradiant-custom.git synced 2026-09-28 00:00:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

EntityKeyValues::find without Key instance creation

Browse Source
This commit is contained in:
Garux
2024-12-02 05:10:22 +05:00
parent 446e9a63c7
commit 516446a573
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/entitylib.h
+21 -4
View File
@@ -448,6 +448,23 @@ private:
}
}
KeyValues::const_iterator find( const char* key ) const {
/* present in the pool -> actual search makes sense */
if( const StringPool::iterator it = getPool().find( const_cast<char *>( key ) ); it != getPool().end() )
for( KeyValues::const_iterator i = m_keyValues.begin(); i != m_keyValues.end(); ++i )
if( i->first == it )
return i;
return m_keyValues.end();
}
KeyValues::iterator find( const char* key ){
/* present in the pool -> actual search makes sense */
if( const StringPool::iterator it = getPool().find( const_cast<char *>( key ) ); it != getPool().end() )
for( KeyValues::iterator i = m_keyValues.begin(); i != m_keyValues.end(); ++i )
if( i->first == it )
return i;
return m_keyValues.end();
}
void insert( const char* key, const KeyValuePtr& keyValue ){
KeyValues::iterator i = m_keyValues.insert( KeyValues::value_type( key, keyValue ) );
notifyInsert( key, *( *i ).second );
@@ -458,7 +475,7 @@ private:
}
void insert( const char* key, const char* value ){
KeyValues::iterator i = m_keyValues.find( key );
KeyValues::iterator i = find( key );
if ( i != m_keyValues.end() ) {
( *i ).second->assign( value );
}
@@ -481,7 +498,7 @@ private:
}
void erase( const char* key ){
KeyValues::iterator i = m_keyValues.find( key );
KeyValues::iterator i = find( key );
if ( i != m_keyValues.end() ) {
m_undo.save();
erase( i );
@@ -616,7 +633,7 @@ public:
m_entityKeyValueChanged();
}
const char* getKeyValue( const char* key ) const override {
KeyValues::const_iterator i = m_keyValues.find( key );
KeyValues::const_iterator i = find( key );
if ( i != m_keyValues.end() ) {
return ( *i ).second->c_str();
}
@@ -625,7 +642,7 @@ public:
return "";
}
bool hasKeyValue( const char* key ) const override {
return m_keyValues.find( key ) != m_keyValues.end();
return find( key ) != m_keyValues.end();
}
bool isContainer() const override {
libs/string/pooledstring.h
+3
View File
@@ -83,6 +83,9 @@ public:
bool operator==( const PooledString& other ) const {
return m_i == other.m_i;
}
bool operator==( const StringPool::iterator i ) const {
return m_i == i;
}
const char* c_str() const {
return ( *m_i ).key;
}