chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 18:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Windows build fix

Browse Source
This commit is contained in:
Mark Watkins 2014-06-23 01:14:46 +10:00
parent 9d6ac34025
commit d6d6780cdc
5 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sleepyhead/SleepLib/loader_plugins/icon_loader.cpp
View File

@ -502,7 +502,7 @@ bool FPIconLoader::OpenFLW(Machine *mach, QString filename, Profile *profile)
do { do {
sit--; sit--;
s1 = sit.value(); s1 = sit.value();
qint64 z = qAbs(sit.key() - ts); qint64 z = qAbs(qint64(sit.key()) - qint64(ts));
if (z < 3600) { if (z < 3600) {
if ((k < 0) || (k > z)) { if ((k < 0) || (k > z)) {
k = z; k = z;

4
sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -1251,10 +1251,6 @@ int ResmedLoader::Open(QString path, Profile *profile)
for (it = strsess.begin(); it != end; ++it) { for (it = strsess.begin(); it != end; ++it) {
STRRecord & R = it.value(); STRRecord & R = it.value();
if (R.date == QDate(2013,6,20)) {
int i=5;
}
if (ignoreold && (R.maskon < ignoreolder)) { if (ignoreold && (R.maskon < ignoreolder)) {
m->skipSaveTask(); m->skipSaveTask();
continue; continue;

4
sleepyhead/SleepLib/machine_loader.cpp
View File

@ -135,10 +135,6 @@ void MachineLoader::runTasks(bool threaded)
while (!m_tasklist.isEmpty()) { while (!m_tasklist.isEmpty()) {
if (threadpool->tryStart(m_tasklist.at(0))) { if (threadpool->tryStart(m_tasklist.at(0))) {
m_tasklist.pop_front(); m_tasklist.pop_front();
if (m_tasklist.isEmpty()) {
int i=5;
}
float f = float(m_currenttask) / float(m_totaltasks) * 100.0; float f = float(m_currenttask) / float(m_totaltasks) * 100.0;
qprogress->setValue(f); qprogress->setValue(f);
m_currenttask++; m_currenttask++;

2
sleepyhead/logger.cpp
View File

@ -116,7 +116,7 @@ void LogThread::run()
running = true; running = true;
do { do {
strlock.lock(); strlock.lock();
int r = receivers(SIGNAL(outputLog(QString()))); //int r = receivers(SIGNAL(outputLog(QString())));
while (!buffer.isEmpty()) { while (!buffer.isEmpty()) {
QString msg = buffer.takeFirst(); QString msg = buffer.takeFirst();
fprintf(stderr, "%s\n", msg.toLocal8Bit().data()); fprintf(stderr, "%s\n", msg.toLocal8Bit().data());

2
sleepyhead/main.cpp
View File

@ -139,7 +139,7 @@ int main(int argc, char *argv[])
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
bool angle_supported = getGraphicsEngine().contains(CSTR_GFX_ANGLE, Qt::CaseInsensitive) && (QSysInfo::windowsVersion() >= QSysInfo::WV_VISTA); bool angle_supported = getGraphicsEngine().contains(CSTR_GFX_ANGLE, Qt::CaseInsensitive) && (QSysInfo::windowsVersion() >= QSysInfo::WV_VISTA);
if (bad_graphics) { if (bad_graphics) {
bad_graphics = !angle_supported bad_graphics = !angle_supported;
} }
#endif #endif