-rw-r--r-- | pwmanager/pwmanager/pwmdoc.cpp | 3 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwmview.cpp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp index a740d6d..1f15ffd 100644 --- a/pwmanager/pwmanager/pwmdoc.cpp +++ b/pwmanager/pwmanager/pwmdoc.cpp | |||
@@ -59,33 +59,34 @@ | |||
59 | #include <unistd.h> | 59 | #include <unistd.h> |
60 | #include <stdint.h> | 60 | #include <stdint.h> |
61 | #endif | 61 | #endif |
62 | 62 | ||
63 | #ifdef PWM_EMBEDDED | 63 | #ifdef PWM_EMBEDDED |
64 | #ifndef Q_LONG | 64 | #ifndef Q_LONG |
65 | #define Q_LONG long | 65 | #define Q_LONG long |
66 | #endif | 66 | #endif |
67 | 67 | ||
68 | #ifndef Q_ULONG | 68 | #ifndef Q_ULONG |
69 | #define Q_ULONG unsigned long | 69 | #define Q_ULONG unsigned long |
70 | #endif | 70 | #endif |
71 | #endif //PWM_EMBEDDED | 71 | #endif //PWM_EMBEDDED |
72 | 72 | ||
73 | 73 | ||
74 | //TODO: reset to its normal value. | 74 | //TODO: reset to its normal value. |
75 | #define META_CHECK_TIMER_INTERVAL10/*300*/ /* sek */ | 75 | //LR set to 5 min |
76 | #define META_CHECK_TIMER_INTERVAL300 /* 10 300*/ /* sek */ | ||
76 | 77 | ||
77 | using namespace std; | 78 | using namespace std; |
78 | 79 | ||
79 | 80 | ||
80 | void PwMDocList::add(PwMDoc *doc, const string &id) | 81 | void PwMDocList::add(PwMDoc *doc, const string &id) |
81 | { | 82 | { |
82 | #ifdef PWM_DEBUG | 83 | #ifdef PWM_DEBUG |
83 | // check for existance of object in debug mode only. | 84 | // check for existance of object in debug mode only. |
84 | vector<listItem>::iterator begin = docList.begin(), | 85 | vector<listItem>::iterator begin = docList.begin(), |
85 | end = docList.end(), | 86 | end = docList.end(), |
86 | i = begin; | 87 | i = begin; |
87 | while (i != end) { | 88 | while (i != end) { |
88 | if (i->doc == doc) { | 89 | if (i->doc == doc) { |
89 | BUG(); | 90 | BUG(); |
90 | return; | 91 | return; |
91 | } | 92 | } |
diff --git a/pwmanager/pwmanager/pwmview.cpp b/pwmanager/pwmanager/pwmview.cpp index 7733028..cd816e5 100644 --- a/pwmanager/pwmanager/pwmview.cpp +++ b/pwmanager/pwmanager/pwmview.cpp | |||
@@ -192,32 +192,33 @@ void PwMView::handleToggle(QListViewItem *item) | |||
192 | doc->lockAt(curCat, curEntryDocIndex, !clItem->isOn()); | 192 | doc->lockAt(curCat, curEntryDocIndex, !clItem->isOn()); |
193 | } | 193 | } |
194 | 194 | ||
195 | void PwMView::handleRightClick(QListViewItem *item, const QPoint &point, int) | 195 | void PwMView::handleRightClick(QListViewItem *item, const QPoint &point, int) |
196 | { | 196 | { |
197 | if (!item) | 197 | if (!item) |
198 | return; | 198 | return; |
199 | ctxMenu->move(point); | 199 | ctxMenu->move(point); |
200 | /* don't use ctxMenu->exec() here, as it generates race conditions | 200 | /* don't use ctxMenu->exec() here, as it generates race conditions |
201 | * with the card interface code. Believe it or not. :) | 201 | * with the card interface code. Believe it or not. :) |
202 | */ | 202 | */ |
203 | ctxMenu->show(); | 203 | ctxMenu->show(); |
204 | } | 204 | } |
205 | 205 | ||
206 | void PwMView::updateCategories() | 206 | void PwMView::updateCategories() |
207 | { | 207 | { |
208 | qDebug("PwMView::updateCategories() "); | ||
208 | QString oldSel(getCurrentCategory()); | 209 | QString oldSel(getCurrentCategory()); |
209 | delAllCategories(); | 210 | delAllCategories(); |
210 | QStringList catList; | 211 | QStringList catList; |
211 | document()->getCategoryList(&catList); | 212 | document()->getCategoryList(&catList); |
212 | catList.sort(); | 213 | catList.sort(); |
213 | #ifndef PWM_EMBEDDED | 214 | #ifndef PWM_EMBEDDED |
214 | QStringList::iterator i = catList.begin(), | 215 | QStringList::iterator i = catList.begin(), |
215 | end = catList.end(); | 216 | end = catList.end(); |
216 | #else | 217 | #else |
217 | QStringList::Iterator i = catList.begin(), | 218 | QStringList::Iterator i = catList.begin(), |
218 | end = catList.end(); | 219 | end = catList.end(); |
219 | #endif | 220 | #endif |
220 | while (i != end) { | 221 | while (i != end) { |
221 | addCategory(*i); | 222 | addCategory(*i); |
222 | ++i; | 223 | ++i; |
223 | } | 224 | } |