diff -r acd4e87b24b4 -r 2f0af9ba7665 logsui/logsengine/src/logsmodel.cpp --- a/logsui/logsengine/src/logsmodel.cpp Fri Sep 17 16:47:32 2010 +0300 +++ b/logsui/logsengine/src/logsmodel.cpp Fri Oct 15 14:47:48 2010 +0300 @@ -31,7 +31,6 @@ #include #include #include -#include #include Q_DECLARE_METATYPE(LogsEvent *) @@ -50,7 +49,11 @@ { LOGS_QDEBUG( "logs [ENG] -> LogsModel::LogsModel()" ) - initIcons(); + if ( LogsCommonData::getInstance().isGui() ){ + initIcons(); + connect( &LogsCommonData::getInstance(), SIGNAL(commonDataChanged()), + this, SLOT(resetModel()) ); + } bool allEvents( mModelType == LogsFullModel ); mDbConnector = new LogsDbConnector( mEvents, allEvents, resourceControl ); @@ -62,9 +65,7 @@ this, SLOT( dataRemoved(QList) )); connect( mDbConnector, SIGNAL( dataReset() ), this, SLOT( resetModel() )); - - connect( hbInstance->theme(), SIGNAL ( changeFinished() ), - this, SLOT ( resetModel())); + mDbConnector->init(); mDbConnector->start(); @@ -142,6 +143,7 @@ { LOGS_QDEBUG( "logs [ENG] -> LogsModel::refreshData()" ) int err = mDbConnector->refreshData(); + LogsCommonData::getInstance().refreshData(); LOGS_QDEBUG_2( "logs [ENG] <- LogsModel::refreshData(), err", err ) return err; } @@ -154,6 +156,7 @@ { LOGS_QDEBUG( "logs [ENG] -> LogsModel::compressData()" ) int err = mDbConnector->compressData(); + LogsCommonData::getInstance().compressData(); LOGS_QDEBUG_2( "logs [ENG] <- LogsModel::compressData(), err", err ) return err; } @@ -232,6 +235,9 @@ list << dateAndTimeString( event->time().toTimeSpec(Qt::LocalTime) ); return QVariant(list); } else if (role == Qt::DecorationRole) { + if ( !LogsCommonData::getInstance().isGui() ){ + return QVariant(); + } QList icons; getDecorationData(*event, icons); return QVariant(icons); @@ -480,3 +486,4 @@ return match; } +