change QgsCptCityCollection to QgsCptCityArchive, join with items and…

… model in file qgscptcityarchive.h
qgis · Aug 24, 2012 · eabdbd7 · eabdbd7
1 parent bcd1a70
commit eabdbd7
Show file tree

Hide file tree

Showing 9 changed files with 800 additions and 768 deletions.
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -35,7 +35,7 @@ SET(QGIS_CORE_SRCS
   symbology-ng/qgsgraduatedsymbolrendererv2.cpp
   symbology-ng/qgsrulebasedrendererv2.cpp
   symbology-ng/qgsvectorcolorrampv2.cpp
-  symbology-ng/qgscptcitybrowsermodel.cpp
+  symbology-ng/qgscptcityarchive.cpp
   symbology-ng/qgsstylev2.cpp
   symbology-ng/qgssymbologyv2conversion.cpp
   symbology-ng/qgssvgcache.cpp
@@ -307,7 +307,7 @@ SET(QGIS_CORE_MOC_HDRS
   gps/qextserialport/qextserialport.h
   gps/qextserialport/qextserialenumerator.h
 
-  symbology-ng/qgscptcitybrowsermodel.h
+  symbology-ng/qgscptcityarchive.h
 )
 
 
@@ -439,7 +439,7 @@ SET(QGIS_CORE_HDRS
   symbology-ng/qgssymbologyv2conversion.h
   symbology-ng/qgssymbolv2.h
   symbology-ng/qgsvectorcolorrampv2.h
-  symbology-ng/qgscptcitybrowsermodel.h
+  symbology-ng/qgscptcityarchive.h
   symbology-ng/qgsvectorfieldsymbollayer.h
 
   qgsdiagramrendererv2.h