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/koproperty/editors | |
| 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/koproperty/editors')
| -rw-r--r-- | lib/koproperty/editors/fontedit.cpp | 4 | ||||
| -rw-r--r-- | lib/koproperty/editors/pixmapedit.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp index 84c7c3d2..2de0468b 100644 --- a/lib/koproperty/editors/fontedit.cpp +++ b/lib/koproperty/editors/fontedit.cpp @@ -32,8 +32,8 @@ #include <tqtooltip.h> #include <tdeversion.h> -#include <kfontrequester.h> -#include <kaccelmanager.h> +#include <tdefontrequester.h> +#include <tdeaccelmanager.h> #include <klocale.h> //! @internal diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp index f803d4c3..a01248f2 100644 --- a/lib/koproperty/editors/pixmapedit.cpp +++ b/lib/koproperty/editors/pixmapedit.cpp @@ -40,7 +40,7 @@ #ifdef TQ_WS_WIN #include <win32_utils.h> -#include <krecentdirs.h> +#include <tderecentdirs.h> #endif #ifndef PURE_QT |