recurrence fixes

5 files changed, 32 insertions, 21 deletions

diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index de11c13..39921a0 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -178,270 +178,273 @@ void KOEventViewer::setSource(const QString& n)
             return;
         }
     } else {
         //QTextBrowser::setSource(n);
     }
 #endif
 }
 void KOEventViewer::mailToAttendees( bool all )
 {
     QPtrList<Attendee> attendees = mCurrentIncidence->attendees();
     if (attendees.count() == 0) return;
     QStringList nameList;
     QStringList emailList;
     QStringList uidList;
     Attendee* a;
     for(a=attendees.first();a;a=attendees.next()) {
         if ( !all && !a->RSVP() ) continue;
         if (!a->email().isEmpty()) {
             nameList.append (a->name() );
             emailList.append (a->email() );
             uidList.append (a->uid() );
         }
     }
     QString uid = "ComposeMailUIpick2"+mMailSubject;
 #ifndef DESKTOP_VERSION
     bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI("QPE/Application/ompi", uid, nameList, emailList, uidList);
 #endif
 
 }
 void KOEventViewer::addTag(const QString & tag,const QString & text)
 {
     int number=text.contains("\n");
     QString str = "<" + tag + ">";
     QString tmpText=text;
     QString tmpStr=str;
     if(number !=-1) 
         {
             if (number > 0) {
                 int pos=0;
                 QString tmp;
                 for(int i=0;i<=number;i++) {
                     pos=tmpText.find("\n");
                     tmp=tmpText.left(pos);
                     tmpText=tmpText.right(tmpText.length()-pos-1);
                     tmpStr+=tmp+"<br>";
                 }
             }
             else tmpStr += tmpText;
             tmpStr+="</" + tag + ">";
             mText.append(tmpStr);
         }
     else
         {
             str += text + "</" + tag + ">";
             mText.append(str);
         }
 }
 
 void KOEventViewer::setColorMode( int m )
 {
     mColorMode = m;
 }
 void KOEventViewer::appendEvent(Event *event, int mode )
 {  
     mMailSubject = "";
     mCurrentIncidence = event;
     bool shortDate = KOPrefs::instance()->mShortDateInViewer;
     topLevelWidget()->setCaption(i18n("Event Viewer"));
     if ( mode == 0 ) {
         addTag("h2",event->summary());
     }
     else {
         if ( mColorMode == 1 ) {
             mText +="<font color=\"#00A000\">";
         }
         if ( mColorMode == 2 ) {
             mText +="<font color=\"#C00000\">";
         }
         // mText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>";
         if ( mode == 1 ) {
             addTag("h2",i18n( "Local: " ) +event->summary());
         } else {
             addTag("h2",i18n( "Remote: " ) +event->summary());
         } 
         addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) );
         if ( mColorMode )
             mText += "</font>";
     } 
     mMailSubject += i18n( "Meeting " )+ event->summary();
     if (event->cancelled ()) {
         mText +="<font color=\"#B00000\">";
         addTag("i",i18n("This event has been cancelled!"));
         mText.append("<br>");
         mText += "</font>";
         mMailSubject += i18n("(cancelled)");
     }
     if (!event->location().isEmpty()) {
         addTag("b",i18n("Location: "));
         mText.append(event->location()+"<br>");
         mMailSubject += i18n(" at ") + event->location();
     }
     if (event->doesFloat()) {
         if (event->isMultiDay()) {
             mText.append(i18n("<p><b>From:</b> %1 </p><p><b>To:</b> %2</p>")
                          .arg(event->dtStartDateStr(shortDate))
                          .arg(event->dtEndDateStr(shortDate)));
         } else {
             mText.append(i18n("<p><b>On:</b> %1</p>").arg(event->dtStartDateStr( shortDate )));
         }
     } else {
         if (event->isMultiDay()) {
             mText.append(i18n("<p><b>From:</b> %1</p> ")
                          .arg(event->dtStartStr( shortDate)));
             mText.append(i18n("<p><b>To:</b> %1</p>")
                          .arg(event->dtEndStr(shortDate)));
         } else {
             mText.append(i18n("<p><b>On:</b> %1</p> ")
                          .arg(event->dtStartDateStr( shortDate )));
             mText.append(i18n("<p><b>From:</b> %1 <b>To:</b> %2</p>")
                          .arg(event->dtStartTimeStr())
                          .arg(event->dtEndTimeStr()));
         }
     }
 
     if (event->recurrence()->doesRecur()) {
 
         QString recurText = event->recurrence()->recurrenceText();
         addTag("p","<em>" + i18n("This is a %1 recurring event.").arg(recurText ) + "</em>");
-        bool last;
+        bool ok;
         QDate start = QDate::currentDate();
-        QDate next;
-        next = event->recurrence()->getPreviousDate( start , &last );
-        if ( !last ) {
-            next = event->recurrence()->getNextDate( start.addDays( - 1 ) );
+        QDateTime next;
+        next = event->getNextOccurence( QDateTime::currentDateTime() , &ok );
+        if ( ok ) {
             addTag("p",i18n("<b>Next recurrence is on:</b>")  );
-            addTag("p", KGlobal::locale()->formatDate( next, shortDate ));
-            QDateTime nextdt = QDateTime( next, event->dtStart().time());
-            mMailSubject += i18n(" - " )+ KGlobal::locale()->formatDateTime( nextdt, true );
+            addTag("p", KGlobal::locale()->formatDate( next.date(), shortDate ));
+            mMailSubject += i18n(" - " )+ KGlobal::locale()->formatDateTime( next, true );
 
         } else {
-            addTag("p",i18n("<b>Last recurrence was on:</b>")  );
-            addTag("p", KGlobal::locale()->formatDate( next, shortDate ));
+            bool last;
+            QDate nextd;
+            nextd = event->recurrence()->getPreviousDate( QDate::currentDate() , &last );
+            if ( last ) {
+                addTag("p",i18n("<b>Last recurrence was on:</b>")  );
+                addTag("p", KGlobal::locale()->formatDate( nextd, shortDate ));
+            }
         }
     } else {
         mMailSubject += i18n(" - " )+event->dtStartStr( true );
 
     }
 
 
     if (event->isAlarmEnabled()) {
         Alarm *alarm =event->alarms().first() ;
         QDateTime t = alarm->time();
         int min = t.secsTo( event->dtStart() )/60;
         QString s =i18n("( %1 min before )").arg( min );
         addTag("p",i18n("<b>Alarm on: ") + s  +" </b>");
         addTag("p", KGlobal::locale()->formatDateTime( t, shortDate ));
         //addTag("p",s);
     }
 
     addTag("b",i18n("Access: "));
     mText.append(event->secrecyStr()+"<br>");
     if (!event->description().isEmpty()) {
         addTag("p",i18n("<b>Details: </b>"));
         addTag("p",event->description());
     }
 
     formatCategories(event);
 
     formatReadOnly(event);
     formatAttendees(event);
 
     setText(mText);
     //QWhatsThis::add(this,mText);
 
 }
 
 void KOEventViewer::appendTodo(Todo *event, int mode )
 {
     mMailSubject = "";
     mCurrentIncidence = event;
     topLevelWidget()->setCaption(i18n("Todo Viewer"));
     bool shortDate = KOPrefs::instance()->mShortDateInViewer;
     if (mode == 0 )
         addTag("h2",event->summary());
     else { 
         if ( mColorMode == 1 ) {
             mText +="<font color=\"#00A000\">";
         }
         if ( mColorMode == 2 ) {
             mText +="<font color=\"#B00000\">";
         }
         if ( mode == 1 ) {
             addTag("h2",i18n( "Local: " ) +event->summary());
         } else {
             addTag("h2",i18n( "Remote: " ) +event->summary());
         }
         addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) );
         if ( mColorMode )
             mText += "</font>";
     } 
     mMailSubject += i18n( "Todo " )+ event->summary();
 
      if ( event->percentComplete() == 100 && event->hasCompletedDate() ) {
         mText +="<font color=\"#B00000\">";
         addTag("i",  i18n("<p><i>Completed on %1</i></p>").arg( event->completedStr(KOPrefs::instance()->mShortDateInViewer) ) );
         mText += "</font>";
     } else {
         mText.append(i18n("<p><i>%1 % completed</i></p>")
                      .arg(event->percentComplete()));
     }
 
     if (event->cancelled ()) {
         mText +="<font color=\"#B00000\">";
         addTag("i",i18n("This todo has been cancelled!"));
         mText.append("<br>");
         mText += "</font>";
         mMailSubject += i18n("(cancelled)");
     }
    
     if (!event->location().isEmpty()) {
         addTag("b",i18n("Location: "));
         mText.append(event->location()+"<br>");
         mMailSubject += i18n(" at ") + event->location();
     }
     if (event->hasStartDate()) {
         mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(KOPrefs::instance()->mShortDateInViewer)));
     }
     if (event->hasDueDate()) {
         mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer)));
         mMailSubject += i18n(" - " )+event->dtDueStr(  true );
     }
     addTag("b",i18n("Access: "));
     mText.append(event->secrecyStr()+"<br>");
     if (!event->description().isEmpty()) {
         addTag("p",i18n("<b>Details: </b>"));
         addTag("p",event->description());
     }
 
     formatCategories(event);
 
     mText.append(i18n("<p><b>Priority:</b> %2</p>")
                  .arg(QString::number(event->priority())));
 
     formatReadOnly(event);
     formatAttendees(event);
     if ( event->relatedTo() ) {
         addTag("b",i18n("Parent todo:<br>"));
         mText.append(event->relatedTo()->summary()+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>");
     }
     QPtrList<Incidence> Relations = event->relations();
     Incidence *to;
     if ( Relations.first() )
         addTag("b",i18n("Sub todos:<br>"));
     for (to=Relations.first();to;to=Relations.next()) {
         mText.append( to->summary()+" [" +QString::number(to->priority()) + "/" + QString::number(((Todo*)to)->percentComplete())+"%]<br>");
         
     } 
     setText(mText);
 }
 
 void KOEventViewer::formatCategories(Incidence *event)
 {
     if (!event->categoriesStr().isEmpty()) {
         if (event->categories().count() == 1) {
             addTag("h3",i18n("Category"));
         } else {
             addTag("h3",i18n("Categories"));
         }
         addTag("p",event->categoriesStr());
     }
diff --git a/libkcal/kincidenceformatter.cpp b/libkcal/kincidenceformatter.cpp
index 6d07d4c..0d9c3f4 100644
--- a/libkcal/kincidenceformatter.cpp
+++ b/libkcal/kincidenceformatter.cpp
@@ -1,245 +1,251 @@
 #include "kincidenceformatter.h"
 #include <kstaticdeleter.h>
 #include <kglobal.h>
 #include <klocale.h>
 #ifdef DEKTOP_VERSION
 #include <kabc/stdaddressbook.h>
 #define size count
 #endif
 
 KIncidenceFormatter* KIncidenceFormatter::mInstance = 0;
 static KStaticDeleter<KIncidenceFormatter> insd;
 
 QString KIncidenceFormatter::getFormattedText( Incidence * inc )
 {
 // #ifndef QT_NO_INPUTDIALOG
 //   return QInputDialog::getItem( caption, label, items, current, editable );
 // #else
 //   return QString::null;
 // #endif
     mText = "";
     if ( inc->type() == "Event" )
         setEvent((Event *) inc );
     else if ( inc->type() == "Todo" )
         setTodo((Todo *) inc );
     return mText;
 }
 
 KIncidenceFormatter* KIncidenceFormatter::instance()
 {
     if (!mInstance) {
       mInstance = insd.setObject(new KIncidenceFormatter());
   }
   return mInstance;
 }
 KIncidenceFormatter::~KIncidenceFormatter()
 {
  if (mInstance == this)
       mInstance = insd.setObject(0); 
  //qDebug("KIncidenceFormatter::~KIncidenceFormatter ");
 }
 KIncidenceFormatter::KIncidenceFormatter()
 {
     mColorMode = 0;
 }
 void KIncidenceFormatter::setEvent(Event *event)
 {
     int mode = 0;
     mCurrentIncidence = event;
     bool shortDate = true;
     if ( mode == 0 ) {
         addTag("h3",event->summary());
     }
     else {
         if ( mColorMode == 1 ) {
             mText +="<font color=\"#00A000\">";
         }
         if ( mColorMode == 2 ) {
             mText +="<font color=\"#C00000\">";
         }
         // mText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>";
         if ( mode == 1 ) {
             addTag("h2",i18n( "Local: " ) +event->summary());
         } else {
             addTag("h2",i18n( "Remote: " ) +event->summary());
         } 
         addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) );
         if ( mColorMode )
             mText += "</font>";
     } 
     if (event->cancelled ()) {
         mText +="<font color=\"#B00000\">";
         addTag("i",i18n("This event has been cancelled!"));
         mText.append("<br>");
         mText += "</font>";
     }
     if (!event->location().isEmpty()) {
         addTag("b",i18n("Location: "));
         mText.append(event->location()+"<br>");
     }
     if (event->doesFloat()) {
         if (event->isMultiDay()) {
             mText.append(i18n("<p><b>From:</b> %1 </p><p><b>To:</b> %2</p>")
                          .arg(event->dtStartDateStr(shortDate))
                          .arg(event->dtEndDateStr(shortDate)));
         } else {
             mText.append(i18n("<p><b>On:</b> %1</p>").arg(event->dtStartDateStr( shortDate )));
         }
     } else {
         if (event->isMultiDay()) {
             mText.append(i18n("<p><b>From:</b> %1</p> ")
                          .arg(event->dtStartStr( shortDate)));
             mText.append(i18n("<p><b>To:</b> %1</p>")
                          .arg(event->dtEndStr(shortDate)));
         } else {
             mText.append(i18n("<p><b>On:</b> %1</p> ")
                          .arg(event->dtStartDateStr( shortDate )));
             mText.append(i18n("<p><b>From:</b> %1 <b>To:</b> %2</p>")
                          .arg(event->dtStartTimeStr())
                          .arg(event->dtEndTimeStr()));
         }
     }
 
     if (event->recurrence()->doesRecur()) {
 
         QString recurText = event->recurrence()->recurrenceText();
         addTag("p","<em>" + i18n("This is a %1 recurring event.").arg(recurText ) + "</em>");
-        bool last;
+
+ bool ok;
         QDate start = QDate::currentDate();
-        QDate next;
-        next = event->recurrence()->getPreviousDate( start , &last );
-        if ( !last ) {
-            next = event->recurrence()->getNextDate( start.addDays( - 1 ) );
-            addTag("p",i18n("Next recurrence is on: ")+ KGlobal::locale()->formatDate( next, shortDate ) );
-            //addTag("p", KGlobal::locale()->formatDate( next, shortDate ));
+        QDateTime next;
+        next = event->getNextOccurence( QDateTime::currentDateTime() , &ok );
+        if ( ok ) {
+            addTag("p",i18n("<b>Next recurrence is on:</b>")  );
+            addTag("p", KGlobal::locale()->formatDate( next.date(), shortDate ));
+
         } else {
-            addTag("p",i18n("<b>Last recurrence was on:</b>")  );
-            addTag("p", KGlobal::locale()->formatDate( next, shortDate ));
+            bool last;
+            QDate nextd;
+            nextd = event->recurrence()->getPreviousDate( QDate::currentDate() , &last );
+            if ( last ) {
+                addTag("p",i18n("<b>Last recurrence was on:</b>")  );
+                addTag("p", KGlobal::locale()->formatDate( nextd, shortDate ));
+            }
         }
     }
 
 
     if (event->isAlarmEnabled()) {
         Alarm *alarm =event->alarms().first() ;
         QDateTime t = alarm->time();
         int min = t.secsTo( event->dtStart() )/60;
         QString s =i18n("(%1 min before)").arg( min );
         addTag("p",i18n("<b>Alarm on:  </b>")  + s  + ": "+KGlobal::locale()->formatDateTime( t, shortDate ));
         //addTag("p", KGlobal::locale()->formatDateTime( t, shortDate ));
         //addTag("p",s);
     }
 
     addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() );
     // mText.append(event->secrecyStr()+"<br>");
     formatCategories(event);
     if (!event->description().isEmpty()) {
         addTag("p",i18n("<b>Details: </b>"));
         addTag("p",event->description());
     }
 
 
     formatReadOnly(event);
     formatAttendees(event);
 
  
 }
 
 void KIncidenceFormatter::setTodo(Todo *event )
 {
     int mode = 0;
     mCurrentIncidence = event;
     bool shortDate = true;
     if (mode == 0 )
         addTag("h3",event->summary());
     else { 
         if ( mColorMode == 1 ) {
             mText +="<font color=\"#00A000\">";
         }
         if ( mColorMode == 2 ) {
             mText +="<font color=\"#B00000\">";
         }
         if ( mode == 1 ) {
             addTag("h2",i18n( "Local: " ) +event->summary());
         } else {
             addTag("h2",i18n( "Remote: " ) +event->summary());
         }
         addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) );
         if ( mColorMode )
             mText += "</font>";
     } 
     if ( event->percentComplete() == 100 && event->hasCompletedDate() ) {
         mText +="<font color=\"#B00000\">";
         addTag("i",  i18n("<p><i>Completed on %1</i></p>").arg( event->completedStr(shortDate) ) );
         mText += "</font>";
     } else {
         mText.append(i18n("<p><i>%1 % completed</i></p>")
                      .arg(event->percentComplete()));
     }
     if (event->cancelled ()) {
         mText +="<font color=\"#B00000\">";
         addTag("i",i18n("This todo has been cancelled!"));
         mText.append("<br>");
         mText += "</font>";
     }
    
     if (!event->location().isEmpty()) {
         addTag("b",i18n("Location: "));
         mText.append(event->location()+"<br>");
     }
     if (event->hasDueDate()) {
         mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(shortDate)));
     }
     mText.append(i18n("<p><b>Priority:</b> %2</p>")
                  .arg(QString::number(event->priority())));
   
     addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() );
     formatCategories(event);
     if (!event->description().isEmpty()) {
         addTag("p",i18n("<b>Details: </b>"));
         addTag("p",event->description());
     }
 
 
 
     formatReadOnly(event);
     formatAttendees(event);
 
 }
 
 void KIncidenceFormatter::setJournal(Journal*  )
 {
 
 }
 
 void KIncidenceFormatter::formatCategories(Incidence *event)
 {
  if (!event->categoriesStr().isEmpty()) {
      addTag("p",i18n("<b>Categories: </b>")+event->categoriesStr() );
      //mText.append(event->categoriesStr());
  }
 }
 void KIncidenceFormatter::addTag(const QString & tag,const QString & text)
 {
   int number=text.contains("\n");
     QString str = "<" + tag + ">";
     QString tmpText=text;
     QString tmpStr=str;
     if(number !=-1) 
         {
             if (number > 0) {
                 int pos=0;
                 QString tmp;
                 for(int i=0;i<=number;i++) {
                     pos=tmpText.find("\n");
                     tmp=tmpText.left(pos);
                     tmpText=tmpText.right(tmpText.length()-pos-1);
                     tmpStr+=tmp+"<br>";
                 }
             }
             else tmpStr += tmpText;
             tmpStr+="</" + tag + ">";
             mText.append(tmpStr);
         }
     else
         {
             str += text + "</" + tag + ">";
diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp
index e84f672..5181eaf 100644
--- a/libkcal/recurrence.cpp
+++ b/libkcal/recurrence.cpp
@@ -754,256 +754,257 @@ void Recurrence::addYearlyMonthPos(short _rPos, const QBitArray &_rDays)
 }
 
 const QPtrList<int> &Recurrence::yearNums() const
 {
   return rYearNums;
 }
 void Recurrence::addYearlyMonth(short _rPos )
 { 
     if (mRecurReadOnly  ||  recurs != rYearlyMonth)    // invalid day/month number
     return;
   rMonthPos *tmpPos = new rMonthPos;
   if ( _rPos > 0) {
     tmpPos->rPos = _rPos;
     tmpPos->negative = false;
   } else {
     tmpPos->rPos = -_rPos; // take abs()
     tmpPos->negative = true;
   }
   rMonthPositions.append(tmpPos);
 }
 void Recurrence::addYearlyNum(short _rNum)
 {
   if (mRecurReadOnly
   ||  (recurs != rYearlyMonth && recurs != rYearlyDay && recurs != rYearlyPos)
   ||  _rNum <= 0)    // invalid day/month number
     return;
 
   if (mCompatVersion < 310 && mCompatRecurs == rYearlyDay) {
     // Backwards compatibility for KDE < 3.1.
     // Dates were stored as day numbers, with a fiddle to take account of leap years.
     // Convert the day number to a month.
     if (_rNum <= 0 || _rNum > 366 || (_rNum == 366 && mRecurStart.date().daysInYear() < 366))
       return;     // invalid day number
     _rNum = QDate(mRecurStart.date().year(), 1, 1).addDays(_rNum - 1).month();
   } else
   if ((recurs == rYearlyMonth || recurs == rYearlyPos) && _rNum > 12
   ||  recurs == rYearlyDay && _rNum > 366)
     return;     // invalid day number
 
   uint i = 0;
   for (int* it = rYearNums.first();  it && _rNum >= *it;  it = rYearNums.next()) {
     if (_rNum == *it)
       return;        // this day/month is already in the list - avoid duplication
     ++i;
   }
 
   int *tmpNum = new int;
   *tmpNum = _rNum;
   rYearNums.insert(i, tmpNum);   // insert the day/month in a sorted position
 
   if (mCompatVersion < 310 && mCompatDuration > 0) {
     // Backwards compatibility for KDE < 3.1.
     // rDuration was set to the number of time periods to recur.
     // Convert this to the number of occurrences.
     QDate end(mRecurStart.date().year() + (mCompatDuration-1+mRecurExDatesCount)*rFreq, 12, 31);
     rDuration = INT_MAX;    // ensure that recurCalc() does its job correctly
     rDuration = recurCalc(COUNT_TO_DATE, end);
   }
 
   if (mParent) mParent->updated();
 }
 
 
 QDateTime Recurrence::getNextDateTime(const QDateTime &preDateTime, bool *last) const
 {  
     if (last)
         *last = false;
   int freq;
   switch (recurs)
   {
     case rMinutely:
       freq = rFreq * 60;
       break;
     case rHourly:
       freq = rFreq * 3600;
       break;
     case rDaily:
     case rWeekly:
     case rMonthlyPos:
     case rMonthlyDay:
     case rYearlyMonth:
     case rYearlyDay:
     case rYearlyPos: {
       QDate preDate = preDateTime.date();
       if (!mFloats && mRecurStart.time() > preDateTime.time())
         preDate = preDate.addDays(-1);
       return QDateTime(getNextDateNoTime(preDate, last), mRecurStart.time());
     }
     default:
       return QDateTime();
   }
 
   // It's a sub-daily recurrence
   if (preDateTime < mRecurStart)
     return mRecurStart;
   int count = mRecurStart.secsTo(preDateTime) / freq + 2;
   if (rDuration > 0) {
     if (count > rDuration)
       return QDateTime();
     if (last && count == rDuration)
       *last = true;
   }
   QDateTime endtime = mRecurStart.addSecs((count - 1)*freq);
   if (rDuration == 0) {
     if (endtime > rEndDateTime)
       return QDateTime();
     if (last && endtime == rEndDateTime)
       *last = true;
   }
   return endtime;
 }
 
 QDate Recurrence::getNextDate(const QDate &preDate, bool *last) const
 { 
     if (last)
         *last = false;
     switch (recurs)
   {
     case rMinutely:
     case rHourly:
       return getNextDateTime(QDateTime(preDate, QTime(23,59,59)), last).date();
     case rDaily:
     case rWeekly:
     case rMonthlyPos:
     case rMonthlyDay:
     case rYearlyMonth:
     case rYearlyDay:
     case rYearlyPos:
+        qDebug("Recurrence::getNextDate: MAY BE BROKEN ");
       return getNextDateNoTime(preDate, last);
     default:
       return QDate();
   }
 }
 
 
 QDateTime Recurrence::getPreviousDateTime(const QDateTime &afterDateTime, bool *last) const
 {
     if (last)
         *last = false;
   int freq;
   switch (recurs)
   {
     case rMinutely:
       freq = rFreq * 60;
       break;
     case rHourly:
       freq = rFreq * 3600;
       break;
     case rDaily:
     case rWeekly:
     case rMonthlyPos:
     case rMonthlyDay:
     case rYearlyMonth:
     case rYearlyDay:
     case rYearlyPos: {
       QDate afterDate = afterDateTime.date();
       if (!mFloats && mRecurStart.time() < afterDateTime.time())
         afterDate = afterDate.addDays(1);
       return QDateTime(getPreviousDateNoTime(afterDate, last), mRecurStart.time());
     }
     default:
       return QDateTime();
   }
 
   // It's a sub-daily recurrence
   if (afterDateTime <= mRecurStart)
     return QDateTime();
   int count = (mRecurStart.secsTo(afterDateTime) - 1) / freq + 1;
   if (rDuration > 0) {
     if (count > rDuration)
       count = rDuration;
     if (last && count == rDuration)
       *last = true;
   }
   QDateTime endtime = mRecurStart.addSecs((count - 1)*freq);
   if (rDuration == 0) {
     if (endtime > rEndDateTime)
       endtime = rEndDateTime;
     if (last && endtime == rEndDateTime)
       *last = true;
   }
   return endtime;
 }
 
 QDate Recurrence::getPreviousDate(const QDate &afterDate, bool *last) const
 {
   if (last)
         *last = false;
   switch (recurs)
   {
     case rMinutely:
     case rHourly:
       return getPreviousDateTime(QDateTime(afterDate, QTime(0,0,0)), last).date();
     case rDaily:
     case rWeekly:
     case rMonthlyPos:
     case rMonthlyDay:
     case rYearlyMonth:
     case rYearlyDay:
     case rYearlyPos:
       return getPreviousDateNoTime(afterDate, last);
     default:
       return QDate();
   }
 }
 
 
 /***************************** PROTECTED FUNCTIONS ***************************/
 
 bool Recurrence::recursSecondly(const QDate &qd, int secondFreq) const
 {
   if ((qd >= mRecurStart.date()) &&
       ((rDuration > 0) && (qd <= endDate()) ||
        ((rDuration == 0) && (qd <= rEndDateTime.date())) ||
        (rDuration == -1))) {
     // The date queried falls within the range of the event.
     if (secondFreq < 24*3600)
       return true;      // the event recurs at least once each day
     int after = mRecurStart.secsTo(QDateTime(qd));
     if (after / secondFreq != (after + 24*3600) / secondFreq)
       return true;
   }
   return false;
 }
 
 bool Recurrence::recursMinutelyAt(const QDateTime &dt, int minuteFreq) const
 {
   if ((dt >= mRecurStart) &&
       ((rDuration > 0) && (dt <= endDateTime()) ||
        ((rDuration == 0) && (dt <= rEndDateTime)) ||
        (rDuration == -1))) {
     // The time queried falls within the range of the event.
     if (((mRecurStart.secsTo(dt) / 60) % minuteFreq) == 0)
       return true;
   }
   return false;
 }
 
 bool Recurrence::recursDaily(const QDate &qd) const
 {
   QDate dStart = mRecurStart.date();
   if ((dStart.daysTo(qd) % rFreq) == 0) {
     // The date is a day which recurs
     if (qd >= dStart
     &&  ((rDuration > 0 && qd <= endDate()) ||
          (rDuration == 0 && qd <= rEndDateTime.date()) ||
          rDuration == -1)) {
       // The date queried falls within the range of the event.
       return true;
     }
   }
   return false;
 }
 
 bool Recurrence::recursWeekly(const QDate &qd) const
 {
@@ -1041,256 +1042,257 @@ bool Recurrence::recursMonthly(const QDate &qd) const
          rDuration == -1)) {
       // The date queried falls within the range of the event.
       QValueList<int> days;
       int daysInMonth = qd.daysInMonth();
       if (recurs == rMonthlyDay)
         getMonthlyDayDays(days, daysInMonth);
       else if (recurs == rMonthlyPos)
         getMonthlyPosDays(days, daysInMonth, QDate(year, month, 1).dayOfWeek());
       for (QValueList<int>::Iterator it = days.begin();  it != days.end();  ++it) {
         if (*it == day)
           return true;
       }
       // no dates matched
     }
   }
   return false;
 }
 
 bool Recurrence::recursYearlyByMonth(const QDate &qd) const
 {
   QDate dStart = mRecurStart.date();
   int startDay = dStart.day();
   int qday     = qd.day();
   int qmonth   = qd.month();
   int qyear    = qd.year();
   bool match = (qday == startDay);
   if (!match && startDay == 29 && dStart.month() == 2) {
     // It's a recurrence on February 29th
     switch (mFeb29YearlyType) {
       case rFeb28:
         if (qday == 28 && qmonth == 2 && !QDate::leapYear(qyear))
           match = true;
         break;
       case rMar1:
         if (qday == 1 && qmonth == 3 && !QDate::leapYear(qyear)) {
           qmonth = 2;
           match = true;
         }
         break;
       case rFeb29:
         break;
     }
   }
 
   if (match) {
     // The day of the month matches. Calculate how many years ahead
     // this date is from the original event's date.
     int yearsAhead = (qyear - dStart.year());
     if (yearsAhead % rFreq == 0) {
       // The date is in a year which recurs
       if (qd >= dStart
       &&  ((rDuration > 0 && qd <= endDate()) ||
            (rDuration == 0 && qd <= rEndDateTime.date()) ||
            rDuration == -1)) {
         // The date queried falls within the range of the event.
         int i = qmonth;
         for (QPtrListIterator<int> qlin(rYearNums); qlin.current(); ++qlin) {
           if (i == *qlin.current())
             return true;
         }
       }
     }
   }
   return false;
 }
 
 bool Recurrence::recursYearlyByPos(const QDate &qd) const
 {
   QDate dStart = mRecurStart.date();
   int year  = qd.year();
   int month = qd.month();
   int day   = qd.day();
   // calculate how many years ahead this date is from the original
   // event's date
   int yearsAhead = (year - dStart.year());
   if (yearsAhead % rFreq == 0) {
     // The date is in a year which recurs
     if (qd >= dStart
     &&  ((rDuration > 0 && qd <= endDate()) ||
          (rDuration == 0 && qd <= rEndDateTime.date()) ||
          rDuration == -1)) {
       // The date queried falls within the range of the event.
       for (QPtrListIterator<int> qlin(rYearNums); qlin.current(); ++qlin) {
         if (month == *qlin.current()) {
           // The month recurs
           QValueList<int> days;
           getMonthlyPosDays(days, qd.daysInMonth(), QDate(year, month, 1).dayOfWeek());
           for (QValueList<int>::Iterator it = days.begin();  it != days.end();  ++it) {
             if (*it == day)
               return true;
           }
         }
       }
     }
   }
   return false;
 }
 
 bool Recurrence::recursYearlyByDay(const QDate &qd) const
 {
   QDate dStart = mRecurStart.date();
   // calculate how many years ahead this date is from the original
   // event's date
   int yearsAhead = (qd.year() - dStart.year());
   if (yearsAhead % rFreq == 0) {
     // The date is in a year which recurs
     if (qd >= dStart
     &&  ((rDuration > 0 && qd <= endDate()) ||
          (rDuration == 0 && qd <= rEndDateTime.date()) ||
          rDuration == -1)) {
       // The date queried falls within the range of the event.
       int i = qd.dayOfYear();
       for (QPtrListIterator<int> qlin(rYearNums); qlin.current(); ++qlin) {
         if (i == *qlin.current())
           return true;
       }
     }
   }
   return false;
 }
 
 /* Get the date of the next recurrence, after the specified date.
  * If 'last' is non-null, '*last' is set to true if the next recurrence is the
  * last recurrence, else false.
  * Reply = date of next recurrence, or invalid date if none.
  */
 QDate Recurrence::getNextDateNoTime(const QDate &preDate, bool *last) const
 {
+    
   if (last)
     *last = false;
   QDate dStart = mRecurStart.date();
   if (preDate < dStart)
     return dStart;
   QDate earliestDate = preDate.addDays(1);
   QDate nextDate;
 
   switch (recurs) {
     case rDaily:
       nextDate = dStart.addDays((dStart.daysTo(preDate)/rFreq + 1) * rFreq);
       break;
 
     case rWeekly: {
       QDate start = dStart.addDays(1 - dStart.dayOfWeek());   // start of week for dStart
       int earliestDayOfWeek = earliestDate.dayOfWeek();
       int weeksAhead = start.daysTo(earliestDate) / 7;
       int notThisWeek = weeksAhead % rFreq;    // zero if this week is a recurring week
       weeksAhead -= notThisWeek;               // latest week which recurred
       int weekday = 0;
       // First check for any remaining day this week, if this week is a recurring week
       if (!notThisWeek)
         weekday = getFirstDayInWeek(earliestDayOfWeek);
       // Check for a day in the next scheduled week
       if (!weekday  &&  earliestDayOfWeek > 1)
         weekday = getFirstDayInWeek(rWeekStart) + rFreq*7;
       if (weekday)
         nextDate = start.addDays(weeksAhead*7 + weekday - 1);
       break;
     }
     case rMonthlyDay:
     case rMonthlyPos: {
       int startYear  = dStart.year();
       int startMonth = dStart.month();     // 1..12
       int earliestYear = earliestDate.year();
       int monthsAhead = (earliestYear - startYear)*12 + earliestDate.month() - startMonth;
       int notThisMonth = monthsAhead % rFreq;    // zero if this month is a recurring month
       monthsAhead -= notThisMonth;               // latest month which recurred
       // Check for the first later day in the current month
       if (!notThisMonth)
         nextDate = getFirstDateInMonth(earliestDate);
       if (!nextDate.isValid()  &&  earliestDate.day() > 1) {
         // Check for a day in the next scheduled month
         int months = startMonth - 1 + monthsAhead + rFreq;
         nextDate = getFirstDateInMonth(QDate(startYear + months/12, months%12 + 1, 1));
       }
       break;
     }
     case rYearlyMonth:
     case rYearlyPos:
     case rYearlyDay: {
       int startYear  = dStart.year();
       int yearsAhead = earliestDate.year() - startYear;
       int notThisYear = yearsAhead % rFreq;   // zero if this year is a recurring year
       yearsAhead -= notThisYear;              // latest year which recurred
       // Check for the first later date in the current year
       if (!notThisYear)
         nextDate = getFirstDateInYear(earliestDate);
       // Check for a date in the next scheduled year
       if (!nextDate.isValid()  &&  earliestDate.dayOfYear() > 1)
         nextDate = getFirstDateInYear(QDate(startYear + yearsAhead + rFreq, 1, 1));
       break;
     }
     case rNone:
     default:
       return QDate();
   }
 
   if (rDuration >= 0 && nextDate.isValid()) {
     // Check that the date found is within the range of the recurrence
     QDate end = endDate();
     if (nextDate > end)
       return QDate();
     if (last  &&  nextDate == end)
       *last = true;
   }
   return nextDate;
 }
 
 /* Get the date of the last previous recurrence, before the specified date.
  * Reply = date of previous recurrence, or invalid date if none.
  */
 QDate Recurrence::getPreviousDateNoTime(const QDate &afterDate, bool *last) const
 {
   if (last)
     *last = false;
   QDate dStart = mRecurStart.date();
   QDate latestDate = afterDate.addDays(-1);
   if (latestDate < dStart)
     return QDate();
   QDate prevDate;
 
   switch (recurs) {
     case rDaily:
       prevDate = dStart.addDays((dStart.daysTo(latestDate) / rFreq) * rFreq);
       break;
 
     case rWeekly: {
       QDate start = dStart.addDays(1 - dStart.dayOfWeek());   // start of week for dStart
       int latestDayOfWeek = latestDate.dayOfWeek();
       int weeksAhead = start.daysTo(latestDate) / 7;
       int notThisWeek = weeksAhead % rFreq;    // zero if this week is a recurring week
       weeksAhead -= notThisWeek;               // latest week which recurred
       int weekday = 0;
       // First check for any previous day this week, if this week is a recurring week
       if (!notThisWeek)
         weekday = getLastDayInWeek(latestDayOfWeek);
       // Check for a day in the previous scheduled week
       if (!weekday) {
         int weekEnd = (rWeekStart + 5)%7 + 1;
         if (latestDayOfWeek < weekEnd) {
           if (!notThisWeek)
             weeksAhead -= rFreq;
           weekday = getLastDayInWeek(weekEnd);
         }
       }
       if (weekday)
         prevDate = start.addDays(weeksAhead*7 + weekday - 1);
       break;
     }
     case rMonthlyDay:
     case rMonthlyPos: {
       int startYear  = dStart.year();
       int startMonth = dStart.month();     // 1..12
       int latestYear = latestDate.year();
       int monthsAhead = (latestYear - startYear)*12 + latestDate.month() - startMonth;
       int notThisMonth = monthsAhead % rFreq;    // zero if this month is a recurring month
       monthsAhead -= notThisMonth;               // latest month which recurred
diff --git a/microkde/kdeui/ktoolbar.cpp b/microkde/kdeui/ktoolbar.cpp
index 09ad0c8..35d4916 100644
--- a/microkde/kdeui/ktoolbar.cpp
+++ b/microkde/kdeui/ktoolbar.cpp
@@ -753,257 +753,257 @@ KToolBarButton * KToolBar::getButton (int id)
         return 0;
 //US    return dynamic_cast<KToolBarButton *>( *it );
     return (KToolBarButton *)( *it );
 }
 
 
 void KToolBar::alignItemRight (int id, bool right )
 {
     Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
         return;
     if ( rightAligned && !right && (*it) == rightAligned )
         rightAligned = 0;
     if ( (*it) && right )
         rightAligned = (*it);
 }
 
 
 QWidget *KToolBar::getWidget (int id)
 {
     Id2WidgetMap::Iterator it = id2widget.find( id );
     return ( it == id2widget.end() ) ? 0 : (*it);
 }
 
 
 void KToolBar::setItemAutoSized (int id, bool yes )
 {
     QWidget *w = getWidget(id);
     if ( w && yes )
         setStretchableWidget( w );
 }
 
 
 void KToolBar::clear ()
 {
     QToolBar::clear();
     widget2id.clear();
     id2widget.clear();
 }
 
 
 void KToolBar::removeItem(int id)
 {
     Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
     {
         kdDebug(220) << "KToolBar::removeItem item " << id << " not found" << endl;
         return;
     }
     QWidget * w = (*it);
     id2widget.remove( id );
     widget2id.remove( w );
     widgets.removeRef( w );
     delete w;
 }
 
 
 void KToolBar::removeItemDelayed(int id)
 {
     Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
     {
         kdDebug(220) << "KToolBar::removeItem item " << id << " not found" << endl;
         return;
     }
     QWidget * w = (*it);
     id2widget.remove( id );
     widget2id.remove( w );
     widgets.removeRef( w );
 
     w->blockSignals(true);
     d->idleButtons.append(w);
     layoutTimer->start( 50, TRUE );
 }
 
 
 void KToolBar::hideItem (int id)
 {
     QWidget *w = getWidget(id);
     if ( w )
         w->hide();
 }
 
 
 void KToolBar::showItem (int id)
 {
     QWidget *w = getWidget(id);
     if ( w )
         w->show();
 }
 
 
 int KToolBar::itemIndex (int id)
 {
     QWidget *w = getWidget(id);
     return w ? widgets.findRef(w) : -1;
 }
 
 
 void KToolBar::setFullSize(bool flag )
 {
     setHorizontalStretchable( flag );
     setVerticalStretchable( flag );
 }
 
 
 bool KToolBar::fullSize() const
 {
     return isHorizontalStretchable() || isVerticalStretchable();
 }
 
 
 void KToolBar::enableMoving(bool flag )
 {
 //US    setMovingEnabled(flag);
   this->mainWindow()->setToolBarsMovable(flag);    
 }
 
 
 void KToolBar::setBarPos (BarPosition bpos)
 {
     if ( !mainWindow() )
         return;
 //US    mainWindow()->moveDockWindow( this, (Dock)bpos );
     mainWindow()->moveToolBar( this, (QMainWindow::ToolBarDock)bpos );
 }
 
 
-KToolBar::BarPosition KToolBar::barPos() const
+const KToolBar::BarPosition KToolBar::barPos()
 {
     if ( !(QMainWindow*)mainWindow() )
         return KToolBar::Top;
 //US    Dock dock;
     QMainWindow::ToolBarDock dock;
     int dm1, dm2;
     bool dm3;
     ((QMainWindow*)mainWindow())->getLocation( (QToolBar*)this, dock, dm1, dm3, dm2 );
 //US    if ( dock == DockUnmanaged ) {
     if ( dock == QMainWindow::Unmanaged ) {
         return (KToolBar::BarPosition)Top;
     }
     return (BarPosition)dock;
 }
 
 
 bool KToolBar::enable(BarStatus stat)
 {
     bool mystat = isVisible();
 
     if ( (stat == Toggle && mystat) || stat == Hide )
         hide();
     else
         show();
 
     return isVisible() == mystat;
 }
 
 
 void KToolBar::setMaxHeight ( int h )
 {
     setMaximumHeight( h );
 }
 
 int KToolBar::maxHeight()
 {
     return maximumHeight();
 }
 
 
 void KToolBar::setMaxWidth (int dw)
 {
     setMaximumWidth( dw );
 }
 
 
 int KToolBar::maxWidth()
 {
     return maximumWidth();
 }
 
 
 void KToolBar::setTitle (const QString& _title)
 {
     setLabel( _title );
 }
 
 
 void KToolBar::enableFloating (bool )
 {
 }
 
 
 void KToolBar::setIconText(IconText it)
 {
     setIconText( it, true );
 }
 
 
 void KToolBar::setIconText(IconText icontext, bool update)
 {
     bool doUpdate=false;
 
     if (icontext != d->m_iconText) {
         d->m_iconText = icontext;
         doUpdate=true;
     }
 
     if (update == false)
         return;
 
     if (doUpdate)
         emit modechange(); // tell buttons what happened
 
     // ugly hack to force a QMainWindow::triggerLayout( TRUE )
     if ( mainWindow() ) {
         QMainWindow *mw = mainWindow();
         mw->setUpdatesEnabled( FALSE );
         mw->setToolBarsMovable( !mw->toolBarsMovable() );
         mw->setToolBarsMovable( !mw->toolBarsMovable() );
         mw->setUpdatesEnabled( TRUE );
     }
 }
 
 
 KToolBar::IconText KToolBar::iconText() const
 {
     return d->m_iconText;
 }
 
 
 void KToolBar::setIconSize(int size)
 {
     setIconSize( size, true );
 }
 
 void KToolBar::setIconSize(int size, bool update)
 {
     bool doUpdate=false;
 
     if ( size != d->m_iconSize ) {
             d->m_iconSize = size;
             doUpdate=true;
     }
 
     if (update == false)
         return;
 
     if (doUpdate)
         emit modechange(); // tell buttons what happened
 
     // ugly hack to force a QMainWindow::triggerLayout( TRUE )
     if ( mainWindow() ) {
         QMainWindow *mw = mainWindow();
         mw->setUpdatesEnabled( FALSE );
         mw->setToolBarsMovable( !mw->toolBarsMovable() );
         mw->setToolBarsMovable( !mw->toolBarsMovable() );
         mw->setUpdatesEnabled( TRUE );
diff --git a/microkde/kdeui/ktoolbar.h b/microkde/kdeui/ktoolbar.h
index 49ff856..7a5c114 100644
--- a/microkde/kdeui/ktoolbar.h
+++ b/microkde/kdeui/ktoolbar.h
@@ -621,257 +621,257 @@ public:
    * as @ref QLineEdit plus completion signals.
    */
     KLineEdit * getLined (int id);
 
     /**
    * Returns a pointer to KToolBarButton.
    *
    * Example:
    * <pre>
    * KToolBarButton * button = toolbar->getButton(button_id);
    * </pre>
    * That way you can get access to other public methods
    * that @ref KToolBarButton provides.
    *
    *  Using this method is not recommended.
    */
     KToolBarButton * getButton (int id);
 
     /**
    * Align item to the right.
    *
    * This works only if toolbar is set to full width.
    * @see setFullWidth()
    */
     void alignItemRight (int id, bool right = true);
 
     /**
    * Returns a pointer to an inserted widget.
    *
    * Wrong ids are not tested.
    * You can do with this whatever you want,
    * except change its height (hardcoded). If you change its width
    * you will probably have to call QToolBar::updateRects(true)
    * @see QWidget
    * @see updateRects()
    * 
    * KDE4: make this const!
    */
     QWidget *getWidget (int id);
 
     /**
    * Set item autosized.
    *
    * This works only if the toolbar is set to full width.
    * Only @p one item can be autosized, and it has to be
    * the last left-aligned item. Items that come after this must be right
    * aligned. Items that can be right aligned are Lineds, Frames, Widgets and
    * Combos. An autosized item will resize itself whenever the toolbar geometry
    * changes to the last right-aligned item (or to end of toolbar if there
    * are no right-aligned items.)
    * @see setFullWidth()
    * @see alignItemRight()
    */
     void setItemAutoSized (int id, bool yes = true);
 
     /**
    * Remove all items.
    *
    * The toolbar is redrawn after it.
    */
     void clear ();
 
     /**
    * Remove item @p id.
    *
    * Item is deleted. Toolbar is redrawn after it.
    */
     void removeItem (int id);
 
     /**
    * Remove item @p id.
    *
    * Item is deleted when toolbar is redrawn.
    */
     void removeItemDelayed (int id);
 
     /**
    * Hide item.
    */
     void hideItem (int id);
 
     /**
    * Show item.
    */
     void showItem (int id);
 
     /**
    * Returns the index of the given item.
    *
    * KDE4: make this const!
    */
     int itemIndex (int id);
 
     /**
    * Set toolbar to full parent size (default).
    *
    *  In full size mode the bar
    * extends over the parent's full width or height. If the mode is disabled
    * the toolbar tries to take as much space as it needs without wrapping, but
    * it does not exceed the parent box. You can force a certain width or
    * height with @ref setMaxWidth() or @ref setMaxHeight().
    *
    * If you want to use right-aligned items or auto-sized items you must use
    * full size mode.
    */
     void setFullSize(bool flag = true);
 
     /**
    * @return @p true if the full-size mode is enabled. Otherwise
    * it returns @false.
    */
     bool fullSize() const;
 
     /**
    * @deprecated use setMovingEnabled(bool) instead.
    * Enable or disable moving of toolbar.
    */
     void enableMoving(bool flag = true);
 
     /**
    * Set position of toolbar.
    * @see BarPosition()
    */
     void setBarPos (BarPosition bpos);
 
     /**
    * Returns position of toolbar.
    */
-    BarPosition barPos() const;
+    const BarPosition barPos();
 
   /**
    * @deprecated
    * Show, hide, or toggle toolbar.
    *
    * This method is provided for compatibility only,
    * please use show() and/or hide() instead.
    * @see BarStatus
    */
     bool enable(BarStatus stat);
 
   /**
    * @deprecated
    * Use setMaximumHeight() instead.
    */
     void setMaxHeight (int h);  // Set max height for vertical toolbars
 
   /**
    * @deprecated
    * Use maximumHeight() instead.
    * Returns the value that was set with @ref setMaxHeight().
    */
     int maxHeight();
 
   /**
    * @deprecated
    * Use setMaximumWidth() instead.
    * Set maximal width of horizontal (top or bottom) toolbar.
    */
     void setMaxWidth (int dw);
 
   /**
    * @deprecated
    * Use maximumWidth() instead.
    * Returns the value that was set with @ref setMaxWidth().
    */
     int maxWidth();
 
   /**
    * Set title for toolbar when it floats.
    *
    * Titles are however not (yet)
    * visible. You can't change toolbar's title while it's floating.
    */
     void setTitle (const QString& _title);
 
   /**
    * @deprecated
    * Use enableMoving() instead.
    */
     void enableFloating (bool arrrrrrgh);
 
   /**
    * Set the kind of painting for buttons.
    *
    * Choose from:
    * @li IconOnly (only icons),
    * @li IconTextRight (icon and text, text is left from icons),
    * @li TextOnly (only text),
    * @li IconTextBottom (icons and text, text is under icons).
    * @see IconText
    *
    */
     void setIconText(IconText it);
    // Note: don't merge with the next one, it breaks Qt properties
 
   /**
    * Similar to @ref setIconText(IconText it) but allows you to
    * disable or enable updating.  If @p update is false, then the
    * buttons will not be updated.  This is useful only if you know
    * that you will be forcing an update later.
    */
     void setIconText(IconText it, bool update);
 
   /**
    * @return The current text style for buttons.
    */
     IconText iconText() const;
 
   /**
    * Set the icon size to load. Usually you should not call
    * this, the icon size is taken care of by KIconLoader
    * and globally configured.
    * By default, the toolbar will load icons of size 32 for main
    * toolbars and 22 for other toolbars
    * @see KIconLoader.
    *
    * @param size The size to use
    */
     void setIconSize(int size);
     // Note: don't merge with the next one, it breaks Qt properties
 
   /**
    * Same as @ref setIconText(int size) but allows you
    * to disable the toolbar update.
    *
    * @param size   The size to use
    * @param update If true, then the toolbar will be updated after
    *               this
    */
     void setIconSize(int size, bool update);
 
   /**
    * @return The current icon size for buttons.
    */
     int iconSize() const;
 
   /**
    * This allows you to enable or disable the context menu.
    *
    * @param enable If false, then the context menu will be disabled
    */
     void setEnableContextMenu(bool enable = true);
 
   /**
    * Returns whether or not the context menu is disabled
    *
    * @return The context menu state
    */
     bool contextMenuEnabled() const;
 
   /**
    * This will inform a toolbar button to ignore certain style
    * changes.  Specifically, it will ignore IconText (always IconOnly)
    * and will not allow image effects to apply.
    *
    * @param id The button to exclude from styles
    * @param no_style If true, then it is excluded (default: true).