From c1d993b1577686cd390a2621afb9fc7872abc476 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Mon, 23 Jun 2014 01:40:52 +1000 Subject: [PATCH] Suppress layout warning, force purge for windows test build --- sleepyhead/SleepLib/loader_plugins/icon_loader.h | 2 +- sleepyhead/SleepLib/loader_plugins/intellipap_loader.h | 2 +- sleepyhead/SleepLib/loader_plugins/prs1_loader.h | 2 +- sleepyhead/mainwindow.cpp | 3 ++- sleepyhead/overview.cpp | 2 +- sleepyhead/oximetry.cpp | 4 ++-- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sleepyhead/SleepLib/loader_plugins/icon_loader.h b/sleepyhead/SleepLib/loader_plugins/icon_loader.h index eeaa3016..8ff81143 100644 --- a/sleepyhead/SleepLib/loader_plugins/icon_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/icon_loader.h @@ -23,7 +23,7 @@ //******************************************************************************************** // Please INCREMENT the following value when making changes to this loaders implementation. // -const int fpicon_data_version = 2; +const int fpicon_data_version = 3; // //******************************************************************************************** diff --git a/sleepyhead/SleepLib/loader_plugins/intellipap_loader.h b/sleepyhead/SleepLib/loader_plugins/intellipap_loader.h index 7a55e497..1a9ad4bb 100644 --- a/sleepyhead/SleepLib/loader_plugins/intellipap_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/intellipap_loader.h @@ -22,7 +22,7 @@ //******************************************************************************************** // Please INCREMENT the following value when making changes to this loaders implementation. // -const int intellipap_data_version = 2; +const int intellipap_data_version = 3; // //******************************************************************************************** diff --git a/sleepyhead/SleepLib/loader_plugins/prs1_loader.h b/sleepyhead/SleepLib/loader_plugins/prs1_loader.h index b18a2259..601576b2 100644 --- a/sleepyhead/SleepLib/loader_plugins/prs1_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/prs1_loader.h @@ -23,7 +23,7 @@ //******************************************************************************************** // Please INCREMENT the following value when making changes to this loaders implementation. // -const int prs1_data_version = 11; +const int prs1_data_version = 12; // //******************************************************************************************** diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp index 49fec450..d0c7158a 100644 --- a/sleepyhead/mainwindow.cpp +++ b/sleepyhead/mainwindow.cpp @@ -1170,7 +1170,8 @@ void MainWindow::on_action_About_triggered() aboutbox.setWindowTitle(QObject::tr("About SleepyHead")); - QVBoxLayout layout(&aboutbox); + QVBoxLayout layout; + aboutbox.setLayout(&layout); QWebView webview(&aboutbox); diff --git a/sleepyhead/overview.cpp b/sleepyhead/overview.cpp index 8efa5d1a..6f256daa 100644 --- a/sleepyhead/overview.cpp +++ b/sleepyhead/overview.cpp @@ -69,7 +69,7 @@ Overview::Overview(QWidget *parent, gGraphView *shared) : connect(ui->dateEnd->calendarWidget(), SIGNAL(currentPageChanged(int, int)), SLOT(dateEnd_currentPageChanged(int, int))); - QVBoxLayout *framelayout = new QVBoxLayout(ui->graphArea); + QVBoxLayout *framelayout = new QVBoxLayout; ui->graphArea->setLayout(framelayout); QFrame *border = new QFrame(ui->graphArea); diff --git a/sleepyhead/oximetry.cpp b/sleepyhead/oximetry.cpp index ab3d1594..97f160cc 100644 --- a/sleepyhead/oximetry.cpp +++ b/sleepyhead/oximetry.cpp @@ -1155,7 +1155,7 @@ Oximetry::Oximetry(QWidget *parent, gGraphView *shared) : day = new Day(oximeter->getMachine()); - QVBoxLayout *framelayout = new QVBoxLayout(ui->graphArea); + QVBoxLayout *framelayout = new QVBoxLayout; ui->graphArea->setLayout(framelayout); QFrame *border = new QFrame(ui->graphArea); @@ -1165,7 +1165,7 @@ Oximetry::Oximetry(QWidget *parent, gGraphView *shared) : framelayout->addWidget(border,1); - layout = new QHBoxLayout(ui->graphArea); + layout = new QHBoxLayout; layout->setSpacing(0); layout->setMargin(0); layout->setContentsMargins(0, 0, 0, 0);