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 /kicker/applets/trash | |
| 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 'kicker/applets/trash')
| -rw-r--r-- | kicker/applets/trash/trashapplet.cpp | 2 | ||||
| -rw-r--r-- | kicker/applets/trash/trashbutton.cpp | 2 | ||||
| -rw-r--r-- | kicker/applets/trash/trashbutton.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp index 478ac01ec..3b7ae419a 100644 --- a/kicker/applets/trash/trashapplet.cpp +++ b/kicker/applets/trash/trashapplet.cpp @@ -24,7 +24,7 @@ #include <kaboutdata.h> #include <kaboutapplication.h> #include <kdebug.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kiconloader.h> #include "trashapplet.h" diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp index fe8ad3200..526048c59 100644 --- a/kicker/applets/trash/trashbutton.cpp +++ b/kicker/applets/trash/trashbutton.cpp @@ -24,7 +24,7 @@ #include <klocale.h> #include <krun.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tdeio/netaccess.h> diff --git a/kicker/applets/trash/trashbutton.h b/kicker/applets/trash/trashbutton.h index 15c5d598f..bbf596a0c 100644 --- a/kicker/applets/trash/trashbutton.h +++ b/kicker/applets/trash/trashbutton.h @@ -28,7 +28,7 @@ #include <tqtimer.h> #include <tdefileitem.h> #include <kpanelapplet.h> -#include <kactioncollection.h> +#include <tdeactioncollection.h> class TrashButton : public PanelPopupButton { |