--- a/gui/src/terminal/QTerminalWidget.cpp
+++ b/gui/src/terminal/QTerminalWidget.cpp
@@ -15,177 +15,196 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-						
+
 #include "QTerminalWidget.h"
 #include "Session.h"
 #include "TerminalDisplay.h"
 
 struct TermWidgetImpl
 {
-    TermWidgetImpl(QWidget* parent = 0);
+  TermWidgetImpl (QWidget * parent = 0);
 
-    TerminalDisplay *m_terminalDisplay;
-    Session *m_session;
-    Session* createSession();
-    TerminalDisplay* createTerminalDisplay(Session *session, QWidget* parent);
+  TerminalDisplay *m_terminalDisplay;
+  Session *m_session;
+  Session *createSession ();
+  TerminalDisplay *createTerminalDisplay (Session * session,
+					  QWidget * parent);
 };
 
-TermWidgetImpl::TermWidgetImpl(QWidget* parent)
+TermWidgetImpl::TermWidgetImpl (QWidget * parent)
 {
-    QPalette palette = QApplication::palette();
-    m_session = createSession();
-    m_terminalDisplay = createTerminalDisplay(this->m_session, parent);
-    m_terminalDisplay->setBackgroundColor(palette.color(QPalette::Base));
-    m_terminalDisplay->setForegroundColor(palette.color(QPalette::Text));
+  QPalette palette = QApplication::palette ();
+  m_session = createSession ();
+  m_terminalDisplay = createTerminalDisplay (this->m_session, parent);
+  m_terminalDisplay->setBackgroundColor (palette.color (QPalette::Base));
+  m_terminalDisplay->setForegroundColor (palette.color (QPalette::Text));
 }
 
-Session *TermWidgetImpl::createSession()
+Session *
+TermWidgetImpl::createSession ()
 {
-    Session *session = new Session();
-    session->setTitle(Session::NameRole, "QTerminalWidget");
-    session->setProgram("/bin/bash");
-    session->setArguments(QStringList());
-    session->setAutoClose(true);
-    session->setCodec(QTextCodec::codecForName("UTF-8"));
-    session->setFlowControlEnabled(true);
-    session->setHistoryType(HistoryTypeBuffer(1000));
-    session->setDarkBackground(true);
-    session->setKeyBindings("");
-    return session;
+  Session *session = new Session ();
+  session->setTitle (Session::NameRole, "QTerminalWidget");
+  session->setProgram ("/bin/bash");
+  session->setArguments (QStringList ());
+  session->setAutoClose (true);
+  session->setCodec (QTextCodec::codecForName ("UTF-8"));
+  session->setFlowControlEnabled (true);
+  session->setHistoryType (HistoryTypeBuffer (1000));
+  session->setDarkBackground (true);
+  session->setKeyBindings ("");
+  return session;
 }
 
-TerminalDisplay *TermWidgetImpl::createTerminalDisplay(Session *session, QWidget* parent)
+TerminalDisplay *
+TermWidgetImpl::createTerminalDisplay (Session * session, QWidget * parent)
 {
-    TerminalDisplay* display = new TerminalDisplay(parent);
-    display->setBellMode(TerminalDisplay::NotifyBell);
-    display->setTerminalSizeHint(true);
-    display->setTripleClickMode(TerminalDisplay::SelectWholeLine);
-    display->setTerminalSizeStartup(true);
-    display->setRandomSeed(session->sessionId() * 31);
-    return display;
+  TerminalDisplay *display = new TerminalDisplay (parent);
+  display->setBellMode (TerminalDisplay::NotifyBell);
+  display->setTerminalSizeHint (true);
+  display->setTripleClickMode (TerminalDisplay::SelectWholeLine);
+  display->setTerminalSizeStartup (true);
+  display->setRandomSeed (session->sessionId () * 31);
+  return display;
 }
 
