author | mickeyl <mickeyl> | 2004-04-24 15:11:39 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-04-24 15:11:39 (UTC) |
commit | 1a00a2edf5da1aa7d47c736bb718933f1c2e774b (patch) (unidiff) | |
tree | f14bdd2ac8aa2912238eb2ed254fa8cfe03e5b7f | |
parent | 2b700fa535661eb1ac897797f318a2694397a4d6 (diff) | |
download | opie-1a00a2edf5da1aa7d47c736bb718933f1c2e774b.zip opie-1a00a2edf5da1aa7d47c736bb718933f1c2e774b.tar.gz opie-1a00a2edf5da1aa7d47c736bb718933f1c2e774b.tar.bz2 |
gcc34 fixlet
-rw-r--r-- | noncore/apps/tableviewer/db/common.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/apps/tableviewer/db/common.cpp b/noncore/apps/tableviewer/db/common.cpp index 6e544ba..b58af85 100644 --- a/noncore/apps/tableviewer/db/common.cpp +++ b/noncore/apps/tableviewer/db/common.cpp | |||
@@ -1053,74 +1053,74 @@ DataElem::DataElem(DBStore *c) : values(20) | |||
1053 | } | 1053 | } |
1054 | 1054 | ||
1055 | /*! | 1055 | /*! |
1056 | Destroys a DataElem and frees memory used by the DataElem | 1056 | Destroys a DataElem and frees memory used by the DataElem |
1057 | */ | 1057 | */ |
1058 | DataElem::~DataElem() { | 1058 | DataElem::~DataElem() { |
1059 | } | 1059 | } |
1060 | 1060 | ||
1061 | 1061 | ||
1062 | 1062 | ||
1063 | QDataStream &operator<<( QDataStream &s, const DataElem &d) | 1063 | QDataStream &operator<<( QDataStream &s, const DataElem &d) |
1064 | { | 1064 | { |
1065 | int size = d.getNumFields(); | 1065 | int size = d.getNumFields(); |
1066 | 1066 | ||
1067 | s << size; /* redundent data but makes streaming easier */ | 1067 | s << size; /* redundent data but makes streaming easier */ |
1068 | KeyList k = d.getKeys(); | 1068 | KeyList k = d.getKeys(); |
1069 | 1069 | ||
1070 | KeyListIterator it(k); | 1070 | KeyListIterator it(k); |
1071 | 1071 | ||
1072 | while(it.current()) { | 1072 | while(it.current()) { |
1073 | s << (Q_UINT16)it.currentKey(); | 1073 | s << (Q_UINT16)it.currentKey(); |
1074 | s << d.getField(it.currentKey()); | 1074 | s << d.getField(it.currentKey()); |
1075 | ++it; | 1075 | ++it; |
1076 | } | 1076 | } |
1077 | return s; | 1077 | return s; |
1078 | } | 1078 | } |
1079 | 1079 | ||
1080 | QDataStream &operator>>( QDataStream &s, DataElem &d) | 1080 | QDataStream &operator>>( QDataStream &s, DataElem &d) |
1081 | { | 1081 | { |
1082 | int i; | 1082 | int i; |
1083 | int size; | 1083 | int size; |
1084 | TVVariant t; | 1084 | TVVariant t; |
1085 | int index = 0; | 1085 | Q_UINT16 index = 0; |
1086 | 1086 | ||
1087 | s >> size; /* redundent data but makes streaming easier */ | 1087 | s >> size; /* redundent data but makes streaming easier */ |
1088 | if (size != d.getNumFields()) { | 1088 | if (size != d.getNumFields()) { |
1089 | owarn << "DataSize mis-match" << oendl; | 1089 | owarn << "DataSize mis-match" << oendl; |
1090 | return s; /* sanity check failed.. don't load */ | 1090 | return s; /* sanity check failed.. don't load */ |
1091 | } | 1091 | } |
1092 | 1092 | ||
1093 | for(i = 0; i < size; i++) { | 1093 | for(i = 0; i < size; i++) { |
1094 | s >> (Q_UINT16)index; | 1094 | s >> index; |
1095 | s >> t; | 1095 | s >> t; |
1096 | d.setField(index, t); | 1096 | d.setField(index, t); |
1097 | } | 1097 | } |
1098 | return s; | 1098 | return s; |
1099 | } | 1099 | } |
1100 | 1100 | ||
1101 | /*! Returns the number of possible (not valid) fields in the data element */ | 1101 | /*! Returns the number of possible (not valid) fields in the data element */ |
1102 | int DataElem::getNumFields() const | 1102 | int DataElem::getNumFields() const |
1103 | { | 1103 | { |
1104 | return contained->getNumFields(); | 1104 | return contained->getNumFields(); |
1105 | } | 1105 | } |
1106 | 1106 | ||
1107 | KeyList DataElem::getKeys() const | 1107 | KeyList DataElem::getKeys() const |
1108 | { | 1108 | { |
1109 | return *(contained->getKeys()); | 1109 | return *(contained->getKeys()); |
1110 | } | 1110 | } |
1111 | 1111 | ||
1112 | /*! | 1112 | /*! |
1113 | This function determines whether field index i of the element has been | 1113 | This function determines whether field index i of the element has been |
1114 | set yet. | 1114 | set yet. |
1115 | 1115 | ||
1116 | \return A boolean value that is TRUE if the specfied field of this | 1116 | \return A boolean value that is TRUE if the specfied field of this |
1117 | element has been set and FALSE if the field has not yet been set | 1117 | element has been set and FALSE if the field has not yet been set |
1118 | */ | 1118 | */ |
1119 | bool DataElem::hasValidValue(int i) const | 1119 | bool DataElem::hasValidValue(int i) const |
1120 | { | 1120 | { |
1121 | if(!values.find(i)) | 1121 | if(!values.find(i)) |
1122 | return FALSE; | 1122 | return FALSE; |
1123 | if(!contained->getKeys()->validIndex(i)) | 1123 | if(!contained->getKeys()->validIndex(i)) |
1124 | return FALSE; | 1124 | return FALSE; |
1125 | return values.find(i)->isValid(); | 1125 | return values.find(i)->isValid(); |
1126 | } | 1126 | } |