Fix for

Issue 23: QXmppBind compilation error on macosx starting from r23
Issue 26: examples fail to link on macosx and linux
Issue 24: all text files should have the svn property eol-style set

Contributed by: Marco Molteni

53 files changed, 5883 insertions, 5857 deletions

diff --git a/LICENSE.LGPL b/LICENSE.LGPL
index 5faba9d4..5ab7695a 100644
--- a/LICENSE.LGPL
+++ b/LICENSE.LGPL
@@ -1,504 +1,504 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE

-		       Version 2.1, February 1999

-

- Copyright (C) 1991, 1999 Free Software Foundation, Inc.

- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

- Everyone is permitted to copy and distribute verbatim copies

- of this license document, but changing it is not allowed.

-

-[This is the first released version of the Lesser GPL.  It also counts

- as the successor of the GNU Library Public License, version 2, hence

- the version number 2.1.]

-

-			    Preamble

-

-  The licenses for most software are designed to take away your

-freedom to share and change it.  By contrast, the GNU General Public

-Licenses are intended to guarantee your freedom to share and change

-free software--to make sure the software is free for all its users.

-

-  This license, the Lesser General Public License, applies to some

-specially designated software packages--typically libraries--of the

-Free Software Foundation and other authors who decide to use it.  You

-can use it too, but we suggest you first think carefully about whether

-this license or the ordinary General Public License is the better

-strategy to use in any particular case, based on the explanations below.

-

-  When we speak of free software, we are referring to freedom of use,

-not price.  Our General Public Licenses are designed to make sure that

-you have the freedom to distribute copies of free software (and charge

-for this service if you wish); that you receive source code or can get

-it if you want it; that you can change the software and use pieces of

-it in new free programs; and that you are informed that you can do

-these things.

-

-  To protect your rights, we need to make restrictions that forbid

-distributors to deny you these rights or to ask you to surrender these

-rights.  These restrictions translate to certain responsibilities for

-you if you distribute copies of the library or if you modify it.

-

-  For example, if you distribute copies of the library, whether gratis

-or for a fee, you must give the recipients all the rights that we gave

-you.  You must make sure that they, too, receive or can get the source

-code.  If you link other code with the library, you must provide

-complete object files to the recipients, so that they can relink them

-with the library after making changes to the library and recompiling

-it.  And you must show them these terms so they know their rights.

-

-  We protect your rights with a two-step method: (1) we copyright the

-library, and (2) we offer you this license, which gives you legal

-permission to copy, distribute and/or modify the library.

-

-  To protect each distributor, we want to make it very clear that

-there is no warranty for the free library.  Also, if the library is

-modified by someone else and passed on, the recipients should know

-that what they have is not the original version, so that the original

-author's reputation will not be affected by problems that might be

-introduced by others.

-

-  Finally, software patents pose a constant threat to the existence of

-any free program.  We wish to make sure that a company cannot

-effectively restrict the users of a free program by obtaining a

-restrictive license from a patent holder.  Therefore, we insist that

-any patent license obtained for a version of the library must be

-consistent with the full freedom of use specified in this license.

-

-  Most GNU software, including some libraries, is covered by the

-ordinary GNU General Public License.  This license, the GNU Lesser

-General Public License, applies to certain designated libraries, and

-is quite different from the ordinary General Public License.  We use

-this license for certain libraries in order to permit linking those

-libraries into non-free programs.

-

-  When a program is linked with a library, whether statically or using

-a shared library, the combination of the two is legally speaking a

-combined work, a derivative of the original library.  The ordinary

-General Public License therefore permits such linking only if the

-entire combination fits its criteria of freedom.  The Lesser General

-Public License permits more lax criteria for linking other code with

-the library.

-

-  We call this license the "Lesser" General Public License because it

-does Less to protect the user's freedom than the ordinary General

-Public License.  It also provides other free software developers Less

-of an advantage over competing non-free programs.  These disadvantages

-are the reason we use the ordinary General Public License for many

-libraries.  However, the Lesser license provides advantages in certain

-special circumstances.

-

-  For example, on rare occasions, there may be a special need to

-encourage the widest possible use of a certain library, so that it becomes

-a de-facto standard.  To achieve this, non-free programs must be

-allowed to use the library.  A more frequent case is that a free

-library does the same job as widely used non-free libraries.  In this

-case, there is little to gain by limiting the free library to free

-software only, so we use the Lesser General Public License.

-

-  In other cases, permission to use a particular library in non-free

-programs enables a greater number of people to use a large body of

-free software.  For example, permission to use the GNU C Library in

-non-free programs enables many more people to use the whole GNU

-operating system, as well as its variant, the GNU/Linux operating

-system.

-

-  Although the Lesser General Public License is Less protective of the

-users' freedom, it does ensure that the user of a program that is

-linked with the Library has the freedom and the wherewithal to run

-that program using a modified version of the Library.

-

-  The precise terms and conditions for copying, distribution and

-modification follow.  Pay close attention to the difference between a

-"work based on the library" and a "work that uses the library".  The

-former contains code derived from the library, whereas the latter must

-be combined with the library in order to run.

-

-		  GNU LESSER GENERAL PUBLIC LICENSE

-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

-

-  0. This License Agreement applies to any software library or other

-program which contains a notice placed by the copyright holder or

-other authorized party saying it may be distributed under the terms of

-this Lesser General Public License (also called "this License").

-Each licensee is addressed as "you".

-

-  A "library" means a collection of software functions and/or data

-prepared so as to be conveniently linked with application programs

-(which use some of those functions and data) to form executables.

-

-  The "Library", below, refers to any such software library or work

-which has been distributed under these terms.  A "work based on the

-Library" means either the Library or any derivative work under

-copyright law: that is to say, a work containing the Library or a

-portion of it, either verbatim or with modifications and/or translated

-straightforwardly into another language.  (Hereinafter, translation is

-included without limitation in the term "modification".)

-

-  "Source code" for a work means the preferred form of the work for

-making modifications to it.  For a library, complete source code means

-all the source code for all modules it contains, plus any associated

-interface definition files, plus the scripts used to control compilation

-and installation of the library.

-

-  Activities other than copying, distribution and modification are not

-covered by this License; they are outside its scope.  The act of

-running a program using the Library is not restricted, and output from

-such a program is covered only if its contents constitute a work based

-on the Library (independent of the use of the Library in a tool for

-writing it).  Whether that is true depends on what the Library does

-and what the program that uses the Library does.

-  

-  1. You may copy and distribute verbatim copies of the Library's

-complete source code as you receive it, in any medium, provided that

-you conspicuously and appropriately publish on each copy an

-appropriate copyright notice and disclaimer of warranty; keep intact

-all the notices that refer to this License and to the absence of any

-warranty; and distribute a copy of this License along with the

-Library.

-

-  You may charge a fee for the physical act of transferring a copy,

-and you may at your option offer warranty protection in exchange for a

-fee.

-

-  2. You may modify your copy or copies of the Library or any portion

-of it, thus forming a work based on the Library, and copy and

-distribute such modifications or work under the terms of Section 1

-above, provided that you also meet all of these conditions:

-

-    a) The modified work must itself be a software library.

-

-    b) You must cause the files modified to carry prominent notices

-    stating that you changed the files and the date of any change.

-

-    c) You must cause the whole of the work to be licensed at no

-    charge to all third parties under the terms of this License.

-

-    d) If a facility in the modified Library refers to a function or a

-    table of data to be supplied by an application program that uses

-    the facility, other than as an argument passed when the facility

-    is invoked, then you must make a good faith effort to ensure that,

-    in the event an application does not supply such function or

-    table, the facility still operates, and performs whatever part of

-    its purpose remains meaningful.

-

-    (For example, a function in a library to compute square roots has

-    a purpose that is entirely well-defined independent of the

-    application.  Therefore, Subsection 2d requires that any

-    application-supplied function or table used by this function must

-    be optional: if the application does not supply it, the square

-    root function must still compute square roots.)

-

-These requirements apply to the modified work as a whole.  If

-identifiable sections of that work are not derived from the Library,

-and can be reasonably considered independent and separate works in

-themselves, then this License, and its terms, do not apply to those

-sections when you distribute them as separate works.  But when you

-distribute the same sections as part of a whole which is a work based

-on the Library, the distribution of the whole must be on the terms of

-this License, whose permissions for other licensees extend to the

-entire whole, and thus to each and every part regardless of who wrote

-it.

-

-Thus, it is not the intent of this section to claim rights or contest

-your rights to work written entirely by you; rather, the intent is to

-exercise the right to control the distribution of derivative or

-collective works based on the Library.

-

-In addition, mere aggregation of another work not based on the Library

-with the Library (or with a work based on the Library) on a volume of

-a storage or distribution medium does not bring the other work under

-the scope of this License.

-

-  3. You may opt to apply the terms of the ordinary GNU General Public

-License instead of this License to a given copy of the Library.  To do

-this, you must alter all the notices that refer to this License, so

-that they refer to the ordinary GNU General Public License, version 2,

-instead of to this License.  (If a newer version than version 2 of the

-ordinary GNU General Public License has appeared, then you can specify

-that version instead if you wish.)  Do not make any other change in

-these notices.

-

-  Once this change is made in a given copy, it is irreversible for

-that copy, so the ordinary GNU General Public License applies to all

-subsequent copies and derivative works made from that copy.

-

-  This option is useful when you wish to copy part of the code of

-the Library into a program that is not a library.

-

-  4. You may copy and distribute the Library (or a portion or

-derivative of it, under Section 2) in object code or executable form

-under the terms of Sections 1 and 2 above provided that you accompany

-it with the complete corresponding machine-readable source code, which

-must be distributed under the terms of Sections 1 and 2 above on a

-medium customarily used for software interchange.

-

-  If distribution of object code is made by offering access to copy

-from a designated place, then offering equivalent access to copy the

-source code from the same place satisfies the requirement to

-distribute the source code, even though third parties are not

-compelled to copy the source along with the object code.

-

-  5. A program that contains no derivative of any portion of the

-Library, but is designed to work with the Library by being compiled or

-linked with it, is called a "work that uses the Library".  Such a

-work, in isolation, is not a derivative work of the Library, and

-therefore falls outside the scope of this License.

-

-  However, linking a "work that uses the Library" with the Library

-creates an executable that is a derivative of the Library (because it

-contains portions of the Library), rather than a "work that uses the

-library".  The executable is therefore covered by this License.

-Section 6 states terms for distribution of such executables.

-

-  When a "work that uses the Library" uses material from a header file

-that is part of the Library, the object code for the work may be a

-derivative work of the Library even though the source code is not.

-Whether this is true is especially significant if the work can be

-linked without the Library, or if the work is itself a library.  The

-threshold for this to be true is not precisely defined by law.

-

-  If such an object file uses only numerical parameters, data

-structure layouts and accessors, and small macros and small inline

-functions (ten lines or less in length), then the use of the object

-file is unrestricted, regardless of whether it is legally a derivative

-work.  (Executables containing this object code plus portions of the

-Library will still fall under Section 6.)

-

-  Otherwise, if the work is a derivative of the Library, you may

-distribute the object code for the work under the terms of Section 6.

-Any executables containing that work also fall under Section 6,

-whether or not they are linked directly with the Library itself.

-

-  6. As an exception to the Sections above, you may also combine or

-link a "work that uses the Library" with the Library to produce a

-work containing portions of the Library, and distribute that work

-under terms of your choice, provided that the terms permit

-modification of the work for the customer's own use and reverse

-engineering for debugging such modifications.

-

-  You must give prominent notice with each copy of the work that the

-Library is used in it and that the Library and its use are covered by

-this License.  You must supply a copy of this License.  If the work

-during execution displays copyright notices, you must include the

-copyright notice for the Library among them, as well as a reference

-directing the user to the copy of this License.  Also, you must do one

-of these things:

-

-    a) Accompany the work with the complete corresponding

-    machine-readable source code for the Library including whatever

-    changes were used in the work (which must be distributed under

-    Sections 1 and 2 above); and, if the work is an executable linked

-    with the Library, with the complete machine-readable "work that

-    uses the Library", as object code and/or source code, so that the

-    user can modify the Library and then relink to produce a modified

-    executable containing the modified Library.  (It is understood

-    that the user who changes the contents of definitions files in the

-    Library will not necessarily be able to recompile the application

-    to use the modified definitions.)

-

-    b) Use a suitable shared library mechanism for linking with the

-    Library.  A suitable mechanism is one that (1) uses at run time a

-    copy of the library already present on the user's computer system,

-    rather than copying library functions into the executable, and (2)

-    will operate properly with a modified version of the library, if

-    the user installs one, as long as the modified version is

-    interface-compatible with the version that the work was made with.

-

-    c) Accompany the work with a written offer, valid for at

-    least three years, to give the same user the materials

-    specified in Subsection 6a, above, for a charge no more

-    than the cost of performing this distribution.

-

-    d) If distribution of the work is made by offering access to copy

-    from a designated place, offer equivalent access to copy the above

-    specified materials from the same place.

-

-    e) Verify that the user has already received a copy of these

-    materials or that you have already sent this user a copy.

-

-  For an executable, the required form of the "work that uses the

-Library" must include any data and utility programs needed for

-reproducing the executable from it.  However, as a special exception,

-the materials to be distributed need not include anything that is

-normally distributed (in either source or binary form) with the major

-components (compiler, kernel, and so on) of the operating system on

-which the executable runs, unless that component itself accompanies

-the executable.

-

-  It may happen that this requirement contradicts the license

-restrictions of other proprietary libraries that do not normally

-accompany the operating system.  Such a contradiction means you cannot

-use both them and the Library together in an executable that you

-distribute.

-

-  7. You may place library facilities that are a work based on the

-Library side-by-side in a single library together with other library

-facilities not covered by this License, and distribute such a combined

-library, provided that the separate distribution of the work based on

-the Library and of the other library facilities is otherwise

-permitted, and provided that you do these two things:

-

-    a) Accompany the combined library with a copy of the same work

-    based on the Library, uncombined with any other library

-    facilities.  This must be distributed under the terms of the

-    Sections above.

-

-    b) Give prominent notice with the combined library of the fact

-    that part of it is a work based on the Library, and explaining

-    where to find the accompanying uncombined form of the same work.

-

-  8. You may not copy, modify, sublicense, link with, or distribute

-the Library except as expressly provided under this License.  Any

-attempt otherwise to copy, modify, sublicense, link with, or

-distribute the Library is void, and will automatically terminate your

-rights under this License.  However, parties who have received copies,

-or rights, from you under this License will not have their licenses

-terminated so long as such parties remain in full compliance.

-

-  9. You are not required to accept this License, since you have not

-signed it.  However, nothing else grants you permission to modify or

-distribute the Library or its derivative works.  These actions are

-prohibited by law if you do not accept this License.  Therefore, by

-modifying or distributing the Library (or any work based on the

-Library), you indicate your acceptance of this License to do so, and

-all its terms and conditions for copying, distributing or modifying

-the Library or works based on it.

-

-  10. Each time you redistribute the Library (or any work based on the

-Library), the recipient automatically receives a license from the

-original licensor to copy, distribute, link with or modify the Library

-subject to these terms and conditions.  You may not impose any further

-restrictions on the recipients' exercise of the rights granted herein.

-You are not responsible for enforcing compliance by third parties with

-this License.

-

-  11. If, as a consequence of a court judgment or allegation of patent

-infringement or for any other reason (not limited to patent issues),

-conditions are imposed on you (whether by court order, agreement or

-otherwise) that contradict the conditions of this License, they do not

-excuse you from the conditions of this License.  If you cannot

-distribute so as to satisfy simultaneously your obligations under this

-License and any other pertinent obligations, then as a consequence you

-may not distribute the Library at all.  For example, if a patent

-license would not permit royalty-free redistribution of the Library by

-all those who receive copies directly or indirectly through you, then

-the only way you could satisfy both it and this License would be to

-refrain entirely from distribution of the Library.

-

-If any portion of this section is held invalid or unenforceable under any

-particular circumstance, the balance of the section is intended to apply,

-and the section as a whole is intended to apply in other circumstances.

-

-It is not the purpose of this section to induce you to infringe any

-patents or other property right claims or to contest validity of any

-such claims; this section has the sole purpose of protecting the

-integrity of the free software distribution system which is

-implemented by public license practices.  Many people have made

-generous contributions to the wide range of software distributed

-through that system in reliance on consistent application of that

-system; it is up to the author/donor to decide if he or she is willing

-to distribute software through any other system and a licensee cannot

-impose that choice.

-

-This section is intended to make thoroughly clear what is believed to

-be a consequence of the rest of this License.

-

-  12. If the distribution and/or use of the Library is restricted in

-certain countries either by patents or by copyrighted interfaces, the

-original copyright holder who places the Library under this License may add

-an explicit geographical distribution limitation excluding those countries,

-so that distribution is permitted only in or among countries not thus

-excluded.  In such case, this License incorporates the limitation as if

-written in the body of this License.

-

-  13. The Free Software Foundation may publish revised and/or new

-versions of the Lesser General Public License from time to time.

-Such new versions will be similar in spirit to the present version,

-but may differ in detail to address new problems or concerns.

-

-Each version is given a distinguishing version number.  If the Library

-specifies a version number of this License which applies to it and

-"any later version", you have the option of following the terms and

-conditions either of that version or of any later version published by

-the Free Software Foundation.  If the Library does not specify a

-license version number, you may choose any version ever published by

-the Free Software Foundation.

-

-  14. If you wish to incorporate parts of the Library into other free

-programs whose distribution conditions are incompatible with these,

-write to the author to ask for permission.  For software which is

-copyrighted by the Free Software Foundation, write to the Free

-Software Foundation; we sometimes make exceptions for this.  Our

-decision will be guided by the two goals of preserving the free status

-of all derivatives of our free software and of promoting the sharing

-and reuse of software generally.

-

-			    NO WARRANTY

-

-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO

-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.

-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR

-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY

-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE

-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE

-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME

-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

-

-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN

-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY

-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU

-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR

-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE

-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING

-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A

-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF

-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH

-DAMAGES.

-

-		     END OF TERMS AND CONDITIONS

-

-           How to Apply These Terms to Your New Libraries

-

-  If you develop a new library, and you want it to be of the greatest

-possible use to the public, we recommend making it free software that

-everyone can redistribute and change.  You can do so by permitting

-redistribution under these terms (or, alternatively, under the terms of the

-ordinary General Public License).

-

-  To apply these terms, attach the following notices to the library.  It is

-safest to attach them to the start of each source file to most effectively

-convey the exclusion of warranty; and each file should have at least the

-"copyright" line and a pointer to where the full notice is found.

-

-    <one line to give the library's name and a brief idea of what it does.>

-    Copyright (C) <year>  <name of author>

-

-    This library is free software; you can redistribute it and/or

-    modify it under the terms of the GNU Lesser General Public

-    License as published by the Free Software Foundation; either

-    version 2.1 of the License, or (at your option) any later version.

-

-    This library is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

-    Lesser General Public License for more details.

-

-    You should have received a copy of the GNU Lesser General Public

-    License along with this library; if not, write to the Free Software

-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

-

-Also add information on how to contact you by electronic and paper mail.

-

-You should also get your employer (if you work as a programmer) or your

-school, if any, to sign a "copyright disclaimer" for the library, if

-necessary.  Here is a sample; alter the names:

-

-  Yoyodyne, Inc., hereby disclaims all copyright interest in the

-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.

-

-  <signature of Ty Coon>, 1 April 1990

-  Ty Coon, President of Vice

-

-That's all there is to it!

-

-

+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/QXmppClient.pro b/QXmppClient.pro
index 9523d82c..d451ec96 100644
--- a/QXmppClient.pro
+++ b/QXmppClient.pro
@@ -1,4 +1,4 @@
-TEMPLATE = subdirs

-

-SUBDIRS = source \

-           example

+TEMPLATE = subdirs
+
+SUBDIRS = source \
+           example
diff --git a/README b/README
index e8207978..d54f955d 100644
--- a/README
+++ b/README
@@ -1,60 +1,60 @@
-ABOUT

-

-This is QXmpp version 0.1.

-QXmpp is cross-platform C++ client library for XMPP. It is based on Qt.

-

-

-BUILDING QXmpp

-

-You need to have Qt 4.5 or higher to build the QXmpp.

-The project uses qmake build system of Qt.

-

-Commands to build QXmpp:

-cd <where QXmppClient.pro is lying>

-qmake

-<respective-make-cmd = gmake, make, mingw32-make, nmake>

-

-Using Qt Creator:

-Open the QXmppClient.pro file in Qt Creator and hit Buil All to build all the examples and library.

-

-EXAMPLES

-

-Have a look the available examples to start using this library.

-

-* example_0_connected

-This example just connects to the xmpp server. And start receiving presences (updates) from the server.

-After running this example, you can see this user online, if it's added in your roster (friends list).

-Logging type has been set to stdout. You can see the progress on the command line.

-

-* example_1_echoClient

-This is a very simple bot which echoes the message sent to it.

-Run this example, send it a message from a friend of this bot. You will recieve the message back.

-This example shows how to receive and send messages.

-

-REFERENCE DOCUMENTATION

-

-http://code.google.com/p/qxmpp

-

-

-SUPPORTED PLATFORMS

-

-For this release, the following platforms have been tested:

-

-  win32-g++        (mingw)

-  win32-msvc2005

-

-  linux-g++

-  linux-g++-64

-

-It should work on all the plaforms supported by Qt.

-For a complete list of supported platforms, see

-http://www.qtsoftware.com/developer/supported-platforms/supported-platforms/

-

-

-HOW TO REPORT A BUG

-

-If you think you have found a bug in QXmpp, we would like to hear about

-it so that we can fix it. Before reporting a bug, please check 

-http://code.google.com/p/qxmpp/issues/

-to see if the issue is already known.

-

+ABOUT
+
+This is QXmpp version 0.1.
+QXmpp is cross-platform C++ client library for XMPP. It is based on Qt.
+
+
+BUILDING QXmpp
+
+You need to have Qt 4.5 or higher to build the QXmpp.
+The project uses qmake build system of Qt.
+
+Commands to build QXmpp:
+cd <where QXmppClient.pro is lying>
+qmake
+<respective-make-cmd = gmake, make, mingw32-make, nmake>
+
+Using Qt Creator:
+Open the QXmppClient.pro file in Qt Creator and hit Buil All to build all the examples and library.
+
+EXAMPLES
+
+Have a look the available examples to start using this library.
+
+* example_0_connected
+This example just connects to the xmpp server. And start receiving presences (updates) from the server.
+After running this example, you can see this user online, if it's added in your roster (friends list).
+Logging type has been set to stdout. You can see the progress on the command line.
+
+* example_1_echoClient
+This is a very simple bot which echoes the message sent to it.
+Run this example, send it a message from a friend of this bot. You will recieve the message back.
+This example shows how to receive and send messages.
+
+REFERENCE DOCUMENTATION
+
+http://code.google.com/p/qxmpp
+
+
+SUPPORTED PLATFORMS
+
+For this release, the following platforms have been tested:
+
+  win32-g++        (mingw)
+  win32-msvc2005
+
+  linux-g++
+  linux-g++-64
+
+It should work on all the plaforms supported by Qt.
+For a complete list of supported platforms, see
+http://www.qtsoftware.com/developer/supported-platforms/supported-platforms/
+
+
+HOW TO REPORT A BUG
+
+If you think you have found a bug in QXmpp, we would like to hear about
+it so that we can fix it. Before reporting a bug, please check 
+http://code.google.com/p/qxmpp/issues/
+to see if the issue is already known.
+
diff --git a/example/example.pro b/example/example.pro
index 1447c88f..d26a7a23 100644
--- a/example/example.pro
+++ b/example/example.pro
@@ -1,5 +1,5 @@
-TEMPLATE = subdirs

-

-SUBDIRS = example_0_connected\

-            example_1_echoClient

-

+TEMPLATE = subdirs
+
+SUBDIRS = example_0_connected\
+            example_1_echoClient
+
diff --git a/example/example_0_connected/README b/example/example_0_connected/README
index 54d162de..fb84fea9 100644
--- a/example/example_0_connected/README
+++ b/example/example_0_connected/README
@@ -1,5 +1,5 @@
-This example just connects to the xmpp server. And start receiving presences (updates) from the server.

-

-After running this example, you can see this user online, if it's added in your roster (friends list).

-

-Logging type has been set to stdout. You can see the progress on the command line.

+This example just connects to the xmpp server. And start receiving presences (updates) from the server.
+
+After running this example, you can see this user online, if it's added in your roster (friends list).
+
+Logging type has been set to stdout. You can see the progress on the command line.
diff --git a/example/example_0_connected/example_0_connected.pro b/example/example_0_connected/example_0_connected.pro
index 967ceade..4dbef891 100644
--- a/example/example_0_connected/example_0_connected.pro
+++ b/example/example_0_connected/example_0_connected.pro
@@ -1,19 +1,19 @@
-TEMPLATE = app

-

-TARGET = example_0_connected

-

-SOURCES += main.cpp

-

-INCLUDEPATH += ../../source

-

-QT += network xml

-

-CONFIG += console debug_and_release

-

-CONFIG(debug, debug|release) {

-    LIBS += -L../../source/debug -lQXmppClient_d

- } else {

-    LIBS += -L../../source/release -lQXmppClient

- }

-

-OTHER_FILES += README

+TEMPLATE = app
+
+TARGET = example_0_connected
+
+SOURCES += main.cpp
+
+INCLUDEPATH += ../../source
+
+QT += network xml
+
+CONFIG += console debug_and_release
+
+CONFIG(debug, debug|release) {
+    LIBS += -L../../source/debug -lQXmppClient_d
+ } else {
+    LIBS += -L../../source/release -lQXmppClient
+ }
+
+OTHER_FILES += README
diff --git a/example/example_0_connected/main.cpp b/example/example_0_connected/main.cpp
index fb9b54b8..110e1630 100644
--- a/example/example_0_connected/main.cpp
+++ b/example/example_0_connected/main.cpp
@@ -1,47 +1,47 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#include <QtCore/QCoreApplication>

-

-#include "QXmppClient.h"

-#include "QXmppLogger.h"

-

-int main(int argc, char *argv[])

-{

-    QCoreApplication a(argc, argv);

-    

-    QXmppLogger::getLogger()->setLoggingType(QXmppLogger::STDOUT);

-

-    QXmppClient client;

-

-//  For google talk

-//    client.connectToServer("talk.google.com", "usernamewithoutdomain", "passwd", "gmail.com");

-

-//  For jabber

-//    client.connectToServer("jabber.org", "usernamewithoutdomain", "passwd", "jabber.org");

-

-    client.connectToServer("talk.google.com", "qxmpp.test1", "qxmpp123", "gmail.com");

-

-    return a.exec();

-}

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#include <QtCore/QCoreApplication>
+
+#include "QXmppClient.h"
+#include "QXmppLogger.h"
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication a(argc, argv);
+    
+    QXmppLogger::getLogger()->setLoggingType(QXmppLogger::STDOUT);
+
+    QXmppClient client;
+
+//  For google talk
+//    client.connectToServer("talk.google.com", "usernamewithoutdomain", "passwd", "gmail.com");
+
+//  For jabber
+//    client.connectToServer("jabber.org", "usernamewithoutdomain", "passwd", "jabber.org");
+
+    client.connectToServer("talk.google.com", "qxmpp.test1", "qxmpp123", "gmail.com");
+
+    return a.exec();
+}
diff --git a/example/example_1_echoClient/README b/example/example_1_echoClient/README
index a8e19abf..4c3ac681 100644
--- a/example/example_1_echoClient/README
+++ b/example/example_1_echoClient/README
@@ -1,5 +1,5 @@
-This is a very simple bot which echoes the message sent to it.

-

-Run this example, send it a message from a friend of this bot. You will recieve the message back.

-

-This example shows how to receive and send messages.

+This is a very simple bot which echoes the message sent to it.
+
+Run this example, send it a message from a friend of this bot. You will recieve the message back.
+
+This example shows how to receive and send messages.
diff --git a/example/example_1_echoClient/echoClient.cpp b/example/example_1_echoClient/echoClient.cpp
index c5738811..f16b076f 100644
--- a/example/example_1_echoClient/echoClient.cpp
+++ b/example/example_1_echoClient/echoClient.cpp
@@ -1,47 +1,47 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#include "echoClient.h"

-#include "QXmppMessage.h"

-

-echoClient::echoClient(QObject *parent)

-    : QXmppClient(parent)

-{

-    bool check = connect(this, SIGNAL(messageReceived(const QXmppMessage&)),

-        SLOT(messageReceived(const QXmppMessage&)));

-    Q_ASSERT(check);

-}

-

-echoClient::~echoClient()

-{

-

-}

-

-void echoClient::messageReceived(const QXmppMessage& message)

-{

-    QString from = message.getFrom();

-    QString msg = message.getBody();

-

-    sendPacket(QXmppMessage("", from, "Your message: " + msg));

-}

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#include "echoClient.h"
+#include "QXmppMessage.h"
+
+echoClient::echoClient(QObject *parent)
+    : QXmppClient(parent)
+{
+    bool check = connect(this, SIGNAL(messageReceived(const QXmppMessage&)),
+        SLOT(messageReceived(const QXmppMessage&)));
+    Q_ASSERT(check);
+}
+
+echoClient::~echoClient()
+{
+
+}
+
+void echoClient::messageReceived(const QXmppMessage& message)
+{
+    QString from = message.getFrom();
+    QString msg = message.getBody();
+
+    sendPacket(QXmppMessage("", from, "Your message: " + msg));
+}
diff --git a/example/example_1_echoClient/echoClient.h b/example/example_1_echoClient/echoClient.h
index 342cc099..a1a0d04c 100644
--- a/example/example_1_echoClient/echoClient.h
+++ b/example/example_1_echoClient/echoClient.h
@@ -1,42 +1,42 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#ifndef ECHOCLIENT_H

-#define ECHOCLIENT_H

-

-#include "QXmppClient.h"

-

-class echoClient : public QXmppClient

-{

-    Q_OBJECT

-

-public:

-    echoClient(QObject *parent = 0);

-    ~echoClient();

-

-public slots:

-    void messageReceived(const QXmppMessage&);

-};

-

-#endif // ECHOCLIENT_H

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#ifndef ECHOCLIENT_H
+#define ECHOCLIENT_H
+
+#include "QXmppClient.h"
+
+class echoClient : public QXmppClient
+{
+    Q_OBJECT
+
+public:
+    echoClient(QObject *parent = 0);
+    ~echoClient();
+
+public slots:
+    void messageReceived(const QXmppMessage&);
+};
+
+#endif // ECHOCLIENT_H
diff --git a/example/example_1_echoClient/example_1_echoClient.pro b/example/example_1_echoClient/example_1_echoClient.pro
index 562cf273..f0555e46 100644
--- a/example/example_1_echoClient/example_1_echoClient.pro
+++ b/example/example_1_echoClient/example_1_echoClient.pro
@@ -1,21 +1,21 @@
-TEMPLATE = app

-

-TARGET = example_1_echoClient

-

-SOURCES +=  main.cpp \

-            echoClient.cpp

-

-HEADERS +=  echoClient.h

-

-INCLUDEPATH += ../../source

-

-QT += network xml

-CONFIG += console debug_and_release

-

-CONFIG(debug, debug|release) {

-    LIBS += -L../../source/debug -lQXmppClient_d

- } else {

-    LIBS += -L../../source/release -lQXmppClient

- }

-

-OTHER_FILES += README

+TEMPLATE = app
+
+TARGET = example_1_echoClient
+
+SOURCES +=  main.cpp \
+            echoClient.cpp
+
+HEADERS +=  echoClient.h
+
+INCLUDEPATH += ../../source
+
+QT += network xml
+CONFIG += console debug_and_release
+
+CONFIG(debug, debug|release) {
+    LIBS += -L../../source/debug -lQXmppClient_d
+ } else {
+    LIBS += -L../../source/release -lQXmppClient
+ }
+
+OTHER_FILES += README
diff --git a/example/example_1_echoClient/main.cpp b/example/example_1_echoClient/main.cpp
index 8c56e412..0cbfae17 100644
--- a/example/example_1_echoClient/main.cpp
+++ b/example/example_1_echoClient/main.cpp
@@ -1,38 +1,38 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#include <QtCore/QCoreApplication>

-#include "echoClient.h"

-#include "QXmppLogger.h"

-

-int main(int argc, char *argv[])

-{

-    QCoreApplication a(argc, argv);

-    

-    QXmppLogger::getLogger()->setLoggingType(QXmppLogger::STDOUT);

-

-    echoClient client;

-    client.connectToServer("talk.google.com", "qxmpp.test1", "qxmpp123", "gmail.com");

-    return a.exec();

-}

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#include <QtCore/QCoreApplication>
+#include "echoClient.h"
+#include "QXmppLogger.h"
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication a(argc, argv);
+    
+    QXmppLogger::getLogger()->setLoggingType(QXmppLogger::STDOUT);
+
+    echoClient client;
+    client.connectToServer("talk.google.com", "qxmpp.test1", "qxmpp123", "gmail.com");
+    return a.exec();
+}
diff --git a/source/QXmppBind.cpp b/source/QXmppBind.cpp
index 1d37e025..a1c5bd25 100644
--- a/source/QXmppBind.cpp
+++ b/source/QXmppBind.cpp
@@ -1,76 +1,76 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#include "QXmppBind.h"

-#include "QXmppUtils.h"

-#include "QXmppConstants.h"

-

-#include <QTextStream>

-#include <QXmlStreamWriter>

-

-QXmppBind::QXmppBind(QXmppIq::Type type)

-    : QXmppIq(type)

-{

-}

-QXmppBind::QXmppBind(const QString& type)

-    : QXmppIq(type)

-{

-}

-

-QXmppBind::~QXmppBind()

-{

-}

-

-QString QXmppBind::getJid() const

-{

-    return m_jid;

-}

-

-QString QXmppBind::getResource() const

-{

-    return m_resource;

-}

-

-void QXmppBind::setJid(const QString& str)

-{

-    m_jid = str;

-}

-

-void QXmppBind::setResource(const QString& str)

-{

-    m_resource = str;

-}

-

-void QXmppBind::toXmlElementFromChild(QXmlStreamWriter *writer) const

-{

-    QString data;

-    QTextStream stream(&data);

-

-    writer->writeStartElement("bind");

-    helperToXmlAddAttribute(writer, "xmlns", ns_bind);

-    helperToXmlAddTextElement(writer, "jid", getJid() );

-    helperToXmlAddTextElement(writer, "resource", getResource());

-    writer->writeEndElement();

-}

-

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#include "QXmppBind.h"
+#include "QXmppUtils.h"
+#include "QXmppConstants.h"
+
+#include <QTextStream>
+#include <QXmlStreamWriter>
+
+QXmppBind::QXmppBind(QXmppIq::Type type)
+    : QXmppIq(type)
+{
+}
+QXmppBind::QXmppBind(const QString& type)
+    : QXmppIq(type)
+{
+}
+
+QXmppBind::~QXmppBind()
+{
+}
+
+QString QXmppBind::getJid() const
+{
+    return m_jid;
+}
+
+QString QXmppBind::getResource() const
+{
+    return m_resource;
+}
+
+void QXmppBind::setJid(const QString& str)
+{
+    m_jid = str;
+}
+
+void QXmppBind::setResource(const QString& str)
+{
+    m_resource = str;
+}
+
+void QXmppBind::toXmlElementFromChild(QXmlStreamWriter *writer) const
+{
+    QString data;
+    QTextStream stream(&data);
+
+    writer->writeStartElement("bind");
+    helperToXmlAddAttribute(writer, "xmlns", ns_bind);
+    helperToXmlAddTextElement(writer, "jid", getJid() );
+    helperToXmlAddTextElement(writer, "resource", getResource());
+    writer->writeEndElement();
+}
+
diff --git a/source/QXmppBind.h b/source/QXmppBind.h
index 46baf91f..4e8472d1 100644
--- a/source/QXmppBind.h
+++ b/source/QXmppBind.h
@@ -1,48 +1,48 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#ifndef QXMPPBIND_H

-#define QXMPPBIND_H

-

-#include "QXmppIq.h"

-

-class QXmppBind : public QXmppIq

-{

-public:

-    QXmppBind(QXmppIq::Type type);

-    QXmppBind(const QString& type);

-    ~QXmppBind();

-    

-    QString getJid() const;

-    QString getResource() const;

-    void setJid(const QString&);

-    void setResource(const QString&);

-

-private:

-    QString m_jid;

-    QString m_resource;

-    void toXmlElementFromChild(QXmlStreamWriter *writer) const;

-};

