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

List:       kde-commits
Subject:    KDE/kdeutils
From:       Pascal Létourneau <pascal.letourneau () kdemail ! net>
Date:       2006-07-18 16:51:19
Message-ID: 1153241479.358759.9673.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 563845 by pletourn:

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


 M  +1 -1      ark/mainwindow.cpp  
 M  +3 -3      kgpg/kgpg.cpp  
 M  +3 -3      kgpg/kgpgoptions.cpp  


--- trunk/KDE/kdeutils/ark/mainwindow.cpp #563844:563845
@@ -425,7 +425,7 @@
         // like: /dira> ark -add /dirb/file, but well...
         KUrl cwdURL;
         cwdURL.setPath( filesToAdd.first().path() );
-        QString dir = cwdURL.directory( false );
+        QString dir = cwdURL.directory( KUrl::AppendTrailingSlash );
 
         archiveFile = getOpenURL( true, i18n( "Select Archive to Add Files To" ),
                                   dir /*cwd*/, archive.fileName() );
--- trunk/KDE/kdeutils/kgpg/kgpg.cpp #563844:563845
@@ -550,7 +550,7 @@
 
     const KArchiveDirectory *archiveDirectory = compressedFolder.directory();
     //KUrl savePath=KUrl::getURL(droppedUrl,this,i18n(""));
-    KUrlRequesterDlg *savePath = new KUrlRequesterDlg(droppedUrl.directory(false), \
i18n("Extract to: "),0); +    KUrlRequesterDlg *savePath = new \
KUrlRequesterDlg(droppedUrl.directory(KUrl::AppendTrailingSlash), i18n("Extract to: \
"),0);  savePath->fileDialog()->setMode(KFile::Directory);
     if (!savePath->exec() == QDialog::Accepted)
     {
@@ -1074,8 +1074,8 @@
 
         QString gpgPath = KGpgSettings::gpgConfigPath();
         if (!gpgPath.isEmpty())
-            if (KUrl::fromPath(gpgPath).directory(false) != (QDir::homePath() + \
                "/.gnupg/"))
-                setenv("GNUPGHOME", \
KUrl::fromPath(gpgPath).directory(false).toAscii(), 1); +            if \
(KUrl::fromPath(gpgPath).directory(KUrl::AppendTrailingSlash) != (QDir::homePath() + \
"/.gnupg/")) +                setenv("GNUPGHOME", \
KUrl::fromPath(gpgPath).directory(KUrl::AppendTrailingSlash).toAscii(), 1);  
         s_keyManager->refreshkey();
 
--- trunk/KDE/kdeutils/kgpg/kgpgoptions.cpp #563844:563845
@@ -244,7 +244,7 @@
 
     gpgConfigPath = KGpgSettings::gpgConfigPath();
     m_page4->gpg_conf_path->setText(KUrl::fromPath(gpgConfigPath).fileName());
-    m_page4->gpg_home_path->setText(KUrl::fromPath(gpgConfigPath).directory(false));
+    m_page4->gpg_home_path->setText(KUrl::fromPath(gpgConfigPath).directory(KUrl::AppendTrailingSlash));
  
     m_useagent = KgpgInterface::getGpgBoolSetting("use-agent", \
KGpgSettings::gpgConfigPath());  m_defaultuseagent = false;
@@ -281,7 +281,7 @@
 {
     // Update config path first!
     KGpgSettings::setGpgConfigPath(m_page4->gpg_home_path->text() + \
                m_page4->gpg_conf_path->text());
-    if (m_page4->gpg_home_path->text() != \
KUrl::fromPath(gpgConfigPath).directory(false)) +    if \
(m_page4->gpg_home_path->text() != \
KUrl::fromPath(gpgConfigPath).directory(KUrl::AppendTrailingSlash))  {
         if (m_page4->gpg_home_path->text() != defaultHomePath)
             setenv("GNUPGHOME", m_page4->gpg_home_path->text().toAscii(), 1);
@@ -497,7 +497,7 @@
     if (m_page4->gpg_conf_path->text() != KUrl::fromPath(gpgConfigPath).fileName())
         return true;
 
-    if (m_page4->gpg_home_path->text() != \
KUrl::fromPath(gpgConfigPath).directory(false)) +    if \
(m_page4->gpg_home_path->text() != \
KUrl::fromPath(gpgConfigPath).directory(KUrl::AppendTrailingSlash))  return true;
 
     if (m_page4->use_agent->isChecked() != m_useagent)


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