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

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdepim/kaddressbook
From:       Dirk Mueller <mueller () kde ! org>
Date:       2004-04-02 22:34:55
Message-ID: 20040402223455.1CF77997E () office ! kde ! org
[Download RAW message or body]

CVS commit by mueller: 

fix KURL() handling


  M +1 -1      addresseeeditorwidget.cpp   1.66.4.1
  M +1 -1      imagewidget.cpp   1.16.4.1
  M +1 -1      features/locationwidget.cpp   1.14.4.1
  M +1 -1      xxport/csvimportdialog.cpp   1.10.4.1
  M +1 -1      xxport/opera_xxport.cpp   1.8.4.1
  M +1 -1      xxport/pab_mapihd.cpp   1.2.4.1


--- kdepim/kaddressbook/addresseeeditorwidget.cpp  #1.66:1.66.4.1
@@ -505,5 +505,5 @@ void AddresseeEditorWidget::load()
   mRoleEdit->setText( mAddressee.role() );
   mOrgEdit->setText( mAddressee.organization() );
-  mURLEdit->setURL( mAddressee.url().url() );
+  mURLEdit->setURL( KURL( mAddressee.url().url() ) );
   mURLEdit->home( false );
   mNoteEdit->setText( mAddressee.note() );

--- kdepim/kaddressbook/imagewidget.cpp  #1.16:1.16.4.1
@@ -191,5 +191,5 @@ KABC::Picture ImageWidget::image() const
 void ImageWidget::loadImage()
 {
-  mImageLabel->setPixmap( loadPixmap( mImageUrl->url() ) );
+  mImageLabel->setPixmap( loadPixmap( KURL( mImageUrl->url() ) ) );
 }
 

--- kdepim/kaddressbook/features/locationwidget.cpp  #1.14:1.14.4.1
@@ -144,5 +144,5 @@ void LocationWidget::loadLocationPage()
   }
 
-  KURL url = createUrl( mAddressList[ mAddressTypeCombo->currentItem() ] );
+  KURL url ( createUrl( mAddressList[ mAddressTypeCombo->currentItem() ] ));
   kapp->invokeBrowser( url.url() );
 }

--- kdepim/kaddressbook/xxport/csvimportdialog.cpp  #1.10:1.10.4.1
@@ -220,5 +220,5 @@ KABC::AddresseeList CSVImportDialog::con
           break;
         case URL:
-          a.setUrl( value );
+          a.setUrl( KURL( value ) );
           break;
         case Organization:

--- kdepim/kaddressbook/xxport/opera_xxport.cpp  #1.8:1.8.4.1
@@ -119,5 +119,5 @@ KABC::AddresseeList OperaXXPort::importC
         addr.setNote( value.replace( separator, "\n" ) );
       else if ( key == QString::fromLatin1( "url" ) )
-        addr.setUrl( value );
+        addr.setUrl( KURL( value ) );
       else if ( key == QString::fromLatin1( "pictureurl" ) ) {
         KABC::Picture pic( value );

--- kdepim/kaddressbook/xxport/pab_mapihd.cpp  #1.2:1.2.4.1
@@ -311,5 +311,5 @@ KABC::Addressee pabfields_t::get() {
   if (!mobile.isEmpty()) a.insertPhoneNumber( KABC::PhoneNumber( mobile, KABC::PhoneNumber::Cell ) );
   if (!modem.isEmpty()) a.insertPhoneNumber( KABC::PhoneNumber( modem, KABC::PhoneNumber::Modem ) );
-  if (!homepage.isEmpty()) a.setUrl(homepage);
+  if (!homepage.isEmpty()) a.setUrl(KURL( homepage ));
   // Miss out talk
   if (!comment.isEmpty()) a.setNote(comment);


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