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

17 files changed, 20 insertions, 20 deletions

diff --git a/kjsembed/bindings/Makefile.am b/kjsembed/bindings/Makefile.am
index cc7cac22..1aa5ce49 100644
--- a/kjsembed/bindings/Makefile.am
+++ b/kjsembed/bindings/Makefile.am
@@ -9,7 +9,7 @@ libkjsembedbindings_la_SOURCES =	image_imp.cpp \
 					painter_imp.cpp \
 					pixmap_imp.cpp \
 					netaccess_imp.cpp \
-					kconfig_imp.cpp \
+					tdeconfig_imp.cpp \
 					bindingobject.cpp \
 					movie_imp.cpp \
 					sql_imp.cpp \
diff --git a/kjsembed/bindings/bindings.pro b/kjsembed/bindings/bindings.pro
index d83d3ba5..6cb7b23d 100644
--- a/kjsembed/bindings/bindings.pro
+++ b/kjsembed/bindings/bindings.pro
@@ -15,7 +15,7 @@ HEADERS += bindingobject.h \
            pen_imp.h \
            pixmap_imp.h \
            sql_imp.h \
-           kconfig_imp.h \
+           tdeconfig_imp.h \
 	   point_imp.h \
 	   rect_imp.h \
 	   size_imp.h
@@ -29,7 +29,7 @@ SOURCES += bindingobject.cpp \
            pen_imp.cpp \
            pixmap_imp.cpp \
            sql_imp.cpp \
-           kconfig_imp.cpp \
+           tdeconfig_imp.cpp \
 	   point_imp.cpp \
 	   rect_imp.cpp \
 	   size_imp.cpp
diff --git a/kjsembed/bindings/dcop_imp.cpp b/kjsembed/bindings/dcop_imp.cpp
index 9dfaf4be..27c4ad22 100644
--- a/kjsembed/bindings/dcop_imp.cpp
+++ b/kjsembed/bindings/dcop_imp.cpp
@@ -605,7 +605,7 @@ TQString JSDCOPClient::dcopStart( const TQString &appName, const TQStringList& a
 	TQDataStream arg(data, IO_WriteOnly);
 	arg << appName << args;
 
-	if ( !kapp->dcopClient()->call( "klauncher", "klauncher", startFunction.latin1(),  data, replyType, replyData) )
+	if ( !kapp->dcopClient()->call( "tdelauncher", "tdelauncher", startFunction.latin1(),  data, replyType, replyData) )
 	{
 		kdWarning() << "Error: Dcop call failed" << endl;
 	}
diff --git a/kjsembed/bindings/netaccess_imp.cpp b/kjsembed/bindings/netaccess_imp.cpp
index 0ffbc12c..91dcf708 100644
--- a/kjsembed/bindings/netaccess_imp.cpp
+++ b/kjsembed/bindings/netaccess_imp.cpp
@@ -21,7 +21,7 @@
  */
 #include "netaccess_imp.h"
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kpropertiesdialog.h>
 
 #include <kurl.h>
diff --git a/kjsembed/bindings/kconfig_imp.cpp b/kjsembed/bindings/tdeconfig_imp.cpp
index 73ca58ed..e4fe3211 100644
--- a/kjsembed/bindings/kconfig_imp.cpp
+++ b/kjsembed/bindings/tdeconfig_imp.cpp
@@ -17,15 +17,15 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include "kconfig_imp.h"
+#include "tdeconfig_imp.h"
 
 #include <kjsembed/global.h>
 
 #ifndef QT_ONLY
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstddirs.h>
 #include <kapplication.h>
-#include "kconfig_imp.moc"
+#include "tdeconfig_imp.moc"
 #else
 #include <tqsettings.h>
 #endif
diff --git a/kjsembed/bindings/kconfig_imp.h b/kjsembed/bindings/tdeconfig_imp.h
index 75bf3bfd..75bf3bfd 100644
--- a/kjsembed/bindings/kconfig_imp.h
+++ b/kjsembed/bindings/tdeconfig_imp.h
diff --git a/kjsembed/builtins/stddialog_imp.cpp b/kjsembed/builtins/stddialog_imp.cpp
index 24c973b0..56c9919c 100644
--- a/kjsembed/builtins/stddialog_imp.cpp
+++ b/kjsembed/builtins/stddialog_imp.cpp
@@ -20,7 +20,7 @@
 #ifndef QT_ONLY
 
 #include <kcolordialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kpropertiesdialog.h>
 
 #else
diff --git a/kjsembed/docs/ChangeLog b/kjsembed/docs/ChangeLog
index 4b14af71..1fb28d23 100644
--- a/kjsembed/docs/ChangeLog
+++ b/kjsembed/docs/ChangeLog
@@ -328,7 +328,7 @@
 
 2004-11-30 Tuesday 17:47  geiseri
 
-	test kconfig more robustly.
+	test tdeconfig more robustly.
 
 2004-11-30 Tuesday 12:02  geiseri
 
diff --git a/kjsembed/docs/embedding/simple-embed/README b/kjsembed/docs/embedding/simple-embed/README
index 12f9642b..4d07166c 100644
--- a/kjsembed/docs/embedding/simple-embed/README
+++ b/kjsembed/docs/embedding/simple-embed/README
@@ -46,7 +46,7 @@ http://developer.kde.org/documentation/tutorials/xmlui/preface.html
 them more maintainable.
 
 For more details, consult :
-http://developer.kde.org/documentation/tutorials/kconfigxt/kconfigxt.html
+http://developer.kde.org/documentation/tutorials/tdeconfigxt/tdeconfigxt.html
 
 * With KParts, you can embed other kde components in your program, or make your program
 embeddable in other apps. For example, the kmplayer kpart can be called to play videos
diff --git a/kjsembed/docs/examples/imunge/imunge.js b/kjsembed/docs/examples/imunge/imunge.js
index 6f75cbf1..137cb272 100755
--- a/kjsembed/docs/examples/imunge/imunge.js
+++ b/kjsembed/docs/examples/imunge/imunge.js
@@ -92,7 +92,7 @@ mw.openFile = function()
     if ( filename.length > 0 ) {
 	this.load( filename );
 	openrecent_action.addURL( filename );
-	openrecent_action.saveEntries( System.KJSConfig.kconfig(), 'test' );
+	openrecent_action.saveEntries( System.KJSConfig.tdeconfig(), 'test' );
 	System.KJSConfig.sync();
     }
 }
