# HG changeset patch
# User Jacob Dawid <jacob.dawid@googlemail.com>
# Date 1302178755 -7200
# Node ID 96ef8177889a4e710ff72c7a302d54534882b1fd
# Parent  d09eb4ace2c39fdd0d994c088f937f59432691c5
Cleaned up code widely.

diff -r d09eb4ace2c3 -r 96ef8177889a gui//BlockArray.cpp
--- a/gui//BlockArray.cpp	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//BlockArray.cpp	Thu Apr 07 14:19:15 2011 +0200
@@ -33,9 +33,6 @@
 #include <unistd.h>
 #include <stdio.h>
 
-
-using namespace Konsole;
-
 static int blocksize = 0;
 
 BlockArray::BlockArray()
diff -r d09eb4ace2c3 -r 96ef8177889a gui//BlockArray.h
--- a/gui//BlockArray.h	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//BlockArray.h	Thu Apr 07 14:19:15 2011 +0200
@@ -30,15 +30,11 @@
 #define BlockSize (1 << 12)
 #define ENTRIES   ((BlockSize - sizeof(size_t) ) / sizeof(unsigned char))
 
-namespace Konsole
-{
-
 struct Block {
     Block() { size = 0; }
     unsigned char data[ENTRIES];
     size_t size;
 };
-
 // ///////////////////////////////////////////////////////
 
 class BlockArray {
@@ -117,9 +113,5 @@
 
     int ion;
     size_t length;
-
 };
-
-}
-
 #endif
diff -r d09eb4ace2c3 -r 96ef8177889a gui//Character.h
--- a/gui//Character.h	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//Character.h	Thu Apr 07 14:19:15 2011 +0200
@@ -31,9 +31,6 @@
 // Local
 #include "CharacterColor.h"
 
-namespace Konsole
-{
-
 typedef unsigned char LineProperty;
 
 static const int LINE_DEFAULT		= 0;
@@ -204,7 +201,5 @@
     QHash<ushort,ushort*> extendedCharTable;
 };
 
-}
-
 #endif // CHARACTER_H
 
diff -r d09eb4ace2c3 -r 96ef8177889a gui//CharacterColor.h
--- a/gui//CharacterColor.h	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//CharacterColor.h	Thu Apr 07 14:19:15 2011 +0200
@@ -28,9 +28,6 @@
 // Qt
 #include <QtGui/QColor>
 
-namespace Konsole
-{
-
 /** 
  * An entry in a terminal display's color palette. 
  *
@@ -294,8 +291,5 @@
   }
 }
 
-
-}
-
 #endif // CHARACTERCOLOR_H
 
diff -r d09eb4ace2c3 -r 96ef8177889a gui//ColorTables.h
--- a/gui//ColorTables.h	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//ColorTables.h	Thu Apr 07 14:19:15 2011 +0200
@@ -3,8 +3,6 @@
 
 #include "CharacterColor.h"
 
-using namespace Konsole;
-
 static const ColorEntry whiteonblack_color_table[TABLE_COLORS] =
 {
     // normal
diff -r d09eb4ace2c3 -r 96ef8177889a gui//Emulation.cpp
--- a/gui//Emulation.cpp	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//Emulation.cpp	Thu Apr 07 14:19:15 2011 +0200
@@ -49,8 +49,6 @@
 #include "TerminalCharacterDecoder.h"
 #include "ScreenWindow.h"
 
-using namespace Konsole;
-
 /* ------------------------------------------------------------------------- */
 /*                                                                           */
 /*                               Emulation                                  */
diff -r d09eb4ace2c3 -r 96ef8177889a gui//Emulation.h
--- a/gui//Emulation.h	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//Emulation.h	Thu Apr 07 14:19:15 2011 +0200
@@ -30,15 +30,10 @@
 
 // Qt 
 #include <QtGui/QKeyEvent>
-//#include <QPointer>
 #include <QtCore/QTextCodec>
 #include <QtCore/QTextStream>
 #include <QtCore/QTimer>
 
-
-namespace Konsole
-{
-
 class KeyboardTranslator;
 class HistoryType;
 class Screen;
@@ -460,6 +455,4 @@
   
 };
 
-}
-
 #endif // ifndef EMULATION_H
