ljp: fixed QString problem

1 files changed, 83 insertions, 82 deletions

diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 0fa7ad5..af1d4e4 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -85,25 +85,26 @@ void Today::autoStart() {
 
 void Today::draw() {
   init();
   getDates();
   getMail();
   getTodo(); 
   // how often refresh
   QTimer::singleShot( 5*1000, this, SLOT(draw()) );
 }
 
 void Today::init() {
   QDate date = QDate::currentDate();
-  QString time = (tr( date.toString() ), white);
+  QString time = (tr( date.toString()) );
+//  QString time = (tr( date.toString()) , white);
   
   TextLabel1->setText(time);
   db = new DateBookDB;
   
   // read config
   Config cfg("today");
   cfg.setGroup("BaseConfig"); 
 
   // how many lines should be showed in the task section
   MAX_LINES_TASK = cfg.readNumEntry("maxlinestask",5);
   // after how many chars should the be cut off on tasks and notes
   MAX_CHAR_CLIP = cfg.readNumEntry("maxcharclip",30);
@@ -177,82 +178,82 @@ void Today::getDates() {
   QValueList<EffectiveEvent> list = db->getEffectiveEvents(date, date);
 
   Config config( "qpe" );
   // if 24 h format
   //bool ampm = config.readBoolEntry( "AMPM", TRUE );
   
   int count=0;
   
   if ( list.count() > 0 ) {
     QString msg;
     
     for ( QValueList<EffectiveEvent>::ConstIterator it=list.begin();
-          it!=list.end(); ++it ) {
+    it!=list.end(); ++it ) {
       
       count++;
       
       if ( count <= MAX_LINES_MEET ) {
-        //cout << time.toString() << endl;
-        //cout << TimeString::dateString((*it).event().end()) << endl;
-        
-        // decide if to get all day or only later appointments
-        if (!ONLY_LATER) {
-          msg += "<B>" + (*it).description() + "</B>";
-          if ( (*it).event().hasAlarm() ) {
-            msg += " <b>[with alarm]</b>";
-          }
-          // include location or not
-          if (SHOW_LOCATION == 1) {
-            msg += "<BR><i>" + (*it).location();
-            msg += "</i>";
-          }
-          
-          if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") &&  (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") ) {
-            msg += "<br>All day";
-          }  else {
-            // start time of event
-            msg += "<br>" + TimeString::timeString(QTime((*it).event().start().time()) )
-              // end time of event
-              + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) );
-          }
-          msg += "<BR>";
-          // include possible note or not
-          if (SHOW_NOTES == 1) {
-            msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
-          }
-        } else if ((time.toString() <= TimeString::dateString((*it).event().end())) ) {
-          msg += "<B>" + (*it).description() + "</B>";
-          if ( (*it).event().hasAlarm() ) {
-            msg += " <b>[with alarm]</b>";
-          }
-          // include location or not
-          if (SHOW_LOCATION == 1) {
-            msg+= "<BR><i>" + (*it).location();
-            msg += "</i>";
-          }
-          
-          if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") &&  (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") ) {
-            msg += "<br>All day";
-          } else {
-            // start time of event
-            msg += "<br>" + TimeString::timeString(QTime((*it).event().start().time()) )
-              // end time of event
-              + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) );
-          }
-          msg += "<BR>";
-          // include possible note or not
-          if (SHOW_NOTES == 1) {
-            msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
-          }
-        }
+  //cout << time.toString() << endl;
+  //cout << TimeString::dateString((*it).event().end()) << endl;
+  
+  // decide if to get all day or only later appointments
+  if (!ONLY_LATER) {
+    msg += "<B>" + (*it).description() + "</B>";
+    if ( (*it).event().hasAlarm() ) {
+      msg += " <b>[with alarm]</b>";
+    }
+    // include location or not
+    if (SHOW_LOCATION == 1) {
+      msg += "<BR><i>" + (*it).location();
+      msg += "</i>";
+    }
+    
+    if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") &&  (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") ) {
+      msg += "<br>All day";
+    }  else {
+      // start time of event
+      msg += "<br>" + TimeString::timeString(QTime((*it).event().start().time()) )
+        // end time of event
+        + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) );
+    }
+    msg += "<BR>";
+    // include possible note or not
+    if (SHOW_NOTES == 1) {
+      msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
+    }
+  } else if ((time.toString() <= TimeString::dateString((*it).event().end())) ) {
+    msg += "<B>" + (*it).description() + "</B>";
+    if ( (*it).event().hasAlarm() ) {
+      msg += " <b>[with alarm]</b>";
+    }
+    // include location or not
+    if (SHOW_LOCATION == 1) {
+      msg+= "<BR><i>" + (*it).location();
+      msg += "</i>";
+    }
+    
+    if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") &&  (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") ) {
+      msg += "<br>All day";
+    } else {
+      // start time of event
+      msg += "<br>" + TimeString::timeString(QTime((*it).event().start().time()) )
+        // end time of event
+        + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) );
+    }
+    msg += "<BR>";
+    // include possible note or not
+    if (SHOW_NOTES == 1) {
+      msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
+    }
+  }
       }
     }
     if (msg.isEmpty()) {
       msg = tr("No more appointments today");
     }
     DatesField->setText(msg);
   }
 }
 
 /*
  * Parse in the todolist.xml
  */
