[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase
From: Pascal Létourneau <pascal.letourneau () kdemail ! net>
Date: 2006-08-29 21:37:36
Message-ID: 1156887456.611713.1223.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 578667 by pletourn:
Fix breakage from the URL -> Url renaming
M +1 -1 apps/konsole/konsole/konsole_part.cpp
M +2 -2 apps/konsole/konsole/konsole_part.h
M +1 -1 khelpcenter/history.cpp
M +3 -3 khelpcenter/mainwindow.cpp
M +1 -1 khelpcenter/navigator.cpp
M +6 -6 khelpcenter/view.cpp
M +1 -1 khelpcenter/view.h
M +1 -1 konqueror/konq_view.cc
M +9 -9 nsplugins/plugin_part.cpp
M +2 -2 nsplugins/plugin_part.h
M +1 -1 runtime/kioslave/man/kmanpart.cpp
M +1 -1 runtime/kioslave/man/kmanpart.h
M +2 -2 runtime/kioslave/thumbnail/htmlcreator.cpp
M +1 -1 workspace/kcontrol/kfontinst/viewpart/FontViewPart.cpp
M +1 -1 workspace/kcontrol/kfontinst/viewpart/FontViewPart.h
--- trunk/KDE/kdebase/apps/konsole/konsole/konsole_part.cpp #578666:578667
@@ -266,7 +266,7 @@
//te is deleted by the framework
}
-bool konsolePart::openURL( const KUrl & url )
+bool konsolePart::openUrl( const KUrl & url )
{
//kDebug(1211) << "konsolePart::openURL " << url.prettyUrl() << endl;
--- trunk/KDE/kdebase/apps/konsole/konsole/konsole_part.h #578666:578667
@@ -77,9 +77,9 @@
void processExited();
void receivedData( const QString& s );
protected:
- virtual bool openURL( const KUrl & url );
+ virtual bool openUrl( const KUrl & url );
virtual bool openFile() {return false;} // never used
- virtual bool closeURL() {return true;}
+ virtual bool closeUrl() {return true;}
virtual void guiActivateEvent( KParts::GUIActivateEvent * event );
protected Q_SLOTS:
--- trunk/KDE/kdebase/khelpcenter/history.cpp #578666:578667
@@ -237,7 +237,7 @@
QDataStream stream( h.buffer );
- h.view->closeURL();
+ h.view->closeUrl();
updateCurrentEntry( h.view );
h.view->browserExtension()->restoreState( stream );
--- trunk/KDE/kdebase/khelpcenter/mainwindow.cpp #578666:578667
@@ -301,7 +301,7 @@
void MainWindow::goInternalUrl( const KUrl &url )
{
- mDoc->closeURL();
+ mDoc->closeUrl();
slotOpenURLRequest( url, KParts::URLArgs() );
}
@@ -362,7 +362,7 @@
slotGlossSelected( mNavigator->glossEntry( decodedEntryId ) );
mNavigator->slotSelectGlossEntry( decodedEntryId );
} else {
- mDoc->openURL( url );
+ mDoc->openUrl( url );
}
}
@@ -419,7 +419,7 @@
{
kDebug() << "MainWindow::stop()" << endl;
- mDoc->closeURL();
+ mDoc->closeUrl();
History::self().updateCurrentEntry( mDoc );
}
--- trunk/KDE/kdebase/khelpcenter/navigator.cpp #578666:578667
@@ -387,7 +387,7 @@
KUrl url ( item->entry()->url() );
if ( url.protocol() == "khelpcenter" ) {
- mView->closeURL();
+ mView->closeUrl();
History::self().updateCurrentEntry( mView );
History::self().createEntry();
showOverview( item, url );
--- trunk/KDE/kdebase/khelpcenter/view.cpp #578666:578667
@@ -66,7 +66,7 @@
kapp->clipboard()->setText( selectedText() );
}
-bool View::openURL( const KUrl &url )
+bool View::openUrl( const KUrl &url )
{
if ( url.protocol().toLower() == "about" )
{
@@ -74,7 +74,7 @@
return true;
}
mState = Docu;
- return KHTMLPart::openURL( url );
+ return KHTMLPart::openUrl( url );
}
void View::saveState( QDataStream &stream )
@@ -285,7 +285,7 @@
return false;
if (!checkOnly)
- openURL( prevURL );
+ openUrl( prevURL );
return true;
}
@@ -313,7 +313,7 @@
return false;
if (!checkOnly)
- openURL( nextURL );
+ openUrl( nextURL );
return true;
}
@@ -373,9 +373,9 @@
args.reload = true;
browserExtension()->setUrlArgs( args );
if ( url.isEmpty() )
- openURL( baseURL() );
+ openUrl( baseURL() );
else
- openURL( url );
+ openUrl( url );
}
#include "view.moc"
--- trunk/KDE/kdebase/khelpcenter/view.h #578666:578667
@@ -27,7 +27,7 @@
~View();
- virtual bool openURL( const KUrl &url );
+ virtual bool openUrl( const KUrl &url );
virtual void saveState( QDataStream &stream );
virtual void restoreState( QDataStream &stream );
--- trunk/KDE/kdebase/konqueror/konq_view.cc #578666:578667
@@ -914,7 +914,7 @@
// we decided to keep it :)
KonqHistoryManager::kself()->confirmPending( url(), m_sTypedURL );
- //kDebug(1202) << "m_pPart->closeURL()" << endl;
+ //kDebug(1202) << "m_pPart->closeUrl()" << endl;
m_pPart->closeUrl();
m_bAborted = true;
m_pKonqFrame->statusbar()->slotLoadingProgress( -1 );
--- trunk/KDE/kdebase/nsplugins/plugin_part.cpp #578666:578667
@@ -219,10 +219,10 @@
}
-bool PluginPart::openURL(const KUrl &url)
+bool PluginPart::openUrl(const KUrl &url)
{
- closeURL();
- kDebug(1432) << "-> PluginPart::openURL" << endl;
+ closeUrl();
+ kDebug(1432) << "-> PluginPart::openUrl" << endl;
m_url = url;
QString surl = url.url();
@@ -262,7 +262,7 @@
}
if (surl.isEmpty()) {
- kDebug(1432) << "<- PluginPart::openURL - false (no url passed to nsplugin)" << endl;
+ kDebug(1432) << "<- PluginPart::openUrl - false (no url passed to nsplugin)" << endl;
return false;
}
@@ -288,14 +288,14 @@
_widget->resize(_canvas->width(), _canvas->height());
_widget->show();
- kDebug(1432) << "<- PluginPart::openURL = " << (inst!=0) << endl;
+ kDebug(1432) << "<- PluginPart::openUrl = " << (inst!=0) << endl;
return inst != 0L;
}
-bool PluginPart::closeURL()
+bool PluginPart::closeUrl()
{
- kDebug(1432) << "PluginPart::closeURL" << endl;
+ kDebug(1432) << "PluginPart::closeUrl" << endl;
delete _widget;
_widget = 0;
return true;
@@ -372,8 +372,8 @@
void PluginPart::changeSrc(const QString& url) {
- closeURL();
- openURL(KUrl( url ));
+ closeUrl();
+ openUrl(KUrl( url ));
}
--- trunk/KDE/kdebase/nsplugins/plugin_part.h #578666:578667
@@ -95,8 +95,8 @@
void changeSrc(const QString& url);
protected:
- virtual bool openURL(const KUrl &url);
- virtual bool closeURL();
+ virtual bool openUrl(const KUrl &url);
+ virtual bool closeUrl();
virtual bool openFile() { return false; };
protected Q_SLOTS:
--- trunk/KDE/kdebase/runtime/kioslave/man/kmanpart.cpp #578666:578667
@@ -78,7 +78,7 @@
m_extension=new KParts::BrowserExtension(this);
}
-bool KManPart::openURL( const KUrl &url )
+bool KManPart::openUrl( const KUrl &url )
{
return KParts::ReadOnlyPart::openUrl(url);
}
--- trunk/KDE/kdebase/runtime/kioslave/man/kmanpart.h #578666:578667
@@ -64,7 +64,7 @@
KParts::BrowserExtension * extension() {return m_extension;};
public Q_SLOTS:
- virtual bool openURL( const KUrl &url );
+ virtual bool openUrl( const KUrl &url );
protected Q_SLOTS:
void readData(KIO::Job * , const QByteArray & data);
void jobDone( KJob *);
--- trunk/KDE/kdebase/runtime/kioslave/thumbnail/htmlcreator.cpp #578666:578667
@@ -64,7 +64,7 @@
}
KUrl url;
url.setPath(path);
- m_html->openURL(url);
+ m_html->openUrl(url);
int t = startTimer(5000);
@@ -99,7 +99,7 @@
img = pix.toImage();
- m_html->closeURL();
+ m_html->closeUrl();
return true;
}
--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/viewpart/FontViewPart.cpp #578666:578667
@@ -134,7 +134,7 @@
setWidget(itsFrame);
}
-bool CFontViewPart::openURL(const KUrl &url)
+bool CFontViewPart::openUrl(const KUrl &url)
{
if (!url.isValid() || !closeUrl())
return false;
--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/viewpart/FontViewPart.h #578666:578667
@@ -57,7 +57,7 @@
CFontViewPart(QWidget *parent=0, const char *name=0);
virtual ~CFontViewPart() {}
- bool openURL(const KUrl &url);
+ bool openUrl(const KUrl &url);
protected:
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic