diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:53:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:53:05 -0600 |
| commit | 65a02c1aff14817c8d185bc127b99e78bdb24ddc (patch) | |
| tree | cd21acec4d83388fd337500cf787b7f714df9815 | |
| parent | f1f2f05210fbe995c6546b7255bb04f24772ed1b (diff) | |
| download | libkdcraw-65a02c1aff14817c8d185bc127b99e78bdb24ddc.tar.gz libkdcraw-65a02c1aff14817c8d185bc127b99e78bdb24ddc.zip | |
Rename additional header files to avoid conflicts with KDE4
| -rw-r--r-- | libkdcraw/libkdcraw/dcrawbinary.cpp | 6 | ||||
| -rw-r--r-- | libkdcraw/libkdcraw/dcrawsettingswidget.cpp | 2 | ||||
| -rw-r--r-- | libkdcraw/libkdcraw/rcombobox.cpp | 2 | ||||
| -rw-r--r-- | libkdcraw/libkdcraw/rnuminput.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/libkdcraw/libkdcraw/dcrawbinary.cpp b/libkdcraw/libkdcraw/dcrawbinary.cpp index 98698f4..338edef 100644 --- a/libkdcraw/libkdcraw/dcrawbinary.cpp +++ b/libkdcraw/libkdcraw/dcrawbinary.cpp @@ -28,10 +28,10 @@ // KDE includes #include <kprocess.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeaboutdata.h> // Local includes diff --git a/libkdcraw/libkdcraw/dcrawsettingswidget.cpp b/libkdcraw/libkdcraw/dcrawsettingswidget.cpp index f3f16cb..74e711c 100644 --- a/libkdcraw/libkdcraw/dcrawsettingswidget.cpp +++ b/libkdcraw/libkdcraw/dcrawsettingswidget.cpp @@ -35,7 +35,7 @@ #include <tdeapplication.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurllabel.h> // Local includes. diff --git a/libkdcraw/libkdcraw/rcombobox.cpp b/libkdcraw/libkdcraw/rcombobox.cpp index cb9d037..c20c414 100644 --- a/libkdcraw/libkdcraw/rcombobox.cpp +++ b/libkdcraw/libkdcraw/rcombobox.cpp @@ -30,7 +30,7 @@ // KDE includes. #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> // Local includes. diff --git a/libkdcraw/libkdcraw/rnuminput.cpp b/libkdcraw/libkdcraw/rnuminput.cpp index e9426bd..b5c0465 100644 --- a/libkdcraw/libkdcraw/rnuminput.cpp +++ b/libkdcraw/libkdcraw/rnuminput.cpp @@ -30,7 +30,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdialog.h> |