diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:20:36 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:20:36 -0600 |
| commit | 81576b133797828eaca3ac819f4adca21de8d327 (patch) | |
| tree | bb7f38c27a3f21d50df51a745c15739dde29bc68 /kamera/kcontrol | |
| parent | 32ace734b36de108d8322157aaa106069df16477 (diff) | |
| download | tdegraphics-81576b133797828eaca3ac819f4adca21de8d327.tar.gz tdegraphics-81576b133797828eaca3ac819f4adca21de8d327.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kamera/kcontrol')
| -rw-r--r-- | kamera/kcontrol/kamera.cpp | 6 | ||||
| -rw-r--r-- | kamera/kcontrol/kameradevice.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp index 58d47734..2af17897 100644 --- a/kamera/kcontrol/kamera.cpp +++ b/kamera/kcontrol/kamera.cpp @@ -25,14 +25,14 @@ #include <kgenericfactory.h> #include <ksimpleconfig.h> -#include <kaction.h> +#include <tdeaction.h> #include <kiconloader.h> #include <kmessagebox.h> #include <kiconview.h> #include <kdialog.h> #include <klocale.h> -#include <ktoolbar.h> -#include <kpopupmenu.h> +#include <tdetoolbar.h> +#include <tdepopupmenu.h> #include <kprotocolinfo.h> #include <kdebug.h> diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp index 8a76b37f..d5d74b99 100644 --- a/kamera/kcontrol/kameradevice.cpp +++ b/kamera/kcontrol/kameradevice.cpp @@ -33,7 +33,7 @@ #include <klocale.h> #include <tdeconfig.h> -#include <klistview.h> +#include <tdelistview.h> #include <kmessagebox.h> #include <kdebug.h> |