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

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdepim/kmail
From:       Dirk Mueller <mueller () kde ! org>
Date:       2004-04-02 22:37:30
Message-ID: 20040402223730.6209E997E () office ! kde ! org
[Download RAW message or body]

CVS commit by mueller: 

fix KURL() handling


  M +2 -2      kmfoldercachedimap.cpp   1.39.2.2
  M +1 -1      kmgroupware.cpp   1.53.2.1
  M +1 -1      kmkernel.cpp   1.235.2.3
  M +1 -1      kmreaderwin.cpp   1.733.2.3
  M +1 -1      kmreaderwin.h   1.185.4.1
  M +1 -1      kmsender.cpp   1.197.2.4
  M +1 -1      sieveconfig.cpp   1.6.2.1
  M +1 -1      signatureconfigurator.cpp   1.8.2.1


--- kdepim/kmail/kmfoldercachedimap.cpp  #1.39.2.1:1.39.2.2
@@ -160,5 +160,5 @@ int KMFolderCachedImap::remove()
     if( QFile::exists(uidCacheFile) )
       unlink( QFile::encodeName( uidCacheFile ) );
-    KIO::del( part1 + ".directory" );
+    KIO::del( KURL( part1 + ".directory" ) );
   } else {
     // Don't remove the uidcache file here, since presence of that is how
@@ -1154,5 +1154,5 @@ void KMFolderCachedImap::listDirectory2(
         foldersForDeletionOnServer << mSubfolderPaths[i];
         // Make sure all trace of the dir is gone
-        KIO::del( part1 + ".directory" );
+        KIO::del( KURL( part1 + ".directory" ) );
       } else {
         // This is a new folder, create the local cache

--- kdepim/kmail/kmgroupware.cpp  #1.53:1.53.2.1
@@ -862,5 +862,5 @@ bool KMGroupware::msTNEFToVPart( const Q
           addressee.insertCustom("KADDRESSBOOK", "X-Anniversary", s);
 
-        addressee.setUrl(sNamedProp(tnefMsg, MAPI_TAG_CONTACT_WEBPAGE));
+        addressee.setUrl(KURL( sNamedProp(tnefMsg, MAPI_TAG_CONTACT_WEBPAGE )));
 
         // collect parts of Name entry

--- kdepim/kmail/kmkernel.cpp  #1.235.2.2:1.235.2.3
@@ -166,5 +166,5 @@ bool KMKernel::handleCommandLine( bool n
 {
   QString to, cc, bcc, subj, body;
-  KURL messageFile = QString::null;
+  KURL messageFile;
   KURL::List attachURLs;
   bool mailto = false;

--- kdepim/kmail/kmreaderwin.cpp  #1.733.2.2:1.733.2.3
@@ -924,5 +924,5 @@ void KMReaderWin::displayAboutPage()
   QString location = locate("data", "kmail/about/main.html");
   QString content = kFileToString(location);
-  mViewer->begin(location);
+  mViewer->begin(KURL( location ));
   QString info =
     i18n("%1: KMail version; %2: help:// URL; %3: homepage URL; "

--- kdepim/kmail/kmreaderwin.h  #1.185:1.185.4.1
@@ -304,5 +304,5 @@ public slots:
       beginning of URL before copying. */
   void slotUrlCopy();
-  void slotUrlOpen( const KURL &url = 0 );
+  void slotUrlOpen( const KURL &url = KURL() );
   /** Save the page to a file */
   void slotUrlSave();

--- kdepim/kmail/kmsender.cpp  #1.197.2.3:1.197.2.4
@@ -1113,5 +1113,5 @@ bool KMSendSMTP::send(KMMessage *aMsg)
     slaveConfig.insert("tls", (ti->encryption == "TLS") ? "on" : "off");
     if (ti->auth) slaveConfig.insert("sasl", ti->authType);
-    mSlave = KIO::Scheduler::getConnectedSlave(destination.url(), slaveConfig);
+    mSlave = KIO::Scheduler::getConnectedSlave(destination, slaveConfig);
   }
 

--- kdepim/kmail/sieveconfig.cpp  #1.6:1.6.2.1
@@ -132,5 +132,5 @@ namespace KMail {
 
   KURL SieveConfigEditor::alternateURL() const {
-    KURL url = mAlternateURLEdit->text();
+    KURL url ( mAlternateURLEdit->text() );
     if ( !url.isValid() )
       return KURL();

--- kdepim/kmail/signatureconfigurator.cpp  #1.8:1.8.2.1
@@ -238,5 +238,5 @@ namespace KMail {
     assert( !url.isEmpty() );
 
-    (void)KRun::runURL( url, QString::fromLatin1("text/plain") );
+    (void)KRun::runURL( KURL( url ), QString::fromLatin1("text/plain") );
   }
 


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