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

List:       kde-commits
Subject:    koffice/kexi/core
From:       Jarosław Staniek <staniek () kde ! org>
Date:       2010-02-21 0:58:06
Message-ID: 1266713886.930707.3008.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1093500 by staniek:

add compatibility for items saved with "uk.co.piggz.report" class


 M  +0 -6      kexipartmanager.cpp  
 M  +5 -2      kexiproject.cpp  


--- trunk/koffice/kexi/core/kexipartmanager.cpp #1093499:1093500
@@ -87,12 +87,6 @@
         {
             continue;
         }
-//</TEMP>
-//! @todo <TEMP>
-        if (partClass == "uk.co.piggz.report") {
-            partClass = "org.kexi-project.report";
-        }
-//        </TEMP>
         const int idx = sl_order.indexOf(partClass);
         if (idx != -1) {
             ordered[idx] = ptr;
--- trunk/koffice/kexi/core/kexiproject.cpp #1093499:1093500
@@ -1085,12 +1085,15 @@
     for (cursor->moveFirst(); !cursor->eof(); cursor->moveNext()) {
         QString partMime( cursor->value(2).toString() );
         QString partClass( cursor->value(3).toString() );
-        if (partClass.startsWith("http://")) {
+        if (partClass.startsWith(QLatin1String("http://"))) {
             // for compatibility with Kexi 1.x
             // part mime was used at the time
-            partClass = QString::fromLatin1("org.kexi-project.")
+            partClass = QLatin1String("org.kexi-project.")
                 + QString(partMime).replace("kexi/", QString());
         }
+        // compatibility:
+        if (partClass == QLatin1String("uk.co.piggz.report"))
+            partClass = QLatin1String("org.kexi-project.report");
         KexiPart::Info *info = Kexi::partManager().infoForClass(partClass);
         if (info) {
 //            i->setProjectPartID(cursor->value(0).toInt());
[prev in list] [next in list] [prev in thread] [next in thread]