Commit 0a5f9848 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

KURL -> KUrl

svn path=/trunk/KDE/kdebase/konqueror/; revision=501890
parent 0da23f54
......@@ -141,7 +141,7 @@ void ChFaceDlg::addCustomPixmap( QString imPath, bool saveCopy )
userfaces.mkdir( userfaces.absolutePath() );
pix.save( userfaces.absolutePath() + "/.userinfo-tmp" , "PNG" );
KonqOperations::copy( this, KonqOperations::COPY, KURL::List( KURL( userfaces.absolutePath() + "/.userinfo-tmp" ) ), KURL( userfaces.absPath() + "/" + QFileInfo(imPath).fileName().section(".",0,0) ) );
KonqOperations::copy( this, KonqOperations::COPY, KUrl::List( KURL( userfaces.absolutePath() + "/.userinfo-tmp" ) ), KURL( userfaces.absPath() + "/" + QFileInfo(imPath).fileName().section(".",0,0) ) );
#if 0
if ( !pix.save( userfaces.absolutePath() + "/" + imPath , "PNG" ) )
KMessageBox::sorry(this, i18n("There was an error saving the image:\n%1").arg( userfaces.absolutePath() ) );
......
......@@ -305,7 +305,7 @@ bool KCMUserAccount::eventFilter(QObject *, QEvent *e)
return true;
}
KURL *url = decodeImgDrop( (QDropEvent *) e, this);
KUrl *url = decodeImgDrop( (QDropEvent *) e, this);
if (url)
{
QString pixPath;
......@@ -319,13 +319,13 @@ bool KCMUserAccount::eventFilter(QObject *, QEvent *e)
return false;
}
inline KURL *KCMUserAccount::decodeImgDrop(QDropEvent *e, QWidget *wdg)
inline KUrl *KCMUserAccount::decodeImgDrop(QDropEvent *e, QWidget *wdg)
{
KURL::List uris;
KUrl::List uris;
if (K3URLDrag::decode(e, uris) && (uris.count() > 0))
{
KURL *url = new KURL(uris.first());
KUrl *url = new KURL(uris.first());
if( KImageIO::types(KImageIO::Reading).contains(url->fileName()) )
return url;
......
......@@ -70,7 +70,7 @@ private Q_SLOTS:
private:
void changeFace(const QPixmap& pix);
inline KURL* decodeImgDrop(QDropEvent *e, QWidget *wdg);
inline KUrl* decodeImgDrop(QDropEvent *e, QWidget *wdg);
KEMailSettings *_kes;
KUser *_ku;
......
......@@ -507,7 +507,7 @@ static int directCommand(KCmdLineArgs *args)
dlg.exec();
if ( args->isSet("getsaveurl") ) {
KURL result = dlg.selectedURL();
KUrl result = dlg.selectedURL();
if ( result.isValid()) {
cout << result.url().local8Bit().data() << endl;
......@@ -533,7 +533,7 @@ static int directCommand(KCmdLineArgs *args)
result = QFileDialog::getExistingDirectory(startDir, 0, "getExistingDirectory",
title, true, true);
#else
KURL url;
KUrl url;
KDirSelectDialog myDialog( startDir, true, 0,
"kdirselect dialog", true );
......@@ -578,13 +578,13 @@ static int directCommand(KCmdLineArgs *args)
dlg.exec();
if (args->isSet("multiple")) {
KURL::List result = dlg.selectedURLs();
KUrl::List result = dlg.selectedURLs();
if ( !result.isEmpty() ) {
outputStringList( result.toStringList(), separateOutput );
return 0;
}
} else {
KURL result = dlg.selectedURL();
KUrl result = dlg.selectedURL();
if (!result.isEmpty()) {
cout << result.url().local8Bit().data() << endl;
return 0;
......
......@@ -152,7 +152,7 @@ EditCommand::EditCommand(const QString & address, int col, const QString & newVa
{
if(mCol == 1)
{
KURL u = KURL::fromPathOrURL(newValue);
KUrl u = KUrl::fromPathOrURL(newValue);
mNewValue = u.url(0, 106);
}
else
......@@ -235,7 +235,7 @@ void EditCommand::modify(QString newValue)
{
if(mCol == 1)
{
KURL u = KURL::fromPathOrURL(newValue);
KUrl u = KUrl::fromPathOrURL(newValue);
mNewValue = u.url(0, 106);
}
else
......
......@@ -68,7 +68,7 @@ public:
// bookmark
CreateCommand(const QString &address,
const QString &text, const QString &iconPath,
const KURL &url)
const KUrl &url)
: KCommand(), m_to(address), m_text(text), m_iconPath(iconPath), m_url(url),
m_group(false), m_separator(false), m_originalBookmark(QDomElement())
{ ; }
......@@ -99,7 +99,7 @@ private:
QString m_to;
QString m_text;
QString m_iconPath;
KURL m_url;
KUrl m_url;
bool m_group:1;
bool m_separator:1;
bool m_open:1;
......
......@@ -97,8 +97,8 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) {
m_browserIface = new FavIconBrowserInterface(this);
ext->setBrowserInterface(m_browserIface);
connect(ext, SIGNAL( setIconURL(const KURL &) ),
this, SLOT( setIconURL(const KURL &) ));
connect(ext, SIGNAL( setIconURL(const KUrl &) ),
this, SLOT( setIconURL(const KUrl &) ));
m_part = part;
}
......@@ -107,7 +107,7 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) {
}
// khtml callback
void FavIconUpdater::setIconURL(const KURL &iconURL) {
void FavIconUpdater::setIconURL(const KUrl &iconURL) {
setIconForURL(m_bk.url(), iconURL);
}
......@@ -125,7 +125,7 @@ void FavIconUpdater::notifyChange(bool isHost, QString hostOrURL, QString iconNa
/* -------------------------- */
FavIconWebGrabber::FavIconWebGrabber(KParts::ReadOnlyPart *part, const KURL &url)
FavIconWebGrabber::FavIconWebGrabber(KParts::ReadOnlyPart *part, const KUrl &url)
: m_part(part), m_url(url) {
// kdDebug() << "FavIconWebGrabber::FavIconWebGrabber starting KIO::get()" << endl;
......
......@@ -31,7 +31,7 @@ class FavIconWebGrabber : public QObject
{
Q_OBJECT
public:
FavIconWebGrabber(KParts::ReadOnlyPart *part, const KURL &url);
FavIconWebGrabber(KParts::ReadOnlyPart *part, const KUrl &url);
~FavIconWebGrabber() {}
protected Q_SLOTS:
......@@ -40,7 +40,7 @@ protected Q_SLOTS:
private:
KParts::ReadOnlyPart *m_part;
KURL m_url;
KUrl m_url;
};
class FavIconBrowserInterface;
......@@ -59,7 +59,7 @@ public:
QString iconName);
protected Q_SLOTS:
void setIconURL(const KURL &iconURL);
void setIconURL(const KUrl &iconURL);
void slotCompleted();
Q_SIGNALS:
......
......@@ -98,7 +98,7 @@ Kfind::~Kfind()
kdDebug() << "Kfind::~Kfind" << endl;
}
void Kfind::setURL( const KURL &url )
void Kfind::setURL( const KUrl &url )
{
tabWidget->setURL( url );
}
......
......@@ -26,7 +26,7 @@ public:
Kfind(QWidget * parent = 0, const char * name = 0);
~Kfind();
void setURL( const KURL &url );
void setURL( const KUrl &url );
void setQuery(KQuery * q) { query = q; }
void searchFinished();
......
......@@ -23,7 +23,7 @@
#include "kfinddlg.h"
#include "kfinddlg.moc"
KfindDlg::KfindDlg(const KURL & url, QWidget *parent, const char *name)
KfindDlg::KfindDlg(const KUrl & url, QWidget *parent, const char *name)
: KDialogBase( Plain, QString(),
User1 | User2 | Apply | Close | Help, Apply,
parent, name, true, true,
......
......@@ -25,7 +25,7 @@ class KfindDlg: public KDialogBase
Q_OBJECT
public:
KfindDlg(const KURL & url, QWidget * parent = 0, const char * name = 0);
KfindDlg(const KUrl & url, QWidget * parent = 0, const char * name = 0);
~KfindDlg();
void copySelection();
......
......@@ -81,7 +81,7 @@ KAboutData *KFindPart::createAboutData()
return new KAboutData( "kfindpart", I18N_NOOP( "Find Component" ), "1.0" );
}
bool KFindPart::doOpenURL( const KURL &url )
bool KFindPart::doOpenURL( const KUrl &url )
{
m_kfindWidget->setURL( url );
return true;
......@@ -189,7 +189,7 @@ void KFindPart::restoreState( QDataStream& stream )
{
KonqDirPart::restoreState(stream);
int nbitems;
KURL itemUrl;
KUrl itemUrl;
m_kfindWidget->restoreState( &stream );
......
......@@ -50,7 +50,7 @@ public:
static KAboutData *createAboutData();
virtual bool doOpenURL( const KURL &url );
virtual bool doOpenURL( const KUrl &url );
virtual bool doCloseURL() { return true; }
virtual bool openFile() { return false; }
......@@ -60,7 +60,7 @@ public:
virtual void restoreState( QDataStream &stream );
// "Cut" icons : disable those whose URL is in lst, enable the rest //added for konqdirpart
virtual void disableIcons( const KURL::List & ){};
virtual void disableIcons( const KUrl::List & ){};
virtual const KFileItem * currentItem(){return 0;};
Q_SIGNALS:
......@@ -89,7 +89,7 @@ protected Q_SLOTS:
virtual void slotDeleteItem( KFileItem * ){};
virtual void slotRefreshItems( const KFileItemList& ){};
virtual void slotClear(){};
virtual void slotRedirection( const KURL & ){};
virtual void slotRedirection( const KUrl & ){};
private:
Kfind * m_kfindWidget;
......
......@@ -389,7 +389,7 @@ KfindTabWidget::~KfindTabWidget()
delete pages[2];
}
void KfindTabWidget::setURL( const KURL & url )
void KfindTabWidget::setURL( const KUrl & url )
{
KConfig *conf = KGlobal::config();
conf->setGroup("History");
......
......@@ -47,7 +47,7 @@ public:
void saveHistory();
bool isSearchRecursive();
void setURL( const KURL & url );
void setURL( const KUrl & url );
public Q_SLOTS:
void setFocus();
......@@ -109,7 +109,7 @@ private:
QCheckBox *regexpContentCb;
QDialog *regExpDialog;
KURL m_url;
KUrl m_url;
KMimeType::List m_types;
QStringList m_ImageTypes;
......
......@@ -156,7 +156,7 @@ QString KfindWindow::reducedDir(const QString& fullDir)
return fullDir;
}
void KfindWindow::beginSearch(const KURL& baseUrl)
void KfindWindow::beginSearch(const KUrl& baseUrl)
{
kdDebug()<<QString("beginSearch in: %1").arg(baseUrl.path())<<endl;
m_baseDir=baseUrl.path(+1);
......@@ -205,7 +205,7 @@ void KfindWindow::saveResults()
dlg->exec();
KURL u = dlg->selectedURL();
KUrl u = dlg->selectedURL();
KMimeType::Ptr mimeType = dlg->currentFilterMimeType();
delete dlg;
......@@ -314,7 +314,7 @@ void KfindWindow::fileProperties()
void KfindWindow::openFolder()
{
KFileItem fileitem = ((KfFileLVI *)currentItem())->fileitem;
KURL url = fileitem.url();
KUrl url = fileitem.url();
url.setFileName(QString());
(void) new KRun(url, this);
......@@ -342,7 +342,7 @@ void KfindWindow::resizeEvent(QResizeEvent *e)
Q3DragObject * KfindWindow::dragObject()
{
KURL::List uris;
KUrl::List uris;
QList<Q3ListViewItem*> selected = selectedItems();
// create a list of URIs from selection
......@@ -431,5 +431,5 @@ void KfindWindow::slotContextMenu(KListView *,Q3ListViewItem *item,const QPoint&
void KfindWindow::slotOpenWith()
{
KRun::displayOpenWithDialog( KURL::split(((KfFileLVI*)currentItem())->fileitem.url()) );
KRun::displayOpenWithDialog( KUrl::split(((KfFileLVI*)currentItem())->fileitem.url()) );
}
......@@ -35,7 +35,7 @@ class KfindWindow: public KListView
public:
KfindWindow( QWidget * parent = 0 );
void beginSearch(const KURL& baseUrl);
void beginSearch(const KUrl& baseUrl);
void endSearch();
void insertItem(const KFileItem &item, const QString& matchingLine);
......
......@@ -459,7 +459,7 @@ void KQuery::setRecursive(bool recursive)
m_recursive = recursive;
}
void KQuery::setPath(const KURL &url)
void KQuery::setPath(const KUrl &url)
{
m_url = url;
}
......
......@@ -28,7 +28,7 @@ class KQuery : public QObject
void setTimeRange( time_t from, time_t to );
void setRegExp( const QString &regexp, bool caseSensitive );
void setRecursive( bool recursive );
void setPath(const KURL & url );
void setPath(const KUrl & url );
void setFileType( int filetype );
void setMimeType( const QStringList & mimetype );
void setContext( const QString & context, bool casesensitive,
......@@ -40,7 +40,7 @@ class KQuery : public QObject
void start();
void kill();
const KURL& url() {return m_url;};
const KUrl& url() {return m_url;};
private:
/* Check if file meets the find's requirements*/
......@@ -68,7 +68,7 @@ class KQuery : public QObject
int m_filetype;
int m_minsize;
int m_maxsize;
KURL m_url;
KUrl m_url;
time_t m_timeFrom;
time_t m_timeTo;
QRegExp m_regexp;// regexp for file content
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment