diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /tdeioslave/media/tdecmodule | |
| parent | eba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff) | |
| download | tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeioslave/media/tdecmodule')
| -rw-r--r-- | tdeioslave/media/tdecmodule/notifiermoduleview.ui | 2 | ||||
| -rw-r--r-- | tdeioslave/media/tdecmodule/serviceconfigdialog.cpp | 2 | ||||
| -rw-r--r-- | tdeioslave/media/tdecmodule/serviceview.ui | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tdeioslave/media/tdecmodule/notifiermoduleview.ui b/tdeioslave/media/tdecmodule/notifiermoduleview.ui index a5cd11622..ad32f7a3c 100644 --- a/tdeioslave/media/tdecmodule/notifiermoduleview.ui +++ b/tdeioslave/media/tdecmodule/notifiermoduleview.ui @@ -166,6 +166,6 @@ <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> </includehints> </UI> diff --git a/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp b/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp index 61dd060f2..989419703 100644 --- a/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp +++ b/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp @@ -21,7 +21,7 @@ #include <klocale.h> #include <klineedit.h> -#include <kactionselector.h> +#include <tdeactionselector.h> #include <kicondialog.h> #include <tqlistbox.h> #include <kservice.h> diff --git a/tdeioslave/media/tdecmodule/serviceview.ui b/tdeioslave/media/tdecmodule/serviceview.ui index 98a9f8666..2991d4c9f 100644 --- a/tdeioslave/media/tdecmodule/serviceview.ui +++ b/tdeioslave/media/tdecmodule/serviceview.ui @@ -240,7 +240,7 @@ <includehints> <includehint>kicondialog.h</includehint> <includehint>klineedit.h</includehint> - <includehint>kactionselector.h</includehint> + <includehint>tdeactionselector.h</includehint> <includehint>kactivelabel.h</includehint> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> |