diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:12:56 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:12:56 -0600 |
| commit | ece35c015c54312eb13f583cc247cdd9a4051b4d (patch) | |
| tree | 2c0599b8705e881f2b53678f48e97ffe4f616d22 /lib/kofficeui/kcoloractions.h | |
| parent | c260bb1b22af487f2410c2c7f6c35db3fe1d57b9 (diff) | |
| download | koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.tar.gz koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'lib/kofficeui/kcoloractions.h')
| -rw-r--r-- | lib/kofficeui/kcoloractions.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kofficeui/kcoloractions.h b/lib/kofficeui/kcoloractions.h index db832d8b..8842f480 100644 --- a/lib/kofficeui/kcoloractions.h +++ b/lib/kofficeui/kcoloractions.h @@ -20,7 +20,7 @@ #ifndef kcoloractions_h #define kcoloractions_h -#include <kaction.h> +#include <tdeaction.h> /** * An action whose pixmap is automatically generated from a color. @@ -94,7 +94,7 @@ signals: void colorSelected( const TQColor& color ); private: - TQString whatsThisWithIcon() const; // duplicated, as it's private in kaction + TQString whatsThisWithIcon() const; // duplicated, as it's private in tdeaction Type m_type; TQColor m_color; |