diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:53 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:53 -0600 |
| commit | 508a49f9ef02a7b03411c8e9953ba79c99b91c0c (patch) | |
| tree | 1df40da8f05d010a3e175c3d48e3529cccf2e067 /cervisia/cvsservice | |
| parent | 19cea58302be2d15b10b106c80ff82f7b5a2fa79 (diff) | |
| download | tdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.tar.gz tdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'cervisia/cvsservice')
| -rw-r--r-- | cervisia/cvsservice/cvsaskpass.cpp | 2 | ||||
| -rw-r--r-- | cervisia/cvsservice/cvsloginjob.cpp | 2 | ||||
| -rw-r--r-- | cervisia/cvsservice/cvsservice.cpp | 4 | ||||
| -rw-r--r-- | cervisia/cvsservice/main.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/cervisia/cvsservice/cvsaskpass.cpp b/cervisia/cvsservice/cvsaskpass.cpp index 9196b9c6..810c906c 100644 --- a/cervisia/cvsservice/cvsaskpass.cpp +++ b/cervisia/cvsservice/cvsaskpass.cpp @@ -22,7 +22,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpassdlg.h> #include <iostream> diff --git a/cervisia/cvsservice/cvsloginjob.cpp b/cervisia/cvsservice/cvsloginjob.cpp index ad6f9176..5eb1d9fc 100644 --- a/cervisia/cvsservice/cvsloginjob.cpp +++ b/cervisia/cvsservice/cvsloginjob.cpp @@ -21,7 +21,7 @@ #include "cvsloginjob.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpassdlg.h> #include <sys/types.h> diff --git a/cervisia/cvsservice/cvsservice.cpp b/cervisia/cvsservice/cvsservice.cpp index 9efbd86e..9eabda4c 100644 --- a/cervisia/cvsservice/cvsservice.cpp +++ b/cervisia/cvsservice/cvsservice.cpp @@ -27,8 +27,8 @@ #include <dcopclient.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocess.h> #include "cvsjob.h" diff --git a/cervisia/cvsservice/main.cpp b/cervisia/cvsservice/main.cpp index d0180b6f..6e11f605 100644 --- a/cervisia/cvsservice/main.cpp +++ b/cervisia/cvsservice/main.cpp @@ -21,7 +21,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include "cvsservice.h" |