X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=MainApp.cpp;h=cbf6d576fc4b675730617fc435819d8b8a5fe84a;hb=0d6fc382050f1f2efa10ff00e34a18706a350a4e;hp=4bb10ba99ed16e2978918d6b3e562c20d717a571;hpb=b7a28bd083843eb35790f351418f6fccdeed9aa4;p=apps%2Fpoi-yelp.git diff --git a/MainApp.cpp b/MainApp.cpp index 4bb10ba..cbf6d57 100644 --- a/MainApp.cpp +++ b/MainApp.cpp @@ -98,7 +98,6 @@ MainApp::MainApp():QMainWindow(Q_NULLPTR, Qt::FramelessWindowHint), if (getenv("AGL_NAVI")) isAglNavi = true; - connect(this, SIGNAL(allSessionsGotSignal()), this, SLOT(allSessionsGot())); connect(this, SIGNAL(positionGotSignal()), this, SLOT(positionGot())); connect(this, SIGNAL(allRoutesGotSignal()), this, SLOT(allRoutesGot())); connect(this, SIGNAL(routeCreatedSignal()), this, SLOT(routeCreated())); @@ -638,36 +637,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; - } + 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'; + buflen = reply->read(buf, BIG_BUFFER_SIZE-1); + buf[buflen] = '\0'; - if (buflen == 0) - { - mutex.unlock(); - return; - } + if (buflen == 0) + { + mutex.unlock(); + return; + } - currentIndex = 0; - Businesses.clear(); - ParseJsonBusinessList(buf, Businesses); - DisplayResultList(true); - FillResultList(Businesses); + 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(); @@ -869,8 +868,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() @@ -931,8 +930,6 @@ void MainApp::getAllSessions_reply(const std::map< uint32_t, std::string >& allS TRACE_INFO("Current session: %d", this->navicoreSession); mutex.unlock(); - - emit allSessionsGotSignal(); } @@ -989,15 +986,6 @@ void MainApp::createRoute_reply(uint32_t routeHandle) emit routeCreatedSignal(); } -void MainApp::allSessionsGot() -{ - mutex.lock(); - - // nothing to do - - mutex.unlock(); -} - void MainApp::positionGot() { mutex.lock();