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

List:       kde-commits
Subject:    KDE/kdebase/kioslave
From:       Laurent Montel <montel () kde ! org>
Date:       2006-02-20 13:09:20
Message-ID: 1140440960.309536.2921.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 511593 by mlaurent:

Compile/link


 M  +2 -4      media/medianotifier/medianotifier.cpp  
 M  +4 -4      smb/kio_smb_internal.cpp  
 M  +1 -1      smb/kio_smb_mount.cpp  
 M  +2 -2      trash/ktrash.cpp  
 M  +3 -3      trash/trashimpl.cpp  


--- trunk/KDE/kdebase/kioslave/media/medianotifier/medianotifier.cpp #511592:511593
@@ -173,10 +173,9 @@
 	QString caption = i18n( "Autorun - %1" ).arg( medium.url().prettyURL() );
 	KGuiItem yes = KStdGuiItem::yes();
 	KGuiItem no = KStdGuiItem::no();
-	int options = KMessageBox::Notify | KMessageBox::Dangerous;
 
 	int answer = KMessageBox::warningYesNo( 0L, text, caption, yes, no,
-	                                        QString(), options );
+	                                        QString(), KMessageBox::Notify | \
KMessageBox::Dangerous );  
 	if ( answer == KMessageBox::Yes )
 	{
@@ -247,10 +246,9 @@
 	QString caption = i18n( "Autoopen - %1" ).arg( medium.url().prettyURL() );
 	KGuiItem yes = KStdGuiItem::yes();
 	KGuiItem no = KStdGuiItem::no();
-	int options = KMessageBox::Notify | KMessageBox::Dangerous;
 
 	int answer = KMessageBox::warningYesNo( 0L, text, caption, yes, no,
-	                                        QString(), options );
+	                                        QString(), KMessageBox::Notify | \
KMessageBox::Dangerous );  
 	// TODO: Take case of the "UNLESS" part?
 	// When an Autoopen file has been detected and the user has confirmed
--- trunk/KDE/kdebase/kioslave/smb/kio_smb_internal.cpp #511592:511593
@@ -85,14 +85,14 @@
     else {
         QString surl = "smb://";
         if (KUrl::hasUser()) {
-            surl += KUrl::encode_string(KUrl::user(), 106);
+            surl += KUrl::encode_string(KUrl::user());
             if (KUrl::hasPass()) {
-                surl += ":" + KUrl::encode_string(KUrl::pass(), 106);
+                surl += ":" + KUrl::encode_string(KUrl::pass());
             }
             surl += "@";
         }
-        surl += KUrl::encode_string(KUrl::host().toUpper(), 106);
-        surl += KUrl::encode_string(KUrl::path(), 106);
+        surl += KUrl::encode_string(KUrl::host().toUpper());
+        surl += KUrl::encode_string(KUrl::path());
         m_surl = surl.toUtf8();
     }
     m_type = SMBURLTYPE_UNKNOWN;
--- trunk/KDE/kdebase/kioslave/smb/kio_smb_mount.cpp #511592:511593
@@ -72,7 +72,7 @@
          mybuf.truncate(0);
          mystderr.truncate(0);
 
-         SMBUrl smburl("smb:///");
+         SMBUrl smburl(KUrl("smb:///"));
          smburl.setHost(host);
          smburl.setPath("/" + share);
 
--- trunk/KDE/kdebase/kioslave/trash/ktrash.cpp #511592:511593
@@ -55,12 +55,12 @@
         QByteArray packedArgs;
         QDataStream stream( &packedArgs, QIODevice::WriteOnly );
         stream << (int)1;
-        KIO::Job* job = KIO::special( "trash:/", packedArgs );
+        KIO::Job* job = KIO::special( KUrl("trash:/"), packedArgs );
         (void)KIO::NetAccess::synchronousRun( job, 0 );
 
         // Update konq windows opened on trash:/
         KDirNotify_stub allDirNotify("*", "KDirNotify*");
-        allDirNotify.FilesAdded( "trash:/" ); // yeah, files were removed, but we \
don't know which ones... +        allDirNotify.FilesAdded( KUrl("trash:/") ); // \
yeah, files were removed, but we don't know which ones...  return 0;
     }
 
--- trunk/KDE/kdebase/kioslave/trash/trashimpl.cpp #511592:511593
@@ -254,9 +254,9 @@
     // Escape filenames according to the way they are encoded on the filesystem
     // All this to basically get back to the raw 8-bit representation of the \
filename...  if ( trashId == 0 ) // home trash: absolute path
-        info += KUrl::encode_string( origPath, m_mibEnum ).latin1();
+        info += KUrl::encode_string( origPath/*, m_mibEnum*/ ).latin1();
     else
-        info += KUrl::encode_string( makeRelativePath( topDirectoryPath( trashId ), \
origPath ), m_mibEnum ).latin1(); +        info += KUrl::encode_string( \
makeRelativePath( topDirectoryPath( trashId ), origPath )/*, m_mibEnum*/ ).latin1();  \
info += "\n";  info += "DeletionDate=";
     info += QDateTime::currentDateTime().toString( Qt::ISODate ).toLatin1();
@@ -605,7 +605,7 @@
         return false;
     }
     cfg.setGroup( "Trash Info" );
-    info.origPath = KUrl::decode_string( cfg.readEntry( "Path" ), m_mibEnum );
+    info.origPath = KUrl::decode_string( cfg.readEntry( "Path" )/*, m_mibEnum*/ );
     if ( info.origPath.isEmpty() )
         return false; // path is mandatory...
     if ( trashId == 0 )


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