diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:12:56 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:12:56 -0600 |
commit | ece35c015c54312eb13f583cc247cdd9a4051b4d (patch) | |
tree | 2c0599b8705e881f2b53678f48e97ffe4f616d22 /kformula | |
parent | c260bb1b22af487f2410c2c7f6c35db3fe1d57b9 (diff) | |
download | koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.tar.gz koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.zip |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kformula')
-rw-r--r-- | kformula/kformula_doc.cc | 2 | ||||
-rw-r--r-- | kformula/kformula_view.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kformula/kformula_doc.cc b/kformula/kformula_doc.cc index c5d1326c..ac8c8bcd 100644 --- a/kformula/kformula_doc.cc +++ b/kformula/kformula_doc.cc @@ -37,7 +37,7 @@ #include <unistd.h> #include <kaboutdialog.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kdebug.h> #include <KoGlobal.h> diff --git a/kformula/kformula_view.cc b/kformula/kformula_view.cc index 4433ddd7..aebcd1c4 100644 --- a/kformula/kformula_view.cc +++ b/kformula/kformula_view.cc @@ -25,7 +25,7 @@ class KPrinter; #include <tqtextedit.h> #include <tqtimer.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <kiconloader.h> #include <klocale.h> |