summaryrefslogtreecommitdiffstats
path: root/katapult/common/imagedisplay.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:10:39 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:10:39 -0600
commit66bf73b75045120f34acc1034f3b43529931a736 (patch)
tree59d6f68a9d89978f35bd4cc97a69e0748fa58049 /katapult/common/imagedisplay.cpp
parent06792503135e0aec3aa89075946feb38b981fbc6 (diff)
downloadkatapult-66bf73b75045120f34acc1034f3b43529931a736.tar.gz
katapult-66bf73b75045120f34acc1034f3b43529931a736.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'katapult/common/imagedisplay.cpp')
-rw-r--r--katapult/common/imagedisplay.cpp2
1 files changed, 1 insertions, 1 deletions
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>