-

-#endif // QXMPPBIND_H

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#ifndef QXMPPBIND_H
+#define QXMPPBIND_H
+
+#include "QXmppIq.h"
+
+class QXmppBind : public QXmppIq
+{
+public:
+    QXmppBind(QXmppIq::Type type);
+    QXmppBind(const QString& type);
+    ~QXmppBind();
+    
+    QString getJid() const;
+    QString getResource() const;
+    void setJid(const QString&);
+    void setResource(const QString&);
+
+private:
+    QString m_jid;
+    QString m_resource;
+    void toXmlElementFromChild(QXmlStreamWriter *writer) const;
+};
+
+#endif // QXMPPBIND_H
diff --git a/source/QXmppClient.cpp b/source/QXmppClient.cpp
index 4618da55..0538224f 100644
--- a/source/QXmppClient.cpp
+++ b/source/QXmppClient.cpp
@@ -1,339 +1,339 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#include "QXmppClient.h"

-#include "QXmppStream.h"

-#include "QXmppRoster.h"

-#include "QXmppMessage.h"

-#include "QXmppReconnectionManager.h"

-

-/// Creates a QXmppClient object.

-/// \param parent is passed to the QObject's contructor.

-/// The default value is 0.

-

-QXmppClient::QXmppClient(QObject *parent)

-    : QObject(parent), m_stream(0), m_clientPrecence(QXmppPresence::Available),

-    m_reconnectionManager(0)

-{

-    m_stream = new QXmppStream(this);

-

-    bool check = connect(m_stream, SIGNAL(messageReceived(const QXmppMessage&)),

-                         this, SIGNAL(messageReceived(const QXmppMessage&)));

-    Q_ASSERT(check);

-

-    check = connect(m_stream, SIGNAL(presenceReceived(const QXmppPresence&)),

-                    this, SIGNAL(presenceReceived(const QXmppPresence&)));

-    Q_ASSERT(check);

-

-    check = connect(m_stream, SIGNAL(iqReceived(const QXmppIq&)), this,

-        SIGNAL(iqReceived(const QXmppIq&)));

-

-    check = connect(m_stream, SIGNAL(disconnected()), this,

-        SIGNAL(disconnected()));

-    Q_ASSERT(check);

-

-    check = connect(m_stream, SIGNAL(xmppConnected()), this,

-        SIGNAL(connected()));

-    Q_ASSERT(check);

-

-    check = connect(m_stream, SIGNAL(error(QXmppClient::Error)), this,

-        SIGNAL(error(QXmppClient::Error)));

-    Q_ASSERT(check);

-

-    check = setReconnectionManager(new QXmppReconnectionManager(this));

-    Q_ASSERT(check);

-}

-

-/// Destroys the QXmppClient object.

-///

-

-QXmppClient::~QXmppClient()

-{

-}

-

-/// Returns a modifiable reference to the current configuration of QXmppClient.

-/// \return Reference to the QXmppClient's configuration for the connection.

-

-QXmppConfiguration& QXmppClient::getConfiguration()

-{

-    return m_config;

-}

-

-/// Overloaded function. It returns a const reference to the current configuration

-/// of QXmppClient.

-/// \return Constant reference to the QXmppClient's configuration for the connection.

-

-const QXmppConfiguration& QXmppClient::getConfiguration() const

-{

-    return m_config;

-}

-

-/// Attempts to connect to the XMPP server. Server deatils and other configurations

-/// are specified using the config parameter. Use signals connected(), error(QXmppClient::Error)

-/// and disconnected() to know the status of the connection.

-/// \param config Specifies the configuration object for connecting the XMPP server.

-/// This contains the host name, user, passwd etc. See QXmppConfiguration for details.

-/// \param initialPresence The initial presence which will be set for this user

-/// after establishing the session. The default value is QXmppPresence::Available

-

-void QXmppClient::connectToServer(const QXmppConfiguration& config,

-                                  const QXmppPresence& initialPresence)

-{

-    m_config = config;

-

-    if(!m_config.getAutoReconnectionEnabled())

-    {

-        delete m_reconnectionManager;

-        m_reconnectionManager = 0;

-    }

-

-    m_clientPrecence = initialPresence;

-

-    m_stream->connect();

-}

-

-/// Overloaded function.

-/// \param host host name of the XMPP server where connection has to be made

-/// (e.g. "jabber.org" and "talk.google.com"). It can also be an IP address in

-/// the form of a string (e.g. "192.168.1.25").

-/// \param user Username of the account at the specified XMPP server. It should

-/// be the name without the domain name. E.g. "qxmpp.test1" and not

-/// "qxmpp.test1@gmail.com"

-/// \param passwd Password for the specified username

-/// \param domain Domain name e.g. "gmail.com" and "jabber.org".

-/// \param port Port number at which the XMPP server is listening. The default

-/// value is 5222.

-/// \param initialPresence The initial presence which will be set for this user

-/// after establishing the session. The default value is QXmppPresence::Available

-

-void QXmppClient::connectToServer(const QString& host, const QString& user,

-                                  const QString& passwd, const QString& domain,

-                                  int port,

-                                  const QXmppPresence& initialPresence)

-{

-    m_config.setHost(host);

-    m_config.setUser(user);

-    m_config.setPasswd(passwd);

-    m_config.setDomain(domain);

-    m_config.setPort(port);

-

-    m_clientPrecence = initialPresence;

-

-    m_stream->connect();

-}

-

-/// After successfully connecting to the server use this function to send

-/// stanzas to the server. This function can solely be used to send various kind

-/// of stanzas to the server. QXmppPacket is a parent class of all the stanzas

-/// QXmppMessage, QXmppPresence, QXmppIq, QXmppBind, QXmppRosterIq, QXmppSession

-/// and QXmppVCard.

-///

-/// Following code snippet illustrates how to send a message using this function:

-/// \code

-/// QXmppMessage message(from, to, message);

-/// client.sendPacket(message);

-/// \endcode

-///

-/// \param packet A valid XMPP stanza. It can an iq, a message or a presence stanza.

-///

-

-void QXmppClient::sendPacket(const QXmppPacket& packet)

-{

-    if(m_stream)

-    {

-        m_stream->sendPacket(packet);

-    }

-}

-

-/// Disconnects the client and the current presence of client changes to

-/// QXmppPresence::Unavailable and statatus text changes to "Logged out".

-///

-/// \note Make sure that the clientPresence is changed to

-/// QXmppPresence::Available, if you are again calling connectToServer() after

-/// calling the disconnect() function.

-///

-

-void QXmppClient::disconnect()

-{

-    m_clientPrecence.setType(QXmppPresence::Unavailable);

-    m_clientPrecence.getStatus().setType(QXmppPresence::Status::Online);

-    m_clientPrecence.getStatus().setStatusText("Logged out");

-    sendPacket(m_clientPrecence);

-    if(m_stream)

-        m_stream->disconnect();

-}

-

-/// Returns the reference to QXmppRoster object of the client.

-/// \return Reference to the roster object of the connected client. Use this to

-/// get the list of friends in the roster and there presence information.

-///

-

-QXmppRoster& QXmppClient::getRoster()

-{

-    return m_stream->getRoster();

-}

-

-/// Utility function to send message to all the resources associated with the

-/// specified bareJid.

-///

-/// \param bareJid bareJid of the receiving entity

-/// \param message Message string to be sent.

-

-void QXmppClient::sendMessage(const QString& bareJid, const QString& message)

-{

-    QStringList resources = getRoster().getResources(bareJid);

-    for(int i = 0; i < resources.size(); ++i)

-    {

-        sendPacket(QXmppMessage("", bareJid + "/" + resources.at(i), message));

-    }

-}

-

-/// Changes the presence of the connected client.

-///

-/// \param presence QXmppPresence object

-///

-

-void QXmppClient::setClientPresence(const QXmppPresence& presence)

-{

-    m_clientPrecence = presence;

-    sendPacket(m_clientPrecence);

-}

-

-/// Overloaded function.

-///

-/// It only changes the status text.

-///

-/// \param statusText New status message string

-///

-

-void QXmppClient::setClientPresence(const QString& statusText)

-{

-    m_clientPrecence.getStatus().setStatusText(statusText);

-    sendPacket(m_clientPrecence);

-}

-

-/// Overloaded function.

-///

-/// It only changes the QXmppPresence::Type.

-///

-/// \param presenceType New QXmppPresence::Type

-///

-

-void QXmppClient::setClientPresence(QXmppPresence::Type presenceType)

-{

-    if(presenceType == QXmppPresence::Unavailable)

-    {

-        disconnect();

-    }

-    else

-    {

-        m_clientPrecence.setType(presenceType);

-        sendPacket(m_clientPrecence);

-    }

-}

-

-/// Overloaded function.

-///

-/// It only changes the QXmppPresence::Status::Type.

-///

-/// \param statusType New QXmppPresence::Status::Type

-///

-

-void QXmppClient::setClientPresence(QXmppPresence::Status::Type statusType)

-{

-    m_clientPrecence.getStatus().setType(statusType);

-    sendPacket(m_clientPrecence);

-}

-

-/// Function to get the client's current presence.

-///

-/// \return Constant reference to the client's presence object

-///

-

-const QXmppPresence& QXmppClient::getClientPresence() const

-{

-    return m_clientPrecence;

-}

-

-/// Function to get reconnection manager. By default there exists a reconnection

-/// manager. See QXmppReconnectionManager for more details of the reconnection

-/// mechanism.

-///

-/// \return Pointer to QXmppReconnectionManager

-///

-

-QXmppReconnectionManager* QXmppClient::getReconnectionManager()

-{

-    return m_reconnectionManager;

-}

-

-/// Sets the user defined reconnection manager.

-///

-/// \return true if all the signal-slot connections are made correctly.

-///

-

-bool QXmppClient::setReconnectionManager(QXmppReconnectionManager*

-                                         reconnectionManager)

-{

-	if(!reconnectionManager)

-		return false;

-		

-    if(m_reconnectionManager)

-        delete m_reconnectionManager;

-

-    m_reconnectionManager = reconnectionManager;

-

-    bool check = connect(this, SIGNAL(connected()), m_reconnectionManager,

-                         SLOT(connected()));

-    Q_ASSERT(check);

-	if(!check)

-		return false;

-

-    check = connect(this, SIGNAL(error(QXmppClient::Error)),

-                    m_reconnectionManager, SLOT(error(QXmppClient::Error)));

-    Q_ASSERT(check);

-	if(!check)

-		return false;

-	

-    return true;

-}

-

-/// Returns the socket error if QXmppClient::Error is QXmppClient::SocketError.

-///

-/// \return QAbstractSocket::SocketError

-///

-

-QAbstractSocket::SocketError QXmppClient::getSocketError()

-{

-    return m_stream->getSocketError();

-}

-

-/// Returns the reference to QXmppVCardManager, implimentation of XEP-0054.

-/// http://xmpp.org/extensions/xep-0054.html

-///

-

-QXmppVCardManager& QXmppClient::getVCardManager()

-{

-    return m_stream->getVCardManager();

-}

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#include "QXmppClient.h"
+#include "QXmppStream.h"
+#include "QXmppRoster.h"
+#include "QXmppMessage.h"
+#include "QXmppReconnectionManager.h"
+
+/// Creates a QXmppClient object.
+/// \param parent is passed to the QObject's contructor.
+/// The default value is 0.
+
+QXmppClient::QXmppClient(QObject *parent)
+    : QObject(parent), m_stream(0), m_clientPrecence(QXmppPresence::Available),
+    m_reconnectionManager(0)
+{
+    m_stream = new QXmppStream(this);
+
+    bool check = connect(m_stream, SIGNAL(messageReceived(const QXmppMessage&)),
+                         this, SIGNAL(messageReceived(const QXmppMessage&)));
+    Q_ASSERT(check);
+
+    check = connect(m_stream, SIGNAL(presenceReceived(const QXmppPresence&)),
+                    this, SIGNAL(presenceReceived(const QXmppPresence&)));
+    Q_ASSERT(check);
+
+    check = connect(m_stream, SIGNAL(iqReceived(const QXmppIq&)), this,
+        SIGNAL(iqReceived(const QXmppIq&)));
+
+    check = connect(m_stream, SIGNAL(disconnected()), this,
+        SIGNAL(disconnected()));
+    Q_ASSERT(check);
+
+    check = connect(m_stream, SIGNAL(xmppConnected()), this,
+        SIGNAL(connected()));
+    Q_ASSERT(check);
+
+    check = connect(m_stream, SIGNAL(error(QXmppClient::Error)), this,
+        SIGNAL(error(QXmppClient::Error)));
+    Q_ASSERT(check);
+
+    check = setReconnectionManager(new QXmppReconnectionManager(this));
+    Q_ASSERT(check);
+}
+
+/// Destroys the QXmppClient object.
+///
+
+QXmppClient::~QXmppClient()
+{
+}
+
+/// Returns a modifiable reference to the current configuration of QXmppClient.
+/// \return Reference to the QXmppClient's configuration for the connection.
+
+QXmppConfiguration& QXmppClient::getConfiguration()
+{
+    return m_config;
+}
+
+/// Overloaded function. It returns a const reference to the current configuration
+/// of QXmppClient.
+/// \return Constant reference to the QXmppClient's configuration for the connection.
+
+const QXmppConfiguration& QXmppClient::getConfiguration() const
+{
+    return m_config;
+}
+
+/// Attempts to connect to the XMPP server. Server deatils and other configurations
+/// are specified using the config parameter. Use signals connected(), error(QXmppClient::Error)
+/// and disconnected() to know the status of the connection.
+/// \param config Specifies the configuration object for connecting the XMPP server.
+/// This contains the host name, user, passwd etc. See QXmppConfiguration for details.
+/// \param initialPresence The initial presence which will be set for this user
+/// after establishing the session. The default value is QXmppPresence::Available
+
+void QXmppClient::connectToServer(const QXmppConfiguration& config,
+                                  const QXmppPresence& initialPresence)
+{
+    m_config = config;
+
+    if(!m_config.getAutoReconnectionEnabled())
+    {
+        delete m_reconnectionManager;
+        m_reconnectionManager = 0;
+    }
+
+    m_clientPrecence = initialPresence;
+
+    m_stream->connect();
+}
+
+/// Overloaded function.
+/// \param host host name of the XMPP server where connection has to be made
+/// (e.g. "jabber.org" and "talk.google.com"). It can also be an IP address in
+/// the form of a string (e.g. "192.168.1.25").
+/// \param user Username of the account at the specified XMPP server. It should
+/// be the name without the domain name. E.g. "qxmpp.test1" and not
+/// "qxmpp.test1@gmail.com"
+/// \param passwd Password for the specified username
+/// \param domain Domain name e.g. "gmail.com" and "jabber.org".
+/// \param port Port number at which the XMPP server is listening. The default
+/// value is 5222.
+/// \param initialPresence The initial presence which will be set for this user
+/// after establishing the session. The default value is QXmppPresence::Available
+
+void QXmppClient::connectToServer(const QString& host, const QString& user,
+                                  const QString& passwd, const QString& domain,
+                                  int port,
+                                  const QXmppPresence& initialPresence)
+{
+    m_config.setHost(host);
+    m_config.setUser(user);
+    m_config.setPasswd(passwd);
+    m_config.setDomain(domain);
+    m_config.setPort(port);
+
+    m_clientPrecence = initialPresence;
+
+    m_stream->connect();
+}
+
+/// After successfully connecting to the server use this function to send
+/// stanzas to the server. This function can solely be used to send various kind
+/// of stanzas to the server. QXmppPacket is a parent class of all the stanzas
+/// QXmppMessage, QXmppPresence, QXmppIq, QXmppBind, QXmppRosterIq, QXmppSession
+/// and QXmppVCard.
+///
+/// Following code snippet illustrates how to send a message using this function:
+/// \code
+/// QXmppMessage message(from, to, message);
+/// client.sendPacket(message);
+/// \endcode
+///
+/// \param packet A valid XMPP stanza. It can an iq, a message or a presence stanza.
+///
+
+void QXmppClient::sendPacket(const QXmppPacket& packet)
+{
+    if(m_stream)
+    {
+        m_stream->sendPacket(packet);
+    }
+}
+
+/// Disconnects the client and the current presence of client changes to
+/// QXmppPresence::Unavailable and statatus text changes to "Logged out".
+///
+/// \note Make sure that the clientPresence is changed to
+/// QXmppPresence::Available, if you are again calling connectToServer() after
+/// calling the disconnect() function.
+///
+
+void QXmppClient::disconnect()
+{
+    m_clientPrecence.setType(QXmppPresence::Unavailable);
+    m_clientPrecence.getStatus().setType(QXmppPresence::Status::Online);
+    m_clientPrecence.getStatus().setStatusText("Logged out");
+    sendPacket(m_clientPrecence);
+    if(m_stream)
+        m_stream->disconnect();
+}
+
+/// Returns the reference to QXmppRoster object of the client.
+/// \return Reference to the roster object of the connected client. Use this to
+/// get the list of friends in the roster and there presence information.
+///
+
+QXmppRoster& QXmppClient::getRoster()
+{
+    return m_stream->getRoster();
+}
+
+/// Utility function to send message to all the resources associated with the
+/// specified bareJid.
+///
+/// \param bareJid bareJid of the receiving entity
+/// \param message Message string to be sent.
+
+void QXmppClient::sendMessage(const QString& bareJid, const QString& message)
+{
+    QStringList resources = getRoster().getResources(bareJid);
+    for(int i = 0; i < resources.size(); ++i)
+    {
+        sendPacket(QXmppMessage("", bareJid + "/" + resources.at(i), message));
+    }
+}
+
+/// Changes the presence of the connected client.
+///
+/// \param presence QXmppPresence object
+///
+
+void QXmppClient::setClientPresence(const QXmppPresence& presence)
+{
+    m_clientPrecence = presence;
+    sendPacket(m_clientPrecence);
+}
+
+/// Overloaded function.
+///
+/// It only changes the status text.
+///
+/// \param statusText New status message string
+///
+
+void QXmppClient::setClientPresence(const QString& statusText)
+{
+    m_clientPrecence.getStatus().setStatusText(statusText);
+    sendPacket(m_clientPrecence);
+}
+
+/// Overloaded function.
+///
+/// It only changes the QXmppPresence::Type.
+///
+/// \param presenceType New QXmppPresence::Type
+///
+
+void QXmppClient::setClientPresence(QXmppPresence::Type presenceType)
+{
+    if(presenceType == QXmppPresence::Unavailable)
+    {
+        disconnect();
+    }
+    else
+    {
+        m_clientPrecence.setType(presenceType);
+        sendPacket(m_clientPrecence);
+    }
+}
+
+/// Overloaded function.
+///
+/// It only changes the QXmppPresence::Status::Type.
+///
+/// \param statusType New QXmppPresence::Status::Type
+///
+
+void QXmppClient::setClientPresence(QXmppPresence::Status::Type statusType)
+{
+    m_clientPrecence.getStatus().setType(statusType);
+    sendPacket(m_clientPrecence);
+}
+
+/// Function to get the client's current presence.
+///
+/// \return Constant reference to the client's presence object
+///
+
+const QXmppPresence& QXmppClient::getClientPresence() const
+{
+    return m_clientPrecence;
+}
+
+/// Function to get reconnection manager. By default there exists a reconnection
+/// manager. See QXmppReconnectionManager for more details of the reconnection
+/// mechanism.
+///
+/// \return Pointer to QXmppReconnectionManager
+///
+
+QXmppReconnectionManager* QXmppClient::getReconnectionManager()
+{
+    return m_reconnectionManager;
+}
+
+/// Sets the user defined reconnection manager.
+///
+/// \return true if all the signal-slot connections are made correctly.
+///
+
+bool QXmppClient::setReconnectionManager(QXmppReconnectionManager*
+                                         reconnectionManager)
+{
+	if(!reconnectionManager)
+		return false;
+		
+    if(m_reconnectionManager)
+        delete m_reconnectionManager;
+
+    m_reconnectionManager = reconnectionManager;
+
+    bool check = connect(this, SIGNAL(connected()), m_reconnectionManager,
+                         SLOT(connected()));
+    Q_ASSERT(check);
+	if(!check)
+		return false;
+
+    check = connect(this, SIGNAL(error(QXmppClient::Error)),
+                    m_reconnectionManager, SLOT(error(QXmppClient::Error)));
+    Q_ASSERT(check);
+	if(!check)
+		return false;
+	
+    return true;
+}
+
+/// Returns the socket error if QXmppClient::Error is QXmppClient::SocketError.
+///
+/// \return QAbstractSocket::SocketError
+///
+
+QAbstractSocket::SocketError QXmppClient::getSocketError()
+{
+    return m_stream->getSocketError();
+}
+
+/// Returns the reference to QXmppVCardManager, implimentation of XEP-0054.
+/// http://xmpp.org/extensions/xep-0054.html
+///
+
+QXmppVCardManager& QXmppClient::getVCardManager()
+{
+    return m_stream->getVCardManager();
+}
diff --git a/source/QXmppClient.h b/source/QXmppClient.h
index 04fbd196..5e5f3099 100644
--- a/source/QXmppClient.h
+++ b/source/QXmppClient.h
@@ -1,160 +1,160 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-/// \class QXmppClient

-/// \brief The QXmppClient is the main class for using QXmpp.

-///

-/// It provides the user all the required functionality to connect to the server

-/// and perform operations afterwards.

-///

-/// This class will provide the handle/reference to QXmppRoster (roster management),

-///  QXmppVCardManager (vCard manager) and QXmppReconnectionManager (reconnection

-/// mechanism).

-///

-/// By default, a reconnection mechanism exists, which makes sure of reconnecting

-/// to the server on dissconnections due to an error. User can have a custom

-/// reconnection mechanism as well.

-///

-

-#ifndef QXMPPCLIENT_H

-#define QXMPPCLIENT_H

-

-#include <QObject>

-#include <QTcpSocket>

-#include "QXmppConfiguration.h"

-#include "QXmppPresence.h"

-

-class QXmppStream;

-class QXmppPresence;

-class QXmppMessage;

-class QXmppPacket;

-class QXmppIq;

-class QXmppRoster;

-class QXmppReconnectionManager;

-class QXmppVCardManager;

-

-class QXmppClient : public QObject

-{

-    Q_OBJECT

-

-public:

-    /// An enumeration for type of error.

-    /// Error could come due a TCP socket or XML stream or due to various stanzas.

-    enum Error

-    {

-        SocketError,        ///< Error due to TCP socket

-        XmppStreamError,    ///< Error due to XML stream

-        XmppStanzaError     ///< Error due to stanza

-    };

-

-    QXmppClient(QObject *parent = 0);

-    ~QXmppClient();

-    void connectToServer(const QString& host,

-                         const QString& user,

-                         const QString& passwd,

-                         const QString& domain,

-                         int port = 5222,

-                         const QXmppPresence& initialPresence =

-                         QXmppPresence());

-    void connectToServer(const QXmppConfiguration&, 

-                         const QXmppPresence& initialPresence = 

-                         QXmppPresence());

-    void disconnect();

-    QXmppRoster& getRoster();

-    QXmppConfiguration& getConfiguration();

-    const QXmppConfiguration& getConfiguration() const;

-    QXmppReconnectionManager* getReconnectionManager();

-    bool setReconnectionManager(QXmppReconnectionManager*);

-    const QXmppPresence& getClientPresence() const;

-    QXmppVCardManager& getVCardManager();

-

-signals:

-

-    /// This signal is emitted when the client connects sucessfully to the XMPP

-    /// server i.e. when a successful XMPP connection is established.

-    /// XMPP Connection involves following sequential steps:

-    ///     - TCP socket connection

-    ///     - Client sends start stream

-    ///     - Server sends start stream

-    ///     - TLS negotiation (encryption)

-    ///     - Authentication

-    ///     - Resource binding

-    ///     - Session establishment

-    ///

-    /// After all these steps a successful XMPP connection is established and

-    /// connected() signal is emitted.

-    ///

-    void connected();

-

-    /// This signal is emitted when the XMPP connection disconnects.

-    ///

-    void disconnected();

-

-    /// This signal is emitted when the XMPP connection encounters any error.

-    /// The QXmppClient::Error parameter specifies the type of error occured.

-    /// It could be due to TCP socket or the xml stream or the stanza.

-    /// Depending upon the type of error occured use the respective get function to

-    /// know the error.

-    void error(QXmppClient::Error);

-

-    /// Notifies that an XMPP message stanza is received. The QXmppMessage

-    /// parameter contains the details of the message sent to this client.

-    /// In other words whenever someone sends you a message this signal is

-    /// emitted.

-    void messageReceived(const QXmppMessage&);

-

-    /// Notifies that an XMPP presence stanza is received. The QXmppPresence

-    /// parameter contains the details of the presence sent to this client.

-    /// This signal is emitted when someone login/logout or when someone's status

-    /// changes Busy, Idle, Invisible etc.

-    void presenceReceived(const QXmppPresence&);

-

-    /// Notifies that an XMPP iq stanza is received. The QXmppIq

-    /// parameter contains the details of the iq sent to this client.

-    /// IQ stanzas provide a structured request-response mechanism. Roster

-    /// management, setting-getting vCards etc is done using iq stanzas.

-    void iqReceived(const QXmppIq&);

-

-public:

-    QAbstractSocket::SocketError getSocketError();

-//    QXmppStanza::Error getXmppStreamError();

-

-public slots:

-    void sendPacket(const QXmppPacket&);

-    void sendMessage(const QString& bareJid, const QString& message);

-

-    void setClientPresence(const QXmppPresence&);

-    void setClientPresence(const QString& statusText);

-    void setClientPresence(QXmppPresence::Type presenceType);

-    void setClientPresence(QXmppPresence::Status::Type statusType);

-

-private:

-    QXmppStream* m_stream;  ///< Pointer to QXmppStream object a wrapper over

-                            ///< TCP socket and XMPP protocol

-    QXmppConfiguration m_config;    ///< This object provides the configuration

-                                    ///< required for connecting to the XMPP server.

-    QXmppPresence m_clientPrecence; ///< Stores the current presence of connected client

-    QXmppReconnectionManager* m_reconnectionManager;    ///< Pointer to the reconnection manager

-};

-

-#endif // QXMPPCLIENT_H

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+/// \class QXmppClient
+/// \brief The QXmppClient is the main class for using QXmpp.
+///
+/// It provides the user all the required functionality to connect to the server
+/// and perform operations afterwards.
+///
+/// This class will provide the handle/reference to QXmppRoster (roster management),
+///  QXmppVCardManager (vCard manager) and QXmppReconnectionManager (reconnection
+/// mechanism).
+///
+/// By default, a reconnection mechanism exists, which makes sure of reconnecting
+/// to the server on dissconnections due to an error. User can have a custom
+/// reconnection mechanism as well.
+///
+
+#ifndef QXMPPCLIENT_H
+#define QXMPPCLIENT_H
+
+#include <QObject>
+#include <QTcpSocket>
+#include "QXmppConfiguration.h"
+#include "QXmppPresence.h"
+
+class QXmppStream;
+class QXmppPresence;
+class QXmppMessage;
+class QXmppPacket;
+class QXmppIq;
+class QXmppRoster;
+class QXmppReconnectionManager;
+class QXmppVCardManager;
+
+class QXmppClient : public QObject
+{
+    Q_OBJECT
+
+public:
+    /// An enumeration for type of error.
+    /// Error could come due a TCP socket or XML stream or due to various stanzas.
+    enum Error
+    {
+        SocketError,        ///< Error due to TCP socket
+        XmppStreamError,    ///< Error due to XML stream
+        XmppStanzaError     ///< Error due to stanza
+    };
+
+    QXmppClient(QObject *parent = 0);
+    ~QXmppClient();
+    void connectToServer(const QString& host,
+                         const QString& user,
+                         const QString& passwd,
+                         const QString& domain,
+                         int port = 5222,
+                         const QXmppPresence& initialPresence =
+                         QXmppPresence());
+    void connectToServer(const QXmppConfiguration&, 
+                         const QXmppPresence& initialPresence = 
+                         QXmppPresence());
+    void disconnect();
+    QXmppRoster& getRoster();
+    QXmppConfiguration& getConfiguration();
+    const QXmppConfiguration& getConfiguration() const;
+    QXmppReconnectionManager* getReconnectionManager();
+    bool setReconnectionManager(QXmppReconnectionManager*);
+    const QXmppPresence& getClientPresence() const;
+    QXmppVCardManager& getVCardManager();
+
+signals:
+
+    /// This signal is emitted when the client connects sucessfully to the XMPP
+    /// server i.e. when a successful XMPP connection is established.
+    /// XMPP Connection involves following sequential steps:
+    ///     - TCP socket connection
+    ///     - Client sends start stream
+    ///     - Server sends start stream
+    ///     - TLS negotiation (encryption)
+    ///     - Authentication
+    ///     - Resource binding
+    ///     - Session establishment
+    ///
+    /// After all these steps a successful XMPP connection is established and
+    /// connected() signal is emitted.
+    ///
+    void connected();
+
+    /// This signal is emitted when the XMPP connection disconnects.
+    ///
+    void disconnected();
+
+    /// This signal is emitted when the XMPP connection encounters any error.
+    /// The QXmppClient::Error parameter specifies the type of error occured.
+    /// It could be due to TCP socket or the xml stream or the stanza.
+    /// Depending upon the type of error occured use the respective get function to
+    /// know the error.
+    void error(QXmppClient::Error);
+
+    /// Notifies that an XMPP message stanza is received. The QXmppMessage
+    /// parameter contains the details of the message sent to this client.
+    /// In other words whenever someone sends you a message this signal is
+    /// emitted.
+    void messageReceived(const QXmppMessage&);
+
+    /// Notifies that an XMPP presence stanza is received. The QXmppPresence
+    /// parameter contains the details of the presence sent to this client.
+    /// This signal is emitted when someone login/logout or when someone's status
+    /// changes Busy, Idle, Invisible etc.
+    void presenceReceived(const QXmppPresence&);
+
+    /// Notifies that an XMPP iq stanza is received. The QXmppIq
+    /// parameter contains the details of the iq sent to this client.
+    /// IQ stanzas provide a structured request-response mechanism. Roster
+    /// management, setting-getting vCards etc is done using iq stanzas.
+    void iqReceived(const QXmppIq&);
+
+public:
+    QAbstractSocket::SocketError getSocketError();
+//    QXmppStanza::Error getXmppStreamError();
+
+public slots:
+    void sendPacket(const QXmppPacket&);
+    void sendMessage(const QString& bareJid, const QString& message);
+
+    void setClientPresence(const QXmppPresence&);
+    void setClientPresence(const QString& statusText);
+    void setClientPresence(QXmppPresence::Type presenceType);
+    void setClientPresence(QXmppPresence::Status::Type statusType);
+
+private:
+    QXmppStream* m_stream;  ///< Pointer to QXmppStream object a wrapper over
+                            ///< TCP socket and XMPP protocol
+    QXmppConfiguration m_config;    ///< This object provides the configuration
+                                    ///< required for connecting to the XMPP server.
+    QXmppPresence m_clientPrecence; ///< Stores the current presence of connected client
+    QXmppReconnectionManager* m_reconnectionManager;    ///< Pointer to the reconnection manager
+};
+
+#endif // QXMPPCLIENT_H
diff --git a/source/QXmppConfiguration.cpp b/source/QXmppConfiguration.cpp
index 7943c5fd..279cbe65 100644
--- a/source/QXmppConfiguration.cpp
+++ b/source/QXmppConfiguration.cpp
@@ -1,217 +1,217 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#include "QXmppConfiguration.h"

-

-QXmppConfiguration::QXmppConfiguration() : m_port(5222),

-                m_resource("QXmpp"),

-                m_autoAcceptSubscriptions(true),

-                m_sendIntialPresence(true),

-                m_sendRosterRequest(true),

-                m_keepAlivePingsInterval(100),

-                m_autoReconnectionEnabled(true),

-                m_useSASLAuthentication(true),

-                m_streamSecurityMode(QXmppConfiguration::TLSEnabled),

-                m_nonSASLAuthMechanism(QXmppConfiguration::NonSASLDigest),

-                m_SASLAuthMechanism(QXmppConfiguration::SASLDigestMD5)

-{

-

-}

-

-QXmppConfiguration::~QXmppConfiguration()

-{

-

-}

-

-void QXmppConfiguration::setHost(const QString& str)

-{

-    m_host = str;

-}

-

-void QXmppConfiguration::setDomain(const QString& str)

-{

-    m_domain = str;

-}

-

-void QXmppConfiguration::setPort(int port)

-{

-    m_port = port;

-}

-

-void QXmppConfiguration::setUser(const QString& str)

-{

-    m_user = str;

-}

-

-void QXmppConfiguration::setPasswd(const QString& str)

-{

-    m_passwd = str;

-}

-

-void QXmppConfiguration::setResource(const QString& str)

-{

-    m_resource = str;

-}

-

-QString QXmppConfiguration::getHost() const

-{

-    return m_host;

-}

-

-QString QXmppConfiguration::getDomain() const

-{

-    return m_domain;

-}

-

-int QXmppConfiguration::getPort() const

-{

-    return m_port;

-}

-

-QString QXmppConfiguration::getUser() const

-{

-    return m_user;

-}

-QString QXmppConfiguration::getPasswd() const

-{

-    return m_passwd;

-}

-

-QString QXmppConfiguration::getResource() const

-{

-    return m_resource;

-}

-

-QString QXmppConfiguration::getJid() const

-{

-    return getJidBare() + "/" + m_resource;

-}

-

-QString QXmppConfiguration::getJidBare() const

-{

-    return m_user+"@"+m_domain;

-}

-

-bool QXmppConfiguration::getAutoAcceptSubscriptions() const

-{

-    return m_autoAcceptSubscriptions;

-}

-

-void QXmppConfiguration::setAutoAcceptSubscriptions(bool check)

-{

-    m_autoAcceptSubscriptions = check;

-}

-

-bool QXmppConfiguration::getAutoReconnectionEnabled() const

-{

-    return m_autoReconnectionEnabled;

-}

-

-void QXmppConfiguration::setAutoReconnectionEnabled(bool value)

-{

-    m_autoReconnectionEnabled = value;

-}

-

-/// Returns the type of authentication system specified by the user.

-/// \return true if SASL was specified else false. If the specified

-/// system is not available QXmpp will resort to the other one.

-

-bool QXmppConfiguration::getUseSASLAuthentication() const

-{

-    return m_useSASLAuthentication;

-}

-

-/// Returns the type of authentication system specified by the user.

-/// \param useSASL to hint to use SASL authentication system if available.

-/// false will specify to use NonSASL XEP-0078: Non-SASL Authentication

-/// If the specified one is not availbe, library will use the othe one

-

-void QXmppConfiguration::setUseSASLAuthentication(bool useSASL)

-{

-    m_useSASLAuthentication = useSASL;

-}

-

-/// Returns the specified security mode for the stream. The default value is

-/// QXmppConfiguration::TLSEnabled.

-/// \return StreamSecurityMode

-

-QXmppConfiguration::StreamSecurityMode QXmppConfiguration::getStreamSecurityMode() const

-{

-    return m_streamSecurityMode;

-}

-

-/// Specifies the specified security mode for the stream. The default value is

-/// QXmppConfiguration::TLSEnabled.

-/// \param mode StreamSecurityMode

-

-void QXmppConfiguration::setStreamSecurityMode(

-        QXmppConfiguration::StreamSecurityMode mode)

-{

-    m_streamSecurityMode = mode;

-}

-

-QXmppConfiguration::NonSASLAuthMechanism QXmppConfiguration::getNonSASLAuthMechanism() const

-{

-    return m_nonSASLAuthMechanism;

-}

-

-void QXmppConfiguration::setNonSASLAuthMechanism(

-        QXmppConfiguration::NonSASLAuthMechanism mech)

-{

-    m_nonSASLAuthMechanism = mech;

-}

-

-QXmppConfiguration::SASLAuthMechanism QXmppConfiguration::getSASLAuthMechanism() const

-{

-    return m_SASLAuthMechanism;

-}

-

-void QXmppConfiguration::setSASLAuthMechanism(

-        QXmppConfiguration::SASLAuthMechanism mech)

-{

-    m_SASLAuthMechanism = mech;

-}

-

-/// Specifies the network proxy used for the connection made by QXmppClient.

-/// The default value is QNetworkProxy::DefaultProxy that is the proxy is

-/// determined based on the application proxy set using

-/// QNetworkProxy::setApplicationProxy().

-/// \param proxy QNetworkProxy

-