diff -r d09eb4ace2c3 -r 96ef8177889a gui//Filter.cpp
--- a/gui//Filter.cpp	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//Filter.cpp	Thu Apr 07 14:19:15 2011 +0200
@@ -34,15 +34,9 @@
 #include <QtCore/QSharedData>
 #include <QtCore>
 
-// KDE
-//#include <KLocale>
-//#include <KRun>
-
 // Konsole
 #include "TerminalCharacterDecoder.h"
 
-using namespace Konsole;
-
 FilterChain::~FilterChain()
 {
     QMutableListIterator<Filter*> iter(*this);
@@ -239,13 +233,6 @@
         }
     }
 }
-    
-
-/*void Filter::addLine(const QString& text)
-{
-    _linePositions << _buffer.length();
-    _buffer.append(text);
-}*/
 
 const QString* Filter::buffer()
 {
@@ -363,10 +350,7 @@
 {
     return _searchText;
 }
-/*void RegExpFilter::reset(int)
-{
-    _buffer = QString();
-}*/
+
 void RegExpFilter::process()
 {
     int pos = 0;
@@ -559,4 +543,3 @@
     return list; 
 }
 
-//#include "moc_Filter.cpp"
diff -r d09eb4ace2c3 -r 96ef8177889a gui//Filter.h
--- a/gui//Filter.h	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//Filter.h	Thu Apr 07 14:19:15 2011 +0200
@@ -33,9 +33,6 @@
 // Local
 #include "Character.h"
 
-namespace Konsole
-{
-
 /**
  * A filter processes blocks of text looking for certain patterns (such as URLs or keywords from a list)
  * and marks the areas which match the filter's patterns as 'hotspots'.
@@ -378,6 +375,4 @@
     QString* _buffer;
     QList<int>* _linePositions;
 };
-
-}
 #endif //FILTER_H
diff -r d09eb4ace2c3 -r 96ef8177889a gui//History.cpp
--- a/gui//History.cpp	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//History.cpp	Thu Apr 07 14:19:15 2011 +0200
@@ -37,8 +37,6 @@
 // Reasonable line size
 #define LINE_SIZE	1024
 
-using namespace Konsole;
-
 /*
    An arbitrary long scroll.
 
diff -r d09eb4ace2c3 -r 96ef8177889a gui//History.h
--- a/gui//History.h	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//History.h	Thu Apr 07 14:19:15 2011 +0200
@@ -20,8 +20,8 @@
     02110-1301  USA.
 */
 
-#ifndef TEHISTORY_H
-#define TEHISTORY_H
+#ifndef HISTORY_H
+#define HISTORY_H
 
 // Qt
 #include <QtCore/QBitRef>
@@ -32,14 +32,6 @@
 #include "BlockArray.h"
 #include "Character.h"
 
-namespace Konsole
-{
-
-#if 1
-/*
-   An extendable tmpfile(1) based buffer.
-*/
-
 class HistoryFile
 {
 public:
@@ -75,7 +67,6 @@
   //when readWriteBalance goes below this threshold, the file will be mmap'ed automatically
   static const int MAP_THRESHOLD = -1000;
 };
-#endif
 
 //////////////////////////////////////////////////////////////////////
 
@@ -124,7 +115,7 @@
 
 };
 
-#if 1
+
 
 //////////////////////////////////////////////////////////////////////
 // File-based history (e.g. file log, no limitation in length)
@@ -186,31 +177,8 @@
   int _maxLineCount;
   int _usedLines;  
   int _head;
-  
-  //QVector<histline*> m_histBuffer;
-  //QBitArray m_wrappedLine;
-  //unsigned int m_maxNbLines;
-  //unsigned int m_nbLines;
-  //unsigned int m_arrayIndex;
-  //bool         m_buffFilled;
 };
 
-/*class HistoryScrollBufferV2 : public HistoryScroll
-{
-public:
-  virtual int  getLines();
-  virtual int  getLineLen(int lineno);
-  virtual void getCells(int lineno, int colno, int count, Character res[]);
-  virtual bool isWrappedLine(int lineno);
-
-  virtual void addCells(const Character a[], int count);
-  virtual void addCells(const QVector<Character>& cells);
-  virtual void addLine(bool previousWrapped=false);
-
-};*/
-
-#endif
-
 //////////////////////////////////////////////////////////////////////
 // Nothing-based history (no history :-)
 //////////////////////////////////////////////////////////////////////
@@ -306,7 +274,6 @@
   size_t m_size;
 };
 