-QTerminalWidget::QTerminalWidget(int startnow, QWidget *parent)
-    :QWidget(parent)
+QTerminalWidget::QTerminalWidget (int startnow, QWidget * parent):QWidget
+  (parent)
 {
-    m_impl = new TermWidgetImpl(this);
-    
-    initialize();
+  m_impl = new TermWidgetImpl (this);
+
+  initialize ();
 
-    if(startnow && m_impl->m_session) {
-	m_impl->m_session->run();
+  if (startnow && m_impl->m_session)
+    {
+      m_impl->m_session->run ();
     }
 
-    setFocus(Qt::OtherFocusReason);
-    m_impl->m_terminalDisplay->resize(this->size());
-    setFocusProxy(m_impl->m_terminalDisplay);
+  setFocus (Qt::OtherFocusReason);
+  m_impl->m_terminalDisplay->resize (this->size ());
+  setFocusProxy (m_impl->m_terminalDisplay);
 }
 
-void QTerminalWidget::startShellProgram()
+void
+QTerminalWidget::startShellProgram ()
 {
-    if(m_impl->m_session->isRunning())
-	return;
-	
-    m_impl->m_session->run();
+  if (m_impl->m_session->isRunning ())
+    return;
+
+  m_impl->m_session->run ();
 }
 
-void QTerminalWidget::initialize()
-{    
-    m_impl->m_terminalDisplay->setSize(80, 40);
-    
-    QFont font = QApplication::font(); 
-    font.setFamily("Monospace");
-    font.setPointSize(10);
-    font.setStyleHint(QFont::TypeWriter);
-    setTerminalFont(font);
-    setScrollBarPosition(NoScrollBar);
+void
+QTerminalWidget::initialize ()
+{
+  m_impl->m_terminalDisplay->setSize (80, 40);
 
-    m_impl->m_session->addView(m_impl->m_terminalDisplay);
-    
-    connect(m_impl->m_session, SIGNAL(finished()), this, SLOT(sessionFinished()));
+  QFont font = QApplication::font ();
+  font.setFamily ("Monospace");
+  font.setPointSize (10);
+  font.setStyleHint (QFont::TypeWriter);
+  setTerminalFont (font);
+  setScrollBarPosition (NoScrollBar);
+
+  m_impl->m_session->addView (m_impl->m_terminalDisplay);
+
+  connect (m_impl->m_session, SIGNAL (finished ()), this,
+	   SLOT (sessionFinished ()));
 }
 
-QTerminalWidget::~QTerminalWidget()
+QTerminalWidget::~QTerminalWidget ()
 {
-    emit destroyed();
+  emit destroyed ();
 }
 
-void QTerminalWidget::setTerminalFont(QFont &font)
+void
+QTerminalWidget::setTerminalFont (QFont & font)
 {
-    if (!m_impl->m_terminalDisplay)
-	return;
-    m_impl->m_terminalDisplay->setVTFont(font);
+  if (!m_impl->m_terminalDisplay)
+    return;
+  m_impl->m_terminalDisplay->setVTFont (font);
 }
 
-void QTerminalWidget::setShellProgram(QString progname)
+void
+QTerminalWidget::setShellProgram (QString progname)
 {
-    if (!m_impl->m_session)
-	return;
-    m_impl->m_session->setProgram(progname);	
+  if (!m_impl->m_session)
+    return;
+  m_impl->m_session->setProgram (progname);
 }
 
-void QTerminalWidget::openTeletype(int fd)
+void
+QTerminalWidget::openTeletype (int fd)
 {
-  if ( m_impl->m_session->isRunning() )
+  if (m_impl->m_session->isRunning ())
     return;
 
-  m_impl->m_session->openTeletype(fd);
+  m_impl->m_session->openTeletype (fd);
 }
 
-void QTerminalWidget::setArgs(QStringList &args)
+void
+QTerminalWidget::setArgs (QStringList & args)
 {
-    if (!m_impl->m_session)
-	return;
-    m_impl->m_session->setArguments(args);	
+  if (!m_impl->m_session)
+    return;
+  m_impl->m_session->setArguments (args);
 }
 
-void QTerminalWidget::setTextCodec(QTextCodec *codec)
+void
+QTerminalWidget::setTextCodec (QTextCodec * codec)
 {
-    if (!m_impl->m_session)
-	return;
-    m_impl->m_session->setCodec(codec);	
+  if (!m_impl->m_session)
+    return;
+  m_impl->m_session->setCodec (codec);
 }
 
-void QTerminalWidget::setSize(int h, int v)
+void
+QTerminalWidget::setSize (int h, int v)
 {
-    if (!m_impl->m_terminalDisplay)
-	return;
-    m_impl->m_terminalDisplay->setSize(h, v);
+  if (!m_impl->m_terminalDisplay)
+    return;
+  m_impl->m_terminalDisplay->setSize (h, v);
 }
 
-void QTerminalWidget::setHistorySize(int lines)
+void
+QTerminalWidget::setHistorySize (int lines)
 {
-    if (lines < 0)
-        m_impl->m_session->setHistoryType(HistoryTypeFile());
-    else
-	m_impl->m_session->setHistoryType(HistoryTypeBuffer(lines));
-}
-
-void QTerminalWidget::setScrollBarPosition(ScrollBarPosition pos)
-{
-    if (!m_impl->m_terminalDisplay)
-	return;
-    m_impl->m_terminalDisplay->setScrollBarPosition((TerminalDisplay::ScrollBarPosition)pos);
+  if (lines < 0)
+    m_impl->m_session->setHistoryType (HistoryTypeFile ());
+  else
+    m_impl->m_session->setHistoryType (HistoryTypeBuffer (lines));
 }
 
-void QTerminalWidget::sendText(const QString &text)
+void
+QTerminalWidget::setScrollBarPosition (ScrollBarPosition pos)
 {
-    m_impl->m_session->sendText(text); 
+  if (!m_impl->m_terminalDisplay)
+    return;
+  m_impl->m_terminalDisplay->
+    setScrollBarPosition ((TerminalDisplay::ScrollBarPosition) pos);
 }
 
-void QTerminalWidget::installEventFilterOnDisplay(QObject *object) {
-    m_impl->m_terminalDisplay->installEventFilter(object);
+void
+QTerminalWidget::sendText (const QString & text)
+{
+  m_impl->m_session->sendText (text);
 }
 
-void QTerminalWidget::resizeEvent(QResizeEvent*)
+void
+QTerminalWidget::installEventFilterOnDisplay (QObject * object)
 {
-    m_impl->m_terminalDisplay->resize(this->size());
-    m_impl->m_terminalDisplay->update();
+  m_impl->m_terminalDisplay->installEventFilter (object);
 }
 
-void QTerminalWidget::sessionFinished()
+void
+QTerminalWidget::resizeEvent (QResizeEvent *)
 {
-    emit finished();
+  m_impl->m_terminalDisplay->resize (this->size ());
+  m_impl->m_terminalDisplay->update ();
 }
 
-
+void
+QTerminalWidget::sessionFinished ()
+{
+  emit finished ();
+}