Diffstat (limited to 'libopie2/opiedb/osqlresult.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiedb/osqlresult.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libopie2/opiedb/osqlresult.cpp b/libopie2/opiedb/osqlresult.cpp index bad7d8b..268ac8e 100644 --- a/libopie2/opiedb/osqlresult.cpp +++ b/libopie2/opiedb/osqlresult.cpp | |||
@@ -4,63 +4,63 @@ | |||
4 | using namespace Opie::DB; | 4 | using namespace Opie::DB; |
5 | 5 | ||
6 | OSQLResultItem::OSQLResultItem( const TableString& string, | 6 | OSQLResultItem::OSQLResultItem( const TableString& string, |
7 | const TableInt& Int) | 7 | const TableInt& Int) |
8 | : m_string( string ), m_int( Int ) | 8 | : m_string( string ), m_int( Int ) |
9 | { | 9 | { |
10 | 10 | ||
11 | } | 11 | } |
12 | OSQLResultItem::~OSQLResultItem() { | 12 | OSQLResultItem::~OSQLResultItem() { |
13 | } | 13 | } |
14 | OSQLResultItem::OSQLResultItem( const OSQLResultItem& item) { | 14 | OSQLResultItem::OSQLResultItem( const OSQLResultItem& item) { |
15 | *this = item; | 15 | *this = item; |
16 | } | 16 | } |
17 | OSQLResultItem &OSQLResultItem::operator=( const OSQLResultItem& other) { | 17 | OSQLResultItem &OSQLResultItem::operator=( const OSQLResultItem& other) { |
18 | m_string = other.m_string; | 18 | m_string = other.m_string; |
19 | m_int = other.m_int; | 19 | m_int = other.m_int; |
20 | return *this; | 20 | return *this; |
21 | } | 21 | } |
22 | OSQLResultItem::TableString OSQLResultItem::tableString()const{ | 22 | OSQLResultItem::TableString OSQLResultItem::tableString()const{ |
23 | return m_string; | 23 | return m_string; |
24 | } | 24 | } |
25 | OSQLResultItem::TableInt OSQLResultItem::tableInt()const { | 25 | OSQLResultItem::TableInt OSQLResultItem::tableInt()const { |
26 | return m_int; | 26 | return m_int; |
27 | } | 27 | } |
28 | QString OSQLResultItem::data( const QString& columnName, bool *ok ) { | 28 | QString OSQLResultItem::data( const QString& columnName, bool *ok ) const { |
29 | TableString::Iterator it = m_string.find( columnName ); | 29 | TableString::ConstIterator it = m_string.find( columnName ); |
30 | 30 | ||
31 | /* if found */ | 31 | /* if found */ |
32 | if ( it != m_string.end() ) { | 32 | if ( it != m_string.end() ) { |
33 | if ( ok ) *ok = true; | 33 | if ( ok ) *ok = true; |
34 | return it.data(); | 34 | return it.data(); |
35 | }else{ | 35 | }else{ |
36 | if ( ok ) *ok = false; | 36 | if ( ok ) *ok = false; |
37 | return QString::null; | 37 | return QString::null; |
38 | } | 38 | } |
39 | 39 | ||
40 | } | 40 | } |
41 | QString OSQLResultItem::data( int column, bool *ok ) { | 41 | QString OSQLResultItem::data( int column, bool *ok ) const { |
42 | TableInt::Iterator it = m_int.find( column ); | 42 | TableInt::ConstIterator it = m_int.find( column ); |
43 | 43 | ||
44 | /* if found */ | 44 | /* if found */ |
45 | if ( it != m_int.end() ) { | 45 | if ( it != m_int.end() ) { |
46 | if ( ok ) *ok = true; | 46 | if ( ok ) *ok = true; |
47 | return it.data(); | 47 | return it.data(); |
48 | }else{ | 48 | }else{ |
49 | if ( ok ) *ok = false; | 49 | if ( ok ) *ok = false; |
50 | return QString::null; | 50 | return QString::null; |
51 | } | 51 | } |
52 | } | 52 | } |
53 | /* | 53 | /* |
54 | * DateFormat is 'YYYY-MM-DD' | 54 | * DateFormat is 'YYYY-MM-DD' |
55 | */ | 55 | */ |
56 | QDate OSQLResultItem::dataToDate( const QString& column, bool *ok ) { | 56 | QDate OSQLResultItem::dataToDate( const QString& column, bool *ok ) { |
57 | QDate date = QDate::currentDate(); | 57 | QDate date = QDate::currentDate(); |
58 | QString str = data( column, ok ); | 58 | QString str = data( column, ok ); |
59 | if (!str.isEmpty() ) { | 59 | if (!str.isEmpty() ) { |
60 | ;// convert | 60 | ;// convert |
61 | } | 61 | } |
62 | return date; | 62 | return date; |
63 | } | 63 | } |
64 | QDate OSQLResultItem::dataToDate( int column, bool *ok ) { | 64 | QDate OSQLResultItem::dataToDate( int column, bool *ok ) { |
65 | QDate date = QDate::currentDate(); | 65 | QDate date = QDate::currentDate(); |
66 | QString str = data( column, ok ); | 66 | QString str = data( column, ok ); |