diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /kxkb | |
| parent | eba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff) | |
| download | tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kxkb')
| -rw-r--r-- | kxkb/kxkb.cpp | 4 | ||||
| -rw-r--r-- | kxkb/kxkbtraywindow.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp index 47fabcdfa..c39204ed2 100644 --- a/kxkb/kxkb.cpp +++ b/kxkb/kxkb.cpp @@ -43,8 +43,8 @@ DESCRIPTION #include <ktempfile.h> #include <kstandarddirs.h> #include <kipc.h> -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <kdebug.h> #include <tdeconfig.h> diff --git a/kxkb/kxkbtraywindow.cpp b/kxkb/kxkbtraywindow.cpp index 6f899eadd..80b4979de 100644 --- a/kxkb/kxkbtraywindow.cpp +++ b/kxkb/kxkbtraywindow.cpp @@ -15,8 +15,8 @@ #include <klocale.h> #include <kiconeffect.h> #include <kiconloader.h> -#include <kpopupmenu.h> -#include <kaction.h> +#include <tdepopupmenu.h> +#include <tdeaction.h> #include <kuniqueapplication.h> #include "kxkbtraywindow.h" |