diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:02 -0600 |
| commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
| tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /kcontrol/kfontinst/lib | |
| parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
| download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kfontinst/lib')
| -rw-r--r-- | kcontrol/kfontinst/lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kcontrol/kfontinst/lib/FcEngine.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/kfontinst/lib/Misc.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/kfontinst/lib/CMakeLists.txt b/kcontrol/kfontinst/lib/CMakeLists.txt index 989d60810..83f977aaa 100644 --- a/kcontrol/kfontinst/lib/CMakeLists.txt +++ b/kcontrol/kfontinst/lib/CMakeLists.txt @@ -28,6 +28,6 @@ link_directories( tde_add_library( kfontinst SHARED SOURCES Misc.cpp FcEngine.cpp VERSION 0.0.0 - LINK kio-shared ${XFT_LIBRARIES} + LINK tdeio-shared ${XFT_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kcontrol/kfontinst/lib/FcEngine.cpp b/kcontrol/kfontinst/lib/FcEngine.cpp index 57fb765f1..6faf700c6 100644 --- a/kcontrol/kfontinst/lib/FcEngine.cpp +++ b/kcontrol/kfontinst/lib/FcEngine.cpp @@ -4,9 +4,9 @@ #include <tqfile.h> #include <tqtextstream.h> #include <kurl.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobalsettings.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <math.h> #include "FcEngine.h" #include "KfiConstants.h" diff --git a/kcontrol/kfontinst/lib/Misc.cpp b/kcontrol/kfontinst/lib/Misc.cpp index a2c150a08..5f39afec8 100644 --- a/kcontrol/kfontinst/lib/Misc.cpp +++ b/kcontrol/kfontinst/lib/Misc.cpp @@ -31,7 +31,7 @@ #include <kprocess.h> #include <kstandarddirs.h> #include <klargefile.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <unistd.h> namespace KFI |