-#if 1 
 class HistoryTypeFile : public HistoryType
 {
 public:
@@ -337,8 +304,4 @@
   unsigned int m_nbLines;
 };
 
-#endif
-
-}
-
-#endif // TEHISTORY_H
+#endif // HISTORY_H
diff -r d09eb4ace2c3 -r 96ef8177889a gui//KeyboardTranslator.cpp
--- a/gui//KeyboardTranslator.cpp	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//KeyboardTranslator.cpp	Thu Apr 07 14:19:15 2011 +0200
@@ -30,18 +30,11 @@
 
 // Qt
 #include <QtCore/QBuffer>
-//#include <KDebug>
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
 #include <QtCore>
 #include <QtGui>
 
-// KDE
-//#include <KDebug>
-//#include <KLocale>
-//#include <KStandardDirs>
-
-using namespace Konsole;
 
 //this is for default REALLY fallback translator.
 
diff -r d09eb4ace2c3 -r 96ef8177889a gui//KeyboardTranslator.h
--- a/gui//KeyboardTranslator.h	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//KeyboardTranslator.h	Thu Apr 07 14:19:15 2011 +0200
@@ -110,9 +110,6 @@
 class QIODevice;
 class QTextStream;
 
-namespace Konsole
-{
-
 /** 
  * A convertor which maps between key sequences pressed by the user and the
  * character strings which should be sent to the terminal and commands
@@ -648,10 +645,9 @@
 }
 inline KeyboardTranslator::States KeyboardTranslator::Entry::stateMask() const { return _stateMask; }
 
-}
 
-Q_DECLARE_METATYPE(Konsole::KeyboardTranslator::Entry)
-Q_DECLARE_METATYPE(const Konsole::KeyboardTranslator*)
+Q_DECLARE_METATYPE(KeyboardTranslator::Entry)
+Q_DECLARE_METATYPE(const KeyboardTranslator*)
 
 #endif // KEYBOARDTRANSLATOR_H
 
diff -r d09eb4ace2c3 -r 96ef8177889a gui//Pty.cpp
--- a/gui//Pty.cpp	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//Pty.cpp	Thu Apr 07 14:19:15 2011 +0200
@@ -32,15 +32,8 @@
 
 // Qt
 #include <QtCore>
-
-// KDE
-//#include <KStandardDirs>
-//#include <KLocale>
-//#include <KDebug>
 #include "kpty.h"
 
-using namespace Konsole;
-
 void Pty::donePty()
 {
   emit done(exitStatus());
diff -r d09eb4ace2c3 -r 96ef8177889a gui//Pty.h
--- a/gui//Pty.h	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//Pty.h	Thu Apr 07 14:19:15 2011 +0200
@@ -33,10 +33,6 @@
 
 #include "k3process.h"
 
-
-namespace Konsole
-{
-
 /**
  * The Pty class is used to start the terminal process, 
  * send data to it, receive data from it and manipulate 
@@ -237,7 +233,4 @@
     bool _utf8;
     KPty *_pty;
 };
-
-}
-
 #endif // PTY_H
diff -r d09eb4ace2c3 -r 96ef8177889a gui//QTerminalWidget.cpp
--- a/gui//QTerminalWidget.cpp	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//QTerminalWidget.cpp	Thu Apr 07 14:19:15 2011 +0200
@@ -21,8 +21,6 @@
 #include "Session.h"
 #include "TerminalDisplay.h"
 
-using namespace Konsole;
-
 struct TermWidgetImpl
 {
     TermWidgetImpl(QWidget* parent = 0);
diff -r d09eb4ace2c3 -r 96ef8177889a gui//Quint
Binary file gui//Quint has changed
diff -r d09eb4ace2c3 -r 96ef8177889a gui//Screen.cpp
--- a/gui//Screen.cpp	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//Screen.cpp	Thu Apr 07 14:19:15 2011 +0200
@@ -39,8 +39,6 @@
 #include "konsole_wcwidth.h"
 #include "TerminalCharacterDecoder.h"
 
-using namespace Konsole;
-
 //FIXME: this is emulation specific. Use false for xterm, true for ANSI.
 //FIXME: see if we can get this from terminfo.
 #define BS_CLEARS false
diff -r d09eb4ace2c3 -r 96ef8177889a gui//Screen.h
--- a/gui//Screen.h	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//Screen.h	Thu Apr 07 14:19:15 2011 +0200
@@ -42,11 +42,6 @@
 #define MODE_NewLine   5
 #define MODES_SCREEN   6
 
-namespace Konsole
-{
-
-/*!
-*/
 struct ScreenParm
 {
   int mode[MODES_SCREEN];
@@ -657,6 +652,4 @@
     static Character defaultChar;
 };
 
-}
-
 #endif // SCREEN_H
