0
0
mirror of https://github.com/fralx/LimeReport.git synced 2025-09-23 08:29:07 +03:00

Merge branch 'master' into 1.4

# Conflicts:
#	limereport/lrreportengine.cpp
#	limereport/lrreportengine_p.h
This commit is contained in:
Arin Alexander
2016-06-25 00:33:44 +04:00
17 changed files with 233 additions and 87 deletions

View File

@@ -31,10 +31,24 @@
#include <QDebug>
#include "lrglobal.h"
QString LimeReport::extractClassName(QString className)
namespace LimeReport {
QString extractClassName(QString className)
{
int startPos=className.lastIndexOf("::");
if(startPos==-1) startPos=0;
else startPos+=2;
return className.right(className.length()-startPos);
}
bool ReportSettings::suppressAbsentFieldsAndVarsWarnings() const
{
return m_suppressAbsentFieldsAndVarsWarnings;
}
void ReportSettings::setSuppressAbsentFieldsAndVarsWarnings(bool suppressAbsentFieldsAndVarsWarnings)
{
m_suppressAbsentFieldsAndVarsWarnings = suppressAbsentFieldsAndVarsWarnings;
}
} //namespace LimeReport

View File

@@ -84,6 +84,16 @@ namespace Const{
ReportError(const QString& message):std::runtime_error(message.toStdString()){}
};
class ReportSettings{
public:
ReportSettings():m_suppressAbsentFieldsAndVarsWarnings(false){}
void setDefaultValues(){m_suppressAbsentFieldsAndVarsWarnings = false;}
bool suppressAbsentFieldsAndVarsWarnings() const;
void setSuppressAbsentFieldsAndVarsWarnings(bool suppressAbsentFieldsAndVarsWarnings);
private:
bool m_suppressAbsentFieldsAndVarsWarnings;
};
} // namespace LimeReport