<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][14780] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=14780">14780</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-09-07 18:08:57 -0500 (Mon, 07 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the model being used on consoleListView and fix horizontal scrollbar.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcfsguiappmanagercpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcinterfacesservermanagercpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcinterfacesservermanagerui">freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.ui</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgetcpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgetui">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.ui</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimestatisticsdialogcpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginsortfilterproxymodelcpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginsortfilterproxymodelh">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitafsguisrcfsguiappmanagercpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp (14779 => 14780)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp 2009-09-07 22:13:09 UTC (rev 14779)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp 2009-09-07 23:08:57 UTC (rev 14780)
</span><span class="lines">@@ -137,7 +137,6 @@
</span><span class="cx"> pluginsDir->setCurrent(dir);
</span><span class="cx"> #else
</span><span class="cx"> dir = settings.value("PluginDir", qApp->applicationDirPath()).toString();
</span><del>- qDebug() << qApp->applicationDirPath();
</del><span class="cx"> pluginsDir->setCurrent(dir);
</span><span class="cx"> pluginsDir->cd("plugins");
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcinterfacesservermanagercpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.cpp (14779 => 14780)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.cpp 2009-09-07 22:13:09 UTC (rev 14779)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.cpp 2009-09-07 23:08:57 UTC (rev 14780)
</span><span class="lines">@@ -133,6 +133,7 @@
</span><span class="cx"> settings.endGroup();
</span><span class="cx"> readSettings();
</span><span class="cx"> m_ui->listServers->setCurrentItem(m_ui->listServers->findItems(text, Qt::MatchExactly, 0).first());
</span><ins>+ m_ui->btnEdit->click();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -144,6 +145,7 @@
</span><span class="cx"> m_ui->btnSave->setEnabled(true);
</span><span class="cx"> m_ui->btnEdit->setEnabled(false);
</span><span class="cx"> m_ui->lineHost->setFocus();
</span><ins>+ m_ui->btnConnect->setEnabled(false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ServerManager::saveServer()
</span><span class="lines">@@ -167,6 +169,7 @@
</span><span class="cx"> m_ui->linePort->setEnabled(false);
</span><span class="cx"> m_ui->btnSave->setEnabled(false);
</span><span class="cx"> m_ui->btnEdit->setEnabled(true);
</span><ins>+ m_ui->btnConnect->setEnabled(true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ServerManager::deleteServer()
</span><span class="lines">@@ -197,4 +200,3 @@
</span><span class="cx"> }
</span><span class="cx"> settings.endGroup();
</span><span class="cx"> }
</span><del>-
</del></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcinterfacesservermanagerui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.ui (14779 => 14780)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.ui 2009-09-07 22:13:09 UTC (rev 14779)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.ui 2009-09-07 23:08:57 UTC (rev 14780)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> <string>&amp;Add server</string>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="icon">
</span><del>- <iconset>
</del><ins>+ <iconset resource="../resources/resources.qrc">
</ins><span class="cx"> <normaloff>:/icons/new_server_icon.png</normaloff>:/icons/new_server_icon.png</iconset>
</span><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> <string>&amp;Remove Server</string>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="icon">
</span><del>- <iconset>
</del><ins>+ <iconset resource="../resources/resources.qrc">
</ins><span class="cx"> <normaloff>:/icons/remove_server_icon.png</normaloff>:/icons/remove_server_icon.png</iconset>
</span><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> <bool>true</bool>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="currentIndex">
</span><del>- <number>1</number>
</del><ins>+ <number>0</number>
</ins><span class="cx"> </property>
</span><span class="cx"> <widget class="QWidget" name="tabBasic">
</span><span class="cx"> <attribute name="title">
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> <string>&amp;Save</string>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="icon">
</span><del>- <iconset>
</del><ins>+ <iconset resource="../resources/resources.qrc">
</ins><span class="cx"> <normaloff>:/icons/save.png</normaloff>:/icons/save.png</iconset>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="iconSize">
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> <string>&amp;Edit</string>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="icon">
</span><del>- <iconset>
</del><ins>+ <iconset resource="../resources/resources.qrc">
</ins><span class="cx"> <normaloff>:/icons/edit_icon.png</normaloff>:/icons/edit_icon.png</iconset>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="iconSize">
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx"> <string>&amp;Connect</string>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="icon">
</span><del>- <iconset>
</del><ins>+ <iconset resource="../resources/resources.qrc">
</ins><span class="cx"> <normaloff>:/icons/connect_icon.png</normaloff>:/icons/connect_icon.png</iconset>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="iconSize">
</span><span class="lines">@@ -243,7 +243,11 @@
</span><span class="cx"> </layout>
</span><span class="cx"> <zorder></zorder>
</span><span class="cx"> </widget>
</span><del>- <resources/>
</del><ins>+ <resources>
+ <include location="../resources/resources.qrc"/>
+ <include location="../resources/resources.qrc"/>
+ <include location="../resources/resources.qrc"/>
+ </resources>
</ins><span class="cx"> <connections>
</span><span class="cx"> <connection>
</span><span class="cx"> <sender>pushButton_5</sender>
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgetcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp (14779 => 14780)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp 2009-09-07 22:13:09 UTC (rev 14779)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp 2009-09-07 23:08:57 UTC (rev 14780)
</span><span class="lines">@@ -19,10 +19,10 @@
</span><span class="cx"> model->setSourceModel(sourceModel);
</span><span class="cx"> model->setFilterKeyColumn(0);
</span><span class="cx"> m_ui->consoleListView->setModel(model);
</span><ins>+ m_ui->consoleListView->setColumnWidth(0, 2000);
</ins><span class="cx">
</span><span class="cx"> QObject::connect(sourceModel, SIGNAL(beforeInserting()),
</span><span class="cx"> this, SLOT(setConditionalScroll()));
</span><del>-
</del><span class="cx"> QObject::connect(sourceModel, SIGNAL(afterInserting()),
</span><span class="cx"> this, SLOT(conditionalScroll()));
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgetui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.ui (14779 => 14780)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.ui 2009-09-07 22:13:09 UTC (rev 14779)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.ui 2009-09-07 23:08:57 UTC (rev 14780)
</span><span class="lines">@@ -306,9 +306,15 @@
</span><span class="cx"> </layout>
</span><span class="cx"> </widget>
</span><span class="cx"> <widget class="QTableView" name="consoleListView">
</span><ins>+ <property name="autoScroll">
+ <bool>false</bool>
+ </property>
</ins><span class="cx"> <property name="editTriggers">
</span><span class="cx"> <set>QAbstractItemView::NoEditTriggers</set>
</span><span class="cx"> </property>
</span><ins>+ <property name="tabKeyNavigation">
+ <bool>false</bool>
+ </property>
</ins><span class="cx"> <property name="showDropIndicator" stdset="0">
</span><span class="cx"> <bool>false</bool>
</span><span class="cx"> </property>
</span><span class="lines">@@ -318,45 +324,48 @@
</span><span class="cx"> <property name="selectionMode">
</span><span class="cx"> <enum>QAbstractItemView::ExtendedSelection</enum>
</span><span class="cx"> </property>
</span><ins>+ <property name="horizontalScrollMode">
+ <enum>QAbstractItemView::ScrollPerPixel</enum>
+ </property>
</ins><span class="cx"> <property name="showGrid">
</span><span class="cx"> <bool>false</bool>
</span><span class="cx"> </property>
</span><ins>+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
</ins><span class="cx"> <property name="cornerButtonEnabled">
</span><span class="cx"> <bool>false</bool>
</span><span class="cx"> </property>
</span><span class="cx"> <attribute name="horizontalHeaderVisible">
</span><span class="cx"> <bool>false</bool>
</span><span class="cx"> </attribute>
</span><del>- <attribute name="horizontalHeaderHighlightSections">
</del><ins>+ <attribute name="horizontalHeaderCascadingSectionResizes">
</ins><span class="cx"> <bool>false</bool>
</span><span class="cx"> </attribute>
</span><del>- <attribute name="horizontalHeaderStretchLastSection">
- <bool>true</bool>
- </attribute>
- <attribute name="verticalHeaderVisible">
</del><ins>+ <attribute name="horizontalHeaderHighlightSections">
</ins><span class="cx"> <bool>false</bool>
</span><span class="cx"> </attribute>
</span><del>- <attribute name="verticalHeaderHighlightSections">
</del><ins>+ <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
</ins><span class="cx"> <bool>false</bool>
</span><span class="cx"> </attribute>
</span><del>- <attribute name="verticalHeaderStretchLastSection">
</del><ins>+ <attribute name="horizontalHeaderStretchLastSection">
</ins><span class="cx"> <bool>false</bool>
</span><span class="cx"> </attribute>
</span><span class="cx"> <attribute name="verticalHeaderVisible">
</span><span class="cx"> <bool>false</bool>
</span><span class="cx"> </attribute>
</span><del>- <attribute name="horizontalHeaderStretchLastSection">
- <bool>true</bool>
- </attribute>
- <attribute name="horizontalHeaderVisible">
</del><ins>+ <attribute name="verticalHeaderCascadingSectionResizes">
</ins><span class="cx"> <bool>false</bool>
</span><span class="cx"> </attribute>
</span><del>- <attribute name="horizontalHeaderHighlightSections">
- <bool>false</bool>
</del><ins>+ <attribute name="verticalHeaderDefaultSectionSize">
+ <number>20</number>
</ins><span class="cx"> </attribute>
</span><span class="cx"> <attribute name="verticalHeaderHighlightSections">
</span><span class="cx"> <bool>false</bool>
</span><span class="cx"> </attribute>
</span><ins>+ <attribute name="verticalHeaderShowSortIndicator" stdset="0">
+ <bool>false</bool>
+ </attribute>
</ins><span class="cx"> <attribute name="verticalHeaderStretchLastSection">
</span><span class="cx"> <bool>false</bool>
</span><span class="cx"> </attribute>
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimestatisticsdialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp (14779 => 14780)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp 2009-09-07 22:13:09 UTC (rev 14779)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp 2009-09-07 23:08:57 UTC (rev 14780)
</span><span class="lines">@@ -146,6 +146,7 @@
</span><span class="cx"> m_ui->listInactiveHeaders->clear();
</span><span class="cx">
</span><span class="cx"> Channel * ch = _sm->getInactiveChannel(index.data(Qt::UserRole).toString());
</span><ins>+ qDebug() << ch;
</ins><span class="cx"> if (!ch)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginsortfilterproxymodelcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.cpp (14779 => 14780)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.cpp 2009-09-07 22:13:09 UTC (rev 14779)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.cpp 2009-09-07 23:08:57 UTC (rev 14780)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> #include "sortfilterproxymodel.h"
</span><span class="cx">
</span><span class="cx"> ConsoleModel::ConsoleModel (QObject *parent)
</span><del>- : QAbstractListModel(parent)
</del><ins>+ : QAbstractTableModel(parent)
</ins><span class="cx"> {
</span><span class="cx"> QSettings settings;
</span><span class="cx"> batchSize = settings.value("Console/batchSize", 200).toInt();
</span><span class="lines">@@ -17,11 +17,15 @@
</span><span class="cx"> return _listDisplayModel.count();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+int ConsoleModel::columnCount ( const QModelIndex & /*parent*/ ) const
+{
+ return 1;
+}
+
</ins><span class="cx"> QVariant ConsoleModel::data ( const QModelIndex & index, int role ) const
</span><span class="cx"> {
</span><span class="cx"> if (!index.isValid())
</span><span class="cx"> return QVariant();
</span><del>-
</del><span class="cx"> return _listDisplayModel.at(index.row())->data(role);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginsortfilterproxymodelh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.h (14779 => 14780)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.h 2009-09-07 22:13:09 UTC (rev 14779)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.h 2009-09-07 23:08:57 UTC (rev 14780)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #define SORTFILTERPROXYMODEL_H
</span><span class="cx">
</span><span class="cx"> #include <QSortFilterProxyModel>
</span><del>-#include <QAbstractListModel>
</del><ins>+#include <QAbstractTableModel>
</ins><span class="cx"> #include <QVector>
</span><span class="cx"> #include <QList>
</span><span class="cx">
</span><span class="lines">@@ -47,12 +47,13 @@
</span><span class="cx"> class QStandardItem;
</span><span class="cx"> class QScrollBar;
</span><span class="cx">
</span><del>-class ConsoleModel : public QAbstractListModel
</del><ins>+class ConsoleModel : public QAbstractTableModel
</ins><span class="cx"> {
</span><span class="cx"> Q_OBJECT
</span><span class="cx"> public:
</span><span class="cx"> ConsoleModel (QObject *parent = 0);
</span><span class="cx"> int rowCount ( const QModelIndex & parent = QModelIndex() ) const;
</span><ins>+ int columnCount ( const QModelIndex & parent = QModelIndex() ) const;
</ins><span class="cx"> QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const;
</span><span class="cx"> void appendRow ( QStandardItem* item );
</span><span class="cx"> void clear();
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>