diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:56:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:56:40 -0600 |
| commit | 4565bfb4e2e9acc5f67603e3de8720b4cd3c9a7e (patch) | |
| tree | 8bdb18e6838f1eb1357e22b6e50b2948d33868a6 /klettres | |
| parent | d5f01dcc48ac3af828089b8810ef30a245e0346b (diff) | |
| download | tdeedu-4565bfb4e2e9acc5f67603e3de8720b4cd3c9a7e.tar.gz tdeedu-4565bfb4e2e9acc5f67603e3de8720b4cd3c9a7e.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'klettres')
| -rw-r--r-- | klettres/klettres/klettres.cpp | 6 | ||||
| -rw-r--r-- | klettres/klettres/klettresview.cpp | 2 | ||||
| -rw-r--r-- | klettres/klettres/soundfactory.cpp | 4 | ||||
| -rw-r--r-- | klettres/klettres/timer.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp index 3afd5036..9c635795 100644 --- a/klettres/klettres/klettres.cpp +++ b/klettres/klettres/klettres.cpp @@ -34,9 +34,9 @@ #include <kcombobox.h> #include <tdeconfigdialog.h> #include <kdebug.h> -#include <klocale.h> -#include <kmenubar.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemenubar.h> +#include <tdemessagebox.h> #include <knuminput.h> #include <kstandarddirs.h> #include <kstatusbar.h> diff --git a/klettres/klettres/klettresview.cpp b/klettres/klettres/klettresview.cpp index 8c8d8252..69cc6bcc 100644 --- a/klettres/klettres/klettresview.cpp +++ b/klettres/klettres/klettresview.cpp @@ -25,7 +25,7 @@ #include <tqpainter.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kdebug.h> //Project headers diff --git a/klettres/klettres/soundfactory.cpp b/klettres/klettres/soundfactory.cpp index e23bc501..48a29ad0 100644 --- a/klettres/klettres/soundfactory.cpp +++ b/klettres/klettres/soundfactory.cpp @@ -21,8 +21,8 @@ */ #include <stdlib.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kaudioplayer.h> #include <kdebug.h> #include <kstandarddirs.h> diff --git a/klettres/klettres/timer.cpp b/klettres/klettres/timer.cpp index f102d82e..d6fa9a4b 100644 --- a/klettres/klettres/timer.cpp +++ b/klettres/klettres/timer.cpp @@ -20,7 +20,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqslider.h> |