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 /kcoloredit | |
| 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 'kcoloredit')
| -rw-r--r-- | kcoloredit/kcoloredit.cpp | 2 | ||||
| -rw-r--r-- | kcoloredit/kcoloredit.h | 4 | ||||
| -rw-r--r-- | kcoloredit/kxycolorselector.h | 2 | ||||
| -rw-r--r-- | kcoloredit/kzcolorselector.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/kcoloredit/kcoloredit.cpp b/kcoloredit/kcoloredit.cpp index 7ecc032e..d5079fa6 100644 --- a/kcoloredit/kcoloredit.cpp +++ b/kcoloredit/kcoloredit.cpp @@ -36,7 +36,7 @@ #include "kcoloreditdoc.h" #include "loadpalettedlg.h" #include "resource.h" -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstatusbar.h> diff --git a/kcoloredit/kcoloredit.h b/kcoloredit/kcoloredit.h index 557cdc02..81e8b200 100644 --- a/kcoloredit/kcoloredit.h +++ b/kcoloredit/kcoloredit.h @@ -27,8 +27,8 @@ // include files for KDE #include <kapplication.h> -#include <kmainwindow.h> -#include <kaction.h> +#include <tdemainwindow.h> +#include <tdeaction.h> // application specific includes #include "color.h" diff --git a/kcoloredit/kxycolorselector.h b/kcoloredit/kxycolorselector.h index 0016dac7..276174ff 100644 --- a/kcoloredit/kxycolorselector.h +++ b/kcoloredit/kxycolorselector.h @@ -19,7 +19,7 @@ #define KXYCOLORSELECTOR_H #include <tqwidget.h> -#include <kselect.h> +#include <tdeselect.h> #include "main.h" diff --git a/kcoloredit/kzcolorselector.h b/kcoloredit/kzcolorselector.h index 6afd369d..cae9d1c5 100644 --- a/kcoloredit/kzcolorselector.h +++ b/kcoloredit/kzcolorselector.h @@ -20,7 +20,7 @@ #include "tqcolor.h" #include "tqpixmap.h" -#include "kselect.h" +#include "tdeselect.h" #include "color.h" |