[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepim
From:       Allen Winter <winter () kde ! org>
Date:       2009-04-30 20:25:44
Message-ID: 1241123144.983197.32056.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 961859 by winterz:

Blocked revisions 961858 via svnmerge

........
  r961858 | winterz | 2009-04-30 16:23:28 -0400 (Thu, 30 Apr 2009) | 6 lines
  
  Remove tailing "ZZ" from dates, if such is found.
  
  Do NOT merge this to any Qt4 based code (e4, trunk, 4.2, etc)
  
  CCMAIL: till@kdab.net
........


 _M            . (directory)  
 M  +3 -2      kresources/kolab/shared/kolabbase.cpp  


** branches/kdepim/enterprise4/kdepim #property svnmerge-blocked
   - /branches/KDE/4.1/kdepim:835908,836092,836400,838188,839458,839904,840864,841784, \
842274,843368,846140,847248,848139,848556,851213,851219-851220,851222-851223,851226-85 \
1227,852004,852783,855231,856061,859356,860263,861766,863416,863770,864185,868785,8704 \
24-870425,870430,870432,870434-870435,870440,870702,871561,871938,872398,874289,874490 \
,874492,874521,874526,874529,874539,874550,874564,874571,877061,877115-877116,877118,8 \
77124-877125,877314,877938,877940,878941,879827,882243,883016,883867,887852,888694,890 \
401,890895,890930,891480,892346,892742,893666,894693,895180,899547,899959,899961,899974-899975,904945,904955,905605,910341 \
/branches/KDE/4.2/kdepim:907253,907465,907518,907668,907704,907710,908368,908423,90907 \
6,909197,909332,909357,909364,909366,909371-909372,909674,909774,909834,909839-909840, \
910005,910079,910085,910091,910245,910467,910557,910624,910965,911050,911061,911146,91 \
1174,911205,911218,911225,911383-911384,911549,911614,911714,911982,912022,912176,912181,9121
  93,912218,912258,912443,912453,912486,912613,912638,913051,913174,913224,913233,9132 \
52,913311,913554,913669,913673,913678,913680,913684-913685,913691,913714,913763,913772 \
,913925,913998,914117,914255,914650,914684,914705,914762-914763,914800,914803,915740,9 \
15743,915747,915793,915831,915837,915907,916068,916122,916124,916512,916686,916909,918 \
286,918728,919076,919165,919171,919482,919507,919687,919703,919713,919735,919790,92138 \
7,921393,921405,921565,922558,922669,922837,923208,923398,923488-923489,923491,923494, \
923502,923785,923939,924058,924604,924888,925027,925407,925409,925411-925412,925415,92 \
5424,925465,925471,926149,926346,926670,926709,926724,926979,927194,927199,927299,9282 \
15-928216,928260,928270,928272-928273,928275,928796,929209,929568,929676,929789,930647 \
,930771,930824,930875,931097,931107,931240,931300,931308,931310,931550,931569,931772,9 \
31881,931909,931994,932775,933156,933184,933313,934775-934777,935089,935344,935392,935744,936115,937530,938037,938128,938183,938190
  ,938194,938198,938208,938211,938215,938219,938228,938236,938246,938546,939288,939350 \
,939407,939535,939596,939658,939756,939964,940766-940767,940815,940817-940819,941078-9 \
41079,941109,941119,941153,941164,941241,941889,942598,942939,943680,943818,943820,943 \
822,943973,944040-944041,944228,944441,944810,945846,945848,945853,946164,946174,94625 \
0,946723,947709,949274,949282,949286,949428,949920,951243,951246,951248,951291,951314, \
951325,952871,953611-953614,953964,953980,954733,954993,955441,955443,955446,955617,95 \
5811,955833,955888,957460,957721-957725,957727-957729,957731,957734,957736,957738,9577 \
40,957742,957744,959546,959549,959879,960468-960470,960528,960665,960711,960718,961247,961650,961652-961653,961659,961662,961664,961668 \
/branches/kdepim/enterprise/kdepim:709145,709322,709403,709405,709412,709432,709473,70 \
9479,709488,709851,710563,710565,710635,710642,710644,711040,711165,711601,711781,7122 \
74,712279,713447,713449,713462,714101,714450,715218,715233,716227,717293,717295,7  \
18341,721122,724382,724385,724444,728090,728451,728581,729581-729582,731334,731670,731 \
720,731868,731871,732023,733048,733089,733464,733469,734535,734537,734581,734583-73458 \
5,734592,735175,735205,735247,735282,735301,736233-736234,736243,736315,736377,737484, \
737490-737491,737496,740442,740447,740460,740472,743888,744693,744708,746932,747592,75 \
7105,757111,758211,758787,758789,758795,759132,759153,759272,759275,759277,759286,7603 \
53,761116,761119,761124,761128-761130,761132-761133,761135-761136,761138,761141-761143 \
,761146,761148,761231,761241,761245,761331,761335,761338,761375,761534,761536,761538,7 \
61547,761551,761554,761557,761560,761562,761565,761571,761573,761581,761602,761621,761 \
896,761901,762899,762905,762908-762909,762922,762989,763016,763038-763039,763521,76428 \
8,764583,764598,764600-764601,764605,764611,764618,764628,764630,764671,764680,764683, \
764746,764822,764850,764876,764887,764894,765071,765073-765075,765080,765083,765086,765097,765104,765132,765139,765141-765142,765
  144,765156,765162,765224,765226-765227,765230,765234,765236,765311,765320,765323,765 \
330,765335,765338,765342-765346,765348-765350,765352-765353,765358-765359,765363-76537 \
0,765372,765380,765382,765384,765578,765740-765741,765746,765750,765755-765756,765761, \
765763,765766,765768,765770-765772,765775-765776,765779,765782,765785-765788,765791,76 \
5804,765853,765857,765875,765877,766055,766057,766086,766089-766090,766094-766095,7661 \
12,766121,766140,766218,766233,766247,766267,766279,766288,766345,766357,766367,766371 \
,766374,766389,766421,766539,766735,766781,766783,766790,766832,766835,766837,766899,7 \
67027,767030,767041,767047,767233,767552,767555,767557,767947,767952,768090,768684,769 \
140,769319,769323,769355,769706,769925,771106,771208,771252,772303,772306,772312,77231 \
7,773733,774162,775015-775016,775036,775041,775195,775203,775205-775206,775212,778002, \
778005-778006,778008-778009,778012,778030,778728,779449,779483,779506,779853,780176,780211,780453,780496,780498,780530,783128,78324
  6-783247,783478,784381-784382,784692,785054,785479,785563,785570,787388,788243-78824 \
4,788634,791441-791442,793305,793472,793539,795764,795766,798445-798446,798449,798496, \
800071,800168,800441,800615,802139,802149,802152,803257,803260,803300,803309,803339,80 \
3381-803382,803398,804109,804616,805671,805825,805827,809627,809709,810303,810305,8110 \
65,811206,813547-813548,814373,814375,816025,821371,821379,821649,821651,825076,825084 \
,826355,827892,827904,827945,827950,828973,830133,830478,830550,830876,830933,836104,8 \
36276-836277,836392,836429,837232,837782,837785,840707,840711,843760,846420,846427,849 \
154,849167,850907,850914,851185-851186,851291,852382,852422,853427,853432,854246-85424 \
7,858423,858425,858427-858429,858460,860191-860192,861915,862659,862682-862683,864154, \
864428,864462,864880,865016,865020,866391,866541,867490,867492,871846,872551,872568,87 \
2571,875331,875438,875447,876309-876310,881860,881862,882936,885957,886069,886071,886481,886632,887369,887372,891125,892009,892014,
  895590,895981,896091,896095,898178,899820,899822,909437,910027,914152,914157,914162, \
915521,915682,917267,918760,918764,922211,922263,924137,924172,924295,925098,925398,92 \
5488-925489,925498,925543,928844,928853,932932,932940,934210,934233,935807,935931-9359 \
32,937670,937680,938159,938220,938648,938843,938853,939046-939047,939056,941667-941668 \
,943188,944231,944965,945022,945313,945325,945343,948158,948181,950008,950032,950184,9 \
51431,951433,951786-951787,951789,951804,951814,951899,951902,951934,951950,953027,953 \
036,953506,953553,953718,953750,953821,954185,955393-955394,955455,956734,956770,957144,957658,958537,958544,958550,958556,958582,958685,958711,960137,961748
  + /branches/KDE/4.2/kdepim:907253,907465,907518,907668,907704,907710,908368,908423,9 \
09076,909197,909332,909357,909364,909366,909371-909372,909674,909774,909834,909839-909 \
840,910005,910079,910085,910091,910245,910467,910557,910624,910965,911050,911061,91114 \
6,911174,911205,911218,911225,911383-911384,911549,911614,911714,911982,912022,912176, \
912181,912193,912218,912258,912443,912453,912486,912613,912638,913051,913174,913224,91 \
3233,913252,913311,913554,913669,913673,913678,913680,913684-913685,913691,913714,9137 \
63,913772,913925,913998,914117,914255,914650,914684,914705,914762-914763,914800,914803 \
,915740,915743,915747,915793,915831,915837,915907,916068,916122,916124,916512,916686,9 \
16909,918286,918728,919076,919165,919171,919482,919507,919687,919703,919713,919735,919 \
790,921387,921393,921405,921565,922558,922669,922837,923208,923398,923488-923489,92349 \
1,923494,923502,923785,923939,924058,924604,924888,925027,925407,925409,925411-925412,925415,925424,925465,925471,926149,926346,9
  26670,926709,926724,926979,927194,927199,927299,928215-928216,928260,928270,928272-9 \
28273,928275,928796,929209,929568,929676,929789,930647,930771,930824,930875,931097,931 \
107,931240,931300,931308,931310,931550,931569,931772,931881,931909,931994,932775,93315 \
6,933184,933313,934775-934777,935089,935344,935392,935744,936115,937530,938037,938128, \
938183,938190,938194,938198,938208,938211,938215,938219,938228,938236,938246,938546,93 \
9288,939350,939407,939535,939596,939658,939756,939964,940766-940767,940815,940817-9408 \
19,941078-941079,941109,941119,941153,941164,941241,941889,942598,942939,943680,943818 \
,943820,943822,943973,944040-944041,944228,944441,944810,945846,945848,945853,946164,9 \
46174,946250,946723,947709,949274,949282,949286,949428,949920,951243,951246,951248,951 \
291,951314,951325,952871,953611-953614,953964,953980,954733,954993,955441,955443,95544 \
6,955617,955811,955833,955888,957460,957721-957725,957727-957729,957731,957734,957736,957738,957740,957742,957744,959546,959549,959
  879,960468-960470,960528,960665,960711,960718,961247,961650,961652-961653,961659,961662,961664,961668 \
/branches/KDE/4.1/kdepim:835908,836092,836400,838188,839458,839904,840864,841784,84227 \
4,843368,846140,847248,848139,848556,851213,851219-851220,851222-851223,851226-851227, \
852004,852783,855231,856061,859356,860263,861766,863416,863770,864185,868785,870424-87 \
0425,870430,870432,870434-870435,870440,870702,871561,871938,872398,874289,874490,8744 \
92,874521,874526,874529,874539,874550,874564,874571,877061,877115-877116,877118,877124 \
-877125,877314,877938,877940,878941,879827,882243,883016,883867,887852,888694,890401,8 \
90895,890930,891480,892346,892742,893666,894693,895180,899547,899959,899961,899974-899975,904945,904955,905605,910341 \
/branches/kdepim/enterprise/kdepim:709145,709322,709403,709405,709412,709432,709473,70 \
9479,709488,709851,710563,710565,710635,710642,710644,711040,711165,711601,711781,7122 \
74,712279,713447,713449,713462,714101,714450,715218,715233,716227,717293,717295,7  \
18341,721122,724382,724385,724444,728090,728451,728581,729581-729582,731334,731670,731 \
720,731868,731871,732023,733048,733089,733464,733469,734535,734537,734581,734583-73458 \
5,734592,735175,735205,735247,735282,735301,736233-736234,736243,736315,736377,737484, \
737490-737491,737496,740442,740447,740460,740472,743888,744693,744708,746932,747592,75 \
7105,757111,758211,758787,758789,758795,759132,759153,759272,759275,759277,759286,7603 \
53,761116,761119,761124,761128-761130,761132-761133,761135-761136,761138,761141-761143 \
,761146,761148,761231,761241,761245,761331,761335,761338,761375,761534,761536,761538,7 \
61547,761551,761554,761557,761560,761562,761565,761571,761573,761581,761602,761621,761 \
896,761901,762899,762905,762908-762909,762922,762989,763016,763038-763039,763521,76428 \
8,764583,764598,764600-764601,764605,764611,764618,764628,764630,764671,764680,764683, \
764746,764822,764850,764876,764887,764894,765071,765073-765075,765080,765083,765086,765097,765104,765132,765139,765141-765142,765
  144,765156,765162,765224,765226-765227,765230,765234,765236,765311,765320,765323,765 \
330,765335,765338,765342-765346,765348-765350,765352-765353,765358-765359,765363-76537 \
0,765372,765380,765382,765384,765578,765740-765741,765746,765750,765755-765756,765761, \
765763,765766,765768,765770-765772,765775-765776,765779,765782,765785-765788,765791,76 \
5804,765853,765857,765875,765877,766055,766057,766086,766089-766090,766094-766095,7661 \
12,766121,766140,766218,766233,766247,766267,766279,766288,766345,766357,766367,766371 \
,766374,766389,766421,766539,766735,766781,766783,766790,766832,766835,766837,766899,7 \
67027,767030,767041,767047,767233,767552,767555,767557,767947,767952,768090,768684,769 \
140,769319,769323,769355,769706,769925,771106,771208,771252,772303,772306,772312,77231 \
7,773733,774162,775015-775016,775036,775041,775195,775203,775205-775206,775212,778002, \
778005-778006,778008-778009,778012,778030,778728,779449,779483,779506,779853,780176,780211,780453,780496,780498,780530,783128,78324
  6-783247,783478,784381-784382,784692,785054,785479,785563,785570,787388,788243-78824 \
4,788634,791441-791442,793305,793472,793539,795764,795766,798445-798446,798449,798496, \
800071,800168,800441,800615,802139,802149,802152,803257,803260,803300,803309,803339,80 \
3381-803382,803398,804109,804616,805671,805825,805827,809627,809709,810303,810305,8110 \
65,811206,813547-813548,814373,814375,816025,821371,821379,821649,821651,825076,825084 \
,826355,827892,827904,827945,827950,828973,830133,830478,830550,830876,830933,836104,8 \
36276-836277,836392,836429,837232,837782,837785,840707,840711,843760,846420,846427,849 \
154,849167,850907,850914,851185-851186,851291,852382,852422,853427,853432,854246-85424 \
7,858423,858425,858427-858429,858460,860191-860192,861915,862659,862682-862683,864154, \
864428,864462,864880,865016,865020,866391,866541,867490,867492,871846,872551,872568,87 \
2571,875331,875438,875447,876309-876310,881860,881862,882936,885957,886069,886071,886481,886632,887369,887372,891125,892009,892014,
  895590,895981,896091,896095,898178,899820,899822,909437,910027,914152,914157,914162, \
915521,915682,917267,918760,918764,922211,922263,924137,924172,924295,925098,925398,92 \
5488-925489,925498,925543,928844,928853,932932,932940,934210,934233,935807,935931-9359 \
32,937670,937680,938159,938220,938648,938843,938853,939046-939047,939056,941667-941668 \
,943188,944231,944965,945022,945313,945325,945343,948158,948181,950008,950032,950184,9 \
51431,951433,951786-951787,951789,951804,951814,951899,951902,951934,951950,953027,953 \
036,953506,953553,953718,953750,953821,954185,955393-955394,955455,956734,956770,957144,957658,958537,958544,958550,958556,958582,958685,958711,960137,961748,961858
                
--- branches/kdepim/enterprise4/kdepim/kresources/kolab/shared/kolabbase.cpp \
#961858:961859 @@ -423,9 +423,10 @@
 KDateTime KolabBase::stringToDateTime( const QString& _date )
 {
   QString date( _date );
-  //deal with data from some clients that always append a Z to dates
+  //Deal with data from some clients that always append a Z to dates.
+  //In Qt4, Qt::ISODate must see a trailing Z for UTC, so keep such.
   if ( date.endsWith( "ZZ" ) )
-    date.truncate( date.length() - 1 );
+    date.chop( 1 );
   return KDateTime::fromString( date, KDateTime::ISODate );
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]