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 /kiconedit | |
| 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 'kiconedit')
| -rw-r--r-- | kiconedit/kiconconfig.cpp | 2 | ||||
| -rw-r--r-- | kiconedit/kiconedit.cpp | 2 | ||||
| -rw-r--r-- | kiconedit/kiconedit.h | 8 | ||||
| -rw-r--r-- | kiconedit/palettetoolbar.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/kiconedit/kiconconfig.cpp b/kiconedit/kiconconfig.cpp index 3dbd10e7..70bbba39 100644 --- a/kiconedit/kiconconfig.cpp +++ b/kiconedit/kiconconfig.cpp @@ -27,7 +27,7 @@ #include <tqbuttongroup.h> #include <tqradiobutton.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <kbuttonbox.h> #include <kapplication.h> #include <klocale.h> diff --git a/kiconedit/kiconedit.cpp b/kiconedit/kiconedit.cpp index c51e0d58..9ff485ff 100644 --- a/kiconedit/kiconedit.cpp +++ b/kiconedit/kiconedit.cpp @@ -21,7 +21,7 @@ #include <tqwhatsthis.h> #include <tqtooltip.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstdaction.h> #include <tdeconfig.h> #include <klocale.h> diff --git a/kiconedit/kiconedit.h b/kiconedit/kiconedit.h index 1b057b17..ac9f41bd 100644 --- a/kiconedit/kiconedit.h +++ b/kiconedit/kiconedit.h @@ -25,14 +25,14 @@ #include <tqpixmap.h> #include <tqptrlist.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kiconloader.h> #include <kmenubar.h> #include <kstatusbar.h> -#include <ktoolbar.h> -#include <kaccel.h> +#include <tdetoolbar.h> +#include <tdeaccel.h> #include <kurl.h> -#include <kaction.h> +#include <tdeaction.h> #include "knew.h" #include "kicon.h" diff --git a/kiconedit/palettetoolbar.h b/kiconedit/palettetoolbar.h index b54a2ac9..d9a60b40 100644 --- a/kiconedit/palettetoolbar.h +++ b/kiconedit/palettetoolbar.h @@ -22,7 +22,7 @@ #ifndef PALLETTETOOLBAR_H #define PALLETTETOOLBAR_H -#include <ktoolbar.h> +#include <tdetoolbar.h> class TQBoxLayout; class TQLabel; |