octave-nkf: libgui/src/m-editor/file-editor-tab.cc comparison

comparison libgui/src/m-editor/file-editor-tab.cc @ 16558:5fc1ce2947bd

style fixes * file-editor.h, file-editor.cc, file-editor-tab.h, file-editor-tab.cc: Style fixes. (file_editor_tab::editor_markers): Declare enum inside file_editor class instead of in global scope.

author	John W. Eaton <jwe@octave.org>
date	Tue, 23 Apr 2013 21:43:25 -0400
parents	3cd80afc3509
children	78765ae325fd

comparison

equal deleted inserted replaced

-:d50bca1cdc22
+:5fc1ce2947bd
 #include "oct-env.h"
 #include "utils.h"
 // Make parent null for the file editor tab so that warning
 // WindowModal messages don't affect grandparents.
-file_editor_tab::file_editor_tab (QString directory)
+file_editor_tab::file_editor_tab (const QString& directory_arg)
 {
+QString directory = directory_arg;
 // Make sure there is a slash at the end of the directory name
 // for identification when saved later.
 if (directory.count () && directory.at (directory.count () - 1) != '/')
 directory.append ("/");
 _file_name = directory;
 _edit_area = new QsciScintilla (this);
 // Leave the find dialog box out of memory until requested.
 _find_dialog = 0;
 _find_dialog_is_visible = false;
 Qt::KeyboardModifiers)),
 this, SLOT (handle_margin_clicked (int, int,
 Qt::KeyboardModifiers)));
 // line numbers
-_edit_area->setMarginsForegroundColor(QColor(96,96,96));
+_edit_area->setMarginsForegroundColor (QColor (96, 96, 96));
-_edit_area->setMarginsBackgroundColor(QColor(232,232,220));
+_edit_area->setMarginsBackgroundColor (QColor (232, 232, 220));
 _edit_area->setMarginType (2, QsciScintilla::TextMargin);
 // code folding
 _edit_area->setMarginType (3, QsciScintilla::SymbolMargin);
 _edit_area->setFolding (QsciScintilla::BoxedTreeFoldStyle , 3);
 //highlight current line color
-_edit_area->setCaretLineBackgroundColor(QColor(245,245,245));
+_edit_area->setCaretLineBackgroundColor (QColor (245, 245, 245));
 // other features
 _edit_area->setBraceMatching (QsciScintilla::StrictBraceMatch);
 _edit_area->setAutoIndent (true);
 _edit_area->setIndentationWidth (2);
 _edit_area->setUtf8 (true);
 // auto completion
 _edit_area->autoCompleteFromAll ();
-_edit_area->setAutoCompletionSource(QsciScintilla::AcsAll);
+_edit_area->setAutoCompletionSource (QsciScintilla::AcsAll);
 QVBoxLayout *edit_area_layout = new QVBoxLayout ();
 edit_area_layout->addWidget (_edit_area);
 edit_area_layout->setMargin (0);
 setLayout (edit_area_layout);
 // connect modified signal
 connect (_edit_area, SIGNAL (modificationChanged (bool)),
 this, SLOT (update_window_title (bool)));
 connect (_edit_area, SIGNAL (copyAvailable (bool)),
 this, SLOT (handle_copy_available (bool)));
-connect (&_file_system_watcher, SIGNAL (fileChanged (QString)),
-this, SLOT (file_has_changed (QString)));
+connect (&_file_system_watcher, SIGNAL (fileChanged (const QString&)),
+this, SLOT (file_has_changed (const QString&)));
 QSettings *settings = resource_manager::get_settings ();
 if (settings)
 notice_settings (settings);
 }
-file_editor_tab::~file_editor_tab ()
+file_editor_tab::~file_editor_tab (void)
 {
 // Destroy items attached to _edit_area.
 QsciLexer *lexer = _edit_area->lexer ();
 if (lexer)
 {
 delete lexer;
-_edit_area->setLexer(0);
+_edit_area->setLexer (0);
 }
 if (_find_dialog)
 {
 delete _find_dialog;
 _find_dialog = 0;
 file_editor_tab::closeEvent (QCloseEvent *e)
 {
 // ignore close event if file is not saved and user cancels
 // closing this window
 if (check_file_modified () == QMessageBox::Cancel)
-{
+e->ignore ();
-e->ignore ();
+else
-}
+e->accept ();
-else
-{
-e->accept();
-}
 }
 void
 file_editor_tab::set_file_name (const QString& fileName)
 {
 // add the new file to the mru list
 emit mru_add_file (QDir::cleanPath (_file_name));
 }
 void
-file_editor_tab::handle_margin_clicked(int margin, int line,
+file_editor_tab::handle_margin_clicked (int margin, int line,
 Qt::KeyboardModifiers state)
 {
 if (margin == 1)
 {
 unsigned int markers_mask = _edit_area->markersAtLine (line);
 if (state & Qt::ControlModifier)
 {
 if (markers_mask && (1 << bookmark))
-_edit_area->markerDelete(line,bookmark);
+_edit_area->markerDelete (line, bookmark);
 else
-_edit_area->markerAdd(line,bookmark);
+_edit_area->markerAdd (line, bookmark);
 }
 else
 {
 if (markers_mask && (1 << breakpoint))
 request_remove_breakpoint (line);
 }
 // slot for fetab_set_focus: sets the focus to the current edit area
 void
-file_editor_tab::set_focus (const QWidget* ID)
+file_editor_tab::set_focus (const QWidget *ID)
 {
 if (ID != this)
 return;
 _edit_area->setFocus ();
 }
 void
-file_editor_tab::undo (const QWidget* ID)
+file_editor_tab::undo (const QWidget *ID)
 {
 if (ID != this)
 return;
 _edit_area->undo ();
 }
 void
-file_editor_tab::redo (const QWidget* ID)
+file_editor_tab::redo (const QWidget *ID)
 {
 if (ID != this)
 return;
 _edit_area->redo ();
 }
 void
-file_editor_tab::copy (const QWidget* ID)
+file_editor_tab::copy (const QWidget *ID)
 {
 if (ID != this)
 return;
 _edit_area->copy ();
 }
 void
-file_editor_tab::cut (const QWidget* ID)
+file_editor_tab::cut (const QWidget *ID)
 {
 if (ID != this)
 return;
 _edit_area->cut ();
 }
 void
-file_editor_tab::paste (const QWidget* ID)
+file_editor_tab::paste (const QWidget *ID)
 {
 if (ID != this)
 return;
 _edit_area->paste ();
 }
 void
-file_editor_tab::save_file (const QWidget* ID)
+file_editor_tab::save_file (const QWidget *ID)
 {
 if (ID != this)
 return;
 save_file (_file_name);
 }
 void
-file_editor_tab::save_file (const QWidget* ID, const QString& fileName, bool remove_on_success)
+file_editor_tab::save_file (const QWidget *ID, const QString& fileName,
+bool remove_on_success)
 {
 if (ID != this)
 return;
 save_file (fileName, remove_on_success);
 }
 void
-file_editor_tab::save_file_as (const QWidget* ID)
+file_editor_tab::save_file_as (const QWidget *ID)
 {
 if (ID != this)
 return;
 save_file_as ();
 }
 void
-file_editor_tab::print_file (const QWidget* ID)
+file_editor_tab::print_file (const QWidget *ID)
 {
 if (ID != this)
 return;
-QsciPrinter * printer = new QsciPrinter( QPrinter::HighResolution );
+QsciPrinter *printer = new QsciPrinter (QPrinter::HighResolution);
-QPrintDialog printDlg(printer, this);
+QPrintDialog printDlg (printer, this);
-if(printDlg.exec() == QDialog::Accepted)
+if (printDlg.exec () == QDialog::Accepted)
-{
+printer->printRange (_edit_area);
-printer->printRange(_edit_area);
-}
 delete printer;
 }
 void
 {
 // Maybe someday we will do something here?
 }
 void
-file_editor_tab::run_file (const QWidget* ID)
+file_editor_tab::run_file (const QWidget *ID)
 {
 if (ID != this)
 return;
 if (_edit_area->isModified ())
 QString function_name = file_info.fileName ();
 // We have to cut off the suffix, because octave appends it.
 function_name.chop (file_info.suffix ().length () + 1);
 emit process_octave_code (QString ("cd \'%1\'\n%2\n")
-.arg(path).arg (function_name));
+.arg (path).arg (function_name));
 // TODO: Sending a run event crashes for long scripts. Find out why.
 // octave_link::post_event
 //   (this, &file_editor_tab::run_file_callback, _file_name.toStdString ()));
 }
 void
-file_editor_tab::toggle_bookmark (const QWidget* ID)
+file_editor_tab::toggle_bookmark (const QWidget *ID)
 {
 if (ID != this)
 return;
 int line, cur;
-_edit_area->getCursorPosition (&line,&cur);
+_edit_area->getCursorPosition (&line, &cur);
-if ( _edit_area->markersAtLine (line) && (1 << bookmark) )
+if (_edit_area->markersAtLine (line) && (1 << bookmark))
 _edit_area->markerDelete (line, bookmark);
 else
 _edit_area->markerAdd (line, bookmark);
 }
 void
-file_editor_tab::next_bookmark (const QWidget* ID)
+file_editor_tab::next_bookmark (const QWidget *ID)
 {
 if (ID != this)
 return;
-int line, cur, nextline;
+int line, cur;
 _edit_area->getCursorPosition (&line, &cur);
-if ( _edit_area->markersAtLine (line) && (1 << bookmark) )
+if (_edit_area->markersAtLine (line) && (1 << bookmark))
 line++; // we have a breakpoint here, so start search from next line
-nextline = _edit_area->markerFindNext (line, (1 << bookmark));
+int nextline = _edit_area->markerFindNext (line, (1 << bookmark));
 _edit_area->setCursorPosition (nextline, 0);
 }
 void
-file_editor_tab::previous_bookmark (const QWidget* ID)
+file_editor_tab::previous_bookmark (const QWidget *ID)
 {
 if (ID != this)
 return;
-int line, cur, prevline;
+int line, cur;
 _edit_area->getCursorPosition (&line, &cur);
-if ( _edit_area->markersAtLine (line) && (1 << bookmark) )
+if (_edit_area->markersAtLine (line) && (1 << bookmark))
 line--; // we have a breakpoint here, so start search from prev line
-prevline = _edit_area->markerFindPrevious (line, (1 << bookmark));
+int prevline = _edit_area->markerFindPrevious (line, (1 << bookmark));
 _edit_area->setCursorPosition (prevline, 0);
 }
 void
-file_editor_tab::remove_bookmark (const QWidget* ID)
+file_editor_tab::remove_bookmark (const QWidget *ID)
 {
 if (ID != this)
 return;
 _edit_area->markerDeleteAll (bookmark);
 octave_link::post_event
 (this, &file_editor_tab::remove_breakpoint_callback, info);
 }
 void
-file_editor_tab::toggle_breakpoint (const QWidget* ID)
+file_editor_tab::toggle_breakpoint (const QWidget *ID)
 {
 if (ID != this)
 return;
 int line, cur;
 _edit_area->getCursorPosition (&line, &cur);
-if ( _edit_area->markersAtLine (line) && (1 << breakpoint) )
+if (_edit_area->markersAtLine (line) && (1 << breakpoint))
 request_remove_breakpoint (line);
 else
 request_add_breakpoint (line);
 }
 void
-file_editor_tab::next_breakpoint (const QWidget* ID)
+file_editor_tab::next_breakpoint (const QWidget *ID)
 {
 if (ID != this)
 return;
-int line, cur, nextline;
+int line, cur;
 _edit_area->getCursorPosition (&line, &cur);
-if ( _edit_area->markersAtLine (line) && (1 << breakpoint) )
+if (_edit_area->markersAtLine (line) && (1 << breakpoint))
 line++; // we have a breakpoint here, so start search from next line
-nextline = _edit_area->markerFindNext (line, (1 << breakpoint));
+int nextline = _edit_area->markerFindNext (line, (1 << breakpoint));
 _edit_area->setCursorPosition (nextline, 0);
 }
 void
-file_editor_tab::previous_breakpoint (const QWidget* ID)
+file_editor_tab::previous_breakpoint (const QWidget *ID)
 {
 if (ID != this)
 return;
 int line, cur, prevline;
 _edit_area->getCursorPosition (&line, &cur);
-if ( _edit_area->markersAtLine (line) && (1 << breakpoint) )
+if (_edit_area->markersAtLine (line) && (1 << breakpoint))
 line--; // we have a breakpoint here, so start search from prev line
 prevline = _edit_area->markerFindPrevious (line, (1 << breakpoint));
 _edit_area->setCursorPosition (prevline, 0);
 }
 void
-file_editor_tab::remove_all_breakpoints (const QWidget* ID)
+file_editor_tab::remove_all_breakpoints (const QWidget *ID)
 {
 if (ID != this)
 return;
 QFileInfo file_info (_file_name);
 octave_link::post_event
 (this, &file_editor_tab::remove_all_breakpoints_callback, info);
 }
 void
-file_editor_tab::comment_selected_text (const QWidget* ID)
+file_editor_tab::comment_selected_text (const QWidget *ID)
 {
 if (ID != this)
 return;
 do_comment_selected_text (true);
 }
 void
-file_editor_tab::uncomment_selected_text (const QWidget* ID)
+file_editor_tab::uncomment_selected_text (const QWidget *ID)
 {
 if (ID != this)
 return;
 do_comment_selected_text (false);
 _find_dialog_geometry = _find_dialog->geometry ();
 _find_dialog_is_visible = false;
 }
 void
-file_editor_tab::find (const QWidget* ID)
+file_editor_tab::find (const QWidget *ID)
 {
 if (ID != this)
 return;
 // The find_dialog feature doesn't need a slot for return info.
 // retaining position per file editor tabs, which can be undocked.
 if (!_find_dialog)
 {
 _find_dialog = new find_dialog (_edit_area,
-qobject_cast<QWidget *>(sender ()));
+qobject_cast<QWidget *> (sender ()));
 connect (_find_dialog, SIGNAL (finished (int)),
 this, SLOT (handle_find_dialog_finished (int)));
 _find_dialog->setWindowModality (Qt::NonModal);
 _find_dialog_geometry = _find_dialog->geometry ();
 }
 _find_dialog->init_search_text ();
 }
 void
-file_editor_tab::goto_line (const QWidget* ID, int line)
+file_editor_tab::goto_line (const QWidget *ID, int line)
 {
 if (ID != this)
 return;
 if (line <= 0)  // ask for desired line
 {
 bool ok = false;
 int index;
-_edit_area->getCursorPosition(&line, &index);
+_edit_area->getCursorPosition (&line, &index);
-line = QInputDialog::getInt (_edit_area, tr("Goto line"), tr("Line number"),
+line = QInputDialog::getInt (_edit_area, tr ("Goto line"),
-line+1, 1, _edit_area->lines(), 1, &ok);
+tr ("Line number"), line+1, 1,
+_edit_area->lines (), 1, &ok);
 if (ok)
 {
 _edit_area->setCursorPosition (line-1, 0);
 center_current_line ();
 }
 }
 else  // go to given line without dialog
-{
+_edit_area->setCursorPosition (line-1, 0);
-_edit_area->setCursorPosition (line-1, 0);
-}
 }
 void
 file_editor_tab::do_comment_selected_text (bool comment)
 {
-if ( _edit_area->hasSelectedText() )
+if (_edit_area->hasSelectedText ())
 {
-int lineFrom, lineTo, colFrom, colTo, i;
+int lineFrom, lineTo, colFrom, colTo;
-_edit_area->getSelection (&lineFrom,&colFrom,&lineTo,&colTo);
+_edit_area->getSelection (&lineFrom, &colFrom, &lineTo, &colTo);
-if ( colTo == 0 )  // the beginning of last line is not selected
+if (colTo == 0)  // the beginning of last line is not selected
 lineTo--;        // stop at line above
 _edit_area->beginUndoAction ();
-for ( i=lineFrom; i<=lineTo; i++ )
+for (int i = lineFrom; i <= lineTo; i++)
 {
-if ( comment )
+if (comment)
-_edit_area->insertAt("%",i,0);
+_edit_area->insertAt ("%", i, 0);
 else
 {
-QString line(_edit_area->text(i));
+QString line (_edit_area->text (i));
-if ( line.startsWith("%") )
+if (line.startsWith ("%"))
 {
-_edit_area->setSelection(i,0,i,1);
+_edit_area->setSelection (i, 0, i, 1);
-_edit_area->removeSelectedText();
+_edit_area->removeSelectedText ();
 }
 }
 }
 _edit_area->endUndoAction ();
 }
 }
 void
 file_editor_tab::update_window_title (bool modified)
 {
 QString title ("");
 QString tooltip ("");
 if (_file_name.isEmpty () || _file_name.at (_file_name.count () - 1) == '/')
-title = tr("<unnamed>");
+title = tr ("<unnamed>");
 else
 {
-if ( _long_title )
+if (_long_title)
 title = _file_name;
 else
 {
-QFileInfo file(_file_name);
+QFileInfo file (_file_name);
-title = file.fileName();
+title = file.fileName ();
 tooltip = _file_name;
 }
 }
-if ( modified )
+if (modified)
-{
+emit file_name_changed (title.prepend ("* "), tooltip);
-emit file_name_changed (title.prepend("* "), tooltip);
-}
 else
 emit file_name_changed (title, tooltip);
 }
 void
-file_editor_tab::handle_copy_available(bool enableCopy)
+file_editor_tab::handle_copy_available (bool enableCopy)
 {
 _copy_available = enableCopy;
 emit editor_state_changed (_copy_available, QDir::cleanPath (_file_name));
 }
 if (_edit_area->isModified ())
 {
 // File is modified but not saved, ask user what to do.  The file
 // editor tab can't be made parent because it may be deleted depending
 // upon the response.  Instead, change the _edit_area to read only.
-QMessageBox* msgBox = new QMessageBox (
+QMessageBox* msgBox
-QMessageBox::Warning, tr ("Octave Editor"),
+= new QMessageBox (QMessageBox::Warning, tr ("Octave Editor"),
 tr ("The file\n"
 "%1\n"
 "is about to be closed but has been modified.\n"
 "Do you want to cancel closing, save or discard the changes?").
 arg (_file_name),
 QMessageBox::Save | QMessageBox::Cancel | QMessageBox::Discard, 0);
 msgBox->setDefaultButton (QMessageBox::Save);
 _edit_area->setReadOnly (true);
 connect (msgBox, SIGNAL (finished (int)),
 this, SLOT (handle_file_modified_answer (int)));
 msgBox->setWindowModality (Qt::NonModal);
 msgBox->setAttribute (Qt::WA_DeleteOnClose);
 msgBox->show ();
-return (QMessageBox::Cancel);
+return QMessageBox::Cancel;
 }
 else
 {
 // Nothing was modified, just remove from editor.
 emit tab_remove_request ();
 }
-return (decision);
+return decision;
 }
 void
 file_editor_tab::handle_file_modified_answer (int decision)
 {
 {
 _edit_area->setModified (modified);
 }
 QString
-file_editor_tab::load_file(const QString& fileName)
+file_editor_tab::load_file (const QString& fileName)
 {
 QFile file (fileName);
 if (!file.open (QFile::ReadOnly))
-{
+return file.errorString ();
-return file.errorString ();
-}
 QTextStream in (&file);
 QApplication::setOverrideCursor (Qt::WaitCursor);
 _edit_area->setText (in.readAll ());
 QApplication::restoreOverrideCursor ();
 void
 file_editor_tab::save_file (const QString& saveFileName, bool remove_on_success)
 {
 // If it is a new file with no name, signal that saveFileAs
 // should be performed.
-if (saveFileName.isEmpty () || saveFileName.at (saveFileName.count () - 1) == '/')
+if (saveFileName.isEmpty ()
+|| saveFileName.at (saveFileName.count () - 1) == '/')
 {
 save_file_as (remove_on_success);
 return;
 }
 // watched previously.
 if (trackedFiles.contains (saveFileName))
 _file_system_watcher.addPath (saveFileName);
 // Create a NonModal message about error.
-QMessageBox* msgBox = new QMessageBox (
+QMessageBox* msgBox
-QMessageBox::Critical, tr ("Octave Editor"),
+= new QMessageBox (QMessageBox::Critical,
-tr ("Could not open file %1 for write:\n%2.").
+tr ("Octave Editor"),
-arg (saveFileName).arg (file.errorString ()),
+tr ("Could not open file %1 for write:\n%2.").
-QMessageBox::Ok, 0);
+arg (saveFileName).arg (file.errorString ()),
+QMessageBox::Ok, 0);
 msgBox->setWindowModality (Qt::NonModal);
 msgBox->setAttribute (Qt::WA_DeleteOnClose);
 msgBox->show ();
 return;
 }
 // save the contents into the file
 QTextStream out (&file);
 QApplication::setOverrideCursor (Qt::WaitCursor);
 out << _edit_area->text ();
 QApplication::restoreOverrideCursor ();
-file.close();
+file.close ();
 // save file name after closing file as set_file_name starts watching again
 set_file_name (saveFileName);
 // set the window title to actual file name (not modified)
 update_window_title (false);
 // files is save -> not modified
 _edit_area->setModified (false);
 if (remove_on_success)
 {
 fileDialog->selectFile (_file_name);
 }
 else
 {
 fileDialog->selectFile ("");
 if (_file_name.isEmpty ())
-{
+fileDialog->setDirectory (QDir::currentPath ());
-fileDialog->setDirectory (QDir::currentPath ());
-}
 else
 {
 // The file name is actually the directory name from the
 // constructor argument.
 fileDialog->setDirectory (_file_name);
 }
 }
-fileDialog->setNameFilter (tr("Octave Files (*.m);;All Files (*.*)"));
+fileDialog->setNameFilter (tr ("Octave Files (*.m);;All Files (*.*)"));
 fileDialog->setDefaultSuffix ("m");
 fileDialog->setAcceptMode (QFileDialog::AcceptSave);
 fileDialog->setViewMode (QFileDialog::Detail);
 if (remove_on_success)
 {
 connect (fileDialog, SIGNAL (fileSelected (const QString&)),
 this, SLOT (handle_save_file_as_answer_close (const QString&)));
 connect (fileDialog, SIGNAL (rejected ()),
 this, SLOT (handle_save_file_as_answer_cancel ()));
 }
 else
 {
 connect (fileDialog, SIGNAL (fileSelected (const QString&)),
 this, SLOT (handle_save_file_as_answer (const QString&)));
 }
 fileDialog->setWindowModality (Qt::WindowModal);
 fileDialog->setAttribute (Qt::WA_DeleteOnClose);
 fileDialog->show ();
 }
 // Could overwrite the file here (and tell user the file was
 // overwritten), but the user could have unintentionally
 // selected the same name not intending to overwrite.
 // Create a NonModal message about error.
-QMessageBox* msgBox = new QMessageBox (
+QMessageBox* msgBox
-QMessageBox::Critical, tr ("Octave Editor"),
+= new QMessageBox (QMessageBox::Critical, tr ("Octave Editor"),
 tr ("File not saved! The selected file name\n%1\n"
 "is the same as the current file name").
 arg (saveFileName),
 QMessageBox::Ok, 0);
 msgBox->setWindowModality (Qt::NonModal);
 msgBox->setAttribute (Qt::WA_DeleteOnClose);
 msgBox->show ();
 }
 if (QFile::exists (_file_name))
 {
 // Create a WindowModal message that blocks the edit area
 // by making _edit_area parent.
-QMessageBox* msgBox = new QMessageBox (
+QMessageBox* msgBox
-QMessageBox::Warning, tr ("Octave Editor"),
+= new QMessageBox (QMessageBox::Warning,
-tr ("It seems that \'%1\' has been modified by another application. Do you want to reload it?").
+tr ("Octave Editor"),
-arg (_file_name), QMessageBox::Yes | QMessageBox::No, this);
+tr ("It seems that \'%1\' has been modified by another application. Do you want to reload it?").
+arg (_file_name),
+QMessageBox::Yes | QMessageBox::No, this);
 connect (msgBox, SIGNAL (finished (int)),
 this, SLOT (handle_file_reload_answer (int)));
 msgBox->setWindowModality (Qt::WindowModal);
 msgBox->setAttribute (Qt::WA_DeleteOnClose);
 msgBox->show ();
 }
 else
 {
 QString modified = "";
 if (_edit_area->isModified ())
 modified = tr ("\n\nWarning: The contents in the editor is modified!");
 // Create a WindowModal message. The file editor tab can't be made
 // parent because it may be deleted depending upon the response.
 // Instead, change the _edit_area to read only.
-QMessageBox* msgBox = new QMessageBox (
+QMessageBox* msgBox
-QMessageBox::Warning, tr ("Octave Editor"),
+= new QMessageBox (QMessageBox::Warning, tr ("Octave Editor"),
 tr ("It seems that the file\n"
 "%1\n"
 "has been deleted or renamed. Do you want to save it now?%2").
 arg (_file_name).arg (modified),
 QMessageBox::Save | QMessageBox::Close, 0);
 _edit_area->setReadOnly (true);
 connect (msgBox, SIGNAL (finished (int)),
 this, SLOT (handle_file_resave_answer (int)));
 msgBox->setWindowModality (Qt::WindowModal);
 msgBox->setAttribute (Qt::WA_DeleteOnClose);
 msgBox->show ();
 }
 }
 file_editor_tab::notice_settings (const QSettings *settings)
 {
 // QSettings pointer is checked before emitting.
 update_lexer ();
 QFontMetrics lexer_font_metrics (_edit_area->lexer ()->defaultFont (0));
-_edit_area->setCaretLineVisible(settings->value ("editor/highlightCurrentLine",true).toBool ());
+_edit_area->setCaretLineVisible
+(settings->value ("editor/highlightCurrentLine", true).toBool ());
-if (settings->value ("editor/codeCompletion",true).toBool ())
+if (settings->value ("editor/codeCompletion", true).toBool ())
 _edit_area->setAutoCompletionThreshold (1);
 else
 _edit_area->setAutoCompletionThreshold (-1);
-if (settings->value ("editor/showLineNumbers",true).toBool ())
+if (settings->value ("editor/showLineNumbers", true).toBool ())
 {
 _edit_area->setMarginLineNumbers (2, true);
-_edit_area->setMarginWidth(2, lexer_font_metrics.width("9999"));
+_edit_area->setMarginWidth (2, lexer_font_metrics.width ("9999"));
 }
 else
 {
 _edit_area->setMarginLineNumbers (2, false);
-_edit_area->setMarginWidth(2, 0);
+_edit_area->setMarginWidth (2, 0);
 }
-_long_title = settings->value ("editor/longWindowTitle",false).toBool ();
+_long_title = settings->value ("editor/longWindowTitle", false).toBool ();
 update_window_title (false);
 }
 void
-file_editor_tab::conditional_close (const QWidget* ID)
+file_editor_tab::conditional_close (const QWidget *ID)
 {
 if (ID != this)
 return;
 close ();
 }
 void
-file_editor_tab::change_editor_state (const QWidget* ID)
+file_editor_tab::change_editor_state (const QWidget *ID)
 {
 if (ID != this)
 {
 // Widget may be going out of focus.  If so, record location.
 if (_find_dialog)
 if (_find_dialog && _find_dialog_is_visible)
 {
 _find_dialog->setGeometry (_find_dialog_geometry);
 _find_dialog->show ();
 }
 emit editor_state_changed (_copy_available, QDir::cleanPath (_file_name));
 }
 void
-file_editor_tab::file_name_query (const QWidget* ID)
+file_editor_tab::file_name_query (const QWidget *ID)
 {
 // A zero (null pointer) means that all file editor tabs
 // should respond, otherwise just the desired file editor tab.
 if (ID != this && ID != 0)
 return;
 void
 file_editor_tab::handle_file_reload_answer (int decision)
 {
 if (decision == QMessageBox::Yes)
-{ // reload: file is readded to the file watcher in set_file_name ()
+{
+// reload: file is readded to the file watcher in set_file_name ()
 load_file (_file_name);
 }
 else
-{ // do not reload: readd to the file watche
+{
+// do not reload: readd to the file watche
 _file_system_watcher.addPath (_file_name);
 }
 }
 void
 void
 file_editor_tab::center_current_line ()
 {
-long int visible_lines = _edit_area->SendScintilla
+long int visible_lines
-(QsciScintillaBase::SCI_LINESONSCREEN);
+= _edit_area->SendScintilla (QsciScintillaBase::SCI_LINESONSCREEN);
 if (visible_lines > 2)
 {
 int line, index;
-_edit_area->getCursorPosition(&line,&index);
+_edit_area->getCursorPosition (&line, &index);
 int first_line = _edit_area->firstVisibleLine ();
 first_line = first_line + (line - first_line - (visible_lines-1)/2);
 _edit_area->setFirstVisibleLine (first_line);
 }
 }
 #endif

Mercurial > hg > octave-nkf

comparison libgui/src/m-editor/file-editor-tab.cc @ 16558:5fc1ce2947bd