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

---
 ksirc/KSPrefs/page_autoconnect.cpp    | 2 +-
 ksirc/KSPrefs/page_autoconnectbase.ui | 2 +-
 ksirc/KSPrefs/page_font.h             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'ksirc/KSPrefs')

diff --git a/ksirc/KSPrefs/page_autoconnect.cpp b/ksirc/KSPrefs/page_autoconnect.cpp
index 964a4acd..86a78c6d 100644
--- a/ksirc/KSPrefs/page_autoconnect.cpp
+++ b/ksirc/KSPrefs/page_autoconnect.cpp
@@ -12,7 +12,7 @@
 
 #include <tqregexp.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
diff --git a/ksirc/KSPrefs/page_autoconnectbase.ui b/ksirc/KSPrefs/page_autoconnectbase.ui
index 664bf30f..ff220588 100644
--- a/ksirc/KSPrefs/page_autoconnectbase.ui
+++ b/ksirc/KSPrefs/page_autoconnectbase.ui
@@ -387,7 +387,7 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/ksirc/KSPrefs/page_font.h b/ksirc/KSPrefs/page_font.h
index 154ff014..ae910a2d 100644
--- a/ksirc/KSPrefs/page_font.h
+++ b/ksirc/KSPrefs/page_font.h
@@ -1,6 +1,6 @@
 #ifndef _PAGE_FONT
 #define _PAGE_FONT
-#include <kfontdialog.h> // For the font selection widget
+#include <tdefontdialog.h> // For the font selection widget
 #include <tqlayout.h> // For the tqlayout
 #include "ksopts.h"  // For storing the info.
 
-- 
cgit v1.2.1