diff --git a/cervisiapart.cpp b/cervisiapart.cpp index 3940d45eee3616afa0c0e70f94735dd15268a1d2..4d890d72bb1eba10bcd9477c59406579fb497572 100644 --- a/cervisiapart.cpp +++ b/cervisiapart.cpp @@ -1758,7 +1758,7 @@ bool CervisiaPart::openSandbox(const QString &dirname) // remove path from recent sandbox menu QFileInfo fi(dirname); - recent->removeUrl( KUrl::fromPathOrUrl(fi.absoluteFilePath()) ); + recent->removeUrl( KUrl(fi.absoluteFilePath()) ); return false; } @@ -1769,14 +1769,14 @@ bool CervisiaPart::openSandbox(const QString &dirname) // get path of sandbox for recent sandbox menu sandbox = cvsRepository.workingCopy(); - recent->addUrl( KUrl::fromPathOrUrl(sandbox) ); + recent->addUrl( KUrl(sandbox) ); // get repository for the caption of the window repository = cvsRepository.location(); emit setWindowCaption(sandbox + '(' + repository + ')'); // set m_url member for tabbed window modus of Konqueror - m_url = KUrl::fromPathOrUrl(sandbox); + m_url = KUrl(sandbox); // *NOTICE* // The order is important here. We have to set the m_url member before diff --git a/cervisiashell.cpp b/cervisiashell.cpp index 37ccecb805bac872644db629692ee332806be393..907ce5cfd447c7c2424a147408a7c5537231bc9c 100644 --- a/cervisiashell.cpp +++ b/cervisiashell.cpp @@ -36,9 +36,9 @@ CervisiaShell::CervisiaShell( const char *name ) - : KParts::MainWindow( 0L,name ) - , m_part(0) + : m_part(0) { + setObjectName( name ); setXMLFile( "cervisiashellui.rc" ); KLibFactory* factory = KLibLoader::self()->factory("libcervisiapart"); @@ -142,7 +142,7 @@ void CervisiaShell::setupActions() void CervisiaShell::openURL() { if( !m_lastOpenDir.isEmpty() ) - m_part->openUrl(KUrl::fromPathOrUrl(m_lastOpenDir)); + m_part->openUrl( KUrl( m_lastOpenDir ) ); }