1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
|
diff -Naru Keyring.orig/accountlist.cpp Keyring/accountlist.cpp
--- Keyring.orig/accountlist.cpp 2002-09-29 17:24:09.000000000 +0200
+++ Keyring/accountlist.cpp 2007-06-05 15:46:59.000000000 +0200
@@ -314,7 +314,7 @@
*/
void AccountList::resetTimer(){
mSeconds=mTimerStart;
- mStartTime = time(NULL);
+ mStartTime = (time_t*)time(NULL);
wLCD->display(mSeconds);
}
@@ -390,20 +390,20 @@
//if so and it has expired, lock keyring.
if(mTimerViewingAC && mTimerEnabled){
//Timer has expired
- if((time(NULL)-mStartTime) > mTimerStart){
+ if((time(NULL)-(time_t)mStartTime) > mTimerStart){
lock();
} else {
//Timer needs to be updated
time_t diff=time(NULL)-viewtime;
mSeconds=mSeconds-diff;
- mStartTime = time(NULL)-(mTimerStart-mSeconds);
+ mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
mUpdateTimer->start(500,false);
wLCD->display(mSeconds);
}
} else {
if(mTimerEnabled){
mUpdateTimer->start(500,false);
- mStartTime = time(NULL)-(mTimerStart-mSeconds);
+ mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
}
}
@@ -432,7 +432,7 @@
if(mTimerEnabled)
mUpdateTimer->start(500,false);
mSeconds=mTimerStart;
- mStartTime = time(NULL);
+ mStartTime = (time_t*)time(NULL);
updateCountDown();
//Let's be a bastard and bitch if the
@@ -463,11 +463,11 @@
void AccountList::updateCountDown(){
wLCD->display(mSeconds);
if(mSeconds==0 ||
- (((time(NULL)-mStartTime) > mTimerStart) && mTimerPowerOff)){
+ (((time(NULL)-(time_t)mStartTime) > mTimerStart) && mTimerPowerOff)){
lock();
return;
}
- mSeconds=mTimerStart-(time(NULL)-mStartTime);
+ mSeconds=mTimerStart-(time(NULL)-(time_t)mStartTime);
}
void AccountList::selectionChanged(QListViewItem *item){
@@ -548,20 +548,20 @@
//if so and it has expired, lock keyring.
if(mTimerViewingAC && mTimerEnabled){
//Timer has expired
- if((time(NULL)-mStartTime) > mTimerStart){
+ if((time(NULL)-(time_t)mStartTime) > mTimerStart){
lock();
} else {
//Timer needs to be updated
- time_t diff=time(NULL)-viewtime;
+ time_t diff = time(NULL)-(time_t)viewtime;
mSeconds=mSeconds-diff;
- mStartTime = time(NULL)-(mTimerStart-mSeconds);
+ mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
mUpdateTimer->start(500,false);
wLCD->display(mSeconds);
}
} else {
if(mTimerEnabled){
mUpdateTimer->start(500,false);
- mStartTime = time(NULL)-(mTimerStart-mSeconds);
+ mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
}
}
delete qd;
@@ -627,7 +627,7 @@
if(mTimerEnabled){
mUpdateTimer->start(500,false);
- mStartTime = time(NULL)-(mTimerStart-mSeconds);
+ mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
}
showAccountList();
|
