fix in save vcal as local time

1 files changed, 3 insertions, 7 deletions

diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp
index 309c699..a6ae1bc 100644
--- a/libkcal/vcalformat.cpp
+++ b/libkcal/vcalformat.cpp
@@ -17,196 +17,192 @@
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qapplication.h>
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qptrlist.h>
 #include <qregexp.h>
 #include <qclipboard.h>
 #include <qdialog.h>
 #include <qfile.h>
 
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <klocale.h>
 
 #include "vcc.h"
 #include "vobject.h"
 
 #include "vcaldrag.h"
 #include "calendar.h"
 
 #include "vcalformat.h"
 
 using namespace KCal;
 
 VCalFormat::VCalFormat()
 {
     mCalendar = 0;
     useLocalTime = false;
 }
 
 VCalFormat::~VCalFormat()
 {
 }
 
 void VCalFormat::setLocalTime ( bool b )
 {
     useLocalTime = b;
 }
 bool VCalFormat::load(Calendar *calendar, const QString &fileName)
 {
   mCalendar = calendar;
   clearException();
-
-  kdDebug(5800) << "VCalFormat::load() " << fileName << endl;
-
+  useLocalTime = mCalendar->isLocalTime();
   VObject *vcal = 0;
 
   // this is not necessarily only 1 vcal.  Could be many vcals, or include
   // a vcard...
   vcal = Parse_MIME_FromFileName(const_cast<char *>(QFile::encodeName(fileName).data()));
 
   if (!vcal) {
     setException(new ErrorFormat(ErrorFormat::CalVersionUnknown));
     return FALSE;
   }
 
   // any other top-level calendar stuff should be added/initialized here
 
   // put all vobjects into their proper places
   populate(vcal);
 
   // clean up from vcal API stuff
   cleanVObjects(vcal);
   cleanStrTbl();
 
   return true;
 }
 
 
 bool VCalFormat::save(Calendar *calendar, const QString &fileName)
 {
   mCalendar = calendar;
+  useLocalTime = mCalendar->isLocalTime();
 
   QString tmpStr;
   VObject *vcal, *vo;
 
-  kdDebug(5800) << "VCalFormat::save(): " << fileName << endl;
 
   vcal = newVObject(VCCalProp);
 
   //  addPropValue(vcal,VCLocationProp, "0.0");
   addPropValue(vcal,VCProdIdProp, productId());
   tmpStr = mCalendar->getTimeZoneStr();
   //qDebug("mCalendar->getTimeZoneStr() %s",tmpStr.latin1() );
   addPropValue(vcal,VCTimeZoneProp, tmpStr.local8Bit());
   addPropValue(vcal,VCVersionProp, _VCAL_VERSION);
 
   // TODO STUFF
   QPtrList<Todo> todoList = mCalendar->rawTodos();
   QPtrListIterator<Todo> qlt(todoList);
   for (; qlt.current(); ++qlt) {
     vo = eventToVTodo(qlt.current());
     addVObjectProp(vcal, vo);
   }
 
   // EVENT STUFF
   QPtrList<Event> events = mCalendar->rawEvents();
   Event *ev;
   for(ev=events.first();ev;ev=events.next()) {
     vo = eventToVEvent(ev);
     addVObjectProp(vcal, vo);
   }
 
   writeVObjectToFile(QFile::encodeName(fileName).data() ,vcal);
   cleanVObjects(vcal);
   cleanStrTbl();
 
   if (QFile::exists(fileName)) {
-    kdDebug(5800) << "No error" << endl;
     return true;
   } else  {
-    kdDebug(5800) << "Error" << endl;
     return false; // error
   }
 }
 
 bool VCalFormat::fromString( Calendar *calendar, const QString &text )
 {
   // TODO: Factor out VCalFormat::fromString()
 
   QCString data = text.utf8();
 
   if ( !data.size() ) return false;
 
   VObject *vcal = Parse_MIME( data.data(), data.size());
   if ( !vcal ) return false;
 
   VObjectIterator i;
   VObject *curvo;
   initPropIterator( &i, vcal );
 
   // we only take the first object. TODO: parse all incidences.
   do  {
     curvo = nextVObject( &i );
   } while ( strcmp( vObjectName( curvo ), VCEventProp ) &&
             strcmp( vObjectName( curvo ), VCTodoProp ) );
 
   if ( strcmp( vObjectName( curvo ), VCEventProp ) == 0 ) {
     Event *event = VEventToEvent( curvo );
     calendar->addEvent( event );
   } else {
-    kdDebug(5800) << "VCalFormat::fromString(): Unknown object type." << endl;
+      qDebug("VCalFormat::fromString(): Unknown object type. ");
     deleteVObject( vcal );
     return false;
   }
 
   deleteVObject( vcal );
 
   return true;
 }
 
 QString VCalFormat::eventToString( Event * event, Calendar *calendar, bool useLocal)
 {
  
   if ( !event ) return QString::null;
   bool useL = useLocalTime;
   useLocalTime = useLocal;
   mCalendar = calendar;
   VObject *vevent = eventToVEvent( event );
   char *buf = writeMemVObject( 0, 0, vevent );
   QString result( buf );
   cleanVObject( vevent );
   useLocalTime =  useL;
   return result;
 }
 QString VCalFormat::todoToString( Todo * todo, Calendar *calendar, bool useLocal )
 {
  
  if ( !todo ) return QString::null;
   bool useL = useLocalTime;
   useLocalTime = useLocal;
   mCalendar = calendar;
   VObject *vevent = eventToVTodo( todo );
   char *buf = writeMemVObject( 0, 0, vevent );
   QString result( buf );
   cleanVObject( vevent );
   useLocalTime =  useL;
   return result;
 }
 
 QString VCalFormat::toString( Calendar *calendar )
 {
   // TODO: Factor out VCalFormat::asString()
 
   VObject *vcal = newVObject(VCCalProp);
 
   addPropValue( vcal, VCProdIdProp, CalFormat::productId() );
   QString tmpStr = mCalendar->getTimeZoneStr();
   addPropValue( vcal, VCTimeZoneProp, tmpStr.local8Bit() );
   addPropValue( vcal, VCVersionProp, _VCAL_VERSION );