diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:39 -0600 |
| commit | ff94d46e423398804d2ae63faeb114c2cf604fc4 (patch) | |
| tree | 4481ffd491d15ac15081cea46d7cc298ef6351a4 /kbabel/common | |
| parent | b9553cef2a3cd9f5b89c8aca6f4b7781a079dbb7 (diff) | |
| download | tdesdk-ff94d46e423398804d2ae63faeb114c2cf604fc4.tar.gz tdesdk-ff94d46e423398804d2ae63faeb114c2cf604fc4.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kbabel/common')
| -rw-r--r-- | kbabel/common/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kbabel/common/Makefile.am | 2 | ||||
| -rw-r--r-- | kbabel/common/catalog.cpp | 4 | ||||
| -rw-r--r-- | kbabel/common/catalogsettings.cpp | 2 | ||||
| -rw-r--r-- | kbabel/common/kbmailer.cpp | 2 | ||||
| -rw-r--r-- | kbabel/common/kbproject.h | 2 | ||||
| -rw-r--r-- | kbabel/common/poinfo.cpp | 2 | ||||
| -rw-r--r-- | kbabel/common/tagextractor.cpp | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/kbabel/common/CMakeLists.txt b/kbabel/common/CMakeLists.txt index f6b6fd96..d0377a65 100644 --- a/kbabel/common/CMakeLists.txt +++ b/kbabel/common/CMakeLists.txt @@ -58,6 +58,6 @@ tde_add_library( kbabelcommon SHARED AUTOMOC exportplugin.cpp kbproject.cpp kbprojectmanager.cpp kbprojectsettings.kcfgc projectsettings.cpp stringdistance.cpp VERSION 3.2.0 - LINK gettext-static kio-shared + LINK gettext-static tdeio-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kbabel/common/Makefile.am b/kbabel/common/Makefile.am index 7d073444..eb455a7a 100644 --- a/kbabel/common/Makefile.am +++ b/kbabel/common/Makefile.am @@ -56,7 +56,7 @@ catalog.lo: version.h # updating of project settings for default project update_DATA = kbabel-projectrename.upd -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update api: mkdir -p API && kdoc -d API -u $$PWD/API -p -ltdecore -lqt-mt -ldcop $(pkginclude_HEADERS) diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp index adf845fe..86f47c29 100644 --- a/kbabel/common/catalog.cpp +++ b/kbabel/common/catalog.cpp @@ -40,7 +40,7 @@ #include <tqtextcodec.h> #include <tqdatetime.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdatatool.h> #include <kglobal.h> #include <klibloader.h> @@ -48,7 +48,7 @@ #include <kmessagebox.h> #include <kmimetype.h> #include <kapplication.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <krfcdate.h> #include <ktrader.h> #include <kurl.h> diff --git a/kbabel/common/catalogsettings.cpp b/kbabel/common/catalogsettings.cpp index d16bc9cc..64185d09 100644 --- a/kbabel/common/catalogsettings.cpp +++ b/kbabel/common/catalogsettings.cpp @@ -33,7 +33,7 @@ **************************************************************************** */ #include "catalogsettings.h" #include "kbprojectsettings.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kemailsettings.h> #include <kglobal.h> diff --git a/kbabel/common/kbmailer.cpp b/kbabel/common/kbmailer.cpp index 156754d0..3fbc12c2 100644 --- a/kbabel/common/kbmailer.cpp +++ b/kbabel/common/kbmailer.cpp @@ -40,7 +40,7 @@ #include <tqwidget.h> #include <kapplication.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <kmessagebox.h> #include <ktar.h> diff --git a/kbabel/common/kbproject.h b/kbabel/common/kbproject.h index 3b2040ed..cedc97c8 100644 --- a/kbabel/common/kbproject.h +++ b/kbabel/common/kbproject.h @@ -35,7 +35,7 @@ #include <tqstring.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "catalogsettings.h" #include "projectsettings.h" diff --git a/kbabel/common/poinfo.cpp b/kbabel/common/poinfo.cpp index 81bfd8b9..6fc27b55 100644 --- a/kbabel/common/poinfo.cpp +++ b/kbabel/common/poinfo.cpp @@ -38,7 +38,7 @@ #include "resources.h" #include <kapplication.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kstandarddirs.h> #include <ksavefile.h> diff --git a/kbabel/common/tagextractor.cpp b/kbabel/common/tagextractor.cpp index 594ec948..bbf9ee1d 100644 --- a/kbabel/common/tagextractor.cpp +++ b/kbabel/common/tagextractor.cpp @@ -36,7 +36,7 @@ #include "tagextractor.h" #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> using namespace KBabel; |