Mercurial > octave-nkf
diff libgui/src/main-window.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 | eec0d1fcba4f |
line wrap: on
line diff
--- a/libgui/src/main-window.cc Wed Sep 12 16:34:39 2012 -0400 +++ b/libgui/src/main-window.cc Wed Sep 12 20:32:57 2012 -0400 @@ -41,8 +41,8 @@ #include "file-editor.h" #include "settings-dialog.h" -main_window::main_window (QWidget * parent) - : QMainWindow (parent), octave_event_observer () +main_window::main_window (QWidget *p) + : QMainWindow (p), octave_event_observer () { // We have to set up all our windows, before we finally launch octave. construct (); @@ -185,10 +185,10 @@ // FIXME -- what should happen if settings is 0? - QFont font = QFont(); - font.setFamily(settings->value("terminal/fontName").toString()); - font.setPointSize(settings->value("terminal/fontSize").toInt ()); - _terminal->setTerminalFont(font); + QFont term_font = QFont(); + term_font.setFamily(settings->value("terminal/fontName").toString()); + term_font.setPointSize(settings->value("terminal/fontSize").toInt ()); + _terminal->setTerminalFont (term_font); QString cursorType = settings->value ("terminal/cursorType").toString (); bool cursorBlinking = settings->value ("terminal/cursorBlinking").toBool (); @@ -422,9 +422,9 @@ } void -main_window::closeEvent (QCloseEvent * closeEvent) +main_window::closeEvent (QCloseEvent *e) { - closeEvent->ignore (); + e->ignore (); octave_link::instance ()->post_event (new octave_exit_event (*this)); }