initial public commit of qt4 portp1

1 files changed, 16 insertions, 14 deletions

diff --git a/korganizer/incomingdialog.cpp b/korganizer/incomingdialog.cpp
index fe78356..c2402d4 100644
--- a/korganizer/incomingdialog.cpp
+++ b/korganizer/incomingdialog.cpp
@@ -17,10 +17,12 @@
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qmap.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 #include <kglobal.h>
 #include <klocale.h>
@@ -56,9 +58,9 @@
 #endif
 
 
-ScheduleItemIn::ScheduleItemIn(QListView *parent,IncidenceBase *ev,
+ScheduleItemIn::ScheduleItemIn(Q3ListView *parent,IncidenceBase *ev,
                                Scheduler::Method method,ScheduleMessage::Status status)
-  : QListViewItem(parent)
+  : Q3ListViewItem(parent)
 {
   mIncidence = ev;
   mMethod = method;
@@ -135,7 +137,7 @@ bool ScheduleItemVisitor::visit(Journal *)
  *  TRUE to construct a modal dialog.
  */
 IncomingDialog::IncomingDialog(Calendar *calendar,OutgoingDialog *outgoing,
-                QWidget* parent,const char* name,bool modal,WFlags fl) :
+                QWidget* parent,const char* name,bool modal,Qt::WFlags fl) :
   IncomingDialog_base(parent,name,modal,fl)
 {
   mCalendar = calendar;
@@ -145,12 +147,12 @@ IncomingDialog::IncomingDialog(Calendar *calendar,OutgoingDialog *outgoing,
 #else
   mScheduler = new DummyScheduler(mCalendar);
 #endif
-  mMessageListView->setColumnAlignment(1,AlignHCenter);
-  mMessageListView->setColumnAlignment(2,AlignHCenter);
-  mMessageListView->setColumnAlignment(3,AlignHCenter);
-  mMessageListView->setColumnAlignment(4,AlignHCenter);
-  QObject::connect(mMessageListView,SIGNAL(doubleClicked(QListViewItem *)),
-                   this,SLOT(showEvent(QListViewItem *)));
+  mMessageListView->setColumnAlignment(1,Qt::AlignHCenter);
+  mMessageListView->setColumnAlignment(2,Qt::AlignHCenter);
+  mMessageListView->setColumnAlignment(3,Qt::AlignHCenter);
+  mMessageListView->setColumnAlignment(4,Qt::AlignHCenter);
+  QObject::connect(mMessageListView,SIGNAL(doubleClicked(Q3ListViewItem *)),
+                   this,SLOT(showEvent(Q3ListViewItem *)));
   retrieve();
 }
 
@@ -169,7 +171,7 @@ void IncomingDialog::setOutgoingDialog(OutgoingDialog *outgoing)
 
 void IncomingDialog::retrieve()
 {
-  QPtrList <ScheduleMessage> messages = mScheduler->retrieveTransactions();
+  Q3PtrList <ScheduleMessage> messages = mScheduler->retrieveTransactions();
 
   ScheduleMessage *message;
   for(message = messages.first();message;message = messages.next()) {
@@ -252,7 +254,7 @@ void IncomingDialog::rejectMessage()
   }
 }
 
-void IncomingDialog::showEvent(QListViewItem *item)
+void IncomingDialog::showEvent(Q3ListViewItem *item)
 {
   IncidenceBase *incidence = ((ScheduleItemIn *)item)->event();
   if( incidence && incidence->typeID() == eventID ) {
@@ -269,7 +271,7 @@ bool IncomingDialog::incomeRefresh(ScheduleItemIn *item)
   if (ev) {
     //user interaction before??
     Attendee *att;
-    QPtrList<Attendee> attlist = ev->attendees();
+    Q3PtrList<Attendee> attlist = ev->attendees();
     for (att=attlist.first(); att; att=attlist.next()) {
       Event *event = new Event(*ev);
       mOutgoing->addMessage(event,Scheduler::Request,att->email());
@@ -514,7 +516,7 @@ bool IncomingDialog::checkAttendeesInAddressbook(IncidenceBase *inc)
 #ifndef KORG_NOKABC
   KABC::AddressBook *add_book = KABC::StdAddressBook::self();
   KABC::Addressee::List addressList;
-  QPtrList <Attendee> attendees;
+  Q3PtrList <Attendee> attendees;
   Attendee *att;
   attendees = inc->attendees();
   for (att=attendees.first();att;att=attendees.next()) {