sorted everything

This commit is contained in:
Dorian Zedler 2018-07-28 23:05:26 +02:00
parent 90adc6bc0a
commit 2caab42745
17 changed files with 20 additions and 20 deletions

View file

@ -145,7 +145,7 @@ Window {
SoundEffect { SoundEffect {
//start sound //start sound
id: startSound id: startSound
source: "OFFICAL_IFSC_STARTIGNAL.wav" source: "qrc:/sounds/OFFICAL_IFSC_STARTIGNAL.wav"
onPlayingChanged: { onPlayingChanged: {
if(!playing){ if(!playing){

View file

@ -1,6 +1,5 @@
<RCC> <RCC>
<qresource prefix="/"> <qresource prefix="/">
<file>OFFICAL_IFSC_STARTIGNAL.wav</file>
<file>graphics/icons/settings.png</file> <file>graphics/icons/settings.png</file>
<file>graphics/icons/user.png</file> <file>graphics/icons/user.png</file>
<file>graphics/icons/menu_black.png</file> <file>graphics/icons/menu_black.png</file>
@ -9,6 +8,7 @@
<file>graphics/icons/menu.png</file> <file>graphics/icons/menu.png</file>
<file>graphics/icons/drawer.png</file> <file>graphics/icons/drawer.png</file>
<file>graphics/icons/back.png</file> <file>graphics/icons/back.png</file>
<file>sounds/OFFICAL_IFSC_STARTIGNAL.wav</file>
<file>sounds/ready_1.wav</file> <file>sounds/ready_1.wav</file>
<file>sounds/at_marks_1.wav</file> <file>sounds/at_marks_1.wav</file>
<file>sounds/ready_2.wav</file> <file>sounds/ready_2.wav</file>

View file

@ -1,4 +1,4 @@
#include "appsettings.h" #include "headers/appsettings.h"
AppSettings::AppSettings(QObject* parent) AppSettings::AppSettings(QObject* parent)
:QObject(parent) :QObject(parent)

View file

@ -1,4 +1,4 @@
#include "buzzerconn.h" #include "headers/buzzerconn.h"
BuzzerConn::BuzzerConn(QObject *parent) : QObject(parent) BuzzerConn::BuzzerConn(QObject *parent) : QObject(parent)
{ {

View file

@ -31,10 +31,10 @@
#ifdef Q_OS_ANDROID #ifdef Q_OS_ANDROID
#include <QtAndroidExtras> #include <QtAndroidExtras>
#endif #endif
#include "sqlstoragemodel.h" #include "headers/sqlstoragemodel.h"
#include "sqlprofilemodel.h" #include "headers/sqlprofilemodel.h"
#include "buzzerconn.h" #include "headers/buzzerconn.h"
#include "appsettings.h" #include "headers/appsettings.h"
static void connectToDatabase() static void connectToDatabase()
{ {

View file

@ -1,4 +1,4 @@
#include "sqlprofilemodel.h" #include "headers/sqlprofilemodel.h"
static void createTable() static void createTable()
{ {

View file

@ -1,4 +1,4 @@
#include "sqlstoragemodel.h" #include "headers/sqlstoragemodel.h"
SqlStorageModel::SqlStorageModel(QObject *parent) : QObject(parent) SqlStorageModel::SqlStorageModel(QObject *parent) : QObject(parent)
{ {

View file

@ -19,13 +19,13 @@ DEFINES += QT_DEPRECATED_WARNINGS
TARGET = speedclimbing_stw TARGET = speedclimbing_stw
SOURCES += \ SOURCES += \
main.cpp \ sources/main.cpp \
sqlstoragemodel.cpp \ sources/sqlstoragemodel.cpp \
sqlprofilemodel.cpp \ sources/sqlprofilemodel.cpp \
buzzerconn.cpp \ sources/buzzerconn.cpp \
appsettings.cpp sources/appsettings.cpp
RESOURCES += qml.qrc \ RESOURCES += qml/qml.qrc \
shared.qrc shared.qrc
# Additional import path used to resolve QML modules in Qt Creator's code model # Additional import path used to resolve QML modules in Qt Creator's code model
@ -51,7 +51,7 @@ android {
} }
HEADERS += \ HEADERS += \
sqlstoragemodel.h \ headers/sqlstoragemodel.h \
sqlprofilemodel.h \ headers/sqlprofilemodel.h \
buzzerconn.h \ headers/buzzerconn.h \
appsettings.h headers/appsettings.h