[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/kexi/plugins/reportspgz (silent)
From: Adam Pigg <adam () piggz ! co ! uk>
Date: 2010-02-12 15:29:28
Message-ID: 1265988568.001978.6803.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1089152 by piggz:
krazy fixes
SVN_SILENT
M +5 -6 kexidbreportdata.cpp
M +1 -1 koreport/common/krchartdata.cpp
M +0 -1 koreport/common/krsize.cpp
M +1 -1 koreport/renderer/scripting/krscripthandler.cpp
M +2 -2 koreport/wrtembed/barcodepaint.h
M +3 -24 koreport/wrtembed/reportdesigner.cpp
M +1 -1 koreport/wrtembed/reportentityfield.cpp
M +5 -7 koreport/wrtembed/reportentityimage.cpp
M +1 -1 koreport/wrtembed/reportentitylabel.cpp
M +2 -2 koreport/wrtembed/reportentityline.cpp
M +2 -2 koreport/wrtembed/reportentityshape.cpp
M +1 -1 koreport/wrtembed/reportentitytext.cpp
M +1 -0 koreport/wrtembed/reportentitytext.h
M +4 -5 koreport/wrtembed/reportscene.cpp
M +1 -2 koreport/wrtembed/reportsection.cpp
--- trunk/koffice/kexi/plugins/reportspgz/kexidbreportdata.cpp #1089151:1089152
@@ -232,8 +232,8 @@
QStringList scriptnames = \
m_connection->objectNames(KexiPart::ScriptObjectType); QString script;
- int id, i;
- id = i = 0;
+ int i;
+ i = 0;
kDebug() << scriptids << scriptnames;
kDebug() << interpreter;
@@ -242,7 +242,7 @@
scripts << "";
- foreach(id, scriptids) {
+ foreach(int id, scriptids) {
kDebug() << "ID:" << id;
tristate res;
res = m_connection->loadDataBlock(id, script, QString());
@@ -277,12 +277,11 @@
if (m_connection) {
QList<int> scriptids = m_connection->objectIds(KexiPart::ScriptObjectType);
QStringList scriptnames = \
m_connection->objectNames(KexiPart::ScriptObjectType);
-
- int id;
+
int i = 0;
QString script;
- foreach(id, scriptids) {
+ foreach(int id, scriptids) {
kDebug() << "ID:" << id;
tristate res;
res = m_connection->loadDataBlock(id, script, QString());
--- trunk/koffice/kexi/plugins/reportspgz/koreport/common/krchartdata.cpp \
#1089151:1089152 @@ -275,7 +275,7 @@
QStringList KRChartData::masterFields()
{
- return m_linkMaster->value().toString().split(",");
+ return m_linkMaster->value().toString().split(',');
}
void KRChartData::setLinkData(QString fld, QVariant val)
--- trunk/koffice/kexi/plugins/reportspgz/koreport/common/krsize.cpp #1089151:1089152
@@ -17,7 +17,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* Please contact info@openmfg.com with any questions on this license.
*/
-#include "krsize.h"
#include "krsize.h"
#include <kdebug.h>
--- trunk/koffice/kexi/plugins/reportspgz/koreport/renderer/scripting/krscripthandler.cpp \
#1089151:1089152 @@ -71,7 +71,7 @@
foreach(KRSectionData *sec, secs) {
m_sectionMap[sec] = new Scripting::Section(sec);
m_sectionMap[sec]->setParent(m_report);
- m_sectionMap[sec]->setObjectName(sec->name().replace('-', \
'_').replace("report:", "")); + \
m_sectionMap[sec]->setObjectName(sec->name().replace('-', \
'_').remove("report:"));
kDebug() << "Added" << m_sectionMap[sec]->objectName() << "to report" << \
m_reportData->name(); }
--- trunk/koffice/kexi/plugins/reportspgz/koreport/wrtembed/barcodepaint.h \
#1089151:1089152 @@ -19,8 +19,8 @@
* Please contact info@openmfg.com with any questions on this license.
*/
-#ifndef __BARCODES_H__
-#define __BARCODES_H__
+#ifndef BARCODEPAINT_H
+#define BARCODEPAINT_H
#include <QRect>
#include <QString>
--- trunk/koffice/kexi/plugins/reportspgz/koreport/wrtembed/reportdesigner.cpp \
#1089151:1089152 @@ -21,10 +21,8 @@
#include "reportdesigner.h"
#include "reportsection.h"
-#include "reportentities.h"
#include "reportscene.h"
#include "reportsceneview.h"
-#include "reportentities.h"
#include "reportentitylabel.h"
#include "reportentityfield.h"
#include "reportentitytext.h"
@@ -36,33 +34,15 @@
#include "reportentitycheck.h"
#include "reportsectiondetailgroup.h"
#include "reportpropertiesbutton.h"
-
-// dialogs
#include "sectioneditor.h"
#include "reportsectiondetail.h"
-// qt
-//#include <qpixmap.h>
-#include <qlayout.h>
+#include <QLayout>
#include <qdom.h>
-#include <qtextstream.h>
-#include <qiodevice.h>
-#include <qfile.h>
-#include <QFileDialog>
-
-#include <QCloseEvent>
#include <QVBoxLayout>
#include <QGridLayout>
-#include <QPushButton>
-#include <qregexp.h>
-#include <qmessagebox.h>
-#include <qsqlerror.h>
-#include <qlineedit.h>
-#include <qspinbox.h>
#include <QGraphicsSceneMouseEvent>
#include <QMenu>
-#include <QSplitter>
-
#include <koproperty/EditorView.h>
#include <KoRuler.h>
#include <KoZoomHandler.h>
@@ -124,7 +104,6 @@
{
public:
QGridLayout *grid;
- QSplitter *splitter;
QGraphicsScene *activeScene;
KoRuler *hruler;
KoZoomHandler *zoom;
@@ -645,8 +624,8 @@
strings = KoUnit::listOfUnitName();
QString unit;
- foreach(unit, strings) {
- unit = unit.mid(unit.indexOf("(") + 1, 2);
+ foreach(const QString &un, strings) {
+ unit = un.mid(un.indexOf('(') + 1, 2);
keys << unit;
}
--- trunk/koffice/kexi/plugins/reportspgz/koreport/wrtembed/reportentityfield.cpp \
#1089151:1089152 @@ -19,8 +19,8 @@
* Please contact info@openmfg.com with any questions on this license.
*/
+#include "reportentityfield.h"
#include "reportentities.h"
-#include "reportentityfield.h"
#include "reportdesigner.h"
#include <qdom.h>
--- trunk/koffice/kexi/plugins/reportspgz/koreport/wrtembed/reportentityimage.cpp \
#1089151:1089152 @@ -19,26 +19,24 @@
* Please contact info@openmfg.com with any questions on this license.
*/
+#include "reportentityimage.h"
+#include "reportentities.h"
+#include "reportdesigner.h"
-
#include <QImageWriter>
#include <QGraphicsScene>
#include <QGraphicsSceneMouseEvent>
#include <QBuffer>
#include <kcodecs.h>
-
-#include "reportentities.h"
-#include "reportentityimage.h"
-#include "reportdesigner.h"
-
#include <qdom.h>
-#include <qpainter.h>
+#include <QPainter>
#include <kdebug.h>
#include <klocalizedstring.h>
#include <koproperty/Property.h>
#include <koproperty/Set.h>
#include <koproperty/EditorView.h>
+
//
// ReportEntitiesImage
//
--- trunk/koffice/kexi/plugins/reportspgz/koreport/wrtembed/reportentitylabel.cpp \
#1089151:1089152 @@ -19,8 +19,8 @@
* Please contact info@openmfg.com with any questions on this license.
*/
+#include "reportentitylabel.h"
#include "reportentities.h"
-#include "reportentitylabel.h"
#include "reportdesigner.h"
#include <qdom.h>
--- trunk/koffice/kexi/plugins/reportspgz/koreport/wrtembed/reportentityline.cpp \
#1089151:1089152 @@ -19,12 +19,12 @@
* Please contact info@openmfg.com with any questions on this license.
*/
+#include "reportentityline.h"
#include "reportentities.h"
-#include "reportentityline.h"
#include "reportdesigner.h"
#include <qdom.h>
-#include <qpainter.h>
+#include <QPainter>
#include <kdebug.h>
#include <klocalizedstring.h>
#include <QGraphicsScene>
--- trunk/koffice/kexi/plugins/reportspgz/koreport/wrtembed/reportentityshape.cpp \
#1089151:1089152 @@ -18,12 +18,12 @@
* Please contact info@openmfg.com with any questions on this license.
*/
+#include "reportentityshape.h"
#include "reportentities.h"
-#include "reportentityshape.h"
#include "reportdesigner.h"
#include <qdom.h>
-#include <qpainter.h>
+#include <QPainter>
#include <kdebug.h>
#include <klocalizedstring.h>
#include <koproperty/EditorView.h>
--- trunk/koffice/kexi/plugins/reportspgz/koreport/wrtembed/reportentitytext.cpp \
#1089151:1089152 @@ -19,8 +19,8 @@
* Please contact info@openmfg.com with any questions on this license.
*/
+#include "reportentitytext.h"
#include "reportentities.h"
-#include "reportentitytext.h"
#include "reportdesigner.h"
#include <qdom.h>
--- trunk/koffice/kexi/plugins/reportspgz/koreport/wrtembed/reportentitytext.h \
#1089151:1089152 @@ -34,6 +34,7 @@
//
class ReportEntityText : public QObject, public KRTextData, public ReportRectEntity
{
+ Q_OBJECT
public:
ReportEntityText(ReportDesigner *, QGraphicsScene * scene);
ReportEntityText(QDomNode & element, ReportDesigner *, QGraphicsScene * scene);
--- trunk/koffice/kexi/plugins/reportspgz/koreport/wrtembed/reportscene.cpp \
#1089151:1089152 @@ -26,19 +26,18 @@
#include "reportscene.h"
#include <reportpageoptions.h>
-#include <labelsizeinfo.h>
-#include <qpainter.h>
+#include "reportrectentity.h"
#include "reportdesigner.h"
+#include <labelsizeinfo.h>
+#include <QPainter>
#include <KoDpi.h>
#include <kdebug.h>
-
#include <KoPageFormat.h>
#include <QGraphicsItem>
#include <QGraphicsSceneMouseEvent>
-#include "reportrectentity.h"
-#include <QGraphicsSceneMouseEvent>
+
ReportScene::ReportScene(qreal w, qreal h, ReportDesigner *rd)
: QGraphicsScene(0, 0, w, h)
{
--- trunk/koffice/kexi/plugins/reportspgz/koreport/wrtembed/reportsection.cpp \
#1089151:1089152 @@ -19,9 +19,8 @@
* Please contact info@openmfg.com with any questions on this license.
*/
-#include "reportdesigner.h"
#include "reportsection.h"
-
+#include "reportdesigner.h"
#include "reportentities.h"
#include "reportentitylabel.h"
#include "reportentityfield.h"
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic