Skip to content

Commit bf07028

Browse files
committed
Add capabilities cache classes and use QHash for config cache
1 parent 09c6d6f commit bf07028

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

src/mapserver/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo
1717

1818
SET ( qgis_mapserv_SRCS
1919
qgis_map_serv.cpp
20+
qgscapabilitiescache.cpp
2021
qgsconfigcache.cpp
2122
qgsconfigparser.cpp
2223
qgsepsgcache.cpp

src/mapserver/qgsconfigcache.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ QgsConfigCache::QgsConfigCache()
2727

2828
QgsConfigCache::~QgsConfigCache()
2929
{
30-
QMap<QString, QgsConfigParser*>::iterator configIt = mCachedConfigurations.begin();
30+
QHash<QString, QgsConfigParser*>::iterator configIt = mCachedConfigurations.begin();
3131
for ( ; configIt != mCachedConfigurations.end(); ++configIt )
3232
{
3333
delete configIt.value();
@@ -37,7 +37,7 @@ QgsConfigCache::~QgsConfigCache()
3737
QgsConfigParser* QgsConfigCache::searchConfiguration( const QString& filePath )
3838
{
3939
QgsConfigParser* p = 0;
40-
QMap<QString, QgsConfigParser*>::const_iterator configIt = mCachedConfigurations.find( filePath );
40+
QHash<QString, QgsConfigParser*>::const_iterator configIt = mCachedConfigurations.find( filePath );
4141
if ( configIt == mCachedConfigurations.constEnd() )
4242
{
4343
QgsMSDebugMsg( "Create new configuration" );
@@ -62,7 +62,7 @@ QgsConfigParser* QgsConfigCache::insertConfiguration( const QString& filePath )
6262
if ( mCachedConfigurations.size() > 40 )
6363
{
6464
//remove 10 elements to avoid memory problems
65-
QMap<QString, QgsConfigParser*>::iterator configIt = mCachedConfigurations.begin();
65+
QHash<QString, QgsConfigParser*>::iterator configIt = mCachedConfigurations.begin();
6666
for ( int i = 0; i < 10; ++i )
6767
{
6868
configIt = mCachedConfigurations.erase( configIt );

src/mapserver/qgsconfigcache.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifndef QGSCONFIGCACHE_H
1919
#define QGSCONFIGCACHE_H
2020

21-
#include <QMap>
21+
#include <QHash>
2222
#include <QString>
2323

2424
class QgsConfigParser;
@@ -39,7 +39,7 @@ class QgsConfigCache
3939
@return the inserted config parser or 0 in case of error*/
4040
QgsConfigParser* insertConfiguration( const QString& filePath );
4141
/**Cached XML configuration documents. Key: file path, value: config parser. Default configuration has key '$default$'*/
42-
QMap<QString, QgsConfigParser*> mCachedConfigurations;
42+
QHash<QString, QgsConfigParser*> mCachedConfigurations;
4343
};
4444

4545
#endif // QGSCONFIGCACHE_H

0 commit comments

Comments
 (0)