[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kexi/plugins/reportspgz/backend
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2009-03-19 23:29:24
Message-ID: 1237505364.940926.32246.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 941566 by staniek:

Reports
= use QString() instead of QString::null
= no need to initialize QStrings to null explicitly
= use .isEmpty()



 M  +0 -1      common/krdetailsectiondata.cpp  
 M  +2 -4      common/krreportdata.cpp  
 M  +0 -3      common/labelsizeinfo.cpp  
 M  +0 -1      common/parsexmlutils.cpp  
 M  +0 -2      common/parsexmlutils.h  
 M  +1 -1      common/reportpageoptions.cpp  
 M  +2 -2      renderer/ext3of9.cpp  
 M  +2 -2      renderer/orprerender.cpp  
 M  +2 -2      wrtembed/ext3of9paint.cpp  


--- trunk/koffice/kexi/plugins/reportspgz/backend/common/krdetailsectiondata.cpp \
#941565:941566 @@ -27,7 +27,6 @@
 
 KRDetailSectionData::KRDetailSectionData()
 {
-    name = QString::null;
     pagebreak = BreakNone;
     detail = 0;
 }
--- trunk/koffice/kexi/plugins/reportspgz/backend/common/krreportdata.cpp \
#941565:941566 @@ -27,8 +27,6 @@
 
 void KRReportData::init()
 {
-    title = QString::null;
-
     pghead_first = pghead_odd = pghead_even = pghead_last = pghead_any = NULL;
     pgfoot_first = pgfoot_odd = pgfoot_even = pgfoot_last = pgfoot_any = NULL;
     rpthead = rptfoot = NULL;
@@ -143,7 +141,7 @@
                     pghead_even = sd;
                 else if (sd->extra() == "lastpage")
                     pghead_last = sd;
-                else if (sd->extra() == QString::null)
+                else if (sd->extra().isEmpty())
                     pghead_any = sd;
                 else {
                     //TODO qDebug("don't know which page this page header is for: \
%s",(const char*)sd->extra); @@ -163,7 +161,7 @@
                     pgfoot_even = sd;
                 else if (sd->extra() == "lastpage")
                     pgfoot_last = sd;
-                else if (sd->extra() == QString::null)
+                else if (sd->extra().isEmpty())
                     pgfoot_any = sd;
                 else {
                     //TODO qDebug("don't know which page this page footer is for: \
                %s",(const char*)sd->extra);
--- trunk/koffice/kexi/plugins/reportspgz/backend/common/labelsizeinfo.cpp \
#941565:941566 @@ -70,9 +70,6 @@
 
 LabelSizeInfo::LabelSizeInfo()
 {
-    _name = QString::null;
-    _paper = QString::null;
-
     _columns = 0;
     _rows = 0;
 
--- trunk/koffice/kexi/plugins/reportspgz/backend/common/parsexmlutils.cpp \
#941565:941566 @@ -35,7 +35,6 @@
 
 ORDetailGroupSectionData::ORDetailGroupSectionData()
 {
-    column = QString::null;
     pagebreak = BreakNone;
     _subtotCheckPoints.clear();
     head = 0;
--- trunk/koffice/kexi/plugins/reportspgz/backend/common/parsexmlutils.h \
#941565:941566 @@ -58,8 +58,6 @@
 {
 public:
     ORDataData() {
-        query = QString::null;
-        column = QString::null;
     }
     ORDataData(const QString & q, const QString & c) {
         query = q;
--- trunk/koffice/kexi/plugins/reportspgz/backend/common/reportpageoptions.cpp \
#941565:941566 @@ -25,7 +25,7 @@
 #include <KoGlobal.h>
 
 ReportPageOptions::ReportPageOptions()
-        : QObject(), _pagesize("Letter"), _labelType(QString::null)
+        : QObject(), _pagesize("Letter")
 {
     _marginTop = _marginBottom = 1.0;
     _marginLeft = _marginRight = 1.0;
--- trunk/koffice/kexi/plugins/reportspgz/backend/renderer/ext3of9.cpp #941565:941566
@@ -175,10 +175,10 @@
 
 QString convertTo3of9(QChar c)
 {
-    for (int i = 0; ext3of9map[i].conversion != QString::null; i++)
+    for (int i = 0; !ext3of9map[i].conversion.isEmpty(); i++)
         if (ext3of9map[i].code == c.toAscii())
             return ext3of9map[i].conversion;
-    return QString::null;
+    return QString();
 }
 
 
--- trunk/koffice/kexi/plugins/reportspgz/backend/renderer/orprerender.cpp \
#941565:941566 @@ -586,7 +586,7 @@
             tb->setTextStyle(f->textStyle());
             tb->setLineStyle(f->lineStyle());
 
-            QString str = QString::null;
+            QString str;
 
             QString cs = f->_controlSource->value().toString();
             if (cs.left(1) == "=") { //Everything after = is treated as code
@@ -841,7 +841,7 @@
             chk->setForegroundColor(cd->_fgColor->value().value<QColor>());
             chk->setCheckType(cd->_checkStyle->value().toString());
 
-            QString str = QString::null;
+            QString str;
 
             QString cs = cd->controlSource();
             kDebug() << "EntityCheck CS:" << cs;
--- trunk/koffice/kexi/plugins/reportspgz/backend/wrtembed/ext3of9paint.cpp \
#941565:941566 @@ -175,10 +175,10 @@
 
 QString convertTo3of9P(QChar c)
 {
-    for (int i = 0; ext3of9map[i].conversion != QString::null; i++)
+    for (int i = 0; !ext3of9map[i].conversion.isEmpty(); i++)
         if (ext3of9map[i].code == c.toAscii())
             return ext3of9map[i].conversion;
-    return QString::null;
+    return QString();
 }
 
 


[prev in list] [next in list] [prev in thread] [next in thread]