Mercurial > hg > octave-lyh
diff libgui/src/files-dockwidget.cc @ 15368:36ececf69385
avoid some GCC warnings in the libgui code
* file-editor-interface.h, lexer-octave-gui.cc, main-window.cc,
settings-dialog.cc, workspace-model.cc, workspace-view.cc:
Avoid some shadowed variable, unused switch case, and C-style cast
warnings.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 12 Sep 2012 20:32:57 -0400 |
| parents | 501a9cc2c68f |
| children | 1e64aff609c3 |
line wrap: on
line diff
--- a/libgui/src/files-dockwidget.cc +++ b/libgui/src/files-dockwidget.cc @@ -34,8 +34,8 @@ #include <QProcess> #include <QDebug> -files_dock_widget::files_dock_widget (QWidget *parent) - : QDockWidget (parent) +files_dock_widget::files_dock_widget (QWidget *p) + : QDockWidget (p) { setObjectName ("FilesDockWidget"); setWindowTitle (tr ("Current Directory")); @@ -88,13 +88,12 @@ SLOT (item_double_clicked (const QModelIndex &))); // Layout the widgets vertically with the toolbar on top - QVBoxLayout * - layout = new QVBoxLayout (); - layout->setSpacing (0); - layout->addWidget (_navigation_tool_bar); - layout->addWidget (_file_tree_view); - layout->setMargin (1); - widget ()->setLayout (layout); + QVBoxLayout *vbox_layout = new QVBoxLayout (); + vbox_layout->setSpacing (0); + vbox_layout->addWidget (_navigation_tool_bar); + vbox_layout->addWidget (_file_tree_view); + vbox_layout->setMargin (1); + widget ()->setLayout (vbox_layout); // TODO: Add right-click contextual menus for copying, pasting, deleting files (and others) connect (_current_directory, SIGNAL (returnPressed ()), @@ -190,8 +189,8 @@ } void -files_dock_widget::closeEvent (QCloseEvent *event) +files_dock_widget::closeEvent (QCloseEvent *e) { emit active_changed (false); - QDockWidget::closeEvent (event); + QDockWidget::closeEvent (e); }