diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:53:57 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:53:57 -0600 |
| commit | c96f95eaac4e5415ddb92103a5c29ab55597408d (patch) | |
| tree | d6b026edcb7e58f72fed333952a22f4c45fb01f8 /kttsd/kcmkttsmgr | |
| parent | 127600d4f12c1787365edc471904f9732743c771 (diff) | |
| download | tdeaccessibility-c96f95eaac4e5415ddb92103a5c29ab55597408d.tar.gz tdeaccessibility-c96f95eaac4e5415ddb92103a5c29ab55597408d.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kttsd/kcmkttsmgr')
| -rw-r--r-- | kttsd/kcmkttsmgr/addtalker.cpp | 4 | ||||
| -rw-r--r-- | kttsd/kcmkttsmgr/kcmkttsmgr.cpp | 2 | ||||
| -rw-r--r-- | kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui | 4 | ||||
| -rw-r--r-- | kttsd/kcmkttsmgr/selectevent.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/kttsd/kcmkttsmgr/addtalker.cpp b/kttsd/kcmkttsmgr/addtalker.cpp index d43b5b2..d3fe4d7 100644 --- a/kttsd/kcmkttsmgr/addtalker.cpp +++ b/kttsd/kcmkttsmgr/addtalker.cpp @@ -27,8 +27,8 @@ // KDE includes. #include <kcombobox.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> // KTTS includes. diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp index 050e629..d4c0e76 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp +++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp @@ -50,7 +50,7 @@ #include <knuminput.h> #include <kcombobox.h> #include <kinputdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> // KTTS includes. diff --git a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui index ffde8a9..79a6db1 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui +++ b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui @@ -1884,8 +1884,8 @@ <tabstop>keepAudioPath</tabstop> </tabstops> <includes> - <include location="global" impldecl="in declaration">klocale.h</include> - <include location="global" impldecl="in implementation">klocale.h</include> + <include location="global" impldecl="in declaration">tdelocale.h</include> + <include location="global" impldecl="in implementation">tdelocale.h</include> <include location="global" impldecl="in implementation">kdebug.h</include> </includes> <Q_SIGNALS> diff --git a/kttsd/kcmkttsmgr/selectevent.cpp b/kttsd/kcmkttsmgr/selectevent.cpp index 1e8f15c..46b2205 100644 --- a/kttsd/kcmkttsmgr/selectevent.cpp +++ b/kttsd/kcmkttsmgr/selectevent.cpp @@ -27,7 +27,7 @@ // KDE includes #include <kstandarddirs.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdelistview.h> #include <kiconloader.h> |