← Back to branch summary

~ubuntu-branches/ubuntu/wily/marble/wily-proposed

« back to all changes in this revision

Viewing changes to src/plugins/runner/gosmore-routing/GosmoreRoutingRunner.cpp

  • Committer: Package Import Robot
  • Author(s): Scarlett Clark, Jonathan Riddell, Scarlett Clark
  • Date: 2014-07-24 23:38:32 UTC
  • mfrom: (1.5.2)
  • Revision ID: package-import@ubuntu.com-20140724233832-7v4421t4khrhw487
Tags: 4:4.13.90-0ubuntu1
[ Jonathan Riddell ]
* Switch to libmarblewidget19 for new soversion

[ Scarlett Clark ]
* New upstream beta release
* Update: do_not_install_private_headers. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/runner/gosmore-routing/GosmoreRoutingRunner.cpp
37
37
 
38
38
    QByteArray retrieveWaypoints( const QString &query ) const;
39
39
 
40
 
    GeoDataDocument* createDocument( GeoDataLineString* routeWaypoints, const QVector<GeoDataPlacemark*> instructions ) const;
41
 
 
42
 
    GeoDataLineString parseGosmoreOutput( const QByteArray &content ) const;
43
 
 
44
 
    void merge( GeoDataLineString* one, const GeoDataLineString& two ) const;
 
40
    static GeoDataDocument* createDocument( GeoDataLineString* routeWaypoints, const QVector<GeoDataPlacemark*> instructions );
 
41
 
 
42
    static GeoDataLineString parseGosmoreOutput( const QByteArray &content );
 
43
 
 
44
    static void merge( GeoDataLineString* one, const GeoDataLineString& two );
45
45
 
46
46
    QVector<GeoDataPlacemark*> parseGosmoreInstructions( const QByteArray &content );
47
47
 
58
58
 
59
59
QMap<QString, QByteArray> GosmoreRunnerPrivate::m_partialRoutes;
60
60
 
61
 
void GosmoreRunnerPrivate::merge( GeoDataLineString* one, const GeoDataLineString& two ) const
 
61
void GosmoreRunnerPrivate::merge( GeoDataLineString* one, const GeoDataLineString& two )
62
62
{
63
63
    Q_ASSERT( one );
64
64
 
93
93
    return QByteArray();
94
94
}
95
95
 
96
 
GeoDataLineString GosmoreRunnerPrivate::parseGosmoreOutput( const QByteArray &content ) const
 
96
GeoDataLineString GosmoreRunnerPrivate::parseGosmoreOutput( const QByteArray &content )
97
97
{
98
98
    GeoDataLineString routeWaypoints;
99
99
 
158
158
    return result;
159
159
}
160
160
 
161
 
GeoDataDocument* GosmoreRunnerPrivate::createDocument( GeoDataLineString* routeWaypoints, const QVector<GeoDataPlacemark*> instructions ) const
 
161
GeoDataDocument* GosmoreRunnerPrivate::createDocument( GeoDataLineString* routeWaypoints, const QVector<GeoDataPlacemark*> instructions )
162
162
{
163
163
    if ( !routeWaypoints || routeWaypoints->isEmpty() ) {
164
164
        return 0;