From 1893d76d7b957768886724287ef5362d087c66a5 Mon Sep 17 00:00:00 2001 From: Darafei Praliaskouski Date: Thu, 18 Jul 2013 18:31:54 +0300 Subject: [PATCH] [map_server] structure simplification --- data/test.png | Bin 4178 -> 0 bytes map_server/main.cpp | 6 ++-- map_server/map_server.pro | 15 ++++++++-- .../map_server_tests/generate_map_tests.cpp | 4 +-- .../map_server_tests/map_server_tests.pro | 2 +- map_server/map_server_tests/utils_tests.cpp | 6 ++-- {map_server_utils => map_server}/request.cpp | 0 {map_server_utils => map_server}/request.hpp | 0 {map_server_utils => map_server}/response.cpp | 0 {map_server_utils => map_server}/response.hpp | 0 .../response_impl/response_cout.cpp | 0 .../response_impl/response_cout.hpp | 0 {map_server_utils => map_server}/viewport.cpp | 0 {map_server_utils => map_server}/viewport.hpp | 0 map_server_utils/map_server_utils.pro | 27 ------------------ omim.pro | 4 +-- 16 files changed, 22 insertions(+), 42 deletions(-) delete mode 100644 data/test.png rename {map_server_utils => map_server}/request.cpp (100%) rename {map_server_utils => map_server}/request.hpp (100%) rename {map_server_utils => map_server}/response.cpp (100%) rename {map_server_utils => map_server}/response.hpp (100%) rename {map_server_utils => map_server}/response_impl/response_cout.cpp (100%) rename {map_server_utils => map_server}/response_impl/response_cout.hpp (100%) rename {map_server_utils => map_server}/viewport.cpp (100%) rename {map_server_utils => map_server}/viewport.hpp (100%) delete mode 100644 map_server_utils/map_server_utils.pro diff --git a/data/test.png b/data/test.png deleted file mode 100644 index 1fef701490aad1917d66949ce2187fe3435e397d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4178 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 diff --git a/map_server/main.cpp b/map_server/main.cpp index 7ea64532fa..0ba4626ab5 100644 --- a/map_server/main.cpp +++ b/map_server/main.cpp @@ -1,7 +1,7 @@ #include "render_context.hpp" -#include "../map_server_utils/viewport.hpp" -#include "../map_server_utils/request.hpp" -#include "../map_server_utils/response.hpp" +#include "viewport.hpp" +#include "request.hpp" +#include "response.hpp" #include "../graphics/resource_manager.hpp" diff --git a/map_server/map_server.pro b/map_server/map_server.pro index 87cc8bfa73..9d1988ef8f 100644 --- a/map_server/map_server.pro +++ b/map_server/map_server.pro @@ -4,7 +4,7 @@ CONFIG -= app_bundle TEMPLATE = app DEPENDENCIES = map gui search storage indexer graphics platform anim geometry coding base \ - map_server_utils bzip2 freetype expat fribidi tomcrypt jansson protobuf + bzip2 freetype expat fribidi tomcrypt jansson protobuf ROOT_DIR = .. include($$ROOT_DIR/common.pri) @@ -19,7 +19,16 @@ macx* { } SOURCES += main.cpp \ - render_context.cpp + render_context.cpp \ + request.cpp \ + response.cpp \ + response_impl/response_cout.cpp \ + viewport.cpp \ HEADERS += \ - render_context.hpp + render_context.hpp \ + request.hpp \ + response.hpp \ + viewport.hpp \ + response_impl/response_cout.hpp \ + diff --git a/map_server/map_server_tests/generate_map_tests.cpp b/map_server/map_server_tests/generate_map_tests.cpp index 14dbf45ba4..b9bf4e7189 100644 --- a/map_server/map_server_tests/generate_map_tests.cpp +++ b/map_server/map_server_tests/generate_map_tests.cpp @@ -5,8 +5,8 @@ #include "../../platform/platform.hpp" -#include "../../map_server_utils/request.hpp" -#include "../../map_server_utils/viewport.hpp" +#include "../../map_server/request.hpp" +#include "../../map_server/viewport.hpp" #include #include diff --git a/map_server/map_server_tests/map_server_tests.pro b/map_server/map_server_tests/map_server_tests.pro index 6c591e2b3d..87c4ce5a72 100644 --- a/map_server/map_server_tests/map_server_tests.pro +++ b/map_server/map_server_tests/map_server_tests.pro @@ -11,7 +11,7 @@ CONFIG -= app_bundle TEMPLATE = app DEPENDENCIES = qt_tstfrm map indexer graphics platform geometry coding base expat freetype fribidi protobuf tomcrypt \ - map_server_utils jansson + jansson ROOT_DIR = ../.. include($$ROOT_DIR/common.pri) diff --git a/map_server/map_server_tests/utils_tests.cpp b/map_server/map_server_tests/utils_tests.cpp index e5e90c7792..a887b1ce81 100644 --- a/map_server/map_server_tests/utils_tests.cpp +++ b/map_server/map_server_tests/utils_tests.cpp @@ -5,9 +5,9 @@ #include "../../platform/platform.hpp" #include "../../coding/reader.hpp" -#include "../../map_server_utils/request.hpp" -#include "../../map_server_utils/response.hpp" -#include "../../map_server_utils/viewport.hpp" +#include "../../map_server/request.hpp" +#include "../../map_server/response.hpp" +#include "../../map_server/viewport.hpp" #include "../../std/iostream.hpp" diff --git a/map_server_utils/request.cpp b/map_server/request.cpp similarity index 100% rename from map_server_utils/request.cpp rename to map_server/request.cpp diff --git a/map_server_utils/request.hpp b/map_server/request.hpp similarity index 100% rename from map_server_utils/request.hpp rename to map_server/request.hpp diff --git a/map_server_utils/response.cpp b/map_server/response.cpp similarity index 100% rename from map_server_utils/response.cpp rename to map_server/response.cpp diff --git a/map_server_utils/response.hpp b/map_server/response.hpp similarity index 100% rename from map_server_utils/response.hpp rename to map_server/response.hpp diff --git a/map_server_utils/response_impl/response_cout.cpp b/map_server/response_impl/response_cout.cpp similarity index 100% rename from map_server_utils/response_impl/response_cout.cpp rename to map_server/response_impl/response_cout.cpp diff --git a/map_server_utils/response_impl/response_cout.hpp b/map_server/response_impl/response_cout.hpp similarity index 100% rename from map_server_utils/response_impl/response_cout.hpp rename to map_server/response_impl/response_cout.hpp diff --git a/map_server_utils/viewport.cpp b/map_server/viewport.cpp similarity index 100% rename from map_server_utils/viewport.cpp rename to map_server/viewport.cpp diff --git a/map_server_utils/viewport.hpp b/map_server/viewport.hpp similarity index 100% rename from map_server_utils/viewport.hpp rename to map_server/viewport.hpp diff --git a/map_server_utils/map_server_utils.pro b/map_server_utils/map_server_utils.pro deleted file mode 100644 index 8eaa324fd2..0000000000 --- a/map_server_utils/map_server_utils.pro +++ /dev/null @@ -1,27 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2013-07-13T21:44:19 -# -#------------------------------------------------- -TARGET = map_server_utils -TEMPLATE = lib -CONFIG += staticlib warn_on - -ROOT_DIR = .. -include($$ROOT_DIR/common.pri) - -INCLUDEPATH += $$ROOT_DIR/3party/jansson/src - -DEPENDENCIES = platform base jansson - -SOURCES += \ - viewport.cpp \ - response.cpp \ - request.cpp \ - response_impl/response_cout.cpp - -HEADERS += \ - viewport.hpp \ - response.hpp \ - request.hpp \ - response_impl/response_cout.hpp diff --git a/omim.pro b/omim.pro index 4bd2fb8439..983be89a5d 100644 --- a/omim.pro +++ b/omim.pro @@ -36,9 +36,7 @@ SUBDIRS = 3party \ graphics/graphics_tests \ gui/gui_tests \ qt \ - map_server_utils \ - map_server \ - map_server/map_server_tests + map_server map_server/map_server_tests \ } else { # libraries which are used on mobile devices SUBDIRS = 3party \