summaryrefslogtreecommitdiffstats
path: root/src/kdiff3.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:11:02 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:11:02 -0600
commit533c3127e1498430584d456034fe2558101d99cb (patch)
treec65bb79b9fe98e34fbdca81ae843289fd47d14f0 /src/kdiff3.h
parent821dbb340f650965ff257f4dec7b31ed7458c6e1 (diff)
downloadkdiff3-533c3127e1498430584d456034fe2558101d99cb.tar.gz
kdiff3-533c3127e1498430584d456034fe2558101d99cb.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/kdiff3.h')
-rw-r--r--src/kdiff3.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/kdiff3.h b/src/kdiff3.h
index 55d0a82..ff0ed8c 100644
--- a/src/kdiff3.h
+++ b/src/kdiff3.h
@@ -31,9 +31,9 @@
// include files for KDE
#include <kapplication.h>
-#include <kmainwindow.h>
-#include <kaccel.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
#include <kurl.h>
#include <tdeparts/mainwindow.h>