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 /tdeioslave | |
| parent | 19cea58302be2d15b10b106c80ff82f7b5a2fa79 (diff) | |
| download | tdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.tar.gz tdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeioslave')
| -rw-r--r-- | tdeioslave/svn/ksvnd/ksvnd.cpp | 4 | ||||
| -rw-r--r-- | tdeioslave/svn/svn.cpp | 6 | ||||
| -rw-r--r-- | tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/tdeioslave/svn/ksvnd/ksvnd.cpp b/tdeioslave/svn/ksvnd/ksvnd.cpp index e4c2454e..82e51bbb 100644 --- a/tdeioslave/svn/ksvnd/ksvnd.cpp +++ b/tdeioslave/svn/ksvnd/ksvnd.cpp @@ -19,9 +19,9 @@ */ #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqdir.h> #include <tqfile.h> diff --git a/tdeioslave/svn/svn.cpp b/tdeioslave/svn/svn.cpp index be3e1160..755541c4 100644 --- a/tdeioslave/svn/svn.cpp +++ b/tdeioslave/svn/svn.cpp @@ -31,11 +31,11 @@ #include <tdeapplication.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 <ksock.h> #include <dcopclient.h> diff --git a/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp b/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp index 6c939441..26098adb 100644 --- a/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp +++ b/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp @@ -18,19 +18,19 @@ */ #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kurl.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <dcopclient.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tqtimer.h> #include <tdeio/job.h> #include <tdeio/jobclasses.h> #include <tdeio/netaccess.h> #include <tqpixmap.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "tdeio_svn_helper.h" #include "subversioncheckout.h" @@ -39,7 +39,7 @@ #include <kurlrequester.h> #include <tqspinbox.h> #include <kprocess.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqtextstream.h> #include <tqtextedit.h> #include <kstandarddirs.h> |