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

List:       kde-commits
Subject:    KDE/kdelibs/kdeui
From:       David Faure <faure () kde ! org>
Date:       2007-11-07 1:33:08
Message-ID: 1194399188.912456.18481.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 733660 by dfaure:

Too many things called "merging" already in xmlgui; let's rename the new (private) \
class to KXmlGuiVersionHandler instead.


 M  +14 -14    tests/kxmlgui_unittest.cpp  
 M  +3 -3      tests/kxmlgui_unittest.h  
 M  +4 -4      xmlgui/kxmlguiclient.cpp  
 D             xmlgui/kxmlguifilemerger.cpp  
 D             xmlgui/kxmlguifilemerger_p.h  
 A             xmlgui/kxmlguiversionhandler.cpp   xmlgui/kxmlguifilemerger.cpp#733653 \
[License: LGPL (v2+)]  A             xmlgui/kxmlguiversionhandler_p.h   \
xmlgui/kxmlguifilemerger_p.h#733505 [License: LGPL (v2+)]


--- trunk/KDE/kdelibs/kdeui/tests/kxmlgui_unittest.cpp #733659:733660
@@ -22,8 +22,8 @@
 #include "kxmlgui_unittest.h"
 #include <ktemporaryfile.h>
 #include "kxmlgui_unittest.moc"
-#include <kxmlguifilemerger_p.h>
-#include <kxmlguifilemerger.cpp> // it's not exported, so we need to include the \
code here +#include <kxmlguiversionhandler_p.h>
+#include <kxmlguiversionhandler.cpp> // it's not exported, so we need to include the \
code here  
 QTEST_KDEMAIN(KXmlGui_UnitTest, NoGUI)
 
@@ -85,7 +85,7 @@
     file.write("</gui>\n");
 }
 
-void KXmlGui_UnitTest::testFileMergerSameVersion()
+void KXmlGui_UnitTest::testVersionHandlerSameVersion()
 {
     // This emulates the case where the user has modified stuff locally
     // and the application hasn't changed since, so the version number is unchanged.
@@ -105,9 +105,9 @@
     userFile.close();
     appFile.close();
 
-    KXmlGuiFileMerger merger(files);
-    QCOMPARE(merger.finalFile(), firstFile);
-    QString finalDoc = merger.finalDocument();
+    KXmlGuiVersionHandler versionHandler(files);
+    QCOMPARE(versionHandler.finalFile(), firstFile);
+    QString finalDoc = versionHandler.finalDocument();
     QVERIFY(finalDoc.startsWith("<?xml"));
     // Check that the shortcuts defined by the user were kept
     QVERIFY(finalDoc.contains("<ActionProperties>"));
@@ -120,7 +120,7 @@
     QCOMPARE(finalDoc, userFileContents);
 }
 
-void KXmlGui_UnitTest::testFileMergerNewVersionNothingKept()
+void KXmlGui_UnitTest::testVersionHandlerNewVersionNothingKept()
 {
     // This emulates the case where the application has been upgraded
     // and the user has a local ui.rc file, but without shortcuts or toolbar \
changes. @@ -155,9 +155,9 @@
     fileV5.close();
     fileV1.close();
 
-    KXmlGuiFileMerger merger(files);
-    QCOMPARE(fileToVersionMap.value(merger.finalFile()), 5);
-    QString finalDoc = merger.finalDocument();
+    KXmlGuiVersionHandler versionHandler(files);
+    QCOMPARE(fileToVersionMap.value(versionHandler.finalFile()), 5);
+    QString finalDoc = versionHandler.finalDocument();
     QVERIFY(finalDoc.startsWith("<?xml"));
     QVERIFY(finalDoc.contains("version=\"5\""));
 
@@ -166,7 +166,7 @@
     QCOMPARE(finalDoc, fileV5Contents);
 }
 
-void KXmlGui_UnitTest::testFileMergerNewVersionUserChanges()
+void KXmlGui_UnitTest::testVersionHandlerNewVersionUserChanges()
 {
     // This emulates the case where the application has been upgraded
     // after the user has changed shortcuts and toolbars
@@ -199,11 +199,11 @@
     fileV5.close();
     fileV1.close();
 
-    KXmlGuiFileMerger merger(files);
+    KXmlGuiVersionHandler versionHandler(files);
     // We selected the local file, so in our map it has version 2.
     // But of course by now it says "version=5" in it :)
-    QCOMPARE(fileToVersionMap.value(merger.finalFile()), 2);
-    const QString finalDoc = merger.finalDocument();
+    QCOMPARE(fileToVersionMap.value(versionHandler.finalFile()), 2);
+    const QString finalDoc = versionHandler.finalDocument();
     //kDebug() << finalDoc;
     QVERIFY(finalDoc.startsWith("<?xml"));
     QVERIFY(finalDoc.contains("version=\"5\""));
--- trunk/KDE/kdelibs/kdeui/tests/kxmlgui_unittest.h #733659:733660
@@ -27,9 +27,9 @@
     Q_OBJECT
 
 private Q_SLOTS:
-    void testFileMergerSameVersion();
-    void testFileMergerNewVersionNothingKept();
-    void testFileMergerNewVersionUserChanges();
+    void testVersionHandlerSameVersion();
+    void testVersionHandlerNewVersionNothingKept();
+    void testVersionHandlerNewVersionUserChanges();
 };
 
 #endif
--- trunk/KDE/kdelibs/kdeui/xmlgui/kxmlguiclient.cpp #733659:733660
@@ -18,7 +18,7 @@
 */
 
 #include "kxmlguiclient.h"
-#include "kxmlguifilemerger_p.h"
+#include "kxmlguiversionhandler_p.h"
 #include "kxmlguifactory.h"
 #include "kxmlguibuilder.h"
 
@@ -625,9 +625,9 @@
 
 QString KXMLGUIClient::findMostRecentXMLFile( const QStringList &files, QString &doc \
)  {
-    KXmlGuiFileMerger merger(files);
-    doc = merger.finalDocument();
-    return merger.finalFile();
+    KXmlGuiVersionHandler versionHandler(files);
+    doc = versionHandler.finalDocument();
+    return versionHandler.finalFile();
 }
 
 void KXMLGUIClient::addStateActionEnabled(const QString& state,


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