chaned qt version comparison

11 files changed, 31 insertions, 35 deletions

diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 6fcd73f..9d8c5ce 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -285,81 +285,81 @@ void KAddressBookCardView::readConfig(KConfig *config)
 #endif
   
     connect(mCardView, SIGNAL(doubleClicked(CardViewItem *)),
             this, SLOT(addresseeExecuted(CardViewItem *)));
 }
 
 void KAddressBookCardView::writeConfig( KConfig *config )
 {
   config->writeEntry( "ItemWidth", mCardView->itemWidth() );
   KAddressBookView::writeConfig( config );
 }
 void KAddressBookCardView::doSearch( const QString&  s,KABC::Field *field  )
 {
     mCardView->clear();
     if ( s.isEmpty() || s == "*" ) {
         refresh();
         return;
     }  
     QString pattern = s.lower()+"*";
     QRegExp re;
     re.setWildcard(true); // most people understand these better.
     re.setCaseSensitive(false);
     re.setPattern( pattern );
     if (!re.isValid())
         return; 
     mCardView->viewport()->setUpdatesEnabled( false );
     KABC::Addressee::List addresseeList = addressees();
     KABC::Addressee::List::Iterator it;  
     if (  field ) {
         for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
             if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                 continue;
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
             if (re.search(field->value( *it ).lower()) != -1)
 #else
                 if (re.match(field->value( *it ).lower()) != -1)
 #endif
                   new AddresseeCardViewItem(fields(), mShowEmptyFields,
                                               addressBook(), *it, mCardView);
 
         }
     } else {
         KABC::Field::List fieldList = allFields();
         KABC::Field::List::ConstIterator fieldIt;
         for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
             if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                 continue;
             for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
                 if (re.search((*fieldIt)->value( *it ).lower()) != -1)
 #else
                     if (re.match((*fieldIt)->value( *it ).lower()) != -1)
 #endif   
                         { 
                            new AddresseeCardViewItem(fields(), mShowEmptyFields,
                                               addressBook(), *it, mCardView);
                             break;
                         }
             }
         }
     }
     mCardView->viewport()->setUpdatesEnabled( true );
     mCardView->viewport()->update();
     if ( mCardView->firstItem() ) {
         mCardView->setCurrentItem ( mCardView->firstItem() );
         mCardView->setSelected ( mCardView->firstItem() , true );
     }
     else
         emit selected(QString::null);
 }
 QStringList KAddressBookCardView::selectedUids()
 {
     QStringList uidList;
     CardViewItem *item;
     AddresseeCardViewItem *aItem;
 
     for (item = mCardView->firstItem(); item; item = item->nextItem())
     {
         if (item->isSelected())
         {
 #ifndef KAB_EMBEDDED
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index ef0a23a..fb53215 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -243,81 +243,81 @@ void KAddressBookIconView::readConfig(KConfig *config)
   if (KABPrefs::instance()->mHonorSingleClick)
     connect(mIconView, SIGNAL(executed(QIconViewItem *)),
             this, SLOT(addresseeExecuted(QIconViewItem *)));
   else
     connect(mIconView, SIGNAL(doubleClicked(QIconViewItem *)),
             this, SLOT(addresseeExecuted(QIconViewItem *)));
 */
     connect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)),
             this, SLOT(addresseeExecuted(QIconViewItem *)));
             
 }
 void KAddressBookIconView::doSearch( const QString&  s ,KABC::Field *field )
 {
     mIconView->clear();
     mIconList.clear();
     if ( s.isEmpty() || s == "*" ) {
         refresh();
         return;
     }  
     QString pattern = s.lower()+"*";
     QRegExp re;
     re.setWildcard(true); // most people understand these better.
     re.setCaseSensitive(false);
     re.setPattern( pattern );
     if (!re.isValid())
         return; 
     KABC::Addressee::List addresseeList = addressees();
     KABC::Addressee::List::Iterator it;  
     if (  field ) {
         for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
             if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                 continue;
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
             if (re.search(field->value( *it ).lower()) != -1)
 #else
                 if (re.match(field->value( *it ).lower()) != -1)
 #endif
                     mIconList.append(new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView ));
                  
 
         }
     } else {
         KABC::Field::List fieldList = allFields();
         KABC::Field::List::ConstIterator fieldIt;
         for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
             if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                 continue;
             for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
                 if (re.search((*fieldIt)->value( *it ).lower()) != -1)
 #else
                     if (re.match((*fieldIt)->value( *it ).lower()) != -1)
 #endif   
                         { 
                             mIconList.append( new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView ));
                             break;
                         }
             }
         }
     }
     mIconView->arrangeItemsInGrid( true ); 
     if ( mIconView->firstItem() ) {
         mIconView->setCurrentItem ( mIconView->firstItem() );
         mIconView->setSelected ( mIconView->firstItem() , true );
     }
     else
         emit selected(QString::null);
 }
 QStringList KAddressBookIconView::selectedUids()
 {
     QStringList uidList;
     QIconViewItem *item;
     AddresseeIconViewItem *aItem;
     
     for (item = mIconView->firstItem(); item; item = item->nextItem())
     {
         if (item->isSelected())
         {
 #ifndef KAB_EMBEDDED
             aItem = dynamic_cast<AddresseeIconViewItem*>(item);
 #else //KAB_EMBEDDED
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 7022dcb..69802a4 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -127,80 +127,80 @@ void KAddressBookTableView::reconstructListView()
     connect(mListView, SIGNAL(signalDelete()),
           this, SLOT(addresseeDeleted()));
 
 //US performceimprovement. Refresh is done from the outside
 //US refresh();
 
   mListView->setSorting( 0, true );
   mainLayout->addWidget( mListView );
   mainLayout->activate();
   mListView->show();
 }
 
 void KAddressBookTableView::doSearch( const QString&  s, KABC::Field *field  )
 {
     mListView->clear();
     if ( s.isEmpty() || s == "*" ) {
         refresh();
         return;
     }  
     QString pattern = s.lower()+"*";
     QRegExp re;
     re.setWildcard(true); // most people understand these better.
     re.setCaseSensitive(false);
     re.setPattern( pattern );
     if (!re.isValid())
         return; 
     KABC::Addressee::List addresseeList = addressees();
     KABC::Addressee::List::Iterator it; 
     if (  field ) {
         for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { 
             if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                 continue;
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
             if (re.search(field->value( *it ).lower()) == 0)
 #else
                 if (re.match(field->value( *it ).lower()) != -1)
 #endif
                     ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
 
         }
     } else {
         KABC::Field::List fieldList = allFields();
         KABC::Field::List::ConstIterator fieldIt;
         for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
             if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                 continue;
             for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
                 if (re.search((*fieldIt)->value( *it ).lower()) != -1)
 #else
                     if (re.match((*fieldIt)->value( *it ).lower()) != -1)
 #endif   
                         { 
                             ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
                             break;
                         }
             }
         }
     }
     // Sometimes the background pixmap gets messed up when we add lots
     // of items.
     mListView->repaint();
     if ( mListView->firstChild() ) {
         mListView->setCurrentItem ( mListView->firstChild() );
         mListView->setSelected ( mListView->firstChild(), true );
     }
     else
         emit selected(QString::null);
    
 }
 void KAddressBookTableView::writeConfig(KConfig *config)
 {
   KAddressBookView::writeConfig(config);
 
   mListView->saveLayout(config, config->group());
 }
 
 void KAddressBookTableView::readConfig(KConfig *config)
 {
   KAddressBookView::readConfig( config );
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index ead8628..21ecb73 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -35,65 +35,65 @@ KOTodoViewItem::KOTodoViewItem( QListView *parent, Todo *todo, KOTodoView *kotod
 KOTodoViewItem::KOTodoViewItem( KOTodoViewItem *parent, Todo *todo, KOTodoView *kotodo )
   : QCheckListItem( parent, "", CheckBox ), mTodo( todo ), mTodoView( kotodo )
 {  
   construct();
 }
 
 QString KOTodoViewItem::key(int column,bool) const
 {
   QMap<int,QString>::ConstIterator it = mKeyMap.find(column);
   if (it == mKeyMap.end()) {
       return text(column).lower();
   } else {
     return *it;
   }
 }
 
 void KOTodoViewItem:: setup()
 {
    
      int h = 20;
      if ( listView () ) {
          QFontMetrics fm ( listView ()->font () );
          h = fm.height();
      }
      setHeight( h );
 
 }
 void KOTodoViewItem::setSortKey(int column,const QString &key)
 {
   mKeyMap.insert(column,key);
 }
 
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 void KOTodoViewItem::paintBranches(QPainter *p,const QColorGroup & cg,int w,
                                    int y,int h)
 {
   QListViewItem::paintBranches(p,cg,w,y,h);
 }
 #else
 #endif
 
 void KOTodoViewItem::construct()
 {
     //  qDebug("KOTodoViewItem::construct() ");
   m_init = true;
   QString keyd = "==";
   QString keyt = "==";
   QString skeyd = "==";
   QString skeyt = "==";
 
   setOn(mTodo->isCompleted());
   setText(0,mTodo->summary());
   setText(1,QString::number(mTodo->priority()));
   setText(2,i18n("%1 %").arg(QString::number(mTodo->percentComplete())));
   if (mTodo->percentComplete()<100) {
     if (mTodo->isCompleted()) setSortKey(2,QString::number(999));
     else setSortKey(2,QString::number(mTodo->percentComplete()));
   }
   else {
     if (mTodo->isCompleted()) setSortKey(2,QString::number(999));
     else setSortKey(2,QString::number(99));
   }
   if (mTodo->hasDueDate()) {
     setText(3, mTodo->dtDueDateStr());
     QDate d = mTodo->dtDue().date();
diff --git a/korganizer/kotodoviewitem.h b/korganizer/kotodoviewitem.h
index 74dbe98..bd024c8 100644
--- a/korganizer/kotodoviewitem.h
+++ b/korganizer/kotodoviewitem.h
@@ -43,51 +43,51 @@ class KOTodoView;
   KTodoView.
   
   @author Cornelius Schumacher <schumacher@kde.org>
   @see KOTodoView
 */
 class KOTodoViewItem : public QCheckListItem
 {
   public:
     /**
       Constructor.
 
       @param parent is the list view to which this item belongs.
       @param ev is the event to have the item display information for.
     */
     KOTodoViewItem(QListView *parent, Todo *todo, KOTodoView *kotodo);
     KOTodoViewItem(KOTodoViewItem *parent, Todo *todo, KOTodoView *kotodo);
     //~KOTodoViewItem() { qDebug("~KOTodoViewItem() %s ", text(0).latin1() );}
 
     void construct();
 
     Todo *todo() { return mTodo; }
 
     QString key(int, bool) const;
 
     void setSortKey(int column,const QString &key);
     
     bool isAlternate();
 
     virtual void paintCell(QPainter *p, const QColorGroup &cg,
       int column, int width, int alignment);
     virtual void setup();
   protected:
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
     void paintBranches(QPainter *p,const QColorGroup & cg,int w,int y,int h);
 #else
 #endif
   virtual void stateChange(bool);
   void setMyPixmap();
 
   private:
     Todo *mTodo;
     KOTodoView *mTodoView;
 
     QMap<int,QString> mKeyMap;
     uint m_odd : 1;
     uint m_known : 1;
     uint m_unused : 30;
     bool m_init;
 };
 
 #endif
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index f6b7718..e255b83 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -546,43 +546,43 @@ void KOViewManager::showTimeSpanView()
         mTimeSpanView = new KOTimeSpanView(mMainView->calendar(),mMainView->viewStack(),
                                            "KOViewManager::TimeSpanView");
         addView(mTimeSpanView);
 
         mTimeSpanView->readSettings();
     }
 
     showView(mTimeSpanView);
 }
 
 Incidence *KOViewManager::currentSelection()
 {
     if (!mCurrentView) return 0;
     if ( mCurrentView == mListView ) {
         if ( mListView->currentItem() )
             return mListView->currentItem();
     }
     return mCurrentView->selectedIncidences().first();
 }
 
 QDate KOViewManager::currentSelectionDate()
 {
     QDate qd;
     if (mCurrentView) {
         DateList qvl = mCurrentView->selectedDates();
         if (!qvl.isEmpty()) qd = qvl.first();
     }
     return qd;
 }
 
 void KOViewManager::addView(KOrg::BaseView *view)
 {
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
     mMainView->viewStack()->addWidget( view );
 #else
     mMainView->viewStack()->addWidget( view, 1 );
 #endif
 }
 
 void KOViewManager::setDocumentId( const QString &id )
 {
     if (mTodoView) mTodoView->setDocumentId( id );
 }
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 72ee1d2..39966b5 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -205,193 +205,193 @@ void SearchDialog::updateConfig()
 }
 void SearchDialog::updateView()
 {
  
     QRegExp re;
     re.setWildcard(true); // most people understand these better.
     re.setCaseSensitive(false);
     re.setPattern(searchEdit->text());
     if (re.isValid()) {
         search(re);
     } else {
         mMatchedEvents.clear();
         mMatchedTodos.clear();
         mMatchedJournals.clear();
     }
     listView->setStartDate( mStartDate->date() );
     listView->showEvents(mMatchedEvents);
     listView->addTodos(mMatchedTodos);
     listView->addJournals(mMatchedJournals);
 }
 
 void SearchDialog::search(const QRegExp &re)
 {
     QPtrList<Event> events = mCalendar->events( mStartDate->date(),
                                                 mEndDate->date(),
                                                 false /*mInclusiveCheck->isChecked()*/ );
 
     mMatchedEvents.clear();
     if ( mSearchEvent->isChecked() ) {
         Event *ev;
         for(ev=events.first();ev;ev=events.next()) {
             if (mSummaryCheck->isChecked()) {
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
                 if (re.search(ev->summary()) != -1) 
 #else
                     if (re.match(ev->summary()) != -1) 
 #endif
                         {
                             mMatchedEvents.append(ev);
                             continue;
                         }
             }
             if (mDescriptionCheck->isChecked()) {
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
                 if (re.search(ev->description()) != -1) 
 #else
                     if (re.match(ev->description()) != -1) 
 #endif
                         {    
                             mMatchedEvents.append(ev);
                             continue;
                         }
             }
             if (mCategoryCheck->isChecked()) {
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
                 if (re.search(ev->categoriesStr()) != -1) 
 #else
                     if (re.match(ev->categoriesStr()) != -1) 
 #endif
                         {
                             mMatchedEvents.append(ev);
                             continue;
                         }
             }
             if ( mSearchAName->isChecked() || mSearchAEmail->isChecked() ) {
                 QPtrList<Attendee> tmpAList = ev->attendees();
                 Attendee *a;
                 for (a = tmpAList.first(); a; a = tmpAList.next()) {
                     if (mSearchAName->isChecked()) {
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
                         if (re.search(a->name()) != -1) 
 #else
                             if (re.match(a->name()) != -1) 
 #endif
                                 {    
                                     mMatchedEvents.append(ev);
                                     break;
                                 }
                     }
                     if (mSearchAEmail->isChecked()) {
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
                         if (re.search(a->email()) != -1) 
 #else
                             if (re.match(a->email()) != -1) 
 #endif
                                 {    
                                     mMatchedEvents.append(ev);
                                     break;
                                 }
                     }
                 }
             }
         }
     }
     QPtrList<Todo> todos = mCalendar->todos( );
     mMatchedTodos.clear();
     if ( mSearchTodo->isChecked() ) {
         Todo *tod;
         for(tod=todos.first();tod;tod=todos.next()) {
             if (mSummaryCheck->isChecked()) {
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
                 if (re.search(tod->summary()) != -1) 
 #else
                     if (re.match(tod->summary()) != -1) 
 #endif
                         {
                             mMatchedTodos.append(tod);
                             continue;
                         }
             }
             if (mDescriptionCheck->isChecked()) {
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
                 if (re.search(tod->description()) != -1) 
 #else
                     if (re.match(tod->description()) != -1) 
 #endif
                         {
                             mMatchedTodos.append(tod);
                             continue;
                         }
             }
             if (mCategoryCheck->isChecked()) {
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
                 if (re.search(tod->categoriesStr()) != -1) 
 #else
                     if (re.match(tod->categoriesStr()) != -1) 
 #endif
                         {                                 
                             mMatchedTodos.append(tod);
                             continue;
                         }
             }
             if ( mSearchAName->isChecked() || mSearchAEmail->isChecked() ) {
                 QPtrList<Attendee> tmpAList = tod->attendees();
                 Attendee *a;
                 for (a = tmpAList.first(); a; a = tmpAList.next()) {
                     if (mSearchAName->isChecked()) {
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
                         if (re.search(a->name()) != -1) 
 #else
                             if (re.match(a->name()) != -1) 
 #endif
                                 {    
                                     mMatchedTodos.append(tod);
                                     break;
                                 }
                     }
                     if (mSearchAEmail->isChecked()) {
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
                         if (re.search(a->email()) != -1) 
 #else
                             if (re.match(a->email()) != -1) 
 #endif
                                 {    
                                     mMatchedTodos.append(tod);
                                     break;
                                 }
                     }
                 }
             }
         }
     }
     mMatchedJournals.clear();
     if (mSearchJournal->isChecked() ) {
         QPtrList<Journal> journals = mCalendar->journals( );
         Journal* journ;
         
         for(journ=journals.first();journ;journ=journals.next()) {
             if ( journ->dtStart().date() <= mEndDate->date() 
                  &&journ->dtStart().date() >= mStartDate->date()) {
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
                 if (re.search(journ->description()) != -1) 
 #else
                     if (re.match(journ->description()) != -1) 
 #endif
                         {
                             mMatchedJournals.append(journ);
                             continue;
                         }
             }
         }
     }
 
 }
 /*
 void SearchDialog::keyPressEvent ( QKeyEvent *e) 
 {
  
     e->ignore();
  
 }
 */
 //mMatchedJournals;
diff --git a/korganizer/timespanview.cpp b/korganizer/timespanview.cpp
index 67a3811..df8ff88 100644
--- a/korganizer/timespanview.cpp
+++ b/korganizer/timespanview.cpp
@@ -76,65 +76,65 @@ void TimeSpanView::setSplitterSizes( QValueList<int> sizes )
 
 void TimeSpanView::addItem( KCal::Event *event )
 {
   new QListViewItem( mList, event->summary() );
   
   QDateTime startDt = event->dtStart();
   QDateTime endDt = event->dtEnd();
 
 //  kdDebug() << "TimeSpanView::addItem(): start: " << startDt.toString()
 //            << "  end: " << endDt.toString() << endl;
 
   int startSecs = mStartDate.secsTo( startDt );
   int durationSecs = startDt.secsTo( endDt );
   
 //  kdDebug() << "--- startSecs: " << startSecs << "  dur: " << durationSecs << endl;
 
   int startX = mStartDate.secsTo( startDt ) / mSecsPerPixel;
   int endX = startX + startDt.secsTo( endDt ) / mSecsPerPixel;
   
 //  kdDebug() << "TimeSpanView::addItem(): s: " << startX << "  e: " << endX << endl;
   
   mLineView->addLine( startX, endX );
 }
 
 void TimeSpanView::clear()
 {
   mList->clear();
   mLineView->clear();
 }
 
 void TimeSpanView::updateView()
 {
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
   mLineView->updateContents();
   mTimeLine->updateContents();
 #else
 #endif
 }
 
 void TimeSpanView::setDateRange( const QDateTime &start, const QDateTime &end )
 {
   mStartDate = start;
   mEndDate = end;
   
   mTimeLine->setDateRange( start, end );
 
   mSecsPerPixel = mStartDate.secsTo( mEndDate ) / mLineView->pixelWidth();
 }
 
 QDateTime TimeSpanView::startDateTime()
 {
   return mStartDate;
 }
 
 QDateTime TimeSpanView::endDateTime()
 {
   return mEndDate;
 }
 
 void TimeSpanView::zoomIn()
 {
   int span = mStartDate.daysTo( mEndDate );
   setDateRange( mStartDate.addDays( span / 4 ), mEndDate.addDays( span / -4 ) );
 
   emit dateRangeChanged();
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index c23978d..bd13132 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -174,69 +174,65 @@ icalcomponent *ICalFormatImpl::writeEvent(Event *event)
 #if 0
   // attachments
   tmpStrList = anEvent->attachments();
   for ( QStringList::Iterator it = tmpStrList.begin();
         it != tmpStrList.end();
         ++it )
     addPropValue(vevent, VCAttachProp, (*it).utf8());
 
   // resources
   tmpStrList = anEvent->resources();
   tmpStr = tmpStrList.join(";");
   if (!tmpStr.isEmpty())
     addPropValue(vevent, VCResourcesProp, tmpStr.utf8());
 
 #endif
 
   // Transparency
   switch( event->transparency() ) {
   case Event::Transparent:
       icalcomponent_add_property(vevent, icalproperty_new_transp(ICAL_TRANSP_TRANSPARENT));
     break;
   case Event::Opaque:
     icalcomponent_add_property(vevent, icalproperty_new_transp(ICAL_TRANSP_OPAQUE));
     break;
   }
 
   return vevent;
 }
 
 icalcomponent *ICalFormatImpl::writeFreeBusy(FreeBusy *freebusy,
                                              Scheduler::Method method)
 {
-#if QT_VERSION >= 300
-  kdDebug(5800) << "icalformatimpl: writeFreeBusy: startDate: "
-    << freebusy->dtStart().toString("ddd MMMM d yyyy: h:m:s ap") << " End Date: "
-    << freebusy->dtEnd().toString("ddd MMMM d yyyy: h:m:s ap") << endl;
-#endif
+
 
   icalcomponent *vfreebusy = icalcomponent_new(ICAL_VFREEBUSY_COMPONENT);
 
   writeIncidenceBase(vfreebusy,freebusy);
 
   icalcomponent_add_property(vfreebusy, icalproperty_new_dtstart(
       writeICalDateTime(freebusy->dtStart())));
 
   icalcomponent_add_property(vfreebusy, icalproperty_new_dtend(
       writeICalDateTime(freebusy->dtEnd())));
 
   if (method == Scheduler::Request) {
     icalcomponent_add_property(vfreebusy,icalproperty_new_uid(
        freebusy->uid().utf8()));
   }
 
   //Loops through all the periods in the freebusy object
   QValueList<Period> list = freebusy->busyPeriods();
   QValueList<Period>::Iterator it;
   icalperiodtype period;
   for (it = list.begin(); it!= list.end(); ++it) {
     period.start = writeICalDateTime((*it).start());
     period.end = writeICalDateTime((*it).end());
     icalcomponent_add_property(vfreebusy, icalproperty_new_freebusy(period) );
   }
 
   return vfreebusy;
 }
 
 icalcomponent *ICalFormatImpl::writeJournal(Journal *journal)
 {
   icalcomponent *vjournal = icalcomponent_new(ICAL_VJOURNAL_COMPONENT);
diff --git a/microkde/KDGanttMinimizeSplitter.cpp b/microkde/KDGanttMinimizeSplitter.cpp
index 60b8bc7..567ae54 100644
--- a/microkde/KDGanttMinimizeSplitter.cpp
+++ b/microkde/KDGanttMinimizeSplitter.cpp
@@ -7,66 +7,66 @@
  **
  ** This file is part of the KDGantt library.
  **
  ** This file may be distributed and/or modified under the terms of the
  ** GNU General Public License version 2 as published by the Free Software
  ** Foundation and appearing in the file LICENSE.GPL included in the
  ** packaging of this file.
  **
  ** Licensees holding valid commercial KDGantt licenses may use this file in
  ** accordance with the KDGantt Commercial License Agreement provided with
  ** the Software.
  **
  ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
  ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  **
  ** See http://www.klaralvdalens-datakonsult.se/Public/products/ for
  **   information about KDGantt Commercial License Agreements.
  **
  ** Contact info@klaralvdalens-datakonsult.se if any conditions of this
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
  ** with any edition of Qt, and distribute the resulting executable,
  ** without including the source code for Qt in the source distribution.
  **
  **********************************************************************/
 
 #include "KDGanttMinimizeSplitter.h"
 #ifndef QT_NO_SPLITTER___
 
 #include "qpainter.h"
 #include "qdrawutil.h"
-#include "qbitmap.h"
-#if QT_VERSION >= 300
+#include "qbitmap.h" 
+#if QT_VERSION >= 0x030000
 #include "qptrlist.h"
 #include "qmemarray.h"
 #else
 #include <qlist.h>
 #include <qarray.h>
 #define QPtrList QList
 #define QMemArray QArray
 #endif
 #include "qlayoutengine_p.h"
 #include "qobjectlist.h"
 #include "qstyle.h"
 #include "qapplication.h" //sendPostedEvents
 #include <qvaluelist.h>
 #include <qcursor.h>
 #ifndef KDGANTT_MASTER_CVS
 //#include "KDGanttMinimizeSplitter.moc"
 #endif
 
 
 
 #ifndef DOXYGEN_SKIP_INTERNAL
 
 #if QT_VERSION >= 232
 static int mouseOffset;
 static int opaqueOldPos = -1; //### there's only one mouse, but this is a bit risky
 
 
 KDGanttSplitterHandle::KDGanttSplitterHandle( Qt::Orientation o,
 				  KDGanttMinimizeSplitter *parent, const char * name )
     : QWidget( parent, name ), _activeButton( 0 ), _collapsed( false )
 {
 
@@ -598,65 +598,65 @@ void KDGanttMinimizeSplitter::childEvent( QChildEvent *c )
 	while ( s ) {
 	    if ( s->wid == c->child() ) {
 		data->list.removeRef( s );
 		delete s;
 		if ( p && p->isSplitter ) {
 		    data->list.removeRef( p );
 		    delete p->wid; //will call childEvent
 		    delete p;
 		}
 		recalcId();
 		doResize();
 		return;
 	    }
 	    p = s;
 	    s = data->list.next();
 	}
     }
 }
 
 
 /*!
   Shows a rubber band at position \a p. If \a p is negative, the
   rubber band is removed.
 */
 void KDGanttMinimizeSplitter::setRubberband( int p )
 {
     QPainter paint( this );
     paint.setPen( gray );
     paint.setBrush( gray );
     paint.setRasterOp( XorROP );
     QRect r = contentsRect();
     const int rBord = 3; //Themable????
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
     int sw = style().pixelMetric(QStyle::PM_SplitterWidth, this);
 #else
     int sw = style().splitterWidth();
 #endif
     if ( orient == Horizontal ) {
 	if ( opaqueOldPos >= 0 )
 	    paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(),
 			    2*rBord, r.height() );
 	if ( p >= 0 )
 	    paint.drawRect( p  + sw/2 - rBord, r.y(), 2*rBord, r.height() );
     } else {
 	if ( opaqueOldPos >= 0 )
 	    paint.drawRect( r.x(), opaqueOldPos + sw/2 - rBord,
 			    r.width(), 2*rBord );
 	if ( p >= 0 )
 	    paint.drawRect( r.x(), p + sw/2 - rBord, r.width(), 2*rBord );
     }
     opaqueOldPos = p;
 }
 
 
 /*! \reimp */
 bool KDGanttMinimizeSplitter::event( QEvent *e )
 {
     if ( e->type() == QEvent::LayoutHint || ( e->type() == QEvent::Show && data->firstShow ) ) {
 	recalc( isVisible() );
 	if ( e->type() == QEvent::Show )
 	    data->firstShow = FALSE;
     }
     return QWidget::event( e );
 }
 
@@ -880,65 +880,65 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max )
     int minA = 0;
     int maxA = 0;	//after
     int n = data->list.count();
     if ( id < 0 || id >= n )
 	return;
     int i;
     for ( i = 0; i < id; i++ ) {
 	QSplitterLayoutStruct *s = data->list.at(i);
 	if ( s->wid->isHidden() ) {
 	    //ignore
 	} else if ( s->isSplitter ) {
 	    minB += s->sizer;
 	    maxB += s->sizer;
 	} else {
 	    minB += pick( minSize(s->wid) );
 	    maxB += pick( s->wid->maximumSize() );
 	}
     }
     for ( i = id; i < n; i++ ) {
 	QSplitterLayoutStruct *s = data->list.at(i);
 	if ( s->wid->isHidden() ) {
 	    //ignore
 	} else if ( s->isSplitter ) {
 	    minA += s->sizer;
 	    maxA += s->sizer;
 	} else {
 	    minA += pick( minSize(s->wid) );
 	    maxA += pick( s->wid->maximumSize() );
 	}
     }
     QRect r = contentsRect();
     if ( orient == Horizontal && false ) {
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
     int splitterWidth = style().pixelMetric(QStyle::PM_SplitterWidth, this);
 #else
     int splitterWidth = style().splitterWidth();
 #endif
       
 	if ( min )
 	    *min = pick(r.topRight()) - QMIN( maxB, pick(r.size())-minA ) - splitterWidth;
 	if ( max )
 	    *max = pick(r.topRight()) - QMAX( minB, pick(r.size())-maxA ) - splitterWidth;
     } else {
 	if ( min )
 	    *min = pick(r.topLeft()) + QMAX( minB, pick(r.size())-maxA );
 	if ( max )
 	    *max = pick(r.topLeft()) + QMIN( maxB, pick(r.size())-minA );
     }
 }
 
 
 /*!
   Returns the closest legal position to \a p of the splitter with id \a id.
 
   \sa idAfter()
 */
 
 int KDGanttMinimizeSplitter::adjustPos( int p, int id )
 {
     int min = 0;
     int max = 0;
     getRange( id, &min, &max );
     p = QMAX( min, QMIN( p, max ) );
 
     return p;
@@ -1358,65 +1358,65 @@ void KDGanttMinimizeSplitter::setSizes( QValueList<int> list )
     processChildEvents();
     QValueList<int>::Iterator it = list.begin();
     QSplitterLayoutStruct *s = data->list.first();
     while ( s && it != list.end() ) {
 	if ( !s->isSplitter ) {
 	    s->sizer = *it;
 	    ++it;
 	}
 	s = data->list.next();
     }
     doResize();
 }
 
 
 /*!
   Gets all posted child events, ensuring that the internal state of
   the splitter is consistent.
 */
 
 void KDGanttMinimizeSplitter::processChildEvents()
 {
     QApplication::sendPostedEvents( this, QEvent::ChildInserted );
 }
 
 
 /*!
   \reimp
 */
 
 void KDGanttMinimizeSplitter::styleChange( QStyle& old )
 {
 
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
     int sw = style().pixelMetric(QStyle::PM_SplitterWidth, this);
 #else
     int sw = style().splitterWidth();
 #endif
     QSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
 	if ( s->isSplitter )
 	    s->sizer = sw;
 	s = data->list.next();
     }
     doResize();
     QFrame::styleChange( old );
 }
 
 #endif
 
 /*!
   Specifies the direction of the minimize buttons.
   If the orientation of the splitter is horizontal then with
   KDGanttMinimizeSplitter::Left or KDGanttMinimizeSplitter::Right should be used,
   otherwise either KDGanttMinimizeSplitter::Up or KDGanttMinimizeSplitter::Down
   should be used.
 */
 void KDGanttMinimizeSplitter::setMinimizeDirection( Direction direction )
 {
     _direction = direction;
 }
 
 /*!
   Returns the direction of the minimize buttons.
 */
 KDGanttMinimizeSplitter::Direction KDGanttMinimizeSplitter::minimizeDirection() const
