Location service: consistent way to output information

qDebug is nice when testing on the desktop, but it has to go to the
message area on an Android device to make things easy.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-11-11 11:16:59 -08:00
parent 9195f247c4
commit e7b2f04bec
4 changed files with 28 additions and 17 deletions

View file

@ -9,7 +9,7 @@
#include "qthelper.h"
#include "qt-gui.h"
static void showMessage(const char *errorString)
void qmlUiShowMessage(const char *errorString)
{
if (qqWindowObject && !qqWindowObject->setProperty("messageText", QVariant(errorString)))
qDebug() << "couldn't set property messageText to" << errorString;
@ -55,11 +55,11 @@ void QMLManager::savePreferences()
void QMLManager::loadDives()
{
showMessage("Loading dives...");
qmlUiShowMessage("Loading dives...");
appendTextToLog("Loading dives...");
QString url;
if (getCloudURL(url)) {
showMessage(get_error_string());
qmlUiShowMessage(get_error_string());
appendTextToLog(get_error_string());
return;
}
@ -69,12 +69,12 @@ void QMLManager::loadDives()
int error = parse_file(fileNamePrt.data());
if (!error) {
report_error("filename is now %s", fileNamePrt.data());
showMessage(get_error_string());
qmlUiShowMessage(get_error_string());
appendTextToLog(get_error_string());
set_filename(fileNamePrt.data(), true);
appendTextToLog(fileNamePrt.data());
} else {
showMessage(get_error_string());
qmlUiShowMessage(get_error_string());
appendTextToLog(get_error_string());
}
process_dives(false, false);
@ -116,21 +116,21 @@ void QMLManager::commitChanges(QString diveId, QString suit, QString buddy, QStr
void QMLManager::saveChanges()
{
showMessage("Saving dives.");
qmlUiShowMessage("Saving dives.");
QString fileName;
if (getCloudURL(fileName)) {
showMessage(get_error_string());
qmlUiShowMessage(get_error_string());
appendTextToLog(get_error_string());
return;
}
if (save_dives(fileName.toUtf8().data())) {
showMessage(get_error_string());
qmlUiShowMessage(get_error_string());
appendTextToLog(get_error_string());
return;
}
showMessage("Dives saved.");
qmlUiShowMessage("Dives saved.");
appendTextToLog("Dive saved.");
set_filename(fileName.toUtf8().data(), true);
mark_divelist_changed(false);
@ -138,7 +138,7 @@ void QMLManager::saveChanges()
void QMLManager::addDive()
{
showMessage("Adding new dive.");
qmlUiShowMessage("Adding new dive.");
appendTextToLog("Adding new dive.");
DiveListModel::instance()->startAddDive();
}