Tag: cws_src680_kaddrbook User: ebischoff Date: 05/11/28 02:59:58 Modified: /dba/connectivity/source/drivers/kab/ kcondition.cxx, kcondition.hxx
Log: Better variable naming and const'ness File Changes: Directory: /dba/connectivity/source/drivers/kab/ ================================================ File [changed]: kcondition.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/kcondition.cxx?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +47 -47 --------------------- --- kcondition.cxx 14 Sep 2005 07:44:37 -0000 1.1.2.2 +++ kcondition.cxx 28 Nov 2005 10:59:55 -0000 1.1.2.3 @@ -2,9 +2,9 @@ * * $RCSfile: kcondition.cxx,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: ebischoff $ $Date: 2005/09/14 07:44:37 $ + * last change: $Author: ebischoff $ $Date: 2005/11/28 10:59:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,8 +75,8 @@ { } // ----------------------------------------------------------------------------- -KabConditionConstant::KabConditionConstant(const sal_Bool value) - : m_bValue(value), +KabConditionConstant::KabConditionConstant(const sal_Bool bValue) + : m_bValue(bValue), KabCondition() { } @@ -91,25 +91,25 @@ return !m_bValue; } // ----------------------------------------------------------------------------- -sal_Bool KabConditionConstant::eval(::KABC::Addressee &addressee) const +sal_Bool KabConditionConstant::eval(const ::KABC::Addressee &aAddressee) const { return m_bValue; } // ----------------------------------------------------------------------------- -KabConditionColumn::KabConditionColumn(const ::rtl::OUString &columnName) throw(SQLException) +KabConditionColumn::KabConditionColumn(const ::rtl::OUString &sColumnName) throw(SQLException) : KabCondition(), - m_nFieldNumber(findKabField(columnName)) + m_nFieldNumber(findKabField(sColumnName)) { } // ----------------------------------------------------------------------------- -QString KabConditionColumn::value(::KABC::Addressee &addressee) const +QString KabConditionColumn::value(const ::KABC::Addressee &aAddressee) const { switch (m_nFieldNumber) { case KAB_FIELD_UID: - return addressee.uid(); + return aAddressee.uid(); case KAB_FIELD_REVISION: -return addressee.revision().toString("yyyy-MM-dd hh:mm:ss"); +return aAddressee.revision().toString("yyyy-MM-dd hh:mm:ss"); // That's not the correct way to do it. // Timestamps deserve a KabCondition class of their own. // The syntax for such queries should be like @@ -117,7 +117,7 @@ // They should also support operators like '<' or '>=' default: ::KABC::Field::List aFields = ::KABC::Field::allFields(); - return aFields[m_nFieldNumber - KAB_DATA_FIELDS]->value(addressee); + return aFields[m_nFieldNumber - KAB_DATA_FIELDS]->value(aAddressee); } } // ----------------------------------------------------------------------------- @@ -133,48 +133,48 @@ return sal_False; } // ----------------------------------------------------------------------------- -KabConditionNull::KabConditionNull(const ::rtl::OUString &columnName) throw(SQLException) - : KabConditionColumn(columnName) +KabConditionNull::KabConditionNull(const ::rtl::OUString &sColumnName) throw(SQLException) + : KabConditionColumn(sColumnName) { } // ----------------------------------------------------------------------------- -sal_Bool KabConditionNull::eval(::KABC::Addressee &addressee) const +sal_Bool KabConditionNull::eval(const ::KABC::Addressee &aAddressee) const { - QString aQtName(value(addressee)); + QString aQtName(value(aAddressee)); return aQtName.isNull(); // KDE address book currently does not use NULL values. // But it might do it someday } // ----------------------------------------------------------------------------- -KabConditionNotNull::KabConditionNotNull(const ::rtl::OUString &columnName) throw(SQLException) - : KabConditionColumn(columnName) +KabConditionNotNull::KabConditionNotNull(const ::rtl::OUString &sColumnName) throw(SQLException) + : KabConditionColumn(sColumnName) { } // ----------------------------------------------------------------------------- -sal_Bool KabConditionNotNull::eval(::KABC::Addressee &addressee) const +sal_Bool KabConditionNotNull::eval(const ::KABC::Addressee &aAddressee) const { - QString aQtName(value(addressee)); + QString aQtName(value(aAddressee)); return !aQtName.isNull(); // KDE address book currently does not use NULL values. // But it might do it someday } // ----------------------------------------------------------------------------- -KabConditionCompare::KabConditionCompare(const ::rtl::OUString &columnName, const ::rtl::OUString &matchString) throw(SQLException) - : m_sMatchString(matchString), - KabConditionColumn(columnName) +KabConditionCompare::KabConditionCompare(const ::rtl::OUString &sColumnName, const ::rtl::OUString &sMatchString) throw(SQLException) + : m_sMatchString(sMatchString), + KabConditionColumn(sColumnName) { } // ----------------------------------------------------------------------------- -KabConditionEqual::KabConditionEqual(const ::rtl::OUString &columnName, const ::rtl::OUString &matchString) throw(SQLException) - : KabConditionCompare(columnName, matchString) +KabConditionEqual::KabConditionEqual(const ::rtl::OUString &sColumnName, const ::rtl::OUString &sMatchString) throw(SQLException) + : KabConditionCompare(sColumnName, sMatchString) { } // ----------------------------------------------------------------------------- -sal_Bool KabConditionEqual::eval(::KABC::Addressee &addressee) const +sal_Bool KabConditionEqual::eval(const ::KABC::Addressee &aAddressee) const { - QString aQtName(value(addressee)); + QString aQtName(value(aAddressee)); if (aQtName.isNull()) return sal_False; @@ -182,14 +182,14 @@ return sValue == m_sMatchString; } // ----------------------------------------------------------------------------- -KabConditionDifferent::KabConditionDifferent(const ::rtl::OUString &columnName, const ::rtl::OUString &matchString) throw(SQLException) - : KabConditionCompare(columnName, matchString) +KabConditionDifferent::KabConditionDifferent(const ::rtl::OUString &sColumnName, const ::rtl::OUString &sMatchString) throw(SQLException) + : KabConditionCompare(sColumnName, sMatchString) { } // ----------------------------------------------------------------------------- -sal_Bool KabConditionDifferent::eval(::KABC::Addressee &addressee) const +sal_Bool KabConditionDifferent::eval(const ::KABC::Addressee &aAddressee) const { - QString aQtName(value(addressee)); + QString aQtName(value(aAddressee)); if (aQtName.isNull()) return sal_False; @@ -197,14 +197,14 @@ return sValue != m_sMatchString; } // ----------------------------------------------------------------------------- -KabConditionSimilar::KabConditionSimilar(const ::rtl::OUString &columnName, const ::rtl::OUString &matchString) throw(SQLException) - : KabConditionCompare(columnName, matchString) +KabConditionSimilar::KabConditionSimilar(const ::rtl::OUString &sColumnName, const ::rtl::OUString &sMatchString) throw(SQLException) + : KabConditionCompare(sColumnName, sMatchString) { } // ----------------------------------------------------------------------------- -sal_Bool KabConditionSimilar::eval(::KABC::Addressee &addressee) const +sal_Bool KabConditionSimilar::eval(const ::KABC::Addressee &aAddressee) const { - QString aQtName(value(addressee)); + QString aQtName(value(aAddressee)); if (aQtName.isNull()) return sal_False; @@ -212,9 +212,9 @@ return match(m_sMatchString, sValue, '\0'); } // ----------------------------------------------------------------------------- -KabConditionBoolean::KabConditionBoolean(KabCondition *left, KabCondition *right) - : m_pLeft(left), - m_pRight(right), +KabConditionBoolean::KabConditionBoolean(KabCondition *pLeft, KabCondition *pRight) + : m_pLeft(pLeft), + m_pRight(pRight), KabCondition() { } @@ -225,8 +225,8 @@ delete m_pRight; } // ----------------------------------------------------------------------------- -KabConditionOr::KabConditionOr(KabCondition *left, KabCondition *right) - : KabConditionBoolean(left, right) +KabConditionOr::KabConditionOr(KabCondition *pLeft, KabCondition *pRight) + : KabConditionBoolean(pLeft, pRight) { } // ----------------------------------------------------------------------------- @@ -240,20 +240,20 @@ return m_pLeft->isAlwaysFalse() && m_pRight->isAlwaysFalse(); } // ----------------------------------------------------------------------------- -sal_Bool KabConditionOr::eval(::KABC::Addressee &addressee) const +sal_Bool KabConditionOr::eval(const ::KABC::Addressee &aAddressee) const { // We avoid evaluating terms as much as we can if (m_pLeft->isAlwaysTrue() || m_pRight->isAlwaysTrue()) return sal_True; if (m_pLeft->isAlwaysFalse() && m_pRight->isAlwaysFalse()) return sal_False; - if (m_pLeft->eval(addressee)) return sal_True; - if (m_pRight->eval(addressee)) return sal_True; + if (m_pLeft->eval(aAddressee)) return sal_True; + if (m_pRight->eval(aAddressee)) return sal_True; return sal_False; } // ----------------------------------------------------------------------------- -KabConditionAnd::KabConditionAnd(KabCondition *left, KabCondition *right) - : KabConditionBoolean(left, right) +KabConditionAnd::KabConditionAnd(KabCondition *pLeft, KabCondition *pRight) + : KabConditionBoolean(pLeft, pRight) { } // ----------------------------------------------------------------------------- @@ -267,14 +267,14 @@ return m_pLeft->isAlwaysFalse() || m_pRight->isAlwaysFalse(); } // ----------------------------------------------------------------------------- -sal_Bool KabConditionAnd::eval(::KABC::Addressee &addressee) const +sal_Bool KabConditionAnd::eval(const ::KABC::Addressee &aAddressee) const { // We avoid evaluating terms as much as we can if (m_pLeft->isAlwaysFalse() || m_pRight->isAlwaysFalse()) return sal_False; if (m_pLeft->isAlwaysTrue() && m_pRight->isAlwaysTrue()) return sal_True; - if (!m_pLeft->eval(addressee)) return sal_False; - if (!m_pRight->eval(addressee)) return sal_False; + if (!m_pLeft->eval(aAddressee)) return sal_False; + if (!m_pRight->eval(aAddressee)) return sal_False; return sal_True; } File [changed]: kcondition.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/kcondition.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +27 -27 --------------------- --- kcondition.hxx 13 Sep 2005 18:20:36 -0000 1.1.2.1 +++ kcondition.hxx 28 Nov 2005 10:59:55 -0000 1.1.2.2 @@ -2,9 +2,9 @@ * * $RCSfile: kcondition.hxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: ebischoff $ $Date: 2005/09/13 18:20:36 $ + * last change: $Author: ebischoff $ $Date: 2005/11/28 10:59:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,7 +82,7 @@ virtual ~KabCondition(); virtual sal_Bool isAlwaysTrue() const = 0; virtual sal_Bool isAlwaysFalse() const = 0; - virtual sal_Bool eval(::KABC::Addressee &addressee) const = 0; + virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const = 0; }; // ----------------------------------------------------------------------------- class KabConditionConstant : public KabCondition @@ -91,10 +91,10 @@ sal_Bool m_bValue; public: - KabConditionConstant(const sal_Bool value); + KabConditionConstant(const sal_Bool bValue); virtual sal_Bool isAlwaysTrue() const; virtual sal_Bool isAlwaysFalse() const; - virtual sal_Bool eval(::KABC::Addressee &addressee) const; + virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const; }; // ----------------------------------------------------------------------------- class KabConditionColumn : public KabCondition @@ -102,11 +102,11 @@ protected: sal_Int32 m_nFieldNumber; - QString value(::KABC::Addressee &addressee) const; + QString value(const ::KABC::Addressee &aAddressee) const; public: KabConditionColumn( - const ::rtl::OUString &columnName) throw(::com::sun::star::sdbc::SQLException); + const ::rtl::OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool isAlwaysTrue() const; virtual sal_Bool isAlwaysFalse() const; }; @@ -115,16 +115,16 @@ { public: KabConditionNull( - const ::rtl::OUString &columnName) throw(::com::sun::star::sdbc::SQLException); - virtual sal_Bool eval(::KABC::Addressee &addressee) const; + const ::rtl::OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); + virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const; }; // ----------------------------------------------------------------------------- class KabConditionNotNull : public KabConditionColumn { public: KabConditionNotNull( - const ::rtl::OUString &columnName) throw(::com::sun::star::sdbc::SQLException); - virtual sal_Bool eval(::KABC::Addressee &addressee) const; + const ::rtl::OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); + virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const; }; // ----------------------------------------------------------------------------- class KabConditionCompare : public KabConditionColumn @@ -134,35 +134,35 @@ public: KabConditionCompare( - const ::rtl::OUString &columnName, - const ::rtl::OUString &matchString) throw(::com::sun::star::sdbc::SQLException); + const ::rtl::OUString &sColumnName, + const ::rtl::OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); }; // ----------------------------------------------------------------------------- class KabConditionEqual : public KabConditionCompare { public: KabConditionEqual( - const ::rtl::OUString &columnName, - const ::rtl::OUString &matchString) throw(::com::sun::star::sdbc::SQLException); - virtual sal_Bool eval(::KABC::Addressee &addressee) const; + const ::rtl::OUString &sColumnName, + const ::rtl::OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); + virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const; }; // ----------------------------------------------------------------------------- class KabConditionDifferent : public KabConditionCompare { public: KabConditionDifferent( - const ::rtl::OUString &columnName, - const ::rtl::OUString &matchString) throw(::com::sun::star::sdbc::SQLException); - virtual sal_Bool eval(::KABC::Addressee &addressee) const; + const ::rtl::OUString &sColumnName, + const ::rtl::OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); + virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const; }; // ----------------------------------------------------------------------------- class KabConditionSimilar : public KabConditionCompare { public: KabConditionSimilar( - const ::rtl::OUString &columnName, - const ::rtl::OUString &matchString) throw(::com::sun::star::sdbc::SQLException); - virtual sal_Bool eval(::KABC::Addressee &addressee) const; + const ::rtl::OUString &sColumnName, + const ::rtl::OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); + virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const; }; // ----------------------------------------------------------------------------- class KabConditionBoolean : public KabCondition @@ -171,26 +171,26 @@ KabCondition *m_pLeft, *m_pRight; public: - KabConditionBoolean(KabCondition *left, KabCondition *right); + KabConditionBoolean(KabCondition *pLeft, KabCondition *pRight); virtual ~KabConditionBoolean(); }; // ----------------------------------------------------------------------------- class KabConditionOr : public KabConditionBoolean { public: - KabConditionOr(KabCondition *left, KabCondition *right); + KabConditionOr(KabCondition *pLeft, KabCondition *pRight); virtual sal_Bool isAlwaysTrue() const; virtual sal_Bool isAlwaysFalse() const; - virtual sal_Bool eval(::KABC::Addressee &addressee) const; + virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const; }; // ----------------------------------------------------------------------------- class KabConditionAnd : public KabConditionBoolean { public: - KabConditionAnd(KabCondition *left, KabCondition *right); + KabConditionAnd(KabCondition *pLeft, KabCondition *pRight); virtual sal_Bool isAlwaysTrue() const; virtual sal_Bool isAlwaysFalse() const; - virtual sal_Bool eval(::KABC::Addressee &addressee) const; + virtual sal_Bool eval(const ::KABC::Addressee &addressee) const; }; // ----------------------------------------------------------------------------- } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
