From ff26edf4064a15a77f6eb16bf45700a7f5eaacfb Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sun, 25 Nov 2012 19:20:22 -0600 Subject: Cleanup header includes to improve readability. --- .../jabber/libiris/cutestuff/network/bsocket.cpp | 18 +++++++------- .../jabber/libiris/cutestuff/network/bsocket.h | 6 ++--- .../libiris/cutestuff/network/httpconnect.cpp | 10 ++++---- .../jabber/libiris/cutestuff/network/httpconnect.h | 2 +- .../jabber/libiris/cutestuff/network/httppoll.cpp | 20 ++++++++-------- .../jabber/libiris/cutestuff/network/httppoll.h | 2 +- .../jabber/libiris/cutestuff/network/ndns.cpp | 20 ++++++++-------- .../jabber/libiris/cutestuff/network/ndns.h | 10 ++++---- .../jabber/libiris/cutestuff/network/servsock.cpp | 2 +- .../jabber/libiris/cutestuff/network/servsock.h | 2 +- .../jabber/libiris/cutestuff/network/socks.cpp | 28 +++++++++++----------- .../jabber/libiris/cutestuff/network/socks.h | 2 +- .../libiris/cutestuff/network/srvresolver.cpp | 12 +++++----- .../jabber/libiris/cutestuff/network/srvresolver.h | 4 ++-- .../jabber/libiris/cutestuff/util/base64.cpp | 2 +- .../jabber/libiris/cutestuff/util/base64.h | 2 +- .../jabber/libiris/cutestuff/util/bytestream.cpp | 2 +- .../jabber/libiris/cutestuff/util/bytestream.h | 4 ++-- .../jabber/libiris/cutestuff/util/cipher.cpp | 10 ++++---- .../jabber/libiris/cutestuff/util/cipher.h | 4 ++-- .../jabber/libiris/cutestuff/util/qrandom.cpp | 4 ++-- .../jabber/libiris/cutestuff/util/qrandom.h | 2 +- .../jabber/libiris/cutestuff/util/safedelete.cpp | 4 ++-- .../jabber/libiris/cutestuff/util/safedelete.h | 4 ++-- .../jabber/libiris/cutestuff/util/sha1.cpp | 2 +- .../protocols/jabber/libiris/cutestuff/util/sha1.h | 2 +- .../jabber/libiris/cutestuff/util/showtextdlg.cpp | 12 +++++----- .../jabber/libiris/cutestuff/util/showtextdlg.h | 2 +- 28 files changed, 97 insertions(+), 97 deletions(-) (limited to 'kopete/protocols/jabber/libiris/cutestuff') diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp index 27184748..1309ec01 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp @@ -18,20 +18,20 @@ * */ -#include"bsocket.h" +#include "bsocket.h" -#include -#include -#include -#include -#include"safedelete.h" +#include +#include +#include +#include +#include "safedelete.h" #ifndef NO_NDNS -#include"ndns.h" +#include "ndns.h" #endif -#include"srvresolver.h" +#include "srvresolver.h" #ifdef BS_DEBUG -#include +#include #endif #define READBUFSIZE 65536 diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h index 38aa4912..c7cb1e23 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h @@ -21,9 +21,9 @@ #ifndef CS_BSOCKET_H #define CS_BSOCKET_H -#include -#include -#include"bytestream.h" +#include +#include +#include "bytestream.h" // CS_NAMESPACE_BEGIN diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp index 6abeb556..e9cc5781 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp @@ -18,14 +18,14 @@ * */ -#include"httpconnect.h" +#include "httpconnect.h" -#include -#include"bsocket.h" -#include"base64.h" +#include +#include "bsocket.h" +#include "base64.h" #ifdef PROX_DEBUG -#include +#include #endif // CS_NAMESPACE_BEGIN diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h index 148356e8..07c08b2e 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h @@ -21,7 +21,7 @@ #ifndef CS_HTTPCONNECT_H #define CS_HTTPCONNECT_H -#include"bytestream.h" +#include "bytestream.h" // CS_NAMESPACE_BEGIN diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp index a07ed503..5e900119 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp @@ -18,19 +18,19 @@ * */ -#include"httppoll.h" +#include "httppoll.h" -#include -#include -#include -#include -#include -#include -#include"bsocket.h" -#include"base64.h" +#include +#include +#include +#include +#include +#include +#include "bsocket.h" +#include "base64.h" #ifdef PROX_DEBUG -#include +#include #endif #define POLL_KEYS 64 diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h index 088d5c33..4342d763 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h @@ -21,7 +21,7 @@ #ifndef CS_HTTPPOLL_H #define CS_HTTPPOLL_H -#include"bytestream.h" +#include "bytestream.h" // CS_NAMESPACE_BEGIN diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp index 7db5defb..d36b1fd0 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp @@ -48,22 +48,22 @@ //! TQString ip_address = dns.resultString(); //! \endcode -#include"ndns.h" +#include "ndns.h" -#include -#include -#include -#include +#include +#include +#include +#include #ifdef Q_OS_UNIX -#include -#include -#include -#include +#include +#include +#include +#include #endif #ifdef Q_OS_WIN32 -#include +#include #endif // CS_NAMESPACE_BEGIN diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h index 01907ccd..50a702f7 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h @@ -21,11 +21,11 @@ #ifndef CS_NDNS_H #define CS_NDNS_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include // CS_NAMESPACE_BEGIN diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp index 0e0b5337..9ee26ee5 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp @@ -18,7 +18,7 @@ * */ -#include"servsock.h" +#include "servsock.h" // CS_NAMESPACE_BEGIN diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h index c77b57c8..ac88719b 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h @@ -21,7 +21,7 @@ #ifndef CS_SERVSOCK_H #define CS_SERVSOCK_H -#include +#include // CS_NAMESPACE_BEGIN diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp index e4e1b182..baa1eb84 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp @@ -18,30 +18,30 @@ * */ -#include"socks.h" +#include "socks.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #ifdef Q_OS_UNIX -#include -#include +#include +#include #endif #ifdef Q_OS_WIN32 -#include +#include #endif -#include"servsock.h" -#include"bsocket.h" +#include "servsock.h" +#include "bsocket.h" #ifdef PROX_DEBUG -#include +#include #endif // CS_NAMESPACE_BEGIN diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.h b/kopete/protocols/jabber/libiris/cutestuff/network/socks.h index 3205ceb2..a09c14c7 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.h @@ -21,7 +21,7 @@ #ifndef CS_SOCKS_H #define CS_SOCKS_H -#include"bytestream.h" +#include "bytestream.h" // CS_NAMESPACE_BEGIN diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp index 987de66c..873d6c11 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp @@ -18,15 +18,15 @@ * */ -#include"srvresolver.h" +#include "srvresolver.h" -#include -#include -#include -#include"safedelete.h" +#include +#include +#include +#include "safedelete.h" #ifndef NO_NDNS -#include"ndns.h" +#include "ndns.h" #endif // CS_NAMESPACE_BEGIN diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h index 669bcf80..cfedae4e 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h @@ -21,8 +21,8 @@ #ifndef CS_SRVRESOLVER_H #define CS_SRVRESOLVER_H -#include -#include +#include +#include // CS_NAMESPACE_BEGIN diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp index 06df3f73..39b2c57f 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp @@ -18,7 +18,7 @@ * */ -#include"base64.h" +#include "base64.h" // CS_NAMESPACE_BEGIN diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/base64.h b/kopete/protocols/jabber/libiris/cutestuff/util/base64.h index eaa2ff5b..6a817133 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/base64.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/base64.h @@ -21,7 +21,7 @@ #ifndef CS_BASE64_H #define CS_BASE64_H -#include +#include // CS_NAMESPACE_BEGIN diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.cpp index e78c2f9a..72cbb614 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.cpp @@ -18,7 +18,7 @@ * */ -#include"bytestream.h" +#include "bytestream.h" // CS_NAMESPACE_BEGIN diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h index 0ffab15b..e64ce68d 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h @@ -21,8 +21,8 @@ #ifndef CS_BYTESTREAM_H #define CS_BYTESTREAM_H -#include -#include +#include +#include // CS_NAMESPACE_BEGIN diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/cipher.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/cipher.cpp index 814b6e9d..98f2944a 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/cipher.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/cipher.cpp @@ -18,12 +18,12 @@ * */ -#include"cipher.h" +#include "cipher.h" -#include -#include -#include"bytestream.h" -#include"tqrandom.h" +#include +#include +#include "bytestream.h" +#include "tqrandom.h" static bool lib_encryptArray(const EVP_CIPHER *type, const TQByteArray &buf, const TQByteArray &key, const TQByteArray &iv, bool pad, TQByteArray *out) { diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/cipher.h b/kopete/protocols/jabber/libiris/cutestuff/util/cipher.h index 02c7606c..ad1c052f 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/cipher.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/cipher.h @@ -21,8 +21,8 @@ #ifndef CS_CIPHER_H #define CS_CIPHER_H -#include -#include +#include +#include namespace Cipher { diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.cpp index 9805de2f..ed1d1a62 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.cpp @@ -1,6 +1,6 @@ -#include"qrandom.h" +#include "qrandom.h" -#include +#include uchar QRandom::randomChar() { diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.h b/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.h index b877c1f2..ed98c263 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.h @@ -1,7 +1,7 @@ #ifndef CS_TQRANDOM_H #define CS_TQRANDOM_H -#include +#include class QRandom { diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp index 8ba6272d..7f5dc901 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp @@ -1,6 +1,6 @@ -#include"safedelete.h" +#include "safedelete.h" -#include +#include //---------------------------------------------------------------------------- // SafeDelete diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h index ce7a789a..e1e06da1 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h @@ -1,8 +1,8 @@ #ifndef SAFEDELETE_H #define SAFEDELETE_H -#include -#include +#include +#include class SafeDelete; class SafeDeleteLock diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/sha1.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/sha1.cpp index 0fefd995..bab37dd4 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/sha1.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/sha1.cpp @@ -18,7 +18,7 @@ * */ -#include"sha1.h" +#include "sha1.h" // CS_NAMESPACE_BEGIN diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/sha1.h b/kopete/protocols/jabber/libiris/cutestuff/util/sha1.h index 093037d3..8d6320eb 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/sha1.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/sha1.h @@ -21,7 +21,7 @@ #ifndef CS_SHA1_H #define CS_SHA1_H -#include +#include // CS_NAMESPACE_BEGIN diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp index 0c8b46df..7dbb0dd3 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp @@ -18,13 +18,13 @@ * */ -#include"showtextdlg.h" +#include "showtextdlg.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include ShowTextDlg::ShowTextDlg(const TQString &fname, bool rich, TQWidget *parent, const char *name) diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h index f8eb7095..060dfa60 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h @@ -21,7 +21,7 @@ #ifndef CS_SHOWTEXTDLG_H #define CS_SHOWTEXTDLG_H -#include +#include class ShowTextDlg : public TQDialog { -- cgit v1.2.1