@@ -117,7 +117,7 @@ mw.saveFileAs = function()
 	    sb.message( filename );
 	    this.imgfile = filename;
 	    openrecent_action.addURL( filename );
-	    openrecent_action.saveEntries( System.KJSConfig.kconfig(), 'test' );
+	    openrecent_action.saveEntries( System.KJSConfig.tdeconfig(), 'test' );
 	    System.KJSConfig.sync();
 	}
     }
@@ -154,7 +154,7 @@ mw.setup_actions = function()
 
     openrecent_action = StdAction.openRecent( null, '', ac );
     openrecent_action.connect( openrecent_action, 'urlSelected(const KURL&)', this, 'load' );
-    openrecent_action.loadEntries( System.KJSConfig.kconfig(), 'test' );
+    openrecent_action.loadEntries( System.KJSConfig.tdeconfig(), 'test' );
 
     save_action = StdAction.save( null, '', ac );
     save_action.connect( save_action, 'activated()', this, 'saveFile' );
diff --git a/kjsembed/jsbuiltin.cpp b/kjsembed/jsbuiltin.cpp
index 04680116..50e16f40 100644
--- a/kjsembed/jsbuiltin.cpp
+++ b/kjsembed/jsbuiltin.cpp
@@ -28,7 +28,7 @@
 #include "builtins/resources.h"
 #endif // QT_ONLY
 
-#include "bindings/kconfig_imp.h"
+#include "bindings/tdeconfig_imp.h"
 
 #include "jsfactory_imp.h"
 #include "jsbuiltinproxy.h"
diff --git a/kjsembed/jsfactory.cpp b/kjsembed/jsfactory.cpp
index d5be63a9..f8c36d75 100644
--- a/kjsembed/jsfactory.cpp
+++ b/kjsembed/jsfactory.cpp
@@ -113,7 +113,7 @@
 #include "bindings/painter_imp.h"
 #include "bindings/movie_imp.h"
 #include "bindings/sql_imp.h"
-#include "bindings/kconfig_imp.h"
+#include "bindings/tdeconfig_imp.h"
 #include "bindings/brush_imp.h"
 #include "bindings/size_imp.h"
 #include "bindings/rect_imp.h"
diff --git a/kjsembed/plugins/Makefile.am b/kjsembed/plugins/Makefile.am
index 5468d792..3f1e4fab 100644
--- a/kjsembed/plugins/Makefile.am
+++ b/kjsembed/plugins/Makefile.am
@@ -26,12 +26,12 @@ libqprocessplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT)
 libqprocessplugin_la_LIBADD  = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_KFILE) ../libkjsembed.la
 
 # the Plugin's source, library search path, and link libraries
-libfileitemplugin_la_SOURCES = kfileitemloader.cpp
+libfileitemplugin_la_SOURCES = tdefileitemloader.cpp
 libfileitemplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(all_libraries)
 libfileitemplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) ../libkjsembed.la
 
 
 # this is where the desktop file will go
 plugindesktopdir   = $(kde_servicesdir)
-plugindesktop_DATA = imagefx_plugin.desktop qprocess_plugin.desktop kfileitem_plugin.desktop
+plugindesktop_DATA = imagefx_plugin.desktop qprocess_plugin.desktop tdefileitem_plugin.desktop
 noinst_DATA = customobject_plugin.desktop customqobject_plugin.desktop
diff --git a/kjsembed/plugins/kfileitem_plugin.desktop b/kjsembed/plugins/tdefileitem_plugin.desktop
index f5f91552..f5f91552 100644
--- a/kjsembed/plugins/kfileitem_plugin.desktop
+++ b/kjsembed/plugins/tdefileitem_plugin.desktop
diff --git a/kjsembed/plugins/kfileitemloader.cpp b/kjsembed/plugins/tdefileitemloader.cpp
index e3fcdb7f..6ab7cc45 100644
--- a/kjsembed/plugins/kfileitemloader.cpp
+++ b/kjsembed/plugins/tdefileitemloader.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#include "kfileitemloader.h"
+#include "tdefileitemloader.h"
 
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
@@ -25,7 +25,7 @@
 #include <kjsembed/jsfactory_imp.h>
 #include <kjsembed/kjsembedpart.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdebug.h>
 
 namespace KJSEmbed {
diff --git a/kjsembed/plugins/kfileitemloader.h b/kjsembed/plugins/tdefileitemloader.h
index 384379f3..384379f3 100644
--- a/kjsembed/plugins/kfileitemloader.h
+++ b/kjsembed/plugins/tdefileitemloader.h
diff --git a/kjsembed/tests/test_kconfig.js b/kjsembed/tests/test_tdeconfig.js
index 519f13fb..519f13fb 100755
--- a/kjsembed/tests/test_kconfig.js
+++ b/kjsembed/tests/test_tdeconfig.js