-void QXmppConfiguration::setNetworkProxy(const QNetworkProxy& proxy)

-{

-    m_networkProxy = proxy;

-}

-

-/// Returns the specified network proxy.

-/// The default value is QNetworkProxy::DefaultProxy that is the proxy is

-/// determined based on the application proxy set using

-/// QNetworkProxy::setApplicationProxy().

-/// \return QNetworkProxy

-

-QNetworkProxy QXmppConfiguration::getNetworkProxy() const

-{

-    return m_networkProxy;

-}

-

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#include "QXmppConfiguration.h"
+
+QXmppConfiguration::QXmppConfiguration() : m_port(5222),
+                m_resource("QXmpp"),
+                m_autoAcceptSubscriptions(true),
+                m_sendIntialPresence(true),
+                m_sendRosterRequest(true),
+                m_keepAlivePingsInterval(100),
+                m_autoReconnectionEnabled(true),
+                m_useSASLAuthentication(true),
+                m_streamSecurityMode(QXmppConfiguration::TLSEnabled),
+                m_nonSASLAuthMechanism(QXmppConfiguration::NonSASLDigest),
+                m_SASLAuthMechanism(QXmppConfiguration::SASLDigestMD5)
+{
+
+}
+
+QXmppConfiguration::~QXmppConfiguration()
+{
+
+}
+
+void QXmppConfiguration::setHost(const QString& str)
+{
+    m_host = str;
+}
+
+void QXmppConfiguration::setDomain(const QString& str)
+{
+    m_domain = str;
+}
+
+void QXmppConfiguration::setPort(int port)
+{
+    m_port = port;
+}
+
+void QXmppConfiguration::setUser(const QString& str)
+{
+    m_user = str;
+}
+
+void QXmppConfiguration::setPasswd(const QString& str)
+{
+    m_passwd = str;
+}
+
+void QXmppConfiguration::setResource(const QString& str)
+{
+    m_resource = str;
+}
+
+QString QXmppConfiguration::getHost() const
+{
+    return m_host;
+}
+
+QString QXmppConfiguration::getDomain() const
+{
+    return m_domain;
+}
+
+int QXmppConfiguration::getPort() const
+{
+    return m_port;
+}
+
+QString QXmppConfiguration::getUser() const
+{
+    return m_user;
+}
+QString QXmppConfiguration::getPasswd() const
+{
+    return m_passwd;
+}
+
+QString QXmppConfiguration::getResource() const
+{
+    return m_resource;
+}
+
+QString QXmppConfiguration::getJid() const
+{
+    return getJidBare() + "/" + m_resource;
+}
+
+QString QXmppConfiguration::getJidBare() const
+{
+    return m_user+"@"+m_domain;
+}
+
+bool QXmppConfiguration::getAutoAcceptSubscriptions() const
+{
+    return m_autoAcceptSubscriptions;
+}
+
+void QXmppConfiguration::setAutoAcceptSubscriptions(bool check)
+{
+    m_autoAcceptSubscriptions = check;
+}
+
+bool QXmppConfiguration::getAutoReconnectionEnabled() const
+{
+    return m_autoReconnectionEnabled;
+}
+
+void QXmppConfiguration::setAutoReconnectionEnabled(bool value)
+{
+    m_autoReconnectionEnabled = value;
+}
+
+/// Returns the type of authentication system specified by the user.
+/// \return true if SASL was specified else false. If the specified
+/// system is not available QXmpp will resort to the other one.
+
+bool QXmppConfiguration::getUseSASLAuthentication() const
+{
+    return m_useSASLAuthentication;
+}
+
+/// Returns the type of authentication system specified by the user.
+/// \param useSASL to hint to use SASL authentication system if available.
+/// false will specify to use NonSASL XEP-0078: Non-SASL Authentication
+/// If the specified one is not availbe, library will use the othe one
+
+void QXmppConfiguration::setUseSASLAuthentication(bool useSASL)
+{
+    m_useSASLAuthentication = useSASL;
+}
+
+/// Returns the specified security mode for the stream. The default value is
+/// QXmppConfiguration::TLSEnabled.
+/// \return StreamSecurityMode
+
+QXmppConfiguration::StreamSecurityMode QXmppConfiguration::getStreamSecurityMode() const
+{
+    return m_streamSecurityMode;
+}
+
+/// Specifies the specified security mode for the stream. The default value is
+/// QXmppConfiguration::TLSEnabled.
+/// \param mode StreamSecurityMode
+
+void QXmppConfiguration::setStreamSecurityMode(
+        QXmppConfiguration::StreamSecurityMode mode)
+{
+    m_streamSecurityMode = mode;
+}
+
+QXmppConfiguration::NonSASLAuthMechanism QXmppConfiguration::getNonSASLAuthMechanism() const
+{
+    return m_nonSASLAuthMechanism;
+}
+
+void QXmppConfiguration::setNonSASLAuthMechanism(
+        QXmppConfiguration::NonSASLAuthMechanism mech)
+{
+    m_nonSASLAuthMechanism = mech;
+}
+
+QXmppConfiguration::SASLAuthMechanism QXmppConfiguration::getSASLAuthMechanism() const
+{
+    return m_SASLAuthMechanism;
+}
+
+void QXmppConfiguration::setSASLAuthMechanism(
+        QXmppConfiguration::SASLAuthMechanism mech)
+{
+    m_SASLAuthMechanism = mech;
+}
+
+/// Specifies the network proxy used for the connection made by QXmppClient.
+/// The default value is QNetworkProxy::DefaultProxy that is the proxy is
+/// determined based on the application proxy set using
+/// QNetworkProxy::setApplicationProxy().
+/// \param proxy QNetworkProxy
+
+void QXmppConfiguration::setNetworkProxy(const QNetworkProxy& proxy)
+{
+    m_networkProxy = proxy;
+}
+
+/// Returns the specified network proxy.
+/// The default value is QNetworkProxy::DefaultProxy that is the proxy is
+/// determined based on the application proxy set using
+/// QNetworkProxy::setApplicationProxy().
+/// \return QNetworkProxy
+
+QNetworkProxy QXmppConfiguration::getNetworkProxy() const
+{
+    return m_networkProxy;
+}
+
diff --git a/source/QXmppConfiguration.h b/source/QXmppConfiguration.h
index baabf1bd..953fe932 100644
--- a/source/QXmppConfiguration.h
+++ b/source/QXmppConfiguration.h
@@ -1,137 +1,137 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#ifndef QXMPPCONFIGURATION_H

-#define QXMPPCONFIGURATION_H

-

-#include <QString>

-#include <QNetworkProxy>

-

-class QXmppConfiguration

-{

-public:

-    /// An enumeration for type of the Security Mode that is stream is encrypted or not.

-    /// The server may or may not have TLS feature. Server may force the encryption.

-    /// Depending upon all this user can specify following options.

-    enum StreamSecurityMode

-    {

-        TLSEnabled = 0, ///< Default, encryption is used if available

-        TLSDisabled,    ///< No encryption is server allows

-        TLSRequired     ///< Encryption is a must otherwise connection would not

-                        ///< be established

-    };

-

-    /// An enumeration for various Non-SASL authentication mechanisms available.

-    /// The server may or may not allow QXmppConfiguration::Plain mechanism. So

-    /// specifying the mechanism is just a hint to the library.

-    enum NonSASLAuthMechanism

-    {

-       NonSASLPlain = 0,///< Plain

-       NonSASLDigest    ///< Default,

-    };

-

-    /// An enumeration for various SASL authentication mechanisms available.

-    /// The server may or may not allow any particular mechanism. So depending

-    /// upon the availability of mechanisms on the server the library will choose

-    /// a mechanism.

-    enum SASLAuthMechanism

-    {

-       SASLPlain = 0,

-       SASLDigestMD5    ///< Default

-    };

-

-    QXmppConfiguration();

-    ~QXmppConfiguration();

-

-    void setHost(const QString&);

-    void setDomain(const QString&);

-    void setPort(int);

-    void setUser(const QString&);

-    void setPasswd(const QString&);

-    void setResource(const QString&);

-

-    QString getHost() const;

-    QString getDomain() const;

-    int getPort() const;

-    QString getUser() const;

-    QString getPasswd() const;

-    QString getStatus() const;

-    QString getResource() const;

-    QString getJid() const;

-    QString getJidBare() const;

-

-    bool getAutoAcceptSubscriptions() const;

-    void setAutoAcceptSubscriptions(bool);

-

-    bool getAutoReconnectionEnabled() const;

-    void setAutoReconnectionEnabled(bool);

-

-    bool getUseSASLAuthentication() const;

-    void setUseSASLAuthentication(bool);

-

-    QXmppConfiguration::StreamSecurityMode getStreamSecurityMode() const;

-    void setStreamSecurityMode(QXmppConfiguration::StreamSecurityMode mode);

-

-    QXmppConfiguration::NonSASLAuthMechanism QXmppConfiguration::

-            getNonSASLAuthMechanism() const;

-    void setNonSASLAuthMechanism(QXmppConfiguration::NonSASLAuthMechanism);

-

-    QXmppConfiguration::SASLAuthMechanism QXmppConfiguration::

-            getSASLAuthMechanism() const;

-    void setSASLAuthMechanism(QXmppConfiguration::SASLAuthMechanism);

-

-    void setNetworkProxy(const QNetworkProxy& proxy);

-    QNetworkProxy getNetworkProxy() const;

-

-private:

-    QString m_host;

-    int m_port;

-    QString m_user;

-    QString m_passwd;

-    QString m_domain;

-    QString m_resource;

-

-    // default is true

-    bool m_autoAcceptSubscriptions;

-    // default is true

-    bool m_sendIntialPresence;

-    // default is true

-    bool m_sendRosterRequest;

-    // interval in seconds, if negative it won't ping

-    int m_keepAlivePingsInterval;

-    // will keep reconnecting if disconnected, default is true

-    bool m_autoReconnectionEnabled;

-    bool m_useSASLAuthentication; ///< flag to specify what authentication system

-                                  ///< to be used

-                                ///< defualt is true and use SASL

-                                ///< false would use NonSASL if available

-

-    StreamSecurityMode m_streamSecurityMode;

-    NonSASLAuthMechanism m_nonSASLAuthMechanism;

-    SASLAuthMechanism m_SASLAuthMechanism;

-

-    QNetworkProxy m_networkProxy;

-};

-

-#endif // QXMPPCONFIGURATION_H

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#ifndef QXMPPCONFIGURATION_H
+#define QXMPPCONFIGURATION_H
+
+#include <QString>
+#include <QNetworkProxy>
+
+class QXmppConfiguration
+{
+public:
+    /// An enumeration for type of the Security Mode that is stream is encrypted or not.
+    /// The server may or may not have TLS feature. Server may force the encryption.
+    /// Depending upon all this user can specify following options.
+    enum StreamSecurityMode
+    {
+        TLSEnabled = 0, ///< Default, encryption is used if available
+        TLSDisabled,    ///< No encryption is server allows
+        TLSRequired     ///< Encryption is a must otherwise connection would not
+                        ///< be established
+    };
+
+    /// An enumeration for various Non-SASL authentication mechanisms available.
+    /// The server may or may not allow QXmppConfiguration::Plain mechanism. So
+    /// specifying the mechanism is just a hint to the library.
+    enum NonSASLAuthMechanism
+    {
+       NonSASLPlain = 0,///< Plain
+       NonSASLDigest    ///< Default,
+    };
+
+    /// An enumeration for various SASL authentication mechanisms available.
+    /// The server may or may not allow any particular mechanism. So depending
+    /// upon the availability of mechanisms on the server the library will choose
+    /// a mechanism.
+    enum SASLAuthMechanism
+    {
+       SASLPlain = 0,
+       SASLDigestMD5    ///< Default
+    };
+
+    QXmppConfiguration();
+    ~QXmppConfiguration();
+
+    void setHost(const QString&);
+    void setDomain(const QString&);
+    void setPort(int);
+    void setUser(const QString&);
+    void setPasswd(const QString&);
+    void setResource(const QString&);
+
+    QString getHost() const;
+    QString getDomain() const;
+    int getPort() const;
+    QString getUser() const;
+    QString getPasswd() const;
+    QString getStatus() const;
+    QString getResource() const;
+    QString getJid() const;
+    QString getJidBare() const;
+
+    bool getAutoAcceptSubscriptions() const;
+    void setAutoAcceptSubscriptions(bool);
+
+    bool getAutoReconnectionEnabled() const;
+    void setAutoReconnectionEnabled(bool);
+
+    bool getUseSASLAuthentication() const;
+    void setUseSASLAuthentication(bool);
+
+    QXmppConfiguration::StreamSecurityMode getStreamSecurityMode() const;
+    void setStreamSecurityMode(QXmppConfiguration::StreamSecurityMode mode);
+
+    QXmppConfiguration::NonSASLAuthMechanism QXmppConfiguration::
+            getNonSASLAuthMechanism() const;
+    void setNonSASLAuthMechanism(QXmppConfiguration::NonSASLAuthMechanism);
+
+    QXmppConfiguration::SASLAuthMechanism QXmppConfiguration::
+            getSASLAuthMechanism() const;
+    void setSASLAuthMechanism(QXmppConfiguration::SASLAuthMechanism);
+
+    void setNetworkProxy(const QNetworkProxy& proxy);
+    QNetworkProxy getNetworkProxy() const;
+
+private:
+    QString m_host;
+    int m_port;
+    QString m_user;
+    QString m_passwd;
+    QString m_domain;
+    QString m_resource;
+
+    // default is true
+    bool m_autoAcceptSubscriptions;
+    // default is true
+    bool m_sendIntialPresence;
+    // default is true
+    bool m_sendRosterRequest;
+    // interval in seconds, if negative it won't ping
+    int m_keepAlivePingsInterval;
+    // will keep reconnecting if disconnected, default is true
+    bool m_autoReconnectionEnabled;
+    bool m_useSASLAuthentication; ///< flag to specify what authentication system
+                                  ///< to be used
+                                ///< defualt is true and use SASL
+                                ///< false would use NonSASL if available
+
+    StreamSecurityMode m_streamSecurityMode;
+    NonSASLAuthMechanism m_nonSASLAuthMechanism;
+    SASLAuthMechanism m_SASLAuthMechanism;
+
+    QNetworkProxy m_networkProxy;
+};
+
+#endif // QXMPPCONFIGURATION_H
diff --git a/source/QXmppConstants.cpp b/source/QXmppConstants.cpp
index bd73494f..7fd2ead4 100644
--- a/source/QXmppConstants.cpp
+++ b/source/QXmppConstants.cpp
@@ -1,39 +1,39 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#include "QXmppConstants.h"

-

-const char* ns_stream = "http://etherx.jabber.org/streams";

-const char* ns_client = "jabber:client";

-const char* ns_roster = "jabber:iq:roster";

-const char* ns_tls = "urn:ietf:params:xml:ns:xmpp-tls";

-const char* ns_sasl = "urn:ietf:params:xml:ns:xmpp-sasl";

-const char* ns_bind = "urn:ietf:params:xml:ns:xmpp-bind";

-const char* ns_session = "urn:ietf:params:xml:ns:xmpp-session";

-const char* ns_stanza = "urn:ietf:params:xml:ns:xmpp-stanzas";

-const char* ns_vcard = "vcard-temp";

-const char* ns_auth = "jabber:iq:auth";

-const char* ns_authFeature = "http://jabber.org/features/iq-auth";

-const char* ns_disco_info = "http://jabber.org/protocol/disco#info";

-const char* ns_ibb = "http://jabber.org/protocol/ibb";

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#include "QXmppConstants.h"
+
+const char* ns_stream = "http://etherx.jabber.org/streams";
+const char* ns_client = "jabber:client";
+const char* ns_roster = "jabber:iq:roster";
+const char* ns_tls = "urn:ietf:params:xml:ns:xmpp-tls";
+const char* ns_sasl = "urn:ietf:params:xml:ns:xmpp-sasl";
+const char* ns_bind = "urn:ietf:params:xml:ns:xmpp-bind";
+const char* ns_session = "urn:ietf:params:xml:ns:xmpp-session";
+const char* ns_stanza = "urn:ietf:params:xml:ns:xmpp-stanzas";
+const char* ns_vcard = "vcard-temp";
+const char* ns_auth = "jabber:iq:auth";
+const char* ns_authFeature = "http://jabber.org/features/iq-auth";
+const char* ns_disco_info = "http://jabber.org/protocol/disco#info";
+const char* ns_ibb = "http://jabber.org/protocol/ibb";
diff --git a/source/QXmppConstants.h b/source/QXmppConstants.h
index ee92560a..0e2553e9 100644
--- a/source/QXmppConstants.h
+++ b/source/QXmppConstants.h
@@ -1,42 +1,42 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#ifndef QXMPPCONSTANTS_H

-#define QXMPPCONSTANTS_H

-

-extern const char* ns_stream;

-extern const char* ns_client;

-extern const char* ns_roster;

-extern const char* ns_tls;

-extern const char* ns_sasl;

-extern const char* ns_bind;

-extern const char* ns_session;

-extern const char* ns_stanza;

-extern const char* ns_vcard;

-extern const char* ns_auth;

-extern const char* ns_authFeature;

-extern const char* ns_disco_info;

-extern const char* ns_ibb;

-

-#endif // QXMPPCONSTANTS_H

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#ifndef QXMPPCONSTANTS_H
+#define QXMPPCONSTANTS_H
+
+extern const char* ns_stream;
+extern const char* ns_client;
+extern const char* ns_roster;
+extern const char* ns_tls;
+extern const char* ns_sasl;
+extern const char* ns_bind;
+extern const char* ns_session;
+extern const char* ns_stanza;
+extern const char* ns_vcard;
+extern const char* ns_auth;
+extern const char* ns_authFeature;
+extern const char* ns_disco_info;
+extern const char* ns_ibb;
+
+#endif // QXMPPCONSTANTS_H
diff --git a/source/QXmppInformationRequestResult.cpp b/source/QXmppInformationRequestResult.cpp
index 058612f1..e882a6f2 100644
--- a/source/QXmppInformationRequestResult.cpp
+++ b/source/QXmppInformationRequestResult.cpp
@@ -1,20 +1,20 @@
-#include "QXmppInformationRequestResult.h"

-#include "QXmppConstants.h"

-#include <QXmlStreamWriter>

-

-QXmppInformationRequestResult::QXmppInformationRequestResult() : QXmppIq(QXmppIq::Result)

-{

-}

-

-void QXmppInformationRequestResult::toXmlElementFromChild(QXmlStreamWriter *writer) const

-{

-    writer->writeStartElement("query");

-    writer->writeAttribute("xmlns", ns_disco_info );

-    writer->writeStartElement("feature");

-    writer->writeAttribute("var", ns_disco_info );

-    writer->writeEndElement();

-    writer->writeStartElement("feature");

-    writer->writeAttribute("var", ns_ibb );

-    writer->writeEndElement();

-    writer->writeEndElement();

-}

+#include "QXmppInformationRequestResult.h"
+#include "QXmppConstants.h"
+#include <QXmlStreamWriter>
+
+QXmppInformationRequestResult::QXmppInformationRequestResult() : QXmppIq(QXmppIq::Result)
+{
+}
+
+void QXmppInformationRequestResult::toXmlElementFromChild(QXmlStreamWriter *writer) const
+{
+    writer->writeStartElement("query");
+    writer->writeAttribute("xmlns", ns_disco_info );
+    writer->writeStartElement("feature");
+    writer->writeAttribute("var", ns_disco_info );
+    writer->writeEndElement();
+    writer->writeStartElement("feature");
+    writer->writeAttribute("var", ns_ibb );
+    writer->writeEndElement();
+    writer->writeEndElement();
+}
diff --git a/source/QXmppInformationRequestResult.h b/source/QXmppInformationRequestResult.h
index 44f128ae..56a22b83 100644
--- a/source/QXmppInformationRequestResult.h
+++ b/source/QXmppInformationRequestResult.h
@@ -1,13 +1,13 @@
-#ifndef QXMPPINFORMATIONREQUESTRESULT_H

-#define QXMPPINFORMATIONREQUESTRESULT_H

-

-#include "QXmppIq.h"

-

-class QXmppInformationRequestResult : public QXmppIq

-{

-public:

-    QXmppInformationRequestResult();

-    virtual void toXmlElementFromChild(QXmlStreamWriter *writer) const;

-};

-

-#endif // QXMPPINFORMATIONREQUESTRESULT_H

+#ifndef QXMPPINFORMATIONREQUESTRESULT_H
+#define QXMPPINFORMATIONREQUESTRESULT_H
+
+#include "QXmppIq.h"
+
+class QXmppInformationRequestResult : public QXmppIq
+{
+public:
+    QXmppInformationRequestResult();
+    virtual void toXmlElementFromChild(QXmlStreamWriter *writer) const;
+};
+
+#endif // QXMPPINFORMATIONREQUESTRESULT_H
diff --git a/source/QXmppIq.cpp b/source/QXmppIq.cpp
index 3eeef4af..5c1ceea2 100644
--- a/source/QXmppIq.cpp
+++ b/source/QXmppIq.cpp
@@ -1,126 +1,126 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#include "QXmppUtils.h"

-#include "QXmppIq.h"

-

-#include <QXmlStreamWriter>

-

-QXmppIq::QXmppIq(QXmppIq::Type type)

-    : QXmppStanza(), m_type(type)

-{

-    generateAndSetNextId();

-}

-

-QXmppIq::QXmppIq(const QString& type)

-    : QXmppStanza()

-{

-    generateAndSetNextId();

-    setTypeFromStr(type);

-}

-

-QXmppIq::~QXmppIq()

-{

-

-}

-

-QXmppIq::Type QXmppIq::getType() const

-{

-    return m_type;

-}

-

-void QXmppIq::setType(QXmppIq::Type type)

-{

-    m_type = type;

-}

-

-void QXmppIq::toXml( QXmlStreamWriter *xmlWriter ) const

-{

-    xmlWriter->writeStartElement("iq");

-

-    helperToXmlAddAttribute(xmlWriter, "id", getId());

-    helperToXmlAddAttribute(xmlWriter, "to", getTo());

-    helperToXmlAddAttribute(xmlWriter, "from", getFrom());

-    if(getTypeStr().isEmpty())

-        helperToXmlAddAttribute(xmlWriter, "type", "get");

-    else

-        helperToXmlAddAttribute(xmlWriter,  "type", getTypeStr());

-    toXmlElementFromChild(xmlWriter);

-    getError().toXml(xmlWriter);

-    xmlWriter->writeEndElement();

-}

-

-void QXmppIq::toXmlElementFromChild( QXmlStreamWriter *writer ) const

-{

-    Q_UNUSED(writer);

-}

-

-QString QXmppIq::getTypeStr() const

-{

-    switch(getType())

-    {

-    case QXmppIq::Error:

-        return "error";

-    case QXmppIq::Get:

-        return "get";

-    case QXmppIq::Set:

-        return "set";

-    case QXmppIq::Result:

-        return "result";

-    default:

-        qWarning("QXmppIq::getTypeStr() invalid type %d", (int)getType());

-        return "";

-    }

-}

-

-void QXmppIq::setTypeFromStr(const QString& str)

-{

-    if(str == "error")

-    {

-        setType(QXmppIq::Error);

-        return;

-    }

-    else if(str == "get")

-    {

-        setType(QXmppIq::Get);

-        return;

-    }

-    else if(str == "set")

-    {

-        setType(QXmppIq::Set);

-        return;

-    }

-    else if(str == "result")

-    {

-        setType(QXmppIq::Result);

-        return;

-    }

-    else

-    {

-        setType(static_cast<QXmppIq::Type>(-1));

-        qWarning("QXmppIq::setTypeFromStr() invalid input string type: %s",

-                 qPrintable(str));

-        return;

-    }

-}

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#include "QXmppUtils.h"
+#include "QXmppIq.h"
+
+#include <QXmlStreamWriter>
+
+QXmppIq::QXmppIq(QXmppIq::Type type)
+    : QXmppStanza(), m_type(type)
+{
+    generateAndSetNextId();
+}
+
+QXmppIq::QXmppIq(const QString& type)
+    : QXmppStanza()
+{
+    generateAndSetNextId();
+    setTypeFromStr(type);
+}
+
+QXmppIq::~QXmppIq()
+{
+
+}
+
+QXmppIq::Type QXmppIq::getType() const
+{
+    return m_type;
+}
+
+void QXmppIq::setType(QXmppIq::Type type)
+{
+    m_type = type;
+}
+
+void QXmppIq::toXml( QXmlStreamWriter *xmlWriter ) const
+{
+    xmlWriter->writeStartElement("iq");
+
+    helperToXmlAddAttribute(xmlWriter, "id", getId());
+    helperToXmlAddAttribute(xmlWriter, "to", getTo());
+    helperToXmlAddAttribute(xmlWriter, "from", getFrom());
+    if(getTypeStr().isEmpty())
+        helperToXmlAddAttribute(xmlWriter, "type", "get");
+    else
+        helperToXmlAddAttribute(xmlWriter,  "type", getTypeStr());
+    toXmlElementFromChild(xmlWriter);
+    getError().toXml(xmlWriter);
+    xmlWriter->writeEndElement();
+}
+
+void QXmppIq::toXmlElementFromChild( QXmlStreamWriter *writer ) const
+{
+    Q_UNUSED(writer);
+}
+
+QString QXmppIq::getTypeStr() const
+{
+    switch(getType())
+    {
+    case QXmppIq::Error:
+        return "error";
+    case QXmppIq::Get:
+        return "get";
+    case QXmppIq::Set:
+        return "set";
+    case QXmppIq::Result:
+        return "result";
+    default:
+        qWarning("QXmppIq::getTypeStr() invalid type %d", (int)getType());
+        return "";
+    }
+}
+
+void QXmppIq::setTypeFromStr(const QString& str)
+{
+    if(str == "error")
+    {
+        setType(QXmppIq::Error);
+        return;
+    }
+    else if(str == "get")
+    {
+        setType(QXmppIq::Get);
+        return;
+    }
+    else if(str == "set")
+    {
+        setType(QXmppIq::Set);
+        return;
+    }
+    else if(str == "result")
+    {
+        setType(QXmppIq::Result);
+        return;
+    }
+    else
+    {
+        setType(static_cast<QXmppIq::Type>(-1));
+        qWarning("QXmppIq::setTypeFromStr() invalid input string type: %s",
+                 qPrintable(str));
+        return;
+    }
+}
diff --git a/source/QXmppIq.h b/source/QXmppIq.h
index 54903d15..f0cc778d 100644
--- a/source/QXmppIq.h
+++ b/source/QXmppIq.h
@@ -1,58 +1,63 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#ifndef QXMPPIQ_H

-#define QXMPPIQ_H

-

-#include "QXmppStanza.h"

-class QXmlStreamWriter;

-

-class QXmppIq : public QXmppStanza

-{

-public:

-    enum Type

-    {

-        Error = 0,

-        Get,

-        Set,

-        Result

-    };

-

-    QXmppIq(QXmppIq::Type type = QXmppIq::Get);

-    QXmppIq(const QString& type);

-    ~QXmppIq();

-

-    QXmppIq::Type getType() const;

-    QString getTypeStr() const;

-    void setType(QXmppIq::Type);

-    void setTypeFromStr(const QString& str);

-

-    void toXml( QXmlStreamWriter *writer ) const;

-    virtual void toXmlElementFromChild( QXmlStreamWriter *writer ) const;

-

-private:

-    Type m_type;

-};

-

-#endif // QXMPPIQ_H

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#ifndef QXMPPIQ_H
+#define QXMPPIQ_H
+
+#include "QXmppStanza.h"
+
+// forward declarations of QXmlStream* classes will not work on Mac, we need to
+// include the whole header.
+// See http://lists.trolltech.com/qt-interest/2008-07/thread00798-0.html
+// for an explanation.
+#include <QXmlStreamWriter>
+
+class QXmppIq : public QXmppStanza
+{
+public:
+    enum Type
+    {
+        Error = 0,
+        Get,
+        Set,
+        Result
+    };
+
+    QXmppIq(QXmppIq::Type type = QXmppIq::Get);
+    QXmppIq(const QString& type);
+    ~QXmppIq();
+
+    QXmppIq::Type getType() const;
+    QString getTypeStr() const;
+    void setType(QXmppIq::Type);
+    void setTypeFromStr(const QString& str);
+
+    void toXml( QXmlStreamWriter *writer ) const;
+    virtual void toXmlElementFromChild( QXmlStreamWriter *writer ) const;
+
+private:
+    Type m_type;
+};
+
+#endif // QXMPPIQ_H
diff --git a/source/QXmppLogger.cpp b/source/QXmppLogger.cpp
index b6c7638d..522b5ff1 100644
--- a/source/QXmppLogger.cpp
+++ b/source/QXmppLogger.cpp
@@ -1,96 +1,96 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#include "QXmppLogger.h"

-#include <iostream>

-#include <QTime>

-

-QXmppLogger* QXmppLogger::m_logger = 0;

-QXmppLogger::LoggingType QXmppLogger::m_loggingType = QXmppLogger::FILE;

-QFile QXmppLogger::m_file("QXmppClientLog.log");

-QTextStream QXmppLogger::m_stream;

-

-QXmppLogger::QXmppLogger()

-{

-}

-

-QXmppLogger* QXmppLogger::getLogger()

-{

-    if(!m_logger)

-        m_logger = new QXmppLogger();

-

-    return m_logger;

-}

-

-void QXmppLogger::setLoggingType(QXmppLogger::LoggingType log)

-{

-    m_loggingType = log;

-}

-

-QXmppLogger::LoggingType QXmppLogger::getLoggingType()

-{

-    return m_loggingType;

-}

-

-void QXmppLogger::log(const QString& str)

-{

-    switch(m_loggingType)

-    {

-    case QXmppLogger::FILE:

-        m_file.open(QIODevice::Append);

-        m_stream.setDevice(&m_file);

-        m_stream << QTime::currentTime().toString("hh:mm:ss.zzz") << " : "<<

-                str << "\n\n";

-        m_file.close();

-        break;

-    case QXmppLogger::STDOUT:

-        std::cout<<qPrintable(str)<<std::endl;

-        break;

-    case QXmppLogger::NONE:

-        break;

-    default:

-        break;

-    }

-}

-

-void QXmppLogger::log(const QByteArray& str)

-{

-    switch(m_loggingType)

-    {

-    case QXmppLogger::FILE:

-        m_file.open(QIODevice::Append);

-        m_stream.setDevice(&m_file);

-        m_stream << QTime::currentTime().toString("hh:mm:ss.zzz") << " : "<<

-                str << "\n\n";

-        m_file.close();

-        break;

-    case QXmppLogger::STDOUT:

-        std::cout<<str.constData()<<std::endl;

-        break;

-    case QXmppLogger::NONE:

-        break;

-    default:

-        break;

-    }

-}

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#include "QXmppLogger.h"
+#include <iostream>
+#include <QTime>
+
+QXmppLogger* QXmppLogger::m_logger = 0;
+QXmppLogger::LoggingType QXmppLogger::m_loggingType = QXmppLogger::FILE;
+QFile QXmppLogger::m_file("QXmppClientLog.log");
+QTextStream QXmppLogger::m_stream;
+
+QXmppLogger::QXmppLogger()
+{
+}
+
+QXmppLogger* QXmppLogger::getLogger()
+{
+    if(!m_logger)
+        m_logger = new QXmppLogger();
+
+    return m_logger;
+}
+
+void QXmppLogger::setLoggingType(QXmppLogger::LoggingType log)
+{
+    m_loggingType = log;
+}
+
+QXmppLogger::LoggingType QXmppLogger::getLoggingType()
+{
+    return m_loggingType;
+}
+
+void QXmppLogger::log(const QString& str)
+{
+    switch(m_loggingType)
+    {
+    case QXmppLogger::FILE:
+        m_file.open(QIODevice::Append);
+        m_stream.setDevice(&m_file);
+        m_stream << QTime::currentTime().toString("hh:mm:ss.zzz") << " : "<<
+                str << "\n\n";
+        m_file.close();
+        break;
+    case QXmppLogger::STDOUT:
+        std::cout<<qPrintable(str)<<std::endl;
+        break;
+    case QXmppLogger::NONE:
+        break;
+    default:
+        break;
+    }
+}
+
+void QXmppLogger::log(const QByteArray& str)
+{
+    switch(m_loggingType)
+    {
+    case QXmppLogger::FILE:
+        m_file.open(QIODevice::Append);
+        m_stream.setDevice(&m_file);
+        m_stream << QTime::currentTime().toString("hh:mm:ss.zzz") << " : "<<
+                str << "\n\n";
+        m_file.close();
+        break;
+    case QXmppLogger::STDOUT:
+        std::cout<<str.constData()<<std::endl;
+        break;
+    case QXmppLogger::NONE:
+        break;
+    default:
+        break;
+    }
+}
diff --git a/source/QXmppLogger.h b/source/QXmppLogger.h
index e1d03459..ef72f528 100644
--- a/source/QXmppLogger.h
+++ b/source/QXmppLogger.h
@@ -1,56 +1,56 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#ifndef QXMPPLOGGER_H

-#define QXMPPLOGGER_H

-

-#include <QTextStream>

-#include <QFile>

-

-/// Singelton class

-class QXmppLogger

-{

-public:

-    enum LoggingType

-    {

-        NONE = 0,

-        FILE,

-        STDOUT

-    };

-

-    static QXmppLogger* getLogger();

-    QXmppLogger::LoggingType getLoggingType();

-    void setLoggingType(QXmppLogger::LoggingType);

-    void log(const QString& str);

-    void log(const QByteArray& str);

-

-private:

-    QXmppLogger();

-    static QXmppLogger* m_logger;

-    static QXmppLogger::LoggingType m_loggingType;

-    static QFile m_file;

-    static QTextStream m_stream;

-};

-

-#endif // QXMPPLOGGER_H

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#ifndef QXMPPLOGGER_H
+#define QXMPPLOGGER_H
+
+#include <QTextStream>
+#include <QFile>
+
+/// Singelton class
+class QXmppLogger
+{
+public:
+    enum LoggingType
+    {
+        NONE = 0,
+        FILE,
+        STDOUT
+    };
+
+    static QXmppLogger* getLogger();
+    QXmppLogger::LoggingType getLoggingType();
+    void setLoggingType(QXmppLogger::LoggingType);
+    void log(const QString& str);
+    void log(const QByteArray& str);
+
+private:
+    QXmppLogger();
+    static QXmppLogger* m_logger;
+    static QXmppLogger::LoggingType m_loggingType;
+    static QFile m_file;
+    static QTextStream m_stream;
+};
+
+#endif // QXMPPLOGGER_H
diff --git a/source/QXmppMessage.cpp b/source/QXmppMessage.cpp
index 54836729..ad079d70 100644
--- a/source/QXmppMessage.cpp
+++ b/source/QXmppMessage.cpp
@@ -1,156 +1,156 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#include "QXmppMessage.h"

-#include "QXmppUtils.h"

-#include <QXmlStreamWriter>

-

-QXmppMessage::QXmppMessage(const QString& from, const QString& to, const 

-                         QString& body, const QString& thread)

-    : QXmppStanza(from, to), m_type(Chat), m_body(body), m_thread(thread)

-{

-}

-

-QXmppMessage::~QXmppMessage()

-{

-

-}

-

-QXmppMessage::Type QXmppMessage::getType() const

-{

-    return m_type;

-}

-

-QString QXmppMessage::getTypeStr() const

-{

-    switch(getType())

-    {

-    case QXmppMessage::Error:

-        return "error";

-    case QXmppMessage::Normal:

-        return "normal";

-    case QXmppMessage::Chat:

-        return "chat";

-    case QXmppMessage::GroupChat:

-        return "groupchat";

-    case QXmppMessage::Headline:

-        return "headline";

-    default:

-        qWarning("QXmppMessage::getTypeStr() invalid type %d", (int)getType());

-        return "";

-    }

-}

-

-void QXmppMessage::setType(QXmppMessage::Type type)

-{

-    m_type = type;

-}

-

-void QXmppMessage::setTypeFromStr(const QString& str)

-{

-    if(str == "error")

-    {

-        setType(QXmppMessage::Error);

-        return;

-    }

-    else if(str == "")   // if no type is specified 

-    {

-        setType(QXmppMessage::Normal);

-        return;

-    }

-    else if(str == "normal")

-    {

-        setType(QXmppMessage::Normal);

-        return;

-    }

-    else if(str == "chat")

-    {

-        setType(QXmppMessage::Chat);

-        return;

-    }

-    else if(str == "groupchat")

-    {

-        setType(QXmppMessage::GroupChat);

-        return;

-    }

-    else if(str == "headline")

-    {

-        setType(QXmppMessage::Headline);

-        return;

-    }

-    else

-    {

-        setType(static_cast<QXmppMessage::Type>(-1));

-        qWarning("QXmppMessage::setTypeFromStr() invalid input string type: %s",

-                 qPrintable(str));

-        return;

-    }

-}

