diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:54:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:54:22 -0600 |
| commit | 038b18b2df1da40baab30d62171766048a948095 (patch) | |
| tree | ba99d50e3e7b3f2eccb63ba71aea4f6163ede37a /karbon | |
| parent | d0baf2961c379b31587c6542625018c6177474d0 (diff) | |
| download | koffice-038b18b2df1da40baab30d62171766048a948095.tar.gz koffice-038b18b2df1da40baab30d62171766048a948095.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'karbon')
| -rw-r--r-- | karbon/dialogs/vconfiguredlg.cc | 2 | ||||
| -rw-r--r-- | karbon/dockers/vstyledocker.cc | 2 | ||||
| -rw-r--r-- | karbon/karbon_part.cc | 2 | ||||
| -rw-r--r-- | karbon/karbon_view.cc | 2 | ||||
| -rw-r--r-- | karbon/plugins/imagetool/vimagetool.cc | 2 | ||||
| -rw-r--r-- | karbon/tools/vpatterntool.cc | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/karbon/dialogs/vconfiguredlg.cc b/karbon/dialogs/vconfiguredlg.cc index 8c41704c..ca81d1b1 100644 --- a/karbon/dialogs/vconfiguredlg.cc +++ b/karbon/dialogs/vconfiguredlg.cc @@ -29,7 +29,7 @@ #include <tqgrid.h> #include <kiconloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialogbase.h> #include <klocale.h> #include <knuminput.h> diff --git a/karbon/dockers/vstyledocker.cc b/karbon/dockers/vstyledocker.cc index 672000ae..ff17fdfd 100644 --- a/karbon/dockers/vstyledocker.cc +++ b/karbon/dockers/vstyledocker.cc @@ -29,7 +29,7 @@ #include <kiconloader.h> #include <KoMainWindow.h> #include <KoFilterManager.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include "karbon_part.h" #include "karbon_view.h" diff --git a/karbon/karbon_part.cc b/karbon/karbon_part.cc index 53cb44de..47418a69 100644 --- a/karbon/karbon_part.cc +++ b/karbon/karbon_part.cc @@ -23,7 +23,7 @@ #include <tqpainter.h> #include <tqpaintdevicemetrics.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> #include <ktempfile.h> diff --git a/karbon/karbon_view.cc b/karbon/karbon_view.cc index 23a31b08..864f695d 100644 --- a/karbon/karbon_view.cc +++ b/karbon/karbon_view.cc @@ -38,7 +38,7 @@ #include <KoMainWindow.h> #include <KoFilterManager.h> #include <kstatusbar.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kstdaction.h> #include <KoContextCelp.h> #include <KoUnitWidgets.h> diff --git a/karbon/plugins/imagetool/vimagetool.cc b/karbon/plugins/imagetool/vimagetool.cc index 40823e99..bc8c2001 100644 --- a/karbon/plugins/imagetool/vimagetool.cc +++ b/karbon/plugins/imagetool/vimagetool.cc @@ -20,7 +20,7 @@ #include <tqcursor.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdebug.h> #include "vimagetool.h" diff --git a/karbon/tools/vpatterntool.cc b/karbon/tools/vpatterntool.cc index 4abbb379..11421fcc 100644 --- a/karbon/tools/vpatterntool.cc +++ b/karbon/tools/vpatterntool.cc @@ -29,7 +29,7 @@ #include <kiconloader.h> #include <koIconChooser.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <karbon_factory.h> |