From 39ff26f42843c834d0ea2dc714019fe3e50e6dc0 Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Sun, 2 Dec 2012 15:08:31 +0000 Subject: [PATCH] Removed a bunch of harmless warnings --- src/meshlab/additionalgui.cpp | 3 +-- src/meshlab/glarea.cpp | 6 ++---- src/meshlab/glarea.h | 2 +- src/meshlab/mainwindow_Init.cpp | 3 +-- src/meshlabplugins/decorate_shadow/decorate_shadow.h | 2 +- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/meshlab/additionalgui.cpp b/src/meshlab/additionalgui.cpp index 741ee1754..239dc184d 100644 --- a/src/meshlab/additionalgui.cpp +++ b/src/meshlab/additionalgui.cpp @@ -356,7 +356,6 @@ void MLScriptEditor::lineNumberAreaPaintEvent( QPaintEvent *event,const QColor& QPainter painter(narea); painter.fillRect(event->rect(),col); QTextBlock block = firstVisibleBlock(); - int indent = block.blockFormat().indent(); int blockNumber = block.blockNumber(); int top = (int) blockBoundingGeometry(block).translated(contentOffset()).top(); int bottom = top + (int) blockBoundingRect(block).height(); @@ -900,7 +899,7 @@ void SearchMenu::clearResults() void SearchMenu::setLineEditFocus() { searchline->setFocus(); - const QList& acts = actions(); +// const QList& acts = actions(); //if (acts.size() > 1 && acts[1] != NULL) // setActiveAction(acts[1]); } diff --git a/src/meshlab/glarea.cpp b/src/meshlab/glarea.cpp index d2dab274b..7fcc60cff 100644 --- a/src/meshlab/glarea.cpp +++ b/src/meshlab/glarea.cpp @@ -457,8 +457,7 @@ void GLArea::paintEvent(QPaintEvent */*event*/) if (takeSnapTile) pasteTile(); // Finally display HELP if requested - if (isHelpVisible()) - displayHelp(&painter); + if (isHelpVisible()) displayHelp(); // Draw the log area background // on the bottom of the glArea @@ -680,7 +679,7 @@ void GLArea::displayViewerHighlight() } -void GLArea::displayHelp(QPainter *painter) +void GLArea::displayHelp() { static QString tableText; if(tableText.isEmpty()) @@ -762,7 +761,6 @@ void GLArea::updateAllPerMeshDecorators() QMap >::iterator i; for ( i = iPerMeshDecoratorsListMap.begin(); i != iPerMeshDecoratorsListMap.end(); ++i ) { - MeshModel * mm = md()->getMesh(i.key()); QList &iDecoratorsList = i.value(); foreach(QAction *p , iDecoratorsList) { diff --git a/src/meshlab/glarea.h b/src/meshlab/glarea.h index 3ac2ed72b..f93963050 100644 --- a/src/meshlab/glarea.h +++ b/src/meshlab/glarea.h @@ -263,7 +263,7 @@ protected: void displayMatrix(QPainter *painter, QRect areaRect); void displayViewerHighlight(); - void displayHelp(QPainter *painter); + void displayHelp(); QString GetMeshInfoString(); void paintEvent(QPaintEvent *event); diff --git a/src/meshlab/mainwindow_Init.cpp b/src/meshlab/mainwindow_Init.cpp index 7cb8b4901..552c2ae3a 100644 --- a/src/meshlab/mainwindow_Init.cpp +++ b/src/meshlab/mainwindow_Init.cpp @@ -46,7 +46,7 @@ QProgressBar *MainWindow::qb; MainWindow::MainWindow() -:wama(),xmlfiltertimer() +:xmlfiltertimer(),wama() { //xmlfiltertimer will be called repeatedly, so like Qt documentation suggests, the first time start function should be called. //Subsequently restart function will be invoked. @@ -672,7 +672,6 @@ void MainWindow::initSearchEngine() void MainWindow::initMenuForSearching(QMenu* menu) { - int actwidth = 0; if (menu == NULL) return; const QList& acts = menu->actions(); diff --git a/src/meshlabplugins/decorate_shadow/decorate_shadow.h b/src/meshlabplugins/decorate_shadow/decorate_shadow.h index 633cdec2a..28185881e 100644 --- a/src/meshlabplugins/decorate_shadow/decorate_shadow.h +++ b/src/meshlabplugins/decorate_shadow/decorate_shadow.h @@ -83,7 +83,7 @@ public: QList actions () const {return actionList;} bool startDecorate(QAction * /*mode*/, MeshDocument &/*m*/, RichParameterSet * /*parent*/ par, GLArea * /*parent*/); - void decorateMesh(QAction *a, MeshModel &m, RichParameterSet *, GLArea *gla, QPainter *p, GLLogStream &){} + void decorateMesh(QAction *, MeshModel &, RichParameterSet *, GLArea *, QPainter *, GLLogStream &){} void decorateDoc(QAction *a, MeshDocument &m, RichParameterSet *, GLArea *gla, QPainter *p, GLLogStream &); void initGlobalParameterSet(QAction *, RichParameterSet & globalparam); int getDecorationClass(QAction */*action*/) const { return MeshDecorateInterface::PerDocument; }