mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 09:04:39 +03:00
Code

Merge pull request #89 from f3nix/gcc-warnings-1

Browse Source 
Fix some GCC warnings.
This commit is contained in:
fralx 2017-11-05 11:35:13 +03:00 committed by GitHub
commit 05691fd7fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
limereport/items/lrchartitemeditor.ui
View File

@ -59,7 +59,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="layoutWidget">
<widget class="QWidget" name="layoutWidget1">
<layout class="QFormLayout" name="seriesData">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>

4
limereport/lrscriptenginemanager.cpp
View File

@ -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);
if (context.contains(rx)){
@ -829,7 +829,7 @@ bool ScriptEngineManager::createReopenDatasourceFunction()
}
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_functionManager = new ScriptFunctionsManager(this);

5
limereport/objectinspector/lrpropertydelegate.cpp
View File

@ -43,7 +43,12 @@ void LimeReport::PropertyDelegate::paint(QPainter *painter, const QStyleOptionVi
{
if (!index.isValid()) return;
#if QT_VERSION >= 0x050000
QStyleOptionViewItem opt = option;
#else
QStyleOptionViewItemV4 opt = option;
#endif
QStyle *style = opt.widget ? opt.widget->style() : QApplication::style();
LimeReport::ObjectPropItem *node = static_cast<LimeReport::ObjectPropItem*>(index.internalPointer());