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/sftp | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeioslave/sftp')
| -rw-r--r-- | tdeioslave/sftp/ksshprocess.cpp | 2 | ||||
| -rw-r--r-- | tdeioslave/sftp/tdeio_sftp.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tdeioslave/sftp/ksshprocess.cpp b/tdeioslave/sftp/ksshprocess.cpp index 678806605..0f19126d2 100644 --- a/tdeioslave/sftp/ksshprocess.cpp +++ b/tdeioslave/sftp/ksshprocess.cpp @@ -66,7 +66,7 @@ #endif #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqregexp.h> /* diff --git a/tdeioslave/sftp/tdeio_sftp.cpp b/tdeioslave/sftp/tdeio_sftp.cpp index 2af66f04f..1e529363c 100644 --- a/tdeioslave/sftp/tdeio_sftp.cpp +++ b/tdeioslave/sftp/tdeio_sftp.cpp @@ -55,11 +55,11 @@ So we can't connect. #include <tdeapplication.h> #include <kuser.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kinstance.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <tdeio/ioslave_defaults.h> #include <kmimetype.h> |