Some more porting, concludes my kmail hacking weekend.

svn path=/trunk/KDE/kdepim/; revision=577861

kmfolderdia.cpp

@@ -65,9 +65,8 @@
 #include <QLabel>
 #include <QToolTip>
 
-//Added by qt3to4:
 #include <QGridLayout>
-#include <Q3Frame>
+#include <QFrame>
 #include <QHBoxLayout>
 #include <QList>
 #include <QVBoxLayout>
@@ -235,11 +234,12 @@ void KMFolderDialog::setFolder( KMFolder* folder )
 
 static void addLine( QWidget *parent, QVBoxLayout* layout )
 {
-   Q3Frame *line = new Q3Frame( parent, "line" );
+   QFrame *line = new QFrame( parent );
+   line->setObjectName( "line" );
    line->setGeometry( QRect( 80, 150, 250, 20 ) );
-   line->setFrameShape( Q3Frame::HLine );
-   line->setFrameShadow( Q3Frame::Sunken );
-   line->setFrameShape( Q3Frame::HLine );
+   line->setFrameShape( QFrame::HLine );
+   line->setFrameShadow( QFrame::Sunken );
+   line->setFrameShape( QFrame::HLine );
    layout->addWidget( line );
 }
 

kmtransport.cpp

@@ -27,7 +27,7 @@
 #include <QLayout>
 //Added by qt3to4:
 #include <QGridLayout>
-#include <Q3Frame>
+#include <QFrame>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <klineedit.h>
@@ -484,8 +484,8 @@ void KMTransportDialog::makeSmtpPage()
                   "if access to the configuration file is obtained."));
   grid->addWidget( mSmtp.storePasswordCheck, 10, 0, 1, 2 );
 
-  line = new Q3Frame( page1 );
-  line->setFrameStyle( Q3Frame::HLine | Q3Frame::Plain );
+  line = new QFrame( page1 );
+  line->setFrameStyle( QFrame::HLine | QFrame::Plain );
   grid->addWidget( line, 11, 0, 1, 2 );
 
   mSmtp.specifyHostnameCheck =

mailinglistpropertiesdialog.cpp

@@ -31,7 +31,7 @@
 
 #include <QLabel>
 #include <QComboBox>
-#include <Q3GroupBox>
+#include <QGroupBox>
 #include <QCheckBox>
 #include <QPushButton>
 #include <QVBoxLayout>
@@ -60,7 +60,7 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( QWidget* p
   setAttribute( Qt::WA_DeleteOnClose );
   QLabel* label;
   mLastItem = 0;
-  
+
   connect( this, SIGNAL( okClicked() ), SLOT( slotOk() ) );
 
   QVBoxLayout *topLayout = new QVBoxLayout();
@@ -68,10 +68,11 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( QWidget* p
   topLayout->setObjectName( "topLayout" );
   topLayout->setSpacing( spacingHint() );
 
-  Q3GroupBox *mlGroup = new Q3GroupBox( i18n("Associated Mailing List" ), this );
-  mlGroup->setColumnLayout( 0,  Qt::Vertical );
-  QGridLayout *groupLayout = new QGridLayout();
-  mlGroup->layout()->addItem( groupLayout );
+  QGroupBox *mlGroup = new QGroupBox( i18n("Associated Mailing List" ), this );
+
+//  mlGroup->setColumnLayout( 0,  Qt::Vertical );
+  QGridLayout *groupLayout = new QGridLayout( mlGroup );
+  //mlGroup->layout()->addItem( groupLayout );
   groupLayout->setSpacing( spacingHint() );
   topLayout->addWidget( mlGroup );
   setMainWidget( mlGroup );

searchjob.cpp

@@ -48,7 +48,7 @@ using KPIM::ProgressManager;
 #include <kio/global.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <Q3StyleSheet>
+#include <QTextDocument>
 
 namespace KMail {
 
@@ -257,7 +257,7 @@ void SearchJob::slotSearchFolder()
     mProgress = ProgressManager::createProgressItem(
         "ImapSearchDownload" + ProgressManager::getUniqueID(),
         i18n("Downloading emails from IMAP server"),
-        i18n( "URL: %1", Q3StyleSheet::escape( mFolder->folder()->prettyUrl() ) ),
+        i18n( "URL: %1", Qt::escape( mFolder->folder()->prettyUrl() ) ),
         true,
         mAccount->useSSL() || mAccount->useTLS() );
     mProgress->setTotalItems( numMsgs );

searchwindow.cpp

@@ -130,10 +130,8 @@ SearchWindow::SearchWindow(KMMainWidget* w, KMFolder *curFolder):
   vbl->addWidget( spacer );
 
   mPatternEdit = new KMSearchPatternEdit( "", searchWidget , false, true );
-#warning Port me!
-//  mPatternEdit->setFrameStyle( Q3Frame::NoFrame | Q3Frame::Plain );
-#warning Port me!
-//  mPatternEdit->setInsideMargin( 0 );
+  mPatternEdit->setFlat( true );
+  mPatternEdit->setContentsMargins( 0, 0, 0, 0 );
   mSearchPattern = new KMSearchPattern();
   KMFolderSearch *searchFolder = 0;
   if (curFolder)