Rename a number of libraries and executables to avoid conflicts with KDE4

38 files changed, 45 insertions, 45 deletions

diff --git a/amarok/src/CMakeLists.txt b/amarok/src/CMakeLists.txt
index cb988ba4..3b0d94c8 100644
--- a/amarok/src/CMakeLists.txt
+++ b/amarok/src/CMakeLists.txt
@@ -104,7 +104,7 @@ tde_add_library( amarok SHARED AUTOMOC
     amarokcore-static magnatunebrowser-static analyzers-static plugin-static
     metadata-static statusbar-static
   LINK
-    khtml-shared knewstuff-shared
+    tdehtml-shared knewstuff-shared
     GL ${TAGLIB_LIBRARIES} ${SQLITE_LIBRARIES} pthread
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp
index 5e33e390..722ea234 100644
--- a/amarok/src/contextbrowser.cpp
+++ b/amarok/src/contextbrowser.cpp
@@ -3209,7 +3209,7 @@ void ContextBrowser::showScanning()
 TQString
 ContextBrowser::getEncodedImage( const TQString &imageUrl )
 {
-    // Embed cover image in html (encoded string), to get around khtml's caching
+    // Embed cover image in html (encoded string), to get around tdehtml's caching
     //debug() << "Encoding imageUrl: " << imageUrl << endl;
     tqApp->lock();
     const TQImage img( imageUrl, "PNG" );
diff --git a/amarok/src/covermanager.cpp b/amarok/src/covermanager.cpp
index af530a0c..84e65e16 100644
--- a/amarok/src/covermanager.cpp
+++ b/amarok/src/covermanager.cpp
@@ -42,7 +42,7 @@
 #include <klistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>    //showCoverMenu()
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 #include <kio/netaccess.h>
 #include <kpopupmenu.h>    //showCoverMenu()
 #include <kprogress.h>
diff --git a/amarok/src/engine/nmm/HostList.cpp b/amarok/src/engine/nmm/HostList.cpp
index 623f2852..869928db 100644
--- a/amarok/src/engine/nmm/HostList.cpp
+++ b/amarok/src/engine/nmm/HostList.cpp
@@ -4,7 +4,7 @@
  *                    NMM work group,
  *                    Computer Graphics Lab,
  *                    Saarland University, Germany
- *                    http://www.networkmultimedia.org
+ *                    http://www.networtdemultimedia.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/amarok/src/engine/nmm/HostList.h b/amarok/src/engine/nmm/HostList.h
index a1d76e12..8be1cb00 100644
--- a/amarok/src/engine/nmm/HostList.h
+++ b/amarok/src/engine/nmm/HostList.h
@@ -4,7 +4,7 @@
  *                    NMM work group,
  *                    Computer Graphics Lab,
  *                    Saarland University, Germany
- *                    http://www.networkmultimedia.org
+ *                    http://www.networtdemultimedia.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/amarok/src/engine/nmm/HostListItem.cpp b/amarok/src/engine/nmm/HostListItem.cpp
index f7a8e83a..efc516fd 100644
--- a/amarok/src/engine/nmm/HostListItem.cpp
+++ b/amarok/src/engine/nmm/HostListItem.cpp
@@ -4,7 +4,7 @@
  *                    NMM work group,
  *                    Computer Graphics Lab,
  *                    Saarland University, Germany
- *                    http://www.networkmultimedia.org
+ *                    http://www.networtdemultimedia.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -111,7 +111,7 @@ TQString HostListItem::prettyStatus( int error )
     st += i18n("An error appeared during video playback initialization. Make sure the <b>XDisplayNode</b> is present on your system. If it is present, the command <b>serverregistry -s</b> in a console will list <b>XDisplayNode</b> as <b>available</b>.<br/>");
 
   if( error )
-    st += i18n("In general have a look at the <a href=\"http://www.networkmultimedia.org/Download/Binary/index.html#configure\">Configuration and tests</a> instructions.");
+    st += i18n("In general have a look at the <a href=\"http://www.networtdemultimedia.org/Download/Binary/index.html#configure\">Configuration and tests</a> instructions.");
 
   st += "</body></html>";
   return st;
diff --git a/amarok/src/engine/nmm/HostListItem.h b/amarok/src/engine/nmm/HostListItem.h
index 2a3b649e..3181a93b 100644
--- a/amarok/src/engine/nmm/HostListItem.h
+++ b/amarok/src/engine/nmm/HostListItem.h
@@ -4,7 +4,7 @@
  *                    NMM work group,
  *                    Computer Graphics Lab,
  *                    Saarland University, Germany
- *                    http://www.networkmultimedia.org
+ *                    http://www.networtdemultimedia.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/amarok/src/engine/nmm/NmmLocation.cpp b/amarok/src/engine/nmm/NmmLocation.cpp
index 050dbe33..8a3dded1 100644
--- a/amarok/src/engine/nmm/NmmLocation.cpp
+++ b/amarok/src/engine/nmm/NmmLocation.cpp
@@ -4,7 +4,7 @@
  *                    NMM work group,
  *                    Computer Graphics Lab,
  *                    Saarland University, Germany
- *                    http://www.networkmultimedia.org
+ *                    http://www.networtdemultimedia.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/amarok/src/engine/nmm/NmmLocation.h b/amarok/src/engine/nmm/NmmLocation.h
index a1bc693d..242ad64e 100644
--- a/amarok/src/engine/nmm/NmmLocation.h
+++ b/amarok/src/engine/nmm/NmmLocation.h
@@ -4,7 +4,7 @@
  *                    NMM work group,
  *                    Computer Graphics Lab,
  *                    Saarland University, Germany
- *                    http://www.networkmultimedia.org
+ *                    http://www.networtdemultimedia.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/amarok/src/engine/nmm/ServerregistryPing.cpp b/amarok/src/engine/nmm/ServerregistryPing.cpp
index 8f025833..fdef69a4 100644
--- a/amarok/src/engine/nmm/ServerregistryPing.cpp
+++ b/amarok/src/engine/nmm/ServerregistryPing.cpp
@@ -4,7 +4,7 @@
  *                    NMM work group,
  *                    Computer Graphics Lab,
  *                    Saarland University, Germany
- *                    http://www.networkmultimedia.org
+ *                    http://www.networtdemultimedia.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/amarok/src/engine/nmm/ServerregistryPing.h b/amarok/src/engine/nmm/ServerregistryPing.h
index 312929c0..5a79aeb1 100644
--- a/amarok/src/engine/nmm/ServerregistryPing.h
+++ b/amarok/src/engine/nmm/ServerregistryPing.h
@@ -4,7 +4,7 @@
  *                    NMM work group,
  *                    Computer Graphics Lab,
  *                    Saarland University, Germany
- *                    http://www.networkmultimedia.org
+ *                    http://www.networtdemultimedia.org
  *
  * Maintainer:        Robert Gogolok <gogo@graphics.cs.uni-sb.de>
  *
diff --git a/amarok/src/engine/nmm/amarok_nmmengine_plugin.desktop b/amarok/src/engine/nmm/amarok_nmmengine_plugin.desktop
index 32c4b138..7f79d5db 100644
--- a/amarok/src/engine/nmm/amarok_nmmengine_plugin.desktop
+++ b/amarok/src/engine/nmm/amarok_nmmengine_plugin.desktop
@@ -113,7 +113,7 @@ ServiceTypes=Amarok/Plugin
 
 X-TDE-Amarok-plugintype=engine
 X-TDE-Amarok-name=nmm-engine
-X-TDE-Amarok-authors=NMM work group http://www.networkmultimedia.org
+X-TDE-Amarok-authors=NMM work group http://www.networtdemultimedia.org
 X-TDE-Amarok-email=nmm-dev@graphics.cs.uni-sb.de
 X-TDE-Amarok-rank=50
 X-TDE-Amarok-version=1
diff --git a/amarok/src/engine/nmm/nmm_configdialog.cpp b/amarok/src/engine/nmm/nmm_configdialog.cpp
index 712e98ea..eba9db0c 100644
--- a/amarok/src/engine/nmm/nmm_configdialog.cpp
+++ b/amarok/src/engine/nmm/nmm_configdialog.cpp
@@ -4,7 +4,7 @@
  *                    NMM work group,
  *                    Computer Graphics Lab,
  *                    Saarland University, Germany
- *                    http://www.networkmultimedia.org
+ *                    http://www.networtdemultimedia.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/amarok/src/engine/nmm/nmm_configdialog.h b/amarok/src/engine/nmm/nmm_configdialog.h
index 292046de..8cd00e7b 100644
--- a/amarok/src/engine/nmm/nmm_configdialog.h
+++ b/amarok/src/engine/nmm/nmm_configdialog.h
@@ -4,7 +4,7 @@
  *                    NMM work group,
  *                    Computer Graphics Lab,
  *                    Saarland University, Germany
- *                    http://www.networkmultimedia.org
+ *                    http://www.networtdemultimedia.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/amarok/src/engine/nmm/nmm_engine.cpp b/amarok/src/engine/nmm/nmm_engine.cpp
index f370974a..77639658 100644
--- a/amarok/src/engine/nmm/nmm_engine.cpp
+++ b/amarok/src/engine/nmm/nmm_engine.cpp
@@ -4,7 +4,7 @@
  *                    NMM work group,
  *                    Computer Graphics Lab,
  *                    Saarland University, Germany
- *                    http://www.networkmultimedia.org
+ *                    http://www.networtdemultimedia.org
  *
  * Maintainer:        Robert Gogolok <gogo@graphics.cs.uni-sb.de>
  *
@@ -142,7 +142,7 @@ void NmmEngine::checkSecurity()
   if( !writepaths_set )
     str += "<b>allowedwritepaths option is not set</b>. NMM plugins are therefore allowed to write every file or directory the process running NMM is allowed.<br/>";
 
-  str += "<br/>See <a href=\"http://www.networkmultimedia.org/Download/\">http://www.networkmultimedia.org/Download/</a> for general security instructions in the correspoding <i>configure and test NMM</i> section depending on your chosen installation method.";
+  str += "<br/>See <a href=\"http://www.networtdemultimedia.org/Download/\">http://www.networtdemultimedia.org/Download/</a> for general security instructions in the correspoding <i>configure and test NMM</i> section depending on your chosen installation method.";
   str += "</body></html>";
 
   if( !writepaths_set || !readpaths_set )
diff --git a/amarok/src/engine/nmm/nmm_engine.h b/amarok/src/engine/nmm/nmm_engine.h
index 43630cb4..0095c731 100644
--- a/amarok/src/engine/nmm/nmm_engine.h
+++ b/amarok/src/engine/nmm/nmm_engine.h
@@ -4,7 +4,7 @@
  *                    NMM work group,
  *                    Computer Graphics Lab,
  *                    Saarland University, Germany
- *                    http://www.networkmultimedia.org
+ *                    http://www.networtdemultimedia.org
  *
  * Maintainer:        Robert Gogolok <gogo@graphics.cs.uni-sb.de>
  *
diff --git a/amarok/src/htmlview.h b/amarok/src/htmlview.h
index 175992e3..32592e2d 100644
--- a/amarok/src/htmlview.h
+++ b/amarok/src/htmlview.h
@@ -6,9 +6,9 @@
 #ifndef AMAROK_HTMLVIEW_H
 #define AMAROK_HTMLVIEW_H
 
-#include <khtml_events.h>
-#include <khtml_part.h>
-#include <khtmlview.h>
+#include <tdehtml_events.h>
+#include <tdehtml_part.h>
+#include <tdehtmlview.h>
 
 class KAction;
 class KTempFile;
diff --git a/amarok/src/iconloader.cpp b/amarok/src/iconloader.cpp
index 4a8a1e46..ae6e641c 100644
--- a/amarok/src/iconloader.cpp
+++ b/amarok/src/iconloader.cpp
@@ -47,7 +47,7 @@ Amarok::icon( const TQString& name ) //declared in amarok.h
         iconMap["configure"]            = "configure";
         iconMap["covermanager"]         = "covermanager";
         iconMap["device"]               = "usbpendrive_unmount";
-        iconMap["download"]             = "khtml_kget";
+        iconMap["download"]             = "tdehtml_kget";
         iconMap["dynamic"]              = "dynamic";
         iconMap["edit"]                 = "edit";
         iconMap["editcopy"]             = "editcopy";
diff --git a/amarok/src/konquisidebar/CMakeLists.txt b/amarok/src/konquisidebar/CMakeLists.txt
index 782d2511..c819b7fb 100644
--- a/amarok/src/konquisidebar/CMakeLists.txt
+++ b/amarok/src/konquisidebar/CMakeLists.txt
@@ -35,6 +35,6 @@ tde_add_kpart( konqsidebar_universalamarok AUTOMOC
   SOURCES
     universalamarok.cpp
     ${CMAKE_SOURCE_DIR}/amarok/src/amarokcore/amarokdcopiface.stub
-  LINK konqsidebarplugin-shared khtml-shared
+  LINK konqsidebarplugin-shared tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/amarok/src/konquisidebar/universalamarok.cpp b/amarok/src/konquisidebar/universalamarok.cpp
index f9da34ee..c24beb8f 100644
--- a/amarok/src/konquisidebar/universalamarok.cpp
+++ b/amarok/src/konquisidebar/universalamarok.cpp
@@ -42,7 +42,7 @@
 #include <tqslider.h>
 #include <kdebug.h>
 #include <kurldrag.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 
 #define HTML_FILE TDEGlobal::dirs()->saveLocation( "data", "amarok/", true ) + "contextbrowser.html"
 
diff --git a/amarok/src/konquisidebar/universalamarok.h b/amarok/src/konquisidebar/universalamarok.h
index 327d1e2a..f96b1de5 100644
--- a/amarok/src/konquisidebar/universalamarok.h
+++ b/amarok/src/konquisidebar/universalamarok.h
@@ -20,12 +20,12 @@
 #ifndef KONQUERORSIDEBAR_H
 #define KONQUERORSIDEBAR_H
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <konqsidebarplugin.h>
 #include <dcopclient.h>
 #include <tqslider.h>
 #include <tqvbox.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <kurl.h>
 #include "amarokdcopiface_stub.h"
 
diff --git a/amarok/src/loader/Makefile.am b/amarok/src/loader/Makefile.am
index 4af3024c..e85e0fd8 100644
--- a/amarok/src/loader/Makefile.am
+++ b/amarok/src/loader/Makefile.am
@@ -10,7 +10,7 @@ amarok_LDADD = \
         $(LIB_QT) \
         $(LIB_TDEUI)
 
-amarok_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+amarok_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 METASOURCES = AUTO
 
diff --git a/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp b/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp
index c2ec0da5..4465fa9a 100644
--- a/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp
+++ b/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp
@@ -21,7 +21,7 @@
 #include "magnatuneartistinfobox.h"
 #include "magnatunedatabasehandler.h"
 
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 
 #include <tqfile.h>
 
diff --git a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
index 7eddc818..f1f87ed3 100644
--- a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
+++ b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
@@ -24,7 +24,7 @@
 #include "magnatunetypes.h"
 #include "statusbar.h"
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kio/jobclasses.h>
 #include <kio/job.h>
 
diff --git a/amarok/src/mediabrowser.cpp b/amarok/src/mediabrowser.cpp
index 71f57406..f852cb73 100644
--- a/amarok/src/mediabrowser.cpp
+++ b/amarok/src/mediabrowser.cpp
@@ -67,7 +67,7 @@
 #include <kio/job.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 #include <kpopupmenu.h>
 #include <kprocess.h>
 #include <kprogress.h>
diff --git a/amarok/src/mediadevice/daap/CMakeLists.txt b/amarok/src/mediadevice/daap/CMakeLists.txt
index d3d510ff..b18ab771 100644
--- a/amarok/src/mediadevice/daap/CMakeLists.txt
+++ b/amarok/src/mediadevice/daap/CMakeLists.txt
@@ -51,7 +51,7 @@ install( FILES
 tde_add_kpart( libamarok_daap-mediadevice AUTOMOC
   SOURCES
     addhostbase.ui daapclient.cpp daapserver.cpp proxy.cpp
-  LINK daapreader-static amarok-shared kdnssd-shared
+  LINK daapreader-static amarok-shared tdednssd-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
   DEPENDENCIES amarokcore-static
 )
diff --git a/amarok/src/mediadevice/daap/daapreader/Makefile.am b/amarok/src/mediadevice/daap/daapreader/Makefile.am
index cb5505c0..c7ef3088 100644
--- a/amarok/src/mediadevice/daap/daapreader/Makefile.am
+++ b/amarok/src/mediadevice/daap/daapreader/Makefile.am
@@ -12,7 +12,7 @@ libdaapreader_la_LIBADD = \
         $(LIB_TDEUI) \
         $(top_builddir)/amarok/src/mediadevice/daap/daapreader/authentication/libauthentication.la
 
-libdaapreader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libdaapreader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 METASOURCES = AUTO
 
diff --git a/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am b/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am
index 69042168..f1346d1d 100644
--- a/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am
+++ b/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am
@@ -15,7 +15,7 @@ libauthentication_la_LIBADD = \
         $(LIB_TDECORE) \
         $(LIB_TDEUI)
 
-libauthentication_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libauthentication_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 METASOURCES = AUTO
 
diff --git a/amarok/src/multitabbar.cpp b/amarok/src/multitabbar.cpp
index 452b3e95..8a0c7a41 100644
--- a/amarok/src/multitabbar.cpp
+++ b/amarok/src/multitabbar.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                       kmultitabbar.cpp -  description
+                       tdemultitabbar.cpp -  description
                            -------------------
    begin                :  2001
    copyright            : (C) 2001,2002,2003 by Joseph Wenninger <jowenn@kde.org>
diff --git a/amarok/src/multitabbar.h b/amarok/src/multitabbar.h
index 8e43a069..c03516f6 100644
--- a/amarok/src/multitabbar.h
+++ b/amarok/src/multitabbar.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                       kmultitabbar.h -  description
+                       tdemultitabbar.h -  description
                            -------------------
    begin                :  2001
    copyright            : (C) 2001,2002,2003 by Joseph Wenninger <jowenn@kde.org>
diff --git a/amarok/src/multitabbar_p.h b/amarok/src/multitabbar_p.h
index 0d0a0ca1..f12308ff 100644
--- a/amarok/src/multitabbar_p.h
+++ b/amarok/src/multitabbar_p.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                        kmultitabbar_p.h -  description
+                        tdemultitabbar_p.h -  description
                             -------------------
     begin                :  2003
     copyright            : (C) 2003 by Joseph Wenninger <jowenn@kde.org>
diff --git a/amarok/src/playlistbrowser.cpp b/amarok/src/playlistbrowser.cpp
index dbefffab..189b72a2 100644
--- a/amarok/src/playlistbrowser.cpp
+++ b/amarok/src/playlistbrowser.cpp
@@ -53,7 +53,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>       //renamePlaylist(), deleteSelectedPlaylist()
 #include <kmimetype.h>
-#include <kmultipledrag.h>     //dragObject()
+#include <tdemultipledrag.h>     //dragObject()
 #include <kpopupmenu.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>     //TDEGlobal::dirs()
diff --git a/amarok/src/playlistwindow.cpp b/amarok/src/playlistwindow.cpp
index f551d04c..03cfc187 100644
--- a/amarok/src/playlistwindow.cpp
+++ b/amarok/src/playlistwindow.cpp
@@ -59,7 +59,7 @@
 #include <kapplication.h>     //kapp
 #include <kfiledialog.h>      //savePlaylist(), openPlaylist()
 #include <kglobal.h>
-#include <khtml_part.h>       //Welcome Tab
+#include <tdehtml_part.h>       //Welcome Tab
 #include <kiconloader.h>      //ClearFilter button
 #include <kinputdialog.h>     //slotAddStream()
 #include <klocale.h>
diff --git a/amarok/src/scriptmanager.cpp b/amarok/src/scriptmanager.cpp
index 30fcc75f..0eec0a4e 100644
--- a/amarok/src/scriptmanager.cpp
+++ b/amarok/src/scriptmanager.cpp
@@ -415,8 +415,8 @@ ScriptManager::slotInstallScript( const TQString& path )
 
     if( path.isNull() ) {
         _path = KFileDialog::getOpenFileName( TQString(),
-            "*.amarokscript.tar *.amarokscript.tar.bz2 *.amarokscript.tar.gz|"
-            + i18n( "Script Packages (*.amarokscript.tar, *.amarokscript.tar.bz2, *.amarokscript.tar.gz)" )
+            "*.amarotdescript.tar *.amarotdescript.tar.bz2 *.amarotdescript.tar.gz|"
+            + i18n( "Script Packages (*.amarotdescript.tar, *.amarotdescript.tar.bz2, *.amarotdescript.tar.gz)" )
             , this
             , i18n( "Select Script Package" ) );
         if( _path.isNull() ) return false;
@@ -501,7 +501,7 @@ ScriptManager::slotRetrieveScript()
     // you have to do this by hand when providing your own Engine
     KNS::ProviderLoader *p = new KNS::ProviderLoader( this );
     TQObject::connect( p, TQT_SIGNAL( providersLoaded(Provider::List*) ), d, TQT_SLOT( slotProviders (Provider::List *) ) );
-    p->load( "amarok/script", "http://amarok.kde.org/knewstuff/amarokscripts-providers.xml" );
+    p->load( "amarok/script", "http://amarok.kde.org/knewstuff/amarotdescripts-providers.xml" );
 
     d->exec();
 }
diff --git a/amarok/src/scripts/graphequalizer/Makefile.am b/amarok/src/scripts/graphequalizer/Makefile.am
index d57ab92b..3b5b878e 100644
--- a/amarok/src/scripts/graphequalizer/Makefile.am
+++ b/amarok/src/scripts/graphequalizer/Makefile.am
@@ -21,7 +21,7 @@ graphequalizer_LDADD = \
         $(LIB_TDEUI) \
         $(LIB_TDECORE)
 
-graphequalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+graphequalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 METASOURCES = AUTO
 
diff --git a/amarok/src/statistics.cpp b/amarok/src/statistics.cpp
index 8ea04d0b..fefcf72c 100644
--- a/amarok/src/statistics.cpp
+++ b/amarok/src/statistics.cpp
@@ -24,7 +24,7 @@
 #include <tdeversion.h>        //TDE_VERSION ifndefs.  Remove this once we reach a kde 4 dep
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kmultipledrag.h>     //startDrag()
+#include <tdemultipledrag.h>     //startDrag()
 #include <kpopupmenu.h>
 #include <kstringhandler.h>    //paintCell
 #include <ktoolbarbutton.h>    //ctor
diff --git a/amarok/src/tagdialog.cpp b/amarok/src/tagdialog.cpp
index 85ff3d74..39ea2860 100644
--- a/amarok/src/tagdialog.cpp
+++ b/amarok/src/tagdialog.cpp
@@ -35,7 +35,7 @@
 #include <kcombobox.h>
 #include <kcursor.h>
 #include <kglobal.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <kiconloader.h>
 #include <ktabwidget.h>
 #include <ktextedit.h>
diff --git a/amarok/src/tagdialog.h b/amarok/src/tagdialog.h
index 7cd9cfe5..81255955 100644
--- a/amarok/src/tagdialog.h
+++ b/amarok/src/tagdialog.h
@@ -20,7 +20,7 @@
 #include <tqmap.h>
 #include <tqptrlist.h>
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 
 
 class PlaylistItem;