diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:12:56 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:12:56 -0600 |
| commit | ece35c015c54312eb13f583cc247cdd9a4051b4d (patch) | |
| tree | 2c0599b8705e881f2b53678f48e97ffe4f616d22 /koshell | |
| 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 'koshell')
| -rw-r--r-- | koshell/iconsidepane.cpp | 2 | ||||
| -rw-r--r-- | koshell/iconsidepane.h | 4 | ||||
| -rw-r--r-- | koshell/koshell_shell.cc | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/koshell/iconsidepane.cpp b/koshell/iconsidepane.cpp index 87fb5251..003762c2 100644 --- a/koshell/iconsidepane.cpp +++ b/koshell/iconsidepane.cpp @@ -39,7 +39,7 @@ #include <kdialog.h> #include <kiconloader.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kpushbutton.h> #include "iconsidepane.h" diff --git a/koshell/iconsidepane.h b/koshell/iconsidepane.h index 5510ffa9..3b72d0a9 100644 --- a/koshell/iconsidepane.h +++ b/koshell/iconsidepane.h @@ -22,8 +22,8 @@ #ifndef KOFFICE_ICONSIDEPANEBASE_H #define KOFFICE_ICONSIDEPANEBASE_H -#include <kactioncollection.h> -#include <klistbox.h> +#include <tdeactioncollection.h> +#include <tdelistbox.h> #include <tqbuttongroup.h> #include <tqlayout.h> diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cc index 763026e3..991a2a09 100644 --- a/koshell/koshell_shell.cc +++ b/koshell/koshell_shell.cc @@ -40,12 +40,12 @@ #include <kkeydialog.h> #include <kstandarddirs.h> #include <klibloader.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kservice.h> #include <kmessagebox.h> -#include <krecentdocument.h> +#include <tderecentdocument.h> #include <tdeparts/partmanager.h> -#include <kaction.h> +#include <tdeaction.h> #include <tdeversion.h> #include <kaboutdata.h> |