summaryrefslogtreecommitdiffstats
path: root/kjsembed
diff options
context:
space:
mode:
Diffstat (limited to 'kjsembed')
-rw-r--r--kjsembed/Makefile.am2
-rw-r--r--kjsembed/builtins/Makefile.am2
-rw-r--r--kjsembed/docs/ChangeLog2
-rw-r--r--kjsembed/docs/embedding/simple-embed/Makefile.am2
-rw-r--r--kjsembed/docs/examples/docviewer/docviewer.js2
-rw-r--r--kjsembed/docs/examples/imageinfo/example.html2
-rw-r--r--kjsembed/docs/examples/imageinfo/example2.htm2
-rw-r--r--kjsembed/docs/examples/imageinfo/thumbs.html2
-rw-r--r--kjsembed/kscript/Makefile.am2
-rw-r--r--kjsembed/plugin/Makefile.am2
-rw-r--r--kjsembed/plugins/Makefile.am10
11 files changed, 15 insertions, 15 deletions
diff --git a/kjsembed/Makefile.am b/kjsembed/Makefile.am
index a3bdb3bc..a87147a9 100644
--- a/kjsembed/Makefile.am
+++ b/kjsembed/Makefile.am
@@ -75,7 +75,7 @@ changes:
--stdout | grep -v 'CCMAIL' > docs/ChangeLog
srcdoc:
- $(kde_bindir)/kdoc -a -p -d classdocs -n 'KJSEmbed' *.h -lqt -lkdecore -lkdeui
+ $(kde_bindir)/kdoc -a -p -d classdocs -n 'KJSEmbed' *.h -lqt -ltdecore -ltdeui
srcdox:
doxygen -u Doxyfile
diff --git a/kjsembed/builtins/Makefile.am b/kjsembed/builtins/Makefile.am
index 0dd2516b..a16109b9 100644
--- a/kjsembed/builtins/Makefile.am
+++ b/kjsembed/builtins/Makefile.am
@@ -11,7 +11,7 @@ libkjsembedbuiltins_la_SOURCES = stdaction_imp.cpp \
qdir_imp.cpp \
qfile_imp.cpp
-libkjsembedbuiltins_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libkjsembedbuiltins_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
libkjsembedbuiltins_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) \
$(LIB_KFILE) -lkjs $(LIBSOCKET)
diff --git a/kjsembed/docs/ChangeLog b/kjsembed/docs/ChangeLog
index 95cedca2..c9af0f97 100644
--- a/kjsembed/docs/ChangeLog
+++ b/kjsembed/docs/ChangeLog
@@ -2742,7 +2742,7 @@
- Extended the code for dumping slots so the output includes the return type.
- - Added a debug area (80001) to the list in kdecore and changed all the debug
+ - Added a debug area (80001) to the list in tdecore and changed all the debug
messages to use it.
- Added the ability to tell the factory that particular class names are
diff --git a/kjsembed/docs/embedding/simple-embed/Makefile.am b/kjsembed/docs/embedding/simple-embed/Makefile.am
index b3f7afe7..f3757571 100644
--- a/kjsembed/docs/embedding/simple-embed/Makefile.am
+++ b/kjsembed/docs/embedding/simple-embed/Makefile.am
@@ -8,7 +8,7 @@ bin_PROGRAMS = embedjs
INCLUDES = -I$(top_srcdir) $(all_includes)
# the library search path.
-embedjs_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+embedjs_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
# the libraries to link against.
embedjs_LDADD = $(LIB_KFILE) $(LIB_KDEPRINT) -lkjs $(top_builddir)/kjsembed/libkjsembed.la
diff --git a/kjsembed/docs/examples/docviewer/docviewer.js b/kjsembed/docs/examples/docviewer/docviewer.js
index 56ccfa0e..3fed8a78 100644
--- a/kjsembed/docs/examples/docviewer/docviewer.js
+++ b/kjsembed/docs/examples/docviewer/docviewer.js
@@ -57,7 +57,7 @@ view.set_class = function( clazz )
if ( /^Q/.test(clazz) )
nm = 'http://doc.trolltech.com/3.2/' + clazz.toLowerCase() + '.html';
else if ( /^K/.test(clazz) )
- nm = 'http://developer.kde.org/documentation/library/cvs-api/kdeui/html/class' + clazz + '.html';
+ nm = 'http://developer.kde.org/documentation/library/cvs-api/tdeui/html/class' + clazz + '.html';
cppview.openURL( nm );
diff --git a/kjsembed/docs/examples/imageinfo/example.html b/kjsembed/docs/examples/imageinfo/example.html
index 82af5e0b..2f616027 100644
--- a/kjsembed/docs/examples/imageinfo/example.html
+++ b/kjsembed/docs/examples/imageinfo/example.html
@@ -21,7 +21,7 @@ include HTML markup <b>like</b> <i>this</i>, and even
<tr>
<td align="center"><a href="example2.png"><img border=0 width=217 height=160 src=thumb-example2.png></a></td>
<td width="60%" valign="top" align="justify"><b><a href="example2.png">example2.png</a></b> (340x250)<p>This image shows
-<a href="http://developer.kde.org/documentation/library/cvs-api/classref/kdeui/KPassivePopup.html">KPassivePopup</a>
+<a href="http://developer.kde.org/documentation/library/cvs-api/classref/tdeui/KPassivePopup.html">KPassivePopup</a>
telling a user they have new mail. The popup is adject to the source of the
message (in this example that is <a href="http://kmail.kde.org/">KMail</a>) and
<i>does not steal the focus</i>, or otherwise interfere with whatever the user is
diff --git a/kjsembed/docs/examples/imageinfo/example2.htm b/kjsembed/docs/examples/imageinfo/example2.htm
index 651048b3..16a84284 100644
--- a/kjsembed/docs/examples/imageinfo/example2.htm
+++ b/kjsembed/docs/examples/imageinfo/example2.htm
@@ -1,5 +1,5 @@
This image shows
-<a href="http://developer.kde.org/documentation/library/cvs-api/classref/kdeui/KPassivePopup.html">KPassivePopup</a>
+<a href="http://developer.kde.org/documentation/library/cvs-api/classref/tdeui/KPassivePopup.html">KPassivePopup</a>
telling a user they have new mail. The popup is adject to the source of the
message (in this example that is <a href="http://kmail.kde.org/">KMail</a>) and
<i>does not steal the focus</i>, or otherwise interfere with whatever the user is
diff --git a/kjsembed/docs/examples/imageinfo/thumbs.html b/kjsembed/docs/examples/imageinfo/thumbs.html
index 663246a0..dd8ae478 100644
--- a/kjsembed/docs/examples/imageinfo/thumbs.html
+++ b/kjsembed/docs/examples/imageinfo/thumbs.html
@@ -21,7 +21,7 @@ include HTML markup <b>like</b> <i>this</i>, and even
<tr>
<td align="center"><a href="example2.png"><img border=0 width=217 height=160 src="thumb-example2.png"></a></td>
<td width="60%" valign="top" align="justify"><b><a href="example2.png">example2.png</a></b> (340x250)<p>This image shows
-<a href="http://developer.kde.org/documentation/library/cvs-api/classref/kdeui/KPassivePopup.html">KPassivePopup</a>
+<a href="http://developer.kde.org/documentation/library/cvs-api/classref/tdeui/KPassivePopup.html">KPassivePopup</a>
telling a user they have new mail. The popup is adject to the source of the
message (in this example that is <a href="http://kmail.kde.org/">KMail</a>) and
<i>does not steal the focus</i>, or otherwise interfere with whatever the user is
diff --git a/kjsembed/kscript/Makefile.am b/kjsembed/kscript/Makefile.am
index f96195df..2efe1a79 100644
--- a/kjsembed/kscript/Makefile.am
+++ b/kjsembed/kscript/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir) -I$(top_srcdir) $(all_includes)
kde_module_LTLIBRARIES = libjavascript.la
libjavascript_la_SOURCES = javascript.cpp
-libjavascript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -no-undefined -avoid-version
+libjavascript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -no-undefined -avoid-version
libjavascript_la_LIBADD = -lkscript ../libkjsembed.la
diff --git a/kjsembed/plugin/Makefile.am b/kjsembed/plugin/Makefile.am
index 0c36bf20..1ccdb914 100644
--- a/kjsembed/plugin/Makefile.am
+++ b/kjsembed/plugin/Makefile.am
@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = libjsconsoleplugin.la
METASOURCES = AUTO
libjsconsoleplugin_la_SOURCES = jsconsoleplugin.cpp
-libjsconsoleplugin_la_LIBADD = -lDCOP -lkdecore -lkdeui -lkjs $(LIB_QT) $(LIB_KPARTS) ../libkjsembed.la
+libjsconsoleplugin_la_LIBADD = -lDCOP -ltdecore -ltdeui -lkjs $(LIB_QT) $(LIB_KPARTS) ../libkjsembed.la
libjsconsoleplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH)
#pluginsdir = $(kde_datadir)/konqueror/kpartplugins
diff --git a/kjsembed/plugins/Makefile.am b/kjsembed/plugins/Makefile.am
index ee697f4a..d7d3ce70 100644
--- a/kjsembed/plugins/Makefile.am
+++ b/kjsembed/plugins/Makefile.am
@@ -7,27 +7,27 @@ METASOURCES = AUTO
# the Plugin's source, library search path, and link libraries
libcustomobjectplugin_la_SOURCES = customobject_plugin.cpp
-libcustomobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx $(KDE_RPATH) $(all_libraries)
+libcustomobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
libcustomobjectplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_KFILE) ../libkjsembed.la
# the Plugin's source, library search path, and link libraries
libcustomqobjectplugin_la_SOURCES = customqobject_plugin.cpp
-libcustomqobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx $(KDE_RPATH) $(all_libraries)
+libcustomqobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
libcustomqobjectplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_KFILE) ../libkjsembed.la
# the Plugin's source, library search path, and link libraries
libimagefxplugin_la_SOURCES = imagefx_plugin.cpp
-libimagefxplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx $(KDE_RPATH) $(all_libraries)
+libimagefxplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
libimagefxplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_KFILE) ../libkjsembed.la
# the Plugin's source, library search path, and link libraries
libqprocessplugin_la_SOURCES = qprocess_plugin.cpp
-libqprocessplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx $(KDE_RPATH) $(all_libraries)
+libqprocessplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
libqprocessplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_KFILE) ../libkjsembed.la
# the Plugin's source, library search path, and link libraries
libfileitemplugin_la_SOURCES = kfileitemloader.cpp
-libfileitemplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx $(all_libraries)
+libfileitemplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(all_libraries)
libfileitemplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) ../libkjsembed.la