mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use the same format for output to stderr and AppLog

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-04-04 10:57:44 -07:00
parent f7564c2b77
commit 9283332b95
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
qt-mobile/qmlmanager.cpp
View file

@ -45,8 +45,10 @@ extern "C" int gitProgressCB(int percent, const char *text)
if (self) { if (self) {
qint64 elapsed = timer.elapsed(); qint64 elapsed = timer.elapsed();
self->loadDiveProgress(percent); self->loadDiveProgress(percent);
self->appendTextToLog(QString::number(elapsed / 1000.0, 'f', 1) + " / " + QString::number((elapsed - lastTime) / 1000.0, 'f', 3) + QString logText = QString::number(elapsed / 1000.0, 'f', 1) + " / " + QString::number((elapsed - lastTime) / 1000.0, 'f', 3) +
QString(" : git progress %1 (%2)").arg(percent).arg(text)); QString(" : git progress %1 (%2)").arg(percent).arg(text);
self->appendTextToLog(logText);
qDebug() << logText;
qApp->processEvents(); qApp->processEvents();
qApp->flush(); qApp->flush();
lastTime = elapsed; lastTime = elapsed;
@ -96,6 +98,8 @@ void QMLManager::applicationStateChanged(Qt::ApplicationState state)
stateText.prepend(QString::number(timer.elapsed() / 1000.0,'f', 3) + ": AppState changed to "); stateText.prepend(QString::number(timer.elapsed() / 1000.0,'f', 3) + ": AppState changed to ");
stateText.append(" with "); stateText.append(" with ");
stateText.append((alreadySaving ? QLatin1Literal("") : QLatin1Literal("no ")) + QLatin1Literal("save ongoing")); stateText.append((alreadySaving ? QLatin1Literal("") : QLatin1Literal("no ")) + QLatin1Literal("save ongoing"));
stateText.append(" and ");
stateText.append((unsaved_changes() ? QLatin1Literal("") : QLatin1Literal("no ")) + QLatin1Literal("unsaved changes"));
appendTextToLog(stateText); appendTextToLog(stateText);
qDebug() << stateText; qDebug() << stateText;

2
subsurface-core/git-access.c
View file

@ -63,8 +63,6 @@ int git_storage_update_progress(int percent, const char *text)
int ret = 0; int ret = 0;
if (update_progress_cb) if (update_progress_cb)
ret = (*update_progress_cb)(percent, text); ret = (*update_progress_cb)(percent, text);
if (verbose)
fprintf(stderr, "git storage progress %d%% (%s)\n", percent, text);
return ret; return ret;
} }