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 /kig/modes | |
| parent | d5f01dcc48ac3af828089b8810ef30a245e0346b (diff) | |
| download | tdeedu-4565bfb4e2e9acc5f67603e3de8720b4cd3c9a7e.tar.gz tdeedu-4565bfb4e2e9acc5f67603e3de8720b4cd3c9a7e.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kig/modes')
| -rw-r--r-- | kig/modes/edittype.cc | 4 | ||||
| -rw-r--r-- | kig/modes/label.cc | 4 | ||||
| -rw-r--r-- | kig/modes/macro.cc | 4 | ||||
| -rw-r--r-- | kig/modes/normal.cc | 2 | ||||
| -rw-r--r-- | kig/modes/popup.cc | 4 | ||||
| -rw-r--r-- | kig/modes/typesdialog.cpp | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/kig/modes/edittype.cc b/kig/modes/edittype.cc index 1dab83d7..00686392 100644 --- a/kig/modes/edittype.cc +++ b/kig/modes/edittype.cc @@ -26,8 +26,8 @@ #include <tdeapplication.h> #include <kicondialog.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpushbutton.h> #include <kstdguiitem.h> diff --git a/kig/modes/label.cc b/kig/modes/label.cc index 67509396..12f0d57c 100644 --- a/kig/modes/label.cc +++ b/kig/modes/label.cc @@ -35,9 +35,9 @@ #include "../objects/text_type.h" #include <kcursor.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqtextedit.h> #include <kdebug.h> #include <kiconloader.h> diff --git a/kig/modes/macro.cc b/kig/modes/macro.cc index ba6f98ab..8fe16b4d 100644 --- a/kig/modes/macro.cc +++ b/kig/modes/macro.cc @@ -28,9 +28,9 @@ #include "../objects/object_imp.h" #include <klineedit.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <functional> #include <algorithm> diff --git a/kig/modes/normal.cc b/kig/modes/normal.cc index 70123996..9a30c213 100644 --- a/kig/modes/normal.cc +++ b/kig/modes/normal.cc @@ -34,7 +34,7 @@ #include <kcursor.h> #include <tdeaction.h> #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include <algorithm> #include <functional> diff --git a/kig/modes/popup.cc b/kig/modes/popup.cc index 5c2528a6..eef5b1e3 100644 --- a/kig/modes/popup.cc +++ b/kig/modes/popup.cc @@ -54,9 +54,9 @@ #include <tdeaction.h> #include <kcolordialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #if KDE_IS_VERSION( 3, 1, 90 ) #include <kinputdialog.h> #else diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp index 8660eaba..8847ee5a 100644 --- a/kig/modes/typesdialog.cpp +++ b/kig/modes/typesdialog.cpp @@ -32,8 +32,8 @@ #include <kdebug.h> #include <tdefiledialog.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpushbutton.h> #include <kstdguiitem.h> |