Showing with 4 additions and 6 deletions.
  1. +0 −3 src/libkst/updatemanager.cpp
  2. +4 −3 src/libkstapp/datasourcepluginfactory.cpp
3 changes: 0 additions & 3 deletions src/libkst/updatemanager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,6 @@ void UpdateManager::doUpdates(bool forceImmediate) {
else if (retval == Object::NoChange) n_unchanged++;
}

//qDebug() << "ds up: " << n_updated << " ds def: " << n_deferred << " n_no: " << n_unchanged;

//MeasureTime t(" UpdateManager::doUpdates loop");

int i_loop = retval = 0;
Expand All @@ -122,7 +120,6 @@ void UpdateManager::doUpdates(bool forceImmediate) {
else if (retval == Object::NoChange) n_unchanged++;
}
maxloop = qMin(maxloop,n_deferred);
//qDebug() << "loop: " << i_loop << " obj up: " << n_updated << " obj def: " << n_deferred << " obj_no: " << n_unchanged << "dt:" << double(_time.elapsed())/1000.0;
i_loop++;
} while ((n_deferred + n_updated > 0) && (i_loop<=maxloop));

Expand Down
7 changes: 4 additions & 3 deletions src/libkstapp/datasourcepluginfactory.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ DataSourcePtr DataSourcePluginFactory::generateDataSource(ObjectStore *store, QX

Q_ASSERT(store);

QString fileType, fileName;
//QString fileType;
QString fileName;
QXmlStreamAttributes propertyAttributes;
DataSource::UpdateCheckType updateCheckType = DataSource::Timer;

Expand All @@ -47,7 +48,7 @@ DataSourcePtr DataSourcePluginFactory::generateDataSource(ObjectStore *store, QX
if (xml.isStartElement()) {
if (n == DataSource::staticTypeTag) {
QXmlStreamAttributes attrs = xml.attributes();
fileType = attrs.value("reader").toString();
//fileType = attrs.value("reader").toString();
fileName = DataPrimitive::readFilename(attrs);
if (attrs.hasAttribute("updateType")) {
updateCheckType = DataSource::UpdateCheckType(attrs.value("updateType").toString().toInt());
Expand Down Expand Up @@ -82,7 +83,7 @@ DataSourcePtr DataSourcePluginFactory::generateDataSource(ObjectStore *store, QX
QString alternate_filename = fileName;
do {
dataSource = 0L;
dataSource = DataSourcePluginManager::loadSource(store, fileName, fileType);
dataSource = DataSourcePluginManager::loadSource(store, fileName); //, fileType);
if (dataSource) {
QObject::connect(dataSource, SIGNAL(progress(int,QString)), kstApp->mainWindow(), SLOT(updateProgress(int,QString)));
dataSource->vector().prepareRead(0);
Expand Down