Rename nonkdeappbutton->nontdeappbutton.

diff --git a/doc/kicker/index.docbook b/doc/kicker/index.docbook
index 9628432..1692f8d 100644
--- a/doc/kicker/index.docbook
+++ b/doc/kicker/index.docbook
@@ -546,7 +546,7 @@
 <listitem>
 <para>
 <!-- <guiicon><inlinemediaobject><imageobject><imagedata -->
-<!-- fileref="nonkdeapp_icon.png" format="PNG"/></imageobject> -->
+<!-- fileref="nontdeapp_icon.png" format="PNG"/></imageobject> -->
 <!-- </inlinemediaobject></guiicon> -->
 The <guilabel>Non-&tde; Application Launcher</guilabel> lets you add an
 application which doesn't appear in the <guimenu>TDE</guimenu> menu to &kicker;.
diff --git a/kicker/kicker/buttons/CMakeLists.txt b/kicker/kicker/buttons/CMakeLists.txt
index 1e7ede5..72d9254 100644
--- a/kicker/kicker/buttons/CMakeLists.txt
+++ b/kicker/kicker/buttons/CMakeLists.txt
@@ -42,7 +42,7 @@
 set( ${target}_SRCS
   servicebutton.cpp bookmarksbutton.cpp browserbutton.cpp
   knewbutton.cpp desktopbutton.cpp extensionbutton.cpp
-  kbutton.cpp nonkdeappbutton.cpp servicemenubutton.cpp
+  kbutton.cpp nontdeappbutton.cpp servicemenubutton.cpp
   urlbutton.cpp windowlistbutton.cpp
 )
 
diff --git a/kicker/kicker/buttons/Makefile.am b/kicker/kicker/buttons/Makefile.am
index 4dcbbb1..1bdba20 100644
--- a/kicker/kicker/buttons/Makefile.am
+++ b/kicker/kicker/buttons/Makefile.am
@@ -6,7 +6,7 @@
 libkicker_buttons_la_SOURCES = servicebutton.cpp bookmarksbutton.cpp \
 	browserbutton.cpp knewbutton.cpp \
 	desktopbutton.cpp extensionbutton.cpp kbutton.cpp \
-	nonkdeappbutton.cpp servicemenubutton.cpp urlbutton.cpp \
+	nontdeappbutton.cpp servicemenubutton.cpp urlbutton.cpp \
 	windowlistbutton.cpp
 
 libkicker_buttons_la_LDFLAGS = $(all_libraries)
