diff options
Diffstat (limited to 'kimgio')
| -rw-r--r-- | kimgio/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | kimgio/Makefile.am | 2 | ||||
| -rw-r--r-- | kimgio/README | 2 | ||||
| -rw-r--r-- | kimgio/dds.cpp | 2 | ||||
| -rw-r--r-- | kimgio/eps.cpp | 4 | ||||
| -rw-r--r-- | kimgio/exr.cpp | 2 | ||||
| -rw-r--r-- | kimgio/gimp.h | 2 | ||||
| -rw-r--r-- | kimgio/hdr.cpp | 2 | ||||
| -rw-r--r-- | kimgio/jp2.cpp | 2 |
9 files changed, 11 insertions, 10 deletions
diff --git a/kimgio/CMakeLists.txt b/kimgio/CMakeLists.txt index f227b4f88..3b72a1db6 100644 --- a/kimgio/CMakeLists.txt +++ b/kimgio/CMakeLists.txt @@ -142,7 +142,8 @@ if( OPENEXR_FOUND ) DESTINATION ${PLUGIN_INSTALL_DIR} ) # FIXME COMPILE_FLAGS must be written a little better - set_target_properties( ${target}-module PROPERTIES COMPILE_FLAGS -I${OPENEXR_INCLUDE_DIRS} ) + STRING(REGEX REPLACE ";" " -I" OPENEXR_INCLUDE_FLAGS "-I${OPENEXR_INCLUDE_DIRS}") + set_target_properties( ${target}-module PROPERTIES COMPILE_FLAGS "${OPENEXR_INCLUDE_FLAGS}" ) install( FILES exr.kimgio DESTINATION ${SERVICES_INSTALL_DIR} ) endif( OPENEXR_FOUND ) diff --git a/kimgio/Makefile.am b/kimgio/Makefile.am index ad833c292..41ca9a892 100644 --- a/kimgio/Makefile.am +++ b/kimgio/Makefile.am @@ -81,7 +81,7 @@ kimg_hdr_la_LIBADD = $(LIB_QT) noinst_HEADERS= xview.h eps.h tiffr.h g3r.h ico.h jp2.h pcx.h tga.h rgb.h xcf.h gimp.h exr.h dds.h psd.h hdr.h -INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl $(all_includes) -Drestrict= $(EXR_FLAGS) +INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl $(all_includes) -Drestrict= $(EXR_FLAGS) servicedir = $(kde_servicesdir) service_DATA = png.kimgio xpm.kimgio bmp.kimgio pbm.kimgio pgm.kimgio \ diff --git a/kimgio/README b/kimgio/README index 6c9cec844..142823e6c 100644 --- a/kimgio/README +++ b/kimgio/README @@ -22,7 +22,7 @@ XCF <read> To use these formats, you only need to: -1. link the application with the libkio library +1. link the application with the libtdeio library 2. Include the <kimageio.h> header 3. call KImageIO::registerFormats() once, somewhere in your code before you load an image. diff --git a/kimgio/dds.cpp b/kimgio/dds.cpp index d174bf893..22251002c 100644 --- a/kimgio/dds.cpp +++ b/kimgio/dds.cpp @@ -24,7 +24,7 @@ #include <tqimage.h> #include <tqdatastream.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <math.h> // sqrtf diff --git a/kimgio/eps.cpp b/kimgio/eps.cpp index a323feace..bcf916836 100644 --- a/kimgio/eps.cpp +++ b/kimgio/eps.cpp @@ -5,8 +5,8 @@ #include <tqfile.h> #include <tqpainter.h> #include <tqprinter.h> -#include <kapplication.h> -#include <ktempfile.h> +#include <tdeapplication.h> +#include <tdetempfile.h> #include <kdebug.h> #include "eps.h" diff --git a/kimgio/exr.cpp b/kimgio/exr.cpp index c28cb799b..563c151a2 100644 --- a/kimgio/exr.cpp +++ b/kimgio/exr.cpp @@ -35,7 +35,7 @@ #include <kurl.h> #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kdebug.h> diff --git a/kimgio/gimp.h b/kimgio/gimp.h index 114ffdc0f..7da1a45f8 100644 --- a/kimgio/gimp.h +++ b/kimgio/gimp.h @@ -21,7 +21,7 @@ * */ -#include <kglobal.h> +#include <tdeglobal.h> /* * These are the constants and functions I extracted from The GIMP source diff --git a/kimgio/hdr.cpp b/kimgio/hdr.cpp index 82cba5c12..5f1832f02 100644 --- a/kimgio/hdr.cpp +++ b/kimgio/hdr.cpp @@ -14,7 +14,7 @@ #include <tqdatastream.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> typedef TQ_UINT8 uchar; diff --git a/kimgio/jp2.cpp b/kimgio/jp2.cpp index 2200c948c..5de8fff8e 100644 --- a/kimgio/jp2.cpp +++ b/kimgio/jp2.cpp @@ -12,7 +12,7 @@ #ifdef HAVE_STDINT_H #include <stdint.h> #endif -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqcolor.h> #include <tqcstring.h> #include <tqfile.h> |