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

Removed boost:: namespace and fixed boost includes

Browse source
This commit is contained in:
Alex Zolotarev 2011-05-22 16:54:21 +02:00 • committed by Alex Zolotarev
parent c88a87db75
commit 93219f070f
9 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
map/framework.cpp
View file

@ -379,9 +379,9 @@ void FrameWork<TModel>::AddRedrawCommandSure()
// initialize gps and compass subsystem
GetLocationManager().SetGpsObserver(
boost::bind(&this_type::OnGpsUpdate, this, _1));
bind(&this_type::OnGpsUpdate, this, _1));
GetLocationManager().SetCompassObserver(
boost::bind(&this_type::OnCompassUpdate, this, _1));
bind(&this_type::OnCompassUpdate, this, _1));
// set language priorities
languages::CodesT langCodes;

5
map/framework.hpp
View file

@ -39,6 +39,7 @@
#include "../base/mutex.hpp"
#include "../std/bind.hpp"
#include "../std/function.hpp"
#include "../std/vector.hpp"
#include "../std/shared_ptr.hpp"
#include "../std/target_os.hpp"
@ -53,7 +54,7 @@ class redraw_operation_cancelled {};
struct BenchmarkRectProvider;
typedef boost::function<void (search::Result const &)> SearchCallbackT;
typedef function<void (search::Result const &)> SearchCallbackT;
namespace fwork
{
@ -94,7 +95,7 @@ namespace fwork
}
typedef boost::function<void (void)> LocationRetrievedCallbackT;
typedef function<void (void)> LocationRetrievedCallbackT;
template
<

4
platform/download_manager.hpp
View file

@ -15,7 +15,7 @@ struct HttpProgressT
int64_t m_current;
int64_t m_total;
};
typedef boost::function<void (HttpProgressT const &)> HttpProgressCallbackT;
typedef function<void (HttpProgressT const &)> HttpProgressCallbackT;
enum DownloadResultT
{
@ -34,7 +34,7 @@ struct HttpFinishedParams
string m_data; //!< if not empty, contains received data
DownloadResultT m_error;
};
typedef boost::function<void (HttpFinishedParams const &)> HttpFinishedCallbackT;
typedef function<void (HttpFinishedParams const &)> HttpFinishedCallbackT;
struct HttpStartParams
{

7
platform/location.hpp
View file

@ -2,8 +2,7 @@
#include "../std/string.hpp"
#include "../std/vector.hpp"
#include <boost/function.hpp>
#include "../std/function.hpp"
namespace location
{
@ -53,8 +52,8 @@ namespace location
int m_z;
};
typedef boost::function<void (GpsInfo const &)> TGpsCallback;
typedef boost::function<void (CompassInfo const &)> TCompassCallback;
typedef function<void (GpsInfo const &)> TGpsCallback;
typedef function<void (CompassInfo const &)> TCompassCallback;
class LocationService
{

5
platform/platform_tests/download_test.cpp
View file

@ -6,10 +6,9 @@
#include "../../coding/file_writer.hpp"
#include "../../coding/file_reader.hpp"
#include <QCoreApplication>
#include <boost/bind.hpp>
#include "../../std/bind.hpp"
#include "../../base/start_mem_debug.hpp"
#include <QCoreApplication>
// file on the server contains "Test1"
#define TEST_FILE_URL1 "http://melnichek.ath.cx:34568/unit_tests/1.txt"

2
platform/wifi_info.hpp
View file

@ -20,7 +20,7 @@ public:
WiFiInfo();
~WiFiInfo();
typedef boost::function<void (vector<WiFiInfo::AccessPoint> const &)> WifiRequestCallbackT;
typedef function<void (vector<WiFiInfo::AccessPoint> const &)> WifiRequestCallbackT;
void RequestWiFiBSSIDs(WifiRequestCallbackT callback);
/// Stops any active updates
void Stop();

9
qt/mainwindow.cpp
View file

@ -7,8 +7,11 @@
#include "../defines.hpp"
#include "../search/search_processor.hpp"
#include "../map/settings.hpp"
#include "../std/bind.hpp"
#include <QtGui/QDockWidget>
#include <QtGui/QToolBar>
#include <QtGui/QAction>
@ -176,7 +179,7 @@ void MainWindow::LoadState()
m_pDrawWidget->UpdateNow();
}
namespace
namespace
{
struct button_t
{
@ -306,7 +309,7 @@ void MainWindow::OnMyPosition()
{
m_pMyPositionAction->setIcon(QIcon(":/navig64/location-search.png"));
m_pMyPositionAction->setToolTip(tr("Looking for position..."));
m_pDrawWidget->OnEnableMyPosition(boost::bind(&MainWindow::OnLocationFound, this));
m_pDrawWidget->OnEnableMyPosition(bind(&MainWindow::OnLocationFound, this));
}
else
{
@ -352,7 +355,7 @@ void MainWindow::OnSearchTextChanged(QString const & str)
table->setRowCount(0);
if (!str.isEmpty())
m_pDrawWidget->Search(str.toUtf8().constData(),
boost::bind(&MainWindow::OnSearchResult, this, _1));
bind(&MainWindow::OnSearchResult, this, _1));
}
void MainWindow::OnSearchResult(search::Result const & result)

4
qt/update_dialog.cpp
View file

@ -5,7 +5,7 @@
#include "../map/settings.hpp"
#include <boost/bind.hpp>
#include "../std/bind.hpp"
#include <QtGui/QVBoxLayout>
#include <QtGui/QHBoxLayout>
@ -40,7 +40,7 @@ enum
#define COLOR_INQUEUE Qt::gray
namespace qt
{
{
///////////////////////////////////////////////////////////////////////////////
// Helpers
///////////////////////////////////////////////////////////////////////////////

17
storage/storage.hpp
View file

@ -11,8 +11,7 @@
#include "../std/list.hpp"
#include "../std/string.hpp"
#include "../std/set.hpp"
#include <boost/function.hpp>
#include "../std/function.hpp"
namespace storage
{
@ -79,9 +78,9 @@ namespace storage
/// @name Communicate with GUI
//@{
typedef boost::function<void (TIndex const &)> TObserverChangeCountryFunction;
typedef boost::function<void (TIndex const &, HttpProgressT const &)> TObserverProgressFunction;
typedef boost::function<void (TUpdateResult, string const &)> TUpdateRequestFunction;
typedef function<void (TIndex const &)> TObserverChangeCountryFunction;
typedef function<void (TIndex const &, HttpProgressT const &)> TObserverProgressFunction;
typedef function<void (TUpdateResult, string const &)> TUpdateRequestFunction;
TObserverChangeCountryFunction m_observerChange;
TObserverProgressFunction m_observerProgress;
TUpdateRequestFunction m_observerUpdateRequest;
@ -90,10 +89,10 @@ namespace storage
/// @name Communicate with Framework
//@{
public:
typedef boost::function<void (string const &)> TAddMapFunction;
typedef boost::function<void (string const &)> TRemoveMapFunction;
typedef boost::function<void (m2::RectD const & r)> TUpdateRectFunction;
typedef boost::function<void (Platform::FilesList &)> TEnumMapsFunction;
typedef function<void (string const &)> TAddMapFunction;
typedef function<void (string const &)> TRemoveMapFunction;
typedef function<void (m2::RectD const & r)> TUpdateRectFunction;
typedef function<void (Platform::FilesList &)> TEnumMapsFunction;
private:
TAddMapFunction m_addMap;