--- 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 ();
 }
-