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 /klatin | |
| parent | d5f01dcc48ac3af828089b8810ef30a245e0346b (diff) | |
| download | tdeedu-4565bfb4e2e9acc5f67603e3de8720b4cd3c9a7e.tar.gz tdeedu-4565bfb4e2e9acc5f67603e3de8720b4cd3c9a7e.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'klatin')
| -rw-r--r-- | klatin/klatin/klatin.cpp | 2 | ||||
| -rw-r--r-- | klatin/klatin/klatingrammar.cpp | 4 | ||||
| -rw-r--r-- | klatin/klatin/klatinverbs.cpp | 4 | ||||
| -rw-r--r-- | klatin/klatin/klatinvocab.cpp | 4 | ||||
| -rw-r--r-- | klatin/klatin/settings.kcfgc | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/klatin/klatin/klatin.cpp b/klatin/klatin/klatin.cpp index f57b0d82..7788ade5 100644 --- a/klatin/klatin/klatin.cpp +++ b/klatin/klatin/klatin.cpp @@ -19,7 +19,7 @@ #include <tdeconfigdialog.h> #include <tdefiledialog.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kstandarddirs.h> #include <kstatusbar.h> diff --git a/klatin/klatin/klatingrammar.cpp b/klatin/klatin/klatingrammar.cpp index 2bc49bb5..e4f3f2a5 100644 --- a/klatin/klatin/klatingrammar.cpp +++ b/klatin/klatin/klatingrammar.cpp @@ -20,8 +20,8 @@ #include <kcombobox.h> #include <kiconloader.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpushbutton.h> #include <kstandarddirs.h> diff --git a/klatin/klatin/klatinverbs.cpp b/klatin/klatin/klatinverbs.cpp index 46e5e744..64dd13fa 100644 --- a/klatin/klatin/klatinverbs.cpp +++ b/klatin/klatin/klatinverbs.cpp @@ -20,8 +20,8 @@ #include <kcombobox.h> #include <kiconloader.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpushbutton.h> #include <kstandarddirs.h> diff --git a/klatin/klatin/klatinvocab.cpp b/klatin/klatin/klatinvocab.cpp index ad5c38c3..b30600eb 100644 --- a/klatin/klatin/klatinvocab.cpp +++ b/klatin/klatin/klatinvocab.cpp @@ -20,8 +20,8 @@ #include <tdeapplication.h> #include <kcombobox.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpushbutton.h> #include <kstandarddirs.h> #include <kstdguiitem.h> diff --git a/klatin/klatin/settings.kcfgc b/klatin/klatin/settings.kcfgc index a58324de..b6246990 100644 --- a/klatin/klatin/settings.kcfgc +++ b/klatin/klatin/settings.kcfgc @@ -1,5 +1,5 @@ File=klatin.kcfg ClassName=Settings -IncludeFiles=kstandarddirs.h,tqdir.h,klocale.h,kdebug.h +IncludeFiles=kstandarddirs.h,tqdir.h,tdelocale.h,kdebug.h Singleton=true Mutators=true
\ No newline at end of file |