summaryrefslogtreecommitdiffstats
path: root/kword/mailmerge/sql
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 23:12:56 -0600
committerTimothy Pearson <[email protected]>2013-02-01 23:12:56 -0600
commitece35c015c54312eb13f583cc247cdd9a4051b4d (patch)
tree2c0599b8705e881f2b53678f48e97ffe4f616d22 /kword/mailmerge/sql
parentc260bb1b22af487f2410c2c7f6c35db3fe1d57b9 (diff)
downloadkoffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.tar.gz
koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kword/mailmerge/sql')
-rw-r--r--kword/mailmerge/sql/kwqtsqlpower.ui2
1 files changed, 1 insertions, 1 deletions
diff --git a/kword/mailmerge/sql/kwqtsqlpower.ui b/kword/mailmerge/sql/kwqtsqlpower.ui
index 198e8f2f..f37b6079 100644
--- a/kword/mailmerge/sql/kwqtsqlpower.ui
+++ b/kword/mailmerge/sql/kwqtsqlpower.ui
@@ -226,7 +226,7 @@
</widget>
<includes>
<include location="global" impldecl="in declaration">klineedit.h</include>
- <include location="global" impldecl="in declaration">klistbox.h</include>
+ <include location="global" impldecl="in declaration">tdelistbox.h</include>
<include location="global" impldecl="in declaration">kpushbutton.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>