From 40fa148548f001ce8a4a1fa250b31b618f8b50d4 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Fri, 29 Dec 2017 12:05:34 +0100 Subject: Replace BEHAVIOR macro by initializer lists The macro BEHAVIOR expanded to "QList()". This was used to generate temporary QLists with constructs such as BEHAVIOR << COLLAPSED << EXPANDED Instead, simply use initializer lists such as {COLLAPSED, EXPANDED} Signed-off-by: Berthold Stoeger --- desktop-widgets/mainwindow.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 4c9cc097c..bbccdc064 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -1115,8 +1115,6 @@ void MainWindow::on_actionYearlyStatistics_triggered() d.exec(); } -#define BEHAVIOR QList() - void MainWindow::toggleCollapsible(bool toggle) { ui.mainSplitter->setCollapsible(0, toggle); @@ -1131,34 +1129,33 @@ void MainWindow::on_actionViewList_triggered() { toggleCollapsible(true); beginChangeState(LIST_MAXIMIZED); - ui.mainSplitter->setSizes(BEHAVIOR << COLLAPSED << EXPANDED); - ui.bottomSplitter->setSizes(BEHAVIOR << EXPANDED << COLLAPSED); + ui.mainSplitter->setSizes({ COLLAPSED, EXPANDED }); + ui.bottomSplitter->setSizes({ EXPANDED, COLLAPSED }); } void MainWindow::on_actionViewProfile_triggered() { toggleCollapsible(true); beginChangeState(PROFILE_MAXIMIZED); - ui.topSplitter->setSizes(BEHAVIOR << COLLAPSED << EXPANDED); - ui.mainSplitter->setSizes(BEHAVIOR << EXPANDED << COLLAPSED); + ui.topSplitter->setSizes({ COLLAPSED, EXPANDED }); + ui.mainSplitter->setSizes({ EXPANDED, COLLAPSED }); } void MainWindow::on_actionViewInfo_triggered() { toggleCollapsible(true); beginChangeState(INFO_MAXIMIZED); - ui.topSplitter->setSizes(BEHAVIOR << EXPANDED << COLLAPSED); - ui.mainSplitter->setSizes(BEHAVIOR << EXPANDED << COLLAPSED); + ui.topSplitter->setSizes({ EXPANDED, COLLAPSED }); + ui.mainSplitter->setSizes({ EXPANDED, COLLAPSED }); } void MainWindow::on_actionViewMap_triggered() { toggleCollapsible(true); beginChangeState(MAP_MAXIMIZED); - ui.mainSplitter->setSizes(BEHAVIOR << COLLAPSED << EXPANDED); - ui.bottomSplitter->setSizes(BEHAVIOR << COLLAPSED << EXPANDED); + ui.mainSplitter->setSizes({ COLLAPSED, EXPANDED }); + ui.bottomSplitter->setSizes({ COLLAPSED, EXPANDED }); } -#undef BEHAVIOR void MainWindow::on_actionViewAll_triggered() { -- cgit v1.2.3-70-g09d2