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

List:       kde-commits
Subject:    koffice/kword
From:       Yann Bodson <yann.bodson () online ! fr>
Date:       2006-09-28 6:19:27
Message-ID: 1159424367.238471.16739.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 589482 by ybodson:

EBN fix: assignments to QString::null


 M  +6 -6      KWDocument.cpp  
 M  +1 -1      KWFootNoteDia.cpp  
 M  +1 -1      KWFrameDia.cpp  
 M  +1 -1      KWFrameSet.h  
 M  +1 -1      KWView.cpp  
 M  +2 -3      KWordDocIface.cpp  
 M  +1 -1      KWordFootNoteFrameSetIface.cpp  
 M  +1 -1      KWordFrameSetIface.cpp  
 M  +1 -1      mailmerge/kspread/kwmailmerge_kspread.cpp  


--- trunk/koffice/kword/KWDocument.cpp #589481:589482
@@ -4829,7 +4829,7 @@
         const_cast<KWDocument*>(this)->m_sectionTitles[ pageNum ] = txt;
         return txt;
     }
-    return QString::null;
+    return QString();
 #endif
 }
 
@@ -4858,15 +4858,15 @@
     // If not in the cache, determine from the paragraphs in the page.
 
     if ( m_lstFrameSet.isEmpty() )
-        return QString::null;
+        return QString();
     // We use the "main" frameset to determine section titles.
     KWTextFrameSet *frameset = dynamic_cast<KWTextFrameSet *>( m_lstFrameSet.getFirst() );
     if ( !frameset )
-        return QString::null;
+        return QString();
 
     int topLUpix, bottomLUpix;
     if ( !frameset->minMaxInternalOnPage( pageNum, topLUpix, bottomLUpix ) )
-        return QString::null;
+        return QString();
 
     KoTextParag* parag = frameset->textDocument()->firstParag();
     //kDebug(32001) << "KWDocument::sectionTitle " << pageNum
@@ -4898,7 +4898,7 @@
     }
 
     // First page, no heading found
-    return QString::null;
+    return QString();
 #endif
 }
 
@@ -5106,7 +5106,7 @@
 
 QString KWDocument::initialFrameSet() const
 {
-    return m_initialEditing ? m_initialEditing->m_initialFrameSet : QString::null;
+    return m_initialEditing ? m_initialEditing->m_initialFrameSet : QString();
 }
 
 int KWDocument::initialCursorParag() const
--- trunk/koffice/kword/KWFootNoteDia.cpp #589481:589482
@@ -123,7 +123,7 @@
 
 QString KWFootNoteDia::manualString()const
 {
-    return  m_rbAuto->isChecked() ? QString::null : m_footLine->text();
+    return  m_rbAuto->isChecked() ? QString() : m_footLine->text();
 }
 
 void KWFootNoteDia::slotConfigurate()
--- trunk/koffice/kword/KWFrameDia.cpp #589481:589482
@@ -1811,7 +1811,7 @@
         frameCopy = m_frame->getCopy(); // keep a copy of the original (for undo/redo)
         isNewFrame = m_frame->frameSet() == 0L; // true if we are creating a newframe
     }
-    QString name=QString::null;
+    QString name;
 
     KMacroCommand * macroCmd=0L;
     if ( m_tab3 ) { // TAB Frameset
--- trunk/koffice/kword/KWFrameSet.h #589481:589482
@@ -332,7 +332,7 @@
     virtual void fromXML( QDomElement &framesetElem, bool loadFrames = true, bool /*useNames*/ = true )
     { load( framesetElem, loadFrames ); }
 
-    virtual QString toPlainText() const { return QString::null; }
+    virtual QString toPlainText() const { return QString(); }
 
     //virtual void preparePrinting( QPainter *, QProgressDialog *, int & ) { }
 
--- trunk/koffice/kword/KWView.cpp #589481:589482
@@ -3979,7 +3979,7 @@
 void KWView::extraStylist()
 {
     KWTextFrameSetEdit * edit = currentTextEdit();
-    QString activeStyleName  = QString::null;
+    QString activeStyleName;
     if ( edit )
     {
         edit->hideCursor();
--- trunk/koffice/kword/KWordDocIface.cpp #589481:589482
@@ -221,7 +221,7 @@
 {
     if(doc->variableCollection()->customVariableExist(varname))
         return doc->variableCollection()->getVariableValue( varname );
-    return QString::null;
+    return QString();
 }
 
 void KWordDocIface::initConfig()
@@ -542,7 +542,6 @@
 
 QString KWordDocIface::footNoteSeparatorLinePosition()const
 {
-    QString tmp=QString::null;
     switch( doc->footNoteSeparatorLinePosition() )
     {
     case SLP_LEFT:
@@ -552,7 +551,7 @@
     case SLP_CENTERED:
         return QString("centered");
     }
-    return tmp;
+    return QString();
 }
 
 double KWordDocIface::footNoteSeparatorLineWidth() const
--- trunk/koffice/kword/KWordFootNoteFrameSetIface.cpp #589481:589482
@@ -34,7 +34,7 @@
     if ( var )
         return var->text();
     else
-        return QString::null;
+        return QString();
 }
 
 bool KWFootNoteFrameSetIface::isFootNote() const
--- trunk/koffice/kword/KWordFrameSetIface.cpp #589481:589482
@@ -200,7 +200,7 @@
         return QString("FootNote");
         break;
     default:
-        return QString::null;
+        return QString();
         break;
     }
 }
--- trunk/koffice/kword/mailmerge/kspread/kwmailmerge_kspread.cpp #589481:589482
@@ -176,7 +176,7 @@
 
 QString KWMailMergeKSpread::cellText( const KSpread::Cell *cell ) const
 {
-  QString text = QString::null;
+  QString text;
 
   if ( !cell->isDefault() && !cell->isEmpty() ) {
       if ( cell->isFormula() )
[prev in list] [next in list] [prev in thread] [next in thread]