diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
| commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
| tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /kicker/applets/trash | |
| parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
| download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip | |
Rename a number of libraries and executables 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 6e1f11504..478ac01ec 100644 --- a/kicker/applets/trash/trashapplet.cpp +++ b/kicker/applets/trash/trashapplet.cpp @@ -19,7 +19,7 @@ #include <kglobal.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kaboutdata.h> #include <kaboutapplication.h> diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp index 57904db43..1f45e1fb4 100644 --- a/kicker/applets/trash/trashbutton.cpp +++ b/kicker/applets/trash/trashbutton.cpp @@ -26,7 +26,7 @@ #include <krun.h> #include <kpopupmenu.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <konq_operations.h> #include <konq_popupmenu.h> diff --git a/kicker/applets/trash/trashbutton.h b/kicker/applets/trash/trashbutton.h index 891e274c0..0ddad290e 100644 --- a/kicker/applets/trash/trashbutton.h +++ b/kicker/applets/trash/trashbutton.h @@ -26,7 +26,7 @@ #include <tqpixmap.h> #include <tqcursor.h> #include <tqtimer.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kpanelapplet.h> #include <kactioncollection.h> |