diff -r d09eb4ace2c3 -r 96ef8177889a gui//ScreenWindow.cpp
--- a/gui//ScreenWindow.cpp	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//ScreenWindow.cpp	Thu Apr 07 14:19:15 2011 +0200
@@ -28,8 +28,6 @@
 // Konsole
 #include "Screen.h"
 
-using namespace Konsole;
-
 ScreenWindow::ScreenWindow(QObject* parent)
     : QObject(parent)
 	, _windowBuffer(0)
@@ -292,5 +290,3 @@
 
     emit outputChanged(); 
 }
-
-//#include "moc_ScreenWindow.cpp"
diff -r d09eb4ace2c3 -r 96ef8177889a gui//ScreenWindow.h
--- a/gui//ScreenWindow.h	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//ScreenWindow.h	Thu Apr 07 14:19:15 2011 +0200
@@ -30,9 +30,6 @@
 // Konsole
 #include "Character.h"
 
-namespace Konsole
-{
-
 class Screen;
 
 /**
@@ -251,6 +248,4 @@
     int  _scrollCount; // count of lines which the window has been scrolled by since
                        // the last call to resetScrollCount()
 };
-
-}
 #endif // SCREENWINDOW_H
diff -r d09eb4ace2c3 -r 96ef8177889a gui//Session.cpp
--- a/gui//Session.cpp	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//Session.cpp	Thu Apr 07 14:19:15 2011 +0200
@@ -22,9 +22,6 @@
     02110-1301  USA.
 */
 
-// Own
-#include "Session.h"
-
 // Standard
 #include <assert.h>
 #include <stdlib.h>
@@ -38,13 +35,13 @@
 #include <QtCore/QStringList>
 #include <QtCore>
 
+// Own
+#include "Session.h"
 #include "Pty.h"
 #include "TerminalDisplay.h"
 #include "ShellCommand.h"
 #include "Vt102Emulation.h"
 
-using namespace Konsole;
-
 int Session::lastSessionId = 0;
 
 Session::Session() :
@@ -64,16 +61,9 @@
    , _flowControl(true)
    , _fullScripting(false)
    , _sessionId(0)
-//   , _zmodemBusy(false)
-//   , _zmodemProc(0)
-//   , _zmodemProgress(0)
    , _hasDarkBackground(false)
 {
-    //prepare DBus communication
-//    new SessionAdaptor(this);
     _sessionId = ++lastSessionId;
-//    QDBusConnection::sessionBus().registerObject(QLatin1String("/Sessions/")+QString::number(_sessionId), this);
-
     //create teletype for I/O with shell process
     _shellProcess = new Pty();
 
@@ -84,16 +74,10 @@
            this, SLOT( setUserTitle( int, const QString & ) ) );
     connect( _emulation, SIGNAL( stateSet(int) ),
            this, SLOT( activityStateSet(int) ) );
-//    connect( _emulation, SIGNAL( zmodemDetected() ), this ,
-//            SLOT( fireZModemDetected() ) );
     connect( _emulation, SIGNAL( changeTabTextColorRequest( int ) ),
            this, SIGNAL( changeTabTextColorRequest( int ) ) );
     connect( _emulation, SIGNAL(profileChangeCommandReceived(const QString&)),
            this, SIGNAL( profileChangeCommandReceived(const QString&)) );
-    // TODO
-    // connect( _emulation,SIGNAL(imageSizeChanged(int,int)) , this ,
-    //        SLOT(onEmulationSizeChange(int,int)) );
-
     //connect teletype to emulation backend
     _shellProcess->setUtf8Mode(_emulation->utf8());
 
@@ -103,8 +87,6 @@
             SLOT(sendData(const char*,int)) );
     connect( _emulation,SIGNAL(lockPtyRequest(bool)),_shellProcess,SLOT(lockPty(bool)) );
     connect( _emulation,SIGNAL(useUtf8Request(bool)),_shellProcess,SLOT(setUtf8Mode(bool)) );
