From 24b6a2845df2ea9bcea22e7672ff9ef3c30fbd73 Mon Sep 17 00:00:00 2001 From: Guido Ranzuglia granzuglia Date: Mon, 17 Sep 2012 10:18:36 +0000 Subject: [PATCH] removed compiler time errors --- src/meshlab/additionalgui.cpp | 4 ++++ src/meshlab/mainwindow_Init.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/meshlab/additionalgui.cpp b/src/meshlab/additionalgui.cpp index 1263779d7..66725b637 100644 --- a/src/meshlab/additionalgui.cpp +++ b/src/meshlab/additionalgui.cpp @@ -851,7 +851,9 @@ void SearchMenu::updateGUI( const QList& results ) } if (oldact->isSeparator() || !results.contains(oldact)) + { delsepremact.push_back(oldact); + } } } if (!maybeallequal) @@ -865,7 +867,9 @@ void SearchMenu::updateGUI( const QList& results ) delsepremact[jj] = NULL; } else + { removeAction(todel); + } } addActions(results); //if (results.size() > 0 && (results[0] != NULL)) diff --git a/src/meshlab/mainwindow_Init.cpp b/src/meshlab/mainwindow_Init.cpp index 7ca95b2e0..784dac394 100644 --- a/src/meshlab/mainwindow_Init.cpp +++ b/src/meshlab/mainwindow_Init.cpp @@ -501,7 +501,7 @@ void MainWindow::createToolBars() searchButton->setPopupMode(QToolButton::InstantPopup); searchButton->setIcon(QIcon(":/images/search.png")); searchToolBar->addWidget(searchButton); - SearchMenu* ser = new SearchMenu(wama,20,searchButton); + SearchMenu* ser = new SearchMenu(wama,15,searchButton); searchButton->setMenu(ser); connect(searchShortCut,SIGNAL(activated()),searchButton,SLOT(showMenu())); }