Mercurial > octave-nkf
diff libgui/src/m-editor/find-dialog.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 | c2e43dd6eb70 |
| children | 36063e43c511 5f7f58866922 cae24b7cfaf4 |
line wrap: on
line diff
--- a/libgui/src/m-editor/find-dialog.cc Mon Oct 28 20:49:13 2013 -0700 +++ b/libgui/src/m-editor/find-dialog.cc Tue Oct 29 09:54:40 2013 -0700 @@ -158,7 +158,7 @@ _find_next_button->setDefault (true); _find_result_available = false; - // move to dialog to side of the parent if there is room on the desktop to do so. + // move dialog to side of the parent if there is room on the desktop to do so. QWidget * desktop = QApplication::desktop (); int xp = p->x () + p->frameGeometry ().width (); int yp= p->y (); @@ -215,9 +215,11 @@ bool do_forward = true; if (_find_result_available) - { // we found a match last time, cursor is at the end of the match + { + // we found a match last time, cursor is at the end of the match if (!forward) - { // backward: go back one position or we will find the same again + { + // backward: go back one position or we will find the same again do_forward = false; _edit_area->getCursorPosition (&line,&col); if (col > 0) @@ -237,18 +239,19 @@ if (_edit_area) { - _find_result_available = _edit_area->findFirst (_search_line_edit->text (), - _regex_check_box->isChecked (), - _case_check_box->isChecked (), - _whole_words_check_box->isChecked (), - do_wrap, - do_forward, - line,col, - true + _find_result_available + = _edit_area->findFirst (_search_line_edit->text (), + _regex_check_box->isChecked (), + _case_check_box->isChecked (), + _whole_words_check_box->isChecked (), + do_wrap, + do_forward, + line,col, + true #ifdef HAVE_QSCI_VERSION_2_6_0 - , true + , true #endif - ); + ); } if (_find_result_available) _from_start_check_box->setChecked (0); @@ -284,7 +287,8 @@ { cs = Qt::CaseInsensitive; } - strDiff = QString::compare(_search_line_edit->text(),_replace_line_edit->text(),cs); + strDiff = QString::compare (_search_line_edit->text(), + _replace_line_edit->text(), cs); // replace all if strings are different if (_edit_area && strDiff ) @@ -307,7 +311,7 @@ void find_dialog::no_matches_message () { - QMessageBox msg_box (QMessageBox::Information, tr ("Find Result"), + QMessageBox msg_box (QMessageBox::Information, tr ("Find Result"), tr ("No more matches found"), QMessageBox::Ok, this); msg_box.exec (); }