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 /kword/KWMailMergeDataBase.cpp | |
| 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 'kword/KWMailMergeDataBase.cpp')
| -rw-r--r-- | kword/KWMailMergeDataBase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp index db95cf5e..8ef08e91 100644 --- a/kword/KWMailMergeDataBase.cpp +++ b/kword/KWMailMergeDataBase.cpp @@ -28,11 +28,11 @@ #include <klocale.h> #include <kdebug.h> #include <kstdaction.h> -#include <kaction.h> +#include <tdeaction.h> #include <kmessagebox.h> #include <kseparator.h> #include <kservice.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tqfile.h> #include <tqvbox.h> |