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

Whitespace cleanup main/helper files

Browse source 
Again, entirely script based.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-07-25 18:36:40 -07:00 • committed by Lubomir I. Ivanov
parent afe7e847d6
commit 00c0f94d8c
3 changed files with 41 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
subsurface-desktop-main.cpp
View file

@ -2,28 +2,28 @@
/* main.c */ /* main.c */
#include <locale.h> #include <locale.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <time.h> #include <time.h>
#include "core/color.h"
#include "core/downloadfromdcthread.h" // for fill_computer_list
#include "core/qt-gui.h" #include "core/qt-gui.h"
#include "core/qthelper.h"
#include "core/subsurfacestartup.h" #include "core/subsurfacestartup.h"
#include "desktop-widgets/diveplanner.h"
#include "desktop-widgets/mainwindow.h" #include "desktop-widgets/mainwindow.h"
#include "desktop-widgets/preferences/preferencesdialog.h"
#include "desktop-widgets/tab-widgets/maintab.h" #include "desktop-widgets/tab-widgets/maintab.h"
#include "profile-widget/profilewidget2.h" #include "profile-widget/profilewidget2.h"
#include "desktop-widgets/preferences/preferencesdialog.h"
#include "desktop-widgets/diveplanner.h"
#include "core/color.h"
#include "core/qthelper.h"
#include "core/downloadfromdcthread.h" // for fill_computer_list
#include <QStringList>
#include <QApplication> #include <QApplication>
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QOpenGLContext>
#include <QOffscreenSurface> #include <QOffscreenSurface>
#include <QOpenGLContext>
#include <QOpenGLFunctions> #include <QOpenGLFunctions>
#include <QQuickWindow> #include <QQuickWindow>
#include <QStringList>
#include <git2.h> #include <git2.h>
static bool filesOnCommandLine = false; static bool filesOnCommandLine = false;
@ -138,8 +138,10 @@ void validateGL()
*/ */
if (!quickBackend.isEmpty()) { if (!quickBackend.isEmpty()) {
if (verbose) { if (verbose) {
qDebug() << QStringLiteral(VALIDATE_GL_PREFIX "'QT_QUICK_BACKEND' is set to '%1'. " qDebug() << QStringLiteral(VALIDATE_GL_PREFIX
"Skipping validation.").arg(quickBackend); "'QT_QUICK_BACKEND' is set to '%1'. "
"Skipping validation.")
.arg(quickBackend);
} }
return; return;
} }
@ -171,7 +173,8 @@ void validateGL()
if (verChar) { if (verChar) {
// detect GLES, show a warning and return early as we don't handle it's versioning // detect GLES, show a warning and return early as we don't handle it's versioning
if (strstr(verChar, " ES ") != NULL) { if (strstr(verChar, " ES ") != NULL) {
qWarning() << QStringLiteral(VALIDATE_GL_PREFIX "WARNING: Detected OpenGL ES!\n" qWarning() << QStringLiteral(VALIDATE_GL_PREFIX
"WARNING: Detected OpenGL ES!\n"
"Attempting to run with the available profile!\n" "Attempting to run with the available profile!\n"
"If this fails try manually setting the environment variable\n" "If this fails try manually setting the environment variable\n"
"'QT_QUICK_BACKEND' with the value of 'software'\n" "'QT_QUICK_BACKEND' with the value of 'software'\n"
@ -205,10 +208,12 @@ exit:
surface.destroy(); surface.destroy();
if (glError) { if (glError) {
#if QT_VERSION < QT_VERSION_CHECK(5, 8, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 8, 0)
qWarning() << QStringLiteral(VALIDATE_GL_PREFIX "ERROR: %1.\n" qWarning() << QStringLiteral(VALIDATE_GL_PREFIX
"ERROR: %1.\n"
"Cannot automatically fallback to a software renderer!\n" "Cannot automatically fallback to a software renderer!\n"
"Set the environment variable 'QT_QUICK_BACKEND' with the value of 'software'\n" "Set the environment variable 'QT_QUICK_BACKEND' with the value of 'software'\n"
"before running Subsurface!\n").arg(glError); "before running Subsurface!\n")
.arg(glError);
exit(0); exit(0);
#else #else
qWarning() << QStringLiteral(VALIDATE_GL_PREFIX "WARNING: %1. Using a software renderer!").arg(glError); qWarning() << QStringLiteral(VALIDATE_GL_PREFIX "WARNING: %1. Using a software renderer!").arg(glError);

23
subsurface-mobile-main.cpp
View file

@ -2,20 +2,20 @@
/* main.c */ /* main.c */
#include <locale.h> #include <locale.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <time.h> #include <time.h>
#include "core/qt-gui.h"
#include "core/subsurfacestartup.h"
#include "core/color.h" #include "core/color.h"
#include "core/qthelper.h"
#include "core/downloadfromdcthread.h" #include "core/downloadfromdcthread.h"
#include "core/qt-gui.h"
#include "core/qthelper.h"
#include "core/subsurfacestartup.h"
#include <QStringList>
#include <QApplication> #include <QApplication>
#include <QLoggingCategory>
#include <QLocale> #include <QLocale>
#include <QLoggingCategory>
#include <QStringList>
#include <git2.h> #include <git2.h>
// Implementation of STP logging // Implementation of STP logging
@ -38,10 +38,10 @@ void log_stp(const char *ident, QString *buf)
stpDuration.start(); stpDuration.start();
} }
if (ident) if (ident)
stpText += QString("STP ") \ stpText += QString("STP ")
.append(QString::number(stpDuration.elapsed())) \ .append(QString::number(stpDuration.elapsed()))
.append(" ms, ") \ .append(" ms, ")
.append(ident) \ .append(ident)
.append("\n"); .append("\n");
if (buf) { if (buf) {
*buf += "---------- startup timer ----------\n"; *buf += "---------- startup timer ----------\n";
@ -115,7 +115,8 @@ int main(int argc, char **argv)
return 0; return 0;
} }
void set_non_bt_addresses() { void set_non_bt_addresses()
{
#if defined(Q_OS_ANDROID) #if defined(Q_OS_ANDROID)
connectionListModel.addAddress("FTDI"); connectionListModel.addAddress("FTDI");
#elif defined(Q_OS_LINUX) // since this is in the else, it does NOT include Android #elif defined(Q_OS_LINUX) // since this is in the else, it does NOT include Android