-

-void QXmppMessage::toXml(QXmlStreamWriter *xmlWriter) const

-{

-

-    xmlWriter->writeStartElement("message");

-    helperToXmlAddAttribute(xmlWriter, "xml:lang", getLang());

-    helperToXmlAddAttribute(xmlWriter,  "id", getId());

-    helperToXmlAddAttribute(xmlWriter, "to", getTo());

-    helperToXmlAddAttribute(xmlWriter, "from", getFrom());

-    helperToXmlAddAttribute(xmlWriter,  "type", getTypeStr());

-    helperToXmlAddTextElement(xmlWriter, "subject", getSubject());

-    helperToXmlAddTextElement(xmlWriter,"body", getBody());

-    helperToXmlAddTextElement(xmlWriter,"thread", getThread());

-    getError().toXml(xmlWriter);

-    xmlWriter->writeEndElement();

-}

-

-QString QXmppMessage::getBody() const

-{

-    return m_body;

-}

-

-void QXmppMessage::setBody(const QString& body)

-{

-    m_body = body;

-}

-

-QString QXmppMessage::getSubject() const

-{

-    return m_subject;

-}

-

-void QXmppMessage::setSubject(const QString& sub)

-{

-    m_subject = sub;

-}

-

-QString QXmppMessage::getThread() const

-{

-    return m_thread;

-}

-

-void QXmppMessage::setThread(const QString& thread)

-{

-    m_thread = thread;

-}

-

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#include "QXmppMessage.h"
+#include "QXmppUtils.h"
+#include <QXmlStreamWriter>
+
+QXmppMessage::QXmppMessage(const QString& from, const QString& to, const 
+                         QString& body, const QString& thread)
+    : QXmppStanza(from, to), m_type(Chat), m_body(body), m_thread(thread)
+{
+}
+
+QXmppMessage::~QXmppMessage()
+{
+
+}
+
+QXmppMessage::Type QXmppMessage::getType() const
+{
+    return m_type;
+}
+
+QString QXmppMessage::getTypeStr() const
+{
+    switch(getType())
+    {
+    case QXmppMessage::Error:
+        return "error";
+    case QXmppMessage::Normal:
+        return "normal";
+    case QXmppMessage::Chat:
+        return "chat";
+    case QXmppMessage::GroupChat:
+        return "groupchat";
+    case QXmppMessage::Headline:
+        return "headline";
+    default:
+        qWarning("QXmppMessage::getTypeStr() invalid type %d", (int)getType());
+        return "";
+    }
+}
+
+void QXmppMessage::setType(QXmppMessage::Type type)
+{
+    m_type = type;
+}
+
+void QXmppMessage::setTypeFromStr(const QString& str)
+{
+    if(str == "error")
+    {
+        setType(QXmppMessage::Error);
+        return;
+    }
+    else if(str == "")   // if no type is specified 
+    {
+        setType(QXmppMessage::Normal);
+        return;
+    }
+    else if(str == "normal")
+    {
+        setType(QXmppMessage::Normal);
+        return;
+    }
+    else if(str == "chat")
+    {
+        setType(QXmppMessage::Chat);
+        return;
+    }
+    else if(str == "groupchat")
+    {
+        setType(QXmppMessage::GroupChat);
+        return;
+    }
+    else if(str == "headline")
+    {
+        setType(QXmppMessage::Headline);
+        return;
+    }
+    else
+    {
+        setType(static_cast<QXmppMessage::Type>(-1));
+        qWarning("QXmppMessage::setTypeFromStr() invalid input string type: %s",
+                 qPrintable(str));
+        return;
+    }
+}
+
+void QXmppMessage::toXml(QXmlStreamWriter *xmlWriter) const
+{
+
+    xmlWriter->writeStartElement("message");
+    helperToXmlAddAttribute(xmlWriter, "xml:lang", getLang());
+    helperToXmlAddAttribute(xmlWriter,  "id", getId());
+    helperToXmlAddAttribute(xmlWriter, "to", getTo());
+    helperToXmlAddAttribute(xmlWriter, "from", getFrom());
+    helperToXmlAddAttribute(xmlWriter,  "type", getTypeStr());
+    helperToXmlAddTextElement(xmlWriter, "subject", getSubject());
+    helperToXmlAddTextElement(xmlWriter,"body", getBody());
+    helperToXmlAddTextElement(xmlWriter,"thread", getThread());
+    getError().toXml(xmlWriter);
+    xmlWriter->writeEndElement();
+}
+
+QString QXmppMessage::getBody() const
+{
+    return m_body;
+}
+
+void QXmppMessage::setBody(const QString& body)
+{
+    m_body = body;
+}
+
+QString QXmppMessage::getSubject() const
+{
+    return m_subject;
+}
+
+void QXmppMessage::setSubject(const QString& sub)
+{
+    m_subject = sub;
+}
+
+QString QXmppMessage::getThread() const
+{
+    return m_thread;
+}
+
+void QXmppMessage::setThread(const QString& thread)
+{
+    m_thread = thread;
+}
+
diff --git a/source/QXmppMessage.h b/source/QXmppMessage.h
index 252d2ba1..6ea1bcd5 100644
--- a/source/QXmppMessage.h
+++ b/source/QXmppMessage.h
@@ -1,68 +1,68 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#ifndef QXMPPMESSAGE_H

-#define QXMPPMESSAGE_H

-

-#include "QXmppStanza.h"

-

-class QXmppMessage : public QXmppStanza

-{

-public:

-    enum Type

-    {

-        Error = 0,

-        Normal,

-        Chat,

-        GroupChat,

-        Headline

-    };

-

-    QXmppMessage(const QString& from = "", const QString& to = "",

-                 const QString& body = "", const QString& thread = "");

-    ~QXmppMessage();

-    

-    QXmppMessage::Type getType() const;

-    QString getTypeStr() const;

-    void setType(QXmppMessage::Type);

-    void setTypeFromStr(const QString&);

-

-    QString getBody() const;

-    void setBody(const QString&);

-    QString getSubject() const;

-    void setSubject(const QString&);

-    QString getThread() const;

-    void setThread(const QString&);

-

-    void toXml(QXmlStreamWriter *writer) const;

-

-private:

-    Type m_type;

-

-    QString m_body;

-    QString m_subject;

-    QString m_thread;

-};

-

-#endif // QXMPPMESSAGE_H

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#ifndef QXMPPMESSAGE_H
+#define QXMPPMESSAGE_H
+
+#include "QXmppStanza.h"
+
+class QXmppMessage : public QXmppStanza
+{
+public:
+    enum Type
+    {
+        Error = 0,
+        Normal,
+        Chat,
+        GroupChat,
+        Headline
+    };
+
+    QXmppMessage(const QString& from = "", const QString& to = "",
+                 const QString& body = "", const QString& thread = "");
+    ~QXmppMessage();
+    
+    QXmppMessage::Type getType() const;
+    QString getTypeStr() const;
+    void setType(QXmppMessage::Type);
+    void setTypeFromStr(const QString&);
+
+    QString getBody() const;
+    void setBody(const QString&);
+    QString getSubject() const;
+    void setSubject(const QString&);
+    QString getThread() const;
+    void setThread(const QString&);
+
+    void toXml(QXmlStreamWriter *writer) const;
+
+private:
+    Type m_type;
+
+    QString m_body;
+    QString m_subject;
+    QString m_thread;
+};
+
+#endif // QXMPPMESSAGE_H
diff --git a/source/QXmppNonSASLAuth.cpp b/source/QXmppNonSASLAuth.cpp
index 7f9c9791..7a039147 100644
--- a/source/QXmppNonSASLAuth.cpp
+++ b/source/QXmppNonSASLAuth.cpp
@@ -1,70 +1,70 @@
-#include "QXmppNonSASLAuth.h"

-#include "QXmppUtils.h"

-#include <QCryptographicHash>

-#include <QXmlStreamWriter>

-

-QXmppNonSASLAuthTypesRequestIq::QXmppNonSASLAuthTypesRequestIq() : QXmppIq(QXmppIq::Get)

-{

-

-}

-

-void QXmppNonSASLAuthTypesRequestIq::setUsername( const QString &username )

-{

-    m_username = username;

-}

-

-void QXmppNonSASLAuthTypesRequestIq::toXmlElementFromChild(QXmlStreamWriter *writer) const

-{

-    writer->writeStartElement("query");

-    writer->writeAttribute( "xmlns","jabber:iq:auth");

-    writer->writeTextElement("username", m_username );

-    writer->writeEndElement();

-}

-

-QXmppNonSASLAuthIq::QXmppNonSASLAuthIq() : QXmppIq(QXmppIq::Set), m_useplaintext(false)

-{

-

-}

-

-void QXmppNonSASLAuthIq::toXmlElementFromChild(QXmlStreamWriter *writer) const

-{

-    writer->writeStartElement("query");

-    writer->writeAttribute( "xmlns","jabber:iq:auth");

-    writer->writeTextElement("username", m_username );

-    if ( m_useplaintext )

-        writer->writeTextElement("password", m_password );

-    else

-    {//SHA1(concat(sid, password)).

-        QByteArray textSid = m_sid.toUtf8();

-        QByteArray encodedPassword = m_password.toUtf8();

-        QByteArray digest = QCryptographicHash::hash(textSid + encodedPassword, QCryptographicHash::Sha1 ).toHex();

-        writer->writeTextElement("digest", digest );

-    }

-    writer->writeTextElement("resource", m_resource );

-    writer->writeEndElement();

-}

-

-void QXmppNonSASLAuthIq::setUsername( const QString &username )

-{

-    m_username = username;

-}

-

-void QXmppNonSASLAuthIq::setPassword( const QString &password )

-{

-    m_password = password;

-}

-

-void QXmppNonSASLAuthIq::setResource( const QString &resource )

-{

-    m_resource = resource;

-}

-

-void QXmppNonSASLAuthIq::setStreamId( const QString &sid )

-{

-    m_sid = sid;

-}

-

-void QXmppNonSASLAuthIq::setUsePlainText( bool use )

-{

-    m_useplaintext = use;

-}

+#include "QXmppNonSASLAuth.h"
+#include "QXmppUtils.h"
+#include <QCryptographicHash>
+#include <QXmlStreamWriter>
+
+QXmppNonSASLAuthTypesRequestIq::QXmppNonSASLAuthTypesRequestIq() : QXmppIq(QXmppIq::Get)
+{
+
+}
+
+void QXmppNonSASLAuthTypesRequestIq::setUsername( const QString &username )
+{
+    m_username = username;
+}
+
+void QXmppNonSASLAuthTypesRequestIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
+{
+    writer->writeStartElement("query");
+    writer->writeAttribute( "xmlns","jabber:iq:auth");
+    writer->writeTextElement("username", m_username );
+    writer->writeEndElement();
+}
+
+QXmppNonSASLAuthIq::QXmppNonSASLAuthIq() : QXmppIq(QXmppIq::Set), m_useplaintext(false)
+{
+
+}
+
+void QXmppNonSASLAuthIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
+{
+    writer->writeStartElement("query");
+    writer->writeAttribute( "xmlns","jabber:iq:auth");
+    writer->writeTextElement("username", m_username );
+    if ( m_useplaintext )
+        writer->writeTextElement("password", m_password );
+    else
+    {//SHA1(concat(sid, password)).
+        QByteArray textSid = m_sid.toUtf8();
+        QByteArray encodedPassword = m_password.toUtf8();
+        QByteArray digest = QCryptographicHash::hash(textSid + encodedPassword, QCryptographicHash::Sha1 ).toHex();
+        writer->writeTextElement("digest", digest );
+    }
+    writer->writeTextElement("resource", m_resource );
+    writer->writeEndElement();
+}
+
+void QXmppNonSASLAuthIq::setUsername( const QString &username )
+{
+    m_username = username;
+}
+
+void QXmppNonSASLAuthIq::setPassword( const QString &password )
+{
+    m_password = password;
+}
+
+void QXmppNonSASLAuthIq::setResource( const QString &resource )
+{
+    m_resource = resource;
+}
+
+void QXmppNonSASLAuthIq::setStreamId( const QString &sid )
+{
+    m_sid = sid;
+}
+
+void QXmppNonSASLAuthIq::setUsePlainText( bool use )
+{
+    m_useplaintext = use;
+}
diff --git a/source/QXmppNonSASLAuth.h b/source/QXmppNonSASLAuth.h
index 6de1063f..79cb8227 100644
--- a/source/QXmppNonSASLAuth.h
+++ b/source/QXmppNonSASLAuth.h
@@ -1,35 +1,35 @@
-#ifndef QXmppNonSASLAuth_H

-#define QXmppNonSASLAuth_H

-

-#include "QXmppIq.h"

-

-class QXmppNonSASLAuthTypesRequestIq : public QXmppIq

-{

-public:

-    QXmppNonSASLAuthTypesRequestIq();

-    void setUsername( const QString &username );

-    virtual void toXmlElementFromChild(QXmlStreamWriter *writer) const;

-private:

-    QString m_username;

-};

-

-class QXmppNonSASLAuthIq : public QXmppIq

-{

-public:

-    QXmppNonSASLAuthIq();

-    virtual void toXmlElementFromChild(QXmlStreamWriter *writer) const;

-    void setUsername( const QString &username );

-    void setPassword( const QString &password );

-    void setResource( const QString &resource );

-    void setStreamId( const QString &sid );

-    void setUsePlainText( bool useplaintext );

-

-private:

-    QString m_username;

-    QString m_password;

-    QString m_resource;

-    QString m_sid;

-    bool m_useplaintext;

-};

-

-#endif // QXmppNonSASLAuth_H

+#ifndef QXmppNonSASLAuth_H
+#define QXmppNonSASLAuth_H
+
+#include "QXmppIq.h"
+
+class QXmppNonSASLAuthTypesRequestIq : public QXmppIq
+{
+public:
+    QXmppNonSASLAuthTypesRequestIq();
+    void setUsername( const QString &username );
+    virtual void toXmlElementFromChild(QXmlStreamWriter *writer) const;
+private:
+    QString m_username;
+};
+
+class QXmppNonSASLAuthIq : public QXmppIq
+{
+public:
+    QXmppNonSASLAuthIq();
+    virtual void toXmlElementFromChild(QXmlStreamWriter *writer) const;
+    void setUsername( const QString &username );
+    void setPassword( const QString &password );
+    void setResource( const QString &resource );
+    void setStreamId( const QString &sid );
+    void setUsePlainText( bool useplaintext );
+
+private:
+    QString m_username;
+    QString m_password;
+    QString m_resource;
+    QString m_sid;
+    bool m_useplaintext;
+};
+
+#endif // QXmppNonSASLAuth_H
diff --git a/source/QXmppPacket.cpp b/source/QXmppPacket.cpp
index 532d7afd..65b0dafb 100644
--- a/source/QXmppPacket.cpp
+++ b/source/QXmppPacket.cpp
@@ -1,40 +1,40 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#include "QXmppPacket.h"

-

-QXmppPacket::QXmppPacket()

-{

-

-}

-

-QXmppPacket::~QXmppPacket()

-{

-

-}

-

-QByteArray QXmppPacket::getXmlReceived() const

-{

-    return m_xmlReceived;

-}

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#include "QXmppPacket.h"
+
+QXmppPacket::QXmppPacket()
+{
+
+}
+
+QXmppPacket::~QXmppPacket()
+{
+
+}
+
+QByteArray QXmppPacket::getXmlReceived() const
+{
+    return m_xmlReceived;
+}
diff --git a/source/QXmppPacket.h b/source/QXmppPacket.h
index c123899f..f7a7cce4 100644
--- a/source/QXmppPacket.h
+++ b/source/QXmppPacket.h
@@ -1,44 +1,49 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#ifndef QXMPPPACKET_H

-#define QXMPPPACKET_H

-

-#include <QByteArray>

-

-class QXmlStreamWriter;

-class QXmppPacket

-{

-public:

-    QXmppPacket();

-    virtual ~QXmppPacket();

-    

-    QByteArray getXmlReceived() const;

-    virtual void toXml( QXmlStreamWriter *writer ) const = 0;

-

-private:

-    QByteArray m_xmlReceived;

-};

-

-#endif // QXMPPPACKET_H

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#ifndef QXMPPPACKET_H
+#define QXMPPPACKET_H
+
+#include <QByteArray>
+
+// forward declarations of QXmlStream* classes will not work on Mac, we need to
+// include the whole header.
+// See http://lists.trolltech.com/qt-interest/2008-07/thread00798-0.html
+// for an explanation.
+#include <QXmlStreamWriter>
+
+class QXmppPacket
+{
+public:
+    QXmppPacket();
+    virtual ~QXmppPacket();
+    
+    QByteArray getXmlReceived() const;
+    virtual void toXml( QXmlStreamWriter *writer ) const = 0;
+
+private:
+    QByteArray m_xmlReceived;
+};
+
+#endif // QXMPPPACKET_H
diff --git a/source/QXmppPresence.cpp b/source/QXmppPresence.cpp
index ea347af6..077c0a7c 100644
--- a/source/QXmppPresence.cpp
+++ b/source/QXmppPresence.cpp
@@ -1,298 +1,298 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#include "QXmppPresence.h"

-#include "QXmppUtils.h"

-#include <QtDebug>

-#include <QXmlStreamWriter>

-

-QXmppPresence::QXmppPresence(QXmppPresence::Type type,

-                             const QXmppPresence::Status& status)

-    : QXmppStanza(), m_type(type), m_status(status)

-{

-

-}

-

-QXmppPresence::~QXmppPresence()

-{

-

-}

-

-QXmppPresence::Type QXmppPresence::getType() const

-{

-    return m_type;

-}

-

-void QXmppPresence::setType(QXmppPresence::Type type)

-{

-    m_type = type;

-}

-

-const QXmppPresence::Status& QXmppPresence::getStatus() const

-{

-    return m_status;

-}

-

-QXmppPresence::Status& QXmppPresence::getStatus()

-{

-    return m_status;

-}

-

-void QXmppPresence::setStatus(const QXmppPresence::Status& status)

-{

-    m_status = status;

-}

-

-void  QXmppPresence::toXml(QXmlStreamWriter *xmlWriter ) const

-{

-

-    xmlWriter->writeStartElement("presence");

-    helperToXmlAddAttribute(xmlWriter,"xml:lang", getLang());

-    helperToXmlAddAttribute(xmlWriter,"id", getId());

-    helperToXmlAddAttribute(xmlWriter,"to", getTo());

-    helperToXmlAddAttribute(xmlWriter,"from", getFrom());

-    helperToXmlAddAttribute(xmlWriter,"type", getTypeStr());

-

-    helperToXmlAddTextElement(xmlWriter,"status", getStatus().getStatusText());

-    if(getStatus().getPriority() != 0)

-        helperToXmlAddNumberElement(xmlWriter,"priority", getStatus().getPriority());

-    helperToXmlAddTextElement(xmlWriter,"show", getStatus().getTypeStr());

-    

-    getError().toXml(xmlWriter);

-    

-    xmlWriter->writeEndElement();

-

-}

-

-QString QXmppPresence::getTypeStr() const

-{

-    QString text;

-    switch(getType())

-    {

-    case QXmppPresence::Error:

-        text = "error"; 

-        break;

-    case QXmppPresence::Available:

-        // no type-attribute if available

-        text = ""; 

-        break;

-    case QXmppPresence::Unavailable:

-        text = "unavailable"; 

-        break;

-    case QXmppPresence::Subscribe:

-        text = "subscribe"; 

-        break;

-    case QXmppPresence::Subscribed:

-        text = "subscribed"; 

-        break;

-    case QXmppPresence::Unsubscribe:

-        text = "unsubscribe"; 

-        break;

-    case QXmppPresence::Unsubscribed:

-        text = "unsubscribed"; 

-        break;

-    case QXmppPresence::Probe:

-        text = "probe"; 

-        break;

-    default:

-        qWarning("QXmppPresence::getTypeStr() invalid type %d", (int)getType());

-        break;

-    }

-    return text;

-}

-

-void QXmppPresence::setTypeFromStr(const QString& str)

-{

-    QXmppPresence::Type type;

-    if(str == "error")

-    {

-        type = QXmppPresence::Error;

-        setType(type);

-        return;

-    }

-    else if(str == "unavailable")

-    {

-        type = QXmppPresence::Unavailable;

-        setType(type);

-        return;

-    }

-    else if(str == "subscribe")

-    {

-        type = QXmppPresence::Subscribe;

-        setType(type);

-        return;

-    }

-    else if(str == "subscribed")

-    {

-        type = QXmppPresence::Subscribed;

-        setType(type);

-        return;

-    }

-    else if(str == "unsubscribe")

-    {

-        type = QXmppPresence::Unsubscribe;

-        setType(type);

-        return;

-    }

-    else if(str == "unsubscribed")

-    {

-        type = QXmppPresence::Unsubscribed;

-        setType(type);

-        return;

-    }

-    else if(str == "probe")

-    {

-        type = QXmppPresence::Probe;

-        setType(type);

-        return;

-    }

-    else if(str == "")

-    {

-        type = QXmppPresence::Available;

-        setType(type);

-        return;

-    }

-    else

-    {

-        type = static_cast<QXmppPresence::Type>(-1);

-        qWarning("QXmppPresence::setTypeFromStr() invalid input string type: %s",

-                 qPrintable(str));

-        setType(type);

-        return;

-    }

-}

-

-QXmppPresence::Status::Status(QXmppPresence::Status::Type type,

-                             const QString statusText, int priority) :

-                                m_type(type),

-                                m_statusText(statusText), m_priority(priority)

-{

-}

-

-QXmppPresence::Status::Type QXmppPresence::Status::getType() const

-{

-    return m_type;

-}

-

-void QXmppPresence::Status::setType(QXmppPresence::Status::Type type)

-{

-    m_type = type;

-}

-

-void QXmppPresence::Status::setTypeFromStr(const QString& str)

-{

-    // there is no keyword for Offline

-

-    QXmppPresence::Status::Type type;

-    if(str == "")   // not type-attribute means online

-    {

-        type = QXmppPresence::Status::Online;

-        setType(type);

-        return;

-    }

-    else if(str == "away")

-    {

-        type = QXmppPresence::Status::Away;

-        setType(type);

-        return;

-    }

-    else if(str == "xa")

-    {

-        type = QXmppPresence::Status::XA;

-        setType(type);

-        return;

-    }

-    else if(str == "dnd")

-    {

-        type = QXmppPresence::Status::DND;

-        setType(type);

-        return;

-    }

-    else if(str == "chat")

-    {

-        type = QXmppPresence::Status::Chat;

-        setType(type);

-        return;

-    }

-    else

-    {

-        type = static_cast<QXmppPresence::Status::Type>(-1);

-        qWarning("QXmppPresence::Status::setTypeFromStr() invalid input string type %s", 

-            qPrintable(str));

-        setType(type);

-    }

-}

-

-QString QXmppPresence::Status::getTypeStr() const

-{

-    QString text;

-    switch(getType())

-    {

-    case QXmppPresence::Status::Online:

-        // no type-attribute if available

-        text = ""; 

-        break;

-    case QXmppPresence::Status::Offline:

-        text = ""; 

-        break;

-    case QXmppPresence::Status::Away:

-        text = "away"; 

-        break;

-    case QXmppPresence::Status::XA:

-        text = "xa"; 

-        break;

-    case QXmppPresence::Status::DND:

-        text = "dnd"; 

-        break;

-    case QXmppPresence::Status::Chat:

-        text = "chat"; 

-        break;

-    default:

-        qWarning("QXmppPresence::Status::getTypeStr() invalid type %d",

-                 (int)getType());

-        break;

-    }

-    return text;

-}

-

-QString QXmppPresence::Status::getStatusText() const

-{

-    return m_statusText;

-}

-

-void QXmppPresence::Status::setStatusText(const QString& str)

-{

-    m_statusText = str;

-}

-

-int QXmppPresence::Status::getPriority() const

-{

-    return m_priority;

-}

-

-void QXmppPresence::Status::setPriority(int priority)

-{

-    m_priority = priority;

-}

-

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#include "QXmppPresence.h"
+#include "QXmppUtils.h"
+#include <QtDebug>
+#include <QXmlStreamWriter>
+
+QXmppPresence::QXmppPresence(QXmppPresence::Type type,
+                             const QXmppPresence::Status& status)
+    : QXmppStanza(), m_type(type), m_status(status)
+{
+
+}
+
+QXmppPresence::~QXmppPresence()
+{
+
+}
+
+QXmppPresence::Type QXmppPresence::getType() const
+{
+    return m_type;
+}
+
+void QXmppPresence::setType(QXmppPresence::Type type)
+{
+    m_type = type;
+}
+
+const QXmppPresence::Status& QXmppPresence::getStatus() const
+{
+    return m_status;
+}
+
+QXmppPresence::Status& QXmppPresence::getStatus()
+{
+    return m_status;
+}
+
+void QXmppPresence::setStatus(const QXmppPresence::Status& status)
+{
+    m_status = status;
+}
+
+void  QXmppPresence::toXml(QXmlStreamWriter *xmlWriter ) const
+{
+
+    xmlWriter->writeStartElement("presence");
+    helperToXmlAddAttribute(xmlWriter,"xml:lang", getLang());
+    helperToXmlAddAttribute(xmlWriter,"id", getId());
+    helperToXmlAddAttribute(xmlWriter,"to", getTo());
+    helperToXmlAddAttribute(xmlWriter,"from", getFrom());
+    helperToXmlAddAttribute(xmlWriter,"type", getTypeStr());
+
+    helperToXmlAddTextElement(xmlWriter,"status", getStatus().getStatusText());
+    if(getStatus().getPriority() != 0)
+        helperToXmlAddNumberElement(xmlWriter,"priority", getStatus().getPriority());
+    helperToXmlAddTextElement(xmlWriter,"show", getStatus().getTypeStr());
+    
+    getError().toXml(xmlWriter);
+    
+    xmlWriter->writeEndElement();
+
+}
+
+QString QXmppPresence::getTypeStr() const
+{
+    QString text;
+    switch(getType())
+    {
+    case QXmppPresence::Error:
+        text = "error"; 
+        break;
+    case QXmppPresence::Available:
+        // no type-attribute if available
+        text = ""; 
+        break;
+    case QXmppPresence::Unavailable:
+        text = "unavailable"; 
+        break;
+    case QXmppPresence::Subscribe:
+        text = "subscribe"; 
+        break;
+    case QXmppPresence::Subscribed:
+        text = "subscribed"; 
+        break;
+    case QXmppPresence::Unsubscribe:
+        text = "unsubscribe"; 
+        break;
+    case QXmppPresence::Unsubscribed:
+        text = "unsubscribed"; 
+        break;
+    case QXmppPresence::Probe:
+        text = "probe"; 
+        break;
+    default:
+        qWarning("QXmppPresence::getTypeStr() invalid type %d", (int)getType());
+        break;
+    }
+    return text;
+}
+
+void QXmppPresence::setTypeFromStr(const QString& str)
+{
+    QXmppPresence::Type type;
+    if(str == "error")
+    {
+        type = QXmppPresence::Error;
+        setType(type);
+        return;
+    }
+    else if(str == "unavailable")
+    {
+        type = QXmppPresence::Unavailable;
+        setType(type);
+        return;
+    }
+    else if(str == "subscribe")
+    {
+        type = QXmppPresence::Subscribe;
+        setType(type);
+        return;
+    }
+    else if(str == "subscribed")
+    {
+        type = QXmppPresence::Subscribed;
+        setType(type);
+        return;
+    }
+    else if(str == "unsubscribe")
+    {
+        type = QXmppPresence::Unsubscribe;
+        setType(type);
+        return;
+    }
+    else if(str == "unsubscribed")
+    {
+        type = QXmppPresence::Unsubscribed;
+        setType(type);
+        return;
+    }
+    else if(str == "probe")
+    {
+        type = QXmppPresence::Probe;
+        setType(type);
+        return;
+    }
+    else if(str == "")
+    {
+        type = QXmppPresence::Available;
+        setType(type);
+        return;
+    }
+    else
+    {
+        type = static_cast<QXmppPresence::Type>(-1);
+        qWarning("QXmppPresence::setTypeFromStr() invalid input string type: %s",
+                 qPrintable(str));
+        setType(type);
+        return;
+    }
+}
+
+QXmppPresence::Status::Status(QXmppPresence::Status::Type type,
+                             const QString statusText, int priority) :
+                                m_type(type),
+                                m_statusText(statusText), m_priority(priority)
+{
+}
+
+QXmppPresence::Status::Type QXmppPresence::Status::getType() const
+{
+    return m_type;
+}
+
+void QXmppPresence::Status::setType(QXmppPresence::Status::Type type)
+{
+    m_type = type;
+}
+
+void QXmppPresence::Status::setTypeFromStr(const QString& str)
+{
+    // there is no keyword for Offline
+
+    QXmppPresence::Status::Type type;
+    if(str == "")   // not type-attribute means online
+    {
+        type = QXmppPresence::Status::Online;
+        setType(type);
+        return;
+    }
+    else if(str == "away")
+    {
+        type = QXmppPresence::Status::Away;
+        setType(type);
+        return;
+    }
+    else if(str == "xa")
+    {
+        type = QXmppPresence::Status::XA;
+        setType(type);
+        return;
+    }
+    else if(str == "dnd")
+    {
+        type = QXmppPresence::Status::DND;
+        setType(type);
+        return;
+    }
+    else if(str == "chat")
+    {
+        type = QXmppPresence::Status::Chat;
+        setType(type);
+        return;
+    }
+    else
+    {
+        type = static_cast<QXmppPresence::Status::Type>(-1);
+        qWarning("QXmppPresence::Status::setTypeFromStr() invalid input string type %s", 
+            qPrintable(str));
+        setType(type);
+    }
+}
+
+QString QXmppPresence::Status::getTypeStr() const
+{
+    QString text;
+    switch(getType())
+    {
+    case QXmppPresence::Status::Online:
+        // no type-attribute if available
+        text = ""; 
+        break;
+    case QXmppPresence::Status::Offline:
+        text = ""; 
+        break;
+    case QXmppPresence::Status::Away:
+        text = "away"; 
+        break;
+    case QXmppPresence::Status::XA:
+        text = "xa"; 
+        break;
+    case QXmppPresence::Status::DND:
+        text = "dnd"; 
+        break;
+    case QXmppPresence::Status::Chat:
+        text = "chat"; 
+        break;
+    default:
+        qWarning("QXmppPresence::Status::getTypeStr() invalid type %d",
+                 (int)getType());
+        break;
+    }
+    return text;
+}
+
+QString QXmppPresence::Status::getStatusText() const
+{
+    return m_statusText;
+}
+
+void QXmppPresence::Status::setStatusText(const QString& str)
+{
+    m_statusText = str;
+}
+
+int QXmppPresence::Status::getPriority() const
+{
+    return m_priority;
+}
+
+void QXmppPresence::Status::setPriority(int priority)
+{
+    m_priority = priority;
+}
+
diff --git a/source/QXmppPresence.h b/source/QXmppPresence.h
index 23c570a7..b6652ae3 100644
--- a/source/QXmppPresence.h
+++ b/source/QXmppPresence.h
@@ -1,100 +1,100 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#ifndef QXMPPPRESENCE_H

-#define QXMPPPRESENCE_H

-

-#include "QXmppStanza.h"

-

-class QXmppPresence : public QXmppStanza

-{

-public:

-    enum Type

-    {

-        Error = 0,

-        Available,

-        Unavailable,

-        Subscribe,

-        Subscribed,

-        Unsubscribe,

-        Unsubscribed,

-        Probe

-    };

-

-    class Status

-    {

-    public:

-        enum Type

-        {

-            Offline = 0, 

-            Online, 

-            Away, 

-            XA, 

-            DND, 

-            Chat,

-            Invisible 

-        };

-

-        Status(QXmppPresence::Status::Type type = QXmppPresence::Status::Online,

-            const QString statusText = "", int priority = 0);

-

-        QXmppPresence::Status::Type getType() const;

-        void setType(QXmppPresence::Status::Type);

-        void setTypeFromStr(const QString&);

-        QString getTypeStr() const;

-

-        QString getStatusText() const;

-        void setStatusText(const QString&);

-

-        int getPriority() const;

-        void setPriority(int);

-

-    private:

-        QXmppPresence::Status::Type m_type;

-        QString m_statusText;

-        int m_priority;

-    };

-

-    QXmppPresence(QXmppPresence::Type type = QXmppPresence::Available, 

-        const QXmppPresence::Status& status = QXmppPresence::Status());

-    ~QXmppPresence();

-

-    QXmppPresence::Type getType() const;

-    void setType(QXmppPresence::Type);

-    void setTypeFromStr(const QString&);

-

-    QXmppPresence::Status& getStatus();

-    const QXmppPresence::Status& getStatus() const;

-    void setStatus(const QXmppPresence::Status&);

-    void toXml( QXmlStreamWriter *writer ) const;

-

-private:

-    Type m_type;

-    QXmppPresence::Status m_status;

-

-    QString getTypeStr() const;

-    QByteArray getExtensionsXML() const;

-};

-

-#endif // QXMPPPRESENCE_H

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#ifndef QXMPPPRESENCE_H
+#define QXMPPPRESENCE_H
+
+#include "QXmppStanza.h"
+
+class QXmppPresence : public QXmppStanza
+{
+public:
+    enum Type
+    {
+        Error = 0,
+        Available,
+        Unavailable,
+        Subscribe,
+        Subscribed,
+        Unsubscribe,
+        Unsubscribed,
+        Probe
+    };
+
+    class Status
+    {
+    public:
+        enum Type
+        {
+            Offline = 0, 
+            Online, 
+            Away, 
+            XA, 
+            DND, 
+            Chat,
+            Invisible 
+        };
+
+        Status(QXmppPresence::Status::Type type = QXmppPresence::Status::Online,
+            const QString statusText = "", int priority = 0);
+
+        QXmppPresence::Status::Type getType() const;
+        void setType(QXmppPresence::Status::Type);
+        void setTypeFromStr(const QString&);
+        QString getTypeStr() const;
+
+        QString getStatusText() const;
+        void setStatusText(const QString&);
+
+        int getPriority() const;
+        void setPriority(int);
+
+    private:
+        QXmppPresence::Status::Type m_type;
+        QString m_statusText;
+        int m_priority;
+    };
+
+    QXmppPresence(QXmppPresence::Type type = QXmppPresence::Available, 
+        const QXmppPresence::Status& status = QXmppPresence::Status());
+    ~QXmppPresence();
+
+    QXmppPresence::Type getType() const;
+    void setType(QXmppPresence::Type);
+    void setTypeFromStr(const QString&);
+
+    QXmppPresence::Status& getStatus();
+    const QXmppPresence::Status& getStatus() const;
+    void setStatus(const QXmppPresence::Status&);
+    void toXml( QXmlStreamWriter *writer ) const;
+
+private:
+    Type m_type;
+    QXmppPresence::Status m_status;
+
+    QString getTypeStr() const;
+    QByteArray getExtensionsXML() const;
+};
+
+#endif // QXMPPPRESENCE_H
diff --git a/source/QXmppReconnectionManager.cpp b/source/QXmppReconnectionManager.cpp
index 32edf41c..c135860b 100644
--- a/source/QXmppReconnectionManager.cpp
+++ b/source/QXmppReconnectionManager.cpp
@@ -1,86 +1,86 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#include "QXmppReconnectionManager.h"

-#include "QXmppClient.h"

-#include "QXmppUtils.h"

-

-QXmppReconnectionManager::QXmppReconnectionManager(QXmppClient* client) :

-        QObject(client),

-        m_reconnectionTries(0),

-        m_timer(this),

-        m_client(client)

-{

-    m_timer.setSingleShot(true);

-    bool check = connect(&m_timer, SIGNAL(timeout()), SLOT(reconnect()));

-    Q_ASSERT(check);

-}

-

-void QXmppReconnectionManager::connected()

-{

-    m_reconnectionTries = 0;

-}

-

-void QXmppReconnectionManager::error(QXmppClient::Error error)

-{   

-    if(m_client && error == QXmppClient::SocketError)

-    {

-        int time = getNextReconnectingInTime();

-

-        // time is in sec

-        m_timer.start(time*1000);

-        emit reconnectingIn(time);

-    }

-}

