diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /tdeioslave/smb | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeioslave/smb')
| -rw-r--r-- | tdeioslave/smb/tdeio_smb.h | 2 | ||||
| -rw-r--r-- | tdeioslave/smb/tdeio_smb_browse.cpp | 2 | ||||
| -rw-r--r-- | tdeioslave/smb/tdeio_smb_internal.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tdeioslave/smb/tdeio_smb.h b/tdeioslave/smb/tdeio_smb.h index 0c89eae95..b2566cb5f 100644 --- a/tdeioslave/smb/tdeio_smb.h +++ b/tdeioslave/smb/tdeio_smb.h @@ -53,7 +53,7 @@ #include <tdeio/global.h> #include <tdeio/slavebase.h> #include <kurl.h> -#include <klocale.h> +#include <tdelocale.h> //----------------------------- // Standard C library includes diff --git a/tdeioslave/smb/tdeio_smb_browse.cpp b/tdeioslave/smb/tdeio_smb_browse.cpp index e06bb81d1..c8d39b8f8 100644 --- a/tdeioslave/smb/tdeio_smb_browse.cpp +++ b/tdeioslave/smb/tdeio_smb_browse.cpp @@ -36,7 +36,7 @@ #include <tqtextcodec.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "tdeio_smb.h" #include "tdeio_smb_internal.h" diff --git a/tdeioslave/smb/tdeio_smb_internal.cpp b/tdeioslave/smb/tdeio_smb_internal.cpp index de3f98127..ebb91b30a 100644 --- a/tdeioslave/smb/tdeio_smb_internal.cpp +++ b/tdeioslave/smb/tdeio_smb_internal.cpp @@ -34,7 +34,7 @@ #include <tqtextcodec.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> //=========================================================================== |