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 /kcontrol/crypto | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/crypto')
| -rw-r--r-- | kcontrol/crypto/certexport.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/crypto/crypto.cpp | 6 | ||||
| -rw-r--r-- | kcontrol/crypto/kdatetimedlg.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kcontrol/crypto/certexport.cpp b/kcontrol/crypto/certexport.cpp index 4a6bda892..034d69897 100644 --- a/kcontrol/crypto/certexport.cpp +++ b/kcontrol/crypto/certexport.cpp @@ -31,9 +31,9 @@ #include <tqvbuttongroup.h> #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <ksslall.h> diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp index 8e97a7c4b..70344e16a 100644 --- a/kcontrol/crypto/crypto.cpp +++ b/kcontrol/crypto/crypto.cpp @@ -56,11 +56,11 @@ #include <kdialog.h> #include <tdefiledialog.h> #include <kgenericfactory.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmdcodec.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kpassdlg.h> #include <kprocess.h> #include <kpushbutton.h> diff --git a/kcontrol/crypto/kdatetimedlg.cpp b/kcontrol/crypto/kdatetimedlg.cpp index 872ffc304..f7cd9d1cb 100644 --- a/kcontrol/crypto/kdatetimedlg.cpp +++ b/kcontrol/crypto/kdatetimedlg.cpp @@ -25,7 +25,7 @@ #include "kdatetimedlg.h" #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kdatepicker.h> #include <kpushbutton.h> |