Mercurial > octave-nkf
diff libgui/src/octave-qt-link.cc @ 17790:86c6ae5f969e
Use GNU style coding conventions for code in libgui/
* libgui/qterminal/libqterminal/QTerminal.h, libgui/src/color-picker.cc,
libgui/src/color-picker.h, libgui/src/dialog.cc, libgui/src/dialog.h,
libgui/src/documentation-dock-widget.cc, libgui/src/files-dock-widget.cc,
libgui/src/files-dock-widget.h, libgui/src/find-files-dialog.cc,
libgui/src/find-files-dialog.h, libgui/src/find-files-model.cc,
libgui/src/find-files-model.h, libgui/src/history-dock-widget.cc,
libgui/src/history-dock-widget.h, libgui/src/m-editor/file-editor-interface.h,
libgui/src/m-editor/file-editor-tab.cc, libgui/src/m-editor/file-editor-tab.h,
libgui/src/m-editor/file-editor.cc, libgui/src/m-editor/find-dialog.cc,
libgui/src/m-editor/find-dialog.h, libgui/src/m-editor/octave-qscintilla.cc,
libgui/src/main-window.cc, libgui/src/main-window.h,
libgui/src/news-dock-widget.h, libgui/src/octave-dock-widget.cc,
libgui/src/octave-dock-widget.h, libgui/src/octave-gui.cc,
libgui/src/octave-qt-link.cc, libgui/src/octave-qt-link.h,
libgui/src/qtinfo/parser.cc, libgui/src/qtinfo/parser.h,
libgui/src/qtinfo/webinfo.cc, libgui/src/qtinfo/webinfo.h,
libgui/src/resource-manager.cc, libgui/src/settings-dialog.cc,
libgui/src/settings-dialog.h, libgui/src/terminal-dock-widget.cc,
libgui/src/welcome-wizard.cc, libgui/src/workspace-model.cc,
libgui/src/workspace-model.h, libgui/src/workspace-view.cc,
libgui/src/workspace-view.h:
Use GNU style coding conventions for code in libgui/
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 29 Oct 2013 09:54:40 -0700 |
| parents | d63878346099 |
| children | 86e8dbccf7c7 |
line wrap: on
line diff
--- a/libgui/src/octave-qt-link.cc Mon Oct 28 20:49:13 2013 -0700 +++ b/libgui/src/octave-qt-link.cc Tue Oct 29 09:54:40 2013 -0700 @@ -114,7 +114,7 @@ uiwidget_creator.wait (); // The GUI has sent a signal and the process has been awakened. - return uiwidget_creator.get_dialog_button().toStdString (); + return uiwidget_creator.get_dialog_button ().toStdString (); } static QStringList @@ -153,10 +153,10 @@ name.replace (QRegExp ("\\(.*\\)"), ""); ext.replace (";", " "); - if (name.length() == 0) + if (name.length () == 0) { // No name field. Build one from the extensions. - name = ext.toUpper() + " Files"; + name = ext.toUpper () + " Files"; } retval.append (name + " (" + ext + ")"); @@ -250,7 +250,8 @@ retval.push_back (it->toStdString ()); retval.push_back (uiwidget_creator.get_dialog_path ()->toStdString ()); - retval.push_back ((QString ("%1").arg (uiwidget_creator.get_dialog_result ())).toStdString ()); + retval.push_back ((QString ("%1").arg ( + uiwidget_creator.get_dialog_result ())).toStdString ()); return retval; } @@ -267,8 +268,8 @@ QString msg = (addpath_option - ? tr ("The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.").arg(qfile).arg(qdir) - : tr ("The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2.").arg(qfile).arg(qdir)); + ? tr ("The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.").arg (qfile).arg (qdir) + : tr ("The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2.").arg (qfile).arg (qdir)); QString title = tr ("Change Directory or Add Directory to Load Path"); @@ -402,7 +403,8 @@ octave_qt_link::do_update_breakpoint (bool insert, const std::string& file, int line) { - emit update_breakpoint_marker_signal (insert, QString::fromStdString (file), line); + emit update_breakpoint_marker_signal (insert, QString::fromStdString (file), + line); } void