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/htmlexport | |
| 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/htmlexport')
| -rw-r--r-- | noatun/modules/htmlexport/htmlexport.cpp | 2 | ||||
| -rw-r--r-- | noatun/modules/htmlexport/htmlexport.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp index 27746b69..60792eea 100644 --- a/noatun/modules/htmlexport/htmlexport.cpp +++ b/noatun/modules/htmlexport/htmlexport.cpp @@ -1,7 +1,7 @@ #include <klocale.h> #include <tqregexp.h> #include <tqtextcodec.h> -#include <kaction.h> +#include <tdeaction.h> #include <noatun/stdaction.h> #include "htmlexport.h" diff --git a/noatun/modules/htmlexport/htmlexport.h b/noatun/modules/htmlexport/htmlexport.h index 0c3de125..d9acd313 100644 --- a/noatun/modules/htmlexport/htmlexport.h +++ b/noatun/modules/htmlexport/htmlexport.h @@ -14,7 +14,7 @@ #include <tqwhatsthis.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tdefiledialog.h> #include <ktempfile.h> #include <kcolorbutton.h> |