From 432e997b127e9f43d0db24426c49e298a5eb2d96 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:15:20 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 src/kvilib/tal/kvi_tal_mainwindow_kde.h | 2 +-
 src/kvilib/tal/kvi_tal_toolbar_kde.h    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/kvilib')

diff --git a/src/kvilib/tal/kvi_tal_mainwindow_kde.h b/src/kvilib/tal/kvi_tal_mainwindow_kde.h
index 32250c31..9cf7928b 100644
--- a/src/kvilib/tal/kvi_tal_mainwindow_kde.h
+++ b/src/kvilib/tal/kvi_tal_mainwindow_kde.h
@@ -23,7 +23,7 @@
 //   Inc. ,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class KVILIB_API KviTalMainWindow : public TDEMainWindow
 {
diff --git a/src/kvilib/tal/kvi_tal_toolbar_kde.h b/src/kvilib/tal/kvi_tal_toolbar_kde.h
index 6310edb9..d6e22710 100644
--- a/src/kvilib/tal/kvi_tal_toolbar_kde.h
+++ b/src/kvilib/tal/kvi_tal_toolbar_kde.h
@@ -22,7 +22,7 @@
 //   Inc. ,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 #include "kvi_tal_toolbardocktype.h"
 
-- 
cgit v1.2.1