dhb Cleaned up populatetree in medialist with foreaches.

[bacula/bacula] / bacula / src / qt-console / console / console.cpp

diff --git a/bacula/src/qt-console/console/console.cpp b/bacula/src/qt-console/console/console.cpp
index 41810642204a02fe3f27cdc49e287b7dc17ba616..ea299258804c978cc550723714dbf35a1f3f16fd 100644 (file)
--- a/bacula/src/qt-console/console/console.cpp
+++ b/bacula/src/qt-console/console/console.cpp
@@ -41,6 +41,7 @@
 Console::Console(QStackedWidget *parent)
 {
    QFont font;
+   m_parent=parent;
    (void)parent;
 
    setupUi(this);
@@ -114,7 +115,7 @@ void Console::connect()
       /* Update page selector to green to indicate that Console is connected */
       mainWin->actionConnect->setIcon(QIcon(QString::fromUtf8("images/connected.png")));
       QBrush greenBrush(Qt::green);
-      m_consoleItem->setForeground(0, greenBrush);
+      m_treeItem->setForeground(0, greenBrush);
    }
 
    jcr.dir_bsock = m_sock;
@@ -378,7 +379,7 @@ void Console::write_dir(const char *msg)
       mainWin->set_status(" Director not connected. Click on connect button.");
       mainWin->actionConnect->setIcon(QIcon(QString::fromUtf8("images/disconnected.png")));
       QBrush redBrush(Qt::red);
-      m_consoleItem->setForeground(0, redBrush);
+      m_treeItem->setForeground(0, redBrush);
       m_at_prompt = false;
    }
 }
@@ -533,7 +534,7 @@ int Console::read()
          m_sock = NULL;
          mainWin->actionConnect->setIcon(QIcon(QString::fromUtf8("images/disconnected.png")));
          QBrush redBrush(Qt::red);
-         m_consoleItem->setForeground(0, redBrush);
+         m_treeItem->setForeground(0, redBrush);
          m_notifier->setEnabled(false);
          delete m_notifier;
          m_notifier = NULL;
@@ -573,12 +574,30 @@ void Console::notify(bool enable)
    m_notifier->setEnabled(enable);   
 }
 
-void Console::setTreeItem(QTreeWidgetItem *item) 
-{ 
-   m_consoleItem = item;
+void Console::setTreeItem(QTreeWidgetItem *item)
+{
+   m_treeItem = item;
 }
 
 void Console::setDirRes(DIRRES *dir) 
 { 
    m_dir = dir;
 }
+
+void Console::dosql(QString* sqlcmd, QStringList& strlstret)
+{
+   int stat;
+   /* don't effect the string coming in */
+   QString cmd(*sqlcmd);
+
+   cmd = ".sql \"" + cmd + "\"";
+
+   write_dir(cmd.toUtf8().data());
+   while ((stat=read()) > 0) {
+      QString line = msg();
+      QRegExp regex("^Using Catalog");
+      if ( regex.indexIn(line) < 0 ){
+        strlstret.append(line);
+      }
+   }
+}