Created search library

map/framework.cpp

@@ -6,7 +6,6 @@
 #include "feature_vec_model.hpp"
 #include "benchmark_provider.hpp"
 #include "languages.hpp"
-#include "search_processor.hpp"
 
 #include "../indexer/feature_visibility.hpp"
 #include "../indexer/feature.hpp"

map/framework.hpp

@@ -7,10 +7,11 @@
 #include "window_handle.hpp"
 #include "location_state.hpp"
 #include "navigator.hpp"
-#include "search_processor.hpp"
 
 #include "../defines.hpp"
 
+#include "../search/search_processor.hpp"
+
 #include "../indexer/drawing_rule_def.hpp"
 #include "../indexer/mercator.hpp"
 #include "../indexer/data_header.hpp"

map/map.pro

@@ -25,7 +25,6 @@ HEADERS += \
     location_state.hpp \
     benchmark_provider.hpp \
     languages.hpp \
-    search_processor.hpp \
 
 SOURCES += \
     feature_vec_model.cpp \
@@ -40,7 +39,6 @@ SOURCES += \
     location_state.cpp \
     benchmark_provider.cpp \
     languages.cpp \
-    search_processor.cpp \
 
 !iphone*:!bada* {
   HEADERS += qgl_render_context.hpp

omim.pro

@@ -12,15 +12,14 @@ SUBDIRS = 3party \
           coding coding/coding_tests \
           geometry \
           indexer \
+          search search/search_tests \
           geometry/geometry_tests \
           version \
           platform platform/platform_tests \
           yg \
           storage storage/storage_tests \
-          map \
-          map/map_tests \
-          generator \
-          generator/generator_tests \
+          map map/map_tests \
+          generator generator/generator_tests \
           generator/generator_tool \
           qt_tstfrm \
           indexer/indexer_tests \

omim_light.pro

@@ -13,6 +13,7 @@ SUBDIRS = \
           yg \
           storage storage/storage_tests \
           indexer \
+          search search/search_tests \
           map \
           qt_tstfrm \
           indexer/indexer_tests \

qt/mainwindow.cpp

@@ -6,7 +6,7 @@
 
 #include "../defines.hpp"
 
-#include "../map/search_processor.hpp"
+#include "../search/search_processor.hpp"
 #include "../map/settings.hpp"
 
 #include <QtGui/QDockWidget>

qt/qt.pro

@@ -1,6 +1,6 @@
 # Main application in qt.
 ROOT_DIR = ..
-DEPENDENCIES = words map storage indexer yg platform geometry coding base \
+DEPENDENCIES = words map storage search indexer yg platform geometry coding base \
                bzip2 freetype expat fribidi tomcrypt jansson version
 
 include($$ROOT_DIR/common.pri)