diff options
| -rw-r--r-- | acinclude.m4 | 26 | ||||
| -rw-r--r-- | ksquirrel/ksquirrel.cpp | 2 | ||||
| -rw-r--r-- | ksquirrel/ksquirrelpart/ksquirrelpart.cpp | 4 | ||||
| -rw-r--r-- | ksquirrel/ksquirrelpart/ksquirrelpart.h | 2 | ||||
| -rw-r--r-- | ksquirrel/sidebar/sq_multibar.cpp | 2 | ||||
| -rw-r--r-- | ksquirrel/sidebar/sq_previewwidget.cpp | 2 | ||||
| -rw-r--r-- | ksquirrel/sq_dragprovider.cpp | 2 | ||||
| -rw-r--r-- | ksquirrel/sq_selectdeselectgroup.ui.h | 2 |
8 files changed, 21 insertions, 21 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 4b73fe2..752b7aa 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KABC, "-lkabc") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_KUTILS, "-lkutils") + AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") - AC_SUBST(LIB_KIMPROXY, "-lkimproxy") + AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-lkdnssd") - AC_SUBST(LIB_KUNITTEST, "-lkunittest") + AC_SUBST(LIB_KDNSSD, "-ltdednssd") + AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KFILE, "-lkio") @@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-lkio") - AC_SUBST(LIB_KSYCOCA, "-lksycoca") + AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") @@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir) test "x$jpeg_incdir" = xNO && jpeg_incdir= dnl if headers _and_ libraries are missing, this is no error, and we -dnl continue with a warning (the user will get no jpeg support in khtml) +dnl continue with a warning (the user will get no jpeg support in tdehtml) dnl if only one is missing, it means a configuration error, but we still dnl only warn if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then @@ -3490,7 +3490,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" AC_SUBST(KDE_PLUGIN) -# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. +# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs. KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" AC_SUBST(KDE_CHECK_PLUGIN) diff --git a/ksquirrel/ksquirrel.cpp b/ksquirrel/ksquirrel.cpp index 67ff6bd..0c913a5 100644 --- a/ksquirrel/ksquirrel.cpp +++ b/ksquirrel/ksquirrel.cpp @@ -57,7 +57,7 @@ #include <kanimwidget.h> #include <kglobalsettings.h> #include <kactioncollection.h> -#include <kmultitabbar.h> +#include <tdemultitabbar.h> #include <kurlcompletion.h> #include <konq_pixmapprovider.h> #include <kio/job.h> diff --git a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp index 05adf9e..bf77ee1 100644 --- a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp +++ b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp @@ -16,8 +16,8 @@ ***************************************************************************/ #include <kaction.h> -#include <kparts/browserextension.h> -#include <kparts/genericfactory.h> +#include <tdeparts/browserextension.h> +#include <tdeparts/genericfactory.h> #include <kfileitem.h> #include <kglobal.h> #include <klocale.h> diff --git a/ksquirrel/ksquirrelpart/ksquirrelpart.h b/ksquirrel/ksquirrelpart/ksquirrelpart.h index 408955d..2ed903b 100644 --- a/ksquirrel/ksquirrelpart/ksquirrelpart.h +++ b/ksquirrel/ksquirrelpart/ksquirrelpart.h @@ -18,7 +18,7 @@ #ifndef KSQUIRRELPART_H #define KSQUIRRELPART_H -#include <kparts/part.h> +#include <tdeparts/part.h> class TDEAboutData; class KToggleAction; diff --git a/ksquirrel/sidebar/sq_multibar.cpp b/ksquirrel/sidebar/sq_multibar.cpp index 87a86c8..b932fa7 100644 --- a/ksquirrel/sidebar/sq_multibar.cpp +++ b/ksquirrel/sidebar/sq_multibar.cpp @@ -23,7 +23,7 @@ #include <tqsignalmapper.h> #include <tqsplitter.h> -#include <kmultitabbar.h> +#include <tdemultitabbar.h> #include <kglobal.h> #include <kiconloader.h> diff --git a/ksquirrel/sidebar/sq_previewwidget.cpp b/ksquirrel/sidebar/sq_previewwidget.cpp index 3da90dd..5d905dc 100644 --- a/ksquirrel/sidebar/sq_previewwidget.cpp +++ b/ksquirrel/sidebar/sq_previewwidget.cpp @@ -70,7 +70,7 @@ SQ_PreviewWidget::SQ_PreviewWidget(TQWidget *parent, const char *name) popup->insertSeparator(); popup->insertItem(i18n("Execute")+"\tEnter", TQT_TQOBJECT(this), TQT_SIGNAL(execute())); - multi_pix = SQ_IconLoader::instance()->loadIcon("kmultiple", KIcon::Desktop, KIcon::SizeSmall); + multi_pix = SQ_IconLoader::instance()->loadIcon("tdemultiple", KIcon::Desktop, KIcon::SizeSmall); setMinimumHeight(20); setFocusPolicy(TQ_WheelFocus); diff --git a/ksquirrel/sq_dragprovider.cpp b/ksquirrel/sq_dragprovider.cpp index 8e93652..84fa83d 100644 --- a/ksquirrel/sq_dragprovider.cpp +++ b/ksquirrel/sq_dragprovider.cpp @@ -122,7 +122,7 @@ void SQ_DragProvider::start() TQPixmap dragIcon; if(urls.count() > 1) - dragIcon = SQ_IconLoader::instance()->loadIcon("kmultiple", KIcon::Desktop, KIcon::SizeSmall); + dragIcon = SQ_IconLoader::instance()->loadIcon("tdemultiple", KIcon::Desktop, KIcon::SizeSmall); else dragIcon = first->pixmap(KIcon::SizeSmall); diff --git a/ksquirrel/sq_selectdeselectgroup.ui.h b/ksquirrel/sq_selectdeselectgroup.ui.h index 740f31b..6057ebe 100644 --- a/ksquirrel/sq_selectdeselectgroup.ui.h +++ b/ksquirrel/sq_selectdeselectgroup.ui.h @@ -13,7 +13,7 @@ #ifdef SQ_HAVE_KREGEXP #include <kregexpeditorinterface.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <ktrader.h> #endif |