diff options
author | Timothy Pearson <[email protected]> | 2013-01-26 13:10:41 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-26 13:10:41 -0600 |
commit | 7422cac1a18dca897d3830a267eb91683d05a95b (patch) | |
tree | 2ba309f49b47a5fbb0b226801b224c2532b7ab1a /tools/thumbnail | |
parent | 3fe437def8063926892bddf2dcc733861308836d (diff) | |
download | koffice-7422cac1a18dca897d3830a267eb91683d05a95b.tar.gz koffice-7422cac1a18dca897d3830a267eb91683d05a95b.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tools/thumbnail')
-rw-r--r-- | tools/thumbnail/Makefile.am | 4 | ||||
-rw-r--r-- | tools/thumbnail/kofficecreator.cpp | 4 | ||||
-rw-r--r-- | tools/thumbnail/kofficecreator.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tools/thumbnail/Makefile.am b/tools/thumbnail/Makefile.am index cf41afd1..a98b6fe4 100644 --- a/tools/thumbnail/Makefile.am +++ b/tools/thumbnail/Makefile.am @@ -5,11 +5,11 @@ kde_module_LTLIBRARIES = clipartthumbnail.la kofficethumbnail.la clipartthumbnail_la_SOURCES = clipartcreator.cpp clipartthumbnail_la_LIBADD = $(KOFFICE_LIBS) # for KoClipartCollection -clipartthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +clipartthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kofficethumbnail_la_SOURCES = kofficecreator.cpp kofficethumbnail_la_LIBADD = $(KOFFICE_LIBS) -kofficethumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kofficethumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts # otherofficethumbnail.desktop is currently not installed, as it gives too many problems kde_services_DATA = clipartthumbnail.desktop kofficethumbnail.desktop diff --git a/tools/thumbnail/kofficecreator.cpp b/tools/thumbnail/kofficecreator.cpp index 4e820eb1..60eef551 100644 --- a/tools/thumbnail/kofficecreator.cpp +++ b/tools/thumbnail/kofficecreator.cpp @@ -29,8 +29,8 @@ #include <kfileitem.h> #include <ktrader.h> #include <klibloader.h> -#include <kparts/part.h> -#include <kparts/componentfactory.h> +#include <tdeparts/part.h> +#include <tdeparts/componentfactory.h> #include "kofficecreator.h" #include <KoStore.h> diff --git a/tools/thumbnail/kofficecreator.h b/tools/thumbnail/kofficecreator.h index c6a27426..3188cff9 100644 --- a/tools/thumbnail/kofficecreator.h +++ b/tools/thumbnail/kofficecreator.h @@ -21,7 +21,7 @@ #define _KWORDCREATOR_H_ "$Id: kofficecreator.h 508787 2006-02-12 18:28:12Z ingwa $" #include <kio/thumbcreator.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "../../lib/kofficecore/KoDocument.h" class KoDocument; |