[Boost-commit] svn:boost r68856 - trunk/libs/geometry/example/with_external_libs

Subject: [Boost-commit] svn:boost r68856 - trunk/libs/geometry/example/with_external_libs
From: barend.gehrels_at_[hidden]
Date: 2011-02-13 17:13:02

Author: barendgehrels
Date: 2011-02-13 17:13:01 EST (Sun, 13 Feb 2011)
New Revision: 68856
URL: http://svn.boost.org/trac/boost/changeset/68856

Log:
Changes for qt for Linux
Text files modified: 
   trunk/libs/geometry/example/with_external_libs/x06_qt_world_mapper.cpp        |     6 ++----                                  
   trunk/libs/geometry/example/with_external_libs/x06_qt_world_mapper_readme.txt |    11 +++++++----                             
   2 files changed, 9 insertions(+), 8 deletions(-)

Modified: trunk/libs/geometry/example/with_external_libs/x06_qt_world_mapper.cpp
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x06_qt_world_mapper.cpp	(original)
+++ trunk/libs/geometry/example/with_external_libs/x06_qt_world_mapper.cpp	2011-02-13 17:13:01 EST (Sun, 13 Feb 2011)
@@ -32,8 +32,6 @@
 #include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
 
 
-#include "qt_mapper.hpp"
-
 
 // Adapt a QPointF such that it can be handled by Boost.Geometry
 BOOST_GEOMETRY_REGISTER_POINT_2D_GET_SET(QPointF, double, cs::cartesian, x, y, setX, setY)
@@ -53,7 +51,7 @@
 class WorldMapper : public QWidget
 {
  public:
-    WorldMapper(std::vector<country_type> const& countries, boost::geometry::model::box<point_2d> const& box, QWidget *parent = 0)
+    WorldMapper(std::vector<country_type> const& countries, boost::geometry::model::box<point_2d> const& box)
         : m_countries(countries)
         , m_box(box)
     {
@@ -62,7 +60,7 @@
     }
 
  protected:
-    void paintEvent(QPaintEvent *event)
+    void paintEvent(QPaintEvent*)
     {
         map_transformer_type transformer(m_box, this->width(), this->height());
 

Modified: trunk/libs/geometry/example/with_external_libs/x06_qt_world_mapper_readme.txt
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x06_qt_world_mapper_readme.txt	(original)
+++ trunk/libs/geometry/example/with_external_libs/x06_qt_world_mapper_readme.txt	2011-02-13 17:13:01 EST (Sun, 13 Feb 2011)
@@ -5,13 +5,10 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-
-
 Qt World Mapper example
 
 It will show a basic Qt Widget, displaying world countries
 
-
 To compile this program:
 
 Install Qt (if not done before)
@@ -25,4 +22,10 @@
    - alternatively you can include Boost and/or Qt in your standard include path
    
 Using Linux/gcc
-   
+   - install Qt with sudo apt-get install libqt4-dev
+   - run qmake -project
+   - edit the generated file "with_external_libs.pro"  and delete all lines but the x06_qt_world_mapper.cpp
+   - run qmake
+   - edit the generated Makefile, if necessary, and add -I../../../.. to include Boost and Boost.Geometry
+   - run make
+