-
-
     connect( _shellProcess,SIGNAL(done(int)), this, SLOT(done(int)) );
 
     //setup timer for monitoring session activity
@@ -210,7 +192,7 @@
 
     QObject::connect( widget ,SIGNAL(destroyed(QObject*)) , this ,
                     SLOT(viewDestroyed(QObject*)) );
-//slot for close
+
     QObject::connect(this, SIGNAL(finished()), widget, SLOT(close()));		    
     
 }
@@ -412,19 +394,8 @@
 
 void Session::monitorTimerDone()
 {
-  //FIXME: The idea here is that the notification popup will appear to tell the user than output from
-  //the terminal has stopped and the popup will disappear when the user activates the session.
-  //
-  //This breaks with the addition of multiple views of a session.  The popup should disappear
-  //when any of the views of the session becomes active
-  
-
-  //FIXME: Make message text for this notification and the activity notification more descriptive.	
   if (_monitorSilence) {
-//    KNotification::event("Silence", ("Silence in session '%1'", _nameTitle), QPixmap(),
-//                    QApplication::activeWindow(),
-//                    KNotification::CloseWhenWidgetActivated);
-    emit stateChanged(NOTIFYSILENCE);
+  emit stateChanged(NOTIFYSILENCE);
   }
   else
   {
@@ -556,7 +527,6 @@
 {
   delete _emulation;
   delete _shellProcess;
-//  delete _zmodemProc;
 }
 
 void Session::setProfileKey(const QString& key)
@@ -594,10 +564,6 @@
     else
         message.sprintf ("Session '%s' exited unexpectedly.", _nameTitle.toAscii().data());
 
-    //FIXME: See comments in Session::monitorTimerDone()
-//    KNotification::event("Finished", message , QPixmap(),
-//                         QApplication::activeWindow(),
-//                         KNotification::CloseWhenWidgetActivated);
   }
   emit finished();
 }
@@ -667,7 +633,6 @@
 void Session::setIconText(const QString& iconText)
 {
   _iconText = iconText;
-  //kDebug(1211)<<"Session setIconText " <<  _iconText;
 }
 
 QString Session::iconName() const
@@ -763,119 +728,7 @@
 {
 	return _flowControl;
 }
-//void Session::fireZModemDetected()
-//{
-//  if (!_zmodemBusy)
-//  {
-//    QTimer::singleShot(10, this, SIGNAL(zmodemDetected()));
-//    _zmodemBusy = true;
-//  }
-//}
 
