diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:10:41 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:10:41 -0600 |
| commit | 7422cac1a18dca897d3830a267eb91683d05a95b (patch) | |
| tree | 2ba309f49b47a5fbb0b226801b224c2532b7ab1a /kspread/plugins | |
| 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 'kspread/plugins')
| -rw-r--r-- | kspread/plugins/calculator/main.h | 2 | ||||
| -rw-r--r-- | kspread/plugins/insertcalendar/kspread_plugininsertcalendar.h | 2 | ||||
| -rw-r--r-- | kspread/plugins/scripting/Makefile.am | 2 | ||||
| -rw-r--r-- | kspread/plugins/scripting/kspreadcore/Makefile.am | 2 | ||||
| -rw-r--r-- | kspread/plugins/scripting/scripting.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/kspread/plugins/calculator/main.h b/kspread/plugins/calculator/main.h index f44a1a01d..dd4d456fc 100644 --- a/kspread/plugins/calculator/main.h +++ b/kspread/plugins/calculator/main.h @@ -25,7 +25,7 @@ #include <tqobject.h> #include <klibloader.h> -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include <koffice_export.h> diff --git a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.h b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.h index b8f681837..0dde5dba4 100644 --- a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.h +++ b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.h @@ -25,7 +25,7 @@ #ifndef KSPREAD_PLUGININSERTCALENDAR_H #define KSPREAD_PLUGININSERTCALENDAR_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include <koffice_export.h> diff --git a/kspread/plugins/scripting/Makefile.am b/kspread/plugins/scripting/Makefile.am index dc1e7ff20..1f490468e 100644 --- a/kspread/plugins/scripting/Makefile.am +++ b/kspread/plugins/scripting/Makefile.am @@ -14,7 +14,7 @@ noinst_HEADERS = scripting.h kspreadscripting_la_METASOURCES = AUTO -kspreadscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kspreadscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kspreadscripting_la_LIBADD = $(top_builddir)/kspread/libkspreadcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la kde_services_DATA = kspreadscripting.desktop diff --git a/kspread/plugins/scripting/kspreadcore/Makefile.am b/kspread/plugins/scripting/kspreadcore/Makefile.am index c9f1f55c0..fcd552f05 100644 --- a/kspread/plugins/scripting/kspreadcore/Makefile.am +++ b/kspread/plugins/scripting/kspreadcore/Makefile.am @@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = krosskspreadcore.la krosskspreadcore_la_SOURCES = kspreadcoremodule.cpp krs_doc.cpp krs_sheet.cpp krs_cell.cpp -krosskspreadcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +krosskspreadcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts krosskspreadcore_la_LIBADD = \ $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ $(LIB_QT) \ diff --git a/kspread/plugins/scripting/scripting.h b/kspread/plugins/scripting/scripting.h index 29fa66814..52ffadd16 100644 --- a/kspread/plugins/scripting/scripting.h +++ b/kspread/plugins/scripting/scripting.h @@ -22,7 +22,7 @@ #ifndef SCRIPTING_H #define SCRIPTING_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include <kspread_view.h> namespace Kross { |