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 /kformula | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kformula')
| -rw-r--r-- | kformula/formulastring.cc | 4 | ||||
| -rw-r--r-- | kformula/fsparser.cc | 2 | ||||
| -rw-r--r-- | kformula/kfconfig.cc | 2 | ||||
| -rw-r--r-- | kformula/kformula_aboutdata.h | 2 | ||||
| -rw-r--r-- | kformula/kformula_doc.cc | 4 | ||||
| -rw-r--r-- | kformula/kformula_factory.cc | 4 | ||||
| -rw-r--r-- | kformula/kformula_view.cc | 4 | ||||
| -rw-r--r-- | kformula/main.cc | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/kformula/formulastring.cc b/kformula/formulastring.cc index 5730975f..f86b113a 100644 --- a/kformula/formulastring.cc +++ b/kformula/formulastring.cc @@ -26,8 +26,8 @@ #include <tqwhatsthis.h> #include <tdeapplication.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kstdguiitem.h> #include <kpushbutton.h> diff --git a/kformula/fsparser.cc b/kformula/fsparser.cc index 863cc9eb..b6bdd787 100644 --- a/kformula/fsparser.cc +++ b/kformula/fsparser.cc @@ -20,7 +20,7 @@ #include <tqptrlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kformuladefs.h> #include <kformuladocument.h> diff --git a/kformula/kfconfig.cc b/kformula/kfconfig.cc index d6ee6d79..82e3ae65 100644 --- a/kformula/kfconfig.cc +++ b/kformula/kfconfig.cc @@ -21,7 +21,7 @@ #include <kdebug.h> #include <kiconloader.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include "kfconfig.h" #include "kformula_factory.h" diff --git a/kformula/kformula_aboutdata.h b/kformula/kformula_aboutdata.h index 70941c48..20d5d5e2 100644 --- a/kformula/kformula_aboutdata.h +++ b/kformula/kformula_aboutdata.h @@ -23,7 +23,7 @@ #define KFORMULA_ABOUTDATA #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <config.h> static const char* description=I18N_NOOP("KOffice Formula Editor"); diff --git a/kformula/kformula_doc.cc b/kformula/kformula_doc.cc index fa2a9bd4..5eeb59f4 100644 --- a/kformula/kformula_doc.cc +++ b/kformula/kformula_doc.cc @@ -42,13 +42,13 @@ #include <kdebug.h> #include <KoGlobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstdaction.h> #include <kstandarddirs.h> #include <kurl.h> #include <KoXmlWriter.h> #include <KoStoreDevice.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <KoMainWindow.h> #include <kformulacontainer.h> diff --git a/kformula/kformula_factory.cc b/kformula/kformula_factory.cc index a23b7b64..1aebcfbd 100644 --- a/kformula/kformula_factory.cc +++ b/kformula/kformula_factory.cc @@ -6,9 +6,9 @@ #include <kiconloader.h> #include <tdefiledialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqstringlist.h> diff --git a/kformula/kformula_view.cc b/kformula/kformula_view.cc index aebcd1c4..2d93ce5d 100644 --- a/kformula/kformula_view.cc +++ b/kformula/kformula_view.cc @@ -28,10 +28,10 @@ class KPrinter; #include <tdeaction.h> #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstdaction.h> #include <ktip.h> -//#include <kglobal.h> +//#include <tdeglobal.h> #include <kformulacontainer.h> #include <kformuladocument.h> diff --git a/kformula/main.cc b/kformula/main.cc index 5d137add..a2337241 100644 --- a/kformula/main.cc +++ b/kformula/main.cc @@ -20,7 +20,7 @@ #include <KoApplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> #include "kformula_aboutdata.h" |