osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Rewrite the layout case statement as two separate ones, grouping and using 

fallthrough to reduce the amount of duplication.

svn path=/trunk/; revision=52398
This commit is contained in:
Evan Huus 2013-10-06 13:22:12 +00:00
parent e0cc11c92b
commit 0faf9a0840
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ui/qt/main_window_slots.cpp
View File

@ -226,46 +226,43 @@ void MainWindow::layoutPanes()
extra_split_.setParent(main_ui_->mainStack);
switch(prefs.gui_layout_type) {
case(layout_type_2):
case(layout_type_1):
extra_split_.setOrientation(Qt::Horizontal);
case(layout_type_5):
master_split_.setOrientation(Qt::Vertical);
break;
case(layout_type_4):
case(layout_type_3):
extra_split_.setOrientation(Qt::Vertical);
case(layout_type_6):
master_split_.setOrientation(Qt::Horizontal);
break;
default:
g_assert_not_reached();
}
switch(prefs.gui_layout_type) {
case(layout_type_5):
case(layout_type_6):
parents[0] = &master_split_;
parents[1] = &master_split_;
parents[2] = &master_split_;
break;
case(layout_type_2):
master_split_.setOrientation(Qt::Vertical);
extra_split_.setOrientation(Qt::Horizontal);
case(layout_type_4):
parents[0] = &master_split_;
parents[1] = &extra_split_;
parents[2] = &extra_split_;
break;
case(layout_type_1):
master_split_.setOrientation(Qt::Vertical);
extra_split_.setOrientation(Qt::Horizontal);
parents[0] = &extra_split_;
parents[1] = &extra_split_;
parents[2] = &master_split_;
break;
case(layout_type_4):
master_split_.setOrientation(Qt::Horizontal);
extra_split_.setOrientation(Qt::Vertical);
parents[0] = &master_split_;
parents[1] = &extra_split_;
parents[2] = &extra_split_;
break;
case(layout_type_3):
master_split_.setOrientation(Qt::Horizontal);
extra_split_.setOrientation(Qt::Vertical);
parents[0] = &extra_split_;
parents[1] = &extra_split_;
parents[2] = &master_split_;
break;
case(layout_type_6):
master_split_.setOrientation(Qt::Horizontal);
parents[0] = &master_split_;
parents[1] = &master_split_;
parents[2] = &master_split_;
break;
default:
g_assert_not_reached();
}