mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-25 09:04:39 +03:00
Fix some GCC warnings.
This commit is contained in:
parent
27427e90aa
commit
05f6eb9284
@ -59,7 +59,7 @@
|
|||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QWidget" name="layoutWidget">
|
<widget class="QWidget" name="layoutWidget1">
|
||||||
<layout class="QFormLayout" name="seriesData">
|
<layout class="QFormLayout" name="seriesData">
|
||||||
<property name="fieldGrowthPolicy">
|
<property name="fieldGrowthPolicy">
|
||||||
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
|
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
|
||||||
|
@ -354,7 +354,7 @@ void ScriptEngineManager::setDataManager(DataSourceManager *dataManager){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
QString ScriptEngineManager::expandUserVariables(QString context, RenderPass pass, ExpandType expandType, QVariant &varValue)
|
QString ScriptEngineManager::expandUserVariables(QString context, RenderPass /* pass */, ExpandType expandType, QVariant &varValue)
|
||||||
{
|
{
|
||||||
QRegExp rx(Const::VARIABLE_RX);
|
QRegExp rx(Const::VARIABLE_RX);
|
||||||
if (context.contains(rx)){
|
if (context.contains(rx)){
|
||||||
@ -829,7 +829,7 @@ bool ScriptEngineManager::createReopenDatasourceFunction()
|
|||||||
}
|
}
|
||||||
|
|
||||||
ScriptEngineManager::ScriptEngineManager()
|
ScriptEngineManager::ScriptEngineManager()
|
||||||
:m_model(0), m_dataManager(0), m_context(0)
|
:m_model(0), m_context(0), m_dataManager(0)
|
||||||
{
|
{
|
||||||
m_scriptEngine = new ScriptEngineType;
|
m_scriptEngine = new ScriptEngineType;
|
||||||
m_functionManager = new ScriptFunctionsManager(this);
|
m_functionManager = new ScriptFunctionsManager(this);
|
||||||
|
@ -43,7 +43,12 @@ void LimeReport::PropertyDelegate::paint(QPainter *painter, const QStyleOptionVi
|
|||||||
{
|
{
|
||||||
if (!index.isValid()) return;
|
if (!index.isValid()) return;
|
||||||
|
|
||||||
|
#if QT_VERSION >= 0x050000
|
||||||
|
QStyleOptionViewItem opt = option;
|
||||||
|
#else
|
||||||
QStyleOptionViewItemV4 opt = option;
|
QStyleOptionViewItemV4 opt = option;
|
||||||
|
#endif
|
||||||
|
|
||||||
QStyle *style = opt.widget ? opt.widget->style() : QApplication::style();
|
QStyle *style = opt.widget ? opt.widget->style() : QApplication::style();
|
||||||
|
|
||||||
LimeReport::ObjectPropItem *node = static_cast<LimeReport::ObjectPropItem*>(index.internalPointer());
|
LimeReport::ObjectPropItem *node = static_cast<LimeReport::ObjectPropItem*>(index.internalPointer());
|
||||||
|
Loading…
Reference in New Issue
Block a user