AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

review fixes

Browse source
This commit is contained in:
ExMix 2013-07-14 22:38:45 +03:00 • committed by Alex Zolotarev
parent e9e2222277
commit 8891c92e42
6 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
map_server/map_server.pro
View file

@ -4,7 +4,6 @@
#
#-------------------------------------------------
QT += core gui opengl
TARGET = map_server
CONFIG += console warn_on
CONFIG -= app_bundle
@ -16,6 +15,8 @@ DEPENDENCIES = map gui search storage indexer graphics platform anim geometry co
ROOT_DIR = ..
include($$ROOT_DIR/common.pri)
QT += core gui opengl
INCLUDEPATH += $$ROOT_DIR/3party/jansson/src
macx* {

3
map_server/map_server_tests/generate_map_tests.cpp
View file

@ -2,7 +2,6 @@
#include "../../testing/testing.hpp"
#include "../../coding/reader.hpp"
#include "../../coding/base64.hpp"
#include "../../platform/platform.hpp"
@ -32,7 +31,7 @@ UNIT_TEST(generate_simle_map)
QByteArray response = mapServer->readAll();
string responseString(response.constData(), response.size());
responseString = base64::Decode(responseString);
responseString = responseString;
ModelReader * reader = GetPlatform().GetReader("test.png");
uint64_t size = reader->Size();

2
map_server/map_server_tests/map_server_tests.pro
View file

@ -4,8 +4,6 @@
#
#-------------------------------------------------
QT += core gui opengl
TARGET = map_server_tests
CONFIG += console warn_on
CONFIG -= app_bundle

2
map_server/map_server_tests/utils_tests.cpp
View file

@ -4,7 +4,6 @@
#include "../../graphics/defines.hpp"
#include "../../platform/platform.hpp"
#include "../../coding/reader.hpp"
#include "../../coding/base64.hpp"
#include "../../map_server_utils/request.hpp"
#include "../../map_server_utils/response.hpp"
@ -64,7 +63,6 @@ UNIT_TEST(get_response)
inStream.read(responseData, length);
string responseString(responseData, length);
responseString = base64::Decode(responseString);
size_t responseSize = responseString.size();
TEST_EQUAL(size, (uint64_t)responseSize, (""));

5
map_server_utils/map_server_utils.pro
View file

@ -3,12 +3,9 @@
# Project created by QtCreator 2013-07-13T21:44:19
#
#-------------------------------------------------
QT -= core gui
TARGET = map_server_utils
TEMPLATE = lib
CONFIG += staticlib wanr_on
CONFIG += staticlib warn_on
ROOT_DIR = ..
include($$ROOT_DIR/common.pri)

8
map_server_utils/response_impl/response_cout.cpp
View file

@ -1,7 +1,6 @@
#include "response_cout.hpp"
#include "../coding/base64.hpp"
#include "../std/string.hpp"
#include "../std/iostream.hpp"
namespace srv
@ -16,10 +15,7 @@ namespace srv
void ResponseCout::DoResponse() const
{
string data(m_buffer.constData(), m_buffer.size());
data = base64::Encode(data);
cout << data << endl;
cout << data;
}
}
}