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 /kooka | |
| 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 'kooka')
| -rw-r--r-- | kooka/dwmenuaction.h | 2 | ||||
| -rw-r--r-- | kooka/kooka.cpp | 6 | ||||
| -rw-r--r-- | kooka/kooka.h | 2 | ||||
| -rw-r--r-- | kooka/kookaview.cpp | 6 | ||||
| -rw-r--r-- | kooka/scanpackager.cpp | 4 | ||||
| -rw-r--r-- | kooka/scanpackager.h | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/kooka/dwmenuaction.h b/kooka/dwmenuaction.h index 0430eb29..130933a4 100644 --- a/kooka/dwmenuaction.h +++ b/kooka/dwmenuaction.h @@ -31,7 +31,7 @@ #define __DW_MENU_ACTION #include <kdockwidget.h> #include <tqstring.h> -#include <kaction.h> +#include <tdeaction.h> /** * This class is just a helper class since the KDockWidget classes do not yet diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp index 018fa120..5c08f69b 100644 --- a/kooka/kooka.cpp +++ b/kooka/kooka.cpp @@ -41,7 +41,7 @@ #include <kdebug.h> #include <kiconloader.h> #include <kmenubar.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <tdeio/netaccess.h> #include <tdefiledialog.h> #include <tdeconfig.h> @@ -54,8 +54,8 @@ #include <kmessagebox.h> #include <kdockwidget.h> #include <tdeparts/partmanager.h> -#include <kstdaccel.h> -#include <kaction.h> +#include <tdestdaccel.h> +#include <tdeaction.h> #include <kstdaction.h> #include <tqiconset.h> #include <kurldrag.h> diff --git a/kooka/kooka.h b/kooka/kooka.h index 6702af62..f689ce5f 100644 --- a/kooka/kooka.h +++ b/kooka/kooka.h @@ -32,7 +32,7 @@ #endif #include <kapplication.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kdockwidget.h> #include <tdeparts/dockmainwindow.h> diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp index d74eed20..d7a32f80 100644 --- a/kooka/kookaview.cpp +++ b/kooka/kookaview.cpp @@ -68,15 +68,15 @@ #include <keditcl.h> #include <kled.h> #include <kcombobox.h> -#include <kaction.h> +#include <tdeaction.h> #include <kiconloader.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <kdockwidget.h> #include <tqobject.h> #include <tdeparts/componentfactory.h> #include <tqimage.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #define STARTUP_IMG_SELECTION "SelectedImageOnStartup" diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp index e02ff547..50fd6ed9 100644 --- a/kooka/scanpackager.cpp +++ b/kooka/scanpackager.cpp @@ -50,8 +50,8 @@ #include <tdefiletreebranch.h> #include <kurldrag.h> -#include <kpopupmenu.h> -#include <kaction.h> +#include <tdepopupmenu.h> +#include <tdeaction.h> #include <kinputdialog.h> #include <kiconloader.h> #include <tdefiledialog.h> diff --git a/kooka/scanpackager.h b/kooka/scanpackager.h index 0fcabb38..fdae6495 100644 --- a/kooka/scanpackager.h +++ b/kooka/scanpackager.h @@ -33,7 +33,7 @@ #include <tqpixmap.h> #include <tqdragobject.h> #include <tqmap.h> -#include <klistview.h> +#include <tdelistview.h> #include <tdeio/job.h> #include <tdeio/global.h> #include <tdeio/file.h> |