diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:38 -0600 |
| commit | cfb328d59024a251690b6e47c9f8d343fd8c241c (patch) | |
| tree | 7c11070cd07e5e023a26ddcfa41832c208c63732 /tdeioslaves | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeioslaves')
| -rw-r--r-- | tdeioslaves/imap4/imap4.cc | 6 | ||||
| -rw-r--r-- | tdeioslaves/imap4/imapcommand.cc | 4 | ||||
| -rw-r--r-- | tdeioslaves/imap4/mimeheader.cc | 2 | ||||
| -rw-r--r-- | tdeioslaves/mbox/mbox.cc | 4 | ||||
| -rw-r--r-- | tdeioslaves/opengroupware/opengroupware.cpp | 8 | ||||
| -rw-r--r-- | tdeioslaves/sieve/sieve.cpp | 6 |
6 files changed, 15 insertions, 15 deletions
diff --git a/tdeioslaves/imap4/imap4.cc b/tdeioslaves/imap4/imap4.cc index 4871ae68e..cb0f06ad8 100644 --- a/tdeioslaves/imap4/imap4.cc +++ b/tdeioslaves/imap4/imap4.cc @@ -81,13 +81,13 @@ extern "C" { #include <tqbuffer.h> #include <tqdatetime.h> #include <tqregexp.h> -#include <kprotocolmanager.h> -#include <kmessagebox.h> +#include <tdeprotocolmanager.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tdeio/connection.h> #include <tdeio/slaveinterface.h> #include <tdeio/passdlg.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmimetype.h> #include <kmdcodec.h> diff --git a/tdeioslaves/imap4/imapcommand.cc b/tdeioslaves/imap4/imapcommand.cc index a3239d09d..f88a65add 100644 --- a/tdeioslaves/imap4/imapcommand.cc +++ b/tdeioslaves/imap4/imapcommand.cc @@ -46,14 +46,14 @@ #include <tqregexp.h> #include <tqbuffer.h> -#include <kprotocolmanager.h> +#include <tdeprotocolmanager.h> #include <ksock.h> #include <kdebug.h> #include <kinstance.h> #include <tdeio/connection.h> #include <tdeio/slaveinterface.h> #include <tdeio/passdlg.h> -#include <klocale.h> */ +#include <tdelocale.h> */ imapCommand::imapCommand () { diff --git a/tdeioslaves/imap4/mimeheader.cc b/tdeioslaves/imap4/mimeheader.cc index 4f3de6469..d0916ba50 100644 --- a/tdeioslaves/imap4/mimeheader.cc +++ b/tdeioslaves/imap4/mimeheader.cc @@ -23,7 +23,7 @@ #include <tqregexp.h> // #include <iostream.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kinstance.h> #include <kiconloader.h> #include <kmimetype.h> diff --git a/tdeioslaves/mbox/mbox.cc b/tdeioslaves/mbox/mbox.cc index 91a324889..5742baffd 100644 --- a/tdeioslaves/mbox/mbox.cc +++ b/tdeioslaves/mbox/mbox.cc @@ -26,9 +26,9 @@ #include <tqcstring.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinstance.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kurl.h> #include <tdeio/global.h> diff --git a/tdeioslaves/opengroupware/opengroupware.cpp b/tdeioslaves/opengroupware/opengroupware.cpp index 3624b61e9..c1fd485df 100644 --- a/tdeioslaves/opengroupware/opengroupware.cpp +++ b/tdeioslaves/opengroupware/opengroupware.cpp @@ -25,7 +25,7 @@ #include <kurl.h> #include <tdeio/job.h> #include <tdeio/davjob.h> -#include <klocale.h> +#include <tdelocale.h> #include <libtdepim/kabcresourcecached.h> @@ -34,12 +34,12 @@ #include <libkcal/scheduler.h> #include <libkcal/calendarlocal.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/vcardconverter.h> #include <kinstance.h> #include <kdebug.h> -#include <klocale.h> -#include <ktempfile.h> +#include <tdelocale.h> +#include <tdetempfile.h> #include <sys/types.h> #include <unistd.h> diff --git a/tdeioslaves/sieve/sieve.cpp b/tdeioslaves/sieve/sieve.cpp index 4a84997cb..77b262fd4 100644 --- a/tdeioslaves/sieve/sieve.cpp +++ b/tdeioslaves/sieve/sieve.cpp @@ -35,11 +35,11 @@ extern "C" { #include <kdebug.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <kmdcodec.h> -#include <kglobal.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdemessagebox.h> #include <tqcstring.h> #include <tqregexp.h> |