[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdenetwork/kopete
From: Andre Duffeck <andre () duffeck ! de>
Date: 2006-07-14 14:27:10
Message-ID: 1152887230.996192.20143.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 562282 by duffeck:
remove KUrl::fromPathOrUrl
M +2 -2 plugins/webpresence/webpresenceplugin.cpp
M +3 -3 protocols/jabber/jabbercontact.cpp
M +1 -1 protocols/jabber/jabberfiletransfer.cpp
M +1 -1 protocols/msn/msnaccount.cpp
M +2 -2 protocols/winpopup/libwinpopup/libwinpopup.cpp
--- trunk/KDE/kdenetwork/kopete/plugins/webpresence/webpresenceplugin.cpp \
#562281:562282 @@ -158,7 +158,7 @@
m_writeScheduler->stop();
// generate the (temporary) XML file representing the current contactlist
- KUrl dest = KUrl::fromPathOrUrl( resultURL );
+ KUrl dest( resultURL );
if ( resultURL.isEmpty() || !dest.isValid() )
{
kDebug(14309) << "url is empty or not valid. NOT UPDATING!" << endl;
@@ -197,7 +197,7 @@
}
// upload it to the specified URL
- KUrl src = KUrl::fromPathOrUrl( m_output->name() );
+ KUrl src( m_output->name() );
KIO::FileCopyJob *job = KIO::file_move( src, dest, -1, true, false, false );
connect( job, SIGNAL( result( KJob * ) ),
SLOT( slotUploadJobResult( KJob * ) ) );
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabbercontact.cpp #562281:562282
@@ -982,7 +982,7 @@
if(contactPhoto.width() > 96 || contactPhoto.height() > 96)
{
// Save image to a new location if the image isn't the correct format.
- QString newLocation( KStandardDirs::locateLocal( "appdata", "jabberphotos/"+ \
KUrl::fromPathOrUrl(photoPath).fileName().toLower() ) ); + QString newLocation( \
KStandardDirs::locateLocal( "appdata", "jabberphotos/"+ \
KUrl(photoPath).fileName().toLower() ) );
// Scale and crop the picture.
contactPhoto = contactPhoto.scaled( 96, 96, Qt::KeepAspectRatio, \
Qt::SmoothTransformation ); @@ -1001,7 +1001,7 @@
else if (contactPhoto.width() < 32 || contactPhoto.height() < 32)
{
// Save image to a new location if the image isn't the correct format.
- QString newLocation( KStandardDirs::locateLocal( "appdata", "jabberphotos/"+ \
KUrl::fromPathOrUrl(photoPath).fileName().toLower() ) ); + QString newLocation( \
KStandardDirs::locateLocal( "appdata", "jabberphotos/"+ \
KUrl(photoPath).fileName().toLower() ) );
// Scale and crop the picture.
contactPhoto = contactPhoto.scaled( 32, 32, Qt::KeepAspectRatio, \
Qt::SmoothTransformation ); @@ -1020,7 +1020,7 @@
else if (contactPhoto.width() != contactPhoto.height())
{
// Save image to a new location if the image isn't the correct format.
- QString newLocation( KStandardDirs::locateLocal( "appdata", "jabberphotos/"+ \
KUrl::fromPathOrUrl(photoPath).fileName().toLower() ) ); + QString newLocation( \
KStandardDirs::locateLocal( "appdata", "jabberphotos/"+ \
KUrl(photoPath).fileName().toLower() ) );
if(contactPhoto.width() < contactPhoto.height())
contactPhoto = contactPhoto.copy((contactPhoto.width()-contactPhoto.height())/2, \
0, contactPhoto.height(), contactPhoto.height());
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabberfiletransfer.cpp \
#562281:562282 @@ -100,7 +100,7 @@
connect ( mXMPPTransfer, SIGNAL ( bytesWritten ( int ) ), this, SLOT ( \
slotOutgoingBytesWritten ( int ) ) ); connect ( mXMPPTransfer, SIGNAL ( error ( int \
) ), this, SLOT ( slotTransferError ( int ) ) );
- mXMPPTransfer->sendFile ( XMPP::Jid ( contact->fullAddress () ), \
KUrl::fromPathOrUrl(file).fileName (), mLocalFile.size (), "" ); \
+ mXMPPTransfer->sendFile ( XMPP::Jid ( contact->fullAddress () ), \
KUrl(file).fileName (), mLocalFile.size (), "" );
}
--- trunk/KDE/kdenetwork/kopete/protocols/msn/msnaccount.cpp #562281:562282
@@ -1457,7 +1457,7 @@
if(picture.width() != 96 || picture.height() != 96)
{
// Save to a new location in msnpictures.
- QString newLocation( KStandardDirs::locateLocal( "appdata", "msnpictures/"+ \
KUrl::fromPathOrUrl(m_pictureFilename).fileName().toLower() ) ); + QString \
newLocation( KStandardDirs::locateLocal( "appdata", "msnpictures/"+ \
KUrl(m_pictureFilename).fileName().toLower() ) );
// Scale and crop the picture.
picture = MSNProtocol::protocol()->scalePicture(picture);
--- trunk/KDE/kdenetwork/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp \
#562281:562282 @@ -56,7 +56,7 @@
dirLister->setAutoUpdate(true);
connect(dirLister, SIGNAL(newItems(const KFileItemList &)), this, \
SLOT(slotNewMessages(const KFileItemList &))); connect(dirLister, \
SIGNAL(completed()), this, SLOT(slotListCompleted()));
- dirLister->openURL(KUrl::fromPathOrUrl(WP_POPUP_DIR));
+ dirLister->openURL(KUrl(WP_POPUP_DIR));
}
}
@@ -117,7 +117,7 @@
if (KToolInvocation::kdeinitExecWait("kdesu", kdesuArgs) == 0) return true;
}
} else {
- KFileItem tmpFileItem = KFileItem(KFileItem::Unknown, KFileItem::Unknown, \
KUrl::fromPathOrUrl(WP_POPUP_DIR)); + KFileItem tmpFileItem = \
KFileItem(KFileItem::Unknown, KFileItem::Unknown, KUrl(WP_POPUP_DIR)); mode_t \
tmpPerms = tmpFileItem.permissions();
if (tmpPerms != 0777) {
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic