1 files changed, 32 insertions, 32 deletions

diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp
index 9f4f358..62cbf62 100644
--- a/noncore/net/mail/accountview.cpp
+++ b/noncore/net/mail/accountview.cpp
@@ -579,3 +579,3 @@ AccountView::~AccountView()
     imapAccounts.clear();
-    mboxAccounts.clear();
+    mhAccounts.clear();
 }
@@ -607,5 +607,5 @@ void AccountView::populate( QList<Account> list )
     imapAccounts.clear();
-    mboxAccounts.clear();
+    mhAccounts.clear();
 
-    mboxAccounts.append(new MBOXviewItem(AbstractMail::defaultLocalfolder(),this));
+    mhAccounts.append(new MHviewItem(AbstractMail::defaultLocalfolder(),this));
 
@@ -668,6 +668,6 @@ void AccountView::setupFolderselect(Selectstore*sels)
     unsigned int i = 0;
-    for (i=0; i < mboxAccounts.count();++i) {
-        mboxAccounts[i]->refresh(false);
-        sFolders = mboxAccounts[i]->subFolders();
-        sels->addAccounts(mboxAccounts[i]->getWrapper(),sFolders);
+    for (i=0; i < mhAccounts.count();++i) {
+        mhAccounts[i]->refresh(false);
+        sFolders = mhAccounts[i]->subFolders();
+        sels->addAccounts(mhAccounts[i]->getWrapper(),sFolders);
     }
@@ -706,6 +706,6 @@ void AccountView::downloadMails(Folder*fromFolder,AbstractMail*fromWrapper)
 /**
- * MBOX Account stuff
+ * MH Account stuff
  */
 
-MBOXviewItem::MBOXviewItem( const QString&aPath, AccountView *parent )
+MHviewItem::MHviewItem( const QString&aPath, AccountView *parent )
     : AccountViewItem( parent )
@@ -720,3 +720,3 @@ MBOXviewItem::MBOXviewItem( const QString&aPath, AccountView *parent )
 
-MBOXviewItem::~MBOXviewItem()
+MHviewItem::~MHviewItem()
 {
@@ -725,3 +725,3 @@ MBOXviewItem::~MBOXviewItem()
 
-AbstractMail *MBOXviewItem::getWrapper()
+AbstractMail *MHviewItem::getWrapper()
 {
@@ -730,3 +730,3 @@ AbstractMail *MBOXviewItem::getWrapper()
 
-void MBOXviewItem::refresh( QList<RecMail> & )
+void MHviewItem::refresh( QList<RecMail> & )
 {
@@ -735,3 +735,3 @@ void MBOXviewItem::refresh( QList<RecMail> & )
 
-void MBOXviewItem::refresh(bool force)
+void MHviewItem::refresh(bool force)
 {
@@ -748,3 +748,3 @@ void MBOXviewItem::refresh(bool force)
     for ( it = folders->first(); it; it = folders->next() ) {
-        item = new MBOXfolderItem( it, this , item );
+        item = new MHfolderItem( it, this , item );
         item->setSelectable(it->may_select());
@@ -756,5 +756,5 @@ void MBOXviewItem::refresh(bool force)
 
-RecBody MBOXviewItem::fetchBody( const RecMail &mail )
+RecBody MHviewItem::fetchBody( const RecMail &mail )
 {
-    qDebug( "MBOX fetchBody" );
+    qDebug( "MH fetchBody" );
     return wrapper->fetchBody( mail );
@@ -762,3 +762,3 @@ RecBody MBOXviewItem::fetchBody( const RecMail &mail )
 
-QPopupMenu * MBOXviewItem::getContextMenu()
+QPopupMenu * MHviewItem::getContextMenu()
 {
@@ -772,3 +772,3 @@ QPopupMenu * MBOXviewItem::getContextMenu()
 
-void MBOXviewItem::createFolder()
+void MHviewItem::createFolder()
 {
@@ -784,3 +784,3 @@ void MBOXviewItem::createFolder()
 
-QStringList MBOXviewItem::subFolders()
+QStringList MHviewItem::subFolders()
 {
@@ -789,5 +789,5 @@ QStringList MBOXviewItem::subFolders()
     while ( child ) {
-        MBOXfolderItem *tmp = (MBOXfolderItem*)child;
+        MHfolderItem *tmp = (MHfolderItem*)child;
         child = child->nextSibling();
-        result.append(tmp->getFolder()->getName());
+        result.append(tmp->getFolder()->getDisplayName());
     }
@@ -797,3 +797,3 @@ QStringList MBOXviewItem::subFolders()
 
-void MBOXviewItem::contextMenuSelected(int which)
+void MHviewItem::contextMenuSelected(int which)
 {
@@ -811,3 +811,3 @@ void MBOXviewItem::contextMenuSelected(int which)
 
-MBOXfolderItem::~MBOXfolderItem()
+MHfolderItem::~MHfolderItem()
 {
@@ -816,3 +816,3 @@ MBOXfolderItem::~MBOXfolderItem()
 
-MBOXfolderItem::MBOXfolderItem( Folder *folderInit, MBOXviewItem *parent , QListViewItem*after  )
+MHfolderItem::MHfolderItem( Folder *folderInit, MHviewItem *parent , QListViewItem*after  )
     : AccountViewItem( parent,after )
@@ -831,3 +831,3 @@ MBOXfolderItem::MBOXfolderItem( Folder *folderInit, MBOXviewItem *parent , QList
 
-Folder*MBOXfolderItem::getFolder()
+Folder*MHfolderItem::getFolder()
 {
@@ -836,3 +836,3 @@ Folder*MBOXfolderItem::getFolder()
 
-void MBOXfolderItem::refresh(QList<RecMail>&target)
+void MHfolderItem::refresh(QList<RecMail>&target)
 {
@@ -842,3 +842,3 @@ void MBOXfolderItem::refresh(QList<RecMail>&target)
 
-RecBody MBOXfolderItem::fetchBody(const RecMail&aMail)
+RecBody MHfolderItem::fetchBody(const RecMail&aMail)
 {
@@ -847,3 +847,3 @@ RecBody MBOXfolderItem::fetchBody(const RecMail&aMail)
 
-void MBOXfolderItem::deleteFolder()
+void MHfolderItem::deleteFolder()
 {
@@ -857,3 +857,3 @@ void MBOXfolderItem::deleteFolder()
             QListView*v=listView();
-            MBOXviewItem * box = mbox;
+            MHviewItem * box = mbox;
             /* be carefull - after that this object is destroyd so don't use
@@ -868,3 +868,3 @@ void MBOXfolderItem::deleteFolder()
 
-QPopupMenu * MBOXfolderItem::getContextMenu()
+QPopupMenu * MHfolderItem::getContextMenu()
 {
@@ -879,3 +879,3 @@ QPopupMenu * MBOXfolderItem::getContextMenu()
 
-void MBOXfolderItem::downloadMails()
+void MHfolderItem::downloadMails()
 {
@@ -886,3 +886,3 @@ void MBOXfolderItem::downloadMails()
 
-void MBOXfolderItem::contextMenuSelected(int which)
+void MHfolderItem::contextMenuSelected(int which)
 {