-//void Session::cancelZModem()
-//{
-//  _shellProcess->sendData("\030\030\030\030", 4); // Abort
-//  _zmodemBusy = false;
-//}
-
-//void Session::startZModem(const QString &zmodem, const QString &dir, const QStringList &list)
-//{
-//  _zmodemBusy = true;
-//  _zmodemProc = new KProcess();
-//  _zmodemProc->setOutputChannelMode( KProcess::SeparateChannels );
-//
-//  *_zmodemProc << zmodem << "-v" << list;
-//
-//  if (!dir.isEmpty())
-//     _zmodemProc->setWorkingDirectory(dir);
-//
-//  _zmodemProc->start();
-//
-//  connect(_zmodemProc,SIGNAL (readyReadStandardOutput()),
-//          this, SLOT(zmodemReadAndSendBlock()));
-//  connect(_zmodemProc,SIGNAL (readyReadStandardError()),
-//          this, SLOT(zmodemReadStatus()));
-//  connect(_zmodemProc,SIGNAL (finished(int,QProcess::ExitStatus)),
-//          this, SLOT(zmodemFinished()));
-//
-//  disconnect( _shellProcess,SIGNAL(block_in(const char*,int)), this, SLOT(onReceiveBlock(const char*,int)) );
-//  connect( _shellProcess,SIGNAL(block_in(const char*,int)), this, SLOT(zmodemRcvBlock(const char*,int)) );
-//
-//  _zmodemProgress = new ZModemDialog(QApplication::activeWindow(), false,
-//                                    i18n("ZModem Progress"));
-//
-//  connect(_zmodemProgress, SIGNAL(user1Clicked()),
-//          this, SLOT(zmodemDone()));
-//
-//  _zmodemProgress->show();
-//}
-
-/*void Session::zmodemReadAndSendBlock()
-{
-  _zmodemProc->setReadChannel( QProcess::StandardOutput );
-  QByteArray data = _zmodemProc->readAll();
-
-  if ( data.count() == 0 )
-      return;
-
-  _shellProcess->sendData(data.constData(),data.count());
-}
-*/
-/*
-void Session::zmodemReadStatus()
-{
-  _zmodemProc->setReadChannel( QProcess::StandardError );
-  QByteArray msg = _zmodemProc->readAll();
-  while(!msg.isEmpty())
-  {
-     int i = msg.indexOf('\015');
-     int j = msg.indexOf('\012');
-     QByteArray txt;
-     if ((i != -1) && ((j == -1) || (i < j)))
-     {
-       msg = msg.mid(i+1);
-     }
-     else if (j != -1)
-     {
-       txt = msg.left(j);
-       msg = msg.mid(j+1);
-     }
-     else
-     {
-       txt = msg;
-       msg.truncate(0);
-     }
-     if (!txt.isEmpty())
-       _zmodemProgress->addProgressText(QString::fromLocal8Bit(txt));
-  }
-}
-*/
-/*
-void Session::zmodemRcvBlock(const char *data, int len)
-{
-  QByteArray ba( data, len );
-
-  _zmodemProc->write( ba );
-}
-*/
-/*
-void Session::zmodemFinished()
-{
-  if (_zmodemProc)
-  {
-    delete _zmodemProc;
-    _zmodemProc = 0;
-    _zmodemBusy = false;
-
-    disconnect( _shellProcess,SIGNAL(block_in(const char*,int)), this ,SLOT(zmodemRcvBlock(const char*,int)) );
-    connect( _shellProcess,SIGNAL(block_in(const char*,int)), this, SLOT(onReceiveBlock(const char*,int)) );
-
-    _shellProcess->sendData("\030\030\030\030", 4); // Abort
-    _shellProcess->sendData("\001\013\n", 3); // Try to get prompt back
-    _zmodemProgress->transferDone();
-  }
-}
-*/
 void Session::onReceiveBlock( const char* buf, int len )
 {
     _emulation->receiveData( buf, len );
@@ -1007,8 +860,6 @@
 }
 void SessionGroup::disconnectPair(Session* master , Session* other)
 {
-//    qDebug() << k_funcinfo;
-
     if ( _masterMode & CopyInputToAll )
     {
         qDebug() << "Disconnecting session " << master->nameTitle() << "from" << other->nameTitle();
@@ -1017,5 +868,3 @@
                 SLOT(sendString(const char*,int)) );
     }
 }
