diff options
| author | Timothy Pearson <[email protected]> | 2013-01-26 13:07:53 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-26 13:07:53 -0600 |
| commit | 3ad898c43c0716bc30f5513a7b0ff6d92cc5e54c (patch) | |
| tree | 804ae6b389ec089efe4ccb423763b03f9bf53439 /src/gvcore | |
| parent | f10950a5b2fef43a5f3a99170682eea55fe9b80b (diff) | |
| download | gwenview-3ad898c43c0716bc30f5513a7b0ff6d92cc5e54c.tar.gz gwenview-3ad898c43c0716bc30f5513a7b0ff6d92cc5e54c.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src/gvcore')
| -rw-r--r-- | src/gvcore/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gvcore/imageviewcontroller.cpp | 4 | ||||
| -rw-r--r-- | src/gvcore/jpegformattype.cpp | 2 | ||||
| -rw-r--r-- | src/gvcore/jpegformattype.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/gvcore/Makefile.am b/src/gvcore/Makefile.am index a2130e8..f0eb7e2 100644 --- a/src/gvcore/Makefile.am +++ b/src/gvcore/Makefile.am @@ -7,7 +7,7 @@ libgwenviewcore_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined libgwenviewcore_la_LIBADD = \ $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEPRINT) $(LIB_QT) \ $(LIBJPEG) $(LIBPNG) $(LIBMNG) $(GV_LIB_XCURSOR) $(LIB_EXIV2) $(LIB_KPARTS) -ltdefx \ - -lkmediaplayer ../imageutils/libgvimageutils.la \ + -ltdemediaplayer ../imageutils/libgvimageutils.la \ ../tsthread/libtsthread.la libgwenviewcore_la_METASOURCES = AUTO diff --git a/src/gvcore/imageviewcontroller.cpp b/src/gvcore/imageviewcontroller.cpp index 8416224..17f592d 100644 --- a/src/gvcore/imageviewcontroller.cpp +++ b/src/gvcore/imageviewcontroller.cpp @@ -32,11 +32,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <kapplication.h> #include <kdebug.h> #include <klocale.h> -#include <kmediaplayer/player.h> +#include <tdemediaplayer/player.h> #include <kmimetype.h> #include <ktoolbar.h> #include <kuserprofile.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kxmlguibuilder.h> #include <kxmlguifactory.h> diff --git a/src/gvcore/jpegformattype.cpp b/src/gvcore/jpegformattype.cpp index ce18820..c401090 100644 --- a/src/gvcore/jpegformattype.cpp +++ b/src/gvcore/jpegformattype.cpp @@ -1,4 +1,4 @@ -/* This file is based on tdelibs-3.2.0/khtml/misc/loader_jpeg.cpp. Original +/* This file is based on tdelibs-3.2.0/tdehtml/misc/loader_jpeg.cpp. Original * copyright follows. */ /* diff --git a/src/gvcore/jpegformattype.h b/src/gvcore/jpegformattype.h index afb9e85..bcc3b00 100644 --- a/src/gvcore/jpegformattype.h +++ b/src/gvcore/jpegformattype.h @@ -1,4 +1,4 @@ -/* This file is based on tdelibs-3.2.0/khtml/misc/loader_jpeg.h. Original +/* This file is based on tdelibs-3.2.0/tdehtml/misc/loader_jpeg.h. Original * copyright follows. */ /* |