chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-17 11:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Suppress layout warning, force purge for windows test build

Browse Source
This commit is contained in:
Mark Watkins 2014-06-23 01:40:52 +10:00
parent d6d6780cdc
commit c1d993b157
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@
//******************************************************************************************** //********************************************************************************************
// Please INCREMENT the following value when making changes to this loaders implementation. // Please INCREMENT the following value when making changes to this loaders implementation.
// //
const int fpicon_data_version = 2; const int fpicon_data_version = 3;
// //
//******************************************************************************************** //********************************************************************************************

2
sleepyhead/SleepLib/loader_plugins/intellipap_loader.h
View File

@ -22,7 +22,7 @@
//******************************************************************************************** //********************************************************************************************
// Please INCREMENT the following value when making changes to this loaders implementation. // Please INCREMENT the following value when making changes to this loaders implementation.
// //
const int intellipap_data_version = 2; const int intellipap_data_version = 3;
// //
//******************************************************************************************** //********************************************************************************************

2
sleepyhead/SleepLib/loader_plugins/prs1_loader.h
View File

@ -23,7 +23,7 @@
//******************************************************************************************** //********************************************************************************************
// Please INCREMENT the following value when making changes to this loaders implementation. // Please INCREMENT the following value when making changes to this loaders implementation.
// //
const int prs1_data_version = 11; const int prs1_data_version = 12;
// //
//******************************************************************************************** //********************************************************************************************

3
sleepyhead/mainwindow.cpp
View File

@ -1170,7 +1170,8 @@ void MainWindow::on_action_About_triggered()
aboutbox.setWindowTitle(QObject::tr("About SleepyHead")); aboutbox.setWindowTitle(QObject::tr("About SleepyHead"));
QVBoxLayout layout(&aboutbox); QVBoxLayout layout;
aboutbox.setLayout(&layout);
QWebView webview(&aboutbox); QWebView webview(&aboutbox);

2
sleepyhead/overview.cpp
View File

@ -69,7 +69,7 @@ Overview::Overview(QWidget *parent, gGraphView *shared) :
connect(ui->dateEnd->calendarWidget(), SIGNAL(currentPageChanged(int, int)), connect(ui->dateEnd->calendarWidget(), SIGNAL(currentPageChanged(int, int)),
SLOT(dateEnd_currentPageChanged(int, int))); SLOT(dateEnd_currentPageChanged(int, int)));
QVBoxLayout *framelayout = new QVBoxLayout(ui->graphArea); QVBoxLayout *framelayout = new QVBoxLayout;
ui->graphArea->setLayout(framelayout); ui->graphArea->setLayout(framelayout);
QFrame *border = new QFrame(ui->graphArea); QFrame *border = new QFrame(ui->graphArea);

4
sleepyhead/oximetry.cpp
View File

@ -1155,7 +1155,7 @@ Oximetry::Oximetry(QWidget *parent, gGraphView *shared) :
day = new Day(oximeter->getMachine()); day = new Day(oximeter->getMachine());
QVBoxLayout *framelayout = new QVBoxLayout(ui->graphArea); QVBoxLayout *framelayout = new QVBoxLayout;
ui->graphArea->setLayout(framelayout); ui->graphArea->setLayout(framelayout);
QFrame *border = new QFrame(ui->graphArea); QFrame *border = new QFrame(ui->graphArea);
@ -1165,7 +1165,7 @@ Oximetry::Oximetry(QWidget *parent, gGraphView *shared) :
framelayout->addWidget(border,1); framelayout->addWidget(border,1);
layout = new QHBoxLayout(ui->graphArea); layout = new QHBoxLayout;
layout->setSpacing(0); layout->setSpacing(0);
layout->setMargin(0); layout->setMargin(0);
layout->setContentsMargins(0, 0, 0, 0); layout->setContentsMargins(0, 0, 0, 0);