initial public commit of qt4 portp1

1 files changed, 7 insertions, 7 deletions

diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 4bc4441..81d7b52 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -33,24 +33,24 @@
 #include <kfiledialog.h>
 //#include <qpe/resource.h>
 #include <qpe/global.h>
 //#include <qpe/contact.h>
 
 
 #include <qcombobox.h>
 #include <qcheckbox.h>
-#include <qiconset.h>
+#include <qicon.h>
 #include <qtimer.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 #include <qlabel.h>
 #include <qtabwidget.h>
-#include <qlistview.h>
+#include <q3listview.h>
 
 //using namespace Opie::Core;
 //using namespace Opie::Ui;
 ComposeMail::ComposeMail( Settings *sett, QWidget *parent, const char *name, bool modal )
     : ComposeMailUI( parent, name, modal )
 {
 
     topLevelWidget()->setCaption( i18n("Compose mail - Click OK to send ->") );
@@ -120,33 +120,33 @@ ComposeMail::ComposeMail( Settings *sett, QWidget *parent, const char *name, boo
     connect( ccButton, SIGNAL( clicked() ), SLOT( pickAddressCC() ) );
     connect( bccButton, SIGNAL( clicked() ), SLOT( pickAddressBCC() ) );
     connect( replyButton, SIGNAL( clicked() ), SLOT( pickAddressReply() ) );
     connect( addButton, SIGNAL( clicked() ), SLOT( addAttachment() ) );
     connect( deleteButton, SIGNAL( clicked() ), SLOT( removeAttachment() ) );
     connect( SaveButton, SIGNAL( clicked() ), SLOT( saveAsDraft()) );
     mMail = 0;
     warnAttach = true; 
-    QIconSet icon;
+    QIcon icon;
     //icon = SmallIcon("fileexport");
     icon = SmallIcon("filesave");
     SaveButton->setIconSet (icon ) ;
     if ( QApplication::desktop()->width() < 320 ) {
         SaveButton->setText ("") ;
         SaveButton->setMaximumSize ( SaveButton->sizeHint().height(),SaveButton->sizeHint().height()) ;
     }
     else
         SaveButton->setText (i18n("Save"));
 #ifndef DESKTOP_VERSION
     QPEApplication::setStylusOperation( message, QPEApplication::RightOnHold );
     QPEApplication::setStylusOperation( senderNameEdit, QPEApplication::RightOnHold );
     QPEApplication::setStylusOperation( subjectLine, QPEApplication::RightOnHold );
 #endif
     message->setFont ( KOPrefs::instance()->mComposeFont );
-    message->setWordWrap (QMultiLineEdit::WidgetWidth);
+    message->setWordWrap (Q3MultiLineEdit::WidgetWidth);
     if ( smtpAccounts.count() > 0 ) {
         fillValues( smtpAccountBox->currentItem() );
     } else {
         QMessageBox::information( 0, i18n( "Problem" ),
                                   i18n( "Please create an\nSMTP account first.\nThe SMTP is needed\nfor sending mail.\n" ),
                                   i18n( "Ok" ) );
         return;
     } 
@@ -529,18 +529,18 @@ void ComposeMail::reEditMail(const RecMailP&current)
     subjectLine->setText( data->getSubject());
     toLine->setText(data->To().join(","));
     ccLine->setText(data->CC().join(","));
     bccLine->setText(data->Bcc().join(","));
     replyLine->setText(data->Replyto());
     setCharset(body->getCharset());
 }
 
-AttachViewItem::AttachViewItem( QListView *parent, Attachment *att )
-    : QListViewItem( parent )
+AttachViewItem::AttachViewItem( Q3ListView *parent, Attachment *att )
+    : Q3ListViewItem( parent )
 {
     attachment = att;
     if ( !attachment->getPixmap().isNull() )
         setPixmap( 0,attachment->getPixmap() );
     setText( 0, att->getName().isEmpty() ? att->getFileName() : att->getName() );
     setText( 1, QString::number( att->getSize() ) );
 }