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
@@ -313,9 +313,9 @@ void KAddressBookCardView::doSearch( const QString&  s,KABC::Field *field  )
     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
@@ -329,9 +329,9 @@ void KAddressBookCardView::doSearch( const QString&  s,KABC::Field *field  )
         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   
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
@@ -271,9 +271,9 @@ void KAddressBookIconView::doSearch( const QString&  s ,KABC::Field *field )
     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
@@ -287,9 +287,9 @@ void KAddressBookIconView::doSearch( const QString&  s ,KABC::Field *field )
         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   
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
@@ -155,9 +155,9 @@ void KAddressBookTableView::doSearch( const QString&  s, KABC::Field *field  )
     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
@@ -170,9 +170,9 @@ void KAddressBookTableView::doSearch( const QString&  s, KABC::Field *field  )
         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   
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index ead8628..21ecb73 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -63,9 +63,9 @@ 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);
diff --git a/korganizer/kotodoviewitem.h b/korganizer/kotodoviewitem.h
index 74dbe98..bd024c8 100644
--- a/korganizer/kotodoviewitem.h
+++ b/korganizer/kotodoviewitem.h
@@ -71,9 +71,9 @@ class KOTodoViewItem : public QCheckListItem
     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);
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index f6b7718..e255b83 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -574,9 +574,9 @@ QDate KOViewManager::currentSelectionDate()
 }
 
 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
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 72ee1d2..39966b5 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -233,9 +233,9 @@ void SearchDialog::search(const QRegExp &re)
     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
@@ -244,9 +244,9 @@ void SearchDialog::search(const QRegExp &re)
                             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
@@ -255,9 +255,9 @@ void SearchDialog::search(const QRegExp &re)
                             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
@@ -270,9 +270,9 @@ void SearchDialog::search(const QRegExp &re)
                 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
@@ -281,9 +281,9 @@ void SearchDialog::search(const QRegExp &re)
                                     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
@@ -301,9 +301,9 @@ void SearchDialog::search(const QRegExp &re)
     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
@@ -312,9 +312,9 @@ void SearchDialog::search(const QRegExp &re)
                             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
@@ -323,9 +323,9 @@ void SearchDialog::search(const QRegExp &re)
                             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
@@ -338,9 +338,9 @@ void SearchDialog::search(const QRegExp &re)
                 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
@@ -349,9 +349,9 @@ void SearchDialog::search(const QRegExp &re)
                                     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
@@ -371,9 +371,9 @@ void SearchDialog::search(const QRegExp &re)
         
         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
diff --git a/korganizer/timespanview.cpp b/korganizer/timespanview.cpp
index 67a3811..df8ff88 100644
--- a/korganizer/timespanview.cpp
+++ b/korganizer/timespanview.cpp
@@ -104,9 +104,9 @@ void TimeSpanView::clear()
 }
 
 void TimeSpanView::updateView()
 {
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
   mLineView->updateContents();
   mTimeLine->updateContents();
 #else
 #endif
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index c23978d..bd13132 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -202,13 +202,9 @@ icalcomponent *ICalFormatImpl::writeEvent(Event *event)
 
 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);
diff --git a/microkde/KDGanttMinimizeSplitter.cpp b/microkde/KDGanttMinimizeSplitter.cpp
index 60b8bc7..567ae54 100644
--- a/microkde/KDGanttMinimizeSplitter.cpp
+++ b/microkde/KDGanttMinimizeSplitter.cpp
@@ -35,10 +35,10 @@
 #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>
@@ -626,9 +626,9 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
     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
@@ -908,9 +908,9 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max )
 	}
     }
     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
@@ -1386,9 +1386,9 @@ void KDGanttMinimizeSplitter::processChildEvents()
 
 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
diff --git a/microkde/kcalendarsystemgregorian.cpp b/microkde/kcalendarsystemgregorian.cpp
index 7c5b62a..cc12b9f 100644
--- a/microkde/kcalendarsystemgregorian.cpp
+++ b/microkde/kcalendarsystemgregorian.cpp
@@ -53,9 +53,9 @@ int KCalendarSystemGregorian::monthsInYear( const QDate & ) const
 }
 
 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
@@ -71,9 +71,9 @@ int KCalendarSystemGregorian::weeksInYear(int year) const
 
 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
@@ -230,9 +230,9 @@ bool KCalendarSystemGregorian::setYMD(QDate & date, int y, int m, int d) const
 }
 
 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();
@@ -244,9 +244,9 @@ QDate KCalendarSystemGregorian::addYears(const QDate & date, int nyears) const
 }
 
 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;