From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 30 Mar 2007 11:36:19 +0000 (+0000)
Subject: More tweaks to names
X-Git-Tag: Release-7.0.0~6666
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bd3880582fd3553842fbf8edc2706d549d36aabd;p=bacula%2Fbacula

More tweaks to names

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4459 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index f210cf5eb4..e0a7a1015d 100644
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -85,8 +85,8 @@ void MainWin::createPages()
    item = createPage("Console", topItem);
    m_console->SetPassedValues(stackedWidget, item, m_pages );
 
-   /* Append to pageslist */
-   m_pageshash.insert(m_pages, m_console);
+   /* Append to pagelist */
+   m_pagelist.insert(m_pages, m_console);
 
    /* Set Color of treeWidgetItem for the console
    * It will be set to gree in the console class if the connection is made.
@@ -106,18 +106,18 @@ void MainWin::createPages()
    m_pages++;
    item=createPage("brestore", topItem);
    bRestore* brestore=new bRestore(stackedWidget, item, m_pages);
-   m_pageshash.insert(m_pages, brestore);
+   m_pagelist.insert(m_pages, brestore);
 
 
    /* lastly for now, the medialist */
    m_pages++;
-   item=createPage("Storage Tree", topItem );
+   item=createPage("Media", topItem );
    MediaList* medialist=new MediaList(stackedWidget, m_console, item, m_pages);
-   m_pageshash.insert(m_pages, medialist);
+   m_pagelist.insert(m_pages, medialist);
 
    /* Iterate through and add to the stack */
-   foreach (Pages* pagesItem,  m_pageshash)
-      pagesItem->dockPage();
+   foreach (Pages *page,  m_pagelist)
+      page->dockPage();
 
    treeWidget->expandItem(topItem);
    stackedWidget->setCurrentIndex(0);
@@ -241,13 +241,13 @@ void MainWin::treeItemClicked(QTreeWidgetItem *item, int column)
 {
    /* Use tree item's Qt::UserRole to get treeindex */
    int treeindex = item->data(column, Qt::UserRole).toInt();
-   int stackindex=stackedWidget->indexOf(m_pageshash.value(treeindex));
+   int stackindex=stackedWidget->indexOf(m_pagelist.value(treeindex));
 
    if( stackindex >= 0 ){
       stackedWidget->setCurrentIndex(stackindex);
    }
    /* run the virtual function in case this class overrides it */
-   m_pageshash.value(treeindex)->PgSeltreeWidgetClicked();
+   m_pagelist.value(treeindex)->PgSeltreeWidgetClicked();
 }
 
 /*
@@ -259,8 +259,8 @@ void MainWin::treeItemDoubleClicked(QTreeWidgetItem *item, int column)
    int treeindex = item->data(column, Qt::UserRole).toInt();
 
    /* Use tree item's Qt::UserRole to get treeindex */
-   if (m_pageshash.value(treeindex)->isDocked()) {
-      m_pagespophold = m_pageshash.value(treeindex);
+   if (m_pagelist.value(treeindex)->isDocked()) {
+      m_pagespophold = m_pagelist.value(treeindex);
 
       /* Create a popup menu before floating window */
       QMenu *popup = new QMenu( treeWidget );
@@ -269,10 +269,10 @@ void MainWin::treeItemDoubleClicked(QTreeWidgetItem *item, int column)
       popup->exec(QCursor::pos());
    } else {
       /* Just pull it back in without prompting */
-      m_pageshash.value(treeindex)->togglePageDocking();
+      m_pagelist.value(treeindex)->togglePageDocking();
    }
    /* Here is the virtual function so that different classes can do different things */
-   m_pageshash.value(treeindex)->PgSeltreeWidgetDoubleClicked();
+   m_pagelist.value(treeindex)->PgSeltreeWidgetDoubleClicked();
 }
 
 void MainWin::labelDialogClicked() 
diff --git a/bacula/src/qt-console/mainwin.h b/bacula/src/qt-console/mainwin.h
index 5e3e7c504b..10991f0211 100644
--- a/bacula/src/qt-console/mainwin.h
+++ b/bacula/src/qt-console/mainwin.h
@@ -86,7 +86,7 @@ private:
 private:
    Console *m_console;
    Pages *m_pagespophold;
-   QHash<int,Pages*> m_pageshash;
+   QHash<int,Pages*> m_pagelist;
    QStringList m_cmd_history;
    int m_cmd_last;
    int m_pages;