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 /lib/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 'lib/kformula')
-rw-r--r-- | lib/kformula/kformulaconfigpage.cc | 4 | ||||
-rw-r--r-- | lib/kformula/kformuladocument.h | 2 | ||||
-rw-r--r-- | lib/kformula/symbolaction.cc | 2 | ||||
-rw-r--r-- | lib/kformula/symbolaction.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/kformula/kformulaconfigpage.cc b/lib/kformula/kformulaconfigpage.cc index 687345e2..da930dba 100644 --- a/lib/kformula/kformulaconfigpage.cc +++ b/lib/kformula/kformulaconfigpage.cc @@ -37,8 +37,8 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> -#include <kfontdialog.h> -#include <klistview.h> +#include <tdefontdialog.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> #include <knuminput.h> diff --git a/lib/kformula/kformuladocument.h b/lib/kformula/kformuladocument.h index 8a3dd77d..7a8f0369 100644 --- a/lib/kformula/kformuladocument.h +++ b/lib/kformula/kformuladocument.h @@ -27,7 +27,7 @@ #include <tqstring.h> #include <tqstringlist.h> -#include <kaction.h> +#include <tdeaction.h> #include <kcommand.h> #include <tdeconfig.h> #include <KoCommandHistory.h> diff --git a/lib/kformula/symbolaction.cc b/lib/kformula/symbolaction.cc index 58074a2b..8591eb04 100644 --- a/lib/kformula/symbolaction.cc +++ b/lib/kformula/symbolaction.cc @@ -23,7 +23,7 @@ #include <kapplication.h> #include <kcombobox.h> #include <kglobalsettings.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> #include <kdebug.h> #include "symbolaction.h" diff --git a/lib/kformula/symbolaction.h b/lib/kformula/symbolaction.h index a7c91292..8021ed50 100644 --- a/lib/kformula/symbolaction.h +++ b/lib/kformula/symbolaction.h @@ -20,7 +20,7 @@ #ifndef _SYMBOLACTION_H_ #define _SYMBOLACTION_H_ -#include <kaction.h> +#include <tdeaction.h> #include <tqvaluelist.h> #include <tqstringlist.h> #include <tqmemarray.h> |