diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:53:57 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:53:57 -0600 |
| commit | c96f95eaac4e5415ddb92103a5c29ab55597408d (patch) | |
| tree | d6b026edcb7e58f72fed333952a22f4c45fb01f8 /kmag | |
| parent | 127600d4f12c1787365edc471904f9732743c771 (diff) | |
| download | tdeaccessibility-c96f95eaac4e5415ddb92103a5c29ab55597408d.tar.gz tdeaccessibility-c96f95eaac4e5415ddb92103a5c29ab55597408d.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kmag')
| -rw-r--r-- | kmag/kmag.cpp | 8 | ||||
| -rw-r--r-- | kmag/kmagselrect.cpp | 2 | ||||
| -rw-r--r-- | kmag/kmagzoomview.cpp | 2 | ||||
| -rw-r--r-- | kmag/main.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp index 0bd9cdd..7961ee6 100644 --- a/kmag/kmag.cpp +++ b/kmag/kmag.cpp @@ -40,10 +40,10 @@ #include <kkeydialog.h> #include <kinputdialog.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> -#include <kmenubar.h> -#include <klocale.h> +#include <tdemenubar.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> #include <kstdaction.h> @@ -51,7 +51,7 @@ #include <kimageio.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdepopupmenu.h> #include <kedittoolbar.h> #include <twin.h> diff --git a/kmag/kmagselrect.cpp b/kmag/kmagselrect.cpp index cde24d1..ba49fe3 100644 --- a/kmag/kmagselrect.cpp +++ b/kmag/kmagselrect.cpp @@ -27,7 +27,7 @@ #include <tqbitmap.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> static uchar line_bits[] = {0x2d, 0x96, 0x4b, 0xa5, 0xd2, 0x69, 0xb4, 0x5a}; diff --git a/kmag/kmagzoomview.cpp b/kmag/kmagzoomview.cpp index da8bc8e..644e91a 100644 --- a/kmag/kmagzoomview.cpp +++ b/kmag/kmagzoomview.cpp @@ -36,7 +36,7 @@ #include <tdeapplication.h> #include <kcursor.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <X11/Xlib.h> #include <X11/Xatom.h> diff --git a/kmag/main.cpp b/kmag/main.cpp index 0eb747f..1d85e05 100644 --- a/kmag/main.cpp +++ b/kmag/main.cpp @@ -18,7 +18,7 @@ #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include "kmag.h" |