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 /khangman | |
| parent | d5f01dcc48ac3af828089b8810ef30a245e0346b (diff) | |
| download | tdeedu-4565bfb4e2e9acc5f67603e3de8720b4cd3c9a7e.tar.gz tdeedu-4565bfb4e2e9acc5f67603e3de8720b4cd3c9a7e.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'khangman')
| -rw-r--r-- | khangman/khangman/khangman.cpp | 4 | ||||
| -rw-r--r-- | khangman/khangman/khangmanview.cpp | 4 | ||||
| -rw-r--r-- | khangman/khangman/main.cpp | 2 | ||||
| -rw-r--r-- | khangman/khangman/timer.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp index 3844c809..8d7d2b20 100644 --- a/khangman/khangman/khangman.cpp +++ b/khangman/khangman/khangman.cpp @@ -36,9 +36,9 @@ #include <tdeconfigdialog.h> #include <kdebug.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdemainwindow.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kstatusbar.h> #include <tdetoolbarbutton.h> diff --git a/khangman/khangman/khangmanview.cpp b/khangman/khangman/khangmanview.cpp index c9271080..0e2f7b2f 100644 --- a/khangman/khangman/khangmanview.cpp +++ b/khangman/khangman/khangmanview.cpp @@ -19,8 +19,8 @@ #include <kaudioplayer.h> #include <kdebug.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpassivepopup.h> #include <kpushbutton.h> #include <kstandarddirs.h> diff --git a/khangman/khangman/main.cpp b/khangman/khangman/main.cpp index b7a0fae5..353b69a5 100644 --- a/khangman/khangman/main.cpp +++ b/khangman/khangman/main.cpp @@ -22,7 +22,7 @@ #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <kstandarddirs.h> diff --git a/khangman/khangman/timer.cpp b/khangman/khangman/timer.cpp index 69bcf6f7..64fe60a7 100644 --- a/khangman/khangman/timer.cpp +++ b/khangman/khangman/timer.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqslider.h> |