diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:48:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:48:17 -0600 |
| commit | 63f984a752aa6a6a73e3af795b05a5a042833eff (patch) | |
| tree | 89b2d1529273ebe59f8c41800aa6c53ee4c29bb1 /kugar/part | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kugar/part')
| -rw-r--r-- | kugar/part/kugar_about.h | 2 | ||||
| -rw-r--r-- | kugar/part/kugar_factory.cpp | 4 | ||||
| -rw-r--r-- | kugar/part/kugar_part.cpp | 6 | ||||
| -rw-r--r-- | kugar/part/kugar_view.cpp | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/kugar/part/kugar_about.h b/kugar/part/kugar_about.h index 2a47f768..965cd282 100644 --- a/kugar/part/kugar_about.h +++ b/kugar/part/kugar_about.h @@ -24,7 +24,7 @@ #endif #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> TDEAboutData *newKugarAboutData() { diff --git a/kugar/part/kugar_factory.cpp b/kugar/part/kugar_factory.cpp index f32c1b95..9cd323c0 100644 --- a/kugar/part/kugar_factory.cpp +++ b/kugar/part/kugar_factory.cpp @@ -3,11 +3,11 @@ // This file contains the implementation of the Kugar KPart. -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kinstance.h> #include <tdeaboutdata.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #if defined(HAVE_CONFIG_H) diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp index 14e8e059..c00ba14d 100644 --- a/kugar/part/kugar_part.cpp +++ b/kugar/part/kugar_part.cpp @@ -4,16 +4,16 @@ #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kinstance.h> #include <tdeaboutdata.h> #include <tdeaction.h> #include <kstdaction.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/netaccess.h> #include <tqfile.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tqwidget.h> #include <tdefiledialog.h> diff --git a/kugar/part/kugar_view.cpp b/kugar/part/kugar_view.cpp index 55403d41..d1040574 100644 --- a/kugar/part/kugar_view.cpp +++ b/kugar/part/kugar_view.cpp @@ -4,16 +4,16 @@ #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kinstance.h> #include <tdeaboutdata.h> #include <tdeaction.h> #include <kstdaction.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/netaccess.h> #include <tqfile.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tqlayout.h> |