From dbf3ee6a200368cbe33ce33f06a1534aa5de241b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:45:50 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 src/directorymergewindow.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/directorymergewindow.cpp')

diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp
index f3f9500..57f05aa 100644
--- a/src/directorymergewindow.cpp
+++ b/src/directorymergewindow.cpp
@@ -34,10 +34,10 @@
 #include <tqsplitter.h>
 #include <tqtextedit.h>
 #include <tqprogressdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <iostream>
 #include <assert.h>
 //#include <konq_popupmenu.h>
-- 
cgit v1.2.1