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 /kanagram | |
| parent | d5f01dcc48ac3af828089b8810ef30a245e0346b (diff) | |
| download | tdeedu-4565bfb4e2e9acc5f67603e3de8720b4cd3c9a7e.tar.gz tdeedu-4565bfb4e2e9acc5f67603e3de8720b4cd3c9a7e.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kanagram')
| -rw-r--r-- | kanagram/src/grammarmanager.cpp | 2 | ||||
| -rw-r--r-- | kanagram/src/kanagram.cpp | 4 | ||||
| -rw-r--r-- | kanagram/src/kanagramgame.cpp | 4 | ||||
| -rw-r--r-- | kanagram/src/keduvocdocument.cpp | 4 | ||||
| -rw-r--r-- | kanagram/src/keduvockvtmlreader.cpp | 4 | ||||
| -rw-r--r-- | kanagram/src/mainsettings.cpp | 4 | ||||
| -rw-r--r-- | kanagram/src/newstuff.cpp | 2 | ||||
| -rw-r--r-- | kanagram/src/newstuffdialog.cpp | 2 | ||||
| -rw-r--r-- | kanagram/src/vocabedit.cpp | 6 |
9 files changed, 16 insertions, 16 deletions
diff --git a/kanagram/src/grammarmanager.cpp b/kanagram/src/grammarmanager.cpp index 71387b91..64710394 100644 --- a/kanagram/src/grammarmanager.cpp +++ b/kanagram/src/grammarmanager.cpp @@ -25,7 +25,7 @@ #include "grammarmanager.h" -#include <klocale.h> +#include <tdelocale.h> Conjugation::conjug_name_t Conjugation::names [] = diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp index 6335d91a..4aaa4d54 100644 --- a/kanagram/src/kanagram.cpp +++ b/kanagram/src/kanagram.cpp @@ -37,8 +37,8 @@ using namespace std; #include <tdeconfig.h> #include <khelpmenu.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include <kstandarddirs.h> #include <tdeconfigdialog.h> diff --git a/kanagram/src/kanagramgame.cpp b/kanagram/src/kanagramgame.cpp index de318cc6..d8dd96a4 100644 --- a/kanagram/src/kanagramgame.cpp +++ b/kanagram/src/kanagramgame.cpp @@ -24,9 +24,9 @@ #include <kurl.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include "kanagramgame.h" #include "keduvocdocument.h" diff --git a/kanagram/src/keduvocdocument.cpp b/kanagram/src/keduvocdocument.cpp index 7122515c..046ad56e 100644 --- a/kanagram/src/keduvocdocument.cpp +++ b/kanagram/src/keduvocdocument.cpp @@ -19,9 +19,9 @@ #include "keduvocdocument.h" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/netaccess.h> #include <tqfileinfo.h> diff --git a/kanagram/src/keduvockvtmlreader.cpp b/kanagram/src/keduvockvtmlreader.cpp index 88bf7607..34c31ca7 100644 --- a/kanagram/src/keduvockvtmlreader.cpp +++ b/kanagram/src/keduvockvtmlreader.cpp @@ -18,8 +18,8 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqdom.h> #include <tqtextstream.h> diff --git a/kanagram/src/mainsettings.cpp b/kanagram/src/mainsettings.cpp index 07651e56..8307bb1d 100644 --- a/kanagram/src/mainsettings.cpp +++ b/kanagram/src/mainsettings.cpp @@ -26,10 +26,10 @@ #include <kdebug.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdeconfigdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/netaccess.h> #include "mainsettings.h" diff --git a/kanagram/src/newstuff.cpp b/kanagram/src/newstuff.cpp index 7c72f938..84a0743d 100644 --- a/kanagram/src/newstuff.cpp +++ b/kanagram/src/newstuff.cpp @@ -6,7 +6,7 @@ #include <kdebug.h> #include <knewstuff/downloaddialog.h> #include <knewstuff/knewstuff.h> -#include <klocale.h> +#include <tdelocale.h> #include "kanagramsettings.h" #include "newstuffdialog.h" diff --git a/kanagram/src/newstuffdialog.cpp b/kanagram/src/newstuffdialog.cpp index 1d3ed4b9..572ec03b 100644 --- a/kanagram/src/newstuffdialog.cpp +++ b/kanagram/src/newstuffdialog.cpp @@ -2,7 +2,7 @@ #include <knewstuff/knewstuff.h> #include <knewstuff/entry.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/netaccess.h> #include <kurl.h> #include <kstandarddirs.h> diff --git a/kanagram/src/vocabedit.cpp b/kanagram/src/vocabedit.cpp index df3bee35..b36a3454 100644 --- a/kanagram/src/vocabedit.cpp +++ b/kanagram/src/vocabedit.cpp @@ -29,11 +29,11 @@ #include <tqvaluevector.h> #include <kstandarddirs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kurl.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include "keduvocdocument.h" #include "keduvocexpression.h" |