summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:59:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:59:20 -0600
commit626cfa8890ed5ffb106fd5158bc5ad55bec617b1 (patch)
tree4f795aaccdb2bc25c5ec7dcf88649f3b88cbb8aa
parent49835742e9258c1614b3b4f8837252fd8633c3e9 (diff)
downloadlibkipi-626cfa8890ed5ffb106fd5158bc5ad55bec617b1.tar.gz
libkipi-626cfa8890ed5ffb106fd5158bc5ad55bec617b1.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
-rw-r--r--acinclude.m48
-rw-r--r--aclocal.m48
-rw-r--r--libkipi/libkipi/batchprogressdialog.cpp2
-rw-r--r--libkipi/libkipi/imagecollectionselector.cpp2
-rw-r--r--libkipi/libkipi/imagedialog.cpp2
-rw-r--r--libkipi/libkipi/pluginloader.cpp2
-rw-r--r--libkipi/libkipi/uploadwidget.cpp2
-rw-r--r--libkipi/libkipi/uploadwidget.h2
-rw-r--r--po/lt/libkipi.po2
9 files changed, 15 insertions, 15 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 54c6366..3b636e7 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi
if test -n "$trinity2ornewer"; then
- KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+ KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi
if test -n "$trinity3ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la"
else
kde_check_header="ksharedptr.h"
- kde_check_lib="libkio.la"
+ kde_check_lib="libtdeio.la"
fi
if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
- AC_SUBST(LIB_KFILE, "-lkfile")
+ AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
- AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+ AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi
])
diff --git a/aclocal.m4 b/aclocal.m4
index 95c318a..9ac5d60 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -614,7 +614,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi
if test -n "$trinity2ornewer"; then
- KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+ KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi
if test -n "$trinity3ornewer"; then
@@ -1800,7 +1800,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la"
else
kde_check_header="ksharedptr.h"
- kde_check_lib="libkio.la"
+ kde_check_lib="libtdeio.la"
fi
if test -z "$1"; then
@@ -2106,7 +2106,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
- AC_SUBST(LIB_KFILE, "-lkfile")
+ AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2116,7 +2116,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
- AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+ AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi
])
diff --git a/libkipi/libkipi/batchprogressdialog.cpp b/libkipi/libkipi/batchprogressdialog.cpp
index 195d590..ce5bad3 100644
--- a/libkipi/libkipi/batchprogressdialog.cpp
+++ b/libkipi/libkipi/batchprogressdialog.cpp
@@ -45,7 +45,7 @@
#include <klocale.h>
#include <kprogress.h>
#include <kinstance.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kapplication.h>
#include <kdebug.h>
#include <kdialogbase.h>
diff --git a/libkipi/libkipi/imagecollectionselector.cpp b/libkipi/libkipi/imagecollectionselector.cpp
index 004ec22..ddba1c5 100644
--- a/libkipi/libkipi/imagecollectionselector.cpp
+++ b/libkipi/libkipi/imagecollectionselector.cpp
@@ -36,7 +36,7 @@
#include <klistview.h>
#include <klocale.h>
#include <kglobal.h>
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
// KIPI includes.
diff --git a/libkipi/libkipi/imagedialog.cpp b/libkipi/libkipi/imagedialog.cpp
index 1d209ce..7a5b11a 100644
--- a/libkipi/libkipi/imagedialog.cpp
+++ b/libkipi/libkipi/imagedialog.cpp
@@ -36,7 +36,7 @@
#include <klistview.h>
#include <klocale.h>
#include <kstandarddirs.h>
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
#include <kapplication.h>
#include <kaboutdata.h>
#include <khelpmenu.h>
diff --git a/libkipi/libkipi/pluginloader.cpp b/libkipi/libkipi/pluginloader.cpp
index 944c956..24aff7e 100644
--- a/libkipi/libkipi/pluginloader.cpp
+++ b/libkipi/libkipi/pluginloader.cpp
@@ -31,7 +31,7 @@
#include "plugin.h"
#include "pluginloader.h"
#include "interface.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <tqcheckbox.h>
#include <tqlayout.h>
diff --git a/libkipi/libkipi/uploadwidget.cpp b/libkipi/libkipi/uploadwidget.cpp
index 84b6e56..60f8744 100644
--- a/libkipi/libkipi/uploadwidget.cpp
+++ b/libkipi/libkipi/uploadwidget.cpp
@@ -31,7 +31,7 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
#include <kmessagebox.h>
#include <tdeversion.h>
diff --git a/libkipi/libkipi/uploadwidget.h b/libkipi/libkipi/uploadwidget.h
index 9ac6ae8..32ac758 100644
--- a/libkipi/libkipi/uploadwidget.h
+++ b/libkipi/libkipi/uploadwidget.h
@@ -30,7 +30,7 @@
// KDE includes.
-#include <kfiletreeview.h>
+#include <tdefiletreeview.h>
#include <kurl.h>
// LibKIPI includes.
diff --git a/po/lt/libkipi.po b/po/lt/libkipi.po
index ebe559e..b8342eb 100644
--- a/po/lt/libkipi.po
+++ b/po/lt/libkipi.po
@@ -48,7 +48,7 @@ msgstr ""
"Būsena\n"
"#-#-#-#-# kopete.po (kopete) #-#-#-#-#\n"
"Būsena\n"
-"#-#-#-#-# kfileshare.po (kfileshare) #-#-#-#-#\n"
+"#-#-#-#-# tdefileshare.po (tdefileshare) #-#-#-#-#\n"
"Būsena\n"
"#-#-#-#-# kpf.po (kpf) #-#-#-#-#\n"
"Būsena\n"