diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:11:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:11:02 -0600 |
| commit | 533c3127e1498430584d456034fe2558101d99cb (patch) | |
| tree | c65bb79b9fe98e34fbdca81ae843289fd47d14f0 /src/directorymergewindow.cpp | |
| parent | 821dbb340f650965ff257f4dec7b31ed7458c6e1 (diff) | |
| download | kdiff3-533c3127e1498430584d456034fe2558101d99cb.tar.gz kdiff3-533c3127e1498430584d456034fe2558101d99cb.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/directorymergewindow.cpp')
| -rw-r--r-- | src/directorymergewindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp index ac8d3ee..c020d0e 100644 --- a/src/directorymergewindow.cpp +++ b/src/directorymergewindow.cpp @@ -24,8 +24,8 @@ #include <tqapplication.h> #include <tqpixmap.h> #include <tqimage.h> -#include <kpopupmenu.h> -#include <kaction.h> +#include <tdepopupmenu.h> +#include <tdeaction.h> #include <tqregexp.h> #include <tqmessagebox.h> #include <tqlayout.h> |