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

---
 katapult/common/imagedisplay.cpp        | 2 +-
 katapult/common/imagedisplaysettings.ui | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'katapult/common')

diff --git a/katapult/common/imagedisplay.cpp b/katapult/common/imagedisplay.cpp
index 7ae95f7..27eae8e 100644
--- a/katapult/common/imagedisplay.cpp
+++ b/katapult/common/imagedisplay.cpp
@@ -27,7 +27,7 @@
 #include <kimageeffect.h>
 #include <kgenericfactory.h>
 #include <tdeconfig.h>
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
 #include <klocale.h>
 
 #include <tqpainter.h>
diff --git a/katapult/common/imagedisplaysettings.ui b/katapult/common/imagedisplaysettings.ui
index 30e5ef6..59c8e8e 100644
--- a/katapult/common/imagedisplaysettings.ui
+++ b/katapult/common/imagedisplaysettings.ui
@@ -207,7 +207,7 @@
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>kfontcombo.h</includehint>
+    <includehint>tdefontcombo.h</includehint>
     <includehint>klineedit.h</includehint>
 </includehints>
 </UI>
-- 
cgit v1.2.3