diff --git a/addons/externaltools/kateexternaltools.cpp b/addons/externaltools/kateexternaltools.cpp
index 92714938d..b2650681f 100644
--- a/addons/externaltools/kateexternaltools.cpp
+++ b/addons/externaltools/kateexternaltools.cpp
@@ -1,890 +1,824 @@
 /*
    This file is part of the Kate text editor of the KDE project.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License version 2 as published by the Free Software Foundation.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 
    ---
    Copyright (C) 2004, Anders Lund <anders@alweb.dk>
 */
 // TODO
 // Icons
 // Direct shortcut setting
-//BEGIN Includes
-#include "kateexternaltoolsplugin.h"
+// BEGIN Includes
 #include "kateexternaltools.h"
 #include "kateexternaltools.moc"
-#include <KTextEditor/View>
+#include "kateexternaltoolsplugin.h"
 #include <KTextEditor/Document>
 #include <KTextEditor/Editor>
+#include <KTextEditor/View>
 
 #include <KActionCollection>
+#include <KComboBox>
+#include <KConfig>
+#include <KConfigGroup>
+#include <KIconDialog>
+#include <KIconLoader>
+#include <KLineEdit>
 #include <KListWidget>
 #include <KLocale>
-#include <KIconLoader>
+#include <KMenu>
 #include <KMessageBox>
 #include <KMimeTypeChooser>
-#include <KXmlGuiWindow>
-#include <KStandardDirs>
-#include <KConfig>
-#include <KConfigGroup>
-#include <KComboBox>
-#include <KLineEdit>
 #include <KRun>
-#include <KIconDialog>
-#include <KMenu>
 #include <KSharedConfig>
-#include <kdebug.h>
+#include <KStandardDirs>
+#include <KXmlGuiWindow>
 #include <kde_file.h>
+#include <kdebug.h>
 
 #include <QBitmap>
 #include <QFile>
+#include <QGridLayout>
 #include <QLabel>
+#include <QObject>
 #include <QPushButton>
 #include <QRegExp>
-#include <QToolButton>
-#include <QGridLayout>
-#include <QObject>
 #include <QTextEdit>
+#include <QToolButton>
 
 #include <unistd.h>
