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/kopalette | |
| 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/kopalette')
| -rw-r--r-- | lib/kopalette/kopalette.cc | 2 | ||||
| -rw-r--r-- | lib/kopalette/kopalettemanager.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc index e93cae7c..2202a86f 100644 --- a/lib/kopalette/kopalette.cc +++ b/lib/kopalette/kopalette.cc @@ -32,7 +32,7 @@ #include <kglobal.h> #include <klocale.h> #include <kglobalsettings.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include <tdeconfig.h> #include <KoView.h> diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc index de35054a..688e1450 100644 --- a/lib/kopalette/kopalettemanager.cc +++ b/lib/kopalette/kopalettemanager.cc @@ -25,9 +25,9 @@ #include <tdeparts/event.h> #include <kapplication.h> -#include <kpopupmenu.h> -#include <kaction.h> -#include <kactionclasses.h> +#include <tdepopupmenu.h> +#include <tdeaction.h> +#include <tdeactionclasses.h> #include <kdebug.h> #include <klocale.h> #include <kglobal.h> |