-

-int QXmppReconnectionManager::getNextReconnectingInTime()

-{

-    int reconnectingIn;

-    if(m_reconnectionTries < 5)

-        reconnectingIn = 10;

-    else if(m_reconnectionTries < 10)

-        reconnectingIn = 20;

-    else if(m_reconnectionTries < 15)

-        reconnectingIn = 40;

-    else

-        reconnectingIn = 60;

-

-    return reconnectingIn;

-}

-

-void QXmppReconnectionManager::reconnect()

-{

-    if(m_client)

-    {

-        log(QString("QXmppReconnectionManager::reconnect()"));

-        emit reconnectingNow();

-        m_client->connectToServer(m_client->getConfiguration());

-    }

-}

-

-void QXmppReconnectionManager::cancelReconnection()

-{

-    m_timer.stop();

-    m_reconnectionTries = 0;

-}

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#include "QXmppReconnectionManager.h"
+#include "QXmppClient.h"
+#include "QXmppUtils.h"
+
+QXmppReconnectionManager::QXmppReconnectionManager(QXmppClient* client) :
+        QObject(client),
+        m_reconnectionTries(0),
+        m_timer(this),
+        m_client(client)
+{
+    m_timer.setSingleShot(true);
+    bool check = connect(&m_timer, SIGNAL(timeout()), SLOT(reconnect()));
+    Q_ASSERT(check);
+}
+
+void QXmppReconnectionManager::connected()
+{
+    m_reconnectionTries = 0;
+}
+
+void QXmppReconnectionManager::error(QXmppClient::Error error)
+{   
+    if(m_client && error == QXmppClient::SocketError)
+    {
+        int time = getNextReconnectingInTime();
+
+        // time is in sec
+        m_timer.start(time*1000);
+        emit reconnectingIn(time);
+    }
+}
+
+int QXmppReconnectionManager::getNextReconnectingInTime()
+{
+    int reconnectingIn;
+    if(m_reconnectionTries < 5)
+        reconnectingIn = 10;
+    else if(m_reconnectionTries < 10)
+        reconnectingIn = 20;
+    else if(m_reconnectionTries < 15)
+        reconnectingIn = 40;
+    else
+        reconnectingIn = 60;
+
+    return reconnectingIn;
+}
+
+void QXmppReconnectionManager::reconnect()
+{
+    if(m_client)
+    {
+        log(QString("QXmppReconnectionManager::reconnect()"));
+        emit reconnectingNow();
+        m_client->connectToServer(m_client->getConfiguration());
+    }
+}
+
+void QXmppReconnectionManager::cancelReconnection()
+{
+    m_timer.stop();
+    m_reconnectionTries = 0;
+}
diff --git a/source/QXmppReconnectionManager.h b/source/QXmppReconnectionManager.h
index 7dc0ac23..eac7bfc0 100644
--- a/source/QXmppReconnectionManager.h
+++ b/source/QXmppReconnectionManager.h
@@ -1,60 +1,60 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#ifndef QXMPPRECONNECTIONMANAGER_H

-#define QXMPPRECONNECTIONMANAGER_H

-

-#include <QObject>

-#include <QTimer>

-#include "QXmppClient.h"

-

-class QXmppReconnectionManager : public QObject

-{

-    Q_OBJECT

-

-public:

-    QXmppReconnectionManager(QXmppClient* client);

-

-signals:

-    void reconnectingIn(int);

-    void reconnectingNow();

-

-public slots:

-    void cancelReconnection();

-

-private slots:

-    void connected();

-    void error(QXmppClient::Error);

-    void reconnect();

-

-private:

-    int getNextReconnectingInTime();

-    int m_reconnectionTries;

-    QTimer m_timer;

-

-    // reference to to client object (no ownership)

-    QXmppClient* m_client;

-};

-

-#endif // QXMPPRECONNECTIONMANAGER_H

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#ifndef QXMPPRECONNECTIONMANAGER_H
+#define QXMPPRECONNECTIONMANAGER_H
+
+#include <QObject>
+#include <QTimer>
+#include "QXmppClient.h"
+
+class QXmppReconnectionManager : public QObject
+{
+    Q_OBJECT
+
+public:
+    QXmppReconnectionManager(QXmppClient* client);
+
+signals:
+    void reconnectingIn(int);
+    void reconnectingNow();
+
+public slots:
+    void cancelReconnection();
+
+private slots:
+    void connected();
+    void error(QXmppClient::Error);
+    void reconnect();
+
+private:
+    int getNextReconnectingInTime();
+    int m_reconnectionTries;
+    QTimer m_timer;
+
+    // reference to to client object (no ownership)
+    QXmppClient* m_client;
+};
+
+#endif // QXMPPRECONNECTIONMANAGER_H
diff --git a/source/QXmppRoster.cpp b/source/QXmppRoster.cpp
index eb5fc737..13f5c8cd 100644
--- a/source/QXmppRoster.cpp
+++ b/source/QXmppRoster.cpp
@@ -1,203 +1,203 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#include "QXmppRoster.h"

-#include "QXmppUtils.h"

-#include "QXmppRosterIq.h"

-#include "QXmppPresence.h"

-#include "QXmppStream.h"

-

-QXmppRoster::QXmppRoster(QXmppStream* stream) : m_stream(stream)

-{

-}

-

-QXmppRoster::~QXmppRoster()

-{

-

-}

-

-void QXmppRoster::presenceReceived(const QXmppPresence& presence)

-{

-    QString jid = presence.getFrom();

-    QString bareJid = jidToBareJid(jid);

-    QString resource = jidToResource(jid);

-

-    m_presences[bareJid][resource] = presence;

-

-    emit presenceChanged(bareJid, resource);

-}

-

-void QXmppRoster::rosterIqReceived(const QXmppRosterIq& rosterIq)

-{

-    switch(rosterIq.getType())

-    {

-    case QXmppIq::Set:

-    case QXmppIq::Result:

-        {

-            QList<QXmppRosterIq::Item> items = rosterIq.getItems();

-            for(int i = 0; i < items.count(); ++i)

-            {

-                QString bareJid = items.at(i).getBareJid();

-                m_entries[bareJid].setBareJid(bareJid);

-                m_entries[bareJid].setName(items.at(i).getName());

-                m_entries[bareJid].setSubscriptionType(

-                    static_cast<QXmppRosterEntry::SubscriptionType>(

-                            items.at(i).getSubscriptionType()));

-                m_entries[bareJid].setSubscriptionStatus(

-                        items.at(i).getSubscriptionStatus());

-                m_entries[bareJid].setGroups(items.at(i).getGroups());

-                emit rosterChanged(bareJid);

-            }

-            if(rosterIq.getType() == QXmppIq::Set) // send result iq

-            {

-                QXmppIq returnIq(QXmppIq::Result);

-                returnIq.setId(rosterIq.getId());

-                m_stream->sendPacket(returnIq);

-            }

-            break;

-        }

-    default:

-        break;

-    }

-}

-

-QString QXmppRoster::QXmppRosterEntry::getBareJid() const

-{

-    return m_bareJid;

-}

-

-QString QXmppRoster::QXmppRosterEntry::getName() const

-{

-    return m_name;

-}

-

-QXmppRoster::QXmppRosterEntry::SubscriptionType

-        QXmppRoster::QXmppRosterEntry::getSubscriptionType() const

-{

-    return m_type;

-}

-

-QString QXmppRoster::QXmppRosterEntry::getSubscriptionStatus() const

-{

-    return m_subscriptionStatus;

-}

-

-QSet<QString> QXmppRoster::QXmppRosterEntry::getGroups() const

-{

-    return m_groups;

-}

-

-void QXmppRoster::QXmppRosterEntry::setBareJid(const QString& str)

-{

-    m_bareJid = str;

-}

-

-void QXmppRoster::QXmppRosterEntry::setName(const QString& str)

-{

-    m_name = str;

-}

-

-void QXmppRoster::QXmppRosterEntry::setSubscriptionType(

-        QXmppRosterEntry::SubscriptionType type)

-{

-    m_type = type;

-}

-

-void QXmppRoster::QXmppRosterEntry::setSubscriptionStatus(const QString& str)

-{

-    m_subscriptionStatus = str;

-}

-

-void QXmppRoster::QXmppRosterEntry::addGroupEntry(const QString& str)

-{

-    m_groups << str;

-}

-

-void QXmppRoster::QXmppRosterEntry::setGroups(const QSet<QString>& groups)

-{

-    m_groups = groups;

-}

-

-QStringList QXmppRoster::getRosterBareJids() const

-{

-    return m_entries.keys();

-}

-

-QXmppRoster::QXmppRosterEntry QXmppRoster::getRosterEntry(

-        const QString& bareJid) const

-{

-    // will return blank entry if bareJid does'nt exist

-    if(m_entries.contains(bareJid))

-        return m_entries.value(bareJid);

-    else

-    {

-        qWarning("QXmppRoster::getRosterEntry(): bareJid doesn't exist in roster db");

-        return QXmppRoster::QXmppRosterEntry();

-    }

-}

-

-QMap<QString, QXmppRoster::QXmppRosterEntry>

-        QXmppRoster::getRosterEntries() const

-{

-    return m_entries;

-}

-

-QStringList QXmppRoster::getResources(const QString& bareJid) const

-{

-    if(m_presences.contains(bareJid))

-    {

-        return m_presences[bareJid].keys();

-    }

-    else

-        return QStringList();

-}

-

-QMap<QString, QXmppPresence> QXmppRoster::getAllPresencesForBareJid(

-        const QString& bareJid) const

-{

-    if(m_presences.contains(bareJid))

-        return m_presences[bareJid];

-    else

-    {

-        qWarning("QXmppRoster::getAllPresences(): invalid bareJid");

-        return QMap<QString, QXmppPresence>();

-    }

-}

-

-QXmppPresence QXmppRoster::getPresence(const QString& bareJid,

-                                       const QString& resource) const

-{

-    if(m_presences.contains(bareJid) && m_presences[bareJid].contains(resource))

-        return m_presences[bareJid][resource];

-    else

-    {

-        qWarning("QXmppRoster::getPresence(): invalid bareJid");

-        return QXmppPresence();

-    }

-}

-

-QMap<QString, QMap<QString, QXmppPresence> > QXmppRoster::getAllPresences() const

-{

-    return m_presences;

-}

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#include "QXmppRoster.h"
+#include "QXmppUtils.h"
+#include "QXmppRosterIq.h"
+#include "QXmppPresence.h"
+#include "QXmppStream.h"
+
+QXmppRoster::QXmppRoster(QXmppStream* stream) : m_stream(stream)
+{
+}
+
+QXmppRoster::~QXmppRoster()
+{
+
+}
+
+void QXmppRoster::presenceReceived(const QXmppPresence& presence)
+{
+    QString jid = presence.getFrom();
+    QString bareJid = jidToBareJid(jid);
+    QString resource = jidToResource(jid);
+
+    m_presences[bareJid][resource] = presence;
+
+    emit presenceChanged(bareJid, resource);
+}
+
+void QXmppRoster::rosterIqReceived(const QXmppRosterIq& rosterIq)
+{
+    switch(rosterIq.getType())
+    {
+    case QXmppIq::Set:
+    case QXmppIq::Result:
+        {
+            QList<QXmppRosterIq::Item> items = rosterIq.getItems();
+            for(int i = 0; i < items.count(); ++i)
+            {
+                QString bareJid = items.at(i).getBareJid();
+                m_entries[bareJid].setBareJid(bareJid);
+                m_entries[bareJid].setName(items.at(i).getName());
+                m_entries[bareJid].setSubscriptionType(
+                    static_cast<QXmppRosterEntry::SubscriptionType>(
+                            items.at(i).getSubscriptionType()));
+                m_entries[bareJid].setSubscriptionStatus(
+                        items.at(i).getSubscriptionStatus());
+                m_entries[bareJid].setGroups(items.at(i).getGroups());
+                emit rosterChanged(bareJid);
+            }
+            if(rosterIq.getType() == QXmppIq::Set) // send result iq
+            {
+                QXmppIq returnIq(QXmppIq::Result);
+                returnIq.setId(rosterIq.getId());
+                m_stream->sendPacket(returnIq);
+            }
+            break;
+        }
+    default:
+        break;
+    }
+}
+
+QString QXmppRoster::QXmppRosterEntry::getBareJid() const
+{
+    return m_bareJid;
+}
+
+QString QXmppRoster::QXmppRosterEntry::getName() const
+{
+    return m_name;
+}
+
+QXmppRoster::QXmppRosterEntry::SubscriptionType
+        QXmppRoster::QXmppRosterEntry::getSubscriptionType() const
+{
+    return m_type;
+}
+
+QString QXmppRoster::QXmppRosterEntry::getSubscriptionStatus() const
+{
+    return m_subscriptionStatus;
+}
+
+QSet<QString> QXmppRoster::QXmppRosterEntry::getGroups() const
+{
+    return m_groups;
+}
+
+void QXmppRoster::QXmppRosterEntry::setBareJid(const QString& str)
+{
+    m_bareJid = str;
+}
+
+void QXmppRoster::QXmppRosterEntry::setName(const QString& str)
+{
+    m_name = str;
+}
+
+void QXmppRoster::QXmppRosterEntry::setSubscriptionType(
+        QXmppRosterEntry::SubscriptionType type)
+{
+    m_type = type;
+}
+
+void QXmppRoster::QXmppRosterEntry::setSubscriptionStatus(const QString& str)
+{
+    m_subscriptionStatus = str;
+}
+
+void QXmppRoster::QXmppRosterEntry::addGroupEntry(const QString& str)
+{
+    m_groups << str;
+}
+
+void QXmppRoster::QXmppRosterEntry::setGroups(const QSet<QString>& groups)
+{
+    m_groups = groups;
+}
+
+QStringList QXmppRoster::getRosterBareJids() const
+{
+    return m_entries.keys();
+}
+
+QXmppRoster::QXmppRosterEntry QXmppRoster::getRosterEntry(
+        const QString& bareJid) const
+{
+    // will return blank entry if bareJid does'nt exist
+    if(m_entries.contains(bareJid))
+        return m_entries.value(bareJid);
+    else
+    {
+        qWarning("QXmppRoster::getRosterEntry(): bareJid doesn't exist in roster db");
+        return QXmppRoster::QXmppRosterEntry();
+    }
+}
+
+QMap<QString, QXmppRoster::QXmppRosterEntry>
+        QXmppRoster::getRosterEntries() const
+{
+    return m_entries;
+}
+
+QStringList QXmppRoster::getResources(const QString& bareJid) const
+{
+    if(m_presences.contains(bareJid))
+    {
+        return m_presences[bareJid].keys();
+    }
+    else
+        return QStringList();
+}
+
+QMap<QString, QXmppPresence> QXmppRoster::getAllPresencesForBareJid(
+        const QString& bareJid) const
+{
+    if(m_presences.contains(bareJid))
+        return m_presences[bareJid];
+    else
+    {
+        qWarning("QXmppRoster::getAllPresences(): invalid bareJid");
+        return QMap<QString, QXmppPresence>();
+    }
+}
+
+QXmppPresence QXmppRoster::getPresence(const QString& bareJid,
+                                       const QString& resource) const
+{
+    if(m_presences.contains(bareJid) && m_presences[bareJid].contains(resource))
+        return m_presences[bareJid][resource];
+    else
+    {
+        qWarning("QXmppRoster::getPresence(): invalid bareJid");
+        return QXmppPresence();
+    }
+}
+
+QMap<QString, QMap<QString, QXmppPresence> > QXmppRoster::getAllPresences() const
+{
+    return m_presences;
+}
diff --git a/source/QXmppRoster.h b/source/QXmppRoster.h
index f9982083..ef1b40d4 100644
--- a/source/QXmppRoster.h
+++ b/source/QXmppRoster.h
@@ -1,108 +1,108 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#ifndef QXMPPROSTER_H

-#define QXMPPROSTER_H

-

-#include <QObject>

-#include <QMap>

-#include <QSet>

-#include <QStringList>

-

-#include "QXmppClient.h"

-

-class QXmppRosterIq;

-class QXmppPresence;

-

-class QXmppRoster : public QObject

-{

-    Q_OBJECT

-

-public:

-    class QXmppRosterEntry

-    {

-    public:

-        enum SubscriptionType

-        {

-            None = 0,

-            Both,

-            From,

-            To,

-            Remove

-        };

-

-        QString getBareJid() const;

-        QString getName() const;

-        QXmppRosterEntry::SubscriptionType getSubscriptionType() const;

-        QString getSubscriptionStatus() const;

-        QSet<QString> getGroups() const;

-

-        void setBareJid(const QString&);

-        void setName(const QString&);

-        void setSubscriptionType(QXmppRosterEntry::SubscriptionType);

-        void setSubscriptionStatus(const QString&);

-        void setGroups(const QSet<QString>&);

-        void addGroupEntry(const QString&);

-

-    private:

-        QString m_bareJid;

-        SubscriptionType m_type;

-        QString m_name;

-        // can be subscribe/unsubscribe (attribute "ask")

-        QString m_subscriptionStatus;

-        QSet<QString> m_groups;

-    };

-

-    QXmppRoster(QXmppStream* stream);

-    ~QXmppRoster();

-    

-    QStringList getRosterBareJids() const;

-    QXmppRoster::QXmppRosterEntry getRosterEntry(const QString& bareJid) const;

-    QMap<QString, QXmppRoster::QXmppRosterEntry> getRosterEntries() const;

-    

-    QStringList getResources(const QString& bareJid) const;

-    QMap<QString, QMap<QString, QXmppPresence> > getAllPresences() const;

-    QMap<QString, QXmppPresence> getAllPresencesForBareJid(

-            const QString& bareJid) const;

-    QXmppPresence getPresence(const QString& bareJid,

-                              const QString& resource) const;

-

-signals:

-    void presenceChanged(const QString& bareJid, const QString& resource);

-    void rosterChanged(const QString& bareJid);

-

-private:

-    //reverse pointer to stream

-    QXmppStream* m_stream;

-    //map of bareJid and its rosterEntry

-    QMap<QString, QXmppRoster::QXmppRosterEntry> m_entries;

-    // map of resources of the jid and map of resouces and presences

-    QMap<QString, QMap<QString, QXmppPresence> > m_presences;

-

-private slots:

-    void presenceReceived(const QXmppPresence&);

-    void rosterIqReceived(const QXmppRosterIq&);

-};

-

-#endif // QXMPPROSTER_H

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#ifndef QXMPPROSTER_H
+#define QXMPPROSTER_H
+
+#include <QObject>
+#include <QMap>
+#include <QSet>
+#include <QStringList>
+
+#include "QXmppClient.h"
+
+class QXmppRosterIq;
+class QXmppPresence;
+
+class QXmppRoster : public QObject
+{
+    Q_OBJECT
+
+public:
+    class QXmppRosterEntry
+    {
+    public:
+        enum SubscriptionType
+        {
+            None = 0,
+            Both,
+            From,
+            To,
+            Remove
+        };
+
+        QString getBareJid() const;
+        QString getName() const;
+        QXmppRosterEntry::SubscriptionType getSubscriptionType() const;
+        QString getSubscriptionStatus() const;
+        QSet<QString> getGroups() const;
+
+        void setBareJid(const QString&);
+        void setName(const QString&);
+        void setSubscriptionType(QXmppRosterEntry::SubscriptionType);
+        void setSubscriptionStatus(const QString&);
+        void setGroups(const QSet<QString>&);
+        void addGroupEntry(const QString&);
+
+    private:
+        QString m_bareJid;
+        SubscriptionType m_type;
+        QString m_name;
+        // can be subscribe/unsubscribe (attribute "ask")
+        QString m_subscriptionStatus;
+        QSet<QString> m_groups;
+    };
+
+    QXmppRoster(QXmppStream* stream);
+    ~QXmppRoster();
+    
+    QStringList getRosterBareJids() const;
+    QXmppRoster::QXmppRosterEntry getRosterEntry(const QString& bareJid) const;
+    QMap<QString, QXmppRoster::QXmppRosterEntry> getRosterEntries() const;
+    
+    QStringList getResources(const QString& bareJid) const;
+    QMap<QString, QMap<QString, QXmppPresence> > getAllPresences() const;
+    QMap<QString, QXmppPresence> getAllPresencesForBareJid(
+            const QString& bareJid) const;
+    QXmppPresence getPresence(const QString& bareJid,
+                              const QString& resource) const;
+
+signals:
+    void presenceChanged(const QString& bareJid, const QString& resource);
+    void rosterChanged(const QString& bareJid);
+
+private:
+    //reverse pointer to stream
+    QXmppStream* m_stream;
+    //map of bareJid and its rosterEntry
+    QMap<QString, QXmppRoster::QXmppRosterEntry> m_entries;
+    // map of resources of the jid and map of resouces and presences
+    QMap<QString, QMap<QString, QXmppPresence> > m_presences;
+
+private slots:
+    void presenceReceived(const QXmppPresence&);
+    void rosterIqReceived(const QXmppRosterIq&);
+};
+
+#endif // QXMPPROSTER_H
diff --git a/source/QXmppRosterIq.cpp b/source/QXmppRosterIq.cpp
index bcc675ce..52686563 100644
--- a/source/QXmppRosterIq.cpp
+++ b/source/QXmppRosterIq.cpp
@@ -1,172 +1,172 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#include "QXmppRosterIq.h"

-#include "QXmppConstants.h"

-#include "QXmppUtils.h"

-#include <QXmlStreamWriter>

-

-QXmppRosterIq::QXmppRosterIq(QXmppIq::Type type)

-    : QXmppIq(type)

-{

-

-}

-

-QXmppRosterIq::QXmppRosterIq(const QString& type)

-    : QXmppIq(type)

-{

-}

-

-QXmppRosterIq::~QXmppRosterIq()

-{

-

-}

-

-void QXmppRosterIq::addItem(const Item& item)

-{

-    m_items.append(item);

-}

-

-QList<QXmppRosterIq::Item> QXmppRosterIq::getItems() const

-{

-    return m_items;

-}

-

-void QXmppRosterIq::toXmlElementFromChild(QXmlStreamWriter *writer) const

-{

-    writer->writeStartElement("query");

-    writer->writeAttribute( "xmlns", ns_roster);

-

-    for(int i = 0; i < m_items.count(); ++i)

-        m_items.at(i).toXml(writer);

-    writer->writeEndElement();

-}

-

-QXmppRosterIq::Item::SubscriptionType

-        QXmppRosterIq::Item::getSubscriptionType() const

-{

-    return m_type;

-}

-

-QString QXmppRosterIq::Item::getName() const

-{

-    return m_name;

-}

-

-QString QXmppRosterIq::Item::getSubscriptionStatus() const

-{

-    return m_subscriptionStatus;

-}

-

-QString QXmppRosterIq::Item::getBareJid() const

-{

-    return m_bareJid;

-}

-

-QSet<QString> QXmppRosterIq::Item::getGroups() const

-{

-    return m_groups;

-}

-

-void QXmppRosterIq::Item::setName(const QString& str)

-{

-    m_name = str;

-}

-

-void QXmppRosterIq::Item::setSubscriptionStatus(const QString& str)

-{

-    m_subscriptionStatus = str;

-}

-

-void QXmppRosterIq::Item::addGroup(const QString& str)

-{

-    m_groups << str;

-}

-

-void QXmppRosterIq::Item::setBareJid(const QString& str)

-{

-    m_bareJid = str;

-}

-

-QString QXmppRosterIq::Item::getSubscriptionTypeStr() const

-{

-    switch(m_type)

-    {

-    case NotSet:

-        return "";

-    case None:

-        return "none";

-    case Both:

-        return "both";

-    case From:

-        return "from";

-    case To:

-        return "to";

-    case Remove:

-        return "remove";

-    default:

-        {

-            qWarning("QXmppRosterIq::Item::getTypeStr(): invalid type");

-            return "";

-        }

-    }

-}

-

-void QXmppRosterIq::Item::setSubscriptionType(SubscriptionType type)

-{

-    m_type = type;

-}

-

-void QXmppRosterIq::Item::setSubscriptionTypeFromStr(const QString& type)

-{

-    if(type == "none")

-        setSubscriptionType(None);

-    else if(type == "both")

-        setSubscriptionType(Both);

-    else if(type == "from")

-        setSubscriptionType(From);

-    else if(type == "to")

-        setSubscriptionType(To);

-    else if(type == "remove")

-        setSubscriptionType(Remove);

-    else

-        qWarning("QXmppRosterIq::Item::setTypeFromStr(): invalid type");

-}

-

-void QXmppRosterIq::Item::toXml(QXmlStreamWriter *writer) const

-{

-    writer->writeStartElement("item");

-    helperToXmlAddAttribute(writer,"jid", m_bareJid);

-    helperToXmlAddAttribute(writer,"name", m_name);

-    helperToXmlAddAttribute(writer,"subscription", getSubscriptionTypeStr());

-    helperToXmlAddAttribute(writer, "ask", getSubscriptionStatus());

-

-    QSet<QString>::const_iterator i = m_groups.constBegin();

-    while(i != m_groups.constEnd())

-    {

-        helperToXmlAddTextElement(writer,"group", *i);

-        ++i;

-    }

-    writer->writeEndElement();

-}

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#include "QXmppRosterIq.h"
+#include "QXmppConstants.h"
+#include "QXmppUtils.h"
+#include <QXmlStreamWriter>
+
+QXmppRosterIq::QXmppRosterIq(QXmppIq::Type type)
+    : QXmppIq(type)
+{
+
+}
+
+QXmppRosterIq::QXmppRosterIq(const QString& type)
+    : QXmppIq(type)
+{
+}
+
+QXmppRosterIq::~QXmppRosterIq()
+{
+
+}
+
+void QXmppRosterIq::addItem(const Item& item)
+{
+    m_items.append(item);
+}
+
+QList<QXmppRosterIq::Item> QXmppRosterIq::getItems() const
+{
+    return m_items;
+}
+
+void QXmppRosterIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
+{
+    writer->writeStartElement("query");
+    writer->writeAttribute( "xmlns", ns_roster);
+
+    for(int i = 0; i < m_items.count(); ++i)
+        m_items.at(i).toXml(writer);
+    writer->writeEndElement();
+}
+
+QXmppRosterIq::Item::SubscriptionType
+        QXmppRosterIq::Item::getSubscriptionType() const
+{
+    return m_type;
+}
+
+QString QXmppRosterIq::Item::getName() const
+{
+    return m_name;
+}
+
+QString QXmppRosterIq::Item::getSubscriptionStatus() const
+{
+    return m_subscriptionStatus;
+}
+
+QString QXmppRosterIq::Item::getBareJid() const
+{
+    return m_bareJid;
+}
+
+QSet<QString> QXmppRosterIq::Item::getGroups() const
+{
+    return m_groups;
+}
+
+void QXmppRosterIq::Item::setName(const QString& str)
+{
+    m_name = str;
+}
+
+void QXmppRosterIq::Item::setSubscriptionStatus(const QString& str)
+{
+    m_subscriptionStatus = str;
+}
+
+void QXmppRosterIq::Item::addGroup(const QString& str)
+{
+    m_groups << str;
+}
+
+void QXmppRosterIq::Item::setBareJid(const QString& str)
+{
+    m_bareJid = str;
+}
+
+QString QXmppRosterIq::Item::getSubscriptionTypeStr() const
+{
+    switch(m_type)
+    {
+    case NotSet:
+        return "";
+    case None:
+        return "none";
+    case Both:
+        return "both";
+    case From:
+        return "from";
+    case To:
+        return "to";
+    case Remove:
+        return "remove";
+    default:
+        {
+            qWarning("QXmppRosterIq::Item::getTypeStr(): invalid type");
+            return "";
+        }
+    }
+}
+
+void QXmppRosterIq::Item::setSubscriptionType(SubscriptionType type)
+{
+    m_type = type;
+}
+
+void QXmppRosterIq::Item::setSubscriptionTypeFromStr(const QString& type)
+{
+    if(type == "none")
+        setSubscriptionType(None);
+    else if(type == "both")
+        setSubscriptionType(Both);
+    else if(type == "from")
+        setSubscriptionType(From);
+    else if(type == "to")
+        setSubscriptionType(To);
+    else if(type == "remove")
+        setSubscriptionType(Remove);
+    else
+        qWarning("QXmppRosterIq::Item::setTypeFromStr(): invalid type");
+}
+
+void QXmppRosterIq::Item::toXml(QXmlStreamWriter *writer) const
+{
+    writer->writeStartElement("item");
+    helperToXmlAddAttribute(writer,"jid", m_bareJid);
+    helperToXmlAddAttribute(writer,"name", m_name);
+    helperToXmlAddAttribute(writer,"subscription", getSubscriptionTypeStr());
+    helperToXmlAddAttribute(writer, "ask", getSubscriptionStatus());
+
+    QSet<QString>::const_iterator i = m_groups.constBegin();
+    while(i != m_groups.constEnd())
+    {
+        helperToXmlAddTextElement(writer,"group", *i);
+        ++i;
+    }
+    writer->writeEndElement();
+}
diff --git a/source/QXmppRosterIq.h b/source/QXmppRosterIq.h
index c750946e..409f4d55 100644
--- a/source/QXmppRosterIq.h
+++ b/source/QXmppRosterIq.h
@@ -1,84 +1,84 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#ifndef QXMPPROSTERIQ_H

-#define QXMPPROSTERIQ_H

-

-#include "QXmppIq.h"

-#include <QList>

-#include <QSet>

-

-class QXmppRosterIq : public QXmppIq

-{

-public:

-

-    class Item

-    {

-    public:

-        enum SubscriptionType

-        {

-            NotSet = 0,

-            None,

-            Both,

-            From,

-            To,

-            Remove

-        };

-

-        SubscriptionType getSubscriptionType() const;

-        QString getName() const;

-        QString getSubscriptionStatus() const;

-        QString getBareJid() const;

-        QSet<QString> getGroups() const;

-        void setName(const QString&);

-        void setSubscriptionStatus(const QString&);

-        void addGroup(const QString&);

-        void setBareJid(const QString&);

-        void setSubscriptionType(SubscriptionType);

-        QString getSubscriptionTypeStr() const;

-        void setSubscriptionTypeFromStr(const QString&);

-        void toXml(QXmlStreamWriter *writer) const;

-        

-    private:

-        QString m_bareJid;

-        SubscriptionType m_type;

-        QString m_name;

-         // can be subscribe/unsubscribe (attribute "ask")

-        QString m_subscriptionStatus;

-        QSet<QString> m_groups;

-    };

-

-    QXmppRosterIq(QXmppIq::Type type);

-    QXmppRosterIq(const QString& type);

-    ~QXmppRosterIq();

-    

-    void addItem(const Item&);

-    QList<Item> getItems() const;

-    void toXmlElementFromChild(QXmlStreamWriter *writer) const;

-

-private:

-    QList<Item> m_items;

-};

-

-#endif // QXMPPROSTERIQ_H

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#ifndef QXMPPROSTERIQ_H
+#define QXMPPROSTERIQ_H
+
+#include "QXmppIq.h"
+#include <QList>
+#include <QSet>
+
+class QXmppRosterIq : public QXmppIq
+{
+public:
+
+    class Item
+    {
+    public:
+        enum SubscriptionType
+        {
+            NotSet = 0,
+            None,
+            Both,
+            From,
+            To,
+            Remove
+        };
+
+        SubscriptionType getSubscriptionType() const;
+        QString getName() const;
+        QString getSubscriptionStatus() const;
+        QString getBareJid() const;
+        QSet<QString> getGroups() const;
+        void setName(const QString&);
+        void setSubscriptionStatus(const QString&);
+        void addGroup(const QString&);
+        void setBareJid(const QString&);
+        void setSubscriptionType(SubscriptionType);
+        QString getSubscriptionTypeStr() const;
+        void setSubscriptionTypeFromStr(const QString&);
+        void toXml(QXmlStreamWriter *writer) const;
+        
+    private:
+        QString m_bareJid;
+        SubscriptionType m_type;
+        QString m_name;
+         // can be subscribe/unsubscribe (attribute "ask")
+        QString m_subscriptionStatus;
+        QSet<QString> m_groups;
+    };
+
+    QXmppRosterIq(QXmppIq::Type type);
+    QXmppRosterIq(const QString& type);
+    ~QXmppRosterIq();
+    
+    void addItem(const Item&);
+    QList<Item> getItems() const;
+    void toXmlElementFromChild(QXmlStreamWriter *writer) const;
+
+private:
+    QList<Item> m_items;
+};
+
+#endif // QXMPPROSTERIQ_H
diff --git a/source/QXmppSession.cpp b/source/QXmppSession.cpp
index abd1dadc..7821f16f 100644
--- a/source/QXmppSession.cpp
+++ b/source/QXmppSession.cpp
@@ -1,50 +1,50 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#include "QXmppSession.h"

-#include "QXmppConstants.h"

-#include "QXmppUtils.h"

-#include <QXmlStreamWriter>

-

-QXmppSession::QXmppSession(QXmppIq::Type type)

-    : QXmppIq(type)

-{

-}

-

-QXmppSession::QXmppSession(const QString& type)

-    : QXmppIq(type)

-{

-}

-

-QXmppSession::~QXmppSession()

-{

-}

-

-void QXmppSession::toXmlElementFromChild(QXmlStreamWriter *writer) const

-{

-    writer->writeStartElement("session");;

-    writer->writeAttribute( "xmlns", ns_session);

-    writer->writeEndElement();

-}

-

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#include "QXmppSession.h"
+#include "QXmppConstants.h"
+#include "QXmppUtils.h"
+#include <QXmlStreamWriter>
+
+QXmppSession::QXmppSession(QXmppIq::Type type)
+    : QXmppIq(type)
+{
+}
+
+QXmppSession::QXmppSession(const QString& type)
+    : QXmppIq(type)
+{
+}
+
+QXmppSession::~QXmppSession()
+{
+}
+
+void QXmppSession::toXmlElementFromChild(QXmlStreamWriter *writer) const
+{
+    writer->writeStartElement("session");;
+    writer->writeAttribute( "xmlns", ns_session);
+    writer->writeEndElement();
+}
+
diff --git a/source/QXmppSession.h b/source/QXmppSession.h
index 1845bf6d..95b1048c 100644
--- a/source/QXmppSession.h
+++ b/source/QXmppSession.h
@@ -1,42 +1,42 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#ifndef QXMPPSESSION_H

-#define QXMPPSESSION_H

-

-#include "QXmppIq.h"

-

-class QXmppSession : public QXmppIq

-{

-public:

-    QXmppSession(QXmppIq::Type type);

-    QXmppSession(const QString& type);

-    ~QXmppSession();

-

-private:

-    void toXmlElementFromChild( QXmlStreamWriter *writer) const;

-    

-};

-

-#endif // QXMPPSESSION_H

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#ifndef QXMPPSESSION_H
+#define QXMPPSESSION_H
+
+#include "QXmppIq.h"
+
+class QXmppSession : public QXmppIq
+{
+public:
+    QXmppSession(QXmppIq::Type type);
+    QXmppSession(const QString& type);
+    ~QXmppSession();
+
+private:
+    void toXmlElementFromChild( QXmlStreamWriter *writer) const;
+    
+};
+
+#endif // QXMPPSESSION_H
diff --git a/source/QXmppStanza.cpp b/source/QXmppStanza.cpp
index c83bfaa8..1cfacfb9 100644
--- a/source/QXmppStanza.cpp
+++ b/source/QXmppStanza.cpp
@@ -1,322 +1,322 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#include "QXmppStanza.h"

-#include "QXmppUtils.h"

-#include "QXmppConstants.h"

-

-#include <QXmlStreamWriter>

-

-int QXmppStanza::s_uniqeIdNo = 0;

-

-QXmppStanza::Error::Error(): m_type(static_cast<QXmppStanza::Error::Type>(-1)), 

-            m_condition(static_cast<QXmppStanza::Error::Condition>(-1)),

-            m_text("")

-{

-}

-

-QXmppStanza::Error::Error(Type type, Condition cond, const QString& text): 

-        m_type(type), m_condition(cond), m_text(text)

-{

-}

-

-QXmppStanza::Error::Error(const QString& type, const QString& cond,

-                          const QString& text):

-    m_text(text)

-{

-    setTypeFromStr(type);

-    setConditionFromStr(cond);

-}

-

-void QXmppStanza::Error::setText(const QString& text)

-{

-    m_text = text;

-}

-

-void QXmppStanza::Error::setCondition(QXmppStanza::Error::Condition cond)

-{

-    m_condition = cond;

-}

-

