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 /kword | |
| 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 'kword')
| -rw-r--r-- | kword/KWBgSpellCheck.cpp | 2 | ||||
| -rw-r--r-- | kword/KWCanvas.cpp | 2 | ||||
| -rw-r--r-- | kword/KWConfig.cpp | 4 | ||||
| -rw-r--r-- | kword/KWImportStyleDia.cpp | 2 | ||||
| -rw-r--r-- | kword/KWInsertPicDia.cpp | 4 | ||||
| -rw-r--r-- | kword/KWTableTemplateSelector.cpp | 2 | ||||
| -rw-r--r-- | kword/KWView.cpp | 4 | ||||
| -rw-r--r-- | kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/kword/KWBgSpellCheck.cpp b/kword/KWBgSpellCheck.cpp index 53e74d028..7b352e093 100644 --- a/kword/KWBgSpellCheck.cpp +++ b/kword/KWBgSpellCheck.cpp @@ -31,7 +31,7 @@ using namespace KSpell2; #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index 3bf00e2bd..27f1320f4 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -58,7 +58,7 @@ #include <tdemultipledrag.h> #include <kurl.h> #include <kurldrag.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kmimetype.h> #include <assert.h> diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp index e7aaff949..701dc9006 100644 --- a/kword/KWConfig.cpp +++ b/kword/KWConfig.cpp @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <klocale.h> #include <KoUnitWidgets.h> @@ -66,7 +66,7 @@ using namespace KSpell2; #include <kglobalsettings.h> #include <kglobal.h> #include <kurlrequesterdlg.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tqtabwidget.h> #include <keditlistbox.h> #include <KoGlobal.h> diff --git a/kword/KWImportStyleDia.cpp b/kword/KWImportStyleDia.cpp index 93ec03349..cb1f40b5a 100644 --- a/kword/KWImportStyleDia.cpp +++ b/kword/KWImportStyleDia.cpp @@ -30,7 +30,7 @@ #include <KoStore.h> #include <tqfile.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdebug.h> #include <tqlabel.h> diff --git a/kword/KWInsertPicDia.cpp b/kword/KWInsertPicDia.cpp index 1194b052c..9aad5b5bf 100644 --- a/kword/KWInsertPicDia.cpp +++ b/kword/KWInsertPicDia.cpp @@ -27,9 +27,9 @@ #include <kdebug.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kimageio.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <KoPicture.h> #include <KoPictureFilePreview.h> diff --git a/kword/KWTableTemplateSelector.cpp b/kword/KWTableTemplateSelector.cpp index f219b0864..d161ccf75 100644 --- a/kword/KWTableTemplateSelector.cpp +++ b/kword/KWTableTemplateSelector.cpp @@ -29,7 +29,7 @@ #include <klocale.h> #include <kurl.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kstandarddirs.h> #include <kdebug.h> diff --git a/kword/KWView.cpp b/kword/KWView.cpp index 0b7f6c645..068e0da63 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -104,10 +104,10 @@ #include <kaccelgen.h> #include <kcolordialog.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kimageio.h> #include <kinputdialog.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kmessagebox.h> #include <tdeparts/event.h> #include <kstandarddirs.h> diff --git a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp index 14222bf03..2f0c1a735 100644 --- a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp +++ b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp @@ -23,7 +23,7 @@ #include <klineedit.h> #include <kdebug.h> #include <tqlayout.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kpushbutton.h> #include <klineeditdlg.h> #include <kiconloader.h> |