From d46e3c00dc2ffc21d6adbdb72fb9e865d2598d7f Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 24 Jan 2006 15:20:56 +0000 Subject: [PATCH] KURL->KUrl svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=501995 --- kdeeducore/keduvocdocument.cpp | 6 +++--- kdeeducore/keduvocdocument.h | 10 +++++----- kdeeduui/kdeeduglossary.cpp | 10 +++++----- kdeeduui/kdeeduglossary.h | 8 ++++---- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/kdeeducore/keduvocdocument.cpp b/kdeeducore/keduvocdocument.cpp index e709871..f0243f1 100644 --- a/kdeeducore/keduvocdocument.cpp +++ b/kdeeducore/keduvocdocument.cpp @@ -91,7 +91,7 @@ void KEduVocDocument::Init () } -bool KEduVocDocument::open(const KURL& url, bool /*append*/) +bool KEduVocDocument::open(const KUrl& url, bool /*append*/) { Init(); if (!url.isEmpty()) @@ -185,11 +185,11 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/) } -bool KEduVocDocument::saveAs(QObject *parent, const KURL & url, FileType ft, const QString & generator) +bool KEduVocDocument::saveAs(QObject *parent, const KUrl & url, FileType ft, const QString & generator) { connect( this, SIGNAL(progressChanged(KEduVocDocument*,int)), parent, SLOT(slotProgress(KEduVocDocument*,int)) ); - KURL tmp (url); + KUrl tmp (url); if (ft == automatic) { diff --git a/kdeeducore/keduvocdocument.h b/kdeeducore/keduvocdocument.h index 2321456..4482156 100644 --- a/kdeeducore/keduvocdocument.h +++ b/kdeeducore/keduvocdocument.h @@ -484,7 +484,7 @@ class KEduVocDocument : public QObject * are in the result. * @returns true if successful */ - bool open(const KURL& url, bool append); + bool open(const KUrl& url, bool append); /** * Saves the data under the given name @@ -495,7 +495,7 @@ class KEduVocDocument : public QObject * @param generator the name of the application saving the document * @returns true if successful */ - bool saveAs(QObject *parent, const KURL & url, FileType ft, const QString & generator); + bool saveAs(QObject *parent, const KUrl & url, FileType ft, const QString & generator); /** * @returns the number of entries @@ -547,12 +547,12 @@ class KEduVocDocument : public QObject /** * @returns the URL of the XML file */ - inline KURL URL() const {return m_url; } + inline KUrl URL() const {return m_url; } /** * Sets the URL of the XML file */ - inline void setURL(const KURL& url) {m_url = url;} + inline void setURL(const KUrl& url) {m_url = url;} /** * @returns the title of the XML file @@ -751,7 +751,7 @@ protected: private: bool m_dirty; - KURL m_url; + KUrl m_url; QList m_sortIdentifier; bool m_sortLesson; bool m_unknownAttribute; diff --git a/kdeeduui/kdeeduglossary.cpp b/kdeeduui/kdeeduglossary.cpp index 6bb4685..6630c88 100644 --- a/kdeeduui/kdeeduglossary.cpp +++ b/kdeeduui/kdeeduglossary.cpp @@ -32,7 +32,7 @@ #include #include -Glossary::Glossary( const KURL& url, const QString& path ) +Glossary::Glossary( const KUrl& url, const QString& path ) { init( url, path ); } @@ -46,7 +46,7 @@ Glossary::~Glossary() { } -void Glossary::init( const KURL& url, const QString& path ) +void Glossary::init( const KUrl& url, const QString& path ) { // setting a generic name for a new glossary m_name = i18n( "Glossary" ); @@ -67,7 +67,7 @@ void Glossary::init( const KURL& url, const QString& path ) } } -bool Glossary::loadLayout( QDomDocument &Document, const KURL& url ) +bool Glossary::loadLayout( QDomDocument &Document, const KUrl& url ) { QFile layoutFile( url.path() ); @@ -237,7 +237,7 @@ GlossaryDialog::GlossaryDialog( bool folded, QWidget *parent ) m_htmlpart = new KHTMLPart( vs, "html-part" ); - connect( m_htmlpart->browserExtension(), SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), this, SLOT( displayItem( const KURL &, const KParts::URLArgs & ) ) ); + connect( m_htmlpart->browserExtension(), SIGNAL( openURLRequestDelayed( const KUrl &, const KParts::URLArgs & ) ), this, SLOT( displayItem( const KUrl &, const KParts::URLArgs & ) ) ); connect( m_glosstree, SIGNAL(clicked( Q3ListViewItem * )), this, SLOT(slotClicked( Q3ListViewItem * ))); connect( clear, SIGNAL(clicked()), m_search, SLOT(clear())); @@ -256,7 +256,7 @@ void GlossaryDialog::keyPressEvent(QKeyEvent* e) KDialogBase::keyPressEvent(e); } -void GlossaryDialog::displayItem( const KURL& url, const KParts::URLArgs& ) +void GlossaryDialog::displayItem( const KUrl& url, const KParts::URLArgs& ) { // using the "host" part of a kurl as reference QString myurl = url.host().toLower(); diff --git a/kdeeduui/kdeeduglossary.h b/kdeeduui/kdeeduglossary.h index 3f8deb1..ae2c8df 100644 --- a/kdeeduui/kdeeduglossary.h +++ b/kdeeduui/kdeeduglossary.h @@ -45,7 +45,7 @@ class Glossary * @param url the path of the file to load * @param path the path of the pictures */ - Glossary( const KURL& url, const QString& path = 0 ); + Glossary( const KUrl& url, const QString& path = 0 ); /** * Creates a new empty glossary @@ -124,7 +124,7 @@ class Glossary } protected: - void init( const KURL& url, const QString& path ); + void init( const KUrl& url, const QString& path ); private: /** @@ -157,7 +157,7 @@ class Glossary * @return a bool indicating whether the loading of the XML was * successfull or not */ - bool loadLayout( QDomDocument& doc, const KURL& url ); + bool loadLayout( QDomDocument& doc, const KUrl& url ); QList m_itemlist; @@ -291,7 +291,7 @@ class GlossaryDialog : public KDialogBase /** * The user clicked on a href. Find and display the right item */ - void displayItem( const KURL& url, const KParts::URLArgs& args ); + void displayItem( const KUrl& url, const KParts::URLArgs& args ); }; #endif // KDEEDUGLOSSARY_H -- 2.47.3