diff --git a/microkde/kcalendarsystemgregorian.cpp b/microkde/kcalendarsystemgregorian.cpp
index 7c5b62a..cc12b9f 100644
--- a/microkde/kcalendarsystemgregorian.cpp
+++ b/microkde/kcalendarsystemgregorian.cpp
@@ -25,83 +25,83 @@
 #include <qstring.h>
 
 #include <klocale.h>
 #include <kdebug.h>
 
 #include "kcalendarsystemgregorian.h"
 
 KCalendarSystemGregorian::KCalendarSystemGregorian(const KLocale * locale)
   : KCalendarSystem(locale)
 {
   kdDebug(5400) << "Created gregorian calendar" << endl;
 }
 
 KCalendarSystemGregorian::~KCalendarSystemGregorian()
 {
 }
 
 int KCalendarSystemGregorian::year(const QDate& date) const
 {
 //  kdDebug(5400) << "Gregorian year..." << endl;
   return date.year();
 }
 
 int KCalendarSystemGregorian::monthsInYear( const QDate & ) const
 {
 //  kdDebug(5400) << "Gregorian monthsInYear" << endl;
 
   return 12;
 }
 
 int KCalendarSystemGregorian::weeksInYear(int year) const
 {
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
   QDate temp;
   temp.setYMD(year, 12, 31);
 
   // If the last day of the year is in the first week, we have to check the
   // week before
   if ( temp.weekNumber() == 1 )
     temp.addDays(-7);
 
   return temp.weekNumber();
 #else
   return 52;
 #endif
 }
 
 int KCalendarSystemGregorian::weekNumber(const QDate& date,
                                          int * yearNum) const
 {
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
   return date.weekNumber(yearNum);
 #else
   return 1;
 #endif
 }
 
 QString KCalendarSystemGregorian::monthName(const QDate& date,
                                             bool shortName) const
 {
   return monthName(month(date), shortName);
 }
 
 QString KCalendarSystemGregorian::monthNamePossessive(const QDate& date, bool shortName) const
 {
   return monthNamePossessive(month(date), shortName);
 }
 
 QString KCalendarSystemGregorian::monthName(int month, bool shortName) const
 {
 //  kdDebug(5400) << "Gregorian getMonthName" << endl;
 
   if ( shortName )
     switch ( month )
       {
       case 1:
         return locale()->translate("January", "Jan");
       case 2:
         return locale()->translate("February", "Feb");
       case 3:
         return locale()->translate("March", "Mar");
       case 4:
         return locale()->translate("April", "Apr");
@@ -202,79 +202,79 @@ QString KCalendarSystemGregorian::monthNamePossessive(int month,
         return locale()->translate("of May long", "of May");
       case 6:
         return locale()->translate("of June");
       case 7:
         return locale()->translate("of July");
       case 8:
         return locale()->translate("of August");
       case 9:
         return locale()->translate("of September");
       case 10:
         return locale()->translate("of October");
       case 11:
         return locale()->translate("of November");
       case 12:
         return locale()->translate("of December");
       }
 
   return QString::null;
 }
 
 bool KCalendarSystemGregorian::setYMD(QDate & date, int y, int m, int d) const
 {
   // We don't want Qt to add 1900 to them
   if ( y >= 0 && y <= 99 )
     return false;
 
   // QDate supports gregorian internally
   return date.setYMD(y, m, d);
 }
 
 QDate KCalendarSystemGregorian::addYears(const QDate & date, int nyears) const
 {
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
   return date.addYears(nyears);
 #else
   int year = date.year() + nyears;
   int month = date.month();
   int day = date.day();
   QDate newDate( year, month, 1 );
   if ( day > newDate.daysInMonth() ) day = newDate.daysInMonth();
   return QDate( year, month, day );
 #endif
 }
 
 QDate KCalendarSystemGregorian::addMonths(const QDate & date, int nmonths) const
 {
-#if QT_VERSION >= 300  
+#if QT_VERSION >= 0x030000  
   return date.addMonths(nmonths);
 #else
   int month = date.month();
   int nyears;
   if ( nmonths >= 0 ) {
     month += nmonths;
     nyears = ( month - 1 ) / 12;
     month = ( ( month - 1 ) % 12 ) + 1;
   } else {
     nyears = nmonths / 12;
     // nmonths += nyears * 12;
     nmonths = nmonths % 12;
     month += nmonths;
     if ( month <= 0 ) {
         month += 12;
         --nyears;
     }
   }
   int year = date.year() + nyears;
   int day = date.day();
   QDate newDate( year, month, 1 );
   if ( day > newDate.daysInMonth() ) day = newDate.daysInMonth();
   return QDate( year, month, day );
 #endif
 }
 
 QDate KCalendarSystemGregorian::addDays(const QDate & date, int ndays) const
 {
   return date.addDays(ndays);
 }
 
 QString KCalendarSystemGregorian::weekDayName(int col, bool shortName) const