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

List:       kde-commits
Subject:    koffice/libs
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2010-04-17 9:43:35
Message-ID: 20100417094335.F2870AC89C () svn ! kde ! org
[Download RAW message or body]

SVN commit 1115725 by rempt:

warnings--

 M  +0 -1      kotext/CMakeLists.txt  
 M  +3 -0      kotext/KoTextRdfCore.cpp  
 M  +14 -13    kotext/opendocument/KoTextLoader.cpp  
 D             kotext/opendocument/KoTextLoader_p.cpp  
 A             kotext/opendocument/KoTextLoader_p.h   \
kotext/opendocument/KoTextLoader_p.cpp#1115720 [License: LGPL (v2+)]  M  +1 -0      \
kotext/opendocument/tests/TestLoading.cpp    M  +3 -3      \
kotext/opendocument/tests/tst_normalizeWhiteSpace.cpp    M  +2 -0      \
widgets/KoDockWidgetTitleBarButton.h  


--- trunk/koffice/libs/kotext/CMakeLists.txt #1115724:1115725
@@ -74,7 +74,6 @@
     opendocument/KoTextSharedLoadingData.cpp
     opendocument/KoTextSharedSavingData.cpp
     opendocument/KoTextLoader.cpp
-    opendocument/KoTextLoader_p.cpp
     opendocument/KoTextWriter.cpp
 
     changetracker/KoChangeTracker.cpp
--- trunk/koffice/libs/kotext/KoTextRdfCore.cpp #1115724:1115725
@@ -150,6 +150,9 @@
     foreach (Soprano::Statement s, allStatements) {
         kDebug(30015) << s;
     }
+#else
+    Q_UNUSED(msg);
+    Q_UNUSED(m);
 #endif
 }
 
--- trunk/koffice/libs/kotext/opendocument/KoTextLoader.cpp #1115724:1115725
@@ -26,7 +26,6 @@
  */
 
 #include "KoTextLoader.h"
-#include "KoTextLoader_p.cpp"
 
 #include <KoTextMeta.h>
 #include <KoBookmark.h>
@@ -72,6 +71,7 @@
 #include "styles/KoSectionStyle.h"
 
 #include <klocale.h>
+#include <kdebug.h>
 
 #include <QList>
 #include <QMap>
@@ -82,9 +82,10 @@
 #include <QTextList>
 #include <QTextTable>
 #include <QTime>
+#include <QString>
 
-#include <kdebug.h>
 
+#include "KoTextLoader_p.h"
 // if defined then debugging is enabled
 // #define KOOPENDOCUMENTLOADER_DEBUG
 
@@ -316,7 +317,7 @@
                             textObjectManager->insertInlineObject(cursor, \
deleteChangemarker);  }
                     }
-                    
+
                     loadDeleteChangeOutsidePorH(id, cursor);
                     usedParagraph = false;
                 } else if (localName == "p") {    // text paragraph
@@ -479,13 +480,13 @@
     if (changeId) {
         KoChangeTrackerElement *changeElement = \
d->changeTracker->elementById(changeId);  KoXmlElement element = \
                d->deleteChangeTable.value(id);
-        
+
         //Call loadBody with this element
         loadBody(element, cursor);
-            
+
         int endPosition = cursor.position();
-            
-        //Set the char format to the changeId 
+
+        //Set the char format to the changeId
         cursor.setPosition(startPosition);
         cursor.setPosition(endPosition, QTextCursor::KeepAnchor);
         QTextCharFormat format;
@@ -801,7 +802,7 @@
             kDebug(32500) << "  <text> localName=" << localName << " \
parent.localName=" << element.localName() << " text=" << text  << text.length();
 #endif
-            text = normalizeWhitespace(text, *stripLeadingSpace);
+            text = KoTextLoaderP::normalizeWhitespace(text, *stripLeadingSpace);
 
             if (!text.isEmpty()) {
                 // if present text ends with a space,
@@ -845,7 +846,7 @@
                     KoInlineTextObjectManager *textObjectManager = \
                layout->inlineTextObjectManager();
                     textObjectManager->insertInlineObject(cursor, \
deleteChangemarker);  }
-                
+
                 loadDeleteChangeWithinPorH(id, cursor);
             }
         } else if (isTextNS && localName == "span") { // text:span
@@ -1030,10 +1031,10 @@
                     loadedTags++;
                 }
             }
-            
+
             int endPosition = cursor.position();
-            
-            //Set the char format to the changeId 
+
+            //Set the char format to the changeId
             cursor.setPosition(startPosition);
             cursor.setPosition(endPosition, QTextCursor::KeepAnchor);
             QTextCharFormat format;
@@ -1196,7 +1197,7 @@
                     if (!region.isNull()) {
                         if (region.localName() == "deletion") {
                             QString id = tag.attributeNS(KoXmlNS::text, "id");
-                            d->deleteChangeTable.insert(id, region); 
+                            d->deleteChangeTable.insert(id, region);
                         }
                     }
                 }
--- trunk/koffice/libs/kotext/opendocument/tests/TestLoading.cpp #1115724:1115725
@@ -1133,6 +1133,7 @@
 
     bool documentsEqual = compareDocuments(actualDocument, expectedDocument);
 
+    Q_UNUSED(showDocument);
 //    showDocument(actualDocument);
 //    showDocument(expectedDocument);
     if (!documentsEqual) {
--- trunk/koffice/libs/kotext/opendocument/tests/tst_normalizeWhiteSpace.cpp \
#1115724:1115725 @@ -1,6 +1,6 @@
 #include <qtest.h>
 
-#include "../KoTextLoader_p.cpp"
+#include "../KoTextLoader_p.h"
 
 #define ITERATION_COUNT 1000
 
@@ -32,8 +32,8 @@
     QFETCH(QString, input);
     QBENCHMARK {
         for (int i = 0; i < ITERATION_COUNT; ++i) {
-            QString answer = normalizeWhitespace(input, true);
-            answer = normalizeWhitespace(input, false);
+            QString answer = KoTextLoaderP::normalizeWhitespace(input, true);
+            answer = KoTextLoaderP::normalizeWhitespace(input, false);
         }
     }
 }
--- trunk/koffice/libs/widgets/KoDockWidgetTitleBarButton.h #1115724:1115725
@@ -33,6 +33,8 @@
  */
 class KOWIDGETS_EXPORT KoDockWidgetTitleBarButton : public QAbstractButton
 {
+    Q_OBJECT
+
 public:
     KoDockWidgetTitleBarButton(QWidget *parent = 0);
     ~KoDockWidgetTitleBarButton();


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