Moved method to parse JORE code into private class.

diff --git a/zouba/qt/route.cpp b/zouba/qt/route.cpp
index 6a4060c..28a011e 100644 (file)
--- a/zouba/qt/route.cpp
+++ b/zouba/qt/route.cpp
@@ -60,21 +60,10 @@ void Route::replyFinished( QNetworkReply * reply )
 {
   RouteData routeData = q->parseReply( reply->readAll() );
 
-  ui->BusNoDisplay->setText( parseJOREcode( routeData.lineCode ) );
+  ui->BusNoDisplay->setText( q->parseJOREcode( routeData.lineCode ) );
   ui->TimeDisplay->setText( routeData.arrivalTime );
 }
 
-QString Route::parseJOREcode( const QString &joreCode ) const
-{
-    QString areaTransportTypeCode( joreCode.mid(0,1) );
-    QString lineCode( joreCode.mid(1,4) );
-    QString letterVariant( joreCode.mid(5,1) );
-    QString letterNumberVariant( joreCode.mid(6,1) );
-    QString direction( joreCode.mid(7,1) );
-    
-    return lineCode+letterVariant;
-}
-
 void Route::setFromLocation( Location fromLocation )
 {
   q->setFromLocation( fromLocation );

diff --git a/zouba/qt/route.h b/zouba/qt/route.h
index f6422c3..4e8bbf6 100644 (file)
--- a/zouba/qt/route.h
+++ b/zouba/qt/route.h
@@ -55,8 +55,6 @@ public Q_SLOTS:
   void replyFinished(QNetworkReply*);
 
 private:
-  QString parseJOREcode( const QString &joreCode ) const;
-
   RoutePrivate *q;
   QNetworkAccessManager *manager;
   Ui::MainWindow *ui;

diff --git a/zouba/qt/route_p.cpp b/zouba/qt/route_p.cpp
index 92c8c3c..7472c97 100644 (file)
--- a/zouba/qt/route_p.cpp
+++ b/zouba/qt/route_p.cpp
@@ -72,8 +72,18 @@ void RoutePrivate::setToLocation( Location toLocation )
   m_toLocation = toLocation;
 }
 
-Location RoutePrivate::toLocation()
+QString RoutePrivate::parseJOREcode( const QString &joreCode ) const
+{
+    QString areaTransportTypeCode( joreCode.mid(0,1) );
+    QString lineCode( joreCode.mid(1,4) );
+    QString letterVariant( joreCode.mid(5,1) );
+    QString letterNumberVariant( joreCode.mid(6,1) );
+    QString direction( joreCode.mid(7,1) );
+    
+    return lineCode+letterVariant;
+}
 
+Location RoutePrivate::toLocation()
 {
   return m_toLocation;
 }

diff --git a/zouba/qt/route_p.h b/zouba/qt/route_p.h
index 57d3767..b30f4ba 100644 (file)
--- a/zouba/qt/route_p.h
+++ b/zouba/qt/route_p.h
@@ -20,30 +20,15 @@ public:
 
   RouteData parseReply( const QByteArray &reply );
 
-  /*!
-    * \brief Sets the from location
-    * \param fromLocation The from location
-    */
   void setFromLocation( Location fromLocation );
 
-  /*!
-    \brief Get the from location
-    \return The from location
-    */
   Location fromLocation();
 
-  /*!
-    * \brief Sets the to location
-    * \param toLocation The to location
-    */
   void setToLocation( Location toLocation );
 
-  /*!
-    \brief Get the to location
-    \return The to location
-    */
   Location toLocation();
 
+  QString parseJOREcode( const QString &joreCode ) const;
 private:
   Location m_fromLocation;
   Location m_toLocation;