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 /libkscan | |
| 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 'libkscan')
| -rw-r--r-- | libkscan/img_canvas.cpp | 2 | ||||
| -rw-r--r-- | libkscan/previewer.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libkscan/img_canvas.cpp b/libkscan/img_canvas.cpp index 9618b47b..5dfa43b7 100644 --- a/libkscan/img_canvas.cpp +++ b/libkscan/img_canvas.cpp @@ -22,7 +22,7 @@ #include <tqstring.h> #include <tqmessagebox.h> #include <tqscrollview.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tqlabel.h> #include <tqdict.h> #include <tqimage.h> diff --git a/libkscan/previewer.cpp b/libkscan/previewer.cpp index 5aba1b04..a8d3f6be 100644 --- a/libkscan/previewer.cpp +++ b/libkscan/previewer.cpp @@ -33,7 +33,7 @@ #include <kdebug.h> #include <klocale.h> #include <kcombobox.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstandarddirs.h> #include "previewer.h" |