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 /kspread/plugins | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kspread/plugins')
| -rw-r--r-- | kspread/plugins/calculator/configdlg.cpp | 2 | ||||
| -rw-r--r-- | kspread/plugins/calculator/kcalc.cpp | 6 | ||||
| -rw-r--r-- | kspread/plugins/calculator/kcalc_core.cpp | 4 | ||||
| -rw-r--r-- | kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/kspread/plugins/calculator/configdlg.cpp b/kspread/plugins/calculator/configdlg.cpp index 28ab2646d..56af25b4d 100644 --- a/kspread/plugins/calculator/configdlg.cpp +++ b/kspread/plugins/calculator/configdlg.cpp @@ -27,7 +27,7 @@ #include "configdlg.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <tqlayout.h> diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp index b6c71ca1c..d7c0ce767 100644 --- a/kspread/plugins/calculator/kcalc.cpp +++ b/kspread/plugins/calculator/kcalc.cpp @@ -24,17 +24,17 @@ #include "configdlg.h" #include "version.h" -#include <klocale.h> +#include <tdelocale.h> #include <knotifyclient.h> #include <tqlayout.h> #include <tqobjectlist.h> #include <tqpushbutton.h> #include <tdeapplication.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tqstyle.h> #include <kdialog.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "kcalc.h" extern last_input_type last_input; diff --git a/kspread/plugins/calculator/kcalc_core.cpp b/kspread/plugins/calculator/kcalc_core.cpp index bdba8469f..881a05ebe 100644 --- a/kspread/plugins/calculator/kcalc_core.cpp +++ b/kspread/plugins/calculator/kcalc_core.cpp @@ -36,8 +36,8 @@ #include <limits.h> #include <math.h> #include <signal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knotifyclient.h> #include "kcalc.h" diff --git a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc index dc4c169ed..ba6f23355 100644 --- a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc +++ b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc @@ -35,9 +35,9 @@ #include <kcalendarsystemfactory.h> #include <tdeaboutdata.h> #include <kgenericfactory.h> -#include <klocale.h> +#include <tdelocale.h> #include <kofficeversion.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqpoint.h> #include <tqrect.h> |