diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:17:49 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:17:49 -0600 |
| commit | a9184bb205c837f932e03b2a6cac578582f36ed5 (patch) | |
| tree | 0b69cad530a4c1d0aa8f36ecd50f72f2f589e980 /kicker-applets/mediacontrol | |
| parent | 74a2067d286867e313f736d6733407586b71195e (diff) | |
| download | tdeaddons-a9184bb205c837f932e03b2a6cac578582f36ed5.tar.gz tdeaddons-a9184bb205c837f932e03b2a6cac578582f36ed5.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kicker-applets/mediacontrol')
| -rw-r--r-- | kicker-applets/mediacontrol/mediacontrol.cpp | 2 | ||||
| -rw-r--r-- | kicker-applets/mediacontrol/mediacontrolconfig.cpp | 2 | ||||
| -rw-r--r-- | kicker-applets/mediacontrol/mediacontrolconfigwidget.ui | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp index ec09ddb..23cfd83 100644 --- a/kicker-applets/mediacontrol/mediacontrol.cpp +++ b/kicker-applets/mediacontrol/mediacontrol.cpp @@ -42,7 +42,7 @@ #include <tqslider.h> #include <tqpainter.h> #include <tqiconset.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kapplication.h> #include <kipc.h> diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp index 8a10717..b423fdb 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp +++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp @@ -37,7 +37,7 @@ #include <tdeconfig.h> #include <kglobal.h> #include <kiconloader.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <klocale.h> #include <knuminput.h> #include <kstandarddirs.h> diff --git a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui index 1f1b835..6d28ca3 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui +++ b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui @@ -359,16 +359,16 @@ <include location="local" impldecl="in implementation"></include> <include location="local" impldecl="in declaration"></include> <include location="global" impldecl="in declaration">knuminput.h</include> - <include location="global" impldecl="in declaration">klistview.h</include> - <include location="global" impldecl="in declaration">klistbox.h</include> + <include location="global" impldecl="in declaration">tdelistview.h</include> + <include location="global" impldecl="in declaration">tdelistbox.h</include> </includes> <Q_SIGNALS> <signal>toggled(bool)</signal> </Q_SIGNALS> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> <includehint>knuminput.h</includehint> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> </includehints> </UI> |