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 /karbon | |
| 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 'karbon')
| -rw-r--r-- | karbon/core/vkarbonplugin.h | 2 | ||||
| -rw-r--r-- | karbon/karbon_factory.cc | 4 | ||||
| -rw-r--r-- | karbon/plugins/flattenpath/flattenpathplugin.h | 2 | ||||
| -rw-r--r-- | karbon/plugins/imagetool/imagetoolplugin.h | 2 | ||||
| -rw-r--r-- | karbon/plugins/insertknots/insertknotsplugin.h | 2 | ||||
| -rw-r--r-- | karbon/plugins/roundcorners/roundcornersplugin.h | 2 | ||||
| -rw-r--r-- | karbon/plugins/shadoweffect/shadoweffectplugin.h | 2 | ||||
| -rw-r--r-- | karbon/plugins/whirlpinch/whirlpinchplugin.h | 2 | ||||
| -rw-r--r-- | karbon/plugins/zoomtool/zoomtoolplugin.h | 2 | ||||
| -rw-r--r-- | karbon/tools/vdefaulttools.h | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/karbon/core/vkarbonplugin.h b/karbon/core/vkarbonplugin.h index 84fed9c6..60caafa4 100644 --- a/karbon/core/vkarbonplugin.h +++ b/karbon/core/vkarbonplugin.h @@ -20,7 +20,7 @@ #ifndef __VKARBONPLUGIN_H__ #define __VKARBONPLUGIN_H__ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include <koffice_export.h> class KARBONBASE_EXPORT VKarbonPlugin : public KParts::Plugin diff --git a/karbon/karbon_factory.cc b/karbon/karbon_factory.cc index 6206926a..67ffb0bd 100644 --- a/karbon/karbon_factory.cc +++ b/karbon/karbon_factory.cc @@ -25,8 +25,8 @@ #include <klocale.h> #include <kstandarddirs.h> #include <ktrader.h> -#include <kparts/componentfactory.h> -#include <kparts/plugin.h> +#include <tdeparts/componentfactory.h> +#include <tdeparts/plugin.h> #include "karbon_factory.h" #include "karbon_part.h" diff --git a/karbon/plugins/flattenpath/flattenpathplugin.h b/karbon/plugins/flattenpath/flattenpathplugin.h index 6384d001..3633480c 100644 --- a/karbon/plugins/flattenpath/flattenpathplugin.h +++ b/karbon/plugins/flattenpath/flattenpathplugin.h @@ -20,7 +20,7 @@ #ifndef __FLATTENPATHPLUGIN_H__ #define __FLATTENPATHPLUGIN_H__ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include <kdialogbase.h> class KarbonView; diff --git a/karbon/plugins/imagetool/imagetoolplugin.h b/karbon/plugins/imagetool/imagetoolplugin.h index 4258f6dc..e9e2ed13 100644 --- a/karbon/plugins/imagetool/imagetoolplugin.h +++ b/karbon/plugins/imagetool/imagetoolplugin.h @@ -23,7 +23,7 @@ #include <tqstring.h> -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> /** */ diff --git a/karbon/plugins/insertknots/insertknotsplugin.h b/karbon/plugins/insertknots/insertknotsplugin.h index 84cd4e1f..3feb1877 100644 --- a/karbon/plugins/insertknots/insertknotsplugin.h +++ b/karbon/plugins/insertknots/insertknotsplugin.h @@ -20,7 +20,7 @@ #ifndef __INSERTKNOTSPLUGIN_H__ #define __INSERTKNOTSPLUGIN_H__ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include <kdialogbase.h> #include <commands/vreplacingcmd.h> diff --git a/karbon/plugins/roundcorners/roundcornersplugin.h b/karbon/plugins/roundcorners/roundcornersplugin.h index 858871a9..3a7c544f 100644 --- a/karbon/plugins/roundcorners/roundcornersplugin.h +++ b/karbon/plugins/roundcorners/roundcornersplugin.h @@ -20,7 +20,7 @@ #ifndef __ROUNDCORNERSPLUGIN_H__ #define __ROUNDCORNERSPLUGIN_H__ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include <kdialogbase.h> #include <commands/vreplacingcmd.h> #include <koffice_export.h> diff --git a/karbon/plugins/shadoweffect/shadoweffectplugin.h b/karbon/plugins/shadoweffect/shadoweffectplugin.h index c1085581..6c05d829 100644 --- a/karbon/plugins/shadoweffect/shadoweffectplugin.h +++ b/karbon/plugins/shadoweffect/shadoweffectplugin.h @@ -20,7 +20,7 @@ #ifndef __SHADOWEFFECTPLUGIN_H__ #define __SHADOWEFFECTPLUGIN_H__ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include <kdialogbase.h> #include <commands/vcommand.h> diff --git a/karbon/plugins/whirlpinch/whirlpinchplugin.h b/karbon/plugins/whirlpinch/whirlpinchplugin.h index b2d68c34..81cd4003 100644 --- a/karbon/plugins/whirlpinch/whirlpinchplugin.h +++ b/karbon/plugins/whirlpinch/whirlpinchplugin.h @@ -21,7 +21,7 @@ #define __WHIRLPINCHPLUGIN_H__ #include <kdialogbase.h> -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include <commands/vreplacingcmd.h> class KarbonView; diff --git a/karbon/plugins/zoomtool/zoomtoolplugin.h b/karbon/plugins/zoomtool/zoomtoolplugin.h index 3de6231d..97a5a752 100644 --- a/karbon/plugins/zoomtool/zoomtoolplugin.h +++ b/karbon/plugins/zoomtool/zoomtoolplugin.h @@ -23,7 +23,7 @@ #include <tqstring.h> -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> /** * A module that provides a zoom tool. diff --git a/karbon/tools/vdefaulttools.h b/karbon/tools/vdefaulttools.h index a9d0f7bf..43125e43 100644 --- a/karbon/tools/vdefaulttools.h +++ b/karbon/tools/vdefaulttools.h @@ -23,7 +23,7 @@ #include <tqstring.h> -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> /** * A module that provides the default tools |