initial public commit of qt4 portp1

1 files changed, 13 insertions, 9 deletions

diff --git a/korganizer/timespanview.cpp b/korganizer/timespanview.cpp
index df8ff88..0908056 100644
--- a/korganizer/timespanview.cpp
+++ b/korganizer/timespanview.cpp
@@ -1,127 +1,131 @@
 
 #ifndef DESKTOP_VERSION
 #include <qksplitter.h>
 #else
 #include <qsplitter.h>
 #endif
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qlayout.h>
-#include <qheader.h>
+#include <q3header.h>
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
+#include <Q3ValueList>
 
 #include <klocale.h>
 #include <kdebug.h>
 
 #include "lineview.h"
 #include "timeline.h"
 
 #include "timespanview.h"
 
 
 TimeSpanView::TimeSpanView( QWidget *parent, const char *name ) :
   QWidget( parent, name )
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
 #ifndef DESKTOP_VERSION
   mSplitter = new QKSplitter( this );
 #else
   mSplitter = new QSplitter( this );
 #endif
   topLayout->addWidget( mSplitter );
 
-  mList = new QListView( mSplitter );
+  mList = new Q3ListView( mSplitter );
   mList->addColumn( i18n("Summary") );
   
   QWidget *rightPane = new QWidget( mSplitter );
-  QBoxLayout *rightPaneLayout = new QVBoxLayout( rightPane );
+  Q3BoxLayout *rightPaneLayout = new Q3VBoxLayout( rightPane );
 
   mTimeLine = new TimeLine( rightPane );
   mTimeLine->setFixedHeight( mList->header()->height() );
   rightPaneLayout->addWidget( mTimeLine );
   
   mLineView = new LineView( rightPane );
   rightPaneLayout->addWidget( mLineView );
 
-  QBoxLayout *buttonLayout = new QHBoxLayout( rightPaneLayout );
+  Q3BoxLayout *buttonLayout = new Q3HBoxLayout( rightPaneLayout );
   
   QPushButton *zoomInButton = new QPushButton( i18n("Zoom In"), rightPane );
   connect( zoomInButton, SIGNAL( clicked() ), SLOT( zoomIn() ) );
   buttonLayout->addWidget( zoomInButton );
   
   QPushButton *zoomOutButton = new QPushButton( i18n("Zoom Out"), rightPane );
   connect( zoomOutButton, SIGNAL( clicked() ), SLOT( zoomOut() ) );
   buttonLayout->addWidget( zoomOutButton );
   
   QPushButton *centerButton = new QPushButton( i18n("Center View"), rightPane );
   connect( centerButton, SIGNAL( clicked() ), SLOT( centerView() ) );
   buttonLayout->addWidget( centerButton );
 
   connect(mLineView->horizontalScrollBar(),SIGNAL(valueChanged(int)),
           mTimeLine,SLOT(setContentsPos(int)));
 }
 
 TimeSpanView::~TimeSpanView()
 {
 }
 
-QValueList<int> TimeSpanView::splitterSizes()
+Q3ValueList<int> TimeSpanView::splitterSizes()
 {
   return mSplitter->sizes();
 }
 
-void TimeSpanView::setSplitterSizes( QValueList<int> sizes )
+void TimeSpanView::setSplitterSizes( Q3ValueList<int> sizes )
 {
   mSplitter->setSizes( sizes );
 }
 
 void TimeSpanView::addItem( KCal::Event *event )
 {
-  new QListViewItem( mList, event->summary() );
+  new Q3ListViewItem( 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 >= 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;