diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:33 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:33 -0600 |
| commit | 5b28c57424294aa30218a9c11cd6ed1a929409b6 (patch) | |
| tree | aaa8c9380d183dfa87857abd34b3ef42bb0de1b5 /noatun/modules/kjofol-skin | |
| parent | 120dff5f18d13aab7d2731de84e64c898728dc60 (diff) | |
| download | tdemultimedia-5b28c57424294aa30218a9c11cd6ed1a929409b6.tar.gz tdemultimedia-5b28c57424294aa30218a9c11cd6ed1a929409b6.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'noatun/modules/kjofol-skin')
| -rw-r--r-- | noatun/modules/kjofol-skin/kjbutton.cpp | 2 | ||||
| -rw-r--r-- | noatun/modules/kjofol-skin/kjguisettingswidget.ui | 2 | ||||
| -rw-r--r-- | noatun/modules/kjofol-skin/kjloader.cpp | 4 | ||||
| -rw-r--r-- | noatun/modules/kjofol-skin/kjprefs.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp index f6c60256..d027217c 100644 --- a/noatun/modules/kjofol-skin/kjbutton.cpp +++ b/noatun/modules/kjofol-skin/kjbutton.cpp @@ -24,7 +24,7 @@ #include <kurl.h> #include <tdefiledialog.h> #include <khelpmenu.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> /******************************************* * KJButton diff --git a/noatun/modules/kjofol-skin/kjguisettingswidget.ui b/noatun/modules/kjofol-skin/kjguisettingswidget.ui index 244e67a2..6088732e 100644 --- a/noatun/modules/kjofol-skin/kjguisettingswidget.ui +++ b/noatun/modules/kjofol-skin/kjguisettingswidget.ui @@ -459,7 +459,7 @@ <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> <includehint>kcolorcombo.h</includehint> - <includehint>kfontcombo.h</includehint> + <includehint>tdefontcombo.h</includehint> <includehint>klineedit.h</includehint> </includehints> </UI> diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp index ee8ca247..67bf516c 100644 --- a/noatun/modules/kjofol-skin/kjloader.cpp +++ b/noatun/modules/kjofol-skin/kjloader.cpp @@ -52,12 +52,12 @@ #include <tqvbox.h> #include <tqlabel.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <tdefiledialog.h> #include <khelpmenu.h> #include <kstdaction.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <klocale.h> #include <kglobalsettings.h> #include <kglobal.h> diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp index 590d2f1a..20ff7750 100644 --- a/noatun/modules/kjofol-skin/kjprefs.cpp +++ b/noatun/modules/kjofol-skin/kjprefs.cpp @@ -40,7 +40,7 @@ #include <kprocess.h> #include <kstandarddirs.h> #include <kglobalsettings.h> -#include <kfontcombo.h> +#include <tdefontcombo.h> #include <kcolorcombo.h> static TQString expand(TQString s); |