error.h   error.h 
skipping to change at line 76 skipping to change at line 76
bool out_of_tries) bool out_of_tries)
: Barry::Error(str), : Barry::Error(str),
m_remaining_tries(remaining_tries), m_remaining_tries(remaining_tries),
m_out_of_tries(out_of_tries) m_out_of_tries(out_of_tries)
{} {}
int remaining_tries() const { return m_remaining_tries; } int remaining_tries() const { return m_remaining_tries; }
bool out_of_tries() const { return m_out_of_tries; } bool out_of_tries() const { return m_out_of_tries; }
}; };
// //
// BadData
//
/// Thrown by record classes if their data is invalid and cannot be
/// uploaded to the Blackberry.
///
class BXEXPORT BadData : public Barry::Error
{
public:
BadData(const std::string &str)
: Barry::Error(str)
{}
};
//
// BadSize // BadSize
// //
/// Unexpected packet size, or not enough data. /// Unexpected packet size, or not enough data.
/// ///
class BXEXPORT BadSize : public Barry::Error class BXEXPORT BadSize : public Barry::Error
{ {
unsigned int m_packet_size, unsigned int m_packet_size,
m_data_buf_size, m_data_buf_size,
m_required_size; m_required_size;
 End of changes. 1 change blocks. 
0 lines changed or deleted 14 lines changed or added


 r_contact.h   r_contact.h 
skipping to change at line 97 skipping to change at line 97
PublicKey, PublicKey,
URL, URL,
Prefix, Prefix,
Notes, Notes,
UserDefined1, UserDefined1,
UserDefined2, UserDefined2,
UserDefined3, UserDefined3,
UserDefined4, UserDefined4,
Image; Image;
Date Birthday;
Date Anniversary;
PostalAddress WorkAddress; PostalAddress WorkAddress;
PostalAddress HomeAddress; PostalAddress HomeAddress;
// Categories are not allowed to have commas in them. // Categories are not allowed to have commas in them.
// A category name containing a comma will be split into // A category name containing a comma will be split into
// two categories, not only by this library, but by the // two categories, not only by this library, but by the
// device itself. // device itself.
CategoryList Categories; CategoryList Categories;
GroupLinksType GroupLinks; GroupLinksType GroupLinks;
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 record.h   record.h 
skipping to change at line 218 skipping to change at line 218
std::string GetLabel() const; std::string GetLabel() const;
void Clear(); void Clear();
bool HasData() const { return Address1.size() || Address2.size() || bool HasData() const { return Address1.size() || Address2.size() ||
Address3.size() || City.size() || Province.size() || Address3.size() || City.size() || Province.size() ||
PostalCode.size() || Country.size(); } PostalCode.size() || Country.size(); }
}; };
BXEXPORT std::ostream& operator<<(std::ostream &os, const PostalAddress &ms ga); BXEXPORT std::ostream& operator<<(std::ostream &os, const PostalAddress &ms ga);
struct BXEXPORT Date
{
int Month; // 0 to 11
int Day; // 1 to 31
int Year; // exact number, eg. 2008
Date() : Month(0), Day(0), Year(0) {}
explicit Date(const struct tm *timep);
bool HasData() const { return Month || Day || Year; }
void Clear();
void ToTm(struct tm *timep) const;
std::string ToYYYYMMDD() const;
std::string ToBBString() const; // converts to Blackberry string
// format of DD/MM/YYYY
bool FromTm(const struct tm *timep);
bool FromBBString(const std::string &str);
bool FromYYYYMMDD(const std::string &str);
};
BXEXPORT std::ostream& operator<<(std::ostream &os, const Date &date);
/// \addtogroup RecordParserClasses /// \addtogroup RecordParserClasses
/// Parser and data storage classes. These classes take a /// Parser and data storage classes. These classes take a
/// Database Database record and convert them into C++ objects. /// Database Database record and convert them into C++ objects.
/// Each of these classes are safe to be used in standard /// Each of these classes are safe to be used in standard
/// containers, and are meant to be used in conjunction with the /// containers, and are meant to be used in conjunction with the
/// RecordParser<> template when calling Controller::LoadDatabas e(). /// RecordParser<> template when calling Controller::LoadDatabas e().
/// @{ /// @{
/// @} /// @}
} // namespace Barry } // namespace Barry
 End of changes. 1 change blocks. 
0 lines changed or deleted 23 lines changed or added


 time.h   time.h 
/// ///
/// \file time.h /// \file time.h
/// Conversion between time_t and cenmin_t and back. /// Time related conversion routines.
/// time_t is the POSIX time. /// time_t is the POSIX time.
/// min1900_t is the minutes from Jan 1, 1900 /// min1900_t is the minutes from Jan 1, 1900
/// ///
/* /*
Copyright (C) 2005-2008, Net Direct Inc. (http://www.netdirect.ca/) Copyright (C) 2005-2008, Net Direct Inc. (http://www.netdirect.ca/)
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/