@@ -273,49 +274,49 @@ QList<TodoItem> Today::loadTodo(const char *filename) {
   tasks = todo->el;
   tasks = tasks->el[0]; /*!DOCTYPE-quickhack*/
   if(tasks) {
     tasklist = tasks->el;
     i = 0;
     while((tasklist) && (tasklist[i])) {
       attlist = tasklist[i]->at;
       j = 0;
       description = NULL;
       priority = -1;
       completed = -1;
       while((attlist) && (attlist[j])) {
-        if(!attlist[j]->name) {
-          continue;
-        }
-        if(!strcmp(attlist[j]->name, "Description")) {
-          description = attlist[j]->value;
-        }
-        // get Completed tag (0 or 1)
-        if(!strcmp(attlist[j]->name, "Completed")) {
-          QString s = attlist[j]->name;
-          if(s == "Completed") {
-            completed = QString(attlist[j]->value).toInt();
-          }
-        }
-        // get Priority (1 to 5)
-        if(!strcmp(attlist[j]->name, "Priority")) {
-          QString s = attlist[j]->name;
-          if(s == "Priority") {
-            priority = QString(attlist[j]->value).toInt(); 
-          }
-        }
-        j++;
+  if(!attlist[j]->name) {
+    continue;
+  }
+  if(!strcmp(attlist[j]->name, "Description")) {
+    description = attlist[j]->value;
+  }
+  // get Completed tag (0 or 1)
+  if(!strcmp(attlist[j]->name, "Completed")) {
+    QString s = attlist[j]->name;
+    if(s == "Completed") {
+      completed = QString(attlist[j]->value).toInt();
+    }
+  }
+  // get Priority (1 to 5)
+  if(!strcmp(attlist[j]->name, "Priority")) {
+    QString s = attlist[j]->name;
+    if(s == "Priority") {
+      priority = QString(attlist[j]->value).toInt(); 
+    }
+  }
+  j++;
       }
       if(description) {
-        tmp = new TodoItem(description, completed, priority);
-        loadtodolist.append(tmp);
+  tmp = new TodoItem(description, completed, priority);
+  loadtodolist.append(tmp);
       }
       i++;
     }
   }
 
   minidom_free(todo);
   
   return loadtodolist;
 }
 
 
 void Today::getMail() {
@@ -344,28 +345,28 @@ void Today::getTodo() {
   int count = 0;
   
   QDir dir;
   QString homedir = dir.homeDirPath (); 
   // see if todolist.xml does exist.
   QFile f(homedir +"/Applications/todolist/todolist.xml");
   if ( f.exists() ) {
     QList<TodoItem> todolist = loadTodo(homedir +"/Applications/todolist/todolist.xml");
     
     TodoItem *item;
     for( item = todolist.first(); item; item = todolist.next()) {
       if (!(item->getCompleted() == 1) ) {
-        count++;
-        if (count <= MAX_LINES_TASK) {
-          tmpout += "<b>- </b>" + QString(((item)->getDescription().mid(0, MAX_CHAR_CLIP) + ("<br>")));
-        }
+  count++;
+  if (count <= MAX_LINES_TASK) {
+    tmpout += "<b>- </b>" + QString(((item)->getDescription().mid(0, MAX_CHAR_CLIP) + ("<br>")));
+  }
       }
     }
   }
   
   if (count > 0) {
     if( count == 1 ) {
       output = tr("There is <b> 1</b> active task:  <br>" );
     } else {
       output = tr("There are <b> %1</b> active tasks: <br>").arg(count);
     }
     output += tmpout;
   } else {