diff --git a/kicker/kicker/buttons/nonkdeappbutton.cpp b/kicker/kicker/buttons/nonkdeappbutton.cpp
deleted file mode 100644
index b2e9006..0000000
--- a/kicker/kicker/buttons/nonkdeappbutton.cpp
+++ /dev/null
@@ -1,287 +0,0 @@
-/*****************************************************************
-
-Copyright (c) 1996-2001 the kicker authors. See file AUTHORS.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-******************************************************************/
-
-#include <tqtooltip.h>
-#include <tqdragobject.h>
-
-#include <tdeconfig.h>
-#include <kdesktopfile.h>
-#include <tdeapplication.h>
-#include <tdeglobal.h>
-#include <krun.h>
-#include <kprocess.h>
-#include <tdemessagebox.h>
-#include <tdelocale.h>
-#include <kiconeffect.h>
-#include <kdebug.h>
-
-// the header where the configuration dialog is defined.
-#include "exe_dlg.h"
-
-// our own definition
-#include "nonkdeappbutton.h"
-
-// we include the "moc" file so that the TDE build system knows to create it
-#include "nonkdeappbutton.moc"
-
-// this is one of the two constructors. gets called when creating a new button
-// e.g. via the "non-TDE Application" dialog, not one that was saved and then
-// restored.
-NonKDEAppButton::NonKDEAppButton(const TQString& name,
-                                 const TQString& description,
-                                 const TQString& filePath, const TQString& icon,
-                                 const TQString &cmdLine, bool inTerm,
-                                 TQWidget* parent)
-  : PanelButton(parent, "NonKDEAppButton") // call our superclass's constructor
-{
-    // call the initialization method
-    initialize(name, description, filePath, icon, cmdLine, inTerm);
-
-    // and connect the clicked() signal (emitted when the button is activated)
-    // to the slotExec() slot
-    // we do this here instead of in initialize(...) since initialize(...) may
-    // get called later, e.g after reconfiguring it
-    connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()));
-}
-
-// this constructor is used when restoring a button, usually at startup
-NonKDEAppButton::NonKDEAppButton( const TDEConfigGroup& config, TQWidget* parent )
-  : PanelButton(parent, "NonKDEAppButton") // call our superclass's constructor
-{
-    // call the initialization method, this time with values from a config file
-    initialize(config.readEntry("Name"),
-               config.readEntry("Description"),
-               config.readPathEntry("Path"),
-               config.readEntry("Icon"),
-               config.readPathEntry("CommandLine"),
-               config.readBoolEntry("RunInTerminal"));
-
-    // see comment on connect in above constructor
-    connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()));
-}
-
-void NonKDEAppButton::initialize(const TQString& name,
-                                 const TQString& description,
-                                 const TQString& filePath, const TQString& icon,
-                                 const TQString &cmdLine, bool inTerm )
-{
-    // and now we actually set up most of the member variables with the
-    // values passed in here. by doing this all in an initialize() method
-    // we avoid duplicating this code all over the place
-    nameStr = name;
-    descStr = description;
-    pathStr = filePath;
-    iconStr = icon;
-    cmdStr = cmdLine;
-    term = inTerm;
-
-    // now we set the buttons tooltip, title and icon using the appropriate
-    // set*() methods from the PanelButton class from which we subclass
-
-    // assign the name or the description to a TQString called tooltip
-    TQString tooltip = description.isEmpty() ? nameStr : descStr;
-
-    if (tooltip.isEmpty())
-    {
-        // we had nothing, so let's try the path
-        tooltip = pathStr;
-
-        // and add the command if we have one.
-        if (!cmdStr.isEmpty())
-        {
-            tooltip += " " + cmdStr;
-        }
-
-        // set the title to the pathStr
-        setTitle(pathStr);
-    }
-    else
-    {
-        // since we have a name or a description (assigned by the user) let's
-        // use that as the title
-        setTitle(nameStr.isEmpty() ? descStr : nameStr);
-    }
-
-    // set the tooltip
-    TQToolTip::add(this, tooltip);
-
-    // set the icon
-    setIcon(iconStr);
-}
-
-void NonKDEAppButton::saveConfig( TDEConfigGroup& config ) const
-{
-    // this is called whenever we change something
-    // the config object sent in will already be set to the
-    // right group and file, so we can just start writing
-    config.writeEntry("Name", nameStr);
-    config.writeEntry("Description", descStr);
-    config.writeEntry("RunInTerminal", term);
-    config.writePathEntry("Path", pathStr);
-    config.writeEntry("Icon", iconStr);
-    config.writePathEntry("CommandLine", cmdStr);
-}
-
-void NonKDEAppButton::dragEnterEvent(TQDragEnterEvent *ev)
-{
-    // when something is dragged onto this button, we'll accept it
-    // if we aren't dragged onto ourselves, and if it's a URL
-    if ((ev->source() != this) && KURLDrag::canDecode(ev))
-    {
-        ev->accept(rect());
-    }
-    else
-    {
-        ev->ignore(rect());
-    }
-
-    // and now let the PanelButton do as it wishes with it...
-    PanelButton::dragEnterEvent(ev);
-}
-
-void NonKDEAppButton::dropEvent(TQDropEvent *ev)
-{
-    // something has been droped on us!
-    KURL::List fileList;
-    TQString execStr;
-    if (KURLDrag::decode(ev, fileList))
-    {
-        // according to KURLDrag, we've successfully retrieved
-        // one or more URLs! now we iterate over them one by
-        // one ....
-        for (KURL::List::ConstIterator it = fileList.begin();
-             it != fileList.end();
-             ++it)
-        {
-            const KURL &url(*it);
-            if (KDesktopFile::isDesktopFile(url.path()))
-            {
-                // this URL is actually a .desktop file, so let's grab
-                // the URL it actually points to ...
-                KDesktopFile deskFile(url.path());
-                deskFile.setDesktopGroup();
-
-                // ... and add it to the exec string
-                execStr += TDEProcess::quote(deskFile.readURL()) + " ";
-            }
-            else
-            {
-                // it's just a URL of some sort, add it directly to the exec
-                execStr += TDEProcess::quote(url.path()) + " ";
-            }
-        }
-
-        // and now run the command
-        runCommand(execStr);
-    }
-
-    // and let PanelButton clean up
-    PanelButton::dropEvent(ev);
-}
-
-void NonKDEAppButton::slotExec()
-{
-    // the button was clicked, let's take some action
-    runCommand();
 ** Diff limit reached (max: 250 lines) **