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 /noatun-plugins | |
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 'noatun-plugins')
-rw-r--r-- | noatun-plugins/alsaplayer/userinterface.cpp | 2 | ||||
-rw-r--r-- | noatun-plugins/dub/dub/dub.h | 2 | ||||
-rw-r--r-- | noatun-plugins/dub/dub/dubapp.h | 6 | ||||
-rw-r--r-- | noatun-plugins/dub/dub/fileselectorwidget.h | 2 | ||||
-rw-r--r-- | noatun-plugins/lyrics/cmodule.cpp | 2 | ||||
-rw-r--r-- | noatun-plugins/lyrics/lyrics.h | 4 | ||||
-rw-r--r-- | noatun-plugins/nexscope/gui.cpp | 2 | ||||
-rw-r--r-- | noatun-plugins/nexscope/gui.h | 4 | ||||
-rw-r--r-- | noatun-plugins/oblique/cmodule.cpp | 2 | ||||
-rw-r--r-- | noatun-plugins/oblique/menu.h | 4 | ||||
-rw-r--r-- | noatun-plugins/oblique/tree.h | 2 | ||||
-rw-r--r-- | noatun-plugins/oblique/view.h | 4 | ||||
-rw-r--r-- | noatun-plugins/wavecapture/wavecapture.cpp | 4 |
13 files changed, 20 insertions, 20 deletions
diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp index 5eadaf9..4ec4867 100644 --- a/noatun-plugins/alsaplayer/userinterface.cpp +++ b/noatun-plugins/alsaplayer/userinterface.cpp @@ -35,7 +35,7 @@ #include <tqframe.h> #include <kstatusbar.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kurldrag.h> #include <kglobal.h> #include <tdeconfig.h> diff --git a/noatun-plugins/dub/dub/dub.h b/noatun-plugins/dub/dub/dub.h index bd44224..fcee29c 100644 --- a/noatun-plugins/dub/dub/dub.h +++ b/noatun-plugins/dub/dub/dub.h @@ -25,7 +25,7 @@ // KDE includes #include <kapplication.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kurl.h> #include <noatun/plugin.h> #include <noatun/playlist.h> diff --git a/noatun-plugins/dub/dub/dubapp.h b/noatun-plugins/dub/dub/dubapp.h index 1ddf273..60f6d16 100644 --- a/noatun-plugins/dub/dub/dubapp.h +++ b/noatun-plugins/dub/dub/dubapp.h @@ -20,9 +20,9 @@ // include files for KDE #include <kapplication.h> -#include <kmainwindow.h> -#include <kaccel.h> -#include <kaction.h> +#include <tdemainwindow.h> +#include <tdeaccel.h> +#include <tdeaction.h> // forward declaration of the Dub classes class DubView; diff --git a/noatun-plugins/dub/dub/fileselectorwidget.h b/noatun-plugins/dub/dub/fileselectorwidget.h index 9d38a86..3f32cec 100644 --- a/noatun-plugins/dub/dub/fileselectorwidget.h +++ b/noatun-plugins/dub/dub/fileselectorwidget.h @@ -19,7 +19,7 @@ #include <tqstrlist.h> #include <tqtooltip.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqvbox.h> #include <tqwidget.h> #include <tdefile.h> diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp index f79b88e..5db1338 100644 --- a/noatun-plugins/lyrics/cmodule.cpp +++ b/noatun-plugins/lyrics/cmodule.cpp @@ -6,7 +6,7 @@ #include <kmessagebox.h> #include <tqvgroupbox.h> #include <tqgrid.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <klineedit.h> #include <kbuttonbox.h> #include <klocale.h> diff --git a/noatun-plugins/lyrics/lyrics.h b/noatun-plugins/lyrics/lyrics.h index a5b411b..71bcfb8 100644 --- a/noatun-plugins/lyrics/lyrics.h +++ b/noatun-plugins/lyrics/lyrics.h @@ -4,10 +4,10 @@ #include <noatun/plugin.h> #include <noatun/player.h> #include <noatun/app.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tqvaluevector.h> #include <tdehtml_part.h> -#include <kaction.h> +#include <tdeaction.h> #include "cmodule.h" class HistoryManager; diff --git a/noatun-plugins/nexscope/gui.cpp b/noatun-plugins/nexscope/gui.cpp index 0a9e28d..62cd27a 100644 --- a/noatun-plugins/nexscope/gui.cpp +++ b/noatun-plugins/nexscope/gui.cpp @@ -4,7 +4,7 @@ #include <tqdragobject.h> #include <tdefiledialog.h> #include <kstdaction.h> -#include <kaction.h> +#include <tdeaction.h> #include "gui.h" #include "renderers.h" diff --git a/noatun-plugins/nexscope/gui.h b/noatun-plugins/nexscope/gui.h index 0630486..c817eee 100644 --- a/noatun-plugins/nexscope/gui.h +++ b/noatun-plugins/nexscope/gui.h @@ -1,8 +1,8 @@ #ifndef GUI_H #define GUI_H -#include <kmainwindow.h> -#include <klistview.h> +#include <tdemainwindow.h> +#include <tdelistview.h> #include <tqsplitter.h> #include <tqdict.h> #include <dcopobject.h> diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp index 83cc1bb..57e3527 100644 --- a/noatun-plugins/oblique/cmodule.cpp +++ b/noatun-plugins/oblique/cmodule.cpp @@ -8,7 +8,7 @@ #include <kregexpeditorinterface.h> #include <tdeparts/componentfactory.h> #include <klocale.h> -#include <klistview.h> +#include <tdelistview.h> #include <klineedit.h> #include <kiconloader.h> #include <kinputdialog.h> diff --git a/noatun-plugins/oblique/menu.h b/noatun-plugins/oblique/menu.h index 32d7d8d..88c8ea7 100644 --- a/noatun-plugins/oblique/menu.h +++ b/noatun-plugins/oblique/menu.h @@ -4,9 +4,9 @@ #ifndef MENU_H #define MENU_H -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kpropertiesdialog.h> -#include <kaction.h> +#include <tdeaction.h> #include "file.h" #include "oblique.h" diff --git a/noatun-plugins/oblique/tree.h b/noatun-plugins/oblique/tree.h index c55e606..0bfb49c 100644 --- a/noatun-plugins/oblique/tree.h +++ b/noatun-plugins/oblique/tree.h @@ -5,7 +5,7 @@ #define TREE_H #include <tqwidget.h> -#include <klistview.h> +#include <tdelistview.h> #include "base.h" #include "query.h" diff --git a/noatun-plugins/oblique/view.h b/noatun-plugins/oblique/view.h index 397fc62..a9b3cdf 100644 --- a/noatun-plugins/oblique/view.h +++ b/noatun-plugins/oblique/view.h @@ -4,8 +4,8 @@ #ifndef VIEW_H #define VIEW_H -#include <kmainwindow.h> -#include <kaction.h> +#include <tdemainwindow.h> +#include <tdeaction.h> #include <klineedit.h> #include "tree.h" diff --git a/noatun-plugins/wavecapture/wavecapture.cpp b/noatun-plugins/wavecapture/wavecapture.cpp index 6c51903..44a1a77 100644 --- a/noatun-plugins/wavecapture/wavecapture.cpp +++ b/noatun-plugins/wavecapture/wavecapture.cpp @@ -27,10 +27,10 @@ #include <arts/mcoputils.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tdefiledialog.h> #include <kurl.h> -#include <krecentdocument.h> +#include <tderecentdocument.h> #include <tdeio/job.h> #include <tdeio/jobclasses.h> |