diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:12:56 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:12:56 -0600 |
| commit | ece35c015c54312eb13f583cc247cdd9a4051b4d (patch) | |
| tree | 2c0599b8705e881f2b53678f48e97ffe4f616d22 /kword/mailmerge | |
| parent | c260bb1b22af487f2410c2c7f6c35db3fe1d57b9 (diff) | |
| download | koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.tar.gz koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kword/mailmerge')
| -rw-r--r-- | kword/mailmerge/kabc/KWMailMergeKABCConfig.h | 2 | ||||
| -rw-r--r-- | kword/mailmerge/kabc/addresspicker.ui | 4 | ||||
| -rw-r--r-- | kword/mailmerge/sql/kwqtsqlpower.ui | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.h b/kword/mailmerge/kabc/KWMailMergeKABCConfig.h index a7fec850..1024ecd0 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.h +++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.h @@ -22,7 +22,7 @@ #define _KWMAILMERGE_KABC_CONFIG_H_ #include <kdialogbase.h> -#include <klistview.h> +#include <tdelistview.h> #include <kabc/stdaddressbook.h> #include "KWMailMergeKABC.h" diff --git a/kword/mailmerge/kabc/addresspicker.ui b/kword/mailmerge/kabc/addresspicker.ui index 38430e4b..44dc8c8f 100644 --- a/kword/mailmerge/kabc/addresspicker.ui +++ b/kword/mailmerge/kabc/addresspicker.ui @@ -291,7 +291,7 @@ <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> - <includehint>klistview.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> 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"/> |