<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<style>
<!--
@font-face
{font-family:Wingdings}
@font-face
{font-family:Wingdings}
@font-face
{font-family:Calibri}
@font-face
{font-family:Tahoma}
@font-face
{font-family:Consolas}
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif"}
a:link, span.MsoHyperlink
{color:blue;
text-decoration:underline}
a:visited, span.MsoHyperlinkFollowed
{color:purple;
text-decoration:underline}
p.MsoPlainText, li.MsoPlainText, div.MsoPlainText
{margin:0cm;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif"}
p.MsoAcetate, li.MsoAcetate, div.MsoAcetate
{margin:0cm;
margin-bottom:.0001pt;
font-size:8.0pt;
font-family:"Tahoma","sans-serif"}
span.NurTextZchn
{font-family:"Calibri","sans-serif"}
span.SprechblasentextZchn
{font-family:"Tahoma","sans-serif"}
.MsoChpDefault
{font-family:"Calibri","sans-serif"}
@page WordSection1
{margin:70.85pt 129.75pt 2.0cm 129.7pt}
div.WordSection1
{}
-->
</style>
</head>
<body lang="DE" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoPlainText"><span lang="EN-US">Peter,</span></p>
<p class="MsoPlainText"><span lang="EN-US"> </span></p>
<p class="MsoPlainText"><span lang="EN-US">the speed improvement with threads sounds freaking good!!!</span></p>
<p class="MsoPlainText"><span lang="EN-US">However when I try it I get this:</span></p>
<p class="MsoPlainText"><span lang="EN-US"></span><span style=""><img width="486" height="159" id="Grafik_x0020_1" src="cid:image001.png@01CDABF4.0950E9C0" alt="Beschreibung: C:\Documents and Settings\g711973\Local Settings\Temp\nhnjp1ci.nx3.png"></span></p>
<p class="MsoPlainText"><span lang="EN-US"> </span></p>
<p class="MsoPlainText"><span lang="EN-US">I first tried without activating it and could honestly not see any improvement. Then I remembered it had been made optional
</span><span lang="EN-US" style="font-family:Wingdings">J</span><span lang="EN-US"></span></p>
<p class="MsoPlainText"><span lang="EN-US">Don’t you get a crash using the Kst-2.0.x-Qt5-2012.10.16-20.27 snapshot?</span></p>
<p class="MsoPlainText"><span lang="EN-US"> </span></p>
<p class="MsoPlainText"><span lang="EN-US">And a couple other things:</span></p>
<p class="MsoPlainText"><span lang="EN-US">- first, you have a typo in the ASCII Dialog for buffer siz*e*.
</span></p>
<p class="MsoPlainText"><span lang="EN-US">- second, I really wonder whether those settings should not rather go to general settings, as they depend more on the computer than the ASCII file. @Barth: what’s your opinion?</span></p>
<p class="MsoPlainText"><span lang="EN-US"> </span></p>
<p class="MsoPlainText"><span lang="EN-US">I think once this crash and the above UI question are settled, you can prepare another snapshot with printing, and we’ll test it a bit before the release. But we’re really close now.
</span></p>
<p class="MsoPlainText"><span lang="EN-US">Thanks soooo much for your great work the last days!</span></p>
<p class="MsoPlainText"><span lang="EN-US"> </span></p>
<p class="MsoPlainText"><span lang="EN-US">Happy Nicolas</span></p>
<p class="MsoPlainText"><span lang="EN-US"> </span></p>
<p class="MsoPlainText">> <span style="">-----Ursprüngliche Nachricht-----</span></p>
<p class="MsoPlainText">> <span style="">Von: kst-bounces@kde.org [mailto:kst-bounces@kde.org] Im Auftrag von Peter</span></p>
<p class="MsoPlainText">> <span style="">Kümmel</span></p>
<p class="MsoPlainText">> <span style="">Gesendet: Dienstag, 16. Oktober 2012 22:38</span></p>
<p class="MsoPlainText">> <span style="">An: kde-commits@kde.org</span></p>
<p class="MsoPlainText">> <span style="">Cc: kst@kde.org</span></p>
<p class="MsoPlainText">> <span style="">Betreff: [Kst] branches/work/kst/portto4/kst/src/datasources/ascii</span></p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> SVN commit 1320820 by kuemmel:</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> make usage of threads optional</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> M +76 -31 asciiconfig.ui</p>
<p class="MsoPlainText">> M +3 -0 asciiplugin.cpp</p>
<p class="MsoPlainText">> M +2 -3 asciisource.cpp</p>
<p class="MsoPlainText">> M +0 -1 asciisource.h</p>
<p class="MsoPlainText">> M +9 -1 asciisourceconfig.cpp</p>
<p class="MsoPlainText">> M +3 -1 asciisourceconfig.h</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> --- branches/work/kst/portto4/kst/src/datasources/ascii/asciiconfig.ui</p>
<p class="MsoPlainText">> #1320819:1320820 @@ -10,7 +10,7 @@</p>
<p class="MsoPlainText">> <height>600</height></p>
<p class="MsoPlainText">> </rect></p>
<p class="MsoPlainText">> </property></p>
<p class="MsoPlainText">> - <layout class="QGridLayout" name="gridLayout"></p>
<p class="MsoPlainText">> + <layout class="QGridLayout" name="gridLayout"</p>
<p class="MsoPlainText">> + columnminimumwidth="2,0,0"></p>
<p class="MsoPlainText">> <item row="0" column="0"></p>
<p class="MsoPlainText">> <widget class="QLabel" name="_labelBeginning"></p>
<p class="MsoPlainText">> <property name="text"></p>
<p class="MsoPlainText">> @@ -18,35 +18,32 @@</p>
<p class="MsoPlainText">> </property></p>
<p class="MsoPlainText">> </widget></p>
<p class="MsoPlainText">> </item></p>
<p class="MsoPlainText">> - <item row="1" column="0" rowspan="2"></p>
<p class="MsoPlainText">> + <item row="1" column="0"></p>
<p class="MsoPlainText">> <widget class="QPlainTextEdit" name="_showBeginning"/></p>
<p class="MsoPlainText">> </item></p>
<p class="MsoPlainText">> - <item row="1" column="1" rowspan="2" colspan="2"></p>
<p class="MsoPlainText">> + <item row="1" column="1"></p>
<p class="MsoPlainText">> <widget class="Line" name="verticalLine"></p>
<p class="MsoPlainText">> <property name="orientation"></p>
<p class="MsoPlainText">> <enum>Qt::Vertical</enum></p>
<p class="MsoPlainText">> </property></p>
<p class="MsoPlainText">> </widget></p>
<p class="MsoPlainText">> </item></p>
<p class="MsoPlainText">> - <item row="2" column="2"></p>
<p class="MsoPlainText">> + <item row="1" column="2"></p>
<p class="MsoPlainText">> <layout class="QVBoxLayout" name="verticalLayout"></p>
<p class="MsoPlainText">> <item></p>
<p class="MsoPlainText">> <widget class="QGroupBox" name="headerButtonGroup"></p>
<p class="MsoPlainText">> <property name="title"></p>
<p class="MsoPlainText">> <string>Header</string></p>
<p class="MsoPlainText">> </property></p>
<p class="MsoPlainText">> - <layout class="QGridLayout" name="gridLayout2"></p>
<p class="MsoPlainText">> - <property name="topMargin"></p>
<p class="MsoPlainText">> - <number>3</number></p>
<p class="MsoPlainText">> + <widget class="QLabel" name="textLabel1_3"></p>
<p class="MsoPlainText">> + <property name="geometry"></p>
<p class="MsoPlainText">> + <rect></p>
<p class="MsoPlainText">> + <x>10</x></p>
<p class="MsoPlainText">> + <y>17</y></p>
<p class="MsoPlainText">> + <width>90</width></p>
<p class="MsoPlainText">> + <height>16</height></p>
<p class="MsoPlainText">> + </rect></p>
<p class="MsoPlainText">> </property></p>
<p class="MsoPlainText">> - <property name="bottomMargin"></p>
<p class="MsoPlainText">> - <number>3</number></p>
<p class="MsoPlainText">> - </property></p>
<p class="MsoPlainText">> - <property name="verticalSpacing"></p>
<p class="MsoPlainText">> - <number>3</number></p>
<p class="MsoPlainText">> - </property></p>
<p class="MsoPlainText">> - <item row="0" column="0"></p>
<p class="MsoPlainText">> - <widget class="QLabel" name="textLabel1_3"></p>
<p class="MsoPlainText">> <property name="sizePolicy"></p>
<p class="MsoPlainText">> <sizepolicy hsizetype="Preferred" vsizetype="Preferred"></p>
<p class="MsoPlainText">> <horstretch>3</horstretch></p>
<p class="MsoPlainText">> @@ -63,9 +60,15 @@</p>
<p class="MsoPlainText">> <cstring>_startLine</cstring></p>
<p class="MsoPlainText">> </property></p>
<p class="MsoPlainText">> </widget></p>
<p class="MsoPlainText">> - </item></p>
<p class="MsoPlainText">> - <item row="0" column="2"></p>
<p class="MsoPlainText">> <widget class="QSpinBox" name="_startLine"></p>
<p class="MsoPlainText">> + <property name="geometry"></p>
<p class="MsoPlainText">> + <rect></p>
<p class="MsoPlainText">> + <x>206</x></p>
<p class="MsoPlainText">> + <y>17</y></p>
<p class="MsoPlainText">> + <width>63</width></p>
<p class="MsoPlainText">> + <height>20</height></p>
<p class="MsoPlainText">> + </rect></p>
<p class="MsoPlainText">> + </property></p>
<p class="MsoPlainText">> <property name="sizePolicy"></p>
<p class="MsoPlainText">> <sizepolicy hsizetype="Minimum" vsizetype="Fixed"></p>
<p class="MsoPlainText">> <horstretch>2</horstretch></p>
<p class="MsoPlainText">> @@ -82,19 +85,31 @@</p>
<p class="MsoPlainText">> <number>1</number></p>
<p class="MsoPlainText">> </property></p>
<p class="MsoPlainText">> </widget></p>
<p class="MsoPlainText">> - </item></p>
<p class="MsoPlainText">> - <item row="1" column="0"></p>
<p class="MsoPlainText">> <widget class="QCheckBox" name="_readFields"></p>
<p class="MsoPlainText">> + <property name="geometry"></p>
<p class="MsoPlainText">> + <rect></p>
<p class="MsoPlainText">> + <x>10</x></p>
<p class="MsoPlainText">> + <y>41</y></p>
<p class="MsoPlainText">> + <width>153</width></p>
<p class="MsoPlainText">> + <height>17</height></p>
<p class="MsoPlainText">> + </rect></p>
<p class="MsoPlainText">> + </property></p>
<p class="MsoPlainText">> <property name="text"></p>
<p class="MsoPlainText">> <string>Read field names from line:</string></p>
<p class="MsoPlainText">> </property></p>
<p class="MsoPlainText">> </widget></p>
<p class="MsoPlainText">> - </item></p>
<p class="MsoPlainText">> - <item row="1" column="2"></p>
<p class="MsoPlainText">> <widget class="QSpinBox" name="_fieldsLine"></p>
<p class="MsoPlainText">> <property name="enabled"></p>
<p class="MsoPlainText">> <bool>false</bool></p>
<p class="MsoPlainText">> </property></p>
<p class="MsoPlainText">> + <property name="geometry"></p>
<p class="MsoPlainText">> + <rect></p>
<p class="MsoPlainText">> + <x>206</x></p>
<p class="MsoPlainText">> + <y>40</y></p>
<p class="MsoPlainText">> + <width>63</width></p>
<p class="MsoPlainText">> + <height>20</height></p>
<p class="MsoPlainText">> + </rect></p>
<p class="MsoPlainText">> + </property></p>
<p class="MsoPlainText">> <property name="sizePolicy"></p>
<p class="MsoPlainText">> <sizepolicy hsizetype="Minimum" vsizetype="Fixed"></p>
<p class="MsoPlainText">> <horstretch>2</horstretch></p>
<p class="MsoPlainText">> @@ -111,22 +126,34 @@</p>
<p class="MsoPlainText">> <number>1</number></p>
<p class="MsoPlainText">> </property></p>
<p class="MsoPlainText">> </widget></p>
<p class="MsoPlainText">> - </item></p>
<p class="MsoPlainText">> - <item row="2" column="0"></p>
<p class="MsoPlainText">> <widget class="QCheckBox" name="_readUnits"></p>
<p class="MsoPlainText">> <property name="enabled"></p>
<p class="MsoPlainText">> <bool>false</bool></p>
<p class="MsoPlainText">> </property></p>
<p class="MsoPlainText">> + <property name="geometry"></p>
<p class="MsoPlainText">> + <rect></p>
<p class="MsoPlainText">> + <x>10</x></p>
<p class="MsoPlainText">> + <y>64</y></p>
<p class="MsoPlainText">> + <width>122</width></p>
<p class="MsoPlainText">> + <height>17</height></p>
<p class="MsoPlainText">> + </rect></p>
<p class="MsoPlainText">> + </property></p>
<p class="MsoPlainText">> <property name="text"></p>
<p class="MsoPlainText">> <string>Read units from line:</string></p>
<p class="MsoPlainText">> </property></p>
<p class="MsoPlainText">> </widget></p>
<p class="MsoPlainText">> - </item></p>
<p class="MsoPlainText">> - <item row="2" column="2"></p>
<p class="MsoPlainText">> <widget class="QSpinBox" name="_unitsLine"></p>
<p class="MsoPlainText">> <property name="enabled"></p>
<p class="MsoPlainText">> <bool>false</bool></p>
<p class="MsoPlainText">> </property></p>
<p class="MsoPlainText">> + <property name="geometry"></p>
<p class="MsoPlainText">> + <rect></p>
<p class="MsoPlainText">> + <x>206</x></p>
<p class="MsoPlainText">> + <y>63</y></p>
<p class="MsoPlainText">> + <width>63</width></p>
<p class="MsoPlainText">> + <height>20</height></p>
<p class="MsoPlainText">> + </rect></p>
<p class="MsoPlainText">> + </property></p>
<p class="MsoPlainText">> <property name="sizePolicy"></p>
<p class="MsoPlainText">> <sizepolicy hsizetype="Minimum" vsizetype="Fixed"></p>
<p class="MsoPlainText">> <horstretch>2</horstretch></p>
<p class="MsoPlainText">> @@ -143,9 +170,15 @@</p>
<p class="MsoPlainText">> <number>1</number></p>
<p class="MsoPlainText">> </property></p>
<p class="MsoPlainText">> </widget></p>
<p class="MsoPlainText">> - </item></p>
<p class="MsoPlainText">> - <item row="3" column="2"></p>
<p class="MsoPlainText">> <widget class="QLabel" name="label"></p>
<p class="MsoPlainText">> + <property name="geometry"></p>
<p class="MsoPlainText">> + <rect></p>
<p class="MsoPlainText">> + <x>206</x></p>
<p class="MsoPlainText">> + <y>86</y></p>
<p class="MsoPlainText">> + <width>114</width></p>
<p class="MsoPlainText">> + <height>16</height></p>
<p class="MsoPlainText">> + </rect></p>
<p class="MsoPlainText">> + </property></p>
<p class="MsoPlainText">> <property name="text"></p>
<p class="MsoPlainText">> <string> Line numbers start at 1</string></p>
<p class="MsoPlainText">> </property></p>
<p class="MsoPlainText">> @@ -153,8 +186,6 @@</p>
<p class="MsoPlainText">> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set></p>
<p class="MsoPlainText">> </property></p>
<p class="MsoPlainText">> </widget></p>
<p class="MsoPlainText">> - </item></p>
<p class="MsoPlainText">> - </layout></p>
<p class="MsoPlainText">> </widget></p>
<p class="MsoPlainText">> </item></p>
<p class="MsoPlainText">> <item></p>
<p class="MsoPlainText">> @@ -437,16 +468,23 @@</p>
<p class="MsoPlainText">> </item></p>
<p class="MsoPlainText">> </layout></p>
<p class="MsoPlainText">> </item></p>
<p class="MsoPlainText">> + <item></p>
<p class="MsoPlainText">> + <widget class="QCheckBox" name="_useThreads"></p>
<p class="MsoPlainText">> + <property name="text"></p>
<p class="MsoPlainText">> + <string>Use threads for parsing Ascii data</string></p>
<p class="MsoPlainText">> + </property></p>
<p class="MsoPlainText">> + </widget></p>
<p class="MsoPlainText">> + </item></p>
<p class="MsoPlainText">> </layout></p>
<p class="MsoPlainText">> </item></p>
<p class="MsoPlainText">> - <item row="3" column="0" colspan="3"></p>
<p class="MsoPlainText">> + <item row="2" column="0" colspan="3"></p>
<p class="MsoPlainText">> <widget class="Line" name="line"></p>
<p class="MsoPlainText">> <property name="orientation"></p>
<p class="MsoPlainText">> <enum>Qt::Horizontal</enum></p>
<p class="MsoPlainText">> </property></p>
<p class="MsoPlainText">> </widget></p>
<p class="MsoPlainText">> </item></p>
<p class="MsoPlainText">> - <item row="4" column="0"></p>
<p class="MsoPlainText">> + <item row="3" column="0"></p>
<p class="MsoPlainText">> <widget class="QCheckBox" name="_applyDefault"></p>
<p class="MsoPlainText">> <property name="text"></p>
<p class="MsoPlainText">> <string>Apply these settings as default</string> @@ -454,6 +492,13 @@</p>
<p class="MsoPlainText">> </widget></p>
<p class="MsoPlainText">> </item></p>
<p class="MsoPlainText">> </layout></p>
<p class="MsoPlainText">> + <zorder>_labelBeginning</zorder></p>
<p class="MsoPlainText">> + <zorder>_showBeginning</zorder></p>
<p class="MsoPlainText">> + <zorder>verticalLine</zorder></p>
<p class="MsoPlainText">> + <zorder>line</zorder></p>
<p class="MsoPlainText">> + <zorder>_applyDefault</zorder></p>
<p class="MsoPlainText">> + <zorder>_limitFileBuffer</zorder></p>
<p class="MsoPlainText">> + <zorder>_useThreads</zorder></p>
<p class="MsoPlainText">> </widget></p>
<p class="MsoPlainText">> <layoutdefault spacing="6" margin="11"/></p>
<p class="MsoPlainText">> <resources/></p>
<p class="MsoPlainText">> --- branches/work/kst/portto4/kst/src/datasources/ascii/asciiplugin.cpp</p>
<p class="MsoPlainText">> #1320819:1320820 @@ -131,6 +131,8 @@</p>
<p class="MsoPlainText">> config._limitFileBufferSize = size * 1024 * 1024;</p>
<p class="MsoPlainText">> }</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> + config._useThreads =_useThreads->isChecked();</p>
<p class="MsoPlainText">> +</p>
<p class="MsoPlainText">> return config;</p>
<p class="MsoPlainText">> }</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> @@ -172,6 +174,7 @@</p>
<p class="MsoPlainText">> _limitFileBufferSize->setText(QString::number(config._limitFileBufferSize /</p>
<p class="MsoPlainText">> 1024 / 1024));</p>
<p class="MsoPlainText">> updateFrameBuffer(config._limitFileBuffer);</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> + _useThreads->setChecked(config._useThreads);</p>
<p class="MsoPlainText">> }</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> --- branches/work/kst/portto4/kst/src/datasources/ascii/asciisource.cpp</p>
<p class="MsoPlainText">> #1320819:1320820 @@ -51,7 +51,6 @@</p>
<p class="MsoPlainText">> Kst::DataSource(store, cfg, filename, type),</p>
<p class="MsoPlainText">> _reader(_config),</p>
<p class="MsoPlainText">> _fileBuffer(),</p>
<p class="MsoPlainText">> - _useThreads(true),</p>
<p class="MsoPlainText">> is(new DataInterfaceAsciiString(*this)),</p>
<p class="MsoPlainText">> iv(new DataInterfaceAsciiVector(*this)) { @@ -270,7 +269,7 @@</p>
<p class="MsoPlainText">> }</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> int numThreads;</p>
<p class="MsoPlainText">> - if (!_useThreads) {</p>
<p class="MsoPlainText">> + if (!_config._useThreads) {</p>
<p class="MsoPlainText">> numThreads = 1;</p>
<p class="MsoPlainText">> } else {</p>
<p class="MsoPlainText">> numThreads = QThread::idealThreadCount(); @@ -292,7 +291,7 @@</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> int sRead = 0;</p>
<p class="MsoPlainText">> - if (_useThreads) {</p>
<p class="MsoPlainText">> + if (_config._useThreads) {</p>
<p class="MsoPlainText">> QFutureSynchronizer<int> readFutures;</p>
<p class="MsoPlainText">> const QVector<AsciiFileData>& data = _fileBuffer.data();</p>
<p class="MsoPlainText">> foreach (const AsciiFileData& chunk, data) {</p>
<p class="MsoPlainText">> --- branches/work/kst/portto4/kst/src/datasources/ascii/asciisource.h</p>
<p class="MsoPlainText">> #1320819:1320820 @@ -69,7 +69,6 @@</p>
<p class="MsoPlainText">> private:</p>
<p class="MsoPlainText">> AsciiDataReader _reader;</p>
<p class="MsoPlainText">> AsciiFileBuffer _fileBuffer;</p>
<p class="MsoPlainText">> - const bool _useThreads;</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> friend class ConfigWidgetAscii;</p>
<p class="MsoPlainText">> mutable AsciiSourceConfig _config;</p>
<p class="MsoPlainText">> --- branches/work/kst/portto4/kst/src/datasources/ascii/asciisourceconfig.cpp</p>
<p class="MsoPlainText">> #1320819:1320820 @@ -55,6 +55,8 @@ const char</p>
<p class="MsoPlainText">> AsciiSourceConfig::Tag_limitFileBuffer[] = "limitFileBuffer"; const char</p>
<p class="MsoPlainText">> AsciiSourceConfig::Key_limitFileBufferSize[] = "Size of limited file buffer"; const</p>
<p class="MsoPlainText">> char AsciiSourceConfig::Tag_limitFileBufferSize[] = "limitFileBufferSize";</p>
<p class="MsoPlainText">> +const char AsciiSourceConfig::Key_useThreads[] = "Use threads when</p>
<p class="MsoPlainText">> +parsing Ascii data"; const char AsciiSourceConfig::Tag_useThreads[] =</p>
<p class="MsoPlainText">> +"useThreads";</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> AsciiSourceConfig::AsciiSourceConfig() :</p>
<p class="MsoPlainText">> _delimiters(DEFAULT_COMMENT_DELIMITERS),</p>
<p class="MsoPlainText">> @@ -72,7 +74,8 @@</p>
<p class="MsoPlainText">> _unitsLine(0),</p>
<p class="MsoPlainText">> _useDot(true),</p>
<p class="MsoPlainText">> _limitFileBuffer(false),</p>
<p class="MsoPlainText">> - _limitFileBufferSize(128)</p>
<p class="MsoPlainText">> + _limitFileBufferSize(128),</p>
<p class="MsoPlainText">> + _useThreads(false)</p>
<p class="MsoPlainText">> {</p>
<p class="MsoPlainText">> }</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> @@ -95,6 +98,7 @@</p>
<p class="MsoPlainText">> _unitsLine >> cfg;</p>
<p class="MsoPlainText">> _limitFileBuffer >> cfg;</p>
<p class="MsoPlainText">> _limitFileBufferSize >> cfg;</p>
<p class="MsoPlainText">> + _useThreads >> cfg;</p>
<p class="MsoPlainText">> }</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> @@ -128,6 +132,7 @@</p>
<p class="MsoPlainText">> _unitsLine << cfg;</p>
<p class="MsoPlainText">> _limitFileBuffer << cfg;</p>
<p class="MsoPlainText">> _limitFileBufferSize << cfg;</p>
<p class="MsoPlainText">> + _useThreads << cfg;</p>
<p class="MsoPlainText">> }</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> @@ -168,6 +173,7 @@</p>
<p class="MsoPlainText">> _unitsLine >> s;</p>
<p class="MsoPlainText">> _limitFileBuffer >> s;</p>
<p class="MsoPlainText">> _limitFileBufferSize >> s;</p>
<p class="MsoPlainText">> + _useThreads >> s;</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> s.writeEndElement();</p>
<p class="MsoPlainText">> }</p>
<p class="MsoPlainText">> @@ -190,6 +196,7 @@</p>
<p class="MsoPlainText">> _unitsLine << attributes;</p>
<p class="MsoPlainText">> _limitFileBuffer << attributes;</p>
<p class="MsoPlainText">> _limitFileBufferSize << attributes;</p>
<p class="MsoPlainText">> + _useThreads << attributes;</p>
<p class="MsoPlainText">> }</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> @@ -215,6 +222,7 @@</p>
<p class="MsoPlainText">> _unitsLine << elem;</p>
<p class="MsoPlainText">> _limitFileBuffer << elem;</p>
<p class="MsoPlainText">> _limitFileBufferSize << elem;</p>
<p class="MsoPlainText">> + _useThreads << elem;</p>
<p class="MsoPlainText">> }</p>
<p class="MsoPlainText">> }</p>
<p class="MsoPlainText">> n = n.nextSibling();</p>
<p class="MsoPlainText">> --- branches/work/kst/portto4/kst/src/datasources/ascii/asciisourceconfig.h</p>
<p class="MsoPlainText">> #1320819:1320820 @@ -53,6 +53,8 @@</p>
<p class="MsoPlainText">> static const char Tag_limitFileBuffer[];</p>
<p class="MsoPlainText">> static const char Key_limitFileBufferSize[];</p>
<p class="MsoPlainText">> static const char Tag_limitFileBufferSize[];</p>
<p class="MsoPlainText">> + static const char Key_useThreads[];</p>
<p class="MsoPlainText">> + static const char Tag_useThreads[];</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> public:</p>
<p class="MsoPlainText">> AsciiSourceConfig();</p>
<p class="MsoPlainText">> @@ -84,8 +86,8 @@</p>
<p class="MsoPlainText">> NamedParameter<bool, Key_useDot, Tag_useDot> _useDot;</p>
<p class="MsoPlainText">> NamedParameter<bool, Key_limitFileBuffer, Tag_limitFileBuffer></p>
<p class="MsoPlainText">> _limitFileBuffer;</p>
<p class="MsoPlainText">> NamedParameter<int, Key_limitFileBufferSize, Tag_limitFileBufferSize></p>
<p class="MsoPlainText">> _limitFileBufferSize;</p>
<p class="MsoPlainText">> + NamedParameter<int, Key_useThreads, Tag_useThreads> _useThreads;</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> -</p>
<p class="MsoPlainText">> private:</p>
<p class="MsoPlainText">> void save(QSettings& cfg);</p>
<p class="MsoPlainText">> void read(QSettings& cfg);</p>
<p class="MsoPlainText">> _______________________________________________</p>
<p class="MsoPlainText">> Kst mailing list</p>
<p class="MsoPlainText">> <a href="mailto:Kst@kde.org"><span style="color:windowtext; text-decoration:none">Kst@kde.org</span></a></p>
<p class="MsoPlainText">> <a href="https://mail.kde.org/mailman/listinfo/kst"><span style="color:windowtext; text-decoration:none">https://mail.kde.org/mailman/listinfo/kst</span></a></p>
</div>
<table border="0" width="38%" id="table1" style="border-collapse:collapse">
<tbody>
<tr>
<td width="468" height="8"><b><font face="Arial" size="1">EUROCOPTER DEUTSCHLAND GmbH</font></b></td>
</tr>
<tr>
<td width="468" height="8"><b><font face="Arial" size="1">Sitz der Gesellschaft / Registered Office: Donauwörth</font></b></td>
</tr>
<tr>
<td width="468" height="8"><b><font face="Arial" size="1">Registergericht / Registration Court: Amtsgericht Augsburg HRB 16508</font></b></td>
</tr>
<tr>
<td width="468" height="8"><b><font face="Arial" size="1">Vorsitzender des Aufsichtsrates / Chairman of the Supervisory Board: Dr. Lutz Bertling</font></b></td>
</tr>
<tr>
<td width="468" height="8"><b><font face="Arial" size="1">Geschäftsführung / Board of Management:</font></b></td>
</tr>
<tr>
<td width="468" height="8"><b><font face="Arial" size="1">Dr. Wolfgang Schoder, Vorsitzender / CEO; Friedrich-Wilhelm Hormel; Ralf Barnscheidt</font></b></td>
</tr>
<tr>
<td width="468" height="8" style="border-bottom-style:double; border-bottom-width:3px">
<font face="Arial" size="1"> </font></td>
</tr>
</tbody>
</table>
<table border="0" width="688" id="table2" height="8" style="border-collapse:collapse">
<tbody>
<tr>
<td width="686" height="8"><font face="Arial" size="1"> </font></td>
</tr>
<tr>
<td width="686" height="8"><font face="Arial" size="1">CONFIDENTIALITY NOTICE</font></td>
</tr>
<tr>
<td width="686" height="8"><font face="Arial" size="1"> </font></td>
</tr>
<tr>
<td width="686" height="8"><font face="Arial" size="1">This communication and the information it contains is intended for the addressee ( s ) named above and for no other persons or organizations. </font></td>
</tr>
<tr>
<td width="686" height="8"><font face="Arial" size="1">It is confidential and may be legally privileged and protected by law. The unauthorized use, copying or disclosure of this communication </font></td>
</tr>
<tr>
<td width="686" height="8"><font face="Arial" size="1">or any part of it is prohibited and may be unlawful. </font></td>
</tr>
<tr>
<td width="686" height="8"><font face="Arial" size="1">If you have received this communication in error, kindly notify us by return e-mail and discard and/or delete the communication. </font></td>
</tr>
<tr>
<td width="686" height="8"><font face="Arial" size="1">Thank you very much.</font></td>
</tr>
<tr>
<td width="686" height="8"><font face="Arial" size="1">It is possible for e-mails to be intercepted or affected by viruses. Whilst we maintain virus checks on our e-mails, we accept no liability for viruses </font></td>
</tr>
<tr>
<td width="686" height="8"><font face="Arial" size="1">or other material which might be introduced with this message.</font></td>
</tr>
</tbody>
</table>
</body>
</html>