-void QXmppStanza::Error::setType(QXmppStanza::Error::Type type)

-{

-    m_type = type;

-}

-

-QString QXmppStanza::Error::getText() const

-{

-    return m_text;

-}

-

-QXmppStanza::Error::Condition QXmppStanza::Error::getCondition() const

-{

-    return m_condition;

-}

-

-QXmppStanza::Error::Type QXmppStanza::Error::getType() const

-{

-    return m_type;

-}

-

-QString QXmppStanza::Error::getTypeStr() const

-{

-    switch(getType())

-    {

-    case Cancel:

-        return "cancel";

-    case Continue:

-        return "continue";

-    case Modify:

-        return "modify";

-    case Auth:

-        return "auth";

-    case Wait:

-        return "wait";

-    default:

-        return "";

-    }

-}

-

-QString QXmppStanza::Error::getConditionStr() const

-{

-    switch(getCondition())

-    {

-    case BadRequest:

-        return "bad-request";

-    case Conflict:

-        return "conflict";

-    case FeatureNotImplemented:

-        return "feature-not-implemented";

-    case Forbidden:

-        return "forbidden";

-    case Gone:

-        return "gone";

-    case InternalServerError:

-        return "internal-server-error";

-    case ItemNotFound:

-        return "item-not-found";

-    case JidMalformed:

-        return "jid-malformed";

-    case NotAcceptable:

-        return "not-acceptable";

-    case NotAllowed:

-        return "not-allowed";

-    case NotAuthorized:

-        return "not-authorized";

-    case PaymentRequired:

-        return "payment-required";

-    case RecipientUnavailable:

-        return "recipient-unavailable";

-    case Redirect:

-        return "redirect";

-    case RegistrationRequired:

-        return "registration-required";

-    case RemoteServerNotFound:

-        return "remote-server-not-found";

-    case RemoteServerTimeout:

-        return "remote-server-timeout";

-    case ResourceConstraint:

-        return "resource-constraint";

-    case ServiceUnavailable:

-        return "service-unavailable";

-    case SubscriptionRequired:

-        return "subscription-required";

-    case UndefinedCondition:

-        return "undefined-condition";

-    case UnexpectedRequest:

-        return "unexpected-request";

-    default:

-        return "";

-    }

-}

-

-void QXmppStanza::Error::setTypeFromStr(const QString& type)

-{

-    if(type == "cancel")

-        setType(Cancel);

-    else if(type == "continue")

-        setType(Continue);

-    else if(type == "modify")

-        setType(Modify);

-    else if(type == "auth")

-        setType(Auth);

-    else if(type == "wait")

-        setType(Wait);

-    else

-        setType(static_cast<QXmppStanza::Error::Type>(-1));

-}

-

-void QXmppStanza::Error::setConditionFromStr(const QString& type)

-{

-    if(type == "bad-request")

-        setCondition(BadRequest);

-    else if(type == "conflict")

-        setCondition(Conflict);

-    else if(type == "feature-not-implemented")

-        setCondition(FeatureNotImplemented);

-    else if(type == "forbidden")

-        setCondition(Forbidden);

-    else if(type == "gone")

-        setCondition(Gone);

-    else if(type == "internal-server-error")

-        setCondition(InternalServerError);

-    else if(type == "item-not-found")

-        setCondition(ItemNotFound);

-    else if(type == "jid-malformed")

-        setCondition(JidMalformed);

-    else if(type == "not-acceptable")

-        setCondition(NotAcceptable);

-    else if(type == "not-allowed")

-        setCondition(NotAllowed);

-    else if(type == "not-authorized")

-        setCondition(NotAuthorized);

-    else if(type == "payment-required")

-        setCondition(PaymentRequired);

-    else if(type == "recipient-unavailable")

-        setCondition(RecipientUnavailable);

-    else if(type == "redirect")

-        setCondition(Redirect);

-    else if(type == "registration-required")

-        setCondition(RegistrationRequired);

-    else if(type == "remote-server-not-found")

-        setCondition(RemoteServerNotFound);

-    else if(type == "remote-server-timeout")

-        setCondition(RemoteServerTimeout);

-    else if(type == "resource-constraint")

-        setCondition(ResourceConstraint);

-    else if(type == "service-unavailable")

-        setCondition(ServiceUnavailable);

-    else if(type == "subscription-required")

-        setCondition(SubscriptionRequired);

-    else if(type == "undefined-condition")

-        setCondition(UndefinedCondition);

-    else if(type == "unexpected-request")

-        setCondition(UnexpectedRequest);

-    else

-        setCondition(static_cast<QXmppStanza::Error::Condition>(-1));

-}

-

-void QXmppStanza::Error::toXml( QXmlStreamWriter *writer ) const

-{

-    QString cond = getConditionStr();

-    QString type = getTypeStr();

-    

-    if(cond.isEmpty() && type.isEmpty())

-        return;

-

-    writer->writeStartElement("error");

-    helperToXmlAddAttribute(writer,"type", type);

-    

-    if(!cond.isEmpty())

-    {

-        writer->writeStartElement(cond);

-        helperToXmlAddAttribute(writer,"xmlns", ns_stanza);

-        writer->writeEndElement();

-    }

-    if(!m_text.isEmpty())

-    {

-        writer->writeStartElement("text");

-        helperToXmlAddAttribute(writer,"xml:lang", "en");

-        helperToXmlAddAttribute(writer,"xmlns", ns_stanza);

-        writer->writeCharacters(m_text);

-        writer->writeEndElement();

-    }

-

-    writer->writeEndElement();

-}

-

-

-QXmppStanza::QXmppStanza(const QString& from, const QString& to) : QXmppPacket(),

-m_to(to), m_from(from)

-{

-}

-

-QXmppStanza::~QXmppStanza()

-{

-

-}

-

-QString QXmppStanza::getTo() const

-{

-    return m_to;

-}

-

-QString QXmppStanza::getFrom() const

-{

-    return m_from;

-}

-

-QString QXmppStanza::getId() const    

-{

-    return m_id;

-}

-

-QString QXmppStanza::getLang() const    

-{

-    return m_lang;

-}

-

-

-void QXmppStanza::setTo(const QString& to)  

-{

-    m_to = to;

-}

-

-void QXmppStanza::setFrom(const QString& from)

-{

-    m_from = from;

-}

-

-void QXmppStanza::setId(const QString& id)    

-{

-    m_id = id;

-}

-

-void QXmppStanza::setLang(const QString& lang)    

-{

-    m_lang = lang;

-}

-

-void QXmppStanza::generateAndSetNextId()

-{

-    // get back

-    ++s_uniqeIdNo;

-    m_id = "qxmpp" + QString::number(s_uniqeIdNo);

-}

-

-QXmppStanza::Error QXmppStanza::getError() const

-{

-    return m_error;

-}

-

-void QXmppStanza::setError(QXmppStanza::Error& error)

-{

-    m_error = error;

-}

-

-bool QXmppStanza::isErrorStanza()

-{

-    return !(m_error.getTypeStr().isEmpty() && 

-        m_error.getConditionStr().isEmpty());

-}

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#include "QXmppStanza.h"
+#include "QXmppUtils.h"
+#include "QXmppConstants.h"
+
+#include <QXmlStreamWriter>
+
+int QXmppStanza::s_uniqeIdNo = 0;
+
+QXmppStanza::Error::Error(): m_type(static_cast<QXmppStanza::Error::Type>(-1)), 
+            m_condition(static_cast<QXmppStanza::Error::Condition>(-1)),
+            m_text("")
+{
+}
+
+QXmppStanza::Error::Error(Type type, Condition cond, const QString& text): 
+        m_type(type), m_condition(cond), m_text(text)
+{
+}
+
+QXmppStanza::Error::Error(const QString& type, const QString& cond,
+                          const QString& text):
+    m_text(text)
+{
+    setTypeFromStr(type);
+    setConditionFromStr(cond);
+}
+
+void QXmppStanza::Error::setText(const QString& text)
+{
+    m_text = text;
+}
+
+void QXmppStanza::Error::setCondition(QXmppStanza::Error::Condition cond)
+{
+    m_condition = cond;
+}
+
+void QXmppStanza::Error::setType(QXmppStanza::Error::Type type)
+{
+    m_type = type;
+}
+
+QString QXmppStanza::Error::getText() const
+{
+    return m_text;
+}
+
+QXmppStanza::Error::Condition QXmppStanza::Error::getCondition() const
+{
+    return m_condition;
+}
+
+QXmppStanza::Error::Type QXmppStanza::Error::getType() const
+{
+    return m_type;
+}
+
+QString QXmppStanza::Error::getTypeStr() const
+{
+    switch(getType())
+    {
+    case Cancel:
+        return "cancel";
+    case Continue:
+        return "continue";
+    case Modify:
+        return "modify";
+    case Auth:
+        return "auth";
+    case Wait:
+        return "wait";
+    default:
+        return "";
+    }
+}
+
+QString QXmppStanza::Error::getConditionStr() const
+{
+    switch(getCondition())
+    {
+    case BadRequest:
+        return "bad-request";
+    case Conflict:
+        return "conflict";
+    case FeatureNotImplemented:
+        return "feature-not-implemented";
+    case Forbidden:
+        return "forbidden";
+    case Gone:
+        return "gone";
+    case InternalServerError:
+        return "internal-server-error";
+    case ItemNotFound:
+        return "item-not-found";
+    case JidMalformed:
+        return "jid-malformed";
+    case NotAcceptable:
+        return "not-acceptable";
+    case NotAllowed:
+        return "not-allowed";
+    case NotAuthorized:
+        return "not-authorized";
+    case PaymentRequired:
+        return "payment-required";
+    case RecipientUnavailable:
+        return "recipient-unavailable";
+    case Redirect:
+        return "redirect";
+    case RegistrationRequired:
+        return "registration-required";
+    case RemoteServerNotFound:
+        return "remote-server-not-found";
+    case RemoteServerTimeout:
+        return "remote-server-timeout";
+    case ResourceConstraint:
+        return "resource-constraint";
+    case ServiceUnavailable:
+        return "service-unavailable";
+    case SubscriptionRequired:
+        return "subscription-required";
+    case UndefinedCondition:
+        return "undefined-condition";
+    case UnexpectedRequest:
+        return "unexpected-request";
+    default:
+        return "";
+    }
+}
+
+void QXmppStanza::Error::setTypeFromStr(const QString& type)
+{
+    if(type == "cancel")
+        setType(Cancel);
+    else if(type == "continue")
+        setType(Continue);
+    else if(type == "modify")
+        setType(Modify);
+    else if(type == "auth")
+        setType(Auth);
+    else if(type == "wait")
+        setType(Wait);
+    else
+        setType(static_cast<QXmppStanza::Error::Type>(-1));
+}
+
+void QXmppStanza::Error::setConditionFromStr(const QString& type)
+{
+    if(type == "bad-request")
+        setCondition(BadRequest);
+    else if(type == "conflict")
+        setCondition(Conflict);
+    else if(type == "feature-not-implemented")
+        setCondition(FeatureNotImplemented);
+    else if(type == "forbidden")
+        setCondition(Forbidden);
+    else if(type == "gone")
+        setCondition(Gone);
+    else if(type == "internal-server-error")
+        setCondition(InternalServerError);
+    else if(type == "item-not-found")
+        setCondition(ItemNotFound);
+    else if(type == "jid-malformed")
+        setCondition(JidMalformed);
+    else if(type == "not-acceptable")
+        setCondition(NotAcceptable);
+    else if(type == "not-allowed")
+        setCondition(NotAllowed);
+    else if(type == "not-authorized")
+        setCondition(NotAuthorized);
+    else if(type == "payment-required")
+        setCondition(PaymentRequired);
+    else if(type == "recipient-unavailable")
+        setCondition(RecipientUnavailable);
+    else if(type == "redirect")
+        setCondition(Redirect);
+    else if(type == "registration-required")
+        setCondition(RegistrationRequired);
+    else if(type == "remote-server-not-found")
+        setCondition(RemoteServerNotFound);
+    else if(type == "remote-server-timeout")
+        setCondition(RemoteServerTimeout);
+    else if(type == "resource-constraint")
+        setCondition(ResourceConstraint);
+    else if(type == "service-unavailable")
+        setCondition(ServiceUnavailable);
+    else if(type == "subscription-required")
+        setCondition(SubscriptionRequired);
+    else if(type == "undefined-condition")
+        setCondition(UndefinedCondition);
+    else if(type == "unexpected-request")
+        setCondition(UnexpectedRequest);
+    else
+        setCondition(static_cast<QXmppStanza::Error::Condition>(-1));
+}
+
+void QXmppStanza::Error::toXml( QXmlStreamWriter *writer ) const
+{
+    QString cond = getConditionStr();
+    QString type = getTypeStr();
+    
+    if(cond.isEmpty() && type.isEmpty())
+        return;
+
+    writer->writeStartElement("error");
+    helperToXmlAddAttribute(writer,"type", type);
+    
+    if(!cond.isEmpty())
+    {
+        writer->writeStartElement(cond);
+        helperToXmlAddAttribute(writer,"xmlns", ns_stanza);
+        writer->writeEndElement();
+    }
+    if(!m_text.isEmpty())
+    {
+        writer->writeStartElement("text");
+        helperToXmlAddAttribute(writer,"xml:lang", "en");
+        helperToXmlAddAttribute(writer,"xmlns", ns_stanza);
+        writer->writeCharacters(m_text);
+        writer->writeEndElement();
+    }
+
+    writer->writeEndElement();
+}
+
+
+QXmppStanza::QXmppStanza(const QString& from, const QString& to) : QXmppPacket(),
+m_to(to), m_from(from)
+{
+}
+
+QXmppStanza::~QXmppStanza()
+{
+
+}
+
+QString QXmppStanza::getTo() const
+{
+    return m_to;
+}
+
+QString QXmppStanza::getFrom() const
+{
+    return m_from;
+}
+
+QString QXmppStanza::getId() const    
+{
+    return m_id;
+}
+
+QString QXmppStanza::getLang() const    
+{
+    return m_lang;
+}
+
+
+void QXmppStanza::setTo(const QString& to)  
+{
+    m_to = to;
+}
+
+void QXmppStanza::setFrom(const QString& from)
+{
+    m_from = from;
+}
+
+void QXmppStanza::setId(const QString& id)    
+{
+    m_id = id;
+}
+
+void QXmppStanza::setLang(const QString& lang)    
+{
+    m_lang = lang;
+}
+
+void QXmppStanza::generateAndSetNextId()
+{
+    // get back
+    ++s_uniqeIdNo;
+    m_id = "qxmpp" + QString::number(s_uniqeIdNo);
+}
+
+QXmppStanza::Error QXmppStanza::getError() const
+{
+    return m_error;
+}
+
+void QXmppStanza::setError(QXmppStanza::Error& error)
+{
+    m_error = error;
+}
+
+bool QXmppStanza::isErrorStanza()
+{
+    return !(m_error.getTypeStr().isEmpty() && 
+        m_error.getConditionStr().isEmpty());
+}
diff --git a/source/QXmppStanza.h b/source/QXmppStanza.h
index 58aedb57..c5b6cd85 100644
--- a/source/QXmppStanza.h
+++ b/source/QXmppStanza.h
@@ -1,122 +1,126 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#ifndef QXMPPSTANZA_H

-#define QXMPPSTANZA_H

-

-#include "QXmppPacket.h"

-#include <QString>

-

-class QXmlStreamWriter;

-

-class QXmppStanza : public QXmppPacket

-{

-public:

-    class Error

-    {

-    public:

-        enum Type

-        {

-            Cancel,

-            Continue,

-            Modify,

-            Auth,

-            Wait

-        };

-

-        enum Condition

-        {

-            BadRequest,

-            Conflict,

-            FeatureNotImplemented,

-            Forbidden,

-            Gone,

-            InternalServerError,

-            ItemNotFound,

-            JidMalformed,

-            NotAcceptable,

-            NotAllowed,

-            NotAuthorized,

-            PaymentRequired,

-            RecipientUnavailable,

-            Redirect,

-            RegistrationRequired,

-            RemoteServerNotFound,

-            RemoteServerTimeout,

-            ResourceConstraint,

-            ServiceUnavailable,

-            SubscriptionRequired,

-            UndefinedCondition,

-            UnexpectedRequest

-        };

-

-        Error();

-        Error(Type type, Condition cond, const QString& text="");

-        Error(const QString& type, const QString& cond, const QString& text="");

-

-        void setText(const QString& text);

-        void setCondition(Condition cond);

-        void setConditionFromStr(const QString& cond);

-        void setType(Type type);

-        void setTypeFromStr(const QString& type);

-        QString getText() const;

-        Condition getCondition() const;

-        Type getType() const;

-        void toXml( QXmlStreamWriter *writer ) const;

-        QString getConditionStr() const;

-        QString getTypeStr() const;

-

-    private:

-        Type m_type;

-        Condition m_condition;

-        QString m_text;

-    };

-

-    QXmppStanza(const QString& from = "", const QString& to = "");

-    ~QXmppStanza();

-    

-    QString getTo() const;  

-    QString getFrom() const;

-    QString getId() const;    

-    QString getLang() const;    

-    QXmppStanza::Error getError() const;    

-

-    void setTo(const QString&);  

-    void setFrom(const QString&);

-    void setId(const QString&);

-    void generateAndSetNextId();

-    void setLang(const QString&);

-    void setError(QXmppStanza::Error& error);    

-    bool isErrorStanza();

-

-private:

-    static int s_uniqeIdNo;

-    QString m_to;  

-    QString m_from;

-    QString m_id;    

-    QString m_lang;

-    QXmppStanza::Error m_error;

-};

-

-#endif // QXMPPSTANZA_H

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#ifndef QXMPPSTANZA_H
+#define QXMPPSTANZA_H
+
+#include "QXmppPacket.h"
+#include <QString>
+
+// forward declarations of QXmlStream* classes will not work on Mac, we need to
+// include the whole header.
+// See http://lists.trolltech.com/qt-interest/2008-07/thread00798-0.html
+// for an explanation.
+#include <QXmlStreamWriter>
+
+class QXmppStanza : public QXmppPacket
+{
+public:
+    class Error
+    {
+    public:
+        enum Type
+        {
+            Cancel,
+            Continue,
+            Modify,
+            Auth,
+            Wait
+        };
+
+        enum Condition
+        {
+            BadRequest,
+            Conflict,
+            FeatureNotImplemented,
+            Forbidden,
+            Gone,
+            InternalServerError,
+            ItemNotFound,
+            JidMalformed,
+            NotAcceptable,
+            NotAllowed,
+            NotAuthorized,
+            PaymentRequired,
+            RecipientUnavailable,
+            Redirect,
+            RegistrationRequired,
+            RemoteServerNotFound,
+            RemoteServerTimeout,
+            ResourceConstraint,
+            ServiceUnavailable,
+            SubscriptionRequired,
+            UndefinedCondition,
+            UnexpectedRequest
+        };
+
+        Error();
+        Error(Type type, Condition cond, const QString& text="");
+        Error(const QString& type, const QString& cond, const QString& text="");
+
+        void setText(const QString& text);
+        void setCondition(Condition cond);
+        void setConditionFromStr(const QString& cond);
+        void setType(Type type);
+        void setTypeFromStr(const QString& type);
+        QString getText() const;
+        Condition getCondition() const;
+        Type getType() const;
+        void toXml( QXmlStreamWriter *writer ) const;
+        QString getConditionStr() const;
+        QString getTypeStr() const;
+
+    private:
+        Type m_type;
+        Condition m_condition;
+        QString m_text;
+    };
+
+    QXmppStanza(const QString& from = "", const QString& to = "");
+    ~QXmppStanza();
+    
+    QString getTo() const;  
+    QString getFrom() const;
+    QString getId() const;    
+    QString getLang() const;    
+    QXmppStanza::Error getError() const;    
+
+    void setTo(const QString&);  
+    void setFrom(const QString&);
+    void setId(const QString&);
+    void generateAndSetNextId();
+    void setLang(const QString&);
+    void setError(QXmppStanza::Error& error);    
+    bool isErrorStanza();
+
+private:
+    static int s_uniqeIdNo;
+    QString m_to;  
+    QString m_from;
+    QString m_id;    
+    QString m_lang;
+    QXmppStanza::Error m_error;
+};
+
+#endif // QXMPPSTANZA_H
diff --git a/source/QXmppStream.cpp b/source/QXmppStream.cpp
index 70e9a4e8..44d8c5f2 100644
--- a/source/QXmppStream.cpp
+++ b/source/QXmppStream.cpp
@@ -1,931 +1,931 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#include "QXmppStream.h"

-#include "QXmppPacket.h"

-#include "QXmppUtils.h"

-#include "QXmppClient.h"

-#include "QXmppRoster.h"

-#include "QXmppPresence.h"

-#include "QXmppIq.h"

-#include "QXmppBind.h"

-#include "QXmppSession.h"

-#include "QXmppRosterIq.h"

-#include "QXmppMessage.h"

-#include "QXmppConstants.h"

-#include "QXmppVCard.h"

-#include "QXmppNonSASLAuth.h"

-#include "QXmppInformationRequestResult.h"

-#include "QXmppLogger.h"

-

-#include <QDomDocument>

-#include <QStringList>

-#include <QRegExp>

-#include <QHostAddress>

-#include <QXmlStreamWriter>

-

-static const QByteArray streamRootElementStart = "<?xml version=\"1.0\"?><stream:stream xmlns:stream=\"http://etherx.jabber.org/streams\" version=\"1.0\" xmlns=\"jabber:client\" xml:lang=\"en\" xmlns:xml=\"http://www.w3.org/XML/1998/namespace\">\n";

-static const QByteArray streamRootElementEnd = "</stream:stream>";

-

-QXmppStream::QXmppStream(QXmppClient* client)

-    : QObject(client), m_client(client), m_roster(this),

-    m_sessionAvaliable(false), m_vCardManager(m_client)

-{

-    bool check = QObject::connect(&m_socket, SIGNAL(hostFound()),

-                                  this, SLOT(socketHostFound()));

-    Q_ASSERT(check);

-    check = QObject::connect(&m_socket, SIGNAL(connected()),

-                             this, SLOT(socketConnected()));

-    Q_ASSERT(check);

-    check = QObject::connect(&m_socket, SIGNAL(disconnected()),

-                             this, SLOT(socketDisconnected()));

-    Q_ASSERT(check);

-    check = QObject::connect(&m_socket, SIGNAL(readyRead()),

-                             this, SLOT(socketReadReady()));

-    Q_ASSERT(check);

-    check = QObject::connect(&m_socket, SIGNAL(encrypted()),

-                             this, SLOT(socketEncrypted()));

-    Q_ASSERT(check);

-    check = QObject::connect(&m_socket,

-                             SIGNAL(sslErrors(const QList<QSslError>&)), this,

-                             SLOT(socketSslErrors(const QList<QSslError>&)));

-    Q_ASSERT(check);

-    check = QObject::connect(&m_socket,

-                             SIGNAL(error(QAbstractSocket::SocketError)), this,

-                             SLOT(socketError(QAbstractSocket::SocketError)));

-    Q_ASSERT(check);

-

-    check = QObject::connect(this,

-                            SIGNAL(presenceReceived(const QXmppPresence&)),

-                            &m_roster,

-                            SLOT(presenceReceived(const QXmppPresence&)));

-    Q_ASSERT(check);

-    

-    check = QObject::connect(this, SIGNAL(rosterIqReceived(const QXmppRosterIq&)), 

-        &m_roster, SLOT(rosterIqReceived(const QXmppRosterIq&)));

-    Q_ASSERT(check);

-

-    check = QObject::connect(this, SIGNAL(vCardIqReceived(const QXmppVCard&)),

-        &m_vCardManager, SLOT(vCardIqReceived(const QXmppVCard&)));

-    Q_ASSERT(check);

-}

-

-QXmppStream::~QXmppStream()

-{

-

-}

-

-QXmppConfiguration& QXmppStream::getConfiguration()

-{

-    return m_client->getConfiguration();

-}

-

-void QXmppStream::connect()

-{

-    log(QString("Connecting to: %1:%2").arg(getConfiguration().

-            getHost()).arg(getConfiguration().getPort()));

-

-    m_socket.setProxy(getConfiguration().getNetworkProxy());

-    m_socket.connectToHost(getConfiguration().

-                           getHost(), getConfiguration().getPort());

-}

-

-void QXmppStream::socketSslErrors(const QList<QSslError> & error)

-{

-    log(QString("SSL errors"));

-    m_socket.ignoreSslErrors();

-    for(int i = 0; i< error.count(); ++i)

-        log(error.at(i).errorString());

-}

-

-void QXmppStream::socketHostFound()

-{

-    log(QString("Host found"));

-    emit hostFound();

-}

-

-void QXmppStream::socketConnected()

-{

-    flushDataBuffer();

-    log(QString("Connected"));

-    emit connected();

-    sendStartStream();

-}

-

-void QXmppStream::socketDisconnected()

-{

-    flushDataBuffer();

-    log(QString("Disconnected"));

-    emit disconnected();

-}

-

-void QXmppStream::socketEncrypted()

-{

-    log(QString("Encrypted"));

-    sendStartStream();

-}

-

-void QXmppStream::socketError(QAbstractSocket::SocketError ee)

-{

-    m_socketError = ee;

-    emit error(QXmppClient::SocketError);

-    log(QString("Socket error: " + m_socket.errorString()));

-}

-

-void QXmppStream::socketReadReady()

-{

-    QByteArray data = m_socket.readAll();

-    log("SERVER [COULD BE PARTIAL DATA]:" + data.left(20));

-    parser(data);

-}

-

-void QXmppStream::sendNonSASLAuthQuery( const QString &to )

-{

-    QXmppNonSASLAuthTypesRequestIq authQuery;

-    authQuery.setTo(to);

-    authQuery.setUsername(getConfiguration().getUser());

-

-    sendPacket(authQuery);

-}

-

-void QXmppStream::parser(const QByteArray& data)

-{

-    QDomDocument doc;

-    QByteArray completeXml;

-

-    m_dataBuffer = m_dataBuffer + data;

-

-    if(hasStartStreamElement(m_dataBuffer))

-    {

-        completeXml = m_dataBuffer + streamRootElementEnd;

-    }

-    else if(hasEndStreamElement(data))

-    {

-        completeXml = streamRootElementStart + m_dataBuffer;

-    }

-    else

-    {

-        completeXml = streamRootElementStart + m_dataBuffer + streamRootElementEnd;

-    }

-    

-    if(doc.setContent(completeXml, true))

-    {

-        log("SERVER:" + m_dataBuffer);

-        flushDataBuffer();

-

-        QDomElement nodeRecv = doc.documentElement().firstChildElement();

-

-        if(nodeRecv.isNull())

-        {

-            QDomElement streamElement = doc.documentElement();

-            if(m_streamId.isEmpty())

-                m_streamId = streamElement.attribute("id");

-            if(m_XMPPVersion.isEmpty())

-            {

-                m_XMPPVersion = streamElement.attribute("version");

-                if(m_XMPPVersion.isEmpty())

-                {

-                    // no version specified, signals XMPP Version < 1.0.

-                    // switch to old auth mechanism

-                    sendNonSASLAuthQuery(doc.documentElement().attribute("from"));

-                }

-            }

-        }

-        else

-        {

-            //TODO: Make a login error here.

-        }

-

-        while(!nodeRecv.isNull())

-        {

-            QString ns = nodeRecv.namespaceURI();

-            if(ns == ns_stream && nodeRecv.tagName() == "features")

-            {

-                bool nonSaslAvailable = nodeRecv.firstChildElement("auth").

-                                         namespaceURI() == ns_authFeature;

-                bool saslAvailable = nodeRecv.firstChildElement("mechanisms").

-                                     namespaceURI() == ns_sasl;

-                bool useSasl = getConfiguration().getUseSASLAuthentication();

-

-                if(nodeRecv.firstChildElement("starttls").namespaceURI()

-                    == ns_tls && !m_socket.isEncrypted())

-                {

-                    if(nodeRecv.firstChildElement("starttls").

-                                     firstChildElement().tagName() == "required")

-                    {

-                        // TLS is must from the server side

-                        sendStartTls();

-                        return;

-                    }

-                    else

-                    {

-                        // TLS is optional from the server side

-                        switch(getConfiguration().getStreamSecurityMode())

-                        {

-                        case QXmppConfiguration::TLSEnabled:

-                        case QXmppConfiguration::TLSRequired:

-                            sendStartTls();

-                            return;

-                        case QXmppConfiguration::TLSDisabled:

-                            break;

-                        }

-                    }

-                }

-                else if(!m_socket.isEncrypted())    // TLS not supported by server

-                {

-                    if(getConfiguration().getStreamSecurityMode() ==

-                       QXmppConfiguration::TLSRequired)

-                    {

-                        // disconnect as the for client TLS is compulsory but

-                        // not available on the server

-                        //

-                        log(QString("Disconnecting as TLS not available at the server"));

-                        disconnect();

-                        return;

-                    }

-                }

-

-                if((saslAvailable && nonSaslAvailable && !useSasl) ||

-                   (!saslAvailable && nonSaslAvailable))

-                {

-                    sendNonSASLAuthQuery(doc.documentElement().attribute("from"));

-                }

-                else if(saslAvailable)

-                {

-                    // SASL Authentication

-                    QDomElement element = nodeRecv.firstChildElement("mechanisms");

-                    log(QString("Mechanisms:"));

-                    QDomElement subElement = element.firstChildElement();

-                    QStringList mechanisms;

-                    while(!subElement.isNull())

-                    {

-                        if(subElement.tagName() == "mechanism")

-                        {

-                            log(subElement.text());

-                            mechanisms << subElement.text();

-                        }

-                        subElement = subElement.nextSiblingElement();

-                    }

-

-                    switch(getConfiguration().getSASLAuthMechanism())

-                    {

-                    case QXmppConfiguration::SASLPlain:

-                        if(mechanisms.contains("PLAIN"))

-                        {

-                            sendAuthPlain();

-                            break;

-                        }

-                    case QXmppConfiguration::SASLDigestMD5:

-                        if(mechanisms.contains("DIGEST-MD5"))

-                        {

-                            sendAuthDigestMD5();

-                            break;

-                        }

-                    default:

-                        log(QString("Desired SASL Auth mechanism not available trying the available ones"));

-                        if(mechanisms.contains("DIGEST-MD5"))

-                            sendAuthDigestMD5();

-                        else if(mechanisms.contains("PLAIN"))

-                            sendAuthPlain();

-                        else

-                        {

-                            log(QString("SASL Auth mechanism not available"));

-                            disconnect();

-                            return;

-                        }

-                        break;

-                    }

-                }

-

-                if(nodeRecv.firstChildElement("bind").

-                                     namespaceURI() == ns_bind)

-                {

-                    sendBindIQ();

-                }

-

-                if(nodeRecv.firstChildElement("session").

-                                     namespaceURI() == ns_session)

-                {

-                    m_sessionAvaliable = true;

-                }

-            }

-            else if(ns == ns_tls)

-            {

-                if(nodeRecv.tagName() == "proceed")

-                {

-                    log(QString("Starting encryption"));

-                    m_socket.startClientEncryption();

-                    return;

-                }

-            }

-            else if(ns == ns_sasl)

-            {

-                if(nodeRecv.tagName() == "success")

-                {

-                    log(QString("Authenticated"));

-                    sendStartStream();

-                }

-                else if(nodeRecv.tagName() == "challenge")

-                {

-                    sendAuthDigestMD5Response(nodeRecv.text());

-                }

-            }

-            else if(ns == ns_client)

-            {

-

-                if(nodeRecv.tagName() == "iq")

-                {

-                    QDomElement element = nodeRecv.firstChildElement();

-                    QString id = nodeRecv.attribute("id");

-                    QString to = nodeRecv.attribute("to");

-                    QString from = nodeRecv.attribute("from");

-                    QString type = nodeRecv.attribute("type");

-                    if(type.isEmpty())

-                        qWarning("QXmppStream: iq type can't be empty");

-                    QXmppIq iqPacket;    // to emit

-

-                    

-                    QDomElement elemen = nodeRecv.firstChildElement("error");

-                    QXmppStanza::Error error = parseStanzaError(elemen);

-

-

-                    if(id == m_sessionId)

-                    {

-                        // get back add configuration whether to send

-                        // roster and intial presence in beginning

-                        // process SessionIq

-

-                        // xmpp connection made

-                        emit xmppConnected();

-

-                        sendRosterRequest();

-                        sendInitialPresence();

-

-                        QXmppBind session(type);

-                        session.setId(id);

-                        session.setTo(to);

-                        session.setFrom(from);

-                        iqPacket = session;

-                    }

-                    else if(id == m_bindId)

-                    {

-                        QXmppBind bind(type);

-                        QString jid = nodeRecv.firstChildElement("bind").

-                                      firstChildElement("jid").text();

-                        bind.setResource(jidToResource(jid));

-                        bind.setJid(jidToBareJid(jid));

-                        bind.setId(id);

-                        bind.setTo(to);

-                        bind.setFrom(from);

-                        processBindIq(bind);

-                        iqPacket = bind;

-                    }

-                    else if(nodeRecv.firstChildElement("query").

-                            namespaceURI() == ns_roster)

-                    {

-                        QDomElement itemElement = nodeRecv.

-                                                  firstChildElement("query").

-                                                  firstChildElement("item");

-                        QXmppRosterIq rosterIq(nodeRecv.attribute("type"));

-                        rosterIq.setId(id);

-                        rosterIq.setTo(to);

-                        rosterIq.setFrom(from);

-                        while(!itemElement.isNull())

-                        {

-                            QXmppRosterIq::Item item;

-                            item.setName(itemElement.attribute("name"));

-                            item.setBareJid(itemElement.attribute("jid"));

-                            item.setSubscriptionTypeFromStr(

-                                    itemElement.attribute("subscription"));

-                            item.setSubscriptionStatus(

-                                    itemElement.attribute("ask"));

-                            item.addGroup(

-                                    itemElement.firstChildElement("group").firstChildElement().text());

-                            rosterIq.addItem(item);

-                            itemElement = itemElement.nextSiblingElement();

-                        }

-                        processRosterIq(rosterIq);

-                        iqPacket = rosterIq;

-                    }

-                    // extensions

-                    // vCard - XEP-0054

-                    // http://xmpp.org/extensions/xep-0054.html

-                    else if(nodeRecv.firstChildElement("vCard").

-                            namespaceURI() == ns_vcard)

-                    {

-                        QXmppVCard vcardIq;

-                        vcardIq.parse(nodeRecv);

-                        emit vCardIqReceived(vcardIq);

-                        iqPacket = vcardIq;

-                    }

-                    // XEP-0030 info query

-                    else if(nodeRecv.firstChildElement("query").

-                            namespaceURI() == ns_disco_info &&

-                            type == "get")

-                    {

-                        QXmppInformationRequestResult qxmppFeatures;

-                        qxmppFeatures.setId(id);

-                        qxmppFeatures.setTo(from);

-                        qxmppFeatures.setFrom(to);

-                        sendPacket(qxmppFeatures);

-                    }

-                    else if(id == m_nonSASLAuthId && type == "result")

-                    {

-                        // successful Non-SASL Authentication

-                        log(QString("Authenticated (Non-SASL)"));

-

-                        emit xmppConnected();

-

-                        sendRosterRequest();

-                        sendInitialPresence();

-                    }

-                    else if(nodeRecv.firstChildElement("query").

-                            namespaceURI() == ns_auth)

-                    {

-                        if(type == "result")

-                        {

-                            bool digest = !nodeRecv.firstChildElement("query").

-                                 firstChildElement("digest").isNull();

-                            bool plain = !nodeRecv.firstChildElement("query").

-                                 firstChildElement("password").isNull();

-                            bool plainText = false;

-

-                            if(plain && digest)

-                            {

-                                if(getConfiguration().getNonSASLAuthMechanism() ==

-                                   QXmppConfiguration::NonSASLDigest)

-                                    plainText = false;

-                                else

-                                    plainText = true;

-                            }

-                            else if(plain)

-                                plainText = true;

-                            else if(digest)

-                                plainText = false;

-                            else

-                            {

-                                //TODO Login error

-                                return;

-                            }

-                            sendNonSASLAuth(plainText);

-                        }

-                    }

-                    else // didn't understant the iq...reply with error

-                    {

-                        if(type != "result") // but not incase of result iqs

-                        {

-                            QXmppIq iq(QXmppIq::Error);

-                            iq.setId(id);

-                            iq.setTo(from);

-                            iq.setFrom(to);

-                            QXmppStanza::Error error(QXmppStanza::Error::Cancel,

-                                QXmppStanza::Error::FeatureNotImplemented);

-                            iq.setError(error);

-                            sendPacket(iq);

-                        }

-                    }

-

-                    iqPacket.setError(error);

-                    processIq(iqPacket);

-                }

-                else if(nodeRecv.tagName() == "presence")

-                {

-                    QXmppPresence presence;

-                    presence.setTypeFromStr(nodeRecv.attribute("type"));

-                    presence.setFrom(nodeRecv.attribute("from"));

-                    presence.setTo(nodeRecv.attribute("to"));

-                    

-                    QString statusText = nodeRecv.

-                                         firstChildElement("status").text();

-                    QString show = nodeRecv.

-                                   firstChildElement("show").text();

-                    int priority = nodeRecv.

-                                   firstChildElement("priority").text().toInt();

-                    QXmppPresence::Status status;

-                    status.setTypeFromStr(show);

-                    status.setStatusText(statusText);

-                    status.setPriority(priority);

-                    presence.setStatus(status);

-

-                    QDomElement errorElement = nodeRecv.

-                                               firstChildElement("error");

-                    if(!errorElement.isNull())

-                    {

-                        QXmppStanza::Error error =

-                                parseStanzaError(errorElement);

-                        presence.setError(error);

-                    }

-

-                    processPresence(presence);

-                }

-                else if(nodeRecv.tagName() == "message")

-                {

-                    QString from = nodeRecv.attribute("from");

-                    QString to = nodeRecv.attribute("to");

-                    QString type = nodeRecv.attribute("type");

-                    QString body = unescapeString(

-                            nodeRecv.firstChildElement("body").text());

-                    QString sub = unescapeString(

-                            nodeRecv.firstChildElement("subject").text());

-                    QString thread = nodeRecv.firstChildElement("thread").text();

-                    QXmppMessage message(from, to, body, thread);

-                    message.setSubject(sub);

-                    message.setTypeFromStr(type);

-

-                    QDomElement errorElement = nodeRecv.

-                                               firstChildElement("error");

-                    if(!errorElement.isNull())

-                    {

-                        QXmppStanza::Error error = parseStanzaError(errorElement);

-                        message.setError(error);

-                    }

-                    processMessage(message);

-                }

-            }

-            nodeRecv = nodeRecv.nextSiblingElement();

-        }

-    }

-    else

-    {

-        //wait for complete packet

-    }

-}

