More porting

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

kmmsgdict.cpp

@@ -13,7 +13,7 @@
 #include <kglobal.h>
 
 #include <QFileInfo>
-#include <Q3MemArray>
+#include <QVector>
 
 #include <stdio.h>
 #include <unistd.h>
@@ -96,15 +96,15 @@ public:
         int newsize = qMax(size + 25, index + 1);
         array.resize(newsize);
         for (int j = size; j < newsize; j++)
-          array.at(j) = 0;
+          array[j] = 0;
       }
-      array.at(index) = entry;
+      array[index] = entry;
     }
   }
 
   KMMsgDictEntry *get(int index)
   {
-    if (index >= 0 && (unsigned)index < array.size())
+    if (index >= 0 && index < array.size())
       return array.at(index);
     return 0;
   }
@@ -134,10 +134,14 @@ public:
   }
 
 public:
-  Q3MemArray<KMMsgDictEntry *> array;
+
   FILE *fp;
   bool swapByteOrder;
   off_t baseOffset;
+
+private:
+
+  QVector<KMMsgDictEntry *> array;
 };
 
 

kmsearchpatternedit.cpp

@@ -28,8 +28,6 @@ using KMail::RuleWidgetHandlerManager;
 #include <kdialog.h>
 #include <kdebug.h>
 
-#include <Q3PtrList>  // KWidgetLister in libkdepim needs to be ported
-
 #include <QButtonGroup>
 #include <QByteArray>
 #include <QComboBox>

tests/recipientseditortest.cpp

@@ -36,8 +36,7 @@
 #include <QLayout>
 #include <QLabel>
 #include <QLineEdit>
-#include <q3textedit.h>
+#include <QTextEdit>
-//Added by qt3to4:
 #include <QGridLayout>
 
 Composer::Composer( QWidget *parent )
@@ -59,7 +58,7 @@ Composer::Composer( QWidget *parent )
 
 //  mRecipients->setFixedHeight( 10 );
 
-  Q3TextEdit *editor = new Q3TextEdit( this );
+  QTextEdit *editor = new QTextEdit( this );
   topLayout->addWidget( editor, 2, 0, 1, 2 );
   topLayout->setRowStretch( 2, 1 );
 

urlhandlermanager.cpp

@@ -46,7 +46,7 @@
 #include <QProcess>
 #include <algorithm>
 
-#include <q3scrollview.h> // temporary hack
+#include <QScrollArea>
 
 using std::for_each;
 using std::remove;
@@ -459,7 +459,7 @@ namespace {
     if ( url.hasHost() || url.path() != "/" || !url.hasRef() )
       return false;
     if ( w && !w->htmlPart()->gotoAnchor( url.ref() ) )
-      static_cast<Q3ScrollView*>( w->htmlPart()->widget() )->ensureVisible( 0, 0 );
+      static_cast<QScrollArea*>( w->htmlPart()->widget() )->ensureVisible( 0, 0 );
     return true;
   }
 }