summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Ranostay <matt.ranostay@konsulko.com>2019-10-18 02:29:26 -0700
committerMatt Ranostay <matt.ranostay@konsulko.com>2019-11-12 22:10:48 -0800
commit81583bbfa365a0c260cc67f97941ac0e623e825a (patch)
tree30f818f96a5926058eab1d706c53dd09050914da
parent0240d99ec8fea238a9193207fe430111ae479f43 (diff)
poi-yelp: fix up formating in source
Fix the mixing of tabs and 4 space indents in all source files. Bug-AGL: SPEC-2880 Change-Id: Ib02b5b9d2c65f252ba9b981be6fed23e8c111e66 Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
-rw-r--r--MainApp.cpp58
-rw-r--r--MainApp.h8
-rw-r--r--main.cpp20
3 files changed, 43 insertions, 43 deletions
diff --git a/MainApp.cpp b/MainApp.cpp
index 31e4420..59e049c 100644
--- a/MainApp.cpp
+++ b/MainApp.cpp
@@ -633,36 +633,36 @@ void MainApp::networkReplySearch(QNetworkReply* reply)
/* memorize the text which gave this result: */
currentSearchedText = lineEdit.text();
- if (reply->error() == QNetworkReply::NoError)
- {
- // we only handle this callback if it matches the last search request:
- if (reply != pSearchReply)
- {
- TRACE_INFO("this reply is already too late (or about a different network request)");
- mutex.unlock();
- return;
- }
-
- buflen = reply->read(buf, BIG_BUFFER_SIZE-1);
- buf[buflen] = '\0';
-
- if (buflen == 0)
- {
- mutex.unlock();
- return;
- }
-
-
-
- currentIndex = 0;
- Businesses.clear();
- ParseJsonBusinessList(buf, Businesses);
- DisplayResultList(true);
- FillResultList(Businesses);
+ if (reply->error() == QNetworkReply::NoError)
+ {
+ // we only handle this callback if it matches the last search request:
+ if (reply != pSearchReply)
+ {
+ TRACE_INFO("this reply is already too late (or about a different network request)");
+ mutex.unlock();
+ return;
+ }
+
+ buflen = reply->read(buf, BIG_BUFFER_SIZE-1);
+ buf[buflen] = '\0';
+
+ if (buflen == 0)
+ {
+ mutex.unlock();
+ return;
+ }
+
+
+
+ currentIndex = 0;
+ Businesses.clear();
+ ParseJsonBusinessList(buf, Businesses);
+ DisplayResultList(true);
+ FillResultList(Businesses);
}
else
{
- fprintf(stderr,"POI: reply error network please check to poikey and system time (adjusted?)\n");
+ fprintf(stderr,"POI: reply error network please check to poikey and system time (adjusted?)\n");
}
mutex.unlock();
@@ -864,8 +864,8 @@ int MainApp::AuthenticatePOI(const QString & CredentialsFile)
/* Then, send a HTTP request to get the token and wait for answer (synchronously): */
- token = AppSecret;
- return 0;
+ token = AppSecret;
+ return 0;
}
int MainApp::StartMonitoringUserInput()
diff --git a/MainApp.h b/MainApp.h
index 0f3d174..66defee 100644
--- a/MainApp.h
+++ b/MainApp.h
@@ -39,7 +39,7 @@ class MainApp: public QMainWindow, public naviapi::NavicoreListener
int FillResultList(std::vector<Business> & list, int focusIndex = 0);
void SetWayPoints(uint32_t myRoute);
- naviapi::Navicore naviapi;
+ naviapi::Navicore naviapi;
QNetworkAccessManager networkManager;
QPushButton searchBtn;
QLineEdit lineEdit;
@@ -68,9 +68,9 @@ class MainApp: public QMainWindow, public naviapi::NavicoreListener
public:
void getAllSessions_reply(const std::map< uint32_t, std::string >& allSessions);
- void getPosition_reply(std::map< int32_t, naviapi::variant > position);
- void getAllRoutes_reply(std::vector< uint32_t > allRoutes);
- void createRoute_reply(uint32_t routeHandle);
+ void getPosition_reply(std::map< int32_t, naviapi::variant > position);
+ void getAllRoutes_reply(std::vector< uint32_t > allRoutes);
+ void createRoute_reply(uint32_t routeHandle);
private slots:
void searchBtnClicked();
diff --git a/main.cpp b/main.cpp
index a43e37b..77e910f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -18,7 +18,7 @@ MainApp *mainapp;
void SyncDrawHandler(json_object *object)
{
- qwm->endDraw(graphic_role);
+ qwm->endDraw(graphic_role);
}
void TapShortcutHandler(json_object *object)
@@ -33,12 +33,12 @@ int main(int argc, char *argv[], char *env[])
QString credentialsFile(DEFAULT_CREDENTIALS_FILE);
qwm = new QLibWindowmanager();
hs = new LibHomeScreen();
- graphic_role = QString("poi");
+ graphic_role = QString("poi");
- QString pt = QString(argv[1]);
- int port = pt.toInt();
- QString secret = QString(argv[2]);
- std::string token = secret.toStdString();
+ QString pt = QString(argv[1]);
+ int port = pt.toInt();
+ QString secret = QString(argv[2]);
+ std::string token = secret.toStdString();
if (qwm->init(port, secret) != 0) {
exit(EXIT_FAILURE);
@@ -49,13 +49,13 @@ int main(int argc, char *argv[], char *env[])
exit(EXIT_FAILURE);
}
- qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, SyncDrawHandler);
+ qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, SyncDrawHandler);
mainapp = new MainApp();
- hs->init(port, token.c_str());
+ hs->init(port, token.c_str());
- hs->set_event_handler(LibHomeScreen::Event_TapShortcut, TapShortcutHandler);
+ hs->set_event_handler(LibHomeScreen::Event_TapShortcut, TapShortcutHandler);
//force setting
mainapp->setInfoScreen(true);
@@ -81,7 +81,7 @@ int main(int argc, char *argv[], char *env[])
if (mainapp->StartMonitoringUserInput() < 0)
return -1;
- qwm->activateWindow(graphic_role);
+ qwm->activateWindow(graphic_role);
/* main loop: */
return a.exec();