-

-

-void QXmppStream::sendStartStream()

-{

-    QByteArray data = "<?xml version='1.0'?><stream:stream to='";

-    data.append(getConfiguration().getDomain());

-    data.append("' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' version='1.0'>");

-    sendToServer(data);

-}

-

-void QXmppStream::sendToServer(const QByteArray& packet)

-{

-    log("CLIENT: " + packet);

-    m_socket.write( packet );

-}

-

-bool QXmppStream::hasStartStreamElement(const QByteArray& data)

-{

-    QString str(data);

-    QRegExp regex("(<\\?xml.*\\?>)?\\s*<stream:stream.*>");

-    regex.setMinimal(true);

-    if(str.contains(regex))

-        return true;

-    else

-        return false;

-}

-

-bool QXmppStream::hasEndStreamElement(const QByteArray& data)

-{

-    QString str(data);

-    QRegExp regex("</stream:stream>");

-    regex.setMinimal(true);

-    if(str.contains(regex))

-        return true;

-    else

-        return false;

-}

-

-void QXmppStream::sendStartTls()

-{

-    sendToServer("<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");

-}

-

-void QXmppStream::sendNonSASLAuth(bool plainText)

-{

-    QXmppNonSASLAuthIq authQuery;

-    authQuery.setUsername(getConfiguration().getUser());

-    authQuery.setPassword(getConfiguration().getPasswd());

-    authQuery.setResource(getConfiguration().getResource());

-    authQuery.setStreamId(m_streamId);

-    authQuery.setUsePlainText(plainText);

-    m_nonSASLAuthId = authQuery.getId();

-    sendPacket(authQuery);

-}

-

-void QXmppStream::sendAuthPlain()

-{

-    QByteArray data = "<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='PLAIN'>";

-    QString userPass('\0' + getConfiguration().getUser() +

-                     '\0' + getConfiguration().getPasswd());

-    data += userPass.toUtf8().toBase64();

-    data += "</auth>";

-    sendToServer(data);

-}

-

-void QXmppStream::sendAuthDigestMD5()

-{

-    QByteArray packet = "<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='DIGEST-MD5'/>";

-    sendToServer(packet);

-}

-

-// challenge is BASE64 encoded string

-void QXmppStream::sendAuthDigestMD5Response(const QString& challenge)

-{

-    QByteArray ba = QByteArray::fromBase64(challenge.toUtf8());

-

-    //log(ba);

-

-    ba.replace('"', QString(""));

-    QList<QByteArray> list = ba.split(',');

-

-    QMap<QByteArray, QByteArray> map;

-

-    QList<QByteArray> list2;

-    for(int i = 0; i < list.count(); ++i)

-    {

-        list2 = list.at(i).split('=');

-        if(list2.count() == 2)

-            map[list2.at(0).trimmed()] = list2.at(1).trimmed();

-        else

-            log(QString("Invalid challenge send"));

-    }

-

-    QByteArray user = getConfiguration().getUser().toUtf8();

-    QByteArray passwd = getConfiguration().getPasswd().toUtf8();

-    QByteArray domain = getConfiguration().getDomain().toUtf8();

-    QByteArray realm;

-    if(map.contains("realm"))

-        realm = map["realm"];

-

-    QByteArray response;

-

-    // First challenge

-    if(map.contains("nonce"))

-    {

-        QByteArray cnonce(32, 'm');

-        for(int n = 0; n < cnonce.size(); ++n)

-                cnonce[n] = (char)(256.0*qrand()/(RAND_MAX+1.0));

-

-        QByteArray nc = "00000001";

-        QByteArray digest_uri = "xmpp/" + domain;

-

-        QByteArray a1 = user + ':' + realm + ':' + passwd;

-        QByteArray ha1 = QCryptographicHash::hash(a1, QCryptographicHash::Md5);

-        ha1 += ':' + map["nonce"] + ':' + cnonce;

-

-        if(map.contains("authzid"))

-            ha1 += ':' + map["authzid"];

-

-        QByteArray A1(ha1);

-        QByteArray A2 = "AUTHENTICATE:" + digest_uri;

-        QByteArray HA1 = QCryptographicHash::hash(A1, QCryptographicHash::Md5).toHex();

-        QByteArray HA2 = QCryptographicHash::hash(A2, QCryptographicHash::Md5).toHex();

-        QByteArray KD = HA1 + ':' + map["nonce"] + ':' + nc + ':' + cnonce + ':'

-                        + "auth" + ':' + HA2;

-        QByteArray Z = QCryptographicHash::hash(KD, QCryptographicHash::Md5).toHex();

-

-        response += "username=\"" + user + "\",";

-

-        if(!realm.isEmpty())

-            response += "realm=\"" + realm + "\",";

-

-        response += "nonce=\"" + map["nonce"] + "\",";

-        response += "cnonce=\"" + cnonce + "\",";

-        response += "nc=" + nc + ",";

-        response += "qop=auth,";

-        response += "digest-uri=\"" + digest_uri + "\",";

-        response += "response=" + Z + ",";

-        if(map.contains("authzid"))

-            response += "authzid=\"" + map["authzid"] + "\",";

-        response += "charset=utf-8";

-

-        log(response);

-        QByteArray packet = "<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>"

-                            + response.toBase64() + "</response>";

-        sendToServer(packet);

-    }

-    else if(map.contains("rspauth"))

-    {

-        sendToServer("<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'/>");

-    }

-    else

-    {

-        disconnect();

-        log(QString("sendAuthDigestMD5Response: Invalid input"));

-    }

-}

-

-void QXmppStream::sendBindIQ()

-{

-    QXmppBind bind(QXmppIq::Set);

-    bind.setResource(getConfiguration().getResource());

-    m_bindId = bind.getId();

-    sendPacket(bind);

-}

-

-void QXmppStream::sendSessionIQ()

-{

-    QXmppSession session(QXmppIq::Set);

-    session.setTo(getConfiguration().getDomain());

-    m_sessionId = session.getId();

-    sendPacket(session);

-}

-

-void QXmppStream::sendInitialPresence()

-{

-    if(m_client)

-        sendPacket(m_client->getClientPresence());

-}

-

-void QXmppStream::acceptSubscriptionRequest(const QString& from, bool accept)

-{

-    QXmppPresence presence;

-    presence.setTo(from);

-    if(accept)

-        presence.setType(QXmppPresence::Subscribed);

-    else

-        presence.setType(QXmppPresence::Unsubscribed);

-

-    sendPacket(presence);

-}

-

-void QXmppStream::sendSubscriptionRequest(const QString& to)

-{

-    if(to.isEmpty())

-        return;

-

-    QXmppPresence presence;

-    presence.setTo(to);

-    presence.setType(QXmppPresence::Subscribe);

-    sendPacket(presence);

-}

-

-void QXmppStream::sendRosterRequest()

-{

-    QXmppRosterIq roster(QXmppIq::Get);

-    roster.setFrom(getConfiguration().getJid());

-    m_rosterReqId = roster.getId();

-    sendPacket(roster);

-}

-

-void QXmppStream::disconnect()

-{

-    sendEndStream();

-    m_socket.disconnectFromHost();

-}

-

-QXmppRoster& QXmppStream::getRoster()

-{

-    return m_roster;

-}

-

-void QXmppStream::sendPacket(const QXmppPacket& packet)

-{

-    if(QXmppLogger::getLogger()->getLoggingType() != QXmppLogger::NONE)

-    {

-        QByteArray logPacket;

-        QXmlStreamWriter xmlStreamLog(&logPacket);

-        packet.toXml(&xmlStreamLog);

-        log("CLIENT: "+ logPacket);

-    }

-

-    QXmlStreamWriter xmlStream(&m_socket);

-    packet.toXml(&xmlStream);

-}

-

-void QXmppStream::processPresence(const QXmppPresence& presence)

-{

-    switch(presence.getType())

-    {

-    case QXmppPresence::Error:

-        break;

-    case QXmppPresence::Available:

-        break;

-    case QXmppPresence::Unavailable:

-        break;

-    case QXmppPresence::Subscribe:

-        if(!presence.getFrom().isEmpty())

-        {

-            if(getConfiguration().getAutoAcceptSubscriptions())

-                acceptSubscriptionRequest(presence.getFrom());

-            emit subscriptionRequestReceived(presence.getFrom());

-        }

-        break;

-    case QXmppPresence::Unsubscribe:

-        break;

-    case QXmppPresence::Unsubscribed:

-        break;

-    case QXmppPresence::Probe:

-        break;

-    default:

-        break;

-    }

-    emit presenceReceived(presence);

-}

-

-void QXmppStream::processMessage(const QXmppMessage& message)

-{

-    emit messageReceived(message);

-}

-

-void QXmppStream::processIq(const QXmppIq& iq)

-{

-    emit iqReceived(iq);

-}

-

-void QXmppStream::sendEndStream()

-{

-    sendToServer(streamRootElementEnd);

-}

-

-void QXmppStream::processBindIq(const QXmppBind& bind)

-{

-    switch(bind.getType())

-    {

-    case QXmppIq::Result:

-        if(!bind.getResource().isEmpty())

-            getConfiguration().setResource(bind.getResource());

-        if(m_sessionAvaliable)

-            sendSessionIQ();

-        break;

-    default:

-        break;

-    }

-}

-

-void QXmppStream::processRosterIq(const QXmppRosterIq& rosterIq)

-{

-    emit rosterIqReceived(rosterIq);

-    switch(rosterIq.getType())

-    {

-    case QXmppIq::Set:

-        // when contact subscribes user...user sends 'subscribed' presence 

-        // then after recieving following iq user requests contact for subscription

-        

-        // check thet "from" is newly added in the roster...and remove this ask thing...and do this for all items

-        if(rosterIq.getItems().at(0).getSubscriptionType() ==

-           QXmppRosterIq::Item::From && rosterIq.getItems().at(0).

-           getSubscriptionStatus().isEmpty())

-            sendSubscriptionRequest(rosterIq.getItems().at(0).getBareJid());

-        break;

-    default:

-        break;

-    }

-}

-

-QXmppStanza::Error QXmppStream::parseStanzaError(QDomElement & errorElement)

-{

-    QXmppStanza::Error error;

- 

-    if(errorElement.isNull())

-        return error;

-

-    QString type = errorElement.attribute("type");

-    QString text;

-    QString cond;

-    QDomElement element = errorElement.firstChildElement();

-    while(!element.isNull())

-    {

-        if(element.tagName() == "text")

-            text = element.text();

-        else if(element.namespaceURI() == ns_stanza)

-        {

-            cond = element.tagName();

-        }        

-        element = element.nextSiblingElement();

-    }

-

-    error.setConditionFromStr(cond);

-    error.setTypeFromStr(type);

-    error.setText(text);

-    return error;

-}

-

-QAbstractSocket::SocketError QXmppStream::getSocketError()

-{

-    return m_socketError;

-}

-

-QXmppVCardManager& QXmppStream::getVCardManager()

-{

-    return m_vCardManager;

-}

-

-void QXmppStream::flushDataBuffer()

