summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-06 02:18:17 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-06 02:18:17 -0600
commite24d7c79a93eaa9f6cc3e2e6a881eab32d0cd151 (patch)
tree0736e2f690caf1f96bf3e50bf15ff861dbe02293
parente085a7affa63047c1b9b9f94dd032f439433eb39 (diff)
downloadgwenview-e24d7c79a93eaa9f6cc3e2e6a881eab32d0cd151.tar.gz
gwenview-e24d7c79a93eaa9f6cc3e2e6a881eab32d0cd151.zip
Additional kde to tde renaming
-rw-r--r--acinclude.m426
-rw-r--r--configure.in2
-rw-r--r--configure.in.in2
-rw-r--r--src/app/Makefile.am2
-rw-r--r--src/gvcore/printdialog.h2
5 files changed, 17 insertions, 17 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 48e5d70..a41853c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -371,7 +371,7 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
fi
AC_MSG_CHECKING([for KDE libraries installed])
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes)
@@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir)
AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir)
AC_SUBST(kde_moduledir)
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
+AC_SUBST(tdeinitdir, '$(kde_moduledir)')
AC_SUBST(kde_styledir)
AC_SUBST(kde_widgetdir)
if test "$kde_qtver" = 1; then
@@ -2055,12 +2055,12 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
if test $kde_qtver = 3; then
case $host in
- *cygwin*) lib_kded="-lkdeinit_kded" ;;
+ *cygwin*) lib_kded="-ltdeinit_kded" ;;
*) lib_kded="" ;;
esac
AC_SUBST(LIB_KDED, $lib_kded)
- AC_SUBST(LIB_KDECORE, "-lkdecore")
- AC_SUBST(LIB_KDEUI, "-lkdeui")
+ AC_SUBST(LIB_KDECORE, "-ltdecore")
+ AC_SUBST(LIB_KDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb")
@@ -2069,9 +2069,9 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
- AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+ AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils")
- AC_SUBST(LIB_KDEPIM, "-lkdepim")
+ AC_SUBST(LIB_KDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd")
@@ -2080,8 +2080,8 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
elif test $kde_qtver = 2; then
- AC_SUBST(LIB_KDECORE, "-lkdecore")
- AC_SUBST(LIB_KDEUI, "-lkdeui")
+ AC_SUBST(LIB_KDECORE, "-ltdecore")
+ AC_SUBST(LIB_KDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca")
AC_SUBST(LIB_SMB, "-lsmb")
@@ -2090,10 +2090,10 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
- AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+ AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
else
- AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
- AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
+ AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
+ AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
@@ -2477,7 +2477,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
else
- AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
+ AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
fi
])
diff --git a/configure.in b/configure.in
index 2907d98..48a4e7d 100644
--- a/configure.in
+++ b/configure.in
@@ -102,7 +102,7 @@ fi
#
AM_PROG_AS
-# MMX test duped from kdelibs/kdefx - it should be probably moved to admin/
+# MMX test duped from kdelibs/tdefx - it should be probably moved to admin/
dnl -----------------------------------------------------
dnl IA32 checks
dnl -----------------------------------------------------
diff --git a/configure.in.in b/configure.in.in
index f51154e..190afeb 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -35,7 +35,7 @@ fi
#
AM_PROG_AS
-# MMX test duped from kdelibs/kdefx - it should be probably moved to admin/
+# MMX test duped from kdelibs/tdefx - it should be probably moved to admin/
dnl -----------------------------------------------------
dnl IA32 checks
dnl -----------------------------------------------------
diff --git a/src/app/Makefile.am b/src/app/Makefile.am
index 86f1935..45ec945 100644
--- a/src/app/Makefile.am
+++ b/src/app/Makefile.am
@@ -1,7 +1,7 @@
bin_PROGRAMS=
lib_LTLIBRARIES=
-kdeinit_LTLIBRARIES = gwenview.la
+tdeinit_LTLIBRARIES = gwenview.la
# -D_LARGEFILE64_SOURCE is necessary on Debian Woody
AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
diff --git a/src/gvcore/printdialog.h b/src/gvcore/printdialog.h
index b94ec90..8a4b957 100644
--- a/src/gvcore/printdialog.h
+++ b/src/gvcore/printdialog.h
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// KDE
#include <kdockwidget.h>
-#include <kdeprint/kprintdialogpage.h>
+#include <tdeprint/kprintdialogpage.h>
#include "libgwenview_export.h"
class PrintDialogPageBase;