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

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdelibs/kio/kfile
From:       Dominik Haumann <dhdev () gmx ! de>
Date:       2004-09-18 9:54:49
Message-ID: 20040918095449.D5823126BB () office ! kde ! org
[Download RAW message or body]

CVS commit by dhaumann: 

backport binner's "compile with gcc 3.4" fix.


  M +6 -6      kdirselectdialog.cpp   1.21.2.2


--- kdelibs/kio/kfile/kdirselectdialog.cpp  #1.21.2.1:1.21.2.2
@@ -405,5 +405,5 @@ void KDirSelectDialog::slotMkdir()
     bool writeOk = false;
     bool exists = false;
-    KURL url( url() );
+    KURL folderurl( url() );
 
     QStringList dirs = QStringList::split( QDir::separator(), directory );
@@ -412,12 +412,12 @@ void KDirSelectDialog::slotMkdir()
     for ( ; it != dirs.end(); ++it )
     {
-        url.addPath( *it );
-        exists = KIO::NetAccess::exists( url, false, 0 );
-        writeOk = !exists && KIO::NetAccess::mkdir( url, topLevelWidget() );
+        folderurl.addPath( *it );
+        exists = KIO::NetAccess::exists( folderurl, false, 0 );
+        writeOk = !exists && KIO::NetAccess::mkdir( folderurl, topLevelWidget() );
     }
 
     if ( exists ) // url was already existant
     {
-        QString which = url.isLocalFile() ? url.path() : url.prettyURL();
+        QString which = folderurl.isLocalFile() ? folderurl.path() : folderurl.prettyURL();
         KMessageBox::sorry(this, i18n("A file or folder named %1 already exists.").arg(which));
         selectDirectory = false;
@@ -427,5 +427,5 @@ void KDirSelectDialog::slotMkdir()
     }
     else if ( selectDirectory ) {
-        setCurrentURL( url );
+        setCurrentURL( folderurl );
     }
 }


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