[Uml-devel] KDE/kdesdk

[Pascal Létourneau]

SVN commit 563842 by pletourn:

directory(false) -> directory(KUrl::AppendTrailingSlash)
A check will be later added to KUrl


 M  +1 -1      kbabel/common/catalog.cpp  
 M  +3 -3      kbabel/kbabel/kbabel.cpp  
 M  +1 -1      umbrello/umbrello/umllistview.cpp  
 M  +1 -1      umbrello/umbrello/umllistviewitem.cpp  


--- trunk/KDE/kdesdk/kbabel/common/catalog.cpp #563841:563842
@@ -854,7 +854,7 @@
 {
     QString result;
     if( !d->_packageDir.isNull() ) result=d->_packageDir;
-    else result=d->_url.directory(false);
+    else result=d->_url.directory(KUrl::AppendTrailingSlash);
 
     return result;
 }
--- trunk/KDE/kdesdk/kbabel/kbabel/kbabel.cpp #563841:563842
@@ -1110,7 +1110,7 @@
        DCOPClient *client = kapp->dcopClient();
        QByteArray data;
        QDataStream arg(&data, QIODevice::WriteOnly);
-       arg << ((url.directory(false)+url.fileName()).utf8())  ;
+       arg << ((url.directory(KUrl::AppendTrailingSlash)+url.fileName()).utf8())  ;
        if( !client->send( "catalogmanager-*", "CatalogManagerIFace", "updatedFile(QCString)", data ))
         kDebug(KBABEL) << "Unable to send file update info via DCOP" << endl;
 
@@ -1127,7 +1127,7 @@
     DCOPClient *client = kapp->dcopClient();
     QByteArray data;
     QDataStream arg(&data, QIODevice::WriteOnly);
-    arg << ((url.directory(false)+url.fileName()).utf8())  ;
+    arg << ((url.directory(KUrl::AppendTrailingSlash)+url.fileName()).utf8())  ;
     if( !client->send( "catalogmanager-*", "CatalogManagerIFace", "updatedFile(QCString)", data ))
         kDebug(KBABEL) << "Unable to send file update info via DCOP" << endl;
 }
@@ -1141,7 +1141,7 @@
     DCOPClient *client = kapp->dcopClient();
     QByteArray data;
     QDataStream arg(&data, QIODevice::WriteOnly);
-    arg << ((url.directory(false)+url.fileName()).utf8())  ;
+    arg << ((url.directory(KUrl::AppendTrailingSlash)+url.fileName()).utf8())  ;
     if( !client->send( "catalogmanager-*", "CatalogManagerIFace", "updatedFile(QCString)", data ))
         kDebug(KBABEL) << "Unable to send file update info via DCOP" << endl;
 }
--- trunk/KDE/kdesdk/umbrello/umbrello/umllistview.cpp #563841:563842
@@ -2926,7 +2926,7 @@
                         if (!folderFile.isEmpty()) {
                             setCurrentItem(item);
                             item->setFolderFile(folderFile);
-                            const QString fqfn(m_doc->URL().directory(false) + folderFile);
+                            const QString fqfn(m_doc->URL().directory(KUrl::AppendTrailingSlash) + folderFile);
                             kDebug() << "UMLListView::loadChildrenFromXMI:"
                             << " fully qualified folderFile is " << fqfn
                             << endl;
--- trunk/KDE/kdesdk/umbrello/umbrello/umllistviewitem.cpp #563841:563842
@@ -695,7 +695,7 @@
         if (UMLListView::typeIsFolder(m_Type) && !m_FolderFile.isEmpty()) {
             itemElement.setAttribute( "external_file", m_FolderFile );
             if (saveSubmodelFiles) {
-                folderFile.setName(umldoc->URL().directory(false) + m_FolderFile);
+                folderFile.setName(umldoc->URL().directory(KUrl::AppendTrailingSlash) + m_FolderFile);
                 if( !folderFile.open( QIODevice::WriteOnly ) ) {
                     KMessageBox::error(0,
                                        i18n("There was a problem saving file: %1", m_FolderFile),