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 /kivio | |
| 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 'kivio')
| -rw-r--r-- | kivio/kiviopart/kivio_doc.cpp | 2 | ||||
| -rw-r--r-- | kivio/kiviopart/kivio_view.cpp | 2 | ||||
| -rw-r--r-- | kivio/kiviopart/kiviostencilsetinstaller.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp index a731869f..1245d707 100644 --- a/kivio/kiviopart/kivio_doc.cpp +++ b/kivio/kiviopart/kivio_doc.cpp @@ -72,7 +72,7 @@ #include <kmenubar.h> #include <kiconloader.h> #include <khelpmenu.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <KoTemplateChooseDia.h> #include <KoFilterManager.h> #include <KoStoreDevice.h> diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp index ad378bf0..fd465151 100644 --- a/kivio/kiviopart/kivio_view.cpp +++ b/kivio/kiviopart/kivio_view.cpp @@ -43,7 +43,7 @@ #include <tqstringlist.h> #include <tqstrlist.h> #include <tqimage.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdialogbase.h> #include <kaction.h> diff --git a/kivio/kiviopart/kiviostencilsetinstaller.cpp b/kivio/kiviopart/kiviostencilsetinstaller.cpp index 52cbb4c4..158a4415 100644 --- a/kivio/kiviopart/kiviostencilsetinstaller.cpp +++ b/kivio/kiviopart/kiviostencilsetinstaller.cpp @@ -31,7 +31,7 @@ #include <klocale.h> #include <kurlrequester.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kurl.h> #include <kstandarddirs.h> #include <ktar.h> |