songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4857 from lrineau/Polyhedron-demo__fix_runtime_warning-GF 

3D demo MainWindow.cpp: Reimplement addActionToMenu with standard algorithms
This commit is contained in:
Laurent Rineau 2020-07-23 17:15:11 +02:00
parent c788d66761 49e3dc41a6
commit 71368f3d0b
1 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Polyhedron/demo/Polyhedron/MainWindow.cpp
View File

@ -409,33 +409,19 @@ MainWindow::MainWindow(const QStringList &keywords, bool verbose, QWidget* paren
void addActionToMenu(QAction* action, QMenu* menu)
{
bool added = false;
QString atxt = action->text().remove("&");
if(atxt.isEmpty())
return;
for(QAction* it : menu->actions())
{
QString btxt = it->text().remove("&");
int i = 0;
if(btxt.isEmpty())
{
continue;
}
while(i < atxt.size()
&& i < btxt.size()
&& atxt[i] == btxt[i])
++i;
bool res = (i == atxt.size() || i == btxt.size() || atxt[i] < btxt[i]);
if (res)
{
menu->insertAction(it, action);
added = true;
break;
}
}
if(!added)
auto actions = menu->actions();
auto it = std::lower_bound(actions.begin(), actions.end(),
action->text().remove("&"),
[](QAction* a, QString text) {
return a->text().remove("&").compare(text) < 0;
});
if(it == actions.end()) {
menu->addAction(action);
}
else {
menu->insertAction(*it, action);
}
}
//Recursive function that do a pass over a menu and its sub-menus(etc.) and hide them when they are empty
void filterMenuOperations(QMenu* menu, QString filter, bool keep_from_here)