-//END Includes
-
-
-//BEGIN KateExternalTool
-KateExternalTool::KateExternalTool( const QString &name,
-                                    const QString &command,
-                                    const QString &icon,
-                                    const QString &tryexec,
-                                    const QStringList &mimetypes,
-                                    const QString &acname,
-                                    const QString &cmdname,
-                                    int save )
-    : name ( name ),
-    command ( command ),
-    icon ( icon ),
-    tryexec ( tryexec ),
-    mimetypes ( mimetypes ),
-    acname ( acname ),
-    cmdname ( cmdname ),
-    save ( save )
-{
-  //if ( ! tryexec.isEmpty() )
-  hasexec = checkExec();
+// END Includes
+
+// BEGIN KateExternalTool
+KateExternalTool::KateExternalTool(const QString& name, const QString& command, const QString& icon,
+                                   const QString& tryexec, const QStringList& mimetypes, const QString& acname,
+                                   const QString& cmdname, int save)
+    : name(name)
+    , command(command)
+    , icon(icon)
+    , tryexec(tryexec)
+    , mimetypes(mimetypes)
+    , acname(acname)
+    , cmdname(cmdname)
+    , save(save)
+{
+    // if ( ! tryexec.isEmpty() )
+    hasexec = checkExec();
 }
 
 bool KateExternalTool::checkExec()
 {
-  // if tryexec is empty, it is the first word of command
-  if ( tryexec.isEmpty() )
-    tryexec = command.section( ' ', 0, 0, QString::SectionSkipEmpty );
-
-  // NOTE this code is modified taken from kdesktopfile.cpp, from KDesktopFile::tryExec()
-  if (!tryexec.isEmpty())
-  {
-    m_exec = KStandardDirs::findExe(tryexec);
-    return !m_exec.isEmpty();
-  }
-  return false;
+    // if tryexec is empty, it is the first word of command
+    if (tryexec.isEmpty())
+        tryexec = command.section(' ', 0, 0, QString::SectionSkipEmpty);
+
+    // NOTE this code is modified taken from kdesktopfile.cpp, from KDesktopFile::tryExec()
+    if (!tryexec.isEmpty()) {
+        m_exec = KStandardDirs::findExe(tryexec);
+        return !m_exec.isEmpty();
+    }
+    return false;
 }
 
-bool KateExternalTool::valid( const QString &mt ) const
+bool KateExternalTool::valid(const QString& mt) const
 {
-  return mimetypes.isEmpty() || mimetypes.contains( mt );
+    return mimetypes.isEmpty() || mimetypes.contains(mt);
 }
-//END KateExternalTool
+// END KateExternalTool
 
-//BEGIN KateExternalToolsCommand
-KateExternalToolsCommand::KateExternalToolsCommand(KateExternalToolsPlugin *plugin) : KTextEditor::Command(),m_plugin(plugin)
+// BEGIN KateExternalToolsCommand
+KateExternalToolsCommand::KateExternalToolsCommand(KateExternalToolsPlugin* plugin)
+    : KTextEditor::Command()
+    , m_plugin(plugin)
 {
-  m_inited = false;
-  reload();
+    m_inited = false;
+    reload();
 }
 
-const QStringList &KateExternalToolsCommand::cmds ()
+const QStringList& KateExternalToolsCommand::cmds()
 {
-  return m_list;
+    return m_list;
 }
 
-
-void KateExternalToolsCommand::reload ()
+void KateExternalToolsCommand::reload()
 {
-  m_list.clear();
-  m_map.clear();
-  m_name.clear();
-
-  KConfig _config( "externaltools", KConfig::NoGlobals, "appdata" );
-  KConfigGroup config(&_config, "Global");
-  const QStringList tools = config.readEntry("tools", QStringList());
+    m_list.clear();
+    m_map.clear();
+    m_name.clear();
 
+    KConfig _config("externaltools", KConfig::NoGlobals, "appdata");
+    KConfigGroup config(&_config, "Global");
+    const QStringList tools = config.readEntry("tools", QStringList());
 
-  for( QStringList::const_iterator it = tools.begin(); it != tools.end(); ++it )
-  {
-    if ( *it == "---" )
-      continue;
+    for (QStringList::const_iterator it = tools.begin(); it != tools.end(); ++it) {
+        if (*it == "---")
+            continue;
 
+        config = KConfigGroup(&_config, *it);
 
-    config= KConfigGroup(&_config,  *it );
-
-    KateExternalTool t = KateExternalTool(
-                           config.readEntry( "name", "" ),
-                           config.readEntry( "command", ""),
-                           config.readEntry( "icon", ""),
-                           config.readEntry( "executable", ""),
-                           config.readEntry( "mimetypes", QStringList() ),
-                           config.readEntry( "acname", "" ),
-                           config.readEntry( "cmdname", "" ) );
-    // FIXME test for a command name first!
-    if ( t.hasexec && (!t.cmdname.isEmpty()))
-    {
-      m_list.append("exttool-" + t.cmdname);
-      m_map.insert("exttool-" + t.cmdname, t.acname);
-      m_name.insert("exttool-" + t.cmdname, t.name);
-    }
-  }
-  if (m_inited)
-  {
-    KTextEditor::CommandInterface* cmdIface =
-      qobject_cast<KTextEditor::CommandInterface*>( Kate::application()->editor() );
-    if( cmdIface )
-    {
-      // reregister commands, in case of something has changed
-      cmdIface->unregisterCommand( this );
-      cmdIface->registerCommand( this );
+        KateExternalTool t = KateExternalTool(config.readEntry("name", ""), config.readEntry("command", ""),
+                                              config.readEntry("icon", ""), config.readEntry("executable", ""),
+                                              config.readEntry("mimetypes", QStringList()),
+                                              config.readEntry("acname", ""), config.readEntry("cmdname", ""));
+        // FIXME test for a command name first!
+        if (t.hasexec && (!t.cmdname.isEmpty())) {
+            m_list.append("exttool-" + t.cmdname);
+            m_map.insert("exttool-" + t.cmdname, t.acname);
+            m_name.insert("exttool-" + t.cmdname, t.name);
+        }
     }
-  }
-  else m_inited = true;
+    if (m_inited) {
+        KTextEditor::CommandInterface* cmdIface
+            = qobject_cast<KTextEditor::CommandInterface*>(Kate::application()->editor());
+        if (cmdIface) {
+            // reregister commands, in case of something has changed
+            cmdIface->unregisterCommand(this);
+            cmdIface->registerCommand(this);
+        }
+    } else
+        m_inited = true;
 }
 
-bool KateExternalToolsCommand::exec (KTextEditor::View *view, const QString &cmd, QString &)
+bool KateExternalToolsCommand::exec(KTextEditor::View* view, const QString& cmd, QString&)
 {
-  QWidget *wv = dynamic_cast<QWidget*>(view);
-  if (!wv)
-  {
-//   kDebug(13001)<<"KateExternalToolsCommand::exec: Could not get view widget";
-    return false;
-  }
-
-
-//  kDebug(13001)<<"cmd="<<cmd.trimmed();
-  QString actionName = m_map[cmd.trimmed()];
-  if (actionName.isEmpty()) return false;
-//  kDebug(13001)<<"actionName is not empty:"<<actionName;
-/*  KateExternalToolsMenuAction *a =
-    dynamic_cast<KateExternalToolsMenuAction*>(dmw->action("tools_external"));
-  if (!a) return false;*/
-  KateExternalToolsPluginView *extview=m_plugin->extView(wv->window());
-  if (!extview) return false;
-  if (!extview->externalTools) return false;
-//  kDebug(13001)<<"trying to find action";
-  QAction *a1 = extview->externalTools->actionCollection()->action(actionName.toUtf8().constData ());
-  if (!a1) return false;
-//  kDebug(13001)<<"activating action";
-  a1->trigger();
-  return true;
+    QWidget* wv = dynamic_cast<QWidget*>(view);
+    if (!wv) {
+        //   kDebug(13001)<<"KateExternalToolsCommand::exec: Could not get view widget";
+        return false;
+    }
+
+    //  kDebug(13001)<<"cmd="<<cmd.trimmed();
+    QString actionName = m_map[cmd.trimmed()];
+    if (actionName.isEmpty())
+        return false;
+    //  kDebug(13001)<<"actionName is not empty:"<<actionName;
+    /*  KateExternalToolsMenuAction *a =
+        dynamic_cast<KateExternalToolsMenuAction*>(dmw->action("tools_external"));
+      if (!a) return false;*/
+    KateExternalToolsPluginView* extview = m_plugin->extView(wv->window());
+    if (!extview)
+        return false;
+    if (!extview->externalTools)
+        return false;
+    //  kDebug(13001)<<"trying to find action";
+    QAction* a1 = extview->externalTools->actionCollection()->action(actionName.toUtf8().constData());
+    if (!a1)
+        return false;
+    //  kDebug(13001)<<"activating action";
+    a1->trigger();
+    return true;
 }
 
-bool KateExternalToolsCommand::help (KTextEditor::View *, const QString &, QString &)
+bool KateExternalToolsCommand::help(KTextEditor::View*, const QString&, QString&)
 {
-  return false;
+    return false;
 }
-//END KateExternalToolsCommand
+// END KateExternalToolsCommand
 
-//BEGIN KateExternalToolAction
-KateExternalToolAction::KateExternalToolAction( QObject *parent, KateExternalTool *t)
-    : KAction( KIcon(t->icon), t->name, parent ),
-    tool ( t )
+// BEGIN KateExternalToolAction
+KateExternalToolAction::KateExternalToolAction(QObject* parent, KateExternalTool* t)
+    : KAction(KIcon(t->icon), t->name, parent)
+    , tool(t)
 {
-  //setText( t->name );
-  //if ( ! t->icon.isEmpty() )
-  //  setIcon( KIcon( t->icon ) );
+    // setText( t->name );
+    // if ( ! t->icon.isEmpty() )
+    //  setIcon( KIcon( t->icon ) );
 
-  connect( this, SIGNAL(triggered(bool)), SLOT(slotRun()) );
+    connect(this, SIGNAL(triggered(bool)), SLOT(slotRun()));
 }
 
-bool KateExternalToolAction::expandMacro( const QString &str, QStringList &ret )
-{
-  Kate::MainWindow *mw = qobject_cast<Kate::MainWindow*>(parent()->parent());
-  Q_ASSERT(mw);
-
-  KTextEditor::View *view = mw->activeView();
-  if ( ! view ) return false;
-
-  KTextEditor::Document *doc = view->document();
-  KUrl url = doc->url();
-
-  if ( str == "URL" )
-    ret += url.url();
-  else if ( str == "directory" ) // directory of current doc
-    ret += url.directory();
-  else if ( str == "filename" )
-    ret += url.fileName();
-  else if ( str == "line" ) // cursor line of current doc
-    ret += QString::number( view->cursorPosition().line() );
-  else if ( str == "col" ) // cursor col of current doc
-    ret += QString::number( view->cursorPosition().column() );
-  else if ( str == "selection" ) // selection of current doc if any
-    ret += view->selectionText();
-  else if ( str == "text" ) // text of current doc
-    ret += doc->text();
-  else if ( str == "URLs" )
-  {
-    foreach( KTextEditor::Document *it, Kate::documentManager()->documents())
-    if ( ! it->url().isEmpty() )
-      ret += it->url().url();
-  }
-  else
-    return false;
-
-  return true;
+bool KateExternalToolAction::expandMacro(const QString& str, QStringList& ret)
+{
+    Kate::MainWindow* mw = qobject_cast<Kate::MainWindow*>(parent()->parent());
+    Q_ASSERT(mw);
+
+    KTextEditor::View* view = mw->activeView();
+    if (!view)
+        return false;
+
+    KTextEditor::Document* doc = view->document();
+    KUrl url = doc->url();
+
+    if (str == "URL")
+        ret += url.url();
+    else if (str == "directory") // directory of current doc
+        ret += url.directory();
+    else if (str == "filename")
+        ret += url.fileName();
+    else if (str == "line") // cursor line of current doc
+        ret += QString::number(view->cursorPosition().line());
+    else if (str == "col") // cursor col of current doc
+        ret += QString::number(view->cursorPosition().column());
+    else if (str == "selection") // selection of current doc if any
+        ret += view->selectionText();
+    else if (str == "text") // text of current doc
+        ret += doc->text();
+    else if (str == "URLs") {
+        foreach (KTextEditor::Document* it, Kate::documentManager()->documents())
+            if (!it->url().isEmpty())
+                ret += it->url().url();
+    } else
+        return false;
+
+    return true;
 }
 
 KateExternalToolAction::~KateExternalToolAction()
 {
-  delete(tool);
+    delete (tool);
 }
 
 void KateExternalToolAction::slotRun()
 {
-  // expand the macros in command if any,
-  // and construct a command with an absolute path
-  QString cmd = tool->command;
-
-  Kate::MainWindow *mw = qobject_cast<Kate::MainWindow*>(parent()->parent());
-  if ( ! expandMacrosShellQuote( cmd ) )
-  {
-    KMessageBox::sorry( mw->window(),
-                        i18n("Failed to expand the command '%1'.", cmd ),
-                        i18n( "Kate External Tools") );
-    return;
-  }
-  kDebug(13001) << "externaltools: Running command: " << cmd;
-
-  // save documents if requested
-  if ( tool->save == 1 )
-    mw->activeView()->document()->save();
-  else if ( tool->save == 2 )
-  {
-    foreach (KXMLGUIClient *client, mw->guiFactory()->clients())
-    {
-      if (QAction *a = client->actionCollection()->action("file_save_all"))
-      {
-        a->trigger();
-        break;
-      }
+    // expand the macros in command if any,
+    // and construct a command with an absolute path
+    QString cmd = tool->command;
+
+    Kate::MainWindow* mw = qobject_cast<Kate::MainWindow*>(parent()->parent());
+    if (!expandMacrosShellQuote(cmd)) {
+        KMessageBox::sorry(mw->window(), i18n("Failed to expand the command '%1'.", cmd), i18n("Kate External Tools"));
+        return;
+    }
+    kDebug(13001) << "externaltools: Running command: " << cmd;
+
+    // save documents if requested
+    if (tool->save == 1)
+        mw->activeView()->document()->save();
+    else if (tool->save == 2) {
+        foreach (KXMLGUIClient* client, mw->guiFactory()->clients()) {
+            if (QAction* a = client->actionCollection()->action("file_save_all")) {
+                a->trigger();
+                break;
+            }
+        }
     }
-  }
 
-  KRun::runCommand( cmd, tool->tryexec, tool->icon, mw->window() );
+    KRun::runCommand(cmd, tool->tryexec, tool->icon, mw->window());
 }
-//END KateExternalToolAction
+// END KateExternalToolAction
 
-//BEGIN KateExternalToolsMenuAction
-KateExternalToolsMenuAction::KateExternalToolsMenuAction( const QString &text,
-    KActionCollection *collection,
-    QObject *parent,
-    Kate::MainWindow *mw )
-    : KActionMenu( text, parent ),
-    mainwindow( mw )
+// BEGIN KateExternalToolsMenuAction
+KateExternalToolsMenuAction::KateExternalToolsMenuAction(const QString& text, KActionCollection* collection,
+                                                         QObject* parent, Kate::MainWindow* mw)
+    : KActionMenu(text, parent)
+    , mainwindow(mw)
 {
 
-  m_actionCollection = collection;
+    m_actionCollection = collection;
 
-  // connect to view changed...
-  connect(mw, SIGNAL(viewChanged()), this, SLOT(slotDocumentChanged()));
+    // connect to view changed...
+    connect(mw, SIGNAL(viewChanged()), this, SLOT(slotDocumentChanged()));
 
-  reload();
+    reload();
 }
 
 KateExternalToolsMenuAction::~KateExternalToolsMenuAction()
 {
-  //kDebug() << "deleted KateExternalToolsMenuAction";
+    // kDebug() << "deleted KateExternalToolsMenuAction";
 }
 
 void KateExternalToolsMenuAction::reload()
 {
-  bool needs_readd=(m_actionCollection->takeAction(this)!=0);
-  m_actionCollection->clear ();
-  if (needs_readd) m_actionCollection->addAction("tools_external",this);
-  menu()->clear();
-
-  // load all the tools, and create a action for each of them
-  KSharedConfig::Ptr pConfig = KSharedConfig::openConfig( "externaltools", KConfig::NoGlobals, "appdata" );
-  KConfigGroup config(pConfig, "Global" );
-  QStringList tools = config.readEntry( "tools", QStringList() );
-
-  // if there are tools that are present but not explicitly removed,
-  // add them to the end of the list
-  pConfig->setReadDefaults( true );
-  QStringList dtools = config.readEntry( "tools", QStringList() );
-  int gver = config.readEntry( "version", 1 );
-  pConfig->setReadDefaults( false );
-
-  int ver = config.readEntry( "version", 0 );
-  if ( ver <= gver )
-  {
-    QStringList removed = config.readEntry( "removed", QStringList() );
-    bool sepadded = false;
-    for (QStringList::iterator itg = dtools.begin(); itg != dtools.end(); ++itg )
-    {
-      if ( ! tools.contains( *itg ) &&
-           ! removed.contains( *itg ) )
-      {
-        if ( ! sepadded )
-        {
-          tools << "---";
-          sepadded = true;
+    bool needs_readd = (m_actionCollection->takeAction(this) != 0);
+    m_actionCollection->clear();
+    if (needs_readd)
+        m_actionCollection->addAction("tools_external", this);
+    menu()->clear();
+
+    // load all the tools, and create a action for each of them
+    KSharedConfig::Ptr pConfig = KSharedConfig::openConfig("externaltools", KConfig::NoGlobals, "appdata");
+    KConfigGroup config(pConfig, "Global");
+    QStringList tools = config.readEntry("tools", QStringList());
+
+    // if there are tools that are present but not explicitly removed,
+    // add them to the end of the list
+    pConfig->setReadDefaults(true);
+    QStringList dtools = config.readEntry("tools", QStringList());
+    int gver = config.readEntry("version", 1);
+    pConfig->setReadDefaults(false);
+
+    int ver = config.readEntry("version", 0);
+    if (ver <= gver) {
+        QStringList removed = config.readEntry("removed", QStringList());
+        bool sepadded = false;
+        for (QStringList::iterator itg = dtools.begin(); itg != dtools.end(); ++itg) {
+            if (!tools.contains(*itg) && !removed.contains(*itg)) {
+                if (!sepadded) {
+                    tools << "---";
+                    sepadded = true;
+                }
+                tools << *itg;
+            }
         }
-        tools << *itg;
-      }
-    }
 
-    config.writeEntry( "tools", tools );
-    config.sync();
-    config.writeEntry( "version", gver );
-  }
-
-  for( QStringList::const_iterator it = tools.constBegin(); it != tools.constEnd(); ++it )
-  {
-    if ( *it == "---" )
-    {
-      menu()->addSeparator();
-      // a separator
-      continue;
+        config.writeEntry("tools", tools);
+        config.sync();
+        config.writeEntry("version", gver);
     }
 
-    config=KConfigGroup(pConfig, *it );
+    for (QStringList::const_iterator it = tools.constBegin(); it != tools.constEnd(); ++it) {
+        if (*it == "---") {
+            menu()->addSeparator();
+            // a separator
+            continue;
+        }
 
-    KateExternalTool *t = new KateExternalTool(
-                            config.readEntry( "name", "" ),
-                            config.readEntry( "command", ""),
-                            config.readEntry( "icon", ""),
-                            config.readEntry( "executable", ""),
-                            config.readEntry( "mimetypes", QStringList() ),
-                            config.readEntry( "acname", "" ),
-                            config.readEntry( "cmdname", "" ),
-                            config.readEntry( "save", 0 ) );
+        config = KConfigGroup(pConfig, *it);
 
-    if ( t->hasexec )
-    {
-      KAction *a = new KateExternalToolAction( this, t );
-      m_actionCollection->addAction( t->acname.toAscii(), a );
-      addAction( a );
+        KateExternalTool* t = new KateExternalTool(
+            config.readEntry("name", ""), config.readEntry("command", ""), config.readEntry("icon", ""),
+            config.readEntry("executable", ""), config.readEntry("mimetypes", QStringList()),
+            config.readEntry("acname", ""), config.readEntry("cmdname", ""), config.readEntry("save", 0));
+
+        if (t->hasexec) {
+            KAction* a = new KateExternalToolAction(this, t);
+            m_actionCollection->addAction(t->acname.toAscii(), a);
+            addAction(a);
+        } else
+            delete t;
     }
-    else
-      delete t;
-  }
 
-  config=KConfigGroup(pConfig, "Shortcuts");
-  m_actionCollection->readSettings( &config );
-  slotDocumentChanged();
+    config = KConfigGroup(pConfig, "Shortcuts");
+    m_actionCollection->readSettings(&config);
+    slotDocumentChanged();
 }
 
 void KateExternalToolsMenuAction::slotDocumentChanged()
 {
-  // try to enable/disable to match current mime type
-  KTextEditor::View *v = mainwindow->activeView();
-
-  // no active view, oh oh
-  if (!v)
-    return;
+    // try to enable/disable to match current mime type
+    KTextEditor::View* v = mainwindow->activeView();
 
-  KTextEditor::Document *de = v->document();
-  if ( de )
-  {
-    QString mt = de->mimeType();
-    QStringList l;
-    bool b;
+    // no active view, oh oh
+    if (!v)
+        return;
 
-    foreach (QAction* kaction, m_actionCollection->actions())
-    {
-      KateExternalToolAction *action = dynamic_cast<KateExternalToolAction*>(kaction);
-      if ( action )
-      {
-        l = action->tool->mimetypes;
-        b = ( ! l.count() || l.contains( mt ) );
-        action->setEnabled( b );
-      }
+    KTextEditor::Document* de = v->document();
+    if (de) {
+        QString mt = de->mimeType();
+        QStringList l;
+        bool b;
+
+        foreach (QAction* kaction, m_actionCollection->actions()) {
+            KateExternalToolAction* action = dynamic_cast<KateExternalToolAction*>(kaction);
+            if (action) {
+                l = action->tool->mimetypes;
+                b = (!l.count() || l.contains(mt));
+                action->setEnabled(b);
+            }
+        }
     }
-  }
 }
-//END KateExternalToolsMenuAction
+// END KateExternalToolsMenuAction
 
-//BEGIN ToolItem
+// BEGIN ToolItem
 /**
  * This is a QListBoxItem, that has a KateExternalTool. The text is the Name
  * of the tool.
  */
 class ToolItem : public QListWidgetItem
 {
-  public:
-    ToolItem( QListWidget *lb, const QPixmap &icon, KateExternalTool *tool )
-        : QListWidgetItem( icon , tool->name , lb ),
-        tool ( tool )
+public:
+    ToolItem(QListWidget* lb, const QPixmap& icon, KateExternalTool* tool)
+        : QListWidgetItem(icon, tool->name, lb)
+        , tool(tool)
     {
     }
 
-    ~ToolItem()
-    {}
+    ~ToolItem() {}
 
-    KateExternalTool *tool;
+    KateExternalTool* tool;
 };
-//END ToolItem
-
-//BEGIN KateExternalToolServiceEditor
-KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *tool,
-    QWidget *parent, const char *name )
-    : KDialog( parent ),
-    tool( tool )
-{
-  setCaption( i18n("Edit External Tool") );
-  setButtons( Ok | Cancel );
-  setObjectName( name );
-  setModal( true );
-
-  // create a entry for each property
-  // fill in the values from the service if available
-  QWidget *w = new QWidget( this );
-  setMainWidget( w );
-  QGridLayout *lo = new QGridLayout( w );
-  lo->setSpacing( KDialog::spacingHint() );
-
-  QLabel *l;
-
-  leName = new KLineEdit( w );
-  lo->addWidget( leName, 1, 2 );
-  l = new QLabel( w );
-  l->setBuddy( leName );
-  l->setText( i18n("&Label:") );
-  l->setAlignment( l->alignment() | Qt::AlignRight );
-  lo->addWidget( l, 1, 1 );
-  if ( tool ) leName->setText( tool->name );
-  leName->setWhatsThis(i18n(
-                         "The name will be displayed in the 'Tools->External' menu") );
-
-  btnIcon = new KIconButton( w );
-  btnIcon->setIconSize( KIconLoader::SizeSmall );
-  lo->addWidget( btnIcon, 1, 3 );
-  if ( tool && !tool->icon.isEmpty() )
-    btnIcon->setIcon( tool->icon );
-
-  teCommand = new QTextEdit( w );
-  lo->addWidget( teCommand, 2, 2, 1, 2 );
-  l = new QLabel( w );
-  l->setBuddy( teCommand );
-  l->setText( i18n("S&cript:") );
-  l->setAlignment( Qt::AlignTop | Qt::AlignRight );
-  lo->addWidget( l, 2, 1 );
-  if ( tool ) teCommand->setText( tool->command );
-  teCommand->setWhatsThis(i18n(
-                            "<p>The script to execute to invoke the tool. The script is passed "
-                            "to /bin/sh for execution. The following macros "
-                            "will be expanded:</p>"
-                            "<ul><li><code>%URL</code> - the URL of the current document.</li>"
-                            "<li><code>%URLs</code> - a list of the URLs of all open documents.</li>"
-                            "<li><code>%directory</code> - the URL of the directory containing "
-                            "the current document.</li>"
-                            "<li><code>%filename</code> - the filename of the current document.</li>"
-                            "<li><code>%line</code> - the current line of the text cursor in the "
-                            "current view.</li>"
-                            "<li><code>%column</code> - the column of the text cursor in the "
-                            "current view.</li>"
-                            "<li><code>%selection</code> - the selected text in the current view.</li>"
-                            "<li><code>%text</code> - the text of the current document.</li></ul>" ) );
-
-
-  leExecutable = new KLineEdit( w );
-  lo->addWidget( leExecutable, 3, 2, 1, 2 );
-  l = new QLabel( w );
-  l->setBuddy( leExecutable );
-  l->setText( i18n("&Executable:") );
-  l->setAlignment( l->alignment() | Qt::AlignRight );
-  lo->addWidget( l, 3, 1 );
-  if ( tool ) leExecutable->setText( tool->tryexec );
-  leExecutable->setWhatsThis(i18n(
-                               "The executable used by the command. This is used to check if a tool "
-                               "should be displayed; if not set, the first word of <em>command</em> "
-                               "will be used.") );
-
-  leMimetypes = new KLineEdit( w );
-  lo->addWidget( leMimetypes, 4, 2 );
-  l = new QLabel( w );
-  l->setBuddy( leMimetypes );
-  l->setText( i18n("&Mime types:") );
-  l->setAlignment( l->alignment() | Qt::AlignRight );
-  lo->addWidget( l, 4, 1 );
-  if ( tool ) leMimetypes->setText( tool->mimetypes.join("; ") );
-  leMimetypes->setWhatsThis(i18n(
-                              "A semicolon-separated list of mime types for which this tool should "
-                              "be available; if this is left empty, the tool is always available. "
-                              "To choose from known mimetypes, press the button on the right.") );
-
-  QToolButton *btnMTW = new QToolButton(w);
-  lo->addWidget( btnMTW, 4, 3 );
-  btnMTW->setIcon(QIcon(SmallIcon("wizard")));
-  connect(btnMTW, SIGNAL(clicked()), this, SLOT(showMTDlg()));
-  btnMTW->setWhatsThis(i18n(
-                         "Click for a dialog that can help you create a list of mimetypes.") );
-
-  cmbSave = new KComboBox(w);
-  lo->addWidget( cmbSave, 5, 2, 1, 2 );
-  l = new QLabel( w );
-  l->setBuddy( cmbSave );
-  l->setText( i18n("&Save:") );
-  l->setAlignment( l->alignment() | Qt::AlignRight );
-  lo->addWidget( l, 5, 1 );
-  QStringList sl;
-  sl << i18n("None") << i18n("Current Document") << i18n("All Documents");
-  cmbSave->addItems( sl );
-  if ( tool ) cmbSave->setCurrentIndex( tool->save );
-  cmbSave->setWhatsThis(i18n(
-                          "You can choose to save the current or all [modified] documents prior to "
-                          "running the command. This is helpful if you want to pass URLs to "
-                          "an application like, for example, an FTP client.") );
-
-
-  leCmdLine = new KLineEdit( w );
-  lo->addWidget( leCmdLine, 6, 2, 1, 2 );
-  l = new QLabel( i18n("&Command line name:"), w );
-  l->setBuddy( leCmdLine );
-  l->setAlignment( l->alignment() | Qt::AlignRight );
-  lo->addWidget( l, 6, 1 );
-  if ( tool ) leCmdLine->setText( tool->cmdname );
-  leCmdLine->setWhatsThis(i18n(
-                            "If you specify a name here, you can invoke the command from the view "
-                            "command line with exttool-the_name_you_specified_here. "
-                            "Please do not use spaces or tabs in the name."));
+// END ToolItem
+
+// BEGIN KateExternalToolServiceEditor
+KateExternalToolServiceEditor::KateExternalToolServiceEditor(KateExternalTool* tool, QWidget* parent, const char* name)
+    : KDialog(parent)
+    , tool(tool)
+{
+    setCaption(i18n("Edit External Tool"));
+    setButtons(Ok | Cancel);
+    setObjectName(name);
+    setModal(true);
+
+    // create a entry for each property
+    // fill in the values from the service if available
+    QWidget* w = new QWidget(this);
+    setMainWidget(w);
+    QGridLayout* lo = new QGridLayout(w);
+    lo->setSpacing(KDialog::spacingHint());
+
+    QLabel* l;
+
+    leName = new KLineEdit(w);
+    lo->addWidget(leName, 1, 2);
+    l = new QLabel(w);
+    l->setBuddy(leName);
+    l->setText(i18n("&Label:"));
+    l->setAlignment(l->alignment() | Qt::AlignRight);
+    lo->addWidget(l, 1, 1);
+    if (tool)
+        leName->setText(tool->name);
+    leName->setWhatsThis(i18n("The name will be displayed in the 'Tools->External' menu"));
+
+    btnIcon = new KIconButton(w);
+    btnIcon->setIconSize(KIconLoader::SizeSmall);
+    lo->addWidget(btnIcon, 1, 3);
+    if (tool && !tool->icon.isEmpty())
+        btnIcon->setIcon(tool->icon);
+
+    teCommand = new QTextEdit(w);
+    lo->addWidget(teCommand, 2, 2, 1, 2);
+    l = new QLabel(w);
+    l->setBuddy(teCommand);
+    l->setText(i18n("S&cript:"));
+    l->setAlignment(Qt::AlignTop | Qt::AlignRight);
+    lo->addWidget(l, 2, 1);
+    if (tool)
+        teCommand->setText(tool->command);
+    teCommand->setWhatsThis(i18n("<p>The script to execute to invoke the tool. The script is passed "
+                                 "to /bin/sh for execution. The following macros "
+                                 "will be expanded:</p>"
+                                 "<ul><li><code>%URL</code> - the URL of the current document.</li>"
+                                 "<li><code>%URLs</code> - a list of the URLs of all open documents.</li>"
+                                 "<li><code>%directory</code> - the URL of the directory containing "
+                                 "the current document.</li>"
+                                 "<li><code>%filename</code> - the filename of the current document.</li>"
+                                 "<li><code>%line</code> - the current line of the text cursor in the "
+                                 "current view.</li>"
+                                 "<li><code>%column</code> - the column of the text cursor in the "
+                                 "current view.</li>"
+                                 "<li><code>%selection</code> - the selected text in the current view.</li>"
+                                 "<li><code>%text</code> - the text of the current document.</li></ul>"));
+
+    leExecutable = new KLineEdit(w);
+    lo->addWidget(leExecutable, 3, 2, 1, 2);
+    l = new QLabel(w);
+    l->setBuddy(leExecutable);
+    l->setText(i18n("&Executable:"));
+    l->setAlignment(l->alignment() | Qt::AlignRight);
+    lo->addWidget(l, 3, 1);
+    if (tool)
+        leExecutable->setText(tool->tryexec);
+    leExecutable->setWhatsThis(i18n("The executable used by the command. This is used to check if a tool "
+                                    "should be displayed; if not set, the first word of <em>command</em> "
+                                    "will be used."));
+
+    leMimetypes = new KLineEdit(w);
+    lo->addWidget(leMimetypes, 4, 2);
+    l = new QLabel(w);
+    l->setBuddy(leMimetypes);
+    l->setText(i18n("&Mime types:"));
+    l->setAlignment(l->alignment() | Qt::AlignRight);
+    lo->addWidget(l, 4, 1);
+    if (tool)
+        leMimetypes->setText(tool->mimetypes.join("; "));
+    leMimetypes->setWhatsThis(i18n("A semicolon-separated list of mime types for which this tool should "
+                                   "be available; if this is left empty, the tool is always available. "
+                                   "To choose from known mimetypes, press the button on the right."));
+
+    QToolButton* btnMTW = new QToolButton(w);
+    lo->addWidget(btnMTW, 4, 3);
+    btnMTW->setIcon(QIcon(SmallIcon("wizard")));
+    connect(btnMTW, SIGNAL(clicked()), this, SLOT(showMTDlg()));
+    btnMTW->setWhatsThis(i18n("Click for a dialog that can help you create a list of mimetypes."));
+
+    cmbSave = new KComboBox(w);
+    lo->addWidget(cmbSave, 5, 2, 1, 2);
+    l = new QLabel(w);
+    l->setBuddy(cmbSave);
+    l->setText(i18n("&Save:"));
+    l->setAlignment(l->alignment() | Qt::AlignRight);
+    lo->addWidget(l, 5, 1);
+    QStringList sl;
+    sl << i18n("None") << i18n("Current Document") << i18n("All Documents");
+    cmbSave->addItems(sl);
+    if (tool)
+        cmbSave->setCurrentIndex(tool->save);
+    cmbSave->setWhatsThis(i18n("You can choose to save the current or all [modified] documents prior to "
+                               "running the command. This is helpful if you want to pass URLs to "
+                               "an application like, for example, an FTP client."));
+
+    leCmdLine = new KLineEdit(w);
+    lo->addWidget(leCmdLine, 6, 2, 1, 2);
+    l = new QLabel(i18n("&Command line name:"), w);
+    l->setBuddy(leCmdLine);
+    l->setAlignment(l->alignment() | Qt::AlignRight);
+    lo->addWidget(l, 6, 1);
+    if (tool)
+        leCmdLine->setText(tool->cmdname);
+    leCmdLine->setWhatsThis(i18n("If you specify a name here, you can invoke the command from the view "
+                                 "command line with exttool-the_name_you_specified_here. "
+                                 "Please do not use spaces or tabs in the name."));
 }
 
 void KateExternalToolServiceEditor::slotButtonClicked(int button)
 {
-  switch( button ) {
+    switch (button) {
     case Ok:
-      if ( leName->text().isEmpty() || teCommand->document()->isEmpty() )
-      {
-        KMessageBox::information( this, i18n("You must specify at least a name and a command") );
-        return;
-      }
-      accept();
-      break;
+        if (leName->text().isEmpty() || teCommand->document()->isEmpty()) {
+            KMessageBox::information(this, i18n("You must specify at least a name and a command"));
+            return;
+        }
+        accept();
+        break;
     case Cancel:
-      reject();
-      break;
-  }
-
+        reject();
+        break;
+    }
 }
 
 void KateExternalToolServiceEditor::showMTDlg()
 {
-  QString text = i18n("Select the MimeTypes for which to enable this tool.");
-  QStringList list = leMimetypes->text().split( QRegExp("\\s*;\\s*"), QString::SkipEmptyParts );
-  KMimeTypeChooserDialog d( i18n("Select Mime Types"), text, list, "text", this );
-  if ( d.exec() == KDialog::Accepted )
-  {
-    leMimetypes->setText( d.chooser()->mimeTypes().join(";") );
-  }
+    QString text = i18n("Select the MimeTypes for which to enable this tool.");
+    QStringList list = leMimetypes->text().split(QRegExp("\\s*;\\s*"), QString::SkipEmptyParts);
+    KMimeTypeChooserDialog d(i18n("Select Mime Types"), text, list, "text", this);
+    if (d.exec() == KDialog::Accepted) {
+        leMimetypes->setText(d.chooser()->mimeTypes().join(";"));
+    }
 }
-//END KateExternalToolServiceEditor
+// END KateExternalToolServiceEditor
 
-//BEGIN KateExternalToolsConfigWidget
-KateExternalToolsConfigWidget::KateExternalToolsConfigWidget( QWidget *parent, KateExternalToolsPlugin *plugin, const char* name)
-    : Kate::PluginConfigPage( parent, name )
-    , m_changed( false )
+// BEGIN KateExternalToolsConfigWidget
+KateExternalToolsConfigWidget::KateExternalToolsConfigWidget(QWidget* parent, KateExternalToolsPlugin* plugin,
+                                                             const char* name)
+    : Kate::PluginConfigPage(parent, name)
+    , m_changed(false)
     , m_plugin(plugin)
 {
-  setupUi(this);
+    setupUi(this);
 
-  btnMoveUp->setIcon(KIcon("go-up"));
-  btnMoveDown->setIcon(KIcon("go-down"));
+    btnMoveUp->setIcon(KIcon("go-up"));
+    btnMoveDown->setIcon(KIcon("go-down"));
 
-  connect( lbTools, SIGNAL(itemSelectionChanged()), this, SLOT(slotSelectionChanged()) );
-  connect( lbTools, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(slotEdit()) );
-  connect( btnNew, SIGNAL(clicked()), this, SLOT(slotNew()) );
-  connect( btnRemove, SIGNAL(clicked()), this, SLOT(slotRemove()) );
-  connect( btnEdit, SIGNAL(clicked()), this, SLOT(slotEdit()) );
-  connect( btnSeparator, SIGNAL(clicked()), this, SLOT(slotInsertSeparator()) );
-  connect( btnMoveUp, SIGNAL(clicked()), this, SLOT(slotMoveUp()) );
-  connect( btnMoveDown, SIGNAL(clicked()), this, SLOT(slotMoveDown()) );
+    connect(lbTools, SIGNAL(itemSelectionChanged()), this, SLOT(slotSelectionChanged()));
+    connect(lbTools, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(slotEdit()));
+    connect(btnNew, SIGNAL(clicked()), this, SLOT(slotNew()));
+    connect(btnRemove, SIGNAL(clicked()), this, SLOT(slotRemove()));
+    connect(btnEdit, SIGNAL(clicked()), this, SLOT(slotEdit()));
+    connect(btnSeparator, SIGNAL(clicked()), this, SLOT(slotInsertSeparator()));
+    connect(btnMoveUp, SIGNAL(clicked()), this, SLOT(slotMoveUp()));
+    connect(btnMoveDown, SIGNAL(clicked()), this, SLOT(slotMoveDown()));
 
-  config = new KConfig( "externaltools", KConfig::NoGlobals, "appdata" );
-  reset();
-  slotSelectionChanged();
+    config = new KConfig("externaltools", KConfig::NoGlobals, "appdata");
+    reset();
+    slotSelectionChanged();
 }
 
 KateExternalToolsConfigWidget::~KateExternalToolsConfigWidget()
 {
-  delete config;
+    delete config;
 }
 
 void KateExternalToolsConfigWidget::reset()
 {
-  //m_tools.clear();
-  lbTools->clear();
+    // m_tools.clear();
+    lbTools->clear();
 
-  // load the files from a KConfig
-  const QStringList tools = config->group("Global").readEntry("tools", QStringList());
+    // load the files from a KConfig
+    const QStringList tools = config->group("Global").readEntry("tools", QStringList());
 
-  for( QStringList::const_iterator it = tools.begin(); it != tools.end(); ++it )
-  {
-    if ( *it == "---" )
-    {
-      new QListWidgetItem( "---" , lbTools);
-    }
-    else
-    {
-      KConfigGroup cg( config, *it );
-
-      KateExternalTool *t = new KateExternalTool(
-                              cg.readEntry( "name", "" ),
-                              cg.readEntry( "command", ""),
-                              cg.readEntry( "icon", ""),
-                              cg.readEntry( "executable", ""),
-                              cg.readEntry( "mimetypes", QStringList() ),
-                              cg.readEntry( "acname" ),
-                              cg.readEntry( "cmdname"),
-                              cg.readEntry( "save", 0 ) );
-
-      if ( t->hasexec ) // we only show tools that are also in the menu.
-        new ToolItem( lbTools, t->icon.isEmpty() ? blankIcon() : SmallIcon( t->icon ), t );
-      else
-        delete t;
+    for (QStringList::const_iterator it = tools.begin(); it != tools.end(); ++it) {
+        if (*it == "---") {
+            new QListWidgetItem("---", lbTools);
+        } else {
+            KConfigGroup cg(config, *it);
+
+            KateExternalTool* t
+                = new KateExternalTool(cg.readEntry("name", ""), cg.readEntry("command", ""), cg.readEntry("icon", ""),
+                                       cg.readEntry("executable", ""), cg.readEntry("mimetypes", QStringList()),
+                                       cg.readEntry("acname"), cg.readEntry("cmdname"), cg.readEntry("save", 0));
+
+            if (t->hasexec) // we only show tools that are also in the menu.
+                new ToolItem(lbTools, t->icon.isEmpty() ? blankIcon() : SmallIcon(t->icon), t);
+            else
+                delete t;
+        }
     }
-  }
-  m_changed = false;
+    m_changed = false;
 }
 
 QPixmap KateExternalToolsConfigWidget::blankIcon()
 {
-  QPixmap pm( KIconLoader::SizeSmall, KIconLoader::SizeSmall );
-  pm.fill();
-  pm.setMask( pm.createHeuristicMask() );
-  return pm;
+    QPixmap pm(KIconLoader::SizeSmall, KIconLoader::SizeSmall);
+    pm.fill();
+    pm.setMask(pm.createHeuristicMask());
+    return pm;
 }
 
 void KateExternalToolsConfigWidget::apply()
 {
-  if ( ! m_changed )
-    return;
-  m_changed = false;
-
-  // save a new list
-  // save each item
-  QStringList tools;
-  for ( int i = 0; i < lbTools->count(); i++ )
-  {
-    if ( lbTools->item(i)->text() == "---" )
-    {
-      tools << "---";
-      continue;
-    }
-    KateExternalTool *t = static_cast<ToolItem*>(lbTools->item( i ))->tool;
-//     kDebug(13001)<<"adding tool: "<<t->name;
-    tools << t->acname;
-
-    KConfigGroup cg( config, t->acname );
-
-    cg.writeEntry( "name", t->name );
-    cg.writeEntry( "command", t->command );
-    cg.writeEntry( "icon", t->icon );
-    cg.writeEntry( "executable", t->tryexec );
-    cg.writeEntry( "mimetypes", t->mimetypes );
-    cg.writeEntry( "acname", t->acname );
-    cg.writeEntry( "cmdname", t->cmdname );
-    cg.writeEntry( "save", t->save );
-  }
-
-  config->group("Global").writeEntry( "tools", tools );
-
-  // if any tools was removed, try to delete their groups, and
-  // add the group names to the list of removed items.
-  if ( m_removed.count() )
-  {
-    for ( QStringList::iterator it = m_removed.begin(); it != m_removed.end(); ++it )
-    {
-      if ( config->hasGroup( *it ) )
-        config->deleteGroup( *it  );
+    if (!m_changed)
+        return;
+    m_changed = false;
+
+    // save a new list
+    // save each item
+    QStringList tools;
+    for (int i = 0; i < lbTools->count(); i++) {
+        if (lbTools->item(i)->text() == "---") {
+            tools << "---";
+            continue;
+        }
+        KateExternalTool* t = static_cast<ToolItem*>(lbTools->item(i))->tool;
+        //     kDebug(13001)<<"adding tool: "<<t->name;
+        tools << t->acname;
+
+        KConfigGroup cg(config, t->acname);
+
+        cg.writeEntry("name", t->name);
+        cg.writeEntry("command", t->command);
+        cg.writeEntry("icon", t->icon);
+        cg.writeEntry("executable", t->tryexec);
+        cg.writeEntry("mimetypes", t->mimetypes);
+        cg.writeEntry("acname", t->acname);
+        cg.writeEntry("cmdname", t->cmdname);
+        cg.writeEntry("save", t->save);
     }
-    QStringList removed = config->group("Global").readEntry( "removed", QStringList() );
-    removed += m_removed;
 
-    // clean up the list of removed items, so that it does not contain
-    // non-existing groups (we can't remove groups from a non-owned global file).
-    config->sync();
-    QStringList::iterator it1 = removed.begin();
-    while ( it1 != removed.end() )
-    {
-      if ( ! config->hasGroup( *it1 ) )
-        it1 = removed.erase( it1 );
-      else
-        ++it1;
+    config->group("Global").writeEntry("tools", tools);
+
+    // if any tools was removed, try to delete their groups, and
+    // add the group names to the list of removed items.
+    if (m_removed.count()) {
+        for (QStringList::iterator it = m_removed.begin(); it != m_removed.end(); ++it) {
+            if (config->hasGroup(*it))
+                config->deleteGroup(*it);
+        }
+        QStringList removed = config->group("Global").readEntry("removed", QStringList());
+        removed += m_removed;
+
+        // clean up the list of removed items, so that it does not contain
+        // non-existing groups (we can't remove groups from a non-owned global file).
+        config->sync();
+        QStringList::iterator it1 = removed.begin();
+        while (it1 != removed.end()) {
+            if (!config->hasGroup(*it1))
+                it1 = removed.erase(it1);
+            else
+                ++it1;
+        }
+        config->group("Global").writeEntry("removed", removed);
     }
-    config->group("Global").writeEntry( "removed", removed );
-  }
 
-  config->sync();
-  m_plugin->reload();
+    config->sync();
+    m_plugin->reload();
 }
 
 void KateExternalToolsConfigWidget::slotSelectionChanged()
 {
-  // update button state
-  bool hs =  lbTools->currentItem() != 0;
-  btnEdit->setEnabled( hs && dynamic_cast<ToolItem*>(lbTools->currentItem()) );
-  btnRemove->setEnabled( hs );
-  btnMoveUp->setEnabled( ( lbTools->currentRow() > 0 ) && hs );
-  btnMoveDown->setEnabled( ( lbTools->currentRow() < (int)lbTools->count() - 1 ) && hs );
+    // update button state
+    bool hs = lbTools->currentItem() != 0;
+    btnEdit->setEnabled(hs && dynamic_cast<ToolItem*>(lbTools->currentItem()));
+    btnRemove->setEnabled(hs);
+    btnMoveUp->setEnabled((lbTools->currentRow() > 0) && hs);
+    btnMoveDown->setEnabled((lbTools->currentRow() < (int)lbTools->count() - 1) && hs);
 }
 
 void KateExternalToolsConfigWidget::slotNew()
 {
-  // display a editor, and if it is OK'd, create a new tool and
-  // create a listbox item for it
-  KateExternalToolServiceEditor editor( 0, this );
+    // display a editor, and if it is OK'd, create a new tool and
+    // create a listbox item for it
+    KateExternalToolServiceEditor editor(0, this);
 
-  if ( editor.exec() )
-  {
-    KateExternalTool *t = new KateExternalTool(
-                            editor.leName->text(),
-                            editor.teCommand->toPlainText(),
-                            editor.btnIcon->icon(),
-                            editor.leExecutable->text(),
-                            editor.leMimetypes->text().split( QRegExp("\\s*;\\s*"), QString::SkipEmptyParts ) );
+    if (editor.exec()) {
+        KateExternalTool* t = new KateExternalTool(
+            editor.leName->text(), editor.teCommand->toPlainText(), editor.btnIcon->icon(), editor.leExecutable->text(),
+            editor.leMimetypes->text().split(QRegExp("\\s*;\\s*"), QString::SkipEmptyParts));
 
-    // This is sticky, it does not change again, so that shortcuts sticks
-    // TODO check for dups
-    t->acname = "externaltool_" + QString(t->name).remove( QRegExp("\\W+") );
+        // This is sticky, it does not change again, so that shortcuts sticks
+        // TODO check for dups
+        t->acname = "externaltool_" + QString(t->name).remove(QRegExp("\\W+"));
 
-    new ToolItem ( lbTools, t->icon.isEmpty() ? blankIcon() : SmallIcon( t->icon ), t );
+        new ToolItem(lbTools, t->icon.isEmpty() ? blankIcon() : SmallIcon(t->icon), t);
 
-    emit changed();
-    m_changed = true;
-  }
+        emit changed();
+        m_changed = true;
+    }
 }
 
 void KateExternalToolsConfigWidget::slotRemove()
 {
-  // add the tool action name to a list of removed items,
-  // remove the current listbox item
-  if ( lbTools->currentRow() > -1 )
-  {
-    ToolItem *i = dynamic_cast<ToolItem*>(lbTools->currentItem());
-    if ( i )
-      m_removed << i->tool->acname;
+    // add the tool action name to a list of removed items,
+    // remove the current listbox item
+    if (lbTools->currentRow() > -1) {
+        ToolItem* i = dynamic_cast<ToolItem*>(lbTools->currentItem());
+        if (i)
+            m_removed << i->tool->acname;
 
-    delete lbTools->takeItem( lbTools->currentRow() );
-    emit changed();
-    m_changed = true;
-  }
+        delete lbTools->takeItem(lbTools->currentRow());
+        emit changed();
+        m_changed = true;
+    }
 }
 
 void KateExternalToolsConfigWidget::slotEdit()
 {
-  if( !dynamic_cast<ToolItem*>(lbTools->currentItem()) ) return;
-  // show the item in an editor
-  KateExternalTool *t = static_cast<ToolItem*>(lbTools->currentItem())->tool;
-  KateExternalToolServiceEditor editor( t, this);
-  editor.resize( config->group("Editor").readEntry( "Size", QSize() ) );
-  if ( editor.exec() /*== KDialog::Ok*/ )
-  {
-
-    bool elementChanged = ( ( editor.btnIcon->icon() != t->icon ) || (editor.leName->text() != t->name ) ) ;
-
-    t->name = editor.leName->text();
-    t->cmdname = editor.leCmdLine->text();
-    t->command = editor.teCommand->toPlainText();
-    t->icon = editor.btnIcon->icon();
-    t->tryexec = editor.leExecutable->text();
-    t->mimetypes = editor.leMimetypes->text().split( QRegExp("\\s*;\\s*"), QString::SkipEmptyParts );
-    t->save = editor.cmbSave->currentIndex();
-
-    //if the icon has changed or name changed, I have to renew the listbox item :S
-    if ( elementChanged )
-    {
-      int idx = lbTools->row( lbTools->currentItem() );
-      delete lbTools->takeItem( idx );
-      lbTools->insertItem( idx , new ToolItem( 0, t->icon.isEmpty() ? blankIcon() : SmallIcon( t->icon ), t ));
-    }
+    if (!dynamic_cast<ToolItem*>(lbTools->currentItem()))
+        return;
+    // show the item in an editor
+    KateExternalTool* t = static_cast<ToolItem*>(lbTools->currentItem())->tool;
+    KateExternalToolServiceEditor editor(t, this);
+    editor.resize(config->group("Editor").readEntry("Size", QSize()));
+    if (editor.exec() /*== KDialog::Ok*/) {
+
+        bool elementChanged = ((editor.btnIcon->icon() != t->icon) || (editor.leName->text() != t->name));
+
+        t->name = editor.leName->text();
+        t->cmdname = editor.leCmdLine->text();
+        t->command = editor.teCommand->toPlainText();
+        t->icon = editor.btnIcon->icon();
+        t->tryexec = editor.leExecutable->text();
+        t->mimetypes = editor.leMimetypes->text().split(QRegExp("\\s*;\\s*"), QString::SkipEmptyParts);
+        t->save = editor.cmbSave->currentIndex();
+
+        // if the icon has changed or name changed, I have to renew the listbox item :S
+        if (elementChanged) {
+            int idx = lbTools->row(lbTools->currentItem());
+            delete lbTools->takeItem(idx);
+            lbTools->insertItem(idx, new ToolItem(0, t->icon.isEmpty() ? blankIcon() : SmallIcon(t->icon), t));
+        }
 
-    emit changed();
-    m_changed = true;
-  }
+        emit changed();
+        m_changed = true;
+    }
 
-  config->group("Editor").writeEntry( "Size", editor.size() );
-  config->sync();
+    config->group("Editor").writeEntry("Size", editor.size());
+    config->sync();
 }
 
 void KateExternalToolsConfigWidget::slotInsertSeparator()
 {
-  lbTools->insertItem( lbTools->currentRow() + 1 , "---" );
-  emit changed();
-  m_changed = true;
+    lbTools->insertItem(lbTools->currentRow() + 1, "---");
+    emit changed();
+    m_changed = true;
 }
 
 void KateExternalToolsConfigWidget::slotMoveUp()
 {
-  // move the current item in the listbox upwards if possible
-  QListWidgetItem *item = lbTools->currentItem();
-  if ( ! item ) return;
-
-  int idx = lbTools->row( item );
-
-  if ( idx < 1 ) return;
-
-  if ( dynamic_cast<ToolItem*>(item) )
-  {
-    KateExternalTool *tool = static_cast<ToolItem*>(item)->tool;
-    delete lbTools->takeItem( idx );
-    lbTools->insertItem( idx - 1 , new ToolItem( 0, tool->icon.isEmpty() ? blankIcon() : SmallIcon( tool->icon ), tool ) );
-  }
-  else // a separator!
-  {
-    delete lbTools->takeItem( idx );
-    lbTools->insertItem( idx - 1 , new QListWidgetItem( "---"  ));
-  }
-
-  lbTools->setCurrentRow( idx - 1 );
-  slotSelectionChanged();
-  emit changed();
-  m_changed = true;
+    // move the current item in the listbox upwards if possible
+    QListWidgetItem* item = lbTools->currentItem();
+    if (!item)
+        return;
+
+    int idx = lbTools->row(item);
+
+    if (idx < 1)
+        return;
+
+    if (dynamic_cast<ToolItem*>(item)) {
+        KateExternalTool* tool = static_cast<ToolItem*>(item)->tool;
+        delete lbTools->takeItem(idx);
+        lbTools->insertItem(idx - 1, new ToolItem(0, tool->icon.isEmpty() ? blankIcon() : SmallIcon(tool->icon), tool));
+    } else // a separator!
+    {
+        delete lbTools->takeItem(idx);
+        lbTools->insertItem(idx - 1, new QListWidgetItem("---"));
+    }
+
+    lbTools->setCurrentRow(idx - 1);
+    slotSelectionChanged();
+    emit changed();
+    m_changed = true;
 }
 
 void KateExternalToolsConfigWidget::slotMoveDown()
 {
-  // move the current item in the listbox downwards if possible
-  QListWidgetItem *item = lbTools->currentItem();
-  if ( ! item ) return;
-
-  int idx = lbTools->row( item );
-
-  if ( idx > lbTools->count() - 1 ) return;
-
-  if ( dynamic_cast<ToolItem*>(item) )
-  {
-    KateExternalTool *tool = static_cast<ToolItem*>(item)->tool;
-    delete lbTools->takeItem( idx );
-    lbTools->insertItem( idx + 1 , new ToolItem( 0, tool->icon.isEmpty() ? blankIcon() : SmallIcon( tool->icon ), tool ) );
-  }
-  else // a separator!
-  {
-    delete lbTools->takeItem( idx );
-    lbTools->insertItem( idx + 1 , new QListWidgetItem( "---" ) );
-  }
-
-  lbTools->setCurrentRow( idx + 1 );
-  slotSelectionChanged();
-  emit changed();
-  m_changed = true;
+    // move the current item in the listbox downwards if possible
+    QListWidgetItem* item = lbTools->currentItem();
+    if (!item)
+        return;
+
+    int idx = lbTools->row(item);
+
+    if (idx > lbTools->count() - 1)
+        return;
+
+    if (dynamic_cast<ToolItem*>(item)) {
+        KateExternalTool* tool = static_cast<ToolItem*>(item)->tool;
+        delete lbTools->takeItem(idx);
+        lbTools->insertItem(idx + 1, new ToolItem(0, tool->icon.isEmpty() ? blankIcon() : SmallIcon(tool->icon), tool));
+    } else // a separator!
+    {
+        delete lbTools->takeItem(idx);
+        lbTools->insertItem(idx + 1, new QListWidgetItem("---"));
+    }
+
+    lbTools->setCurrentRow(idx + 1);
+    slotSelectionChanged();
+    emit changed();
+    m_changed = true;
 }
-//END KateExternalToolsConfigWidget
+// END KateExternalToolsConfigWidget
 // kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/addons/externaltools/kateexternaltoolsplugin.cpp b/addons/externaltools/kateexternaltoolsplugin.cpp
index 7f7a3c5fb..30c30cb12 100644
--- a/addons/externaltools/kateexternaltoolsplugin.cpp
+++ b/addons/externaltools/kateexternaltoolsplugin.cpp
@@ -1,186 +1,187 @@
 /* This file is part of the KDE project
    Copyright (C) 2001 Christoph Cullmann <cullmann@kde.org>
    Copyright (C) 2002 Joseph Wenninger <jowenn@kde.org>
    Copyright (C) 2002 Anders Lund <anders.lund@lund.tdcadsl.dk>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License version 2 as published by the Free Software Foundation.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #include "kateexternaltoolsplugin.h"
 #include "kateexternaltoolsplugin.moc"
 
+#include <kate/application.h>
 #include <kicon.h>
 #include <kiconloader.h>
 #include <ktexteditor/document.h>
-#include <ktexteditor/view.h>
 #include <ktexteditor/editor.h>
-#include <kate/application.h>
+#include <ktexteditor/view.h>
 
-#include <kparts/part.h>
 #include <kaction.h>
 #include <kactioncollection.h>
+#include <kparts/part.h>
 
-#include <kurl.h>
-#include <klocale.h>
 #include <kdebug.h>
+#include <klocale.h>
 #include <kmessagebox.h>
+#include <kurl.h>
 
-#include <kpluginloader.h>
-#include <kpluginfactory.h>
 #include <kaboutdata.h>
 #include <kauthorized.h>
+#include <kpluginfactory.h>
+#include <kpluginloader.h>
 
 K_PLUGIN_FACTORY(KateExternalToolsFactory, registerPlugin<KateExternalToolsPlugin>();)
-K_EXPORT_PLUGIN(KateExternalToolsFactory(KAboutData("kateexternaltools","kateexternaltoolsplugin",ki18n("External Tools"), "0.1", ki18n("Run external tools"), KAboutData::License_LGPL)) )
+K_EXPORT_PLUGIN(KateExternalToolsFactory(KAboutData("kateexternaltools", "kateexternaltoolsplugin",
+                                                    ki18n("External Tools"), "0.1", ki18n("Run external tools"),
+                                                    KAboutData::License_LGPL)))
 
-
-KateExternalToolsPlugin::KateExternalToolsPlugin( QObject* parent, const QList<QVariant>& ):
-    Kate::Plugin ( (Kate::Application*)parent ),m_command(0)
+KateExternalToolsPlugin::KateExternalToolsPlugin(QObject* parent, const QList<QVariant>&)
+    : Kate::Plugin((Kate::Application*)parent)
+    , m_command(0)
 {
-  if (KAuthorized::authorizeKAction("shell_access"))
-  {
-    KTextEditor::CommandInterface* cmdIface =
-      qobject_cast<KTextEditor::CommandInterface*>( Kate::application()->editor() );
-    if( cmdIface ) {
-      m_command=new KateExternalToolsCommand(this);
-      cmdIface->registerCommand( m_command );
+    if (KAuthorized::authorizeKAction("shell_access")) {
+        KTextEditor::CommandInterface* cmdIface
+            = qobject_cast<KTextEditor::CommandInterface*>(Kate::application()->editor());
+        if (cmdIface) {
+            m_command = new KateExternalToolsCommand(this);
+            cmdIface->registerCommand(m_command);
+        }
     }
-  }
 }
 
 KateExternalToolsPlugin::~KateExternalToolsPlugin()
 {
-  if (KAuthorized::authorizeKAction("shell_access"))
-  {
-    if (m_command) {
-      KTextEditor::CommandInterface* cmdIface =
-        qobject_cast<KTextEditor::CommandInterface*>( Kate::application()->editor() );
-      if( cmdIface )
-        cmdIface->unregisterCommand( m_command );
-      delete m_command;
+    if (KAuthorized::authorizeKAction("shell_access")) {
+        if (m_command) {
+            KTextEditor::CommandInterface* cmdIface
+                = qobject_cast<KTextEditor::CommandInterface*>(Kate::application()->editor());
+            if (cmdIface)
+                cmdIface->unregisterCommand(m_command);
+            delete m_command;
+        }
     }
-  }
 }
 
-Kate::PluginView *KateExternalToolsPlugin::createView (Kate::MainWindow *mainWindow)
+Kate::PluginView* KateExternalToolsPlugin::createView(Kate::MainWindow* mainWindow)
 {
-  KateExternalToolsPluginView *view= new KateExternalToolsPluginView (mainWindow);
-  connect(view,SIGNAL(destroyed(QObject*)),this,SLOT(viewDestroyed(QObject*)));
-  m_views.append(view);
-  return view;
+    KateExternalToolsPluginView* view = new KateExternalToolsPluginView(mainWindow);
+    connect(view, SIGNAL(destroyed(QObject*)), this, SLOT(viewDestroyed(QObject*)));
+    m_views.append(view);
+    return view;
 }
 
-KateExternalToolsPluginView *KateExternalToolsPlugin::extView(QWidget *widget)
+KateExternalToolsPluginView* KateExternalToolsPlugin::extView(QWidget* widget)
 {
-  foreach (KateExternalToolsPluginView* view, m_views)
-  {
-    if (view->mainWindow()->window()==widget) return view;
-  }
-  return 0;
+    foreach (KateExternalToolsPluginView* view, m_views) {
+        if (view->mainWindow()->window() == widget)
+            return view;
+    }
+    return 0;
 }
 
-void KateExternalToolsPlugin::viewDestroyed(QObject *view)
+void KateExternalToolsPlugin::viewDestroyed(QObject* view)
 {
-  m_views.removeAll(dynamic_cast<KateExternalToolsPluginView*>(view));
+    m_views.removeAll(dynamic_cast<KateExternalToolsPluginView*>(view));
 }
 
-void KateExternalToolsPlugin::reload() {
-  if (KAuthorized::authorizeKAction("shell_access"))
-  {
-    KTextEditor::CommandInterface* cmdIface =
-      qobject_cast<KTextEditor::CommandInterface*>( Kate::application()->editor() );
-    if (cmdIface)
-      if(m_command) m_command->reload();
-  }
-  foreach(KateExternalToolsPluginView* view,m_views) {
-    view->rebuildMenu();
-  }
+void KateExternalToolsPlugin::reload()
+{
+    if (KAuthorized::authorizeKAction("shell_access")) {
+        KTextEditor::CommandInterface* cmdIface
+            = qobject_cast<KTextEditor::CommandInterface*>(Kate::application()->editor());
+        if (cmdIface)
+            if (m_command)
+                m_command->reload();
+    }
+    foreach (KateExternalToolsPluginView* view, m_views) {
+        view->rebuildMenu();
+    }
 }
 
 uint KateExternalToolsPlugin::configPages() const
 {
-  return 1;
+    return 1;
 }
 
-Kate::PluginConfigPage *KateExternalToolsPlugin::configPage (uint number, QWidget *parent, const char *name )
+Kate::PluginConfigPage* KateExternalToolsPlugin::configPage(uint number, QWidget* parent, const char* name)
 {
-  if (number == 0) {
-    return new KateExternalToolsConfigWidget(parent, this, name);
-  }
-  return 0;
+    if (number == 0) {
+        return new KateExternalToolsConfigWidget(parent, this, name);
+    }
+    return 0;
 }
 
-QString KateExternalToolsPlugin::configPageName (uint number) const
+QString KateExternalToolsPlugin::configPageName(uint number) const
 {
-  if (number == 0) {
-    return i18n("External Tools");
-  }
-  return QString();
+    if (number == 0) {
+        return i18n("External Tools");
+    }
+    return QString();
 }
 
-QString KateExternalToolsPlugin::configPageFullName (uint number) const
+QString KateExternalToolsPlugin::configPageFullName(uint number) const
 {
-  if (number == 0) {
-    return i18n("External Tools");
-  }
-  return QString();
+    if (number == 0) {
+        return i18n("External Tools");
+    }
+    return QString();
 }
 
-KIcon KateExternalToolsPlugin::configPageIcon (uint number) const
+KIcon KateExternalToolsPlugin::configPageIcon(uint number) const
 {
-  if (number == 0) {
+    if (number == 0) {
+        return KIcon();
+    }
     return KIcon();
-  }
-  return KIcon();
 }
 
-
-KateExternalToolsPluginView::KateExternalToolsPluginView (Kate::MainWindow *mainWindow)
-    : Kate::PluginView (mainWindow), Kate::XMLGUIClient(KateExternalToolsFactory::componentData())
+KateExternalToolsPluginView::KateExternalToolsPluginView(Kate::MainWindow* mainWindow)
+    : Kate::PluginView(mainWindow)
+    , Kate::XMLGUIClient(KateExternalToolsFactory::componentData())
 {
-  externalTools = 0;
-
-  if (KAuthorized::authorizeKAction("shell_access"))
-  {
-    externalTools = new KateExternalToolsMenuAction( i18n("External Tools"), actionCollection(), mainWindow, mainWindow );
-    actionCollection()->addAction("tools_external", externalTools);
-    externalTools->setWhatsThis( i18n("Launch external helper applications") );
+    externalTools = 0;
 
-  }
+    if (KAuthorized::authorizeKAction("shell_access")) {
+        externalTools
+            = new KateExternalToolsMenuAction(i18n("External Tools"), actionCollection(), mainWindow, mainWindow);
+        actionCollection()->addAction("tools_external", externalTools);
+        externalTools->setWhatsThis(i18n("Launch external helper applications"));
+    }
 
-  mainWindow->guiFactory()->addClient (this);
+    mainWindow->guiFactory()->addClient(this);
 }
 
-void KateExternalToolsPluginView::rebuildMenu() {
-  kDebug(13001);
-  if (externalTools) {
-    KXMLGUIFactory *f=factory();
-    f->removeClient(this);
-    reloadXML();
-    externalTools->reload();
-    kDebug(13001)<<"has just returned from externalTools->reload()";
-    f->addClient(this);
-  }
+void KateExternalToolsPluginView::rebuildMenu()
+{
+    kDebug(13001);
+    if (externalTools) {
+        KXMLGUIFactory* f = factory();
+        f->removeClient(this);
+        reloadXML();
+        externalTools->reload();
+        kDebug(13001) << "has just returned from externalTools->reload()";
+        f->addClient(this);
+    }
 }
 
-KateExternalToolsPluginView::~KateExternalToolsPluginView ()
+KateExternalToolsPluginView::~KateExternalToolsPluginView()
 {
-  mainWindow()->guiFactory()->removeClient (this);
+    mainWindow()->guiFactory()->removeClient(this);
 
-  delete externalTools;
-  externalTools = 0;
+    delete externalTools;
+    externalTools = 0;
 }
 
 // kate: space-indent on; indent-width 2; replace-tabs on;