initial public commit of qt4 portp1

1 files changed, 7 insertions, 4 deletions

diff --git a/libkcal/freebusy.cpp b/libkcal/freebusy.cpp
index ba15d6d..e4e9ec9 100644
--- a/libkcal/freebusy.cpp
+++ b/libkcal/freebusy.cpp
@@ -12,47 +12,50 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     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 <kdebug.h>
 
 #include "freebusy.h"
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3PtrList>
 
 using namespace KCal;
 
 FreeBusy::FreeBusy()
 {
 }
 
 FreeBusy::FreeBusy(const QDateTime &start, const QDateTime &end)
 {
   setDtStart(start);
   setDtEnd(end);
 }
 
 FreeBusy::FreeBusy( Calendar *calendar, const QDateTime &start, const QDateTime &end )
 {
   kdDebug() << "FreeBusy::FreeBusy" << endl;
   mCalendar = calendar;
 
   setDtStart(start);
   setDtEnd(end);
 
   //Gets all the events in the calendar
-  QPtrList<Event> eventList = mCalendar->events();
+  Q3PtrList<Event> eventList = mCalendar->events();
   Event *event;
 
   int extraDays, i, x, duration;
   duration = start.daysTo(end);
   QDate day;
   QDateTime tmpStart;
   QDateTime tmpEnd;
   //Loops through every event in the calendar
   for( event = eventList.first(); event; event = eventList.next() ) {
     //This whole for loop is for recurring events, it loops through 
     //each of the days of the freebusy request
 
@@ -104,25 +107,25 @@ FreeBusy::~FreeBusy()
 
 bool FreeBusy::setDtEnd( const QDateTime &end )
 {
   mDtEnd = end;
   return true;
 }
 
 QDateTime FreeBusy::dtEnd() const
 {
   return mDtEnd;
 }
 
-QValueList<Period> FreeBusy::busyPeriods() const
+Q3ValueList<Period> FreeBusy::busyPeriods() const
 {
   return mBusyPeriods;
 }
 
 bool FreeBusy::addLocalPeriod(const QDateTime &eventStart, const QDateTime &eventEnd ) {
   QDateTime tmpStart;
   QDateTime tmpEnd;
 
   //Check to see if the start *or* end of the event is
   //between the start and end of the freebusy dates.
   if (!((((this->dtStart()).secsTo(eventStart)>=0)&&(eventStart.secsTo(this->dtEnd())>=0)) 
     ||(((this->dtStart()).secsTo(eventEnd) >= 0)&&(eventEnd.secsTo(this->dtEnd()) >= 0))))
@@ -137,32 +140,32 @@ bool FreeBusy::addLocalPeriod(const QDateTime &eventStart, const QDateTime &even
   if ( eventEnd.secsTo(this->dtEnd())<=0 ) {
     tmpEnd = this->dtEnd();
   } else {
     tmpEnd = eventEnd;
   }  
 
   Period p(tmpStart, tmpEnd);  
   mBusyPeriods.append( p );
 
   return true;
 }
 
-FreeBusy::FreeBusy(QValueList<Period> busyPeriods)
+FreeBusy::FreeBusy(Q3ValueList<Period> busyPeriods)
 {
   mBusyPeriods = busyPeriods;
 }
 
 void FreeBusy::sortList()
 {
-  typedef QValueList<Period> PeriodList;
+  typedef Q3ValueList<Period> PeriodList;
 
   PeriodList::Iterator tmpPeriod, earlyPeriod;
   PeriodList sortedList;
   QDateTime earlyTime;
 
   while( mBusyPeriods.count() > 0 ) {
     earlyTime=(*mBusyPeriods.begin()).start();
     for (tmpPeriod=mBusyPeriods.begin(); tmpPeriod!=mBusyPeriods.end(); tmpPeriod++) {
       if (earlyTime.secsTo((*tmpPeriod).start()) <= 0) {
         earlyTime=(*tmpPeriod).start();
         earlyPeriod=tmpPeriod;
       }