-{

-    m_dataBuffer.clear();

-}

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#include "QXmppStream.h"
+#include "QXmppPacket.h"
+#include "QXmppUtils.h"
+#include "QXmppClient.h"
+#include "QXmppRoster.h"
+#include "QXmppPresence.h"
+#include "QXmppIq.h"
+#include "QXmppBind.h"
+#include "QXmppSession.h"
+#include "QXmppRosterIq.h"
+#include "QXmppMessage.h"
+#include "QXmppConstants.h"
+#include "QXmppVCard.h"
+#include "QXmppNonSASLAuth.h"
+#include "QXmppInformationRequestResult.h"
+#include "QXmppLogger.h"
+
+#include <QDomDocument>
+#include <QStringList>
+#include <QRegExp>
+#include <QHostAddress>
+#include <QXmlStreamWriter>
+
+static const QByteArray streamRootElementStart = "<?xml version=\"1.0\"?><stream:stream xmlns:stream=\"http://etherx.jabber.org/streams\" version=\"1.0\" xmlns=\"jabber:client\" xml:lang=\"en\" xmlns:xml=\"http://www.w3.org/XML/1998/namespace\">\n";
+static const QByteArray streamRootElementEnd = "</stream:stream>";
+
+QXmppStream::QXmppStream(QXmppClient* client)
+    : QObject(client), m_client(client), m_roster(this),
+    m_sessionAvaliable(false), m_vCardManager(m_client)
+{
+    bool check = QObject::connect(&m_socket, SIGNAL(hostFound()),
+                                  this, SLOT(socketHostFound()));
+    Q_ASSERT(check);
+    check = QObject::connect(&m_socket, SIGNAL(connected()),
+                             this, SLOT(socketConnected()));
+    Q_ASSERT(check);
+    check = QObject::connect(&m_socket, SIGNAL(disconnected()),
+                             this, SLOT(socketDisconnected()));
+    Q_ASSERT(check);
+    check = QObject::connect(&m_socket, SIGNAL(readyRead()),
+                             this, SLOT(socketReadReady()));
+    Q_ASSERT(check);
+    check = QObject::connect(&m_socket, SIGNAL(encrypted()),
+                             this, SLOT(socketEncrypted()));
+    Q_ASSERT(check);
+    check = QObject::connect(&m_socket,
+                             SIGNAL(sslErrors(const QList<QSslError>&)), this,
+                             SLOT(socketSslErrors(const QList<QSslError>&)));
+    Q_ASSERT(check);
+    check = QObject::connect(&m_socket,
+                             SIGNAL(error(QAbstractSocket::SocketError)), this,
+                             SLOT(socketError(QAbstractSocket::SocketError)));
+    Q_ASSERT(check);
+
+    check = QObject::connect(this,
+                            SIGNAL(presenceReceived(const QXmppPresence&)),
+                            &m_roster,
+                            SLOT(presenceReceived(const QXmppPresence&)));
+    Q_ASSERT(check);
+    
+    check = QObject::connect(this, SIGNAL(rosterIqReceived(const QXmppRosterIq&)), 
+        &m_roster, SLOT(rosterIqReceived(const QXmppRosterIq&)));
+    Q_ASSERT(check);
+
+    check = QObject::connect(this, SIGNAL(vCardIqReceived(const QXmppVCard&)),
+        &m_vCardManager, SLOT(vCardIqReceived(const QXmppVCard&)));
+    Q_ASSERT(check);
+}
+
+QXmppStream::~QXmppStream()
+{
+
+}
+
+QXmppConfiguration& QXmppStream::getConfiguration()
+{
+    return m_client->getConfiguration();
+}
+
+void QXmppStream::connect()
+{
+    log(QString("Connecting to: %1:%2").arg(getConfiguration().
+            getHost()).arg(getConfiguration().getPort()));
+
+    m_socket.setProxy(getConfiguration().getNetworkProxy());
+    m_socket.connectToHost(getConfiguration().
+                           getHost(), getConfiguration().getPort());
+}
+
+void QXmppStream::socketSslErrors(const QList<QSslError> & error)
+{
+    log(QString("SSL errors"));
+    m_socket.ignoreSslErrors();
+    for(int i = 0; i< error.count(); ++i)
+        log(error.at(i).errorString());
+}
+
+void QXmppStream::socketHostFound()
+{
+    log(QString("Host found"));
+    emit hostFound();
+}
+
+void QXmppStream::socketConnected()
+{
+    flushDataBuffer();
+    log(QString("Connected"));
+    emit connected();
+    sendStartStream();
+}
+
+void QXmppStream::socketDisconnected()
+{
+    flushDataBuffer();
+    log(QString("Disconnected"));
+    emit disconnected();
+}
+
+void QXmppStream::socketEncrypted()
+{
+    log(QString("Encrypted"));
+    sendStartStream();
+}
+
+void QXmppStream::socketError(QAbstractSocket::SocketError ee)
+{
+    m_socketError = ee;
+    emit error(QXmppClient::SocketError);
+    log(QString("Socket error: " + m_socket.errorString()));
+}
+
+void QXmppStream::socketReadReady()
+{
+    QByteArray data = m_socket.readAll();
+    log("SERVER [COULD BE PARTIAL DATA]:" + data.left(20));
+    parser(data);
+}
+
+void QXmppStream::sendNonSASLAuthQuery( const QString &to )
+{
+    QXmppNonSASLAuthTypesRequestIq authQuery;
+    authQuery.setTo(to);
+    authQuery.setUsername(getConfiguration().getUser());
+
+    sendPacket(authQuery);
+}
+
+void QXmppStream::parser(const QByteArray& data)
+{
+    QDomDocument doc;
+    QByteArray completeXml;
+
+    m_dataBuffer = m_dataBuffer + data;
+
+    if(hasStartStreamElement(m_dataBuffer))
+    {
+        completeXml = m_dataBuffer + streamRootElementEnd;
+    }
+    else if(hasEndStreamElement(data))
+    {
+        completeXml = streamRootElementStart + m_dataBuffer;
+    }
+    else
+    {
+        completeXml = streamRootElementStart + m_dataBuffer + streamRootElementEnd;
+    }
+    
+    if(doc.setContent(completeXml, true))
+    {
+        log("SERVER:" + m_dataBuffer);
+        flushDataBuffer();
+
+        QDomElement nodeRecv = doc.documentElement().firstChildElement();
+
+        if(nodeRecv.isNull())
+        {
+            QDomElement streamElement = doc.documentElement();
+            if(m_streamId.isEmpty())
+                m_streamId = streamElement.attribute("id");
+            if(m_XMPPVersion.isEmpty())
+            {
+                m_XMPPVersion = streamElement.attribute("version");
+                if(m_XMPPVersion.isEmpty())
+                {
+                    // no version specified, signals XMPP Version < 1.0.
+                    // switch to old auth mechanism
+                    sendNonSASLAuthQuery(doc.documentElement().attribute("from"));
+                }
+            }
+        }
+        else
+        {
+            //TODO: Make a login error here.
+        }
+
+        while(!nodeRecv.isNull())
+        {
+            QString ns = nodeRecv.namespaceURI();
+            if(ns == ns_stream && nodeRecv.tagName() == "features")
+            {
+                bool nonSaslAvailable = nodeRecv.firstChildElement("auth").
+                                         namespaceURI() == ns_authFeature;
+                bool saslAvailable = nodeRecv.firstChildElement("mechanisms").
+                                     namespaceURI() == ns_sasl;
+                bool useSasl = getConfiguration().getUseSASLAuthentication();
+
+                if(nodeRecv.firstChildElement("starttls").namespaceURI()
+                    == ns_tls && !m_socket.isEncrypted())
+                {
+                    if(nodeRecv.firstChildElement("starttls").
+                                     firstChildElement().tagName() == "required")
+                    {
+                        // TLS is must from the server side
+                        sendStartTls();
+                        return;
+                    }
+                    else
+                    {
+                        // TLS is optional from the server side
+                        switch(getConfiguration().getStreamSecurityMode())
+                        {
+                        case QXmppConfiguration::TLSEnabled:
+                        case QXmppConfiguration::TLSRequired:
+                            sendStartTls();
+                            return;
+                        case QXmppConfiguration::TLSDisabled:
+                            break;
+                        }
+                    }
+                }
+                else if(!m_socket.isEncrypted())    // TLS not supported by server
+                {
+                    if(getConfiguration().getStreamSecurityMode() ==
+                       QXmppConfiguration::TLSRequired)
+                    {
+                        // disconnect as the for client TLS is compulsory but
+                        // not available on the server
+                        //
+                        log(QString("Disconnecting as TLS not available at the server"));
+                        disconnect();
+                        return;
+                    }
+                }
+
+                if((saslAvailable && nonSaslAvailable && !useSasl) ||
+                   (!saslAvailable && nonSaslAvailable))
+                {
+                    sendNonSASLAuthQuery(doc.documentElement().attribute("from"));
+                }
+                else if(saslAvailable)
+                {
+                    // SASL Authentication
+                    QDomElement element = nodeRecv.firstChildElement("mechanisms");
+                    log(QString("Mechanisms:"));
+                    QDomElement subElement = element.firstChildElement();
+                    QStringList mechanisms;
+                    while(!subElement.isNull())
+                    {
+                        if(subElement.tagName() == "mechanism")
+                        {
+                            log(subElement.text());
+                            mechanisms << subElement.text();
+                        }
+                        subElement = subElement.nextSiblingElement();
+                    }
+
+                    switch(getConfiguration().getSASLAuthMechanism())
+                    {
+                    case QXmppConfiguration::SASLPlain:
+                        if(mechanisms.contains("PLAIN"))
+                        {
+                            sendAuthPlain();
+                            break;
+                        }
+                    case QXmppConfiguration::SASLDigestMD5:
+                        if(mechanisms.contains("DIGEST-MD5"))
+                        {
+                            sendAuthDigestMD5();
+                            break;
+                        }
+                    default:
+                        log(QString("Desired SASL Auth mechanism not available trying the available ones"));
+                        if(mechanisms.contains("DIGEST-MD5"))
+                            sendAuthDigestMD5();
+                        else if(mechanisms.contains("PLAIN"))
+                            sendAuthPlain();
+                        else
+                        {
+                            log(QString("SASL Auth mechanism not available"));
+                            disconnect();
+                            return;
+                        }
+                        break;
+                    }
+                }
+
+                if(nodeRecv.firstChildElement("bind").
+                                     namespaceURI() == ns_bind)
+                {
+                    sendBindIQ();
+                }
+
+                if(nodeRecv.firstChildElement("session").
+                                     namespaceURI() == ns_session)
+                {
+                    m_sessionAvaliable = true;
+                }
+            }
+            else if(ns == ns_tls)
+            {
+                if(nodeRecv.tagName() == "proceed")
+                {
+                    log(QString("Starting encryption"));
+                    m_socket.startClientEncryption();
+                    return;
+                }
+            }
+            else if(ns == ns_sasl)
+            {
+                if(nodeRecv.tagName() == "success")
+                {
+                    log(QString("Authenticated"));
+                    sendStartStream();
+                }
+                else if(nodeRecv.tagName() == "challenge")
+                {
+                    sendAuthDigestMD5Response(nodeRecv.text());
+                }
+            }
+            else if(ns == ns_client)
+            {
+
+                if(nodeRecv.tagName() == "iq")
+                {
+                    QDomElement element = nodeRecv.firstChildElement();
+                    QString id = nodeRecv.attribute("id");
+                    QString to = nodeRecv.attribute("to");
+                    QString from = nodeRecv.attribute("from");
+                    QString type = nodeRecv.attribute("type");
+                    if(type.isEmpty())
+                        qWarning("QXmppStream: iq type can't be empty");
+                    QXmppIq iqPacket;    // to emit
+
+                    
+                    QDomElement elemen = nodeRecv.firstChildElement("error");
+                    QXmppStanza::Error error = parseStanzaError(elemen);
+
+
+                    if(id == m_sessionId)
+                    {
+                        // get back add configuration whether to send
+                        // roster and intial presence in beginning
+                        // process SessionIq
+
+                        // xmpp connection made
+                        emit xmppConnected();
+
+                        sendRosterRequest();
+                        sendInitialPresence();
+
+                        QXmppBind session(type);
+                        session.setId(id);
+                        session.setTo(to);
+                        session.setFrom(from);
+                        iqPacket = session;
+                    }
+                    else if(id == m_bindId)
+                    {
+                        QXmppBind bind(type);
+                        QString jid = nodeRecv.firstChildElement("bind").
+                                      firstChildElement("jid").text();
+                        bind.setResource(jidToResource(jid));
+                        bind.setJid(jidToBareJid(jid));
+                        bind.setId(id);
+                        bind.setTo(to);
+                        bind.setFrom(from);
+                        processBindIq(bind);
+                        iqPacket = bind;
+                    }
+                    else if(nodeRecv.firstChildElement("query").
+                            namespaceURI() == ns_roster)
+                    {
+                        QDomElement itemElement = nodeRecv.
+                                                  firstChildElement("query").
+                                                  firstChildElement("item");
+                        QXmppRosterIq rosterIq(nodeRecv.attribute("type"));
+                        rosterIq.setId(id);
+                        rosterIq.setTo(to);
+                        rosterIq.setFrom(from);
+                        while(!itemElement.isNull())
+                        {
+                            QXmppRosterIq::Item item;
+                            item.setName(itemElement.attribute("name"));
+                            item.setBareJid(itemElement.attribute("jid"));
+                            item.setSubscriptionTypeFromStr(
+                                    itemElement.attribute("subscription"));
+                            item.setSubscriptionStatus(
+                                    itemElement.attribute("ask"));
+                            item.addGroup(
+                                    itemElement.firstChildElement("group").firstChildElement().text());
+                            rosterIq.addItem(item);
+                            itemElement = itemElement.nextSiblingElement();
+                        }
+                        processRosterIq(rosterIq);
+                        iqPacket = rosterIq;
+                    }
+                    // extensions
+                    // vCard - XEP-0054
+                    // http://xmpp.org/extensions/xep-0054.html
+                    else if(nodeRecv.firstChildElement("vCard").
+                            namespaceURI() == ns_vcard)
+                    {
+                        QXmppVCard vcardIq;
+                        vcardIq.parse(nodeRecv);
+                        emit vCardIqReceived(vcardIq);
+                        iqPacket = vcardIq;
+                    }
+                    // XEP-0030 info query
+                    else if(nodeRecv.firstChildElement("query").
+                            namespaceURI() == ns_disco_info &&
+                            type == "get")
+                    {
+                        QXmppInformationRequestResult qxmppFeatures;
+                        qxmppFeatures.setId(id);
+                        qxmppFeatures.setTo(from);
+                        qxmppFeatures.setFrom(to);
+                        sendPacket(qxmppFeatures);
+                    }
+                    else if(id == m_nonSASLAuthId && type == "result")
+                    {
+                        // successful Non-SASL Authentication
+                        log(QString("Authenticated (Non-SASL)"));
+
+                        emit xmppConnected();
+
+                        sendRosterRequest();
+                        sendInitialPresence();
+                    }
+                    else if(nodeRecv.firstChildElement("query").
+                            namespaceURI() == ns_auth)
+                    {
+                        if(type == "result")
+                        {
+                            bool digest = !nodeRecv.firstChildElement("query").
+                                 firstChildElement("digest").isNull();
+                            bool plain = !nodeRecv.firstChildElement("query").
+                                 firstChildElement("password").isNull();
+                            bool plainText = false;
+
+                            if(plain && digest)
+                            {
+                                if(getConfiguration().getNonSASLAuthMechanism() ==
+                                   QXmppConfiguration::NonSASLDigest)
+                                    plainText = false;
+                                else
+                                    plainText = true;
+                            }
+                            else if(plain)
+                                plainText = true;
+                            else if(digest)
+                                plainText = false;
+                            else
+                            {
+                                //TODO Login error
+                                return;
+                            }
+                            sendNonSASLAuth(plainText);
+                        }
+                    }
+                    else // didn't understant the iq...reply with error
+                    {
+                        if(type != "result") // but not incase of result iqs
+                        {
+                            QXmppIq iq(QXmppIq::Error);
+                            iq.setId(id);
+                            iq.setTo(from);
+                            iq.setFrom(to);
+                            QXmppStanza::Error error(QXmppStanza::Error::Cancel,
+                                QXmppStanza::Error::FeatureNotImplemented);
+                            iq.setError(error);
+                            sendPacket(iq);
+                        }
+                    }
+
+                    iqPacket.setError(error);
+                    processIq(iqPacket);
+                }
+                else if(nodeRecv.tagName() == "presence")
+                {
+                    QXmppPresence presence;
+                    presence.setTypeFromStr(nodeRecv.attribute("type"));
+                    presence.setFrom(nodeRecv.attribute("from"));
+                    presence.setTo(nodeRecv.attribute("to"));
+                    
+                    QString statusText = nodeRecv.
+                                         firstChildElement("status").text();
+                    QString show = nodeRecv.
+                                   firstChildElement("show").text();
+                    int priority = nodeRecv.
+                                   firstChildElement("priority").text().toInt();
+                    QXmppPresence::Status status;
+                    status.setTypeFromStr(show);
+                    status.setStatusText(statusText);
+                    status.setPriority(priority);
+                    presence.setStatus(status);
+
+                    QDomElement errorElement = nodeRecv.
+                                               firstChildElement("error");
+                    if(!errorElement.isNull())
+                    {
+                        QXmppStanza::Error error =
+                                parseStanzaError(errorElement);
+                        presence.setError(error);
+                    }
+
+                    processPresence(presence);
+                }
+                else if(nodeRecv.tagName() == "message")
+                {
+                    QString from = nodeRecv.attribute("from");
+                    QString to = nodeRecv.attribute("to");
+                    QString type = nodeRecv.attribute("type");
+                    QString body = unescapeString(
+                            nodeRecv.firstChildElement("body").text());
+                    QString sub = unescapeString(
+                            nodeRecv.firstChildElement("subject").text());
+                    QString thread = nodeRecv.firstChildElement("thread").text();
+                    QXmppMessage message(from, to, body, thread);
+                    message.setSubject(sub);
+                    message.setTypeFromStr(type);
+
+                    QDomElement errorElement = nodeRecv.
+                                               firstChildElement("error");
+                    if(!errorElement.isNull())
+                    {
+                        QXmppStanza::Error error = parseStanzaError(errorElement);
+                        message.setError(error);
+                    }
+                    processMessage(message);
+                }
+            }
+            nodeRecv = nodeRecv.nextSiblingElement();
+        }
+    }
+    else
+    {
+        //wait for complete packet
+    }
+}
+
+
+void QXmppStream::sendStartStream()
+{
+    QByteArray data = "<?xml version='1.0'?><stream:stream to='";
+    data.append(getConfiguration().getDomain());
+    data.append("' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' version='1.0'>");
+    sendToServer(data);
+}
+
+void QXmppStream::sendToServer(const QByteArray& packet)
+{
+    log("CLIENT: " + packet);
+    m_socket.write( packet );
+}
+
+bool QXmppStream::hasStartStreamElement(const QByteArray& data)
+{
+    QString str(data);
+    QRegExp regex("(<\\?xml.*\\?>)?\\s*<stream:stream.*>");
+    regex.setMinimal(true);
+    if(str.contains(regex))
+        return true;
+    else
+        return false;
+}
+
+bool QXmppStream::hasEndStreamElement(const QByteArray& data)
+{
+    QString str(data);
+    QRegExp regex("</stream:stream>");
+    regex.setMinimal(true);
+    if(str.contains(regex))
+        return true;
+    else
+        return false;
+}
+
+void QXmppStream::sendStartTls()
+{
+    sendToServer("<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
+}
+
+void QXmppStream::sendNonSASLAuth(bool plainText)
+{
+    QXmppNonSASLAuthIq authQuery;
+    authQuery.setUsername(getConfiguration().getUser());
+    authQuery.setPassword(getConfiguration().getPasswd());
+    authQuery.setResource(getConfiguration().getResource());
+    authQuery.setStreamId(m_streamId);
+    authQuery.setUsePlainText(plainText);
+    m_nonSASLAuthId = authQuery.getId();
+    sendPacket(authQuery);
+}
+
+void QXmppStream::sendAuthPlain()
+{
+    QByteArray data = "<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='PLAIN'>";
+    QString userPass('\0' + getConfiguration().getUser() +
+                     '\0' + getConfiguration().getPasswd());
+    data += userPass.toUtf8().toBase64();
+    data += "</auth>";
+    sendToServer(data);
+}
+
+void QXmppStream::sendAuthDigestMD5()
+{
+    QByteArray packet = "<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='DIGEST-MD5'/>";
+    sendToServer(packet);
+}
+
+// challenge is BASE64 encoded string
+void QXmppStream::sendAuthDigestMD5Response(const QString& challenge)
+{
+    QByteArray ba = QByteArray::fromBase64(challenge.toUtf8());
+
+    //log(ba);
+
+    ba.replace('"', QString(""));
+    QList<QByteArray> list = ba.split(',');
+
+    QMap<QByteArray, QByteArray> map;
+
+    QList<QByteArray> list2;
+    for(int i = 0; i < list.count(); ++i)
+    {
+        list2 = list.at(i).split('=');
+        if(list2.count() == 2)
+            map[list2.at(0).trimmed()] = list2.at(1).trimmed();
+        else
+            log(QString("Invalid challenge send"));
+    }
+
+    QByteArray user = getConfiguration().getUser().toUtf8();
+    QByteArray passwd = getConfiguration().getPasswd().toUtf8();
+    QByteArray domain = getConfiguration().getDomain().toUtf8();
+    QByteArray realm;
+    if(map.contains("realm"))
+        realm = map["realm"];
+
+    QByteArray response;
+
+    // First challenge
+    if(map.contains("nonce"))
+    {
+        QByteArray cnonce(32, 'm');
+        for(int n = 0; n < cnonce.size(); ++n)
+                cnonce[n] = (char)(256.0*qrand()/(RAND_MAX+1.0));
+
+        QByteArray nc = "00000001";
+        QByteArray digest_uri = "xmpp/" + domain;
+
+        QByteArray a1 = user + ':' + realm + ':' + passwd;
+        QByteArray ha1 = QCryptographicHash::hash(a1, QCryptographicHash::Md5);
+        ha1 += ':' + map["nonce"] + ':' + cnonce;
+
+        if(map.contains("authzid"))
+            ha1 += ':' + map["authzid"];
+
+        QByteArray A1(ha1);
+        QByteArray A2 = "AUTHENTICATE:" + digest_uri;
+        QByteArray HA1 = QCryptographicHash::hash(A1, QCryptographicHash::Md5).toHex();
+        QByteArray HA2 = QCryptographicHash::hash(A2, QCryptographicHash::Md5).toHex();
+        QByteArray KD = HA1 + ':' + map["nonce"] + ':' + nc + ':' + cnonce + ':'
+                        + "auth" + ':' + HA2;
+        QByteArray Z = QCryptographicHash::hash(KD, QCryptographicHash::Md5).toHex();
+
+        response += "username=\"" + user + "\",";
+
+        if(!realm.isEmpty())
+            response += "realm=\"" + realm + "\",";
+
+        response += "nonce=\"" + map["nonce"] + "\",";
+        response += "cnonce=\"" + cnonce + "\",";
+        response += "nc=" + nc + ",";
+        response += "qop=auth,";
+        response += "digest-uri=\"" + digest_uri + "\",";
+        response += "response=" + Z + ",";
+        if(map.contains("authzid"))
+            response += "authzid=\"" + map["authzid"] + "\",";
+        response += "charset=utf-8";
+
+        log(response);
+        QByteArray packet = "<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>"
+                            + response.toBase64() + "</response>";
+        sendToServer(packet);
+    }
+    else if(map.contains("rspauth"))
+    {
+        sendToServer("<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'/>");
+    }
+    else
+    {
+        disconnect();
+        log(QString("sendAuthDigestMD5Response: Invalid input"));
+    }
+}
+
+void QXmppStream::sendBindIQ()
+{
+    QXmppBind bind(QXmppIq::Set);
+    bind.setResource(getConfiguration().getResource());
+    m_bindId = bind.getId();
+    sendPacket(bind);
+}
+
+void QXmppStream::sendSessionIQ()
+{
+    QXmppSession session(QXmppIq::Set);
+    session.setTo(getConfiguration().getDomain());
+    m_sessionId = session.getId();
+    sendPacket(session);
+}
+
+void QXmppStream::sendInitialPresence()
+{
+    if(m_client)
+        sendPacket(m_client->getClientPresence());
+}
+
+void QXmppStream::acceptSubscriptionRequest(const QString& from, bool accept)
+{
+    QXmppPresence presence;
+    presence.setTo(from);
+    if(accept)
+        presence.setType(QXmppPresence::Subscribed);
+    else
+        presence.setType(QXmppPresence::Unsubscribed);
+
+    sendPacket(presence);
+}
+
+void QXmppStream::sendSubscriptionRequest(const QString& to)
+{
+    if(to.isEmpty())
+        return;
+
+    QXmppPresence presence;
+    presence.setTo(to);
+    presence.setType(QXmppPresence::Subscribe);
+    sendPacket(presence);
+}
+
+void QXmppStream::sendRosterRequest()
+{
+    QXmppRosterIq roster(QXmppIq::Get);
+    roster.setFrom(getConfiguration().getJid());
+    m_rosterReqId = roster.getId();
+    sendPacket(roster);
+}
+
+void QXmppStream::disconnect()
+{
+    sendEndStream();
+    m_socket.disconnectFromHost();
+}
+
+QXmppRoster& QXmppStream::getRoster()
+{
+    return m_roster;
+}
+
+void QXmppStream::sendPacket(const QXmppPacket& packet)
+{
+    if(QXmppLogger::getLogger()->getLoggingType() != QXmppLogger::NONE)
+    {
+        QByteArray logPacket;
+        QXmlStreamWriter xmlStreamLog(&logPacket);
+        packet.toXml(&xmlStreamLog);
+        log("CLIENT: "+ logPacket);
+    }
+
+    QXmlStreamWriter xmlStream(&m_socket);
+    packet.toXml(&xmlStream);
+}
+
+void QXmppStream::processPresence(const QXmppPresence& presence)
+{
+    switch(presence.getType())
+    {
+    case QXmppPresence::Error:
+        break;
+    case QXmppPresence::Available:
+        break;
+    case QXmppPresence::Unavailable:
+        break;
+    case QXmppPresence::Subscribe:
+        if(!presence.getFrom().isEmpty())
+        {
+            if(getConfiguration().getAutoAcceptSubscriptions())
+                acceptSubscriptionRequest(presence.getFrom());
+            emit subscriptionRequestReceived(presence.getFrom());
+        }
+        break;
+    case QXmppPresence::Unsubscribe:
+        break;
+    case QXmppPresence::Unsubscribed:
+        break;
+    case QXmppPresence::Probe:
+        break;
+    default:
+        break;
+    }
+    emit presenceReceived(presence);
+}
+
+void QXmppStream::processMessage(const QXmppMessage& message)
+{
+    emit messageReceived(message);
+}
+
+void QXmppStream::processIq(const QXmppIq& iq)
+{
+    emit iqReceived(iq);
+}
+
+void QXmppStream::sendEndStream()
+{
+    sendToServer(streamRootElementEnd);
+}
+
+void QXmppStream::processBindIq(const QXmppBind& bind)
+{
+    switch(bind.getType())
+    {
+    case QXmppIq::Result:
+        if(!bind.getResource().isEmpty())
+            getConfiguration().setResource(bind.getResource());
+        if(m_sessionAvaliable)
+            sendSessionIQ();
+        break;
+    default:
+        break;
+    }
+}
+
+void QXmppStream::processRosterIq(const QXmppRosterIq& rosterIq)
+{
+    emit rosterIqReceived(rosterIq);
+    switch(rosterIq.getType())
+    {
+    case QXmppIq::Set:
+        // when contact subscribes user...user sends 'subscribed' presence 
+        // then after recieving following iq user requests contact for subscription
+        
+        // check thet "from" is newly added in the roster...and remove this ask thing...and do this for all items
+        if(rosterIq.getItems().at(0).getSubscriptionType() ==
+           QXmppRosterIq::Item::From && rosterIq.getItems().at(0).
+           getSubscriptionStatus().isEmpty())
+            sendSubscriptionRequest(rosterIq.getItems().at(0).getBareJid());
+        break;
+    default:
+        break;
+    }
+}
+
+QXmppStanza::Error QXmppStream::parseStanzaError(QDomElement & errorElement)
+{
+    QXmppStanza::Error error;
+ 
+    if(errorElement.isNull())
+        return error;
+
+    QString type = errorElement.attribute("type");
+    QString text;
+    QString cond;
+    QDomElement element = errorElement.firstChildElement();
+    while(!element.isNull())
+    {
+        if(element.tagName() == "text")
+            text = element.text();
+        else if(element.namespaceURI() == ns_stanza)
+        {
+            cond = element.tagName();
+        }        
+        element = element.nextSiblingElement();
+    }
+
+    error.setConditionFromStr(cond);
+    error.setTypeFromStr(type);
+    error.setText(text);
+    return error;
+}
+
+QAbstractSocket::SocketError QXmppStream::getSocketError()
+{
+    return m_socketError;
+}
+
+QXmppVCardManager& QXmppStream::getVCardManager()
+{
+    return m_vCardManager;
+}
+
+void QXmppStream::flushDataBuffer()
+{
+    m_dataBuffer.clear();
+}
diff --git a/source/QXmppStream.h b/source/QXmppStream.h
index b85f1204..05d18f80 100644
--- a/source/QXmppStream.h
+++ b/source/QXmppStream.h
@@ -1,141 +1,141 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#ifndef QXMPPSTREAM_H

-#define QXMPPSTREAM_H

-

-#include <QObject>

-#include <QSslSocket>

-#include "QXmppConfiguration.h"

-#include "QXmppRoster.h"

-#include "QXmppStanza.h"

-#include "QXmppVCardManager.h"

-

-class QDomElement;

-

-class QXmppRoster;

-class QXmppClient;

-class QXmppPacket;

-class QXmppPresence;

-class QXmppIq;

-class QXmppBind;

-class QXmppRosterIq;

-class QXmppVCard;

-class QXmppMessage;

-

-class QXmppStream : public QObject

-{

-    Q_OBJECT

-

-public:

-    QXmppStream(QXmppClient* client);

-    ~QXmppStream();

-    void connect();

-    void acceptSubscriptionRequest(const QString& from, bool accept = true);

-    void sendSubscriptionRequest(const QString& to);

-    void disconnect();

-    QXmppRoster& getRoster();

-    QXmppVCardManager& getVCardManager();

-    void sendPacket(const QXmppPacket&);

-

-    QAbstractSocket::SocketError getSocketError();

-

-signals:

-    // socket host found

-    void hostFound();

-

-    // socket connected

-    void connected();

-

-    // socket disconnected

-    void disconnected();

-

-    // xmpp connected

-    void xmppConnected();

-

-    void error(QXmppClient::Error);

-    void subscriptionRequestReceived(const QString& from);

-    void presenceReceived(const QXmppPresence&);

-    void messageReceived(const QXmppMessage&);

-    void iqReceived(const QXmppIq&);

-    void rosterIqReceived(const QXmppRosterIq&);

-    void vCardIqReceived(const QXmppVCard&);

-

-private slots:

-    void socketHostFound();

-    void socketReadReady();

-    void socketEncrypted();

-    void socketConnected();

-    void socketDisconnected();

-    void socketError(QAbstractSocket::SocketError);

-    void socketSslErrors(const QList<QSslError>&);

-

-private:

-    QXmppClient* m_client; // reverse pointer

-    QXmppRoster m_roster;

-    QString m_sessionId;

-    QString m_bindId;

-    QString m_rosterReqId;

-    QByteArray m_dataBuffer;

-    QSslSocket m_socket;

-    bool m_sessionAvaliable;

-    QAbstractSocket::SocketError m_socketError;

-    QString m_streamId;

-    QString m_nonSASLAuthId;

-    QString m_XMPPVersion;

-//    m_xmppStreamError;

-//    m_xmppStanzaError;

-

-

-    QXmppVCardManager m_vCardManager;

-

-    QXmppConfiguration& getConfiguration();

-    void parser(const QByteArray&);

-    void sendStartStream();

-    void sendEndStream();

-    void sendStartTls();

-    void sendNonSASLAuth(bool);

-    void sendNonSASLAuthQuery( const QString &to );

-    void sendAuthPlain();

-    void sendAuthDigestMD5();

-    void sendAuthDigestMD5Response(const QString& challenge);

-    void sendBindIQ();

-    void sendSessionIQ();

-    void sendInitialPresence();

-    void sendRosterRequest();

-    void sendToServer(const QByteArray&);

-    bool hasStartStreamElement(const QByteArray&);

-    bool hasEndStreamElement(const QByteArray&);

-    QXmppStanza::Error parseStanzaError(QDomElement & errorElement);

-

-    void processPresence(const QXmppPresence&);

-    void processMessage(const QXmppMessage&);

-    void processIq(const QXmppIq&);

-    void processBindIq(const QXmppBind&);

-    void processRosterIq(const QXmppRosterIq&);

-

-    void flushDataBuffer();

-};

-

-#endif // QXMPPSTREAM_H

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#ifndef QXMPPSTREAM_H
+#define QXMPPSTREAM_H
+
+#include <QObject>
+#include <QSslSocket>
+#include "QXmppConfiguration.h"
+#include "QXmppRoster.h"
+#include "QXmppStanza.h"
+#include "QXmppVCardManager.h"
+
+class QDomElement;
+
+class QXmppRoster;
+class QXmppClient;
+class QXmppPacket;
+class QXmppPresence;
+class QXmppIq;
+class QXmppBind;
+class QXmppRosterIq;
+class QXmppVCard;
+class QXmppMessage;
+
+class QXmppStream : public QObject
+{
+    Q_OBJECT
+
+public:
+    QXmppStream(QXmppClient* client);
+    ~QXmppStream();
+    void connect();
+    void acceptSubscriptionRequest(const QString& from, bool accept = true);
+    void sendSubscriptionRequest(const QString& to);
+    void disconnect();
+    QXmppRoster& getRoster();
+    QXmppVCardManager& getVCardManager();
+    void sendPacket(const QXmppPacket&);
+
+    QAbstractSocket::SocketError getSocketError();
+
+signals:
+    // socket host found
+    void hostFound();
+
+    // socket connected
+    void connected();
+
+    // socket disconnected
+    void disconnected();
+
+    // xmpp connected
+    void xmppConnected();
+
+    void error(QXmppClient::Error);
+    void subscriptionRequestReceived(const QString& from);
+    void presenceReceived(const QXmppPresence&);
+    void messageReceived(const QXmppMessage&);
+    void iqReceived(const QXmppIq&);
+    void rosterIqReceived(const QXmppRosterIq&);
+    void vCardIqReceived(const QXmppVCard&);
+
+private slots:
+    void socketHostFound();
+    void socketReadReady();
+    void socketEncrypted();
+    void socketConnected();
+    void socketDisconnected();
+    void socketError(QAbstractSocket::SocketError);
+    void socketSslErrors(const QList<QSslError>&);
+
+private:
+    QXmppClient* m_client; // reverse pointer
+    QXmppRoster m_roster;
+    QString m_sessionId;
+    QString m_bindId;
+    QString m_rosterReqId;
+    QByteArray m_dataBuffer;
+    QSslSocket m_socket;
+    bool m_sessionAvaliable;
+    QAbstractSocket::SocketError m_socketError;
+    QString m_streamId;
+    QString m_nonSASLAuthId;
+    QString m_XMPPVersion;
+//    m_xmppStreamError;
+//    m_xmppStanzaError;
+
+
+    QXmppVCardManager m_vCardManager;
+
+    QXmppConfiguration& getConfiguration();
+    void parser(const QByteArray&);
+    void sendStartStream();
+    void sendEndStream();
+    void sendStartTls();
+    void sendNonSASLAuth(bool);
+    void sendNonSASLAuthQuery( const QString &to );
+    void sendAuthPlain();
+    void sendAuthDigestMD5();
+    void sendAuthDigestMD5Response(const QString& challenge);
+    void sendBindIQ();
+    void sendSessionIQ();
+    void sendInitialPresence();
+    void sendRosterRequest();
+    void sendToServer(const QByteArray&);
+    bool hasStartStreamElement(const QByteArray&);
+    bool hasEndStreamElement(const QByteArray&);
+    QXmppStanza::Error parseStanzaError(QDomElement & errorElement);
+
+    void processPresence(const QXmppPresence&);
+    void processMessage(const QXmppMessage&);
+    void processIq(const QXmppIq&);
+    void processBindIq(const QXmppBind&);
+    void processRosterIq(const QXmppRosterIq&);
+
+    void flushDataBuffer();
+};
+
+#endif // QXMPPSTREAM_H
diff --git a/source/QXmppUtils.cpp b/source/QXmppUtils.cpp
index c4b50fe0..08c1543a 100644
--- a/source/QXmppUtils.cpp
+++ b/source/QXmppUtils.cpp
@@ -1,136 +1,136 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#include "QXmppUtils.h"

-#include "QXmppLogger.h"

-#include <QString>

-#include <QXmlStreamWriter>

-#include <QByteArray>

-#include <QBuffer>

-#include <QImageReader>

-#include <QCryptographicHash>

-

-QString jidToResource(const QString& jid)

-{

-    return jid.mid(jid.indexOf(QChar('/'))+1);

-}

-

-QString jidToBareJid(const QString& jid)

-{

-    return jid.left(jid.indexOf(QChar('/')));

-}

-

-void helperToXmlAddAttribute(QXmlStreamWriter* stream, const QString& name,

-                             const QString& value)

-{

-    if(!value.isEmpty())

-        stream->writeAttribute(name,value);

-}

-

-void helperToXmlAddNumberElement(QXmlStreamWriter* stream, const QString& name, int value)

-{

-    stream->writeTextElement( name, QString::number(value));

-}

-

-void helperToXmlAddTextElement(QXmlStreamWriter* stream, const QString& name,

-                           const QString& value)

-{

-    if(!value.isEmpty())

-        stream->writeTextElement( name, value);

-    else

-        stream->writeEmptyElement(name);

-}

-

-void log(const QString& str)

-{

-    QXmppLogger::getLogger()->log(str);

-}

-

-void log(const QByteArray& str)

-{

-    QXmppLogger::getLogger()->log(str);

-}

-

-QString escapeString(const QString& str)

-{

-    QString strOut = str;

-    strOut.replace(QChar('&'), "&amp;");

-    strOut.replace(QChar('<'), "&lt;");

-    strOut.replace(QChar('>'), "&gt;");

-    strOut.replace(QChar('"'), "&quot;");

-    return strOut;

-}

-

-QString unescapeString(const QString& str)

-{

-    QString strOut = str;

-    strOut.replace("&lt;", QChar('<'));

-    strOut.replace("&gt;", QChar('>'));

-    strOut.replace("&quot;", QChar('"'));

-    strOut.replace("&amp;", QChar('&'));

-    return strOut;

-}

-

-QString getImageType(const QByteArray& image)

-{

-    QBuffer buffer;

-    buffer.setData(image);

-    buffer.open(QIODevice::ReadOnly);

-    QString format = QImageReader::imageFormat(&buffer);

-

-    if(format.toUpper() == "PNG")

-        return "image/png";

-    else if(format.toUpper() == "MNG")

-        return "video/x-mng";

-    else if(format.toUpper() == "GIF")

-        return "image/gif";

-    else if(format.toUpper() == "BMP")

-        return "image/bmp";

-    else if(format.toUpper() == "XPM")

-        return "image/x-xpm";

-    else if(format.toUpper() == "SVG")

-        return "image/svg+xml";

-    else if(format.toUpper() == "JPEG")

-        return "image/jpeg";

-

-    return "image/unknown";

-}

-

-QString getImageHash(const QByteArray& image)

-{

-    if(image.isEmpty())

-        return "";

-    else

-        return QString(QCryptographicHash::hash(image,

-            QCryptographicHash::Sha1).toHex());

-}

-

-QImage getImageFromByteArray(const QByteArray& image)

-{

-    QBuffer buffer;

-    buffer.setData(image);

-    buffer.open(QIODevice::ReadOnly);

-    QImageReader imageReader(&buffer);

-    return imageReader.read();

-}

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#include "QXmppUtils.h"
+#include "QXmppLogger.h"
+#include <QString>
+#include <QXmlStreamWriter>
+#include <QByteArray>
+#include <QBuffer>
+#include <QImageReader>
+#include <QCryptographicHash>
+
+QString jidToResource(const QString& jid)
+{
+    return jid.mid(jid.indexOf(QChar('/'))+1);
+}
+
+QString jidToBareJid(const QString& jid)
+{
+    return jid.left(jid.indexOf(QChar('/')));
+}
+
+void helperToXmlAddAttribute(QXmlStreamWriter* stream, const QString& name,
+                             const QString& value)
+{
+    if(!value.isEmpty())
+        stream->writeAttribute(name,value);
+}
+
+void helperToXmlAddNumberElement(QXmlStreamWriter* stream, const QString& name, int value)
+{
+    stream->writeTextElement( name, QString::number(value));
+}
+
+void helperToXmlAddTextElement(QXmlStreamWriter* stream, const QString& name,
+                           const QString& value)
+{
+    if(!value.isEmpty())
+        stream->writeTextElement( name, value);
+    else
+        stream->writeEmptyElement(name);
+}
+
+void log(const QString& str)
+{
+    QXmppLogger::getLogger()->log(str);
+}
+
+void log(const QByteArray& str)
+{
+    QXmppLogger::getLogger()->log(str);
+}
+
+QString escapeString(const QString& str)
+{
+    QString strOut = str;
+    strOut.replace(QChar('&'), "&amp;");
+    strOut.replace(QChar('<'), "&lt;");
+    strOut.replace(QChar('>'), "&gt;");
+    strOut.replace(QChar('"'), "&quot;");
+    return strOut;
+}
+
+QString unescapeString(const QString& str)
+{
+    QString strOut = str;
+    strOut.replace("&lt;", QChar('<'));
+    strOut.replace("&gt;", QChar('>'));
+    strOut.replace("&quot;", QChar('"'));
+    strOut.replace("&amp;", QChar('&'));
+    return strOut;
+}
+
+QString getImageType(const QByteArray& image)
+{
+    QBuffer buffer;
+    buffer.setData(image);
+    buffer.open(QIODevice::ReadOnly);
+    QString format = QImageReader::imageFormat(&buffer);
+
+    if(format.toUpper() == "PNG")
+        return "image/png";
+    else if(format.toUpper() == "MNG")
+        return "video/x-mng";
+    else if(format.toUpper() == "GIF")
+        return "image/gif";
+    else if(format.toUpper() == "BMP")
+        return "image/bmp";
+    else if(format.toUpper() == "XPM")
+        return "image/x-xpm";
+    else if(format.toUpper() == "SVG")
+        return "image/svg+xml";
+    else if(format.toUpper() == "JPEG")
+        return "image/jpeg";
+
+    return "image/unknown";
+}
+
+QString getImageHash(const QByteArray& image)
+{
+    if(image.isEmpty())
+        return "";
+    else
+        return QString(QCryptographicHash::hash(image,
+            QCryptographicHash::Sha1).toHex());
+}
+
+QImage getImageFromByteArray(const QByteArray& image)
+{
+    QBuffer buffer;
+    buffer.setData(image);
+    buffer.open(QIODevice::ReadOnly);
+    QImageReader imageReader(&buffer);
+    return imageReader.read();
+}
diff --git a/source/QXmppUtils.h b/source/QXmppUtils.h
index 146057c7..f9a7cdfd 100644
--- a/source/QXmppUtils.h
+++ b/source/QXmppUtils.h
@@ -1,54 +1,59 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#ifndef QXMPPUTILS_H

-#define QXMPPUTILS_H

-

-

-class QXmlStreamWriter;

-class QByteArray;

-class QString;

-class QImage;

-

-QString jidToResource(const QString& jid);

-QString jidToBareJid(const QString& jid);

-

-void helperToXmlAddAttribute(QXmlStreamWriter* stream, const QString& name,

-                             const QString& value);

-void helperToXmlAddTextElement(QXmlStreamWriter* stream, const QString& name,

-                           const QString& value);

-void helperToXmlAddNumberElement(QXmlStreamWriter* stream, const QString& name,

-                           int value);

-

-void log(const QString& str);

-void log(const QByteArray& str);

-

-QString escapeString(const QString& str);

-QString unescapeString(const QString& str);

-

-QString getImageType(const QByteArray& image);

-QString getImageHash(const QByteArray& image);

-QImage getImageFromByteArray(const QByteArray& image);

-

-#endif // QXMPPUTILS_H

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#ifndef QXMPPUTILS_H
+#define QXMPPUTILS_H
+
+
+// forward declarations of QXmlStream* classes will not work on Mac, we need to
+// include the whole header.
+// See http://lists.trolltech.com/qt-interest/2008-07/thread00798-0.html
+// for an explanation.
+#include <QXmlStreamWriter>
+
+class QByteArray;
+class QString;
+class QImage;
+
+QString jidToResource(const QString& jid);
+QString jidToBareJid(const QString& jid);
+
+void helperToXmlAddAttribute(QXmlStreamWriter* stream, const QString& name,
+                             const QString& value);
+void helperToXmlAddTextElement(QXmlStreamWriter* stream, const QString& name,
+                           const QString& value);
+void helperToXmlAddNumberElement(QXmlStreamWriter* stream, const QString& name,
+                           int value);
+
+void log(const QString& str);
+void log(const QByteArray& str);
+
+QString escapeString(const QString& str);
+QString unescapeString(const QString& str);
+
+QString getImageType(const QByteArray& image);
+QString getImageHash(const QByteArray& image);
+QImage getImageFromByteArray(const QByteArray& image);
+
+#endif // QXMPPUTILS_H
diff --git a/source/QXmppVCard.cpp b/source/QXmppVCard.cpp
index 8a5f4b0f..d3c71df1 100644
--- a/source/QXmppVCard.cpp
+++ b/source/QXmppVCard.cpp
@@ -1,108 +1,108 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#include "QXmppVCard.h"

-#include "QXmppUtils.h"

-#include "QXmppConstants.h"

-

-#include <QXmlStreamWriter>

-#include <QImage>

-#include <QBuffer>

-

-QXmppVCard::QXmppVCard(const QString& jid) : QXmppIq(QXmppIq::Get)

-{

-    // for self jid should be empty

-    setTo(jid);

-}

-

-QString QXmppVCard::getFullName() const

-{

-    return m_fullName;

-}

-

-void QXmppVCard::setFullName(const QString& str)

-{

-    m_fullName = str;

-}

-

-const QByteArray& QXmppVCard::getPhoto() const

-{

-    return m_photo;

-}

-

-void QXmppVCard::setPhoto(const QByteArray& photo)

-{

-    m_photo = photo;

-}

-

-void QXmppVCard::setPhoto(const QImage& image)

-{

-    QByteArray ba;

-    QBuffer buffer(&ba);

-    buffer.open(QIODevice::WriteOnly);

-    image.save(&buffer, "PNG");

-    m_photo = ba;

-}

-

-void QXmppVCard::parse(const QDomElement& nodeRecv)

-{

-    QString id = nodeRecv.attribute("id");

-    QString to = nodeRecv.attribute("to");

-    QString from = nodeRecv.attribute("from");

-    QString type = nodeRecv.attribute("type");

-    setTypeFromStr(type);

-    setId(id);

-    setTo(to);

-    setFrom(from);

-

-    // vCard

-    setFullName(nodeRecv.firstChildElement("vCard").

-                firstChildElement("FN").text());

-    QByteArray base64data = nodeRecv.firstChildElement("vCard").

-                            firstChildElement("PHOTO").

-                            firstChildElement("BINVAL").text().toAscii();

-    setPhoto(QByteArray::fromBase64(base64data));

-}

-

-void QXmppVCard::toXmlElementFromChild(QXmlStreamWriter *writer) const

-{

-    writer->writeStartElement("vCard");

-    helperToXmlAddAttribute(writer,"xmlns", ns_vcard);

-    helperToXmlAddTextElement(writer, "FN", getFullName());

-

-    if(!getPhoto().isEmpty())

-    {

-        writer->writeStartElement("PHOTO");

-        helperToXmlAddTextElement(writer, "TYPE", getImageType(getPhoto()));

-        helperToXmlAddTextElement(writer, "BINVAL", getPhoto().toBase64());

-        writer->writeEndElement();

-    }

-

-    writer->writeEndElement();

-}

-

-QImage QXmppVCard::getPhotoAsImage() const

-{

-    return getImageFromByteArray(getPhoto());

-}

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#include "QXmppVCard.h"
+#include "QXmppUtils.h"
+#include "QXmppConstants.h"
+
+#include <QXmlStreamWriter>
+#include <QImage>
+#include <QBuffer>
+
+QXmppVCard::QXmppVCard(const QString& jid) : QXmppIq(QXmppIq::Get)
+{
+    // for self jid should be empty
+    setTo(jid);
+}
+
+QString QXmppVCard::getFullName() const
+{
+    return m_fullName;
+}
+
+void QXmppVCard::setFullName(const QString& str)
+{
+    m_fullName = str;
+}
+
+const QByteArray& QXmppVCard::getPhoto() const
+{
+    return m_photo;
+}
+
+void QXmppVCard::setPhoto(const QByteArray& photo)
+{
+    m_photo = photo;
+}
+
+void QXmppVCard::setPhoto(const QImage& image)
+{
+    QByteArray ba;
+    QBuffer buffer(&ba);
+    buffer.open(QIODevice::WriteOnly);
+    image.save(&buffer, "PNG");
+    m_photo = ba;
+}
+
+void QXmppVCard::parse(const QDomElement& nodeRecv)
+{
+    QString id = nodeRecv.attribute("id");
+    QString to = nodeRecv.attribute("to");
+    QString from = nodeRecv.attribute("from");
+    QString type = nodeRecv.attribute("type");
+    setTypeFromStr(type);
+    setId(id);
+    setTo(to);
+    setFrom(from);
+
+    // vCard
+    setFullName(nodeRecv.firstChildElement("vCard").
+                firstChildElement("FN").text());
+    QByteArray base64data = nodeRecv.firstChildElement("vCard").
+                            firstChildElement("PHOTO").
+                            firstChildElement("BINVAL").text().toAscii();
+    setPhoto(QByteArray::fromBase64(base64data));
+}
+
+void QXmppVCard::toXmlElementFromChild(QXmlStreamWriter *writer) const
+{
+    writer->writeStartElement("vCard");
+    helperToXmlAddAttribute(writer,"xmlns", ns_vcard);
+    helperToXmlAddTextElement(writer, "FN", getFullName());
+
+    if(!getPhoto().isEmpty())
+    {
+        writer->writeStartElement("PHOTO");
+        helperToXmlAddTextElement(writer, "TYPE", getImageType(getPhoto()));
+        helperToXmlAddTextElement(writer, "BINVAL", getPhoto().toBase64());
+        writer->writeEndElement();
+    }
+
+    writer->writeEndElement();
+}
+
+QImage QXmppVCard::getPhotoAsImage() const
+{
+    return getImageFromByteArray(getPhoto());
+}
diff --git a/source/QXmppVCard.h b/source/QXmppVCard.h
index 20a26fcb..bef9d5a9 100644
--- a/source/QXmppVCard.h
+++ b/source/QXmppVCard.h
@@ -1,58 +1,58 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#ifndef QXMPPVCARD_H

-#define QXMPPVCARD_H

-

-#include "QXmppIq.h"

-#include <QMap>

-#include <QDomElement>

-

-class QImage;

-

-class QXmppVCard : public QXmppIq

-{

-public:

-    QXmppVCard(const QString& bareJid = "");

-

-    QString getFullName() const;

-    void setFullName(const QString&);

-

-    QImage getPhotoAsImage() const;

-    const QByteArray& getPhoto() const;

-    void setPhoto(const QByteArray&);

-    void setPhoto(const QImage&);

-

-    void parse(const QDomElement&);

-

-private:

-    void toXmlElementFromChild(QXmlStreamWriter *writer) const;

-

-    QString m_fullName;

-

-    // not as 64 base

-    QByteArray m_photo;

-};

-

-#endif // QXMPPVCARD_H

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#ifndef QXMPPVCARD_H
+#define QXMPPVCARD_H
+
+#include "QXmppIq.h"
+#include <QMap>
+#include <QDomElement>
+
+class QImage;
+
+class QXmppVCard : public QXmppIq
+{
+public:
+    QXmppVCard(const QString& bareJid = "");
+
+    QString getFullName() const;
+    void setFullName(const QString&);
+
+    QImage getPhotoAsImage() const;
+    const QByteArray& getPhoto() const;
+    void setPhoto(const QByteArray&);
+    void setPhoto(const QImage&);
+
+    void parse(const QDomElement&);
+
+private:
+    void toXmlElementFromChild(QXmlStreamWriter *writer) const;
+
+    QString m_fullName;
+
+    // not as 64 base
+    QByteArray m_photo;
+};
+
+#endif // QXMPPVCARD_H
diff --git a/source/QXmppVCardManager.cpp b/source/QXmppVCardManager.cpp
index 0240f094..845959f7 100644
--- a/source/QXmppVCardManager.cpp
+++ b/source/QXmppVCardManager.cpp
@@ -1,43 +1,43 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#include "QXmppVCardManager.h"

-#include "QXmppUtils.h"

-

-QXmppVCardManager::QXmppVCardManager(QXmppClient* client) :

-        QObject(client), m_client(client)

-{

-}

-

-void QXmppVCardManager::requestVCard(const QString& jid)

-{

-    QXmppVCard vcardIq(jid);

-    m_client->sendPacket(vcardIq);

-}

-

-void QXmppVCardManager::vCardIqReceived(const QXmppVCard& vcard)

-{

-    emit vCardReceived(vcard);

-}

-

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#include "QXmppVCardManager.h"
+#include "QXmppUtils.h"
+
+QXmppVCardManager::QXmppVCardManager(QXmppClient* client) :
+        QObject(client), m_client(client)
+{
+}
+
+void QXmppVCardManager::requestVCard(const QString& jid)
+{
+    QXmppVCard vcardIq(jid);
+    m_client->sendPacket(vcardIq);
+}
+
+void QXmppVCardManager::vCardIqReceived(const QXmppVCard& vcard)
+{
+    emit vCardReceived(vcard);
+}
+
diff --git a/source/QXmppVCardManager.h b/source/QXmppVCardManager.h
index ac078fc7..f2a84658 100644
--- a/source/QXmppVCardManager.h
+++ b/source/QXmppVCardManager.h
@@ -1,51 +1,51 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#ifndef QXMPPVCARDMANAGER_H

-#define QXMPPVCARDMANAGER_H

-

-#include <QObject>

-#include "QXmppClient.h"

-#include "QXmppVCard.h"

-

-class QXmppVCardManager : public QObject

-{

-    Q_OBJECT

-

-public:

-    QXmppVCardManager(QXmppClient* client);

-    void requestVCard(const QString& bareJid = "");

-

-signals:

-    void vCardReceived(const QXmppVCard&);

-

-private slots:

-    void vCardIqReceived(const QXmppVCard&);

-

-private:

-    // reference to to client object (no ownership)

-    QXmppClient* m_client;

-};

-

-#endif // QXMPPVCARDMANAGER_H

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#ifndef QXMPPVCARDMANAGER_H
+#define QXMPPVCARDMANAGER_H
+
+#include <QObject>
+#include "QXmppClient.h"
+#include "QXmppVCard.h"
+
+class QXmppVCardManager : public QObject
+{
+    Q_OBJECT
+
+public:
+    QXmppVCardManager(QXmppClient* client);
+    void requestVCard(const QString& bareJid = "");
+
+signals:
+    void vCardReceived(const QXmppVCard&);
+
+private slots:
+    void vCardIqReceived(const QXmppVCard&);
+
+private:
+    // reference to to client object (no ownership)
+    QXmppClient* m_client;
+};
+
+#endif // QXMPPVCARDMANAGER_H
diff --git a/source/source.pro b/source/source.pro
index cbc98332..f6623546 100644
--- a/source/source.pro
+++ b/source/source.pro
@@ -1,51 +1,58 @@
-TEMPLATE = lib

-QT += network \

-    xml

-CONFIG += staticlib \

-    debug_and_release

-CONFIG(debug, debug|release):TARGET = QXmppClient_d

-else:TARGET = QXmppClient

-

-# Header files

-HEADERS += QXmppUtils.h \

-    QXmppBind.h \

-    QXmppClient.h \

-    QXmppConfiguration.h \

-    QXmppConstants.h \

-    QXmppIq.h \

-    QXmppMessage.h \

-    QXmppPacket.h \

-    QXmppPresence.h \

-    QXmppRoster.h \

-    QXmppRosterIq.h \

-    QXmppSession.h \

-    QXmppStanza.h \

-    QXmppStream.h \

-    QXmppLogger.h \

-    QXmppReconnectionManager.h \

-    QXmppVCardManager.h \

-    QXmppVCard.h \

-    QXmppNonSASLAuth.h \

-    QXmppInformationRequestResult.h

-

-# Source files

-SOURCES += QXmppUtils.cpp \

-    QXmppBind.cpp \

-    QXmppClient.cpp \

-    QXmppConfiguration.cpp \

-    QXmppConstants.cpp \

-    QXmppIq.cpp \

-    QXmppMessage.cpp \

-    QXmppPacket.cpp \

-    QXmppPresence.cpp \

-    QXmppRoster.cpp \

-    QXmppRosterIq.cpp \

-    QXmppSession.cpp \

-    QXmppStanza.cpp \

-    QXmppStream.cpp \

-    QXmppLogger.cpp \

-    QXmppReconnectionManager.cpp \

-    QXmppVCardManager.cpp \

-    QXmppVCard.cpp \

-    QXmppNonSASLAuth.cpp \

-    QXmppInformationRequestResult.cpp

+TEMPLATE = lib
+QT += network \
+    xml
+	
+CONFIG += staticlib \
+    debug_and_release
+
+CONFIG(debug, debug|release){
+        win32:TARGET = QXmppClient_d
+        !win32:TARGET = debug\QXmppClient_d
+}else{
+        win32:TARGET = QXmppClient
+        !win32:TARGET = release\QXmppClient
+}
+
+# Header files
+HEADERS += QXmppUtils.h \
+    QXmppBind.h \
+    QXmppClient.h \
+    QXmppConfiguration.h \
+    QXmppConstants.h \
+    QXmppIq.h \
+    QXmppMessage.h \
+    QXmppPacket.h \
+    QXmppPresence.h \
+    QXmppRoster.h \
+    QXmppRosterIq.h \
+    QXmppSession.h \
+    QXmppStanza.h \
+    QXmppStream.h \
+    QXmppLogger.h \
+    QXmppReconnectionManager.h \
+    QXmppVCardManager.h \
+    QXmppVCard.h \
+    QXmppNonSASLAuth.h \
+    QXmppInformationRequestResult.h
+
+# Source files
+SOURCES += QXmppUtils.cpp \
+    QXmppBind.cpp \
+    QXmppClient.cpp \
+    QXmppConfiguration.cpp \
+    QXmppConstants.cpp \
+    QXmppIq.cpp \
+    QXmppMessage.cpp \
+    QXmppPacket.cpp \
+    QXmppPresence.cpp \
+    QXmppRoster.cpp \
+    QXmppRosterIq.cpp \
+    QXmppSession.cpp \
+    QXmppStanza.cpp \
+    QXmppStream.cpp \
+    QXmppLogger.cpp \
+    QXmppReconnectionManager.cpp \
+    QXmppVCardManager.cpp \
+    QXmppVCard.cpp \
+    QXmppNonSASLAuth.cpp \
+    QXmppInformationRequestResult.cpp