--- a/gui/src/BrowserWidget.cpp
+++ b/gui/src/BrowserWidget.cpp
@@ -22,56 +22,70 @@
 #include <QStyle>
 #include <QApplication>
 
-BrowserWidget::BrowserWidget(QWidget *parent)
-    : QWidget(parent) {
-    construct();
+BrowserWidget::BrowserWidget (QWidget * parent):QWidget (parent)
+{
+  construct ();
 }
 
-void BrowserWidget::construct() {
-    QStyle *style = QApplication::style();
-    m_navigationToolBar = new QToolBar(this);
-    m_webView = new QWebView(this);
-    m_urlLineEdit = new QLineEdit(this);
-    m_statusBar = new QStatusBar(this);
+void
+BrowserWidget::construct ()
+{
+  QStyle *style = QApplication::style ();
+  m_navigationToolBar = new QToolBar (this);
+  m_webView = new QWebView (this);
+  m_urlLineEdit = new QLineEdit (this);
+  m_statusBar = new QStatusBar (this);
 
-    m_webView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    QAction *backAction = new QAction(style->standardIcon(QStyle::SP_ArrowLeft),
-        "", m_navigationToolBar);
-    QAction *forwardAction = new QAction(style->standardIcon(QStyle::SP_ArrowRight),
-        "", m_navigationToolBar);
+  m_webView->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Expanding);
+  QAction *backAction =
+    new QAction (style->standardIcon (QStyle::SP_ArrowLeft),
+		 "", m_navigationToolBar);
+  QAction *forwardAction =
+    new QAction (style->standardIcon (QStyle::SP_ArrowRight),
+		 "", m_navigationToolBar);
 
-    m_navigationToolBar->addAction(backAction);
-    m_navigationToolBar->addAction(forwardAction);
-    m_navigationToolBar->addWidget(m_urlLineEdit);
+  m_navigationToolBar->addAction (backAction);
+  m_navigationToolBar->addAction (forwardAction);
+  m_navigationToolBar->addWidget (m_urlLineEdit);
 
-    QVBoxLayout *layout = new QVBoxLayout();
-    layout->addWidget(m_navigationToolBar);
-    layout->addWidget(m_webView);
-    layout->addWidget(m_statusBar);
-    layout->setMargin(2);
-    setLayout(layout);
+  QVBoxLayout *layout = new QVBoxLayout ();
+  layout->addWidget (m_navigationToolBar);
+  layout->addWidget (m_webView);
+  layout->addWidget (m_statusBar);
+  layout->setMargin (2);
+  setLayout (layout);
 
-    connect(backAction, SIGNAL(triggered()), m_webView, SLOT(back()));
-    connect(forwardAction, SIGNAL(triggered()), m_webView, SLOT(forward()));
-    connect(m_webView, SIGNAL(urlChanged(QUrl)), this, SLOT(setUrl(QUrl)));
-    connect(m_urlLineEdit, SIGNAL(returnPressed()), this, SLOT(jumpToWebsite()));
+  connect (backAction, SIGNAL (triggered ()), m_webView, SLOT (back ()));
+  connect (forwardAction, SIGNAL (triggered ()), m_webView,
+	   SLOT (forward ()));
+  connect (m_webView, SIGNAL (urlChanged (QUrl)), this, SLOT (setUrl (QUrl)));
+  connect (m_urlLineEdit, SIGNAL (returnPressed ()), this,
+	   SLOT (jumpToWebsite ()));
 }
 
-void BrowserWidget::setUrl(QUrl url) {
-    m_urlLineEdit->setText(url.toString());
+void
+BrowserWidget::setUrl (QUrl url)
+{
+  m_urlLineEdit->setText (url.toString ());
 }
 
-void BrowserWidget::jumpToWebsite() {
-    QString url = m_urlLineEdit->text();
-    if(!url.startsWith("http://"))
-        url = "http://" + url;
-    load(url);
+void
+BrowserWidget::jumpToWebsite ()
+{
+  QString url = m_urlLineEdit->text ();
+  if (!url.startsWith ("http://"))
+    url = "http://" + url;
+  load (url);
 }
 
-void BrowserWidget::showStatusMessage(QString message) {
-    m_statusBar->showMessage(message, 1000);
+void
+BrowserWidget::showStatusMessage (QString message)
+{
+  m_statusBar->showMessage (message, 1000);
 }
 
-void BrowserWidget::load(QUrl url) {
-    m_webView->load(url);
+void
+BrowserWidget::load (QUrl url)
+{
+  m_webView->load (url);
 }

--- a/gui/src/BrowserWidget.h
+++ b/gui/src/BrowserWidget.h
@@ -25,24 +25,23 @@
 #include <QtWebKit/QWebView>
 #include <QStatusBar>
 
-class BrowserWidget : public QWidget {
-    Q_OBJECT
-public:
-    BrowserWidget(QWidget *parent = 0);
-    void load(QUrl url);
+class BrowserWidget:public QWidget
+{
+Q_OBJECT public:
+  BrowserWidget (QWidget * parent = 0);
+  void load (QUrl url);
 
-public slots:
-    void setUrl(QUrl url);
-    void jumpToWebsite();
-    void showStatusMessage(QString message);
+  public slots:void setUrl (QUrl url);
+  void jumpToWebsite ();
+  void showStatusMessage (QString message);
 
 private:
-    void construct();
+  void construct ();
 
-    QLineEdit *m_urlLineEdit;
-    QToolBar *m_navigationToolBar;
-    QWebView *m_webView;
-    QStatusBar *m_statusBar;
+  QLineEdit *m_urlLineEdit;
+  QToolBar *m_navigationToolBar;
+  QWebView *m_webView;
+  QStatusBar *m_statusBar;
 };
 
 #endif // BROWSERMDISUBWINDOW_H

--- a/gui/src/FileEditorMdiSubWindow.cpp
+++ b/gui/src/FileEditorMdiSubWindow.cpp
@@ -26,140 +26,174 @@
 #include <QStyle>
 #include <QTextStream>
 
-FileEditorMdiSubWindow::FileEditorMdiSubWindow(QWidget *parent)
-    : QMdiSubWindow(parent) {
-    construct();
+FileEditorMdiSubWindow::FileEditorMdiSubWindow (QWidget * parent):QMdiSubWindow
+  (parent)
+{
+  construct ();
 }
 
-FileEditorMdiSubWindow::~FileEditorMdiSubWindow() {
-    while(checkFileModified("Close File")) {
-    } // don't close if something went wrong while saving the file
+FileEditorMdiSubWindow::~FileEditorMdiSubWindow ()
+{
+  while (checkFileModified ("Close File"))
+    {
+    }				// don't close if something went wrong while saving the file
 }
 
-void FileEditorMdiSubWindow::loadFile(QString fileName) {    
-    QFile file(fileName);
-    if (!file.open(QFile::ReadOnly)) {
-        QMessageBox::warning(this, tr("File Editor"),
-                             tr("Cannot read file %1:\n%2.")
-                             .arg(fileName)
-                             .arg(file.errorString()));
-        return;
+void
+FileEditorMdiSubWindow::loadFile (QString fileName)
+{
+  QFile file (fileName);
+  if (!file.open (QFile::ReadOnly))
+    {
+      QMessageBox::warning (this, tr ("File Editor"),
+			    tr ("Cannot read file %1:\n%2.").arg (fileName).
+			    arg (file.errorString ()));
+      return;
     }
 
-    QTextStream in(&file);
-    QApplication::setOverrideCursor(Qt::WaitCursor);
-    m_editor->setText(in.readAll());
-    QApplication::restoreOverrideCursor();
+  QTextStream in (&file);
+  QApplication::setOverrideCursor (Qt::WaitCursor);
+  m_editor->setText (in.readAll ());
+  QApplication::restoreOverrideCursor ();
+
+  m_fileName = fileName;
+  setWindowTitle (fileName);
+  m_statusBar->showMessage (tr ("File loaded."), 2000);
+  m_editor->setModified (false);
+}
 
-    m_fileName = fileName;
-    setWindowTitle(fileName);
-    m_statusBar->showMessage(tr("File loaded."), 2000);
-    m_editor->setModified(false);
+void
+FileEditorMdiSubWindow::newFile ()
+{
+  if (checkFileModified ("Open New File"))
+    {
+      return;			// something went wrong while saving the old file
+    }
+  m_fileName = "<unnamed>";
+  setWindowTitle (m_fileName);
+  m_editor->setText ("");
+  m_editor->setModified (false);
 }
 
-void FileEditorMdiSubWindow::newFile() {
-    if(checkFileModified("Open New File")) {
-        return;  // something went wrong while saving the old file
-    }
-    m_fileName = "<unnamed>";
-    setWindowTitle(m_fileName);
-    m_editor->setText("");
-    m_editor->setModified(false);
-}
+int
+FileEditorMdiSubWindow::checkFileModified (QString msg)
+{
+  if (m_editor->isModified ())
+    {
+      int decision = QMessageBox::question (this,
+					    msg,
+					    "Do you want to save the current file?",
+					    QMessageBox::Yes,
+					    QMessageBox::No);
 
-int FileEditorMdiSubWindow::checkFileModified(QString msg) {
-    if(m_editor->isModified()) {
-        int decision
-                = QMessageBox::question(this,
-                                        msg,
-                                        "Do you want to save the current file?",
-                                        QMessageBox::Yes, QMessageBox::No);
-
-        if(decision == QMessageBox::Yes) {
-            saveFile();
-            if(m_editor->isModified()) {
-                // If the user attempted to save the file, but it's still
-                // modified, then probably something went wrong, so return error
-                return(1);
-            }
-        }
+      if (decision == QMessageBox::Yes)
+	{
+	  saveFile ();
+	  if (m_editor->isModified ())
+	    {
+	      // If the user attempted to save the file, but it's still
+	      // modified, then probably something went wrong, so return error
+	      return (1);
+	    }
+	}
     }
-    return(0);
+  return (0);
 }
 
-void FileEditorMdiSubWindow::saveFile() {
-    if(m_fileName.isEmpty()) {
-        m_fileName = QFileDialog::getSaveFileName(this, "Save File", m_fileName);
-        if(m_fileName.isEmpty())
-            return;
+void
+FileEditorMdiSubWindow::saveFile ()
+{
+  if (m_fileName.isEmpty ())
+    {
+      m_fileName =
+	QFileDialog::getSaveFileName (this, "Save File", m_fileName);
+      if (m_fileName.isEmpty ())
+	return;
     }
 
-    QFile file(m_fileName);
-    if (!file.open(QFile::WriteOnly)) {
-        QMessageBox::warning(this, tr("File Editor"),
-                             tr("Cannot write file %1:\n%2.")
-                             .arg(m_fileName)
-                             .arg(file.errorString()));
-        return;
+  QFile file (m_fileName);
+  if (!file.open (QFile::WriteOnly))
+    {
+      QMessageBox::warning (this, tr ("File Editor"),
+			    tr ("Cannot write file %1:\n%2.").
+			    arg (m_fileName).arg (file.errorString ()));
+      return;
     }
 
-    QTextStream out(&file);
-    QApplication::setOverrideCursor(Qt::WaitCursor);
-    out << m_editor->text();
-    QApplication::restoreOverrideCursor();
-    m_statusBar->showMessage(tr("File saved"), 2000);
+  QTextStream out (&file);
+  QApplication::setOverrideCursor (Qt::WaitCursor);
+  out << m_editor->text ();
+  QApplication::restoreOverrideCursor ();
+  m_statusBar->showMessage (tr ("File saved"), 2000);
 }
 
-void FileEditorMdiSubWindow::saveFileAs() {/*
-    QString saveFileName = QFileDialog::getSaveFileName(this, "Save File", m_fileName);
-    if(saveFileName.isEmpty())
-        return;
+void
+FileEditorMdiSubWindow::saveFileAs ()
+{				/*
+				   QString saveFileName = QFileDialog::getSaveFileName(this, "Save File", m_fileName);
+				   if(saveFileName.isEmpty())
+				   return;
 
-    QFile file(saveFileName);
-    file.open(QFile::WriteOnly);
+				   QFile file(saveFileName);
+				   file.open(QFile::WriteOnly);
 
-    if(file.write(m_simpleEditor->toPlainText().toLocal8Bit()) == -1) {
-        QMessageBox::warning(this,
-                             "Error Saving File",
-                             QString("The file could not be saved: %1.").arg(file.errorString()));
-    } else {
-        m_simpleEditor->document()->setModified(false);
-        m_fileName = saveFileName;
-        setWindowTitle(m_fileName);
-    }
+				   if(file.write(m_simpleEditor->toPlainText().toLocal8Bit()) == -1) {
+				   QMessageBox::warning(this,
+				   "Error Saving File",
+				   QString("The file could not be saved: %1.").arg(file.errorString()));
+				   } else {
+				   m_simpleEditor->document()->setModified(false);
+				   m_fileName = saveFileName;
+				   setWindowTitle(m_fileName);
+				   }
 
-    file.close();*/
+				   file.close(); */
 }
 
-void FileEditorMdiSubWindow::showToolTipNew() {
-    m_statusBar->showMessage("Create a new file.", 2000);
+void
+FileEditorMdiSubWindow::showToolTipNew ()
+{
+  m_statusBar->showMessage ("Create a new file.", 2000);
 }
 
-void FileEditorMdiSubWindow::showToolTipSave() {
-    m_statusBar->showMessage("Save the file.", 2000);
+void
+FileEditorMdiSubWindow::showToolTipSave ()
+{
+  m_statusBar->showMessage ("Save the file.", 2000);
 }
 
-void FileEditorMdiSubWindow::showToolTipSaveAs() {
-    m_statusBar->showMessage("Save the file as.", 2000);
+void
+FileEditorMdiSubWindow::showToolTipSaveAs ()
+{
+  m_statusBar->showMessage ("Save the file as.", 2000);
 }
-void FileEditorMdiSubWindow::showToolTipUndo() {
-    m_statusBar->showMessage("Revert previous changes.", 2000);
+
+void
+FileEditorMdiSubWindow::showToolTipUndo ()
+{
+  m_statusBar->showMessage ("Revert previous changes.", 2000);
 }
 
-void FileEditorMdiSubWindow::showToolTipRedo() {
-    m_statusBar->showMessage("Append previous changes.", 2000);
+void
+FileEditorMdiSubWindow::showToolTipRedo ()
+{
+  m_statusBar->showMessage ("Append previous changes.", 2000);
 }
 
-void FileEditorMdiSubWindow::registerModified(bool modified) {
-    m_modified = modified;
+void
+FileEditorMdiSubWindow::registerModified (bool modified)
+{
+  m_modified = modified;
 }
 
-void FileEditorMdiSubWindow::construct() {
-    QStyle *style = QApplication::style();
-    setWidget(new QWidget());
-    m_toolBar = new QToolBar(this);
-    m_statusBar = new QStatusBar(this);
-    m_editor = new QsciScintilla(this);
+void
+FileEditorMdiSubWindow::construct ()
+{
+  QStyle *style = QApplication::style ();
+  setWidget (new QWidget ());
+  m_toolBar = new QToolBar (this);
+  m_statusBar = new QStatusBar (this);
+  m_editor = new QsciScintilla (this);
 
 // Not available in the Debian repos yet!
 /*
@@ -171,55 +205,60 @@
     m_editor->setLexer(m_lexer);
 */
 
-    m_editor->setMarginType(1,QsciScintilla::TextMargin);
-    m_editor->setMarginType(2,QsciScintilla::SymbolMargin);
-    m_editor->setFolding(QsciScintilla::BoxedTreeFoldStyle,2);
-    m_editor->setMarginLineNumbers(1, true);
-    m_editor->setMarginWidth(1, "99999");
+  m_editor->setMarginType (1, QsciScintilla::TextMargin);
+  m_editor->setMarginType (2, QsciScintilla::SymbolMargin);
+  m_editor->setFolding (QsciScintilla::BoxedTreeFoldStyle, 2);
+  m_editor->setMarginLineNumbers (1, true);
+  m_editor->setMarginWidth (1, "99999");
+
+  m_editor->setBraceMatching (QsciScintilla::SloppyBraceMatch);
+  m_editor->setAutoIndent (true);
+  m_editor->setIndentationWidth (2);
+  m_editor->setIndentationsUseTabs (false);
+  m_editor->setAutoCompletionThreshold (2);
 
-    m_editor->setBraceMatching(QsciScintilla::SloppyBraceMatch);
-    m_editor->setAutoIndent(true);
-    m_editor->setIndentationWidth(2);
-    m_editor->setIndentationsUseTabs(false);
-    m_editor->setAutoCompletionThreshold(2);
-
-    QAction *newAction = new QAction(style->standardIcon(QStyle::SP_FileIcon),
-        "", m_toolBar);
-    QAction *saveAction = new QAction(style->standardIcon(QStyle::SP_DriveHDIcon),
-        "", m_toolBar);
-    QAction *saveActionAs = new QAction(style->standardIcon(QStyle::SP_DriveFDIcon),
-        "", m_toolBar);
-    QAction *undoAction = new QAction(style->standardIcon(QStyle::SP_ArrowLeft),
-        "", m_toolBar);
-    QAction *redoAction = new QAction(style->standardIcon(QStyle::SP_ArrowRight),
-        "", m_toolBar);
+  QAction *newAction = new QAction (style->standardIcon (QStyle::SP_FileIcon),
+				    "", m_toolBar);
+  QAction *saveAction =
+    new QAction (style->standardIcon (QStyle::SP_DriveHDIcon),
+		 "", m_toolBar);
+  QAction *saveActionAs =
+    new QAction (style->standardIcon (QStyle::SP_DriveFDIcon),
+		 "", m_toolBar);
+  QAction *undoAction =
+    new QAction (style->standardIcon (QStyle::SP_ArrowLeft),
+		 "", m_toolBar);
+  QAction *redoAction =
+    new QAction (style->standardIcon (QStyle::SP_ArrowRight),
+		 "", m_toolBar);
 
-    m_toolBar->addAction(newAction);
-    m_toolBar->addAction(saveAction);
-    m_toolBar->addAction(saveActionAs);
-    m_toolBar->addAction(undoAction);
-    m_toolBar->addAction(redoAction);
+  m_toolBar->addAction (newAction);
+  m_toolBar->addAction (saveAction);
+  m_toolBar->addAction (saveActionAs);
+  m_toolBar->addAction (undoAction);
+  m_toolBar->addAction (redoAction);
 
-    QVBoxLayout *layout = new QVBoxLayout();
-    layout->addWidget(m_toolBar);
-    layout->addWidget(m_editor);
-    layout->addWidget(m_statusBar);
-    layout->setMargin(2);
-    widget()->setLayout(layout);
+  QVBoxLayout *layout = new QVBoxLayout ();
+  layout->addWidget (m_toolBar);
+  layout->addWidget (m_editor);
+  layout->addWidget (m_statusBar);
+  layout->setMargin (2);
+  widget ()->setLayout (layout);
 
-    connect(newAction, SIGNAL(triggered()), this, SLOT(newFile()));
-    connect(undoAction, SIGNAL(triggered()), m_editor, SLOT(undo()));
-    connect(redoAction, SIGNAL(triggered()), m_editor, SLOT(redo()));
-    connect(saveAction, SIGNAL(triggered()), this, SLOT(saveFile()));
-    connect(saveActionAs, SIGNAL(triggered()), this, SLOT(saveFileAs()));
+  connect (newAction, SIGNAL (triggered ()), this, SLOT (newFile ()));
+  connect (undoAction, SIGNAL (triggered ()), m_editor, SLOT (undo ()));
+  connect (redoAction, SIGNAL (triggered ()), m_editor, SLOT (redo ()));
+  connect (saveAction, SIGNAL (triggered ()), this, SLOT (saveFile ()));
+  connect (saveActionAs, SIGNAL (triggered ()), this, SLOT (saveFileAs ()));
 
-    connect(newAction, SIGNAL(hovered()), this, SLOT(showToolTipNew()));
-    connect(undoAction, SIGNAL(hovered()), this, SLOT(showToolTipUndo()));
-    connect(redoAction, SIGNAL(hovered()), this, SLOT(showToolTipRedo()));
-    connect(saveAction, SIGNAL(hovered()), this, SLOT(showToolTipSave()));
-    connect(saveActionAs, SIGNAL(hovered()), this, SLOT(showToolTipSaveAs()));
+  connect (newAction, SIGNAL (hovered ()), this, SLOT (showToolTipNew ()));
+  connect (undoAction, SIGNAL (hovered ()), this, SLOT (showToolTipUndo ()));
+  connect (redoAction, SIGNAL (hovered ()), this, SLOT (showToolTipRedo ()));
+  connect (saveAction, SIGNAL (hovered ()), this, SLOT (showToolTipSave ()));
+  connect (saveActionAs, SIGNAL (hovered ()), this,
+	   SLOT (showToolTipSaveAs ()));
 
-    m_fileName = "";
-    setWindowTitle(m_fileName);
-    show();
+  m_fileName = "";
+  setWindowTitle (m_fileName);
+  show ();
 }

--- a/gui/src/FileEditorMdiSubWindow.h
+++ b/gui/src/FileEditorMdiSubWindow.h
@@ -27,33 +27,32 @@
 // #include <Qsci/qscilexeroctave.h>
 #include <Qsci/qsciapis.h>
 
-class FileEditorMdiSubWindow : public QMdiSubWindow {
-    Q_OBJECT
-public:
-    FileEditorMdiSubWindow(QWidget *parent = 0);
-    ~FileEditorMdiSubWindow();
-    void loadFile(QString fileName);
+class FileEditorMdiSubWindow:public QMdiSubWindow
+{
+Q_OBJECT public:
+  FileEditorMdiSubWindow (QWidget * parent = 0);
+  ~FileEditorMdiSubWindow ();
+  void loadFile (QString fileName);
 
-public slots:
-    void newFile();
-    void saveFile();
-    void saveFileAs();
+  public slots:void newFile ();
+  void saveFile ();
+  void saveFileAs ();
 
-    void showToolTipNew();
-    void showToolTipSave();
-    void showToolTipSaveAs();
-    void showToolTipUndo();
-    void showToolTipRedo();
+  void showToolTipNew ();
+  void showToolTipSave ();
+  void showToolTipSaveAs ();
+  void showToolTipUndo ();
+  void showToolTipRedo ();
 
-    void registerModified(bool modified);
+  void registerModified (bool modified);
 private:
-    int checkFileModified(QString msg);
-    void construct();
-    QToolBar *m_toolBar;
-    QsciScintilla *m_editor;
-    QStatusBar *m_statusBar;
-    QString m_fileName;
-    bool m_modified;
+  int checkFileModified (QString msg);
+  void construct ();
+  QToolBar *m_toolBar;
+  QsciScintilla *m_editor;
+  QStatusBar *m_statusBar;
+  QString m_fileName;
+  bool m_modified;
 };
 
 #endif // FILEEDITORMDISUBWINDOW_H

--- a/gui/src/FilesDockWidget.cpp
+++ b/gui/src/FilesDockWidget.cpp
@@ -22,96 +22,123 @@
 #include <QFileInfo>
 #include <QCompleter>
 
-FilesDockWidget::FilesDockWidget(QWidget *parent)
-  : QDockWidget(parent) {
-    setObjectName("FilesDockWidget");
-    setWindowTitle(tr("Current Folder"));
-    setWidget(new QWidget(this));
+FilesDockWidget::FilesDockWidget (QWidget * parent):QDockWidget (parent)
+{
+  setObjectName ("FilesDockWidget");
+  setWindowTitle (tr ("Current Folder"));
+  setWidget (new QWidget (this));
 
-    // Create a toolbar
-    m_navigationToolBar = new QToolBar("", widget());
-    m_navigationToolBar->setAllowedAreas(Qt::TopToolBarArea);
-    m_navigationToolBar->setMovable(false);
-    m_navigationToolBar->setIconSize(QSize (20,20));
+  // Create a toolbar
+  m_navigationToolBar = new QToolBar ("", widget ());
+  m_navigationToolBar->setAllowedAreas (Qt::TopToolBarArea);
+  m_navigationToolBar->setMovable (false);
+  m_navigationToolBar->setIconSize (QSize (20, 20));
 
-    // Add a button to the toolbar with the QT standard icon for up-directory
-    // TODO: Maybe change this to be an up-directory icon that is OS specific???
-    QStyle *style = QApplication::style();
-    m_directoryIcon = style->standardIcon(QStyle::SP_FileDialogToParent);
-    m_directoryUpAction = new QAction(m_directoryIcon, "", m_navigationToolBar);
-    m_currentDirectory = new QLineEdit(m_navigationToolBar);
+  // Add a button to the toolbar with the QT standard icon for up-directory
+  // TODO: Maybe change this to be an up-directory icon that is OS specific???
+  QStyle *
+    style = QApplication::style ();
+  m_directoryIcon = style->standardIcon (QStyle::SP_FileDialogToParent);
+  m_directoryUpAction =
+    new QAction (m_directoryIcon, "", m_navigationToolBar);
+  m_currentDirectory = new QLineEdit (m_navigationToolBar);
 
-    m_navigationToolBar->addAction(m_directoryUpAction);
-    m_navigationToolBar->addWidget(m_currentDirectory);
-    connect(m_directoryUpAction, SIGNAL(triggered()), this, SLOT(onUpDirectory()));
+  m_navigationToolBar->addAction (m_directoryUpAction);
+  m_navigationToolBar->addWidget (m_currentDirectory);
+  connect (m_directoryUpAction, SIGNAL (triggered ()), this,
+	   SLOT (onUpDirectory ()));
 
-    // TODO: Add other buttons for creating directories
+  // TODO: Add other buttons for creating directories
+
+  // Create the QFileSystemModel starting in the home directory
+  QString
+    homePath = QDir::homePath ();
+  // TODO: This should occur after Octave has been initialized and the startup directory of Octave is established
 
-    // Create the QFileSystemModel starting in the home directory
-    QString homePath = QDir::homePath();
-    // TODO: This should occur after Octave has been initialized and the startup directory of Octave is established
+  m_fileSystemModel = new QFileSystemModel (this);
+  m_fileSystemModel->setFilter (QDir::NoDotAndDotDot | QDir::AllEntries);
+  QModelIndex
+    rootPathIndex = m_fileSystemModel->setRootPath (homePath);
 
-    m_fileSystemModel = new QFileSystemModel(this);
-    m_fileSystemModel->setFilter(QDir::NoDotAndDotDot | QDir::AllEntries);
-    QModelIndex rootPathIndex = m_fileSystemModel->setRootPath(homePath);
+  // Attach the model to the QTreeView and set the root index
+  m_fileTreeView = new QTreeView (widget ());
+  m_fileTreeView->setModel (m_fileSystemModel);
+  m_fileTreeView->setRootIndex (rootPathIndex);
+  m_fileTreeView->setSortingEnabled (true);
+  m_fileTreeView->setAlternatingRowColors (true);
+  m_fileTreeView->setAnimated (true);
+  setCurrentDirectory (m_fileSystemModel->fileInfo (rootPathIndex).
+		       absoluteFilePath ());
 
-    // Attach the model to the QTreeView and set the root index
-    m_fileTreeView = new QTreeView(widget());
-    m_fileTreeView->setModel(m_fileSystemModel);
-    m_fileTreeView->setRootIndex(rootPathIndex);
-    m_fileTreeView->setSortingEnabled(true);
-    m_fileTreeView->setAlternatingRowColors(true);
-    m_fileTreeView->setAnimated(true);
-    setCurrentDirectory(m_fileSystemModel->fileInfo(rootPathIndex).absoluteFilePath());
-
-    connect(m_fileTreeView, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(itemDoubleClicked(const QModelIndex &)));
+  connect (m_fileTreeView, SIGNAL (doubleClicked (const QModelIndex &)), this,
+	   SLOT (itemDoubleClicked (const QModelIndex &)));
 
-    // Layout the widgets vertically with the toolbar on top
-    QVBoxLayout *layout = new QVBoxLayout();
-    layout->setSpacing(0);
-    layout->addWidget(m_navigationToolBar);
-    layout->addWidget(m_fileTreeView);
-    widget()->setLayout(layout);
-    // TODO: Add right-click contextual menus for copying, pasting, deleting files (and others)
+  // Layout the widgets vertically with the toolbar on top
+  QVBoxLayout *
+    layout = new QVBoxLayout ();
+  layout->setSpacing (0);
+  layout->addWidget (m_navigationToolBar);
+  layout->addWidget (m_fileTreeView);
+  widget ()->setLayout (layout);
+  // TODO: Add right-click contextual menus for copying, pasting, deleting files (and others)
 
-    connect(m_currentDirectory, SIGNAL(returnPressed()), this, SLOT(currentDirectoryEntered()));
-    QCompleter *completer = new QCompleter(m_fileSystemModel, this);
-    m_currentDirectory->setCompleter(completer);
+  connect (m_currentDirectory, SIGNAL (returnPressed ()), this,
+	   SLOT (currentDirectoryEntered ()));
+  QCompleter *
+    completer = new QCompleter (m_fileSystemModel, this);
+  m_currentDirectory->setCompleter (completer);
 }
 
-void FilesDockWidget::itemDoubleClicked(const QModelIndex &index)
+void
+FilesDockWidget::itemDoubleClicked (const QModelIndex & index)
 {
-    QFileInfo fileInfo = m_fileSystemModel->fileInfo(index);
-    if (fileInfo.isDir()) {
-        m_fileSystemModel->setRootPath(fileInfo.absolutePath());
-        m_fileTreeView->setRootIndex(index);
-        setCurrentDirectory(m_fileSystemModel->fileInfo(index).absoluteFilePath());
-    } else {
-        QFileInfo fileInfo = m_fileSystemModel->fileInfo(index);
-        emit openFile(fileInfo.filePath());
+  QFileInfo fileInfo = m_fileSystemModel->fileInfo (index);
+  if (fileInfo.isDir ())
+    {
+      m_fileSystemModel->setRootPath (fileInfo.absolutePath ());
+      m_fileTreeView->setRootIndex (index);
+      setCurrentDirectory (m_fileSystemModel->fileInfo (index).
+			   absoluteFilePath ());
+    }
+  else
+    {
+      QFileInfo fileInfo = m_fileSystemModel->fileInfo (index);
+      emit openFile (fileInfo.filePath ());
     }
 }
 
-void FilesDockWidget::setCurrentDirectory(QString currentDirectory) {
-    m_currentDirectory->setText(currentDirectory);
+void
+FilesDockWidget::setCurrentDirectory (QString currentDirectory)
+{
+  m_currentDirectory->setText (currentDirectory);
 }
 
-void FilesDockWidget::onUpDirectory(void) {
-    QDir dir = QDir(m_fileSystemModel->filePath(m_fileTreeView->rootIndex()));
-    dir.cdUp();
-    m_fileSystemModel->setRootPath(dir.absolutePath());
-    m_fileTreeView->setRootIndex(m_fileSystemModel->index(dir.absolutePath()));
-    setCurrentDirectory(dir.absolutePath());
+void
+FilesDockWidget::onUpDirectory (void)
+{
+  QDir dir =
+    QDir (m_fileSystemModel->filePath (m_fileTreeView->rootIndex ()));
+  dir.cdUp ();
+  m_fileSystemModel->setRootPath (dir.absolutePath ());
+  m_fileTreeView->setRootIndex (m_fileSystemModel->
+				index (dir.absolutePath ()));
+  setCurrentDirectory (dir.absolutePath ());
 }
 
-void FilesDockWidget::currentDirectoryEntered() {
-    QFileInfo fileInfo(m_currentDirectory->text());
-    if (fileInfo.isDir()) {
-        m_fileTreeView->setRootIndex(m_fileSystemModel->index(fileInfo.absolutePath()));
-        m_fileSystemModel->setRootPath(fileInfo.absolutePath());
-        setCurrentDirectory(fileInfo.absoluteFilePath());
-    } else {
-        if(QFile::exists(fileInfo.absoluteFilePath()))
-            emit openFile(fileInfo.absoluteFilePath());
+void
+FilesDockWidget::currentDirectoryEntered ()
+{
+  QFileInfo fileInfo (m_currentDirectory->text ());
+  if (fileInfo.isDir ())
+    {
+      m_fileTreeView->setRootIndex (m_fileSystemModel->
+				    index (fileInfo.absolutePath ()));
+      m_fileSystemModel->setRootPath (fileInfo.absolutePath ());
+      setCurrentDirectory (fileInfo.absoluteFilePath ());
+    }
+  else
+    {
+      if (QFile::exists (fileInfo.absoluteFilePath ()))
+	emit openFile (fileInfo.absoluteFilePath ());
     }
 }

--- a/gui/src/FilesDockWidget.h
+++ b/gui/src/FilesDockWidget.h
@@ -46,41 +46,39 @@
 #include <QDockWidget>
 #include <QLineEdit>
 
-class FilesDockWidget : public QDockWidget {
-    Q_OBJECT
-public :
-    FilesDockWidget(QWidget *parent = 0);
-public slots:
+class FilesDockWidget:public QDockWidget
+{
+  Q_OBJECT public:FilesDockWidget (QWidget * parent = 0);
+  public slots:
     /** Slot for handling a change in directory via double click. */
-    void itemDoubleClicked(const QModelIndex &index);
+  void itemDoubleClicked (const QModelIndex & index);
 
     /** Slot for handling the up-directory button in the toolbar. */
-    void onUpDirectory();
+  void onUpDirectory ();
 
-    void setCurrentDirectory(QString currentDirectory);
+  void setCurrentDirectory (QString currentDirectory);
 
-    void currentDirectoryEntered();
+  void currentDirectoryEntered ();
 
-signals:
-    void openFile(QString fileName);
+    signals:void openFile (QString fileName);
 
 private:
-    // TODO: Add toolbar with buttons for navigating the path, creating dirs, etc
+  // TODO: Add toolbar with buttons for navigating the path, creating dirs, etc
 
     /** Toolbar for file and directory manipulation. */
-    QToolBar *m_navigationToolBar;
+    QToolBar * m_navigationToolBar;
 
     /** Variables for the up-directory action. */
-    QIcon m_directoryIcon;
-    QAction *m_directoryUpAction;
-    QToolButton *upDirectoryButton;
+  QIcon m_directoryIcon;
+  QAction *m_directoryUpAction;
+  QToolButton *upDirectoryButton;
 
     /** The file system model. */
-    QFileSystemModel *m_fileSystemModel;
+  QFileSystemModel *m_fileSystemModel;
 
     /** The file system view. */
-    QTreeView *m_fileTreeView;
-    QLineEdit *m_currentDirectory;
+  QTreeView *m_fileTreeView;
+  QLineEdit *m_currentDirectory;
 };
 
 #endif // FILESDOCKWIDGET_H

--- a/gui/src/HistoryDockWidget.cpp
+++ b/gui/src/HistoryDockWidget.cpp
@@ -19,43 +19,52 @@
 #include "HistoryDockWidget.h"
 #include <QHBoxLayout>
 
-HistoryDockWidget::HistoryDockWidget(QWidget *parent)
-    : QDockWidget(parent) {
-    setObjectName("HistoryDockWidget");
-    construct();
+HistoryDockWidget::HistoryDockWidget (QWidget * parent):QDockWidget (parent)
+{
+  setObjectName ("HistoryDockWidget");
+  construct ();
 }
 
-void HistoryDockWidget::handleListViewItemDoubleClicked(QModelIndex modelIndex) {
-    QString command = m_historyListModel->data(modelIndex, 0).toString();
-    emit commandDoubleClicked(command);
+void
+HistoryDockWidget::handleListViewItemDoubleClicked (QModelIndex modelIndex)
+{
+  QString command = m_historyListModel->data (modelIndex, 0).toString ();
+  emit commandDoubleClicked (command);
 }
 
-void HistoryDockWidget::construct() {
-    m_historyListModel = new QStringListModel();
-    m_historyListView = new QListView(this);
-    m_historyListView->setModel(m_historyListModel);
-    m_historyListView->setAlternatingRowColors(true);
-    m_historyListView->setEditTriggers(QAbstractItemView::NoEditTriggers);
-    QHBoxLayout *layout = new QHBoxLayout();
+void
+HistoryDockWidget::construct ()
+{
+  m_historyListModel = new QStringListModel ();
+  m_historyListView = new QListView (this);
+  m_historyListView->setModel (m_historyListModel);
+  m_historyListView->setAlternatingRowColors (true);
+  m_historyListView->setEditTriggers (QAbstractItemView::NoEditTriggers);
+  QHBoxLayout *layout = new QHBoxLayout ();
 
-    setWindowTitle(tr("Command History"));
-    setWidget(new QWidget());
+  setWindowTitle (tr ("Command History"));
+  setWidget (new QWidget ());
 
-    layout->addWidget(m_historyListView);
-    layout->setMargin(2);
+  layout->addWidget (m_historyListView);
+  layout->setMargin (2);
 
-    widget()->setLayout(layout);
-    connect(m_historyListView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(handleListViewItemDoubleClicked(QModelIndex)));
+  widget ()->setLayout (layout);
+  connect (m_historyListView, SIGNAL (doubleClicked (QModelIndex)), this,
+	   SLOT (handleListViewItemDoubleClicked (QModelIndex)));
 }
 
-void HistoryDockWidget::updateHistory(string_vector historyEntries) {
-    QStringList stringList = m_historyListModel->stringList();
-    for(int i = 0; i < historyEntries.length(); i++) {
-        QString command(historyEntries[i].c_str());
-        if(!command.startsWith("#")) {
-            stringList.push_front(command);
-        }
+void
+HistoryDockWidget::updateHistory (string_vector historyEntries)
+{
+  QStringList stringList = m_historyListModel->stringList ();
+  for (int i = 0; i < historyEntries.length (); i++)
+    {
+      QString command (historyEntries[i].c_str ());
+      if (!command.startsWith ("#"))
+	{
+	  stringList.push_front (command);
+	}
     }
-    m_historyListModel->setStringList(stringList);
-    emit information(tr("History updated."));
+  m_historyListModel->setStringList (stringList);
+  emit information (tr ("History updated."));
 }

--- a/gui/src/HistoryDockWidget.h
+++ b/gui/src/HistoryDockWidget.h
@@ -51,23 +51,21 @@
 #include "octave/symtab.h"
 #include "cmd-edit.h"
 
-class HistoryDockWidget : public QDockWidget {
-    Q_OBJECT
-public:
-    HistoryDockWidget(QWidget *parent = 0);
-    void updateHistory(string_vector historyEntries);
+class HistoryDockWidget:public QDockWidget
+{
+Q_OBJECT public:
+  HistoryDockWidget (QWidget * parent = 0);
+  void updateHistory (string_vector historyEntries);
 
-signals:
-    void information(QString message);
-    void commandDoubleClicked(QString command);
+    signals:void information (QString message);
+  void commandDoubleClicked (QString command);
 
-private slots:
-    void handleListViewItemDoubleClicked(QModelIndex modelIndex);
+  private slots:void handleListViewItemDoubleClicked (QModelIndex modelIndex);
 
 private:
-    void construct();
-    QListView *m_historyListView;
-    QStringListModel *m_historyListModel;
+  void construct ();
+  QListView *m_historyListView;
+  QStringListModel *m_historyListModel;
 };
 
 #endif // HISTORYDOCKWIDGET_H

--- a/gui/src/IRCWidget.cpp
+++ b/gui/src/IRCWidget.cpp
@@ -24,225 +24,319 @@
 #include <QSettings>
 #include <QInputDialog>
 
-IRCWidget::IRCWidget(QWidget *parent, QString settingsFile) :
-    QWidget(parent)
+IRCWidget::IRCWidget (QWidget * parent, QString settingsFile):
+QWidget (parent)
 {
-    m_settingsFile = settingsFile;
-    m_alternatingColor = false;
-    QSettings settings(m_settingsFile, QSettings::IniFormat);
-    bool connectOnStartup = settings.value("connectOnStartup").toBool();
-    m_autoIdentification = settings.value("autoIdentification").toBool();
-    m_nickServPassword = settings.value("nickServPassword").toString();
+  m_settingsFile = settingsFile;
+  m_alternatingColor = false;
+  QSettings settings (m_settingsFile, QSettings::IniFormat);
+  bool connectOnStartup = settings.value ("connectOnStartup").toBool ();
+  m_autoIdentification = settings.value ("autoIdentification").toBool ();
+  m_nickServPassword = settings.value ("nickServPassword").toString ();
 
-    m_initialNick = settings.value("IRCNick").toString();
+  m_initialNick = settings.value ("IRCNick").toString ();
+
+  if (m_initialNick.isEmpty ())
+    m_initialNick = "OctaveGUI-User";
+
+  QVBoxLayout *layout = new QVBoxLayout ();
 
-    if(m_initialNick.isEmpty())
-        m_initialNick = "OctaveGUI-User";
+  m_chatWindow = new QTextEdit (this);
+  m_chatWindow->setReadOnly (true);
+  m_chatWindow->setEnabled (false);
+  QWidget *bottomWidget = new QWidget (this);
 
-    QVBoxLayout *layout = new QVBoxLayout();
+  layout->addWidget (m_chatWindow);
+  layout->addWidget (bottomWidget);
+  setLayout (layout);
 
-    m_chatWindow = new QTextEdit(this);
-    m_chatWindow->setReadOnly(true);
-    m_chatWindow->setEnabled(false);
-    QWidget* bottomWidget = new QWidget(this);
-
-    layout->addWidget(m_chatWindow);
-    layout->addWidget(bottomWidget);
-    setLayout(layout);
+  QHBoxLayout *bottomLayout = new QHBoxLayout ();
+  m_nickButton = new QPushButton (bottomWidget);
+  m_nickButton->
+    setStatusTip (tr ((char *) "Click here to change your nick."));
+  m_nickButton->setText (m_initialNick);
+  m_inputLine = new QLineEdit (bottomWidget);
+  m_inputLine->setStatusTip (tr ((char *) "Enter your message here."));
+  bottomLayout->addWidget (m_nickButton);
+  bottomLayout->addWidget (new QLabel (":", this));
+  bottomLayout->addWidget (m_inputLine);
+  bottomLayout->setMargin (0);
+  bottomWidget->setLayout (bottomLayout);
+  m_nickButton->setEnabled (false);
+  m_inputLine->setEnabled (false);
 
-    QHBoxLayout *bottomLayout = new QHBoxLayout();
-    m_nickButton = new QPushButton(bottomWidget);
-    m_nickButton->setStatusTip(tr((char*)"Click here to change your nick."));
-    m_nickButton->setText(m_initialNick);
-    m_inputLine = new QLineEdit(bottomWidget);
-    m_inputLine->setStatusTip(tr((char*)"Enter your message here."));
-    bottomLayout->addWidget(m_nickButton);
-    bottomLayout->addWidget(new QLabel(":", this));
-    bottomLayout->addWidget(m_inputLine);
-    bottomLayout->setMargin(0);
-    bottomWidget->setLayout(bottomLayout);
-    m_nickButton->setEnabled(false);
-    m_inputLine->setEnabled(false);
+  m_chatWindow->setFocusProxy (m_inputLine);
+  m_nickButton->setFocusProxy (m_inputLine);
 
-    m_chatWindow->setFocusProxy(m_inputLine);
-    m_nickButton->setFocusProxy(m_inputLine);
+  QFont font;
+  font.setFamily ("Courier");
+  font.setPointSize (11);
+  m_chatWindow->setFont (font);
+  m_ircClient = new IRCClient ();
+
+  connect (m_nickButton, SIGNAL (clicked ()), this, SLOT (nickPopup ()));
+  connect (m_inputLine, SIGNAL (returnPressed ()), this,
+	   SLOT (sendInputLine ()));
 
-    QFont font;
-    font.setFamily("Courier");
-    font.setPointSize(11);
-    m_chatWindow->setFont(font);
-    m_ircClient = new IRCClient();
-
-    connect(m_nickButton, SIGNAL(clicked()), this, SLOT(nickPopup()));
-    connect(m_inputLine, SIGNAL(returnPressed()), this, SLOT(sendInputLine()));
+  connect (m_ircClient, SIGNAL (nickInUseChanged ()), this,
+	   SLOT (handleNickInUseChanged ()));
+  connect (m_ircClient, SIGNAL (connectionStatus (const char *)), this,
+	   SLOT (showStatusMessage (const char *)));
+  connect (m_ircClient, SIGNAL (error (const char *)), this,
+	   SLOT (showStatusMessage (const char *)));
+  connect (m_ircClient, SIGNAL (completedLogin (const char *)), this,
+	   SLOT (loginSuccessful (const char *)));
+  connect (m_ircClient, SIGNAL (completedLogin (const char *)), this,
+	   SLOT (joinOctaveChannel (const char *)));
+  connect (m_ircClient,
+	   SIGNAL (topic (const char *, const char *, const char *)), this,
+	   SLOT (showTopic (const char *, const char *, const char *)));
+  connect (m_ircClient, SIGNAL (join (const char *, const char *)), this,
+	   SLOT (showJoin (const char *, const char *)));
+  connect (m_ircClient, SIGNAL (quit (const char *, const char *)), this,
+	   SLOT (showQuit (const char *, const char *)));
+  connect (m_ircClient,
+	   SIGNAL (privateMessage (const char *, const char *, const char *)),
+	   this,
+	   SLOT (showPrivateMessage
+		 (const char *, const char *, const char *)));
+  connect (m_ircClient,
+	   SIGNAL (notice (const char *, const char *, const char *)), this,
+	   SLOT (showNotice (const char *, const char *, const char *)));
+  connect (m_ircClient, SIGNAL (nick (const char *, const char *)), this,
+	   SLOT (showNickChange (const char *, const char *)));
+  connect (m_ircClient, SIGNAL (replyCode (IRCEvent *)), this,
+	   SLOT (handleReplyCode (IRCEvent *)));
 
-    connect(m_ircClient, SIGNAL(nickInUseChanged()), this, SLOT(handleNickInUseChanged()));
-    connect(m_ircClient, SIGNAL(connectionStatus(const char*)), this, SLOT(showStatusMessage(const char*)));
-    connect(m_ircClient, SIGNAL(error(const char*)), this, SLOT(showStatusMessage(const char*)));
-    connect(m_ircClient, SIGNAL(completedLogin(const char*)), this, SLOT(loginSuccessful(const char*)));
-    connect(m_ircClient, SIGNAL(completedLogin(const char*)), this, SLOT(joinOctaveChannel(const char*)));
-    connect(m_ircClient, SIGNAL(topic(const char*,const char*,const char*)), this, SLOT(showTopic(const char*,const char*,const char*)));
-    connect(m_ircClient, SIGNAL(join(const char*,const char*)), this, SLOT(showJoin(const char*, const char*)));
-    connect(m_ircClient, SIGNAL(quit(const char*,const char*)), this, SLOT(showQuit(const char*,const char*)));
-    connect(m_ircClient, SIGNAL(privateMessage(const char*,const char*,const char*)), this, SLOT(showPrivateMessage(const char*,const char*,const char*)));
-    connect(m_ircClient, SIGNAL(notice(const char*,const char*,const char*)), this, SLOT(showNotice(const char*,const char*,const char*)));
-    connect(m_ircClient, SIGNAL(nick(const char*,const char*)), this, SLOT(showNickChange(const char*, const char*)));
-    connect(m_ircClient, SIGNAL(replyCode(IRCEvent*)), this, SLOT(handleReplyCode(IRCEvent*)));
-
-    if(connectOnStartup)
-        connectToServer();
+  if (connectOnStartup)
+    connectToServer ();
 }
 
-void IRCWidget::connectToServer() {
-    m_ircClient->connectToServer("irc.freenode.net", 6667,
-                                 m_initialNick.toStdString().c_str(),
-                                 m_initialNick.toStdString().c_str(),
-                                 "Unknown", "Unknown", 0, 0);
+void
+IRCWidget::connectToServer ()
+{
+  m_ircClient->connectToServer ("irc.freenode.net", 6667,
+				m_initialNick.toStdString ().c_str (),
+				m_initialNick.toStdString ().c_str (),
+				"Unknown", "Unknown", 0, 0);
 }
 
-void IRCWidget::showStatusMessage(const char *message) {
-    m_chatWindow->append(QString("<i>%1</i>").arg(message));
+void
+IRCWidget::showStatusMessage (const char *message)
+{
+  m_chatWindow->append (QString ("<i>%1</i>").arg (message));
 }
 
-void IRCWidget::joinOctaveChannel(const char*) {
-    m_ircClient->joinChannel("#octave");
+void
+IRCWidget::joinOctaveChannel (const char *)
+{
+  m_ircClient->joinChannel ("#octave");
 }
 
-void IRCWidget::loginSuccessful(const char *nick) {
-    m_chatWindow->append(QString("<i><font color=\"#00AA00\"><b>Successfully logged in as %1.</b></font></i>").arg(nick));
-    m_nickButton->setEnabled(true);
-    m_inputLine->setEnabled(true);
-    m_chatWindow->setEnabled(true);
-    m_inputLine->setFocus();
+void
+IRCWidget::loginSuccessful (const char *nick)
+{
+  m_chatWindow->
+    append (QString
+	    ("<i><font color=\"#00AA00\"><b>Successfully logged in as %1.</b></font></i>").
+	    arg (nick));
+  m_nickButton->setEnabled (true);
+  m_inputLine->setEnabled (true);
+  m_chatWindow->setEnabled (true);
+  m_inputLine->setFocus ();
 
-    if(m_autoIdentification)
-    m_ircClient->sendCommand(2, COMMAND_PRIVMSG,
-                             "NickServ",
-                             QString("identify %1").arg(m_nickServPassword).toStdString().c_str());
+  if (m_autoIdentification)
+    m_ircClient->sendCommand (2, COMMAND_PRIVMSG,
+			      "NickServ",
+			      QString ("identify %1").
+			      arg (m_nickServPassword).toStdString ().
+			      c_str ());
 }
 
-void IRCWidget::showPrivateMessage(const char *nick, const char *destination, const char *message) {
-    Q_UNUSED(destination);
-    QString msg(message);
-    if(msg.contains(m_ircClient->nickInUse())) {
-        msg = QString("<font color=\"#990000\"><b>%1:</b> %2</font>").arg(nick).arg(msg);
-    } else {
-        msg = QString("<font color=\"%3\"><b>%1:</b> %2</font>").arg(nick).arg(msg).arg(getAlternatingColor());
+void
+IRCWidget::showPrivateMessage (const char *nick, const char *destination,
+			       const char *message)
+{
+  Q_UNUSED (destination);
+  QString msg (message);
+  if (msg.contains (m_ircClient->nickInUse ()))
+    {
+      msg =
+	QString ("<font color=\"#990000\"><b>%1:</b> %2</font>").arg (nick).
+	arg (msg);
     }
-    m_chatWindow->append(msg);
-}
-
-void IRCWidget::showNotice(const char *nick, const char *destination, const char *message) {
-    Q_UNUSED(nick);
-    Q_UNUSED(destination);
-    m_chatWindow->append(QString("<font color=\"#007700\">%1</font>").arg(message));
+  else
+    {
+      msg =
+	QString ("<font color=\"%3\"><b>%1:</b> %2</font>").arg (nick).
+	arg (msg).arg (getAlternatingColor ());
+    }
+  m_chatWindow->append (msg);
 }
 
-void IRCWidget::showTopic(const char *nick, const char *channel, const char *message) {
-    m_chatWindow->append(QString("Topic for %2 was set by %1: %3").arg(nick).arg(channel).arg(message));
+void
+IRCWidget::showNotice (const char *nick, const char *destination,
+		       const char *message)
+{
+  Q_UNUSED (nick);
+  Q_UNUSED (destination);
+  m_chatWindow->append (QString ("<font color=\"#007700\">%1</font>").
+			arg (message));
+}
+
+void
+IRCWidget::showTopic (const char *nick, const char *channel,
+		      const char *message)
+{
+  m_chatWindow->append (QString ("Topic for %2 was set by %1: %3").arg (nick).
+			arg (channel).arg (message));
 }
 
-void IRCWidget::showNickChange(const char *oldNick, const char *newNick) {
-    m_chatWindow->append(QString("%1 is now known as %2.").arg(oldNick).arg(newNick));
-    m_nickList.removeAll(QString(oldNick));
-    m_nickList.append(QString(newNick));
-    updateNickCompleter();
+void
+IRCWidget::showNickChange (const char *oldNick, const char *newNick)
+{
+  m_chatWindow->append (QString ("%1 is now known as %2.").arg (oldNick).
+			arg (newNick));
+  m_nickList.removeAll (QString (oldNick));
+  m_nickList.append (QString (newNick));
+  updateNickCompleter ();
 }
 
-void IRCWidget::nickPopup() {
-    bool ok;
-    QString newNick = QInputDialog::getText(this, QString("Nickname"), QString("Type in your nickname:"),
-                           QLineEdit::Normal, m_ircClient->nickInUse(), &ok);
-    if(ok) {
-        m_ircClient->sendNickChange(newNick);
+void
+IRCWidget::nickPopup ()
+{
+  bool ok;
+  QString newNick =
+    QInputDialog::getText (this, QString ("Nickname"),
+			   QString ("Type in your nickname:"),
+			   QLineEdit::Normal, m_ircClient->nickInUse (), &ok);
+  if (ok)
+    {
+      m_ircClient->sendNickChange (newNick);
     }
 }
 
-void IRCWidget::showJoin(const char *nick, const char *channel) {
-    m_chatWindow->append(QString("<i>%1 has joined %2.</i>").arg(nick).arg(channel));
-    m_nickList.append(QString(nick));
-    updateNickCompleter();
+void
+IRCWidget::showJoin (const char *nick, const char *channel)
+{
+  m_chatWindow->append (QString ("<i>%1 has joined %2.</i>").arg (nick).
+			arg (channel));
+  m_nickList.append (QString (nick));
+  updateNickCompleter ();
 }
 
-void IRCWidget::showQuit(const char *nick, const char *reason) {
-    m_chatWindow->append(QString("<i>%1 has quit.(%2).</i>").arg(nick).arg(reason));
-    m_nickList.removeAll(QString(nick));
-    updateNickCompleter();
+void
+IRCWidget::showQuit (const char *nick, const char *reason)
+{
+  m_chatWindow->append (QString ("<i>%1 has quit.(%2).</i>").arg (nick).
+			arg (reason));
+  m_nickList.removeAll (QString (nick));
+  updateNickCompleter ();
 }
 
-void IRCWidget::sendMessage(QString message) {
-    // Do not send empty messages.
-    if(message.isEmpty())
-        return;
+void
+IRCWidget::sendMessage (QString message)
+{
+  // Do not send empty messages.
+  if (message.isEmpty ())
+    return;
 
-    // Remove trailing spaces.
-    while(message.at(0).isSpace()) message.remove(0, 1);
-    if(message.startsWith("/")) {
-        QStringList line = message.split(QRegExp("\\s+"), QString::SkipEmptyParts);
-        if(line.at(0) == "/join") {
-            m_ircClient->joinChannel(line.at(1));
-        } else if(line.at(0) == "/nick") {
-            m_ircClient->sendNickChange(line.at(1));
-        } else if(line.at(0) == "/msg") {
-            QString recipient = line.at(1);
-            // Since we splitted the message before, we have to glue it together again.
-            QString pmsg = "";
-            for(int i=2; i < line.length(); i++) {
-                pmsg += line.at(i);
-                pmsg += " ";
-            }
-            m_ircClient->sendCommand(2, COMMAND_PRIVMSG,
-                                     recipient.toStdString().c_str(),
-                                     pmsg.toStdString().c_str());
-        }
-    } else {
-        m_ircClient->sendPublicMessage(message);
-        m_chatWindow->append(QString("<b>%1:</b> %2").arg(m_ircClient->nickInUse()).arg(message));
+  // Remove trailing spaces.
+  while (message.at (0).isSpace ())
+    message.remove (0, 1);
+  if (message.startsWith ("/"))
+    {
+      QStringList line =
+	message.split (QRegExp ("\\s+"), QString::SkipEmptyParts);
+      if (line.at (0) == "/join")
+	{
+	  m_ircClient->joinChannel (line.at (1));
+	}
+      else if (line.at (0) == "/nick")
+	{
+	  m_ircClient->sendNickChange (line.at (1));
+	}
+      else if (line.at (0) == "/msg")
+	{
+	  QString recipient = line.at (1);
+	  // Since we splitted the message before, we have to glue it together again.
+	  QString pmsg = "";
+	  for (int i = 2; i < line.length (); i++)
+	    {
+	      pmsg += line.at (i);
+	      pmsg += " ";
+	    }
+	  m_ircClient->sendCommand (2, COMMAND_PRIVMSG,
+				    recipient.toStdString ().c_str (),
+				    pmsg.toStdString ().c_str ());
+	}
+    }
+  else
+    {
+      m_ircClient->sendPublicMessage (message);
+      m_chatWindow->append (QString ("<b>%1:</b> %2").
+			    arg (m_ircClient->nickInUse ()).arg (message));
     }
 }
 
-void IRCWidget::sendInputLine() {
-    sendMessage(m_inputLine->text());
-    m_inputLine->setText("");
+void
+IRCWidget::sendInputLine ()
+{
+  sendMessage (m_inputLine->text ());
+  m_inputLine->setText ("");
 }
 
-void IRCWidget::handleNickInUseChanged() {
-    m_nickButton->setText(m_ircClient->nickInUse());
-    QSettings settings(m_settingsFile, QSettings::IniFormat);
-    settings.setValue("IRCNick", m_ircClient->nickInUse());
+void
+IRCWidget::handleNickInUseChanged ()
+{
+  m_nickButton->setText (m_ircClient->nickInUse ());
+  QSettings settings (m_settingsFile, QSettings::IniFormat);
+  settings.setValue ("IRCNick", m_ircClient->nickInUse ());
 }
 
-void IRCWidget::handleReplyCode(IRCEvent *event) {
-    QSettings settings(m_settingsFile, QSettings::IniFormat);
+void
+IRCWidget::handleReplyCode (IRCEvent * event)
+{
+  QSettings settings (m_settingsFile, QSettings::IniFormat);
 
-    switch(event->getNumeric()) {
+  switch (event->getNumeric ())
+    {
     case RPL_MOTDSTART:
     case RPL_MOTD:
     case ERR_NOMOTD:
     case RPL_ENDOFMOTD:
-        if(settings.value("showMessageOfTheDay").toBool())
-            m_chatWindow->append(QString("<font color=\"#777777\">%1</font>").arg(event->getParam(1)));
-        break;
+      if (settings.value ("showMessageOfTheDay").toBool ())
+	m_chatWindow->append (QString ("<font color=\"#777777\">%1</font>").
+			      arg (event->getParam (1)));
+      break;
     case RPL_NOTOPIC:
     case RPL_TOPIC:
-        if(settings.value("showTopic").toBool())
-            m_chatWindow->append(QString("<font color=\"#000088\"><b>%1</b></font>").arg(event->getParam(2)));
-        break;
+      if (settings.value ("showTopic").toBool ())
+	m_chatWindow->
+	  append (QString ("<font color=\"#000088\"><b>%1</b></font>").
+		  arg (event->getParam (2)));
+      break;
     case RPL_NAMREPLY:
-        m_chatWindow->append(QString("<font color=\"#000088\">Users online: %1</font>").arg(event->getParam(3)));
-        m_nickList = event->getParam(3).split(QRegExp("\\s+"), QString::SkipEmptyParts);
-        updateNickCompleter();
-        break;
+      m_chatWindow->
+	append (QString ("<font color=\"#000088\">Users online: %1</font>").
+		arg (event->getParam (3)));
+      m_nickList =
+	event->getParam (3).split (QRegExp ("\\s+"), QString::SkipEmptyParts);
+      updateNickCompleter ();
+      break;
     case ERR_NICKNAMEINUSE:
     case ERR_NICKCOLLISION:
-        m_chatWindow->append(QString("<font color=\"#AA0000\">Nickname in use.</font>"));
-        break;
+      m_chatWindow->
+	append (QString ("<font color=\"#AA0000\">Nickname in use.</font>"));
+      break;
     };
 }
 
 
-void IRCWidget::updateNickCompleter() {
-    QCompleter *completer = new QCompleter(m_nickList, this);
-    completer->setCompletionMode(QCompleter::InlineCompletion);
-    m_inputLine->setCompleter(completer);
+void
+IRCWidget::updateNickCompleter ()
+{
+  QCompleter *completer = new QCompleter (m_nickList, this);
+  completer->setCompletionMode (QCompleter::InlineCompletion);
+  m_inputLine->setCompleter (completer);
 }

--- a/gui/src/IRCWidget.h
+++ b/gui/src/IRCWidget.h
@@ -26,52 +26,49 @@
 #include <QCompleter>
 #include "IRCClient.h"
 
-class IRCWidget : public QWidget
+class IRCWidget:public QWidget
 {
-    Q_OBJECT
-public:
-    explicit IRCWidget(QWidget *parent, QString settingsFile);
-    void connectToServer();
-
-signals:
+Q_OBJECT public:
+  explicit IRCWidget (QWidget * parent, QString settingsFile);
+  void connectToServer ();
 
-public slots:
-    void showStatusMessage(const char*);
-    void joinOctaveChannel(const char*);
-    void loginSuccessful(const char*);
-    void showPrivateMessage(const char*, const char*, const char*);
-    void showNotice(const char*, const char*, const char*);
-    void showTopic(const char*, const char*, const char*);
-    void showJoin(const char*, const char*);
-    void showQuit(const char*, const char*);
-    void showNickChange(const char*, const char*);
-    void nickPopup();
-    void sendMessage(QString);
-    void sendInputLine();
+    signals:public slots:void showStatusMessage (const char *);
+  void joinOctaveChannel (const char *);
+  void loginSuccessful (const char *);
+  void showPrivateMessage (const char *, const char *, const char *);
+  void showNotice (const char *, const char *, const char *);
+  void showTopic (const char *, const char *, const char *);
+  void showJoin (const char *, const char *);
+  void showQuit (const char *, const char *);
+  void showNickChange (const char *, const char *);
+  void nickPopup ();
+  void sendMessage (QString);
+  void sendInputLine ();
+
+  void handleNickInUseChanged ();
+  void handleReplyCode (IRCEvent * event);
 
-    void handleNickInUseChanged();
-    void handleReplyCode(IRCEvent *event);
-
-    void updateNickCompleter();
+  void updateNickCompleter ();
 private:
-    IRCClient *m_ircClient;
-    QTextEdit *m_chatWindow;
-    QPushButton *m_nickButton;
-    QLineEdit *m_inputLine;
-    bool m_alternatingColor;
+    IRCClient * m_ircClient;
+  QTextEdit *m_chatWindow;
+  QPushButton *m_nickButton;
+  QLineEdit *m_inputLine;
+  bool m_alternatingColor;
 
-    QString getAlternatingColor() {
-        m_alternatingColor = !m_alternatingColor;
-        if(m_alternatingColor)
-            return "#000077";
-        return "#005533";
-    }
+  QString getAlternatingColor ()
+  {
+    m_alternatingColor = !m_alternatingColor;
+    if (m_alternatingColor)
+      return "#000077";
+    return "#005533";
+  }
 
-    QString m_initialNick;
-    bool m_autoIdentification;
-    QString m_nickServPassword;
-    QString m_settingsFile;
-    QStringList m_nickList;
+  QString m_initialNick;
+  bool m_autoIdentification;
+  QString m_nickServPassword;
+  QString m_settingsFile;
+  QStringList m_nickList;
 };
 
 #endif // IRCWIDGET_H

--- a/gui/src/ImageViewerMdiSubWindow.cpp
+++ b/gui/src/ImageViewerMdiSubWindow.cpp
@@ -21,21 +21,24 @@
 #include <QPixmap>
 #include <QScrollArea>
 
-ImageViewerMdiSubWindow::ImageViewerMdiSubWindow(QPixmap pixmap, QWidget *parent)
-    : QMdiSubWindow(parent),
-      m_pixmap(pixmap) {
-    construct();
+ImageViewerMdiSubWindow::ImageViewerMdiSubWindow (QPixmap pixmap, QWidget * parent):QMdiSubWindow (parent),
+m_pixmap
+(pixmap)
+{
+  construct ();
 }
 
-void ImageViewerMdiSubWindow::construct() {
-    QLabel *label = new QLabel();
-    label->setBackgroundRole(QPalette::Base);
-    label->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
-    label->setScaledContents(true);
-    label->setPixmap(m_pixmap);
+void
+ImageViewerMdiSubWindow::construct ()
+{
+  QLabel *label = new QLabel ();
+  label->setBackgroundRole (QPalette::Base);
+  label->setSizePolicy (QSizePolicy::Ignored, QSizePolicy::Ignored);
+  label->setScaledContents (true);
+  label->setPixmap (m_pixmap);
 
-    QScrollArea *scrollArea = new QScrollArea(this);
-    scrollArea->setBackgroundRole(QPalette::Dark);
-    scrollArea->setWidget(label);
-    setWidget(scrollArea);
+  QScrollArea *scrollArea = new QScrollArea (this);
+  scrollArea->setBackgroundRole (QPalette::Dark);
+  scrollArea->setWidget (label);
+  setWidget (scrollArea);
 }

--- a/gui/src/ImageViewerMdiSubWindow.h
+++ b/gui/src/ImageViewerMdiSubWindow.h
@@ -21,14 +21,14 @@
 
 #include <QMdiSubWindow>
 
-class ImageViewerMdiSubWindow : public QMdiSubWindow
+class ImageViewerMdiSubWindow:public QMdiSubWindow
 {
 public:
-    ImageViewerMdiSubWindow(QPixmap pixmap, QWidget *parent = 0);
+  ImageViewerMdiSubWindow (QPixmap pixmap, QWidget * parent = 0);
 
 private:
-    void construct();
-    QPixmap m_pixmap;
+  void construct ();
+  QPixmap m_pixmap;
 };
 
 #endif // IMAGEVIEWERMDISUBWINDOW_H

--- a/gui/src/MainWindow.cpp
+++ b/gui/src/MainWindow.cpp
@@ -27,198 +27,265 @@
 #include "ImageViewerMdiSubWindow.h"
 #include "SettingsDialog.h"
 
-MainWindow::MainWindow(QWidget *parent)
-    : QMainWindow(parent),
-      m_isRunning(true) {
-    QDesktopServices desktopServices;
-    m_settingsFile = desktopServices.storageLocation(QDesktopServices::HomeLocation) + "/.quint/settings.ini";
-    construct();
-    establishOctaveLink();
+MainWindow::MainWindow (QWidget * parent):QMainWindow (parent),
+m_isRunning (true)
+{
+  QDesktopServices
+    desktopServices;
+  m_settingsFile =
+    desktopServices.storageLocation (QDesktopServices::HomeLocation) +
+    "/.quint/settings.ini";
+  construct ();
+  establishOctaveLink ();
 }
 
-MainWindow::~MainWindow() {
+MainWindow::~MainWindow ()
+{
 }
 
-void MainWindow::handleOpenFileRequest(QString fileName) {
-    reportStatusMessage(tr("Opening file."));
-    QPixmap pixmap;
-    if(pixmap.load(fileName)) {
+void
+MainWindow::handleOpenFileRequest (QString fileName)
+{
+  reportStatusMessage (tr ("Opening file."));
+  QPixmap pixmap;
+  if (pixmap.load (fileName))
+    {
 //        ImageViewerMdiSubWindow *subWindow = new ImageViewerMdiSubWindow(pixmap, this);
 //        subWindow->setAttribute(Qt::WA_DeleteOnClose);
 //        m_centralMdiArea->addSubWindow(subWindow);
 //        subWindow->setWindowTitle(fileName);
-    } else {
-        FileEditorMdiSubWindow *subWindow = new FileEditorMdiSubWindow(m_centralMdiArea);
-        subWindow->setAttribute(Qt::WA_DeleteOnClose);
+    }
+  else
+    {
+      FileEditorMdiSubWindow *subWindow =
+	new FileEditorMdiSubWindow (m_centralMdiArea);
+      subWindow->setAttribute (Qt::WA_DeleteOnClose);
 // addSubWindow uncommented to avoid "QMdiArea::addSubWindow: window is already added"
 //        m_centralMdiArea->addSubWindow(subWindow);
-        subWindow->loadFile(fileName);
+      subWindow->loadFile (fileName);
     }
 }
 
-void MainWindow::reportStatusMessage(QString statusMessage) {
-    m_statusBar->showMessage(statusMessage, 1000);
+void
+MainWindow::reportStatusMessage (QString statusMessage)
+{
+  m_statusBar->showMessage (statusMessage, 1000);
 }
 
-void MainWindow::openWebPage(QString url) {
-    m_documentationWidget->load(QUrl(url));
-}
-
-void MainWindow::handleSaveWorkspaceRequest() {
-    QDesktopServices desktopServices;
-    QString selectedFile = QFileDialog::getSaveFileName(this, tr("Save Workspace"),
-        desktopServices.storageLocation(QDesktopServices::HomeLocation) + "/.quint/workspace");
-    m_octaveTerminal->sendText(QString("save \'%1\'\n").arg(selectedFile));
-    m_octaveTerminal->setFocus();
+void
+MainWindow::openWebPage (QString url)
+{
+  m_documentationWidget->load (QUrl (url));
 }
 
-void MainWindow::handleLoadWorkspaceRequest() {
-    QDesktopServices desktopServices;
-    QString selectedFile = QFileDialog::getOpenFileName(this, tr("Load Workspace"),
-        desktopServices.storageLocation(QDesktopServices::HomeLocation) + "/.quint/workspace");
-    m_octaveTerminal->sendText(QString("load \'%1\'\n").arg(selectedFile));
-    m_octaveTerminal->setFocus();
+void
+MainWindow::handleSaveWorkspaceRequest ()
+{
+  QDesktopServices desktopServices;
+  QString selectedFile =
+    QFileDialog::getSaveFileName (this, tr ("Save Workspace"),
+				  desktopServices.
+				  storageLocation (QDesktopServices::
+						   HomeLocation) +
+				  "/.quint/workspace");
+  m_octaveTerminal->sendText (QString ("save \'%1\'\n").arg (selectedFile));
+  m_octaveTerminal->setFocus ();
 }
 
-void MainWindow::handleClearWorkspaceRequest() {
-    m_octaveTerminal->sendText("clear\n");
-    m_octaveTerminal->setFocus();
+void
+MainWindow::handleLoadWorkspaceRequest ()
+{
+  QDesktopServices desktopServices;
+  QString selectedFile =
+    QFileDialog::getOpenFileName (this, tr ("Load Workspace"),
+				  desktopServices.
+				  storageLocation (QDesktopServices::
+						   HomeLocation) +
+				  "/.quint/workspace");
+  m_octaveTerminal->sendText (QString ("load \'%1\'\n").arg (selectedFile));
+  m_octaveTerminal->setFocus ();
 }
 
-void MainWindow::handleCommandDoubleClicked(QString command) {
-    m_octaveTerminal->sendText(command);
-    m_octaveTerminal->setFocus();
+void
+MainWindow::handleClearWorkspaceRequest ()
+{
+  m_octaveTerminal->sendText ("clear\n");
+  m_octaveTerminal->setFocus ();
 }
 
-void MainWindow::alignMdiWindows() {
-    m_centralMdiArea->tileSubWindows();
+void
+MainWindow::handleCommandDoubleClicked (QString command)
+{
+  m_octaveTerminal->sendText (command);
+  m_octaveTerminal->setFocus ();
+}
+
+void
+MainWindow::alignMdiWindows ()
+{
+  m_centralMdiArea->tileSubWindows ();
 }
 
-void MainWindow::openBugTrackerPage() {
-    QDesktopServices::openUrl(QUrl("http://savannah.gnu.org/bugs/?group=octave"));
+void
+MainWindow::openBugTrackerPage ()
+{
+  QDesktopServices::
+    openUrl (QUrl ("http://savannah.gnu.org/bugs/?group=octave"));
 }
 
-void MainWindow::processSettingsDialogRequest() {
-    SettingsDialog settingsDialog(this, m_settingsFile);
-    settingsDialog.exec();
+void
+MainWindow::processSettingsDialogRequest ()
+{
+  SettingsDialog settingsDialog (this, m_settingsFile);
+  settingsDialog.exec ();
 }
 
-void MainWindow::closeEvent(QCloseEvent *closeEvent) {
-    m_isRunning = false;
-    reportStatusMessage(tr("Saving data and shutting down."));
-    writeSettings();
+void
+MainWindow::closeEvent (QCloseEvent * closeEvent)
+{
+  m_isRunning = false;
+  reportStatusMessage (tr ("Saving data and shutting down."));
+  writeSettings ();
 
-    m_octaveCallbackThread->terminate();
-    m_octaveCallbackThread->wait();
+  m_octaveCallbackThread->terminate ();
+  m_octaveCallbackThread->wait ();
 
-    m_octaveMainThread->terminate();
-    QMainWindow::closeEvent(closeEvent);
+  m_octaveMainThread->terminate ();
+  QMainWindow::closeEvent (closeEvent);
 }
 
-void MainWindow::readSettings() {
-    QSettings settings(m_settingsFile, QSettings::IniFormat);
-    restoreGeometry(settings.value("MainWindow/geometry").toByteArray());
-    restoreState(settings.value("MainWindow/windowState").toByteArray());
+void
+MainWindow::readSettings ()
+{
+  QSettings settings (m_settingsFile, QSettings::IniFormat);
+  restoreGeometry (settings.value ("MainWindow/geometry").toByteArray ());
+  restoreState (settings.value ("MainWindow/windowState").toByteArray ());
 }
 
-void MainWindow::writeSettings() {
-    QSettings settings(m_settingsFile, QSettings::IniFormat);
-    settings.setValue("MainWindow/geometry", saveGeometry());
-    settings.setValue("MainWindow/windowState", saveState());
+void
+MainWindow::writeSettings ()
+{
+  QSettings settings (m_settingsFile, QSettings::IniFormat);
+  settings.setValue ("MainWindow/geometry", saveGeometry ());
+  settings.setValue ("MainWindow/windowState", saveState ());
 }
 
-void MainWindow::construct() {
+void
+MainWindow::construct ()
+{
+
+  if (QFile::exists ("../media/logo.png"))
+    setWindowIcon (QIcon ("../media/logo.png"));
+  else
+    setWindowIcon (QIcon ("/usr/share/octave/quint/media/logo.png"));
 
-    if(QFile::exists("../media/logo.png"))
-        setWindowIcon(QIcon("../media/logo.png"));
-    else
-        setWindowIcon(QIcon("/usr/share/octave/quint/media/logo.png"));
+  // Initialize MDI area.
+  m_centralMdiArea = new QMdiArea (this);
+  m_centralMdiArea->setObjectName ("CentralMdiArea");
+  m_centralMdiArea->setViewMode (QMdiArea::TabbedView);
 
-    // Initialize MDI area.
-    m_centralMdiArea = new QMdiArea(this);
-    m_centralMdiArea->setObjectName("CentralMdiArea");
-    m_centralMdiArea->setViewMode(QMdiArea::TabbedView);
+  // Setup dockable widgets and the status bar.
+  m_variablesDockWidget = new VariablesDockWidget (this);
+  m_historyDockWidget = new HistoryDockWidget (this);
+  m_filesDockWidget = new FilesDockWidget (this);
+  m_statusBar = new QStatusBar (this);
 
-    // Setup dockable widgets and the status bar.
-    m_variablesDockWidget = new VariablesDockWidget(this);
-    m_historyDockWidget = new HistoryDockWidget(this);
-    m_filesDockWidget = new FilesDockWidget(this);
-    m_statusBar = new QStatusBar(this);
-
-    // Setup essential MDI Windows.
-    m_octaveTerminal = new OctaveTerminal(this);
-    m_documentationWidget = new BrowserWidget(this);
-    m_ircWidget = new IRCWidget(this, m_settingsFile);
+  // Setup essential MDI Windows.
+  m_octaveTerminal = new OctaveTerminal (this);
+  m_documentationWidget = new BrowserWidget (this);
+  m_ircWidget = new IRCWidget (this, m_settingsFile);
 
-    m_documentationWidgetSubWindow = m_centralMdiArea->addSubWindow(m_documentationWidget,
-        Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint);
-    m_documentationWidgetSubWindow->setObjectName("DocumentationWidgetSubWindow");
-    m_documentationWidgetSubWindow->setWindowTitle(tr("Documentation"));
-    m_documentationWidgetSubWindow->setWindowIcon(QIcon("../media/help_index.png"));
+  m_documentationWidgetSubWindow =
+    m_centralMdiArea->addSubWindow (m_documentationWidget,
+				    Qt::WindowTitleHint | Qt::
+				    WindowMinMaxButtonsHint);
+  m_documentationWidgetSubWindow->
+    setObjectName ("DocumentationWidgetSubWindow");
+  m_documentationWidgetSubWindow->setWindowTitle (tr ("Documentation"));
+  m_documentationWidgetSubWindow->
+    setWindowIcon (QIcon ("../media/help_index.png"));
 
-    m_octaveTerminalSubWindow = m_centralMdiArea->addSubWindow(m_octaveTerminal,
-        Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint);
-    m_octaveTerminalSubWindow->setObjectName("OctaveTerminalSubWindow");
-    m_octaveTerminalSubWindow->setWindowTitle(tr("Terminal"));
-    m_octaveTerminalSubWindow->setWindowIcon(QIcon("../media/terminal.png"));
+  m_octaveTerminalSubWindow =
+    m_centralMdiArea->addSubWindow (m_octaveTerminal,
+				    Qt::WindowTitleHint | Qt::
+				    WindowMinMaxButtonsHint);
+  m_octaveTerminalSubWindow->setObjectName ("OctaveTerminalSubWindow");
+  m_octaveTerminalSubWindow->setWindowTitle (tr ("Terminal"));
+  m_octaveTerminalSubWindow->setWindowIcon (QIcon ("../media/terminal.png"));
 
-    m_ircWidgetSubWindow = m_centralMdiArea->addSubWindow(m_ircWidget,
-        Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint);
-    m_ircWidgetSubWindow->setObjectName("ChatWidgetSubWindow");
-    m_ircWidgetSubWindow->setWindowTitle(tr("Chat"));
-    m_ircWidgetSubWindow->setWindowIcon(QIcon("../media/chat.png"));
+  m_ircWidgetSubWindow = m_centralMdiArea->addSubWindow (m_ircWidget,
+							 Qt::
+							 WindowTitleHint |
+							 Qt::
+							 WindowMinMaxButtonsHint);
+  m_ircWidgetSubWindow->setObjectName ("ChatWidgetSubWindow");
+  m_ircWidgetSubWindow->setWindowTitle (tr ("Chat"));
+  m_ircWidgetSubWindow->setWindowIcon (QIcon ("../media/chat.png"));
 
-    QMenu *controlMenu = menuBar()->addMenu(tr("Octave"));
-    QAction *settingsAction = controlMenu->addAction(tr("Settings"));
-    controlMenu->addSeparator();
-    QAction *exitAction = controlMenu->addAction(tr("Exit"));
+  QMenu *controlMenu = menuBar ()->addMenu (tr ("Octave"));
+  QAction *settingsAction = controlMenu->addAction (tr ("Settings"));
+  controlMenu->addSeparator ();
+  QAction *exitAction = controlMenu->addAction (tr ("Exit"));
 
-    QMenu *interfaceMenu = menuBar()->addMenu(tr("Interface"));
-    QAction *alignWindowsAction = interfaceMenu->addAction(tr("Align Windows"));
+  QMenu *interfaceMenu = menuBar ()->addMenu (tr ("Interface"));
+  QAction *alignWindowsAction =
+    interfaceMenu->addAction (tr ("Align Windows"));
 
-    QMenu *communityMenu = menuBar()->addMenu(tr("Community"));
-    QAction *reportBugAction = communityMenu->addAction(tr("Report Bug"));
+  QMenu *communityMenu = menuBar ()->addMenu (tr ("Community"));
+  QAction *reportBugAction = communityMenu->addAction (tr ("Report Bug"));
 
-    connect(settingsAction, SIGNAL(triggered()), this, SLOT(processSettingsDialogRequest()));
-    connect(exitAction, SIGNAL(triggered()), this, SLOT(close()));
-    connect(alignWindowsAction, SIGNAL(triggered()), this, SLOT(alignMdiWindows()));
-    connect(reportBugAction, SIGNAL(triggered()), this, SLOT(openBugTrackerPage()));
+  connect (settingsAction, SIGNAL (triggered ()), this,
+	   SLOT (processSettingsDialogRequest ()));
+  connect (exitAction, SIGNAL (triggered ()), this, SLOT (close ()));
+  connect (alignWindowsAction, SIGNAL (triggered ()), this,
+	   SLOT (alignMdiWindows ()));
+  connect (reportBugAction, SIGNAL (triggered ()), this,
+	   SLOT (openBugTrackerPage ()));
+
+  setWindowTitle ("Octave");
+  setCentralWidget (m_centralMdiArea);
+  addDockWidget (Qt::LeftDockWidgetArea, m_variablesDockWidget);
+  addDockWidget (Qt::LeftDockWidgetArea, m_historyDockWidget);
+  addDockWidget (Qt::RightDockWidgetArea, m_filesDockWidget);
+  setStatusBar (m_statusBar);
 
-    setWindowTitle("Octave");
-    setCentralWidget(m_centralMdiArea);
-    addDockWidget(Qt::LeftDockWidgetArea, m_variablesDockWidget);
-    addDockWidget(Qt::LeftDockWidgetArea, m_historyDockWidget);
-    addDockWidget(Qt::RightDockWidgetArea, m_filesDockWidget);
-    setStatusBar(m_statusBar);
-
-    readSettings();
+  readSettings ();
 
-    connect(m_filesDockWidget, SIGNAL(openFile(QString)), this, SLOT(handleOpenFileRequest(QString)));
-    connect(m_historyDockWidget, SIGNAL(information(QString)), this, SLOT(reportStatusMessage(QString)));
-    connect(m_historyDockWidget, SIGNAL(commandDoubleClicked(QString)), this, SLOT(handleCommandDoubleClicked(QString)));
-    connect(m_variablesDockWidget, SIGNAL(saveWorkspace()), this, SLOT(handleSaveWorkspaceRequest()));
-    connect(m_variablesDockWidget, SIGNAL(loadWorkspace()), this, SLOT(handleLoadWorkspaceRequest()));
-    connect(m_variablesDockWidget, SIGNAL(clearWorkspace()), this, SLOT(handleClearWorkspaceRequest()));
+  connect (m_filesDockWidget, SIGNAL (openFile (QString)), this,
+	   SLOT (handleOpenFileRequest (QString)));
+  connect (m_historyDockWidget, SIGNAL (information (QString)), this,
+	   SLOT (reportStatusMessage (QString)));
+  connect (m_historyDockWidget, SIGNAL (commandDoubleClicked (QString)), this,
+	   SLOT (handleCommandDoubleClicked (QString)));
+  connect (m_variablesDockWidget, SIGNAL (saveWorkspace ()), this,
+	   SLOT (handleSaveWorkspaceRequest ()));
+  connect (m_variablesDockWidget, SIGNAL (loadWorkspace ()), this,
+	   SLOT (handleLoadWorkspaceRequest ()));
+  connect (m_variablesDockWidget, SIGNAL (clearWorkspace ()), this,
+	   SLOT (handleClearWorkspaceRequest ()));
 
-    openWebPage("http://www.gnu.org/software/octave/doc/interpreter/");
+  openWebPage ("http://www.gnu.org/software/octave/doc/interpreter/");
 }
 
-void MainWindow::establishOctaveLink() {
-    m_octaveMainThread = new OctaveMainThread(this);
-    m_octaveMainThread->start();
+void
+MainWindow::establishOctaveLink ()
+{
+  m_octaveMainThread = new OctaveMainThread (this);
+  m_octaveMainThread->start ();
 
-    m_octaveCallbackThread = new OctaveCallbackThread(this, this);
-    m_octaveCallbackThread->start();
+  m_octaveCallbackThread = new OctaveCallbackThread (this, this);
+  m_octaveCallbackThread->start ();
 
-    command_editor::add_event_hook(OctaveLink::readlineEventHook);
+  command_editor::add_event_hook (OctaveLink::readlineEventHook);
 
-    int fdm, fds;
-    if(openpty(&fdm, &fds, 0, 0, 0) < 0) {
-        assert(0);
+  int fdm, fds;
+  if (openpty (&fdm, &fds, 0, 0, 0) < 0)
+    {
+      assert (0);
     }
-    dup2 (fds, 0);
-    dup2 (fds, 1);
-    dup2 (fds, 2);
-    m_octaveTerminal->openTeletype(fdm);
-    reportStatusMessage(tr("Established link to Octave."));
+  dup2 (fds, 0);
+  dup2 (fds, 1);
+  dup2 (fds, 2);
+  m_octaveTerminal->openTeletype (fdm);
+  reportStatusMessage (tr ("Established link to Octave."));
 }

--- a/gui/src/MainWindow.h
+++ b/gui/src/MainWindow.h
@@ -63,7 +63,7 @@
 #include "cmd-edit.h"
 
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
-extern OCTINTERP_API YY_BUFFER_STATE create_buffer (FILE *f);
+extern OCTINTERP_API YY_BUFFER_STATE create_buffer (FILE * f);
 extern OCTINTERP_API void switch_to_buffer (YY_BUFFER_STATE buf);
 extern OCTINTERP_API FILE *get_input_from_stdin (void);
 
@@ -85,110 +85,133 @@
   *
   * Represents the main window.
   */
-class MainWindow : public QMainWindow {
-    Q_OBJECT
-public:
-    MainWindow(QWidget *parent = 0);
-    ~MainWindow();
-
-    bool isRunning() { return m_isRunning; }
-    OctaveTerminal *octaveTerminal() { return m_octaveTerminal; }
-    VariablesDockWidget *variablesDockWidget() { return m_variablesDockWidget; }
-    HistoryDockWidget *historyDockWidget() { return m_historyDockWidget; }
-    FilesDockWidget *filesDockWidget() { return m_filesDockWidget; }
+class MainWindow:public QMainWindow
+{
+Q_OBJECT public:
+  MainWindow (QWidget * parent = 0);
+  ~MainWindow ();
 
-public slots:
-    void handleOpenFileRequest(QString fileName);
-    void reportStatusMessage(QString statusMessage);
-    void openWebPage(QString url);
-    void handleSaveWorkspaceRequest();
-    void handleLoadWorkspaceRequest();
-    void handleClearWorkspaceRequest();
-    void handleCommandDoubleClicked(QString command);
-    void alignMdiWindows();
-    void openBugTrackerPage();
-    void processSettingsDialogRequest();
+  bool isRunning ()
+  {
+    return m_isRunning;
+  }
+  OctaveTerminal *octaveTerminal ()
+  {
+    return m_octaveTerminal;
+  }
+  VariablesDockWidget *variablesDockWidget ()
+  {
+    return m_variablesDockWidget;
+  }
+  HistoryDockWidget *historyDockWidget ()
+  {
+    return m_historyDockWidget;
+  }
+  FilesDockWidget *filesDockWidget ()
+  {
+    return m_filesDockWidget;
+  }
+
+  public slots:void handleOpenFileRequest (QString fileName);
+  void reportStatusMessage (QString statusMessage);
+  void openWebPage (QString url);
+  void handleSaveWorkspaceRequest ();
+  void handleLoadWorkspaceRequest ();
+  void handleClearWorkspaceRequest ();
+  void handleCommandDoubleClicked (QString command);
+  void alignMdiWindows ();
+  void openBugTrackerPage ();
+  void processSettingsDialogRequest ();
 
 protected:
-    void closeEvent(QCloseEvent *closeEvent);
-    void readSettings();
-    void writeSettings();
+  void closeEvent (QCloseEvent * closeEvent);
+  void readSettings ();
+  void writeSettings ();
 
 private:
-    void construct();
-    void establishOctaveLink();
-    QMdiArea *m_centralMdiArea;
+  void construct ();
+  void establishOctaveLink ();
+  QMdiArea *m_centralMdiArea;
 
-    // Mdi sub windows.
-    OctaveTerminal *m_octaveTerminal;
-    BrowserWidget *m_documentationWidget;
-    IRCWidget *m_ircWidget;
+  // Mdi sub windows.
+  OctaveTerminal *m_octaveTerminal;
+  BrowserWidget *m_documentationWidget;
+  IRCWidget *m_ircWidget;
 
-    QMdiSubWindow *m_octaveTerminalSubWindow;
-    QMdiSubWindow *m_documentationWidgetSubWindow;
-    QMdiSubWindow *m_ircWidgetSubWindow;
+  QMdiSubWindow *m_octaveTerminalSubWindow;
+  QMdiSubWindow *m_documentationWidgetSubWindow;
+  QMdiSubWindow *m_ircWidgetSubWindow;
 
-    // Dock widgets.
-    VariablesDockWidget *m_variablesDockWidget;
-    HistoryDockWidget *m_historyDockWidget;
-    FilesDockWidget *m_filesDockWidget;
+  // Dock widgets.
+  VariablesDockWidget *m_variablesDockWidget;
+  HistoryDockWidget *m_historyDockWidget;
+  FilesDockWidget *m_filesDockWidget;
 
-    // Toolbars.
-    QStatusBar *m_statusBar;
+  // Toolbars.
+  QStatusBar *m_statusBar;
 
-    QString m_settingsFile;
+  QString m_settingsFile;
 
-    // Threads for running octave and managing the data interaction.
-    OctaveMainThread *m_octaveMainThread;
-    OctaveCallbackThread *m_octaveCallbackThread;
-    bool m_isRunning;
+  // Threads for running octave and managing the data interaction.
+  OctaveMainThread *m_octaveMainThread;
+  OctaveCallbackThread *m_octaveCallbackThread;
+  bool m_isRunning;
 };
 
-class OctaveMainThread : public QThread {
-    Q_OBJECT
-public:
-    OctaveMainThread(QObject *parent)
-        : QThread(parent) {
-    }
+class OctaveMainThread:public QThread
+{
+Q_OBJECT public:
+  OctaveMainThread (QObject * parent):QThread (parent)
+  {
+  }
 protected:
-    void run() {
-        int argc = 3;
-        const char* argv[] = {"octave", "--interactive", "--line-editing"};
-        octave_main(argc, (char**)argv, 1);
-        main_loop();
-        clean_up_and_exit(0);
-    }
+  void run ()
+  {
+    int argc = 3;
+    const char *argv[] = { "octave", "--interactive", "--line-editing" };
+    octave_main (argc, (char **) argv, 1);
+    main_loop ();
+    clean_up_and_exit (0);
+  }
 };
 
-class OctaveCallbackThread : public QThread {
-    Q_OBJECT
-public:
-    OctaveCallbackThread(QObject *parent, MainWindow *mainWindow)
-        : QThread(parent),
-          m_mainWindow(mainWindow) {
-    }
+class OctaveCallbackThread:public QThread
+{
+Q_OBJECT public:
+  OctaveCallbackThread (QObject * parent,
+			MainWindow * mainWindow):QThread (parent),
+    m_mainWindow (mainWindow)
+  {
+  }
 
 protected:
-    void run() {
-        while(m_mainWindow->isRunning()) {
+  void run ()
+  {
+    while (m_mainWindow->isRunning ())
+      {
 
-        // Get a full variable list.
-        QList<SymbolRecord> symbolTable = OctaveLink::instance()->currentSymbolTable();
-        if(symbolTable.size()) {
-            m_mainWindow->variablesDockWidget()->setVariablesList(symbolTable);
-        }
+	// Get a full variable list.
+	QList < SymbolRecord > symbolTable =
+	  OctaveLink::instance ()->currentSymbolTable ();
+	if (symbolTable.size ())
+	  {
+	    m_mainWindow->variablesDockWidget ()->
+	      setVariablesList (symbolTable);
+	  }
 
-        // Collect history list.
-        string_vector historyList = OctaveLink::instance()->currentHistory();
-        if(historyList.length()) {
-            m_mainWindow->historyDockWidget()->updateHistory(historyList);
-        }
+	// Collect history list.
+	string_vector historyList =
+	  OctaveLink::instance ()->currentHistory ();
+	if (historyList.length ())
+	  {
+	    m_mainWindow->historyDockWidget ()->updateHistory (historyList);
+	  }
 
-            usleep(100000);
-        }
-    }
+	usleep (100000);
+      }
+  }
 private:
-    MainWindow *m_mainWindow;
+  MainWindow * m_mainWindow;
 };
 
 #endif // MAINWINDOW_H

--- a/gui/src/OctaveGUI.cpp
+++ b/gui/src/OctaveGUI.cpp
@@ -21,24 +21,32 @@
 #include <QSettings>
 #include "MainWindow.h"
 
-int main(int argc, char *argv[])
+int
+main (int argc, char *argv[])
 {
-    QApplication application(argc, argv);
-    QDesktopServices desktopServices;
-    QSettings settings(
-                desktopServices.storageLocation(QDesktopServices::HomeLocation)
-                + "/.quint/settings.ini", QSettings::IniFormat);
+  QApplication application (argc, argv);
+  QDesktopServices desktopServices;
+  QSettings settings (desktopServices.
+		      storageLocation (QDesktopServices::HomeLocation) +
+		      "/.quint/settings.ini", QSettings::IniFormat);
 
-    QTranslator translator;
-    QString translatorFile = QString("../languages/%1.qm").arg(settings.value("application/language").toString());
-    if(!QFile::exists(translatorFile))
-        translatorFile =  QString("/usr/share/octave/quint/languages/%1.qm").arg(settings.value("application/language").toString());
+  QTranslator translator;
+  QString translatorFile =
+    QString ("../languages/%1.qm").arg (settings.
+					value ("application/language").
+					toString ());
+  if (!QFile::exists (translatorFile))
+    translatorFile =
+      QString ("/usr/share/octave/quint/languages/%1.qm").arg (settings.
+							       value
+							       ("application/language").
+							       toString ());
 
-    translator.load(translatorFile);
-    application.installTranslator(&translator);
+  translator.load (translatorFile);
+  application.installTranslator (&translator);
 
-    MainWindow w;
-    w.show();
+  MainWindow w;
+  w.show ();
 
-    return application.exec();
+  return application.exec ();
 }

--- a/gui/src/OctaveLink.cpp
+++ b/gui/src/OctaveLink.cpp
@@ -24,110 +24,144 @@
 
 #include "OctaveLink.h"
 
-OctaveLink OctaveLink::m_singleton;
+OctaveLink
+  OctaveLink::m_singleton;
 
 
-OctaveLink::OctaveLink()
-    : QObject(),
-      m_previousHistoryLength(0) {
-    m_symbolTableSemaphore = new QSemaphore(1);
-    m_historySemaphore = new QSemaphore(1);
+OctaveLink::OctaveLink ():QObject (), m_previousHistoryLength (0)
+{
+  m_symbolTableSemaphore = new QSemaphore (1);
+  m_historySemaphore = new QSemaphore (1);
 }
 
-OctaveLink::~OctaveLink() {
+OctaveLink::~OctaveLink ()
+{
 }
 
-int OctaveLink::readlineEventHook() {
-  OctaveLink::instance()->processOctaveServerData();
+int
+OctaveLink::readlineEventHook ()
+{
+  OctaveLink::instance ()->processOctaveServerData ();
   return 0;
 }
 
-QString OctaveLink::octaveValueAsQString(OctaveValue octaveValue) {
-    // Convert single qouted string.
-    if(octaveValue.is_sq_string()) {
-        return QString("\'%1\'").arg(octaveValue.string_value().c_str());
+QString
+OctaveLink::octaveValueAsQString (OctaveValue octaveValue)
+{
+  // Convert single qouted string.
+  if (octaveValue.is_sq_string ())
+    {
+      return QString ("\'%1\'").arg (octaveValue.string_value ().c_str ());
 
-    // Convert double qouted string.
-    } else if(octaveValue.is_dq_string()) {
-        return QString("\"%1\"").arg(octaveValue.string_value().c_str());
+      // Convert double qouted string.
+    }
+  else if (octaveValue.is_dq_string ())
+    {
+      return QString ("\"%1\"").arg (octaveValue.string_value ().c_str ());
 
-    // Convert real scalar.
-    } else if(octaveValue.is_real_scalar()) {
-        return QString("%1").arg(octaveValue.scalar_value());
+      // Convert real scalar.
+    }
+  else if (octaveValue.is_real_scalar ())
+    {
+      return QString ("%1").arg (octaveValue.scalar_value ());
 
-    // Convert complex scalar.
-    } else if(octaveValue.is_complex_scalar()) {
-        return QString("%1 + %2i").arg(octaveValue.scalar_value()).arg(octaveValue.complex_value().imag());
+      // Convert complex scalar.
+    }
+  else if (octaveValue.is_complex_scalar ())
+    {
+      return QString ("%1 + %2i").arg (octaveValue.scalar_value ()).
+	arg (octaveValue.complex_value ().imag ());
 
-    // Convert range.
-    } else if(octaveValue.is_range()) {
-        return QString("%1 : %2 : %3").arg(octaveValue.range_value().base())
-                                      .arg(octaveValue.range_value().inc())
-                                      .arg(octaveValue.range_value().limit());
+      // Convert range.
+    }
+  else if (octaveValue.is_range ())
+    {
+      return QString ("%1 : %2 : %3").arg (octaveValue.range_value ().
+					   base ()).arg (octaveValue.
+							 range_value ().
+							 inc ()).
+	arg (octaveValue.range_value ().limit ());
 
-    // Convert real matrix.
-    } else if(octaveValue.is_real_matrix()) {
-        // TODO: Convert real matrix into a string.
-        return QString("{matrix}");
+      // Convert real matrix.
+    }
+  else if (octaveValue.is_real_matrix ())
+    {
+      // TODO: Convert real matrix into a string.
+      return QString ("{matrix}");
 
-    // Convert complex matrix.
-    } else if(octaveValue.is_complex_matrix()) {
-        // TODO: Convert complex matrix into a string.
-        return QString("{complex matrix}");
+      // Convert complex matrix.
+    }
+  else if (octaveValue.is_complex_matrix ())
+    {
+      // TODO: Convert complex matrix into a string.
+      return QString ("{complex matrix}");
 
-    // If everything else does not fit, we could not recognize the type.
-    } else {
-        return QString("<Type not recognized>");
+      // If everything else does not fit, we could not recognize the type.
+    }
+  else
+    {
+      return QString ("<Type not recognized>");
     }
 }
 
-void OctaveLink::fetchSymbolTable() {
-    m_symbolTableSemaphore->acquire();
-    m_symbolTableBuffer.clear();
-    std::list<SymbolRecord> allVariables = symbol_table::all_variables();
-    std::list<SymbolRecord>::iterator iterator;
-    for(iterator = allVariables.begin(); iterator != allVariables.end(); iterator++)
-        m_symbolTableBuffer.append(iterator->dup());
-    m_symbolTableSemaphore->release();
-    emit symbolTableChanged();
+void
+OctaveLink::fetchSymbolTable ()
+{
+  m_symbolTableSemaphore->acquire ();
+  m_symbolTableBuffer.clear ();
+  std::list < SymbolRecord > allVariables = symbol_table::all_variables ();
+  std::list < SymbolRecord >::iterator iterator;
+  for (iterator = allVariables.begin (); iterator != allVariables.end ();
+       iterator++)
+    m_symbolTableBuffer.append (iterator->dup ());
+  m_symbolTableSemaphore->release ();
+  emit symbolTableChanged ();
 }
 
 
-void OctaveLink::fetchHistory() {
-    int currentLen = command_history::length();
-    if(currentLen != m_previousHistoryLength) {
-        m_historySemaphore->acquire();
-        for(int i = m_previousHistoryLength; i < currentLen; i++) {
-            m_historyBuffer.append(command_history::get_entry(i));
-        }
-        m_historySemaphore->release();
-        m_previousHistoryLength = currentLen;
-        emit historyChanged();
+void
+OctaveLink::fetchHistory ()
+{
+  int currentLen = command_history::length ();
+  if (currentLen != m_previousHistoryLength)
+    {
+      m_historySemaphore->acquire ();
+      for (int i = m_previousHistoryLength; i < currentLen; i++)
+	{
+	  m_historyBuffer.append (command_history::get_entry (i));
+	}
+      m_historySemaphore->release ();
+      m_previousHistoryLength = currentLen;
+      emit historyChanged ();
     }
 }
 
-QList<SymbolRecord> OctaveLink::currentSymbolTable() {
-    QList<SymbolRecord> m_symbolTableCopy;
+QList < SymbolRecord > OctaveLink::currentSymbolTable ()
+{
+  QList < SymbolRecord > m_symbolTableCopy;
 
-    // Generate a deep copy of the current symbol table.
-    m_symbolTableSemaphore->acquire();
-    foreach(SymbolRecord symbolRecord, m_symbolTableBuffer)
-        m_symbolTableCopy.append(symbolRecord.dup());
-    m_symbolTableSemaphore->release();
+  // Generate a deep copy of the current symbol table.
+  m_symbolTableSemaphore->acquire ();
+  foreach (SymbolRecord symbolRecord, m_symbolTableBuffer)
+    m_symbolTableCopy.append (symbolRecord.dup ());
+  m_symbolTableSemaphore->release ();
 
-    return m_symbolTableCopy;
+  return m_symbolTableCopy;
 }
 
-string_vector OctaveLink::currentHistory() {
-    m_historySemaphore->acquire();
-    string_vector retval(m_historyBuffer);
-    m_historyBuffer = string_vector();
-    m_historySemaphore->release();
-    return retval;
+string_vector
+OctaveLink::currentHistory ()
+{
+  m_historySemaphore->acquire ();
+  string_vector retval (m_historyBuffer);
+  m_historyBuffer = string_vector ();
+  m_historySemaphore->release ();
+  return retval;
 }
 
-void OctaveLink::processOctaveServerData() {
-    fetchSymbolTable();
-    fetchHistory();
+void
+OctaveLink::processOctaveServerData ()
+{
+  fetchSymbolTable ();
+  fetchHistory ();
 }
-

--- a/gui/src/OctaveLink.h
+++ b/gui/src/OctaveLink.h
@@ -79,65 +79,86 @@
 #include <QSemaphore>
 #include <QObject>
 
-typedef symbol_table::symbol_record SymbolRecord;
-typedef octave_value OctaveValue;
+typedef
+  symbol_table::symbol_record
+  SymbolRecord;
+typedef octave_value
+  OctaveValue;
 
 /**
   * \class OctaveLink
   * Manages a link to an octave instance.
   */
-class OctaveLink : QObject
+class
+  OctaveLink:
+  QObject
 {
-    Q_OBJECT
+  Q_OBJECT
 public:
-    static OctaveLink *instance() { return &m_singleton; }
-    static int readlineEventHook(void);
-    static QString octaveValueAsQString(OctaveValue octaveValue);
+  static OctaveLink *
+  instance ()
+  {
+    return &m_singleton;
+  }
+  static int
+  readlineEventHook (void);
+  static QString
+  octaveValueAsQString (OctaveValue octaveValue);
 
     /**
       * Returns a copy of the current symbol table buffer.
       * \return Copy of the current symbol table buffer.
       */
-    QList<SymbolRecord> currentSymbolTable();
+  QList < SymbolRecord > currentSymbolTable ();
 
     /**
       * Returns a copy of the current history buffer.
       * \return Copy of the current history buffer.
       */
-    string_vector currentHistory();
+  string_vector
+  currentHistory ();
 
-    void processOctaveServerData();
+  void
+  processOctaveServerData ();
 
     /**
       * Updates the current symbol table with new data
       * from octave.
       */
-    void fetchSymbolTable();
+  void
+  fetchSymbolTable ();
 
     /**
       * Updates the current history buffer with new data
       * from octave.
       */
-    void fetchHistory();
+  void
+  fetchHistory ();
 
 signals:
-    void symbolTableChanged();
-    void historyChanged();
+  void
+  symbolTableChanged ();
+  void
+  historyChanged ();
 
 private:
-    OctaveLink();
-    ~OctaveLink();
+  OctaveLink ();
+  ~OctaveLink ();
 
     /** Variable related member variables. */
-    QSemaphore *m_symbolTableSemaphore;
-    QList<SymbolRecord> m_symbolTableBuffer;
+  QSemaphore *
+    m_symbolTableSemaphore;
+  QList < SymbolRecord > m_symbolTableBuffer;
 
     /** History related member variables. */
-    QSemaphore *m_historySemaphore;
-    string_vector m_historyBuffer;
-    int m_previousHistoryLength;
+  QSemaphore *
+    m_historySemaphore;
+  string_vector
+    m_historyBuffer;
+  int
+    m_previousHistoryLength;
 
-    static OctaveLink m_singleton;
+  static OctaveLink
+    m_singleton;
 };
 #endif // OCTAVELINK_H
-

--- a/gui/src/OctaveTerminal.cpp
+++ b/gui/src/OctaveTerminal.cpp
@@ -22,16 +22,18 @@
 #include <QStringListModel>
 #include <QStringList>
 
-OctaveTerminal::OctaveTerminal(QWidget *parent)
-    : QTerminalWidget(0, parent) {
-    construct();
+OctaveTerminal::OctaveTerminal (QWidget * parent):QTerminalWidget (0, parent)
+{
+  construct ();
 }
 
-OctaveTerminal::~OctaveTerminal() {
+OctaveTerminal::~OctaveTerminal ()
+{
 }
 
-void OctaveTerminal::construct() {
-    setScrollBarPosition(QTerminalWidget::ScrollBarRight);
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+void
+OctaveTerminal::construct ()
+{
+  setScrollBarPosition (QTerminalWidget::ScrollBarRight);
+  setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Expanding);
 }
-

--- a/gui/src/OctaveTerminal.h
+++ b/gui/src/OctaveTerminal.h
@@ -20,13 +20,13 @@
 #define OCTAVETERMINAL_H
 #include "QTerminalWidget.h"
 
-class OctaveTerminal : public QTerminalWidget {
-    Q_OBJECT
-public:
-    OctaveTerminal(QWidget *parent = 0);
-    ~OctaveTerminal();
+class OctaveTerminal:public QTerminalWidget
+{
+Q_OBJECT public:
+  OctaveTerminal (QWidget * parent = 0);
+  ~OctaveTerminal ();
 
 private:
-    void construct();
+  void construct ();
 };
 #endif // OCTAVETERMINAL_H

--- a/gui/src/SettingsDialog.cpp
+++ b/gui/src/SettingsDialog.cpp
@@ -2,28 +2,33 @@
 #include "ui_SettingsDialog.h"
 #include <QSettings>
 
-SettingsDialog::SettingsDialog(QWidget *parent, QString settingsFile) :
-    QDialog(parent),
-    ui(new Ui::SettingsDialog)
+SettingsDialog::SettingsDialog (QWidget * parent, QString settingsFile):
+QDialog (parent), ui (new Ui::SettingsDialog)
 {
-    m_settingsFile = settingsFile;
-    ui->setupUi(this);
+  m_settingsFile = settingsFile;
+  ui->setupUi (this);
 
-    QSettings settings(m_settingsFile, QSettings::IniFormat);
-    ui->connectOnStartup->setChecked(settings.value("connectOnStartup").toBool());
-    ui->showMessageOfTheDay->setChecked(settings.value("showMessageOfTheDay").toBool());
-    ui->showTopic->setChecked(settings.value("showTopic").toBool());
-    ui->autoIdentification->setChecked(settings.value("autoIdentification").toBool());
-    ui->nickServPassword->setText(settings.value("nickServPassword").toString());
+  QSettings settings (m_settingsFile, QSettings::IniFormat);
+  ui->connectOnStartup->setChecked (settings.value ("connectOnStartup").
+				    toBool ());
+  ui->showMessageOfTheDay->setChecked (settings.value ("showMessageOfTheDay").
+				       toBool ());
+  ui->showTopic->setChecked (settings.value ("showTopic").toBool ());
+  ui->autoIdentification->setChecked (settings.value ("autoIdentification").
+				      toBool ());
+  ui->nickServPassword->setText (settings.value ("nickServPassword").
+				 toString ());
 }
 
-SettingsDialog::~SettingsDialog()
+SettingsDialog::~SettingsDialog ()
 {
-    QSettings settings(m_settingsFile, QSettings::IniFormat);
-    settings.setValue("connectOnStartup", ui->connectOnStartup->isChecked());
-    settings.setValue("showMessageOfTheDay", ui->showMessageOfTheDay->isChecked());
-    settings.setValue("showTopic", ui->showTopic->isChecked());
-    settings.setValue("autoIdentification", ui->autoIdentification->isChecked());
-    settings.setValue("nickServPassword", ui->nickServPassword->text());
-    delete ui;
+  QSettings settings (m_settingsFile, QSettings::IniFormat);
+  settings.setValue ("connectOnStartup", ui->connectOnStartup->isChecked ());
+  settings.setValue ("showMessageOfTheDay",
+		     ui->showMessageOfTheDay->isChecked ());
+  settings.setValue ("showTopic", ui->showTopic->isChecked ());
+  settings.setValue ("autoIdentification",
+		     ui->autoIdentification->isChecked ());
+  settings.setValue ("nickServPassword", ui->nickServPassword->text ());
+  delete ui;
 }

--- a/gui/src/SettingsDialog.h
+++ b/gui/src/SettingsDialog.h
@@ -3,21 +3,20 @@
 
 #include <QDialog>
 
-namespace Ui {
-    class SettingsDialog;
+namespace Ui
+{
+  class SettingsDialog;
 }
 
-class SettingsDialog : public QDialog
+class SettingsDialog:public QDialog
 {
-    Q_OBJECT
-
-public:
-    explicit SettingsDialog(QWidget *parent, QString settingsFile);
-    ~SettingsDialog();
+Q_OBJECT public:
+  explicit SettingsDialog (QWidget * parent, QString settingsFile);
+  ~SettingsDialog ();
 
 private:
-    Ui::SettingsDialog *ui;
-    QString m_settingsFile;
+  Ui::SettingsDialog * ui;
+  QString m_settingsFile;
 };
 
 #endif // SETTINGSDIALOG_H

--- a/gui/src/VariablesDockWidget.cpp
+++ b/gui/src/VariablesDockWidget.cpp
@@ -21,166 +21,209 @@
 #include <QVBoxLayout>
 #include <QPushButton>
 
-VariablesDockWidget::VariablesDockWidget(QWidget *parent)
-    : QDockWidget(parent) {
-    setObjectName("VariablesDockWidget");
-    construct();
+VariablesDockWidget::VariablesDockWidget (QWidget * parent):QDockWidget
+  (parent)
+{
+  setObjectName ("VariablesDockWidget");
+  construct ();
 }
 
-void VariablesDockWidget::construct() {
-    m_updateSemaphore = new QSemaphore(1);
-    QStringList headerLabels;
-    headerLabels << tr("Name") << tr("Type") << tr("Value");
-    m_variablesTreeWidget = new QTreeWidget(this);
-    m_variablesTreeWidget->setHeaderHidden(false);
-    m_variablesTreeWidget->setHeaderLabels(headerLabels);
-    QVBoxLayout *layout = new QVBoxLayout();
+void
+VariablesDockWidget::construct ()
+{
+  m_updateSemaphore = new QSemaphore (1);
+  QStringList headerLabels;
+  headerLabels << tr ("Name") << tr ("Type") << tr ("Value");
+  m_variablesTreeWidget = new QTreeWidget (this);
+  m_variablesTreeWidget->setHeaderHidden (false);
+  m_variablesTreeWidget->setHeaderLabels (headerLabels);
+  QVBoxLayout *layout = new QVBoxLayout ();
 
-    setWindowTitle(tr("Workspace"));
-    setWidget(new QWidget());
+  setWindowTitle (tr ("Workspace"));
+  setWidget (new QWidget ());
 
-    layout->addWidget(m_variablesTreeWidget);
-    QWidget *buttonBar = new QWidget(this);
-    layout->addWidget(buttonBar);
+  layout->addWidget (m_variablesTreeWidget);
+  QWidget *buttonBar = new QWidget (this);
+  layout->addWidget (buttonBar);
 
-        QHBoxLayout *buttonBarLayout = new QHBoxLayout();
-        QPushButton *saveWorkspaceButton = new QPushButton(tr("Save"), buttonBar);
-        QPushButton *loadWorkspaceButton = new QPushButton(tr("Load"), buttonBar);
-        QPushButton *clearWorkspaceButton = new QPushButton(tr("Clear"), buttonBar);
-        buttonBarLayout->addWidget(saveWorkspaceButton);
-        buttonBarLayout->addWidget(loadWorkspaceButton);
-        buttonBarLayout->addWidget(clearWorkspaceButton);
-        buttonBarLayout->setMargin(2);
-        buttonBar->setLayout(buttonBarLayout);
+  QHBoxLayout *buttonBarLayout = new QHBoxLayout ();
+  QPushButton *saveWorkspaceButton = new QPushButton (tr ("Save"), buttonBar);
+  QPushButton *loadWorkspaceButton = new QPushButton (tr ("Load"), buttonBar);
+  QPushButton *clearWorkspaceButton =
+    new QPushButton (tr ("Clear"), buttonBar);
+  buttonBarLayout->addWidget (saveWorkspaceButton);
+  buttonBarLayout->addWidget (loadWorkspaceButton);
+  buttonBarLayout->addWidget (clearWorkspaceButton);
+  buttonBarLayout->setMargin (2);
+  buttonBar->setLayout (buttonBarLayout);
 
-    layout->setMargin(2);
-    widget()->setLayout(layout);
+  layout->setMargin (2);
+  widget ()->setLayout (layout);
 
-    connect(saveWorkspaceButton, SIGNAL(clicked()), this, SLOT(emitSaveWorkspace()));
-    connect(loadWorkspaceButton, SIGNAL(clicked()), this, SLOT(emitLoadWorkspace()));
-    connect(clearWorkspaceButton, SIGNAL(clicked()), this, SLOT(emitClearWorkspace()));
+  connect (saveWorkspaceButton, SIGNAL (clicked ()), this,
+	   SLOT (emitSaveWorkspace ()));
+  connect (loadWorkspaceButton, SIGNAL (clicked ()), this,
+	   SLOT (emitLoadWorkspace ()));
+  connect (clearWorkspaceButton, SIGNAL (clicked ()), this,
+	   SLOT (emitClearWorkspace ()));
 
-    QTreeWidgetItem *treeWidgetItem = new QTreeWidgetItem();
-    treeWidgetItem->setData(0, 0, QString(tr("Local")));
-    m_variablesTreeWidget->insertTopLevelItem(0, treeWidgetItem);
+  QTreeWidgetItem *treeWidgetItem = new QTreeWidgetItem ();
+  treeWidgetItem->setData (0, 0, QString (tr ("Local")));
+  m_variablesTreeWidget->insertTopLevelItem (0, treeWidgetItem);
 
-    treeWidgetItem = new QTreeWidgetItem();
-    treeWidgetItem->setData(0, 0, QString(tr("Global")));
-    m_variablesTreeWidget->insertTopLevelItem(1, treeWidgetItem);
+  treeWidgetItem = new QTreeWidgetItem ();
+  treeWidgetItem->setData (0, 0, QString (tr ("Global")));
+  m_variablesTreeWidget->insertTopLevelItem (1, treeWidgetItem);
 
-    treeWidgetItem = new QTreeWidgetItem();
-    treeWidgetItem->setData(0, 0, QString(tr("Persistent")));
-    m_variablesTreeWidget->insertTopLevelItem(2, treeWidgetItem);
+  treeWidgetItem = new QTreeWidgetItem ();
+  treeWidgetItem->setData (0, 0, QString (tr ("Persistent")));
+  m_variablesTreeWidget->insertTopLevelItem (2, treeWidgetItem);
 
-    treeWidgetItem = new QTreeWidgetItem();
-    treeWidgetItem->setData(0, 0, QString(tr("Hidden")));
-    m_variablesTreeWidget->insertTopLevelItem(3, treeWidgetItem);
+  treeWidgetItem = new QTreeWidgetItem ();
+  treeWidgetItem->setData (0, 0, QString (tr ("Hidden")));
+  m_variablesTreeWidget->insertTopLevelItem (3, treeWidgetItem);
 
-    m_variablesTreeWidget->expandAll();
-    m_variablesTreeWidget->setAlternatingRowColors(true);
-    m_variablesTreeWidget->setAnimated(true);    
+  m_variablesTreeWidget->expandAll ();
+  m_variablesTreeWidget->setAlternatingRowColors (true);
+  m_variablesTreeWidget->setAnimated (true);
 }
 
-void VariablesDockWidget::updateTreeEntry(QTreeWidgetItem *treeItem, SymbolRecord symbolRecord) {
-    treeItem->setData(0, 0, QString(symbolRecord.name().c_str()));
-    treeItem->setData(1, 0, QString(symbolRecord.varval().type_name().c_str()));
-    treeItem->setData(2, 0, OctaveLink::octaveValueAsQString(symbolRecord.varval()));
+void
+VariablesDockWidget::updateTreeEntry (QTreeWidgetItem * treeItem,
+				      SymbolRecord symbolRecord)
+{
+  treeItem->setData (0, 0, QString (symbolRecord.name ().c_str ()));
+  treeItem->setData (1, 0,
+		     QString (symbolRecord.varval ().type_name ().c_str ()));
+  treeItem->setData (2, 0,
+		     OctaveLink::octaveValueAsQString (symbolRecord.
+						       varval ()));
 }
 
-void VariablesDockWidget::setVariablesList(QList<SymbolRecord> symbolTable) {
-    m_updateSemaphore->acquire();
-    // Split the symbol table into its different scopes.
-    QList<SymbolRecord> localSymbolTable;
-    QList<SymbolRecord> globalSymbolTable;
-    QList<SymbolRecord> persistentSymbolTable;
-    QList<SymbolRecord> hiddenSymbolTable;
+void
+VariablesDockWidget::setVariablesList (QList < SymbolRecord > symbolTable)
+{
+  m_updateSemaphore->acquire ();
+  // Split the symbol table into its different scopes.
+  QList < SymbolRecord > localSymbolTable;
+  QList < SymbolRecord > globalSymbolTable;
+  QList < SymbolRecord > persistentSymbolTable;
+  QList < SymbolRecord > hiddenSymbolTable;
 
-    foreach(SymbolRecord symbolRecord, symbolTable) {
-        // It's true that being global or hidden includes it's can mean it's also locally visible,
-        // but we want to distinguish that here.
-        if(symbolRecord.is_local() && !symbolRecord.is_global() && !symbolRecord.is_hidden()) {
-            localSymbolTable.append(symbolRecord);
-        }
+  foreach (SymbolRecord symbolRecord, symbolTable)
+  {
+    // It's true that being global or hidden includes it's can mean it's also locally visible,
+    // but we want to distinguish that here.
+    if (symbolRecord.is_local () && !symbolRecord.is_global ()
+	&& !symbolRecord.is_hidden ())
+      {
+	localSymbolTable.append (symbolRecord);
+      }
 
-        if(symbolRecord.is_global()) {
-            globalSymbolTable.append(symbolRecord);
-        }
+    if (symbolRecord.is_global ())
+      {
+	globalSymbolTable.append (symbolRecord);
+      }
 
-        if(symbolRecord.is_persistent()) {
-            persistentSymbolTable.append(symbolRecord);
-        }
+    if (symbolRecord.is_persistent ())
+      {
+	persistentSymbolTable.append (symbolRecord);
+      }
 
-        if(symbolRecord.is_hidden()) {
-            hiddenSymbolTable.append(symbolRecord);
-        }
-    }
+    if (symbolRecord.is_hidden ())
+      {
+	hiddenSymbolTable.append (symbolRecord);
+      }
+  }
 
-    updateScope(0, localSymbolTable);
-    updateScope(1, globalSymbolTable);
-    updateScope(2, persistentSymbolTable);
-    updateScope(3, hiddenSymbolTable);
-    m_updateSemaphore->release();
+  updateScope (0, localSymbolTable);
+  updateScope (1, globalSymbolTable);
+  updateScope (2, persistentSymbolTable);
+  updateScope (3, hiddenSymbolTable);
+  m_updateSemaphore->release ();
 }
 
-void VariablesDockWidget::updateScope(int topLevelItemIndex, QList<SymbolRecord> symbolTable) {
-    // This method may be a little bit confusing; variablesList is a complete list of all
-    // variables that are in the workspace currently.
-    QTreeWidgetItem *topLevelItem = m_variablesTreeWidget->topLevelItem(topLevelItemIndex);
+void
+VariablesDockWidget::updateScope (int topLevelItemIndex,
+				  QList < SymbolRecord > symbolTable)
+{
+  // This method may be a little bit confusing; variablesList is a complete list of all
+  // variables that are in the workspace currently.
+  QTreeWidgetItem *topLevelItem =
+    m_variablesTreeWidget->topLevelItem (topLevelItemIndex);
 
-    // First we check, if any variables that exist in the model tree have to be updated
-    // or created. So we walk the variablesList check against the tree.
-    foreach(SymbolRecord symbolRecord, symbolTable) {
-        int childCount = topLevelItem->childCount();
-        bool alreadyExists = false;
-        QTreeWidgetItem *child;
+  // First we check, if any variables that exist in the model tree have to be updated
+  // or created. So we walk the variablesList check against the tree.
+  foreach (SymbolRecord symbolRecord, symbolTable)
+  {
+    int childCount = topLevelItem->childCount ();
+    bool alreadyExists = false;
+    QTreeWidgetItem *child;
 
-        // Search for the corresponding item in the tree. If it has been found, child
-        // will contain the appropriate QTreeWidgetItem* pointing at it.
-        for(int i = 0; i < childCount; i++) {
-            child = topLevelItem->child(i);
-            if(child->data(0, 0).toString() == QString(symbolRecord.name().c_str())) {
-                alreadyExists = true;
-                break;
-            }
-        }
+    // Search for the corresponding item in the tree. If it has been found, child
+    // will contain the appropriate QTreeWidgetItem* pointing at it.
+    for (int i = 0; i < childCount; i++)
+      {
+	child = topLevelItem->child (i);
+	if (child->data (0, 0).toString () ==
+	    QString (symbolRecord.name ().c_str ()))
+	  {
+	    alreadyExists = true;
+	    break;
+	  }
+      }
 
-        // If it already exists, just update it.
-        if(alreadyExists) {
-            updateTreeEntry(child, symbolRecord);
-        } else {
-            // It does not exist, so create a new one and set the right values.
-            child = new QTreeWidgetItem();
-            updateTreeEntry(child, symbolRecord);
-            topLevelItem->addChild(child);
-        }
-    }
+    // If it already exists, just update it.
+    if (alreadyExists)
+      {
+	updateTreeEntry (child, symbolRecord);
+      }
+    else
+      {
+	// It does not exist, so create a new one and set the right values.
+	child = new QTreeWidgetItem ();
+	updateTreeEntry (child, symbolRecord);
+	topLevelItem->addChild (child);
+      }
+  }
 
-    // Check the tree against the list for deleted variables.
-    for(int i = 0; i < topLevelItem->childCount(); i++) {
-        bool existsInVariableList = false;
-        QTreeWidgetItem *child = topLevelItem->child(i);
-        foreach(SymbolRecord symbolRecord, symbolTable) {
-            if(QString(symbolRecord.name().c_str()) == child->data(0, 0).toString()) {
-                existsInVariableList = true;
-            }
-        }
+  // Check the tree against the list for deleted variables.
+  for (int i = 0; i < topLevelItem->childCount (); i++)
+    {
+      bool existsInVariableList = false;
+      QTreeWidgetItem *child = topLevelItem->child (i);
+      foreach (SymbolRecord symbolRecord, symbolTable)
+      {
+	if (QString (symbolRecord.name ().c_str ()) ==
+	    child->data (0, 0).toString ())
+	  {
+	    existsInVariableList = true;
+	  }
+      }
 
-        if(!existsInVariableList) {
-            topLevelItem->removeChild(child);
-            delete child;
-            i--;
-        }
+      if (!existsInVariableList)
+	{
+	  topLevelItem->removeChild (child);
+	  delete child;
+	  i--;
+	}
     }
 }
 
-void VariablesDockWidget::emitSaveWorkspace() {
-    emit saveWorkspace();
+void
+VariablesDockWidget::emitSaveWorkspace ()
+{
+  emit saveWorkspace ();
 }
 
-void VariablesDockWidget::emitLoadWorkspace() {
-    emit loadWorkspace();
+void
+VariablesDockWidget::emitLoadWorkspace ()
+{
+  emit loadWorkspace ();
 }
 
-void VariablesDockWidget::emitClearWorkspace() {
-    emit clearWorkspace();
+void
+VariablesDockWidget::emitClearWorkspace ()
+{
+  emit clearWorkspace ();
 }

--- a/gui/src/VariablesDockWidget.h
+++ b/gui/src/VariablesDockWidget.h
@@ -24,29 +24,28 @@
 #include <QSemaphore>
 #include "OctaveLink.h"
 
-class VariablesDockWidget : public QDockWidget
+class VariablesDockWidget:public QDockWidget
 {
-    Q_OBJECT
-public:
-    VariablesDockWidget(QWidget *parent = 0);
-    void setVariablesList(QList<SymbolRecord> symbolTable);
+Q_OBJECT public:
+  VariablesDockWidget (QWidget * parent = 0);
+  void setVariablesList (QList < SymbolRecord > symbolTable);
 
-signals:
-    void saveWorkspace();
-    void loadWorkspace();
-    void clearWorkspace();
+    signals:void saveWorkspace ();
+  void loadWorkspace ();
+  void clearWorkspace ();
 
-private slots:
-    void emitSaveWorkspace();
-    void emitLoadWorkspace();
-    void emitClearWorkspace();
+  private slots:void emitSaveWorkspace ();
+  void emitLoadWorkspace ();
+  void emitClearWorkspace ();
 
 private:
-    void construct();
-    void updateTreeEntry(QTreeWidgetItem *treeItem, SymbolRecord symbolRecord);
-    void updateScope(int topLevelItemIndex, QList<SymbolRecord> symbolTable);
-    QTreeWidget *m_variablesTreeWidget;
-    QSemaphore *m_updateSemaphore;
+  void construct ();
+  void updateTreeEntry (QTreeWidgetItem * treeItem,
+			SymbolRecord symbolRecord);
+  void updateScope (int topLevelItemIndex,
+		    QList < SymbolRecord > symbolTable);
+  QTreeWidget *m_variablesTreeWidget;
+  QSemaphore *m_updateSemaphore;
 };
 
 #endif // VARIABLESDOCKWIDGET_H

--- a/gui/src/qirc/IClientSocket.cpp
+++ b/gui/src/qirc/IClientSocket.cpp
@@ -26,206 +26,264 @@
 #define ERROR_ICLIENTSOCKET_NOWRITE		5
 #define ERROR_ICLIENTSOCKET_NOFCNTL		6
 
-const char *ICLIENTSOCKET_MENSAJES[] = {"Nothing has happened, boss",
-                                        "Can't create the socket to initiate the connection",
-                                        "Can't connect to the destination",
-                                        "Can't resolv the server name",
-                                        "Problems during read operation",
-                                        "Problems during write operation",
-                                        "Can't make the socket non-blocking"};
+const char *ICLIENTSOCKET_MENSAJES[] = { "Nothing has happened, boss",
+  "Can't create the socket to initiate the connection",
+  "Can't connect to the destination",
+  "Can't resolv the server name",
+  "Problems during read operation",
+  "Problems during write operation",
+  "Can't make the socket non-blocking"
+};
 
 #define ICLIENT_MAX_MENSAJE_ERROR 300
 
-char ICLIENTSOCKETmensajeError[ICLIENT_MAX_MENSAJE_ERROR+1];
+char ICLIENTSOCKETmensajeError[ICLIENT_MAX_MENSAJE_ERROR + 1];
 
-void IClientSocket::inicializar() {
-    handler = 0;
-    puerto = 0;
-    bzero((void *)&ip, sizeof(in_addr));
+void
+IClientSocket::inicializar ()
+{
+  handler = 0;
+  puerto = 0;
+  bzero ((void *) &ip, sizeof (in_addr));
 
-    conectado = false;
-    socketCreado = false;
-    blocking = true;
-    lastError = ERROR_ICLIENTSOCKET_NOERROR;
+  conectado = false;
+  socketCreado = false;
+  blocking = true;
+  lastError = ERROR_ICLIENTSOCKET_NOERROR;
 }
 
-IClientSocket::IClientSocket() {
-    inicializar();
+IClientSocket::IClientSocket ()
+{
+  inicializar ();
 }
 
 
-IClientSocket::~IClientSocket() {
-    if (conectado == true) {
-        close();
+IClientSocket::~IClientSocket ()
+{
+  if (conectado == true)
+    {
+      close ();
     }
 }
 
-int IClientSocket::getSocket() {
-    return handler;
+int
+IClientSocket::getSocket ()
+{
+  return handler;
 }
 
-const char *IClientSocket::strError() {
-    switch (lastError) {
-    case ERROR_ICLIENTSOCKET_NORESOLV : snprintf(ICLIENTSOCKETmensajeError, ICLIENT_MAX_MENSAJE_ERROR, "%s", ICLIENTSOCKET_MENSAJES[lastError]);
-        break;
-    default						 : snprintf(ICLIENTSOCKETmensajeError, ICLIENT_MAX_MENSAJE_ERROR, "%s - %s", ICLIENTSOCKET_MENSAJES[lastError], ::strerror(lastErrnoValue));
-        break;
+const char *
+IClientSocket::strError ()
+{
+  switch (lastError)
+    {
+    case ERROR_ICLIENTSOCKET_NORESOLV:
+      snprintf (ICLIENTSOCKETmensajeError, ICLIENT_MAX_MENSAJE_ERROR, "%s",
+		ICLIENTSOCKET_MENSAJES[lastError]);
+      break;
+    default:
+      snprintf (ICLIENTSOCKETmensajeError, ICLIENT_MAX_MENSAJE_ERROR,
+		"%s - %s",
+		ICLIENTSOCKET_MENSAJES[lastError],::
+		strerror (lastErrnoValue));
+      break;
     }
-    return ICLIENTSOCKETmensajeError;
+  return ICLIENTSOCKETmensajeError;
 }
 
-int IClientSocket::connect() {
-    if(conectado == true) {
-        close();
+int
+IClientSocket::connect ()
+{
+  if (conectado == true)
+    {
+      close ();
     }
 
-    if((handler = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
-        lastError = ERROR_ICLIENTSOCKET_NOSOCKET;
-        lastErrnoValue = errno;
-        return -1;
+  if ((handler = socket (AF_INET, SOCK_STREAM, 0)) < 0)
+    {
+      lastError = ERROR_ICLIENTSOCKET_NOSOCKET;
+      lastErrnoValue = errno;
+      return -1;
     }
-    socketCreado = true;
+  socketCreado = true;
 
-    if (blocking == false) {
-        if (fcntl(handler, F_SETFL, O_NONBLOCK) < 0) {
-            lastError = ERROR_ICLIENTSOCKET_NOFCNTL;
-            lastErrnoValue = errno;
-        }
+  if (blocking == false)
+    {
+      if (fcntl (handler, F_SETFL, O_NONBLOCK) < 0)
+	{
+	  lastError = ERROR_ICLIENTSOCKET_NOFCNTL;
+	  lastErrnoValue = errno;
+	}
     }
 
-    sockaddr_in addr;
-    addr.sin_family = AF_INET;
-    addr.sin_port   = htons(puerto);
-    addr.sin_addr   = ip;
-    bzero(&(addr.sin_zero), 8);
-    int respuesta = ::connect(handler, (sockaddr *)&addr, sizeof(sockaddr_in));
+  sockaddr_in addr;
+  addr.sin_family = AF_INET;
+  addr.sin_port = htons (puerto);
+  addr.sin_addr = ip;
+  bzero (&(addr.sin_zero), 8);
+  int respuesta =::connect (handler, (sockaddr *) & addr,
+			    sizeof (sockaddr_in));
 
-    if ((respuesta == 0) || ((respuesta < 0) && (errno == EINPROGRESS) && (blocking == false))) {
-        conectado = true;
-    } else {
-        lastError = ERROR_ICLIENTSOCKET_NOCONNECT;
-        lastErrnoValue = errno;
-        return -1;
+  if ((respuesta == 0)
+      || ((respuesta < 0) && (errno == EINPROGRESS) && (blocking == false)))
+    {
+      conectado = true;
+    }
+  else
+    {
+      lastError = ERROR_ICLIENTSOCKET_NOCONNECT;
+      lastErrnoValue = errno;
+      return -1;
     }
 
-    return 0;
+  return 0;
 }
 
 
-int IClientSocket::connect(int socket, bool block) {
-    if(socketCreado) {
-        close();
+int
+IClientSocket::connect (int socket, bool block)
+{
+  if (socketCreado)
+    {
+      close ();
     }
 
-    handler = socket;
-    bzero((void *)&ip, sizeof(in_addr));
+  handler = socket;
+  bzero ((void *) &ip, sizeof (in_addr));
 
-    conectado = true;
-    socketCreado = true;
-    blocking = block;
-    lastError = 0;
+  conectado = true;
+  socketCreado = true;
+  blocking = block;
+  lastError = 0;
 
-    if (block == false) {
-        fcntl(handler, F_SETFL, O_NONBLOCK);
+  if (block == false)
+    {
+      fcntl (handler, F_SETFL, O_NONBLOCK);
     }
 
-    return 0;
+  return 0;
 }
 
-int IClientSocket::connect(in_addr addr, unsigned int p, bool block) {
-    if(socketCreado == true) {
-        close();
+int
+IClientSocket::connect (in_addr addr, unsigned int p, bool block)
+{
+  if (socketCreado == true)
+    {
+      close ();
     }
 
-    ip = addr;
-    puerto = p;
-    blocking = block;
+  ip = addr;
+  puerto = p;
+  blocking = block;
 
-    return connect();
+  return connect ();
 }
 
-int IClientSocket::connect(const char * server, unsigned int p, bool block) {
-    if(socketCreado == true) {
-        close();
+int
+IClientSocket::connect (const char *server, unsigned int p, bool block)
+{
+  if (socketCreado == true)
+    {
+      close ();
     }
 
-    puerto = p;
-    blocking = block;
+  puerto = p;
+  blocking = block;
 
-    if (resolv(server, &ip) < 0) {
-        lastError = ERROR_ICLIENTSOCKET_NORESOLV;
-        return -1;
+  if (resolv (server, &ip) < 0)
+    {
+      lastError = ERROR_ICLIENTSOCKET_NORESOLV;
+      return -1;
     }
-    return connect();
+  return connect ();
 }
 
-long int IClientSocket::read(char *data, long count) {
-    long done = 0;
-    long res = 0;
+long int
+IClientSocket::read (char *data, long count)
+{
+  long done = 0;
+  long res = 0;
 
-    do {
-        res = recv(handler, data + done, count - done, 0);
-
-        if (res > 0)
-        {
-            done += res;
-        }
-    } while ((((done < count) && (res > 0)) && (blocking == true)) || ((res < 0) && (errno == EINTR)));
+  do
+    {
+      res = recv (handler, data + done, count - done, 0);
 
-    if (res < 0)
+      if (res > 0)
+	{
+	  done += res;
+	}
+    }
+  while ((((done < count) && (res > 0)) && (blocking == true))
+	 || ((res < 0) && (errno == EINTR)));
+
+  if (res < 0)
     {
-        if (errno == EWOULDBLOCK)
-        {
-            return 0;
-        } else {
-            lastError = ERROR_ICLIENTSOCKET_NOREAD;
-            lastErrnoValue = errno;
-            return -1;
-        }
-    } else {
-        return done;
+      if (errno == EWOULDBLOCK)
+	{
+	  return 0;
+	}
+      else
+	{
+	  lastError = ERROR_ICLIENTSOCKET_NOREAD;
+	  lastErrnoValue = errno;
+	  return -1;
+	}
+    }
+  else
+    {
+      return done;
     }
 }
 
-long IClientSocket::write(const char *data, long count) {
-    long sent = 0;
-    long response = 0;
+long
+IClientSocket::write (const char *data, long count)
+{
+  long sent = 0;
+  long response = 0;
 
-    do {
-        response = send(handler, data + sent, count - sent, 0);
+  do
+    {
+      response = send (handler, data + sent, count - sent, 0);
 
-        if (response > 0)
-        {
-            sent += response;
-        }
-    } while (((sent < count) && (response >= 0)) || ((response < 0) && (errno == EWOULDBLOCK)));
+      if (response > 0)
+	{
+	  sent += response;
+	}
+    }
+  while (((sent < count) && (response >= 0))
+	 || ((response < 0) && (errno == EWOULDBLOCK)));
 
-    if (response < 0)
+  if (response < 0)
     {
-        lastError = ERROR_ICLIENTSOCKET_NOWRITE;
-        lastErrnoValue = errno;
-        return -1;
+      lastError = ERROR_ICLIENTSOCKET_NOWRITE;
+      lastErrnoValue = errno;
+      return -1;
     }
-    return sent;
+  return sent;
 }
 
-void IClientSocket::close() {
-    if (socketCreado == true)
+void
+IClientSocket::close ()
+{
+  if (socketCreado == true)
     {
-        ::close(handler);
-        conectado = false;
-        socketCreado = false;
-        blocking = true;
+      ::close (handler);
+      conectado = false;
+      socketCreado = false;
+      blocking = true;
     }
 }
 
-int IClientSocket::resolv(const char * fqdn, in_addr * ip) {
-    hostent *host;
-    host = gethostbyname(fqdn);
-    if (host == NULL) {
-        return -1;
+int
+IClientSocket::resolv (const char *fqdn, in_addr * ip)
+{
+  hostent *host;
+  host = gethostbyname (fqdn);
+  if (host == NULL)
+    {
+      return -1;
     }
 
-    bcopy((void *)host->h_addr, (void *)ip, sizeof(in_addr));
-    return 0;
+  bcopy ((void *) host->h_addr, (void *) ip, sizeof (in_addr));
+  return 0;
 }

--- a/gui/src/qirc/IClientSocket.h
+++ b/gui/src/qirc/IClientSocket.h
@@ -33,36 +33,36 @@
 class IClientSocket
 {
 private:
-    int handler;
-    in_addr ip;
-    unsigned int puerto;
+  int handler;
+  in_addr ip;
+  unsigned int puerto;
 
-    int lastError, lastErrnoValue;
+  int lastError, lastErrnoValue;
 
-    bool conectado;
-    bool socketCreado;
-    bool blocking;
+  bool conectado;
+  bool socketCreado;
+  bool blocking;
 
-    void inicializar();
-    int connect();
+  void inicializar ();
+  int connect ();
 
 public:
-    IClientSocket();
-    ~IClientSocket();
+    IClientSocket ();
+   ~IClientSocket ();
 
-    int getSocket();
-    const char *strError();
+  int getSocket ();
+  const char *strError ();
 
-    int connect(int socket, bool block = true);
-    int connect(in_addr addr, unsigned int puerto, bool blocking = true);
-    int connect(const char * server, unsigned int puerto, bool blocking = true);
+  int connect (int socket, bool block = true);
+  int connect (in_addr addr, unsigned int puerto, bool blocking = true);
+  int connect (const char *server, unsigned int puerto, bool blocking = true);
 
-    long int read(char *, long count);
-    long int write(const char *, long count);
+  long int read (char *, long count);
+  long int write (const char *, long count);
 
-    void close();
+  void close ();
 
-    int resolv(const char * fqdn, in_addr * ip);
+  int resolv (const char *fqdn, in_addr * ip);
 };
 
 #endif

--- a/gui/src/qirc/IRCClient.cpp
+++ b/gui/src/qirc/IRCClient.cpp
@@ -20,419 +20,557 @@
 #include <string.h>
 #include <stdlib.h>
 
-void IRCClient::handleIncomingLine()
+void
+IRCClient::handleIncomingLine ()
 {
-    IRCEvent evento(lines);
-    emit event(&evento);
-    if (evento.isNumeric() == true) {
-        if (evento.getNumeric() == RPL_WELCOME) {
-            m_loggedIn = true;
-            emit completedLogin(m_nickInUse.toStdString().c_str());
-        } else if ((evento.getNumeric() == ERR_NICKNAMEINUSE) && (m_loggedIn == false)) {
-            if (testedNicks == 50) {
-                emit connectionStatus("Nicknames in use, aborting connection.");
-                disconnectFromServer();
-            } else {
-                emit connectionStatus(QString("Nickname %1 is in use.").arg(m_nickInUse).toStdString().c_str());
-                setNickInUse(QString("%1%2").arg(m_nick1).arg(testedNicks));
-                sendCommand(1, COMMAND_NICK, m_nickInUse.toStdString().c_str());
-                testedNicks++;
-            }
-        } else if (evento.getNumeric() == ERR_PASSWDMISMATCH) {
-            emit connectionStatus("The password you provided seems to be wrong.");
-        } else {
-            emit replyCode(&evento);
-        }
-        return;
+  IRCEvent evento (lines);
+  emit event (&evento);
+  if (evento.isNumeric () == true)
+    {
+      if (evento.getNumeric () == RPL_WELCOME)
+	{
+	  m_loggedIn = true;
+	  emit completedLogin (m_nickInUse.toStdString ().c_str ());
+	}
+      else if ((evento.getNumeric () == ERR_NICKNAMEINUSE)
+	       && (m_loggedIn == false))
+	{
+	  if (testedNicks == 50)
+	    {
+	      emit
+		connectionStatus ("Nicknames in use, aborting connection.");
+	      disconnectFromServer ();
+	    }
+	  else
+	    {
+	      emit connectionStatus (QString ("Nickname %1 is in use.").
+				     arg (m_nickInUse).toStdString ().
+				     c_str ());
+	      setNickInUse (QString ("%1%2").arg (m_nick1).arg (testedNicks));
+	      sendCommand (1, COMMAND_NICK,
+			   m_nickInUse.toStdString ().c_str ());
+	      testedNicks++;
+	    }
+	}
+      else if (evento.getNumeric () == ERR_PASSWDMISMATCH)
+	{
+	  emit
+	    connectionStatus ("The password you provided seems to be wrong.");
+	}
+      else
+	{
+	  emit replyCode (&evento);
+	}
+      return;
     }
 
-    QString command = evento.getCommand();
+  QString command = evento.getCommand ();
 
-    if (command == COMMAND_NICK) {
-        emit nick(evento.getNick().toStdString().c_str(),
-                  evento.getParam(0).toStdString().c_str());
+  if (command == COMMAND_NICK)
+    {
+      emit nick (evento.getNick ().toStdString ().c_str (),
+		 evento.getParam (0).toStdString ().c_str ());
 
-        if(evento.getNick() == nickInUse())
-            setNickInUse(evento.getParam(0));
+      if (evento.getNick () == nickInUse ())
+	setNickInUse (evento.getParam (0));
 
-        return;
-    } else if (command == COMMAND_QUIT) {
-        emit quit(evento.getNick().toStdString().c_str(),
-                  evento.getParam(0).toStdString().c_str());
-        return;
-    } else if (command == COMMAND_JOIN) {
-        emit join(evento.getNick().toStdString().c_str(),
-                  evento.getParam(0).toStdString().c_str());
-        return;
-    } else if (command == COMMAND_PART) {
-        emit part(evento.getNick().toStdString().c_str(),
-                  evento.getParam(0).toStdString().c_str(),
-                  evento.getParam(1).toStdString().c_str());
-        return;
-    } else if (command == COMMAND_MODE) {
-        emit mode(&evento);
-        return;
-    } else if (command == COMMAND_TOPIC) {
-        emit topic(evento.getNick().toStdString().c_str(),
-                   evento.getParam(0).toStdString().c_str(),
-                   evento.getParam(1).toStdString().c_str());
-        return;
-    } else if (command == COMMAND_KICK) {
-        emit kick(evento.getNick().toStdString().c_str(),
-                  evento.getParam(0).toStdString().c_str(),
-                  evento.getParam(1).toStdString().c_str(),
-                  evento.getParam(2).toStdString().c_str());
-        return;
-    } else if (command == COMMAND_INVITE) {
-        emit invite(evento.getNick().toStdString().c_str(),
-                    evento.getParam(1).toStdString().c_str());
-        return;
-    } else if (command == COMMAND_PRIVMSG) {
-        emit privateMessage(evento.getNick().toStdString().c_str(),
-                            evento.getParam(0).toStdString().c_str(),
-                            evento.getParam(1).toStdString().c_str());
-        return;
-    } else if (command == COMMAND_NOTICE) {
-        emit notice(evento.getNick().toStdString().c_str(),
-                    evento.getParam(0).toStdString().c_str(),
-                    evento.getParam(1).toStdString().c_str());
-        return;
-    } else if (command == COMMAND_PING) {
-        if (m_automaticPong == true) {
-            sendCommand(1, COMMAND_PONG, m_nickInUse.toStdString().c_str());
-        }
-        emit ping(evento.getParam(0).toStdString().c_str());
-        return;
-    } else if (command == COMMAND_ERROR) {
-        emit error(evento.getParam(0).toStdString().c_str());
-        terminateConnection();
-        return;
-    } else {
-        emit notRecognized(&evento);
+      return;
+    }
+  else if (command == COMMAND_QUIT)
+    {
+      emit quit (evento.getNick ().toStdString ().c_str (),
+		 evento.getParam (0).toStdString ().c_str ());
+      return;
+    }
+  else if (command == COMMAND_JOIN)
+    {
+      emit join (evento.getNick ().toStdString ().c_str (),
+		 evento.getParam (0).toStdString ().c_str ());
+      return;
+    }
+  else if (command == COMMAND_PART)
+    {
+      emit part (evento.getNick ().toStdString ().c_str (),
+		 evento.getParam (0).toStdString ().c_str (),
+		 evento.getParam (1).toStdString ().c_str ());
+      return;
+    }
+  else if (command == COMMAND_MODE)
+    {
+      emit mode (&evento);
+      return;
+    }
+  else if (command == COMMAND_TOPIC)
+    {
+      emit topic (evento.getNick ().toStdString ().c_str (),
+		  evento.getParam (0).toStdString ().c_str (),
+		  evento.getParam (1).toStdString ().c_str ());
+      return;
+    }
+  else if (command == COMMAND_KICK)
+    {
+      emit kick (evento.getNick ().toStdString ().c_str (),
+		 evento.getParam (0).toStdString ().c_str (),
+		 evento.getParam (1).toStdString ().c_str (),
+		 evento.getParam (2).toStdString ().c_str ());
+      return;
+    }
+  else if (command == COMMAND_INVITE)
+    {
+      emit invite (evento.getNick ().toStdString ().c_str (),
+		   evento.getParam (1).toStdString ().c_str ());
+      return;
+    }
+  else if (command == COMMAND_PRIVMSG)
+    {
+      emit privateMessage (evento.getNick ().toStdString ().c_str (),
+			   evento.getParam (0).toStdString ().c_str (),
+			   evento.getParam (1).toStdString ().c_str ());
+      return;
+    }
+  else if (command == COMMAND_NOTICE)
+    {
+      emit notice (evento.getNick ().toStdString ().c_str (),
+		   evento.getParam (0).toStdString ().c_str (),
+		   evento.getParam (1).toStdString ().c_str ());
+      return;
+    }
+  else if (command == COMMAND_PING)
+    {
+      if (m_automaticPong == true)
+	{
+	  sendCommand (1, COMMAND_PONG, m_nickInUse.toStdString ().c_str ());
+	}
+      emit ping (evento.getParam (0).toStdString ().c_str ());
+      return;
+    }
+  else if (command == COMMAND_ERROR)
+    {
+      emit error (evento.getParam (0).toStdString ().c_str ());
+      terminateConnection ();
+      return;
+    }
+  else
+    {
+      emit notRecognized (&evento);
     }
 }
 
-IRCClient::IRCClient(bool autoPong)
+IRCClient::IRCClient (bool autoPong)
 {
-    m_clientSocket = new IClientSocket();
-    m_connected = false;
-    m_loggedIn = false;
-    lines[0] = 0;
-    longitud = 0;
+  m_clientSocket = new IClientSocket ();
+  m_connected = false;
+  m_loggedIn = false;
+  lines[0] = 0;
+  longitud = 0;
 
-    m_readSocketNotifier = m_writeSocketNotifier = NULL;
-    m_automaticPong = autoPong;
+  m_readSocketNotifier = m_writeSocketNotifier = NULL;
+  m_automaticPong = autoPong;
 }
 
-IRCClient::~IRCClient() {
-    disconnectFromServer();
-    delete m_clientSocket;
+IRCClient::~IRCClient ()
+{
+  disconnectFromServer ();
+  delete m_clientSocket;
 }
 
-int IRCClient::getSocket() {
-    return m_clientSocket->getSocket();
+int
+IRCClient::getSocket ()
+{
+  return m_clientSocket->getSocket ();
 }
 
-bool IRCClient::setAutoPong(bool aP) {
-    return (m_automaticPong = aP);
+bool
+IRCClient::setAutoPong (bool aP)
+{
+  return (m_automaticPong = aP);
 }
 
-void IRCClient::initializeReadingSocket(int socketHandler) {
-    Q_UNUSED(socketHandler);
-    int error = 0;
-    bool moreThanOne = false;
-    char c;
+void
+IRCClient::initializeReadingSocket (int socketHandler)
+{
+  Q_UNUSED (socketHandler);
+  int error = 0;
+  bool moreThanOne = false;
+  char c;
 
-    while((m_connected == true) && ((error = m_clientSocket->read(&c, 1)) > 0)) {
-        if ((longitud < 510) && (c != 10) && (c != 13)) {
-            lines[longitud] = c;
-            lines[longitud+1] = 0;
-            longitud++;
-        }
+  while ((m_connected == true)
+	 && ((error = m_clientSocket->read (&c, 1)) > 0))
+    {
+      if ((longitud < 510) && (c != 10) && (c != 13))
+	{
+	  lines[longitud] = c;
+	  lines[longitud + 1] = 0;
+	  longitud++;
+	}
 
-        if (((c == 10) || (c == 13)) && (longitud > 0)) {
-            handleIncomingLine();
-            lines[0] = 0;
-            longitud = 0;
-        }
-        moreThanOne = true;
+      if (((c == 10) || (c == 13)) && (longitud > 0))
+	{
+	  handleIncomingLine ();
+	  lines[0] = 0;
+	  longitud = 0;
+	}
+      moreThanOne = true;
     }
 
-    if ((error == 0) && (moreThanOne == false)) {
-        terminateConnection();
+  if ((error == 0) && (moreThanOne == false))
+    {
+      terminateConnection ();
     }
 
-    if ((error < 0) && (m_connected == true)) {
-        terminateConnection();
+  if ((error < 0) && (m_connected == true))
+    {
+      terminateConnection ();
     }
 }
 
-void IRCClient::initializeWritingSocket(int socketHandler) {
-    Q_UNUSED(socketHandler);
-    m_writeSocketNotifier->setEnabled(false);
-    int resultado = 0;
-    socklen_t l = sizeof(resultado);
-    getsockopt(m_clientSocket->getSocket(), SOL_SOCKET, SO_ERROR, &resultado, &l);
-    if(resultado != 0) {
-        emit connectionStatus("<font color=\"#990000\"><b>Connection failed.</b></font>");
-        terminateConnection();
-    } else {
-        emit connectionStatus("<font color=\"#00AA00\"><b>Connection to server established.</b></font>");
-        m_connected = true;
-        m_readSocketNotifier->setEnabled(true);
-        emit establishedConnection();
-        setNickInUse(m_nick1);
-        m_loggedIn = false;
+void
+IRCClient::initializeWritingSocket (int socketHandler)
+{
+  Q_UNUSED (socketHandler);
+  m_writeSocketNotifier->setEnabled (false);
+  int resultado = 0;
+  socklen_t l = sizeof (resultado);
+  getsockopt (m_clientSocket->getSocket (), SOL_SOCKET, SO_ERROR, &resultado,
+	      &l);
+  if (resultado != 0)
+    {
+      emit
+	connectionStatus
+	("<font color=\"#990000\"><b>Connection failed.</b></font>");
+      terminateConnection ();
+    }
+  else
+    {
+      emit
+	connectionStatus
+	("<font color=\"#00AA00\"><b>Connection to server established.</b></font>");
+      m_connected = true;
+      m_readSocketNotifier->setEnabled (true);
+      emit establishedConnection ();
+      setNickInUse (m_nick1);
+      m_loggedIn = false;
 
-        emit connectionStatus(QString("Attempting to login as %1.")
-                              .arg(m_nickInUse).toStdString().c_str());
-        if (m_password.isNull() == false) {
-            sendCommand(1, COMMAND_PASS, m_password.toStdString().c_str());
-        }
-        sendCommand(4, COMMAND_USER, m_userName.toStdString().c_str(),
-                    "0", "0", m_realName.toStdString().c_str());
-        sendCommand(1, COMMAND_NICK, m_nickInUse.toStdString().c_str());
+      emit connectionStatus (QString ("Attempting to login as %1.").
+			     arg (m_nickInUse).toStdString ().c_str ());
+      if (m_password.isNull () == false)
+	{
+	  sendCommand (1, COMMAND_PASS, m_password.toStdString ().c_str ());
+	}
+      sendCommand (4, COMMAND_USER, m_userName.toStdString ().c_str (),
+		   "0", "0", m_realName.toStdString ().c_str ());
+      sendCommand (1, COMMAND_NICK, m_nickInUse.toStdString ().c_str ());
 
-        testedNicks = 1;
+      testedNicks = 1;
     }
 }
 
-void IRCClient::sendNickChange(QString nick) {
-    sendCommand(1, COMMAND_NICK, nick.toStdString().c_str());
+void
+IRCClient::sendNickChange (QString nick)
+{
+  sendCommand (1, COMMAND_NICK, nick.toStdString ().c_str ());
 }
 
-void IRCClient::joinChannel(QString channel) {
-    emit connectionStatus(QString("Joining channel %1.").arg(channel).toStdString().c_str());
-    sendCommand(1, COMMAND_JOIN, channel.toStdString().c_str());
-    m_recentChannel = channel;
+void
+IRCClient::joinChannel (QString channel)
+{
+  emit connectionStatus (QString ("Joining channel %1.").arg (channel).
+			 toStdString ().c_str ());
+  sendCommand (1, COMMAND_JOIN, channel.toStdString ().c_str ());
+  m_recentChannel = channel;
 }
 
-void IRCClient::sendPublicMessage(QString message) {
-    sendCommand(2, COMMAND_PRIVMSG, m_recentChannel.toStdString().c_str(),
-                message.toStdString().c_str());
+void
+IRCClient::sendPublicMessage (QString message)
+{
+  sendCommand (2, COMMAND_PRIVMSG, m_recentChannel.toStdString ().c_str (),
+	       message.toStdString ().c_str ());
 }
 
-void IRCClient::connectToServer(const char *server,
-                                int puerto,
-                                const char *nick1,
-                                const char *nick2,
-                                const char *user,
-                                const char *realName,
-                                const char *pass,
-                                int flags) {
-    Q_UNUSED(flags);
-    if (m_readSocketNotifier != NULL)
+void
+IRCClient::connectToServer (const char *server,
+			    int puerto,
+			    const char *nick1,
+			    const char *nick2,
+			    const char *user,
+			    const char *realName, const char *pass, int flags)
+{
+  Q_UNUSED (flags);
+  if (m_readSocketNotifier != NULL)
     {
-        if (m_connected == true) {
-            disconnectFromServer();
-        } else {
-            terminateConnection();
-        }
+      if (m_connected == true)
+	{
+	  disconnectFromServer ();
+	}
+      else
+	{
+	  terminateConnection ();
+	}
     }
 
-    m_connected = false;
-    IRCClient::m_nick1 = nick1;
-    IRCClient::m_nick2 = nick2;
-    IRCClient::m_userName = user;
-    IRCClient::m_password = pass;
-    IRCClient::m_realName = realName;
+  m_connected = false;
+  IRCClient::m_nick1 = nick1;
+  IRCClient::m_nick2 = nick2;
+  IRCClient::m_userName = user;
+  IRCClient::m_password = pass;
+  IRCClient::m_realName = realName;
 
-    if (m_clientSocket->connect(server, puerto, false) < 0)
+  if (m_clientSocket->connect (server, puerto, false) < 0)
     {
-        emit connectionStatus("Can't resolve the server name. Connection aborted.");
-        return;
+      emit
+	connectionStatus
+	("Can't resolve the server name. Connection aborted.");
+      return;
     }
 
-    m_writeSocketNotifier = new QSocketNotifier(m_clientSocket->getSocket(), QSocketNotifier::Write, this);
-    m_writeSocketNotifier->setEnabled(true);
-    connect(m_writeSocketNotifier, SIGNAL(activated(int)), this, SLOT(initializeWritingSocket(int)));
+  m_writeSocketNotifier =
+    new QSocketNotifier (m_clientSocket->getSocket (), QSocketNotifier::Write,
+			 this);
+  m_writeSocketNotifier->setEnabled (true);
+  connect (m_writeSocketNotifier, SIGNAL (activated (int)), this,
+	   SLOT (initializeWritingSocket (int)));
 
-    m_readSocketNotifier = new QSocketNotifier(m_clientSocket->getSocket(), QSocketNotifier::Read, this);
-    m_readSocketNotifier->setEnabled(false);
-    connect(m_readSocketNotifier, SIGNAL(activated(int)), this, SLOT(initializeReadingSocket(int)));
-    emit connectionStatus("Trying to connect to IRC server, please wait..");
+  m_readSocketNotifier =
+    new QSocketNotifier (m_clientSocket->getSocket (), QSocketNotifier::Read,
+			 this);
+  m_readSocketNotifier->setEnabled (false);
+  connect (m_readSocketNotifier, SIGNAL (activated (int)), this,
+	   SLOT (initializeReadingSocket (int)));
+  emit connectionStatus ("Trying to connect to IRC server, please wait..");
 }
 
-void IRCClient::disconnectFromServer(const char *razon)
+void
+IRCClient::disconnectFromServer (const char *razon)
 {
-    lines[0] = 0;
-    longitud = 0;
+  lines[0] = 0;
+  longitud = 0;
+
+  if (m_readSocketNotifier == NULL)
+    return;
 
-    if (m_readSocketNotifier == NULL)
-        return;
-
-    if (m_connected) {
-        if (razon == 0) {
-            sendCommand(0, COMMAND_QUIT);
-        } else {
-            sendCommand(1, COMMAND_QUIT, razon);
-        }
+  if (m_connected)
+    {
+      if (razon == 0)
+	{
+	  sendCommand (0, COMMAND_QUIT);
+	}
+      else
+	{
+	  sendCommand (1, COMMAND_QUIT, razon);
+	}
     }
 
-    delete m_readSocketNotifier;
-    delete m_writeSocketNotifier;
+  delete m_readSocketNotifier;
+  delete m_writeSocketNotifier;
 
-    m_readSocketNotifier = m_writeSocketNotifier = NULL;
-    m_clientSocket->close();
-    m_connected = m_loggedIn = false;
-    emit disconnected();
+  m_readSocketNotifier = m_writeSocketNotifier = NULL;
+  m_clientSocket->close ();
+  m_connected = m_loggedIn = false;
+  emit disconnected ();
 }
 
-void IRCClient::terminateConnection()
+void
+IRCClient::terminateConnection ()
 {
-    if (m_readSocketNotifier == NULL)
-        return;
+  if (m_readSocketNotifier == NULL)
+    return;
 
-    delete m_readSocketNotifier;
-    delete m_writeSocketNotifier;
-    m_readSocketNotifier = m_writeSocketNotifier = NULL;
-    m_clientSocket->close();
-    m_connected = m_loggedIn = false;
-    emit disconnected();
+  delete m_readSocketNotifier;
+  delete m_writeSocketNotifier;
+  m_readSocketNotifier = m_writeSocketNotifier = NULL;
+  m_clientSocket->close ();
+  m_connected = m_loggedIn = false;
+  emit disconnected ();
 }
 
 
-void IRCClient::sendLine(const char *line) {
-    QString msg = QString("%1%2").arg(line).arg(CRLF);
-    m_clientSocket->write(msg.toStdString().c_str(), msg.length());
+void
+IRCClient::sendLine (const char *line)
+{
+  QString msg = QString ("%1%2").arg (line).arg (CRLF);
+  m_clientSocket->write (msg.toStdString ().c_str (), msg.length ());
 }
 
-void IRCClient::sendCommand(int numberOfCommands, const char *command, ...) {
-    char linea[513];
-    char *parametro;
-    va_list lp;
+void
+IRCClient::sendCommand (int numberOfCommands, const char *command, ...)
+{
+  char linea[513];
+  char *parametro;
+  va_list lp;
 
-    strncpy(linea, command, 512);
-    linea[512] = 0;
-    va_start(lp, command);
-    for (int i = 0; i < numberOfCommands; i++)
+  strncpy (linea, command, 512);
+  linea[512] = 0;
+  va_start (lp, command);
+  for (int i = 0; i < numberOfCommands; i++)
     {
-        if (i == 15) break;
-        parametro = va_arg(lp, char *);
-        if (i == numberOfCommands - 1)
-        {
-            if (strlen(linea) + strlen(parametro) + 2 > 512) break;
-            if (strchr(parametro, ' ') != NULL)
-            { strcat(linea, " :");
-            } else {
-                strcat(linea, " ");
-            }
-            strcat(linea, parametro);
-        } else {
-            if (strlen(linea) + strlen(parametro) + 1 > 512) break;
-            strcat(linea, " ");
-            strcat(linea, parametro);
-        }
+      if (i == 15)
+	break;
+      parametro = va_arg (lp, char *);
+      if (i == numberOfCommands - 1)
+	{
+	  if (strlen (linea) + strlen (parametro) + 2 > 512)
+	    break;
+	  if (strchr (parametro, ' ') != NULL)
+	    {
+	      strcat (linea, " :");
+	    }
+	  else
+	    {
+	      strcat (linea, " ");
+	    }
+	  strcat (linea, parametro);
+	}
+      else
+	{
+	  if (strlen (linea) + strlen (parametro) + 1 > 512)
+	    break;
+	  strcat (linea, " ");
+	  strcat (linea, parametro);
+	}
     }
-    va_end(lp);
-    sendLine(linea);
+  va_end (lp);
+  sendLine (linea);
 }
 
 
 // ************************** IRCEvent **********************
 
-IRCEvent::IRCEvent(const char *serverMessage) {
-    char prefix[MAX_LINE_LEN];
-    int index = 0;
+IRCEvent::IRCEvent (const char *serverMessage)
+{
+  char prefix[MAX_LINE_LEN];
+  int index = 0;
 
-    nick = "";
-    user = "";
-    host = "";
-    for (int i = 0; i < 15; i++)
+  nick = "";
+  user = "";
+  host = "";
+  for (int i = 0; i < 15; i++)
     {
-        param[i] = "";
+      param[i] = "";
     }
 
-    if (serverMessage[0] == CHR_COLON)
+  if (serverMessage[0] == CHR_COLON)
     {
-        index++;
-        strcpy(prefix, getStringToken(serverMessage, index).toStdString().c_str());
+      index++;
+      strcpy (prefix,
+	      getStringToken (serverMessage, index).toStdString ().c_str ());
 
-        int etapa = 0;
-        for (unsigned int i = 0; i < strlen(prefix); i++)
-        {
-            switch (prefix[i]) {
-            case '!' : etapa = 1; break;
-            case '@' : etapa = 2; break;
-            default:
-                switch (etapa) {
-                case 0  : nick += prefix[i]; break;
-                case 1  : user += prefix[i]; break;
-                default : host += prefix[i]; break;
-                }
-            }
-        }
+      int etapa = 0;
+      for (unsigned int i = 0; i < strlen (prefix); i++)
+	{
+	  switch (prefix[i])
+	    {
+	    case '!':
+	      etapa = 1;
+	      break;
+	    case '@':
+	      etapa = 2;
+	      break;
+	    default:
+	      switch (etapa)
+		{
+		case 0:
+		  nick += prefix[i];
+		  break;
+		case 1:
+		  user += prefix[i];
+		  break;
+		default:
+		  host += prefix[i];
+		  break;
+		}
+	    }
+	}
     }
 
-    command = getStringToken(serverMessage, index);
-    command = command.toUpper();
+  command = getStringToken (serverMessage, index);
+  command = command.toUpper ();
 
-    paramCount = 0;
-    while (serverMessage[index] != 0)
+  paramCount = 0;
+  while (serverMessage[index] != 0)
     {
-        if ((serverMessage[index] == CHR_COLON) || (paramCount == 14))
-        {
+      if ((serverMessage[index] == CHR_COLON) || (paramCount == 14))
+	{
 
-            if (serverMessage[index] == CHR_COLON)
-            {
-                index++;
-            }
+	  if (serverMessage[index] == CHR_COLON)
+	    {
+	      index++;
+	    }
 
-            param[paramCount] = (const char *)(serverMessage+index);
-            index += strlen(serverMessage+index);
-        } else {
-            param[paramCount] = getStringToken(serverMessage, index);
-        }
-        paramCount++;
+	  param[paramCount] = (const char *) (serverMessage + index);
+	  index += strlen (serverMessage + index);
+	}
+      else
+	{
+	  param[paramCount] = getStringToken (serverMessage, index);
+	}
+      paramCount++;
     }
 
-    if (strlen(command.toStdString().c_str()) == strspn(command.toStdString().c_str(), DIGITS))
+  if (strlen (command.toStdString ().c_str ()) ==
+      strspn (command.toStdString ().c_str (), DIGITS))
     {
-        numeric = true;
-        codeNumber = atoi(command.toStdString().c_str());
-    } else {
-        numeric = false;
+      numeric = true;
+      codeNumber = atoi (command.toStdString ().c_str ());
+    }
+  else
+    {
+      numeric = false;
     }
 }
 
-int IRCEvent::getNumeric() {
-    if (!numeric)
+int
+IRCEvent::getNumeric ()
+{
+  if (!numeric)
     {
-        return -1;
-    } else {
-        return codeNumber;
+      return -1;
+    }
+  else
+    {
+      return codeNumber;
     }
 }
 
-QString IRCEvent::getParam(int index) {
-    if ((index < 0) || (index > 14)) {
-        return QString();
-    } else {
-        return param[index];
+QString
+IRCEvent::getParam (int index)
+{
+  if ((index < 0) || (index > 14))
+    {
+      return QString ();
+    }
+  else
+    {
+      return param[index];
     }
 }
 
-int IRCEvent::skipSpaces(const char *line, int &index) {
-    while (line[index] == CHR_SPACE)
+int
+IRCEvent::skipSpaces (const char *line, int &index)
+{
+  while (line[index] == CHR_SPACE)
     {
-        index++;
+      index++;
     }
-    return index;
+  return index;
 }
 
-QString IRCEvent::getStringToken(const char *line, int &index)
+QString
+IRCEvent::getStringToken (const char *line, int &index)
 {
-    QString token("");
-    skipSpaces(line, index);
-    while ((line[index] != CHR_SPACE) && (line[index] != CHR_ZERO)) {
-        token += line[index];
-        index++;
+  QString token ("");
+  skipSpaces (line, index);
+  while ((line[index] != CHR_SPACE) && (line[index] != CHR_ZERO))
+    {
+      token += line[index];
+      index++;
     }
 
-    skipSpaces(line, index);
-    return token;
+  skipSpaces (line, index);
+  return token;
 }
 
-QString IRCEvent::getStringToken(QString line, int &index) {
-    return getStringToken(line.toStdString().c_str(), index);
+QString
+IRCEvent::getStringToken (QString line, int &index)
+{
+  return getStringToken (line.toStdString ().c_str (), index);
 }