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/media | |
| 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/media')
| -rw-r--r-- | kicker/applets/media/mediaapplet.cpp | 2 | ||||
| -rw-r--r-- | kicker/applets/media/mediaapplet.h | 4 | ||||
| -rw-r--r-- | kicker/applets/media/mediumbutton.h | 2 | ||||
| -rw-r--r-- | kicker/applets/media/preferencesdialog.cpp | 2 | ||||
| -rw-r--r-- | kicker/applets/media/preferencesdialog.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp index 527c92b62..f8a1ac630 100644 --- a/kicker/applets/media/mediaapplet.cpp +++ b/kicker/applets/media/mediaapplet.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/media/mediaapplet.h b/kicker/applets/media/mediaapplet.h index 68d0b5d99..4c57b508d 100644 --- a/kicker/applets/media/mediaapplet.h +++ b/kicker/applets/media/mediaapplet.h @@ -26,9 +26,9 @@ #include <kpanelapplet.h> #include <tqstring.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kurl.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kdirlister.h> #include <tqptrlist.h> diff --git a/kicker/applets/media/mediumbutton.h b/kicker/applets/media/mediumbutton.h index 3fa31756a..5f6a2b80b 100644 --- a/kicker/applets/media/mediumbutton.h +++ b/kicker/applets/media/mediumbutton.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> diff --git a/kicker/applets/media/preferencesdialog.cpp b/kicker/applets/media/preferencesdialog.cpp index bf8234fe5..f53381a10 100644 --- a/kicker/applets/media/preferencesdialog.cpp +++ b/kicker/applets/media/preferencesdialog.cpp @@ -24,7 +24,7 @@ #include <tqvbox.h> #include <tqwhatsthis.h> #include <klistview.h> -#include <kfiledetailview.h> +#include <tdefiledetailview.h> class MediumTypeItem : public TQCheckListItem { diff --git a/kicker/applets/media/preferencesdialog.h b/kicker/applets/media/preferencesdialog.h index e946f81de..f758d280b 100644 --- a/kicker/applets/media/preferencesdialog.h +++ b/kicker/applets/media/preferencesdialog.h @@ -22,7 +22,7 @@ #include <tqwidget.h> #include <kdialogbase.h> -#include <kfileitem.h> +#include <tdefileitem.h> /** *@author ervin |