diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:53:57 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:53:57 -0600 |
| commit | c96f95eaac4e5415ddb92103a5c29ab55597408d (patch) | |
| tree | d6b026edcb7e58f72fed333952a22f4c45fb01f8 /kttsd/plugins/hadifix | |
| parent | 127600d4f12c1787365edc471904f9732743c771 (diff) | |
| download | tdeaccessibility-c96f95eaac4e5415ddb92103a5c29ab55597408d.tar.gz tdeaccessibility-c96f95eaac4e5415ddb92103a5c29ab55597408d.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kttsd/plugins/hadifix')
| -rw-r--r-- | kttsd/plugins/hadifix/hadifixconf.cpp | 4 | ||||
| -rw-r--r-- | kttsd/plugins/hadifix/hadifixconfigui.ui | 2 | ||||
| -rw-r--r-- | kttsd/plugins/hadifix/voicefileui.ui | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kttsd/plugins/hadifix/hadifixconf.cpp b/kttsd/plugins/hadifix/hadifixconf.cpp index 08b8ab0..9b86384 100644 --- a/kttsd/plugins/hadifix/hadifixconf.cpp +++ b/kttsd/plugins/hadifix/hadifixconf.cpp @@ -25,11 +25,11 @@ #include <tqfile.h> // KDE includes. -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeaboutdata.h> #include <tdeaboutapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <kcombobox.h> #include <kstandarddirs.h> diff --git a/kttsd/plugins/hadifix/hadifixconfigui.ui b/kttsd/plugins/hadifix/hadifixconfigui.ui index 8a686c2..367200c 100644 --- a/kttsd/plugins/hadifix/hadifixconfigui.ui +++ b/kttsd/plugins/hadifix/hadifixconfigui.ui @@ -636,7 +636,7 @@ <include location="global" impldecl="in declaration">tqpixmap.h</include> <include location="global" impldecl="in declaration">kurl.h</include> <include location="global" impldecl="in declaration">tqmap.h</include> - <include location="global" impldecl="in implementation">kglobal.h</include> + <include location="global" impldecl="in implementation">tdeglobal.h</include> <include location="global" impldecl="in implementation">tqstringlist.h</include> <include location="global" impldecl="in implementation">math.h</include> <include location="global" impldecl="in implementation">kiconloader.h</include> diff --git a/kttsd/plugins/hadifix/voicefileui.ui b/kttsd/plugins/hadifix/voicefileui.ui index 32b4fc5..c333670 100644 --- a/kttsd/plugins/hadifix/voicefileui.ui +++ b/kttsd/plugins/hadifix/voicefileui.ui @@ -99,7 +99,7 @@ </connections> <includes> <include location="global" impldecl="in implementation">kurlrequesterdlg.h</include> - <include location="global" impldecl="in implementation">kmessagebox.h</include> + <include location="global" impldecl="in implementation">tdemessagebox.h</include> <include location="local" impldecl="in implementation">hadifixproc.h</include> <include location="local" impldecl="in implementation">voicefileui.ui.h</include> </includes> |