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 /koshell | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'koshell')
| -rw-r--r-- | koshell/iconsidepane.cpp | 2 | ||||
| -rw-r--r-- | koshell/koshell_main.cc | 2 | ||||
| -rw-r--r-- | koshell/koshell_shell.cc | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/koshell/iconsidepane.cpp b/koshell/iconsidepane.cpp index dc43a8d9e..fc370370c 100644 --- a/koshell/iconsidepane.cpp +++ b/koshell/iconsidepane.cpp @@ -38,7 +38,7 @@ #include <kdebug.h> #include <kdialog.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kpushbutton.h> diff --git a/koshell/koshell_main.cc b/koshell/koshell_main.cc index f405d81ad..e816cd9e1 100644 --- a/koshell/koshell_main.cc +++ b/koshell/koshell_main.cc @@ -22,7 +22,7 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kuniqueapplication.h> #include <twin.h> diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cc index 46453c1c7..fc5ac0cf8 100644 --- a/koshell/koshell_shell.cc +++ b/koshell/koshell_shell.cc @@ -32,9 +32,9 @@ #include "koshellsettings.h" #include <tdeapplication.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> #include <kkeydialog.h> @@ -42,7 +42,7 @@ #include <klibloader.h> #include <tdepopupmenu.h> #include <kservice.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tderecentdocument.h> #include <tdeparts/partmanager.h> #include <tdeaction.h> |