diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:10:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:10:39 -0600 |
| commit | 66bf73b75045120f34acc1034f3b43529931a736 (patch) | |
| tree | 59d6f68a9d89978f35bd4cc97a69e0748fa58049 /katapult/common | |
| parent | 06792503135e0aec3aa89075946feb38b981fbc6 (diff) | |
| download | katapult-66bf73b75045120f34acc1034f3b43529931a736.tar.gz katapult-66bf73b75045120f34acc1034f3b43529931a736.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'katapult/common')
| -rw-r--r-- | katapult/common/imagedisplay.cpp | 2 | ||||
| -rw-r--r-- | katapult/common/imagedisplaysettings.ui | 2 |
2 files changed, 2 insertions, 2 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> 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> |