author | zecke <zecke> | 2002-09-22 23:32:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-22 23:32:49 (UTC) |
commit | d7098ef25f7f4ebe5678061aa3a3c0bd1f077f7f (patch) (side-by-side diff) | |
tree | 5ff52b48fd514c6f24da6d3204bc98b66c48a652 | |
parent | 4f142e98ee63e88fa0df61161b93228ee719d551 (diff) | |
download | opie-d7098ef25f7f4ebe5678061aa3a3c0bd1f077f7f.zip opie-d7098ef25f7f4ebe5678061aa3a3c0bd1f077f7f.tar.gz opie-d7098ef25f7f4ebe5678061aa3a3c0bd1f077f7f.tar.bz2 |
Two brown paper bags later OTodo is ok again... pointers can be so fscking awesome
I had problems with QShared because I forgot to copy it in &operator=
And the other one was d = 0
-rw-r--r-- | libopie/pim/orecordlist.h | 12 | ||||
-rw-r--r-- | libopie/pim/otodo.cpp | 25 | ||||
-rw-r--r-- | libopie/pim/otodoaccessxml.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiepim/backend/otodoaccessxml.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiepim/orecordlist.h | 12 | ||||
-rw-r--r-- | libopie2/opiepim/otodo.cpp | 25 |
6 files changed, 42 insertions, 36 deletions
diff --git a/libopie/pim/orecordlist.h b/libopie/pim/orecordlist.h index 75bb33c..36728b8 100644 --- a/libopie/pim/orecordlist.h +++ b/libopie/pim/orecordlist.h @@ -42,3 +42,3 @@ public: */ - T &operator*(); + T operator*(); ORecordListIterator &operator++(); @@ -101,2 +101,3 @@ ORecordListIterator<T>::ORecordListIterator() { m_end = true; + m_record = T(); } @@ -109,3 +110,3 @@ template <class T> ORecordListIterator<T>::ORecordListIterator( const ORecordListIterator<T>& it) { - qWarning("ORecordListIterator"); +// qWarning("ORecordListIterator copy c'tor"); m_uids = it.m_uids; @@ -123,3 +124,3 @@ ORecordListIterator<T> &ORecordListIterator<T>::operator=( const ORecordListIter m_end = it.m_end; - m_record = it.m_record; +// m_record = it.m_record; @@ -129,4 +130,4 @@ ORecordListIterator<T> &ORecordListIterator<T>::operator=( const ORecordListIter template <class T> -T &ORecordListIterator<T>::operator*() { - qWarning("operator* %d %d", m_current, m_uids[m_current] ); +T ORecordListIterator<T>::operator*() { +// qWarning("operator* %d %d", m_current, m_uids[m_current] ); if (!m_end ) @@ -195,3 +196,2 @@ template <class T> ORecordList<T>::Iterator ORecordList<T>::begin() { - qWarning("ORecordList::begin"); Iterator it( m_ids, m_acc ); diff --git a/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp index b3c14e6..cc46b21 100644 --- a/libopie/pim/otodo.cpp +++ b/libopie/pim/otodo.cpp @@ -38,8 +38,9 @@ OTodo::OTodo(const OTodo &event ) data->ref(); - qWarning("ref up"); +// qWarning("ref up"); } OTodo::~OTodo() { - qWarning("~OTodo " + data->sum ); + +// qWarning("~OTodo " ); if ( data->deref() ) { - qWarning("OTodo::dereffing"); +// qWarning("OTodo::dereffing"); delete data; @@ -56,3 +57,3 @@ OTodo::OTodo(bool completed, int priority, { - qWarning("OTodoData " + summary); +// qWarning("OTodoData " + summary); setCategories( category ); @@ -79,3 +80,3 @@ OTodo::OTodo(bool completed, int priority, { - qWarning("OTodoData" + summary); +// qWarning("OTodoData" + summary); setCategories( idsFromString( category.join(";") ) ); @@ -83,4 +84,4 @@ OTodo::OTodo(bool completed, int priority, data = new OTodoData; - data->date = date; + data->date = date; data->isCompleted = completed; @@ -162,2 +163,3 @@ void OTodo::setDescription(const QString &desc ) { + qWarning( "desc " + desc ); changeOrModify(); @@ -309,7 +311,7 @@ void OTodo::deref() { - //qWarning("deref in ToDoEvent"); +// qWarning("deref in ToDoEvent"); if ( data->deref() ) { - //qWarning("deleting"); +// qWarning("deleting"); delete data; - d= 0; + data= 0; } @@ -318,3 +320,3 @@ OTodo &OTodo::operator=(const OTodo &item ) { - OPimRecord::operator=( item ); +// OPimRecord::operator=( item ); //qWarning("operator= ref "); @@ -322,2 +324,3 @@ OTodo &OTodo::operator=(const OTodo &item ) deref(); + data = item.data; @@ -357,3 +360,3 @@ void OTodo::changeOrModify() { if ( data->count != 1 ) { - qWarning("changeOrModify"); +// qWarning("changeOrModify"); data->deref(); diff --git a/libopie/pim/otodoaccessxml.cpp b/libopie/pim/otodoaccessxml.cpp index 21756c9..3a72881 100644 --- a/libopie/pim/otodoaccessxml.cpp +++ b/libopie/pim/otodoaccessxml.cpp @@ -70,3 +70,2 @@ bool OTodoAccessXML::load() { } - return true; }else { @@ -78,2 +77,3 @@ bool OTodoAccessXML::load() { m_opened = true; + qWarning("Access %d" + m_events.count() ); return true; diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp index 21756c9..3a72881 100644 --- a/libopie2/opiepim/backend/otodoaccessxml.cpp +++ b/libopie2/opiepim/backend/otodoaccessxml.cpp @@ -70,3 +70,2 @@ bool OTodoAccessXML::load() { } - return true; }else { @@ -78,2 +77,3 @@ bool OTodoAccessXML::load() { m_opened = true; + qWarning("Access %d" + m_events.count() ); return true; diff --git a/libopie2/opiepim/orecordlist.h b/libopie2/opiepim/orecordlist.h index 75bb33c..36728b8 100644 --- a/libopie2/opiepim/orecordlist.h +++ b/libopie2/opiepim/orecordlist.h @@ -42,3 +42,3 @@ public: */ - T &operator*(); + T operator*(); ORecordListIterator &operator++(); @@ -101,2 +101,3 @@ ORecordListIterator<T>::ORecordListIterator() { m_end = true; + m_record = T(); } @@ -109,3 +110,3 @@ template <class T> ORecordListIterator<T>::ORecordListIterator( const ORecordListIterator<T>& it) { - qWarning("ORecordListIterator"); +// qWarning("ORecordListIterator copy c'tor"); m_uids = it.m_uids; @@ -123,3 +124,3 @@ ORecordListIterator<T> &ORecordListIterator<T>::operator=( const ORecordListIter m_end = it.m_end; - m_record = it.m_record; +// m_record = it.m_record; @@ -129,4 +130,4 @@ ORecordListIterator<T> &ORecordListIterator<T>::operator=( const ORecordListIter template <class T> -T &ORecordListIterator<T>::operator*() { - qWarning("operator* %d %d", m_current, m_uids[m_current] ); +T ORecordListIterator<T>::operator*() { +// qWarning("operator* %d %d", m_current, m_uids[m_current] ); if (!m_end ) @@ -195,3 +196,2 @@ template <class T> ORecordList<T>::Iterator ORecordList<T>::begin() { - qWarning("ORecordList::begin"); Iterator it( m_ids, m_acc ); diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp index b3c14e6..cc46b21 100644 --- a/libopie2/opiepim/otodo.cpp +++ b/libopie2/opiepim/otodo.cpp @@ -38,8 +38,9 @@ OTodo::OTodo(const OTodo &event ) data->ref(); - qWarning("ref up"); +// qWarning("ref up"); } OTodo::~OTodo() { - qWarning("~OTodo " + data->sum ); + +// qWarning("~OTodo " ); if ( data->deref() ) { - qWarning("OTodo::dereffing"); +// qWarning("OTodo::dereffing"); delete data; @@ -56,3 +57,3 @@ OTodo::OTodo(bool completed, int priority, { - qWarning("OTodoData " + summary); +// qWarning("OTodoData " + summary); setCategories( category ); @@ -79,3 +80,3 @@ OTodo::OTodo(bool completed, int priority, { - qWarning("OTodoData" + summary); +// qWarning("OTodoData" + summary); setCategories( idsFromString( category.join(";") ) ); @@ -83,4 +84,4 @@ OTodo::OTodo(bool completed, int priority, data = new OTodoData; - data->date = date; + data->date = date; data->isCompleted = completed; @@ -162,2 +163,3 @@ void OTodo::setDescription(const QString &desc ) { + qWarning( "desc " + desc ); changeOrModify(); @@ -309,7 +311,7 @@ void OTodo::deref() { - //qWarning("deref in ToDoEvent"); +// qWarning("deref in ToDoEvent"); if ( data->deref() ) { - //qWarning("deleting"); +// qWarning("deleting"); delete data; - d= 0; + data= 0; } @@ -318,3 +320,3 @@ OTodo &OTodo::operator=(const OTodo &item ) { - OPimRecord::operator=( item ); +// OPimRecord::operator=( item ); //qWarning("operator= ref "); @@ -322,2 +324,3 @@ OTodo &OTodo::operator=(const OTodo &item ) deref(); + data = item.data; @@ -357,3 +360,3 @@ void OTodo::changeOrModify() { if ( data->count != 1 ) { - qWarning("changeOrModify"); +// qWarning("changeOrModify"); data->deref(); |