-
-//#include "moc_Session.cpp"
diff -r d09eb4ace2c3 -r 96ef8177889a gui//Session.h
--- a/gui//Session.h	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//Session.h	Thu Apr 07 14:19:15 2011 +0200
@@ -34,14 +34,9 @@
 #include "History.h"
 
 class KProcess;
-
-namespace Konsole
-{
-
 class Emulation;
 class Pty;
 class TerminalDisplay;
-//class ZModemDialog;
 
 /**
  * Represents a terminal session consisting of a pseudo-teletype and a terminal emulation.
@@ -358,11 +353,6 @@
    * shell to redraw the prompt line.
    */
   void refresh();
-
-//  void startZModem(const QString &rz, const QString &dir, const QStringList &list);
-//  void cancelZModem();
-//  bool isZModemBusy() { return _zmodemBusy; }
-
 public slots:
 
   /**
@@ -435,9 +425,6 @@
   /** TODO: Document me. */
   void openUrlRequest(const QString& url);
 
-  /** TODO: Document me. */
-//  void zmodemDetected();
-
   /**
    * Emitted when the terminal process requests a change
    * in the size of the terminal window.
@@ -464,8 +451,6 @@
 private slots:
   void done(int);
 
-//  void fireZModemDetected();
-
   void onReceiveBlock( const char* buffer, int len );
   void monitorTimerDone();
 
@@ -477,11 +462,6 @@
   //automatically detach views from sessions when view is destroyed
   void viewDestroyed(QObject* view);
 
-//  void zmodemReadStatus();
-//  void zmodemReadAndSendBlock();
-//  void zmodemRcvBlock(const char *data, int len);
-//  void zmodemFinished();
-
 private:
 
   void updateTerminalSize();
@@ -525,13 +505,6 @@
 
   QString        _initialWorkingDir;
 
-  // ZModem
-//  bool           _zmodemBusy;
-//  KProcess*      _zmodemProc;
-//  ZModemDialog*  _zmodemProgress;
-
-  // Color/Font Changes by ESC Sequences
-
   QColor         _modifiedBackground; // as set by: echo -en '\033]11;Color\007
 
   QString        _profileKey;
@@ -615,7 +588,4 @@
 
     int _masterMode;
 };
-
-}
-
 #endif
diff -r d09eb4ace2c3 -r 96ef8177889a gui//ShellCommand.cpp
--- a/gui//ShellCommand.cpp	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//ShellCommand.cpp	Thu Apr 07 14:19:15 2011 +0200
@@ -25,9 +25,6 @@
 //some versions of gcc(4.3) require explicit include
 #include <cstdlib>
 
-
-using namespace Konsole;
-
 // expands environment variables in 'text'
 // function copied from kdelibs/kio/kio/kurlcompletion.cpp
 static bool expandEnv(QString& text);
diff -r d09eb4ace2c3 -r 96ef8177889a gui//ShellCommand.h
--- a/gui//ShellCommand.h	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//ShellCommand.h	Thu Apr 07 14:19:15 2011 +0200
@@ -25,9 +25,6 @@
 // Qt
 #include <QtCore/QStringList>
 
-namespace Konsole
-{
-
 /** 
  * A class to parse and extract information about shell commands. 
  *
@@ -87,8 +84,5 @@
 private:
     QStringList _arguments;    
 };
-
-}
-
 #endif // SHELLCOMMAND_H
 
diff -r d09eb4ace2c3 -r 96ef8177889a gui//TerminalCharacterDecoder.cpp
--- a/gui//TerminalCharacterDecoder.cpp	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//TerminalCharacterDecoder.cpp	Thu Apr 07 14:19:15 2011 +0200
@@ -27,9 +27,6 @@
 // Qt
 #include <QtCore/QTextStream>
 
-
-using namespace Konsole;
-
 PlainTextDecoder::PlainTextDecoder()
  : _output(0)
  , _includeTrailingWhitespace(true)
@@ -124,8 +121,7 @@
 }
 
 //TODO: Support for LineProperty (mainly double width , double height)
-void HTMLDecoder::decodeLine(const Character* const characters, int count, LineProperty /*properties*/
-							)
+void HTMLDecoder::decodeLine(const Character* const characters, int count, LineProperty)
 {
     Q_ASSERT( _output );
 
diff -r d09eb4ace2c3 -r 96ef8177889a gui//TerminalCharacterDecoder.h
--- a/gui//TerminalCharacterDecoder.h	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//TerminalCharacterDecoder.h	Thu Apr 07 14:19:15 2011 +0200
@@ -28,9 +28,6 @@
 
 class QTextStream;
 
-namespace Konsole
-{
-
 /**
  * Base class for terminal character decoders
  *
@@ -133,7 +130,4 @@
 	CharacterColor _lastBackColor;
 
 };
-
-}
-
 #endif
diff -r d09eb4ace2c3 -r 96ef8177889a gui//TerminalDisplay.cpp
--- a/gui//TerminalDisplay.cpp	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//TerminalDisplay.cpp	Thu Apr 07 14:19:15 2011 +0200
@@ -49,8 +49,6 @@
 #include "TerminalCharacterDecoder.h"
 #include "ColorTables.h"
 
-using namespace Konsole;
-
 #ifndef loc
 #define loc(X,Y) ((Y)*_columns+(X))
 #endif
@@ -151,7 +149,7 @@
 
 // assert for i in [0..31] : vt100extended(vt100_graphics[i]) == i.
 
-unsigned short Konsole::vt100_graphics[32] =
+unsigned short vt100_graphics[32] =
 { // 0/8     1/9    2/10    3/11    4/12    5/13    6/14    7/15
   0x0020, 0x25C6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
   0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
diff -r d09eb4ace2c3 -r 96ef8177889a gui//TerminalDisplay.h
--- a/gui//TerminalDisplay.h	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//TerminalDisplay.h	Thu Apr 07 14:19:15 2011 +0200
@@ -47,11 +47,6 @@
 class QHideEvent;
 class QWidget;
 
-//class KMenu;
-
-namespace Konsole
-{
-
 extern unsigned short vt100_graphics[32];
 
 class ScreenWindow;
@@ -748,7 +743,4 @@
         HAVE_TRANSPARENCY = enable;
     }
 };
-
-}
-
 #endif // TERMINALDISPLAY_H
diff -r d09eb4ace2c3 -r 96ef8177889a gui//Vt102Emulation.cpp
--- a/gui//Vt102Emulation.cpp	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//Vt102Emulation.cpp	Thu Apr 07 14:19:15 2011 +0200
@@ -46,10 +46,6 @@
 #include <QtGui/QKeyEvent>
 #include <QtCore/QByteRef>
 
-// KDE
-//#include <kdebug.h>
-//#include <klocale.h>
-
 // Konsole
 #include "KeyboardTranslator.h"
 #include "Screen.h"
@@ -59,8 +55,6 @@
 void scrolllock_set_on();
 #endif
 
-using namespace Konsole;
-
 /* VT102 Terminal Emulation
 
    This class puts together the screens, the pty and the widget to a
@@ -1252,15 +1246,9 @@
   printf("token: "); hexdump(pbuf,ppos); printf("\n");
 }
 
-/*!
-*/
-
 void Vt102Emulation::ReportErrorToken()
 {
 #ifndef NDEBUG
   printf("undecodable "); scan_buffer_report();
 #endif
 }
-
-//#include "moc_Vt102Emulation.cpp"
-
diff -r d09eb4ace2c3 -r 96ef8177889a gui//Vt102Emulation.h
--- a/gui//Vt102Emulation.h	Thu Apr 07 12:51:31 2011 +0200
+++ b/gui//Vt102Emulation.h	Thu Apr 07 14:19:15 2011 +0200
@@ -47,9 +47,6 @@
 #define MODE_Ansi      (MODES_SCREEN+7)
 #define MODE_total     (MODES_SCREEN+8)
 
-namespace Konsole
-{
-
 struct DECpar
 {
   bool mode[MODE_total];
@@ -186,7 +183,4 @@
   QTimer* _titleUpdateTimer;
   
 };
-
-}
-
 #endif // VT102EMULATION_H