Commit aa4c48e7 authored by Laurent Montel's avatar Laurent Montel 😁

Compile/link

KURL->KUrl

svn path=/trunk/KDE/kdesdk/cervisia/; revision=502943
parent aaa2761a
......@@ -186,7 +186,7 @@ KConfig *CervisiaPart::config()
return CervisiaFactory::instance()->config();
}
bool CervisiaPart::openURL( const KURL &u )
bool CervisiaPart::openURL( const KUrl &u )
{
// right now, we are unfortunately not network-aware
if( !u.isLocalFile() )
......@@ -242,7 +242,7 @@ void CervisiaPart::setupActions()
action->setWhatsThis( hint );
recent = new KRecentFilesAction( i18n("Recent Sandboxes"), 0,
this, SLOT( openURL( const KURL & ) ),
this, SLOT( openURL( const KUrl & ) ),
actionCollection(), "file_open_recent" );
action = new KAction( i18n("&Insert ChangeLog Entry..."), 0,
......@@ -666,7 +666,7 @@ void CervisiaPart::popupRequested(KListView*, Q3ListViewItem* item, const QPoint
if( !selectedFile.isEmpty() )
{
KURL u;
KUrl u;
u.setPath(sandbox + "/" + selectedFile);
m_currentEditMenu = new Cervisia::EditWithMenu(u, popup);
......@@ -828,7 +828,7 @@ void CervisiaPart::openFiles(const QStringList &filenames)
QStringList::ConstIterator end = filenames.end();
for( ; it != end; ++it )
{
KURL u;
KUrl u;
u.setPath(dir.absoluteFilePath(*it));
KRun* run = new KRun(u, 0, true, false);
run->setRunExecutables(false);
......@@ -1024,7 +1024,7 @@ void CervisiaPart::slotFileProperties()
// Create URL from selected filename
QDir dir(sandbox);
KURL u;
KUrl u;
u.setPath(dir.absoluteFilePath(filename));
// show file properties dialog
......@@ -1713,7 +1713,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::fromPathOrURL(fi.absoluteFilePath()) );
return false;
}
......@@ -1724,14 +1724,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::fromPathOrURL(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::fromPathOrURL(sandbox);
// *NOTICE*
// The order is important here. We have to set the m_url member before
......
......@@ -73,7 +73,7 @@ public:
public slots:
// unused because we overwrite the default behaviour of openURL()
virtual bool openFile() { return true; }
virtual bool openURL( const KURL & );
virtual bool openURL( const KUrl & );
void openFile(QString filename);
void openFiles(const QStringList &filenames);
......
......@@ -137,11 +137,11 @@ void CervisiaShell::setupActions()
void CervisiaShell::openURL()
{
if( !m_lastOpenDir.isEmpty() )
m_part->openURL(KURL::fromPathOrURL(m_lastOpenDir));
m_part->openURL(KUrl::fromPathOrURL(m_lastOpenDir));
}
void CervisiaShell::openURL(const KURL& url)
void CervisiaShell::openURL(const KUrl& url)
{
m_part->openURL(url);
}
......
......@@ -41,7 +41,7 @@ public:
public slots:
void openURL();
void openURL(const KURL& url);
void openURL(const KUrl& url);
void slotConfigureKeys();
void slotConfigureToolBars();
......
......@@ -126,7 +126,7 @@ CheckoutDialog::CheckoutDialog(KConfig& cfg, CvsService_stub* service,
workdir_edit->setText(QDir::homePath());
workdir_edit->setMinimumWidth(fontMetrics().width('X') * 40);
KURLCompletion* comp = new KURLCompletion();
KUrlCompletion* comp = new KUrlCompletion();
workdir_edit->setCompletionObject(comp);
workdir_edit->setAutoDeleteCompletionObject(true);
connect( workdir_edit, SIGNAL(returnPressed(const QString&)),
......
......@@ -50,7 +50,7 @@ CvsInitDialog::CvsInitDialog(QWidget* parent, const char* name)
m_directoryEdit = new KLineEdit(mainWidget);
m_directoryEdit->setFocus();
KURLCompletion* comp = new KURLCompletion();
KUrlCompletion* comp = new KUrlCompletion();
m_directoryEdit->setCompletionObject(comp);
m_directoryEdit->setAutoDeleteCompletionObject(true);
......
......@@ -23,7 +23,7 @@
#include <kapplication.h>
#include <kcmdlineargs.h>
#include <klocale.h>
#include <kpassdlg.h>
#include <kpassworddialog.h>
#include <iostream>
......
......@@ -22,7 +22,7 @@
#include <kdebug.h>
#include <klocale.h>
#include <kpassdlg.h>
#include <kpassworddialog.h>
#include <sys/types.h>
#include <signal.h>
......
......@@ -27,7 +27,7 @@ using namespace Cervisia;
#include <kurl.h>
EditWithMenu::EditWithMenu(const KURL& url, QWidget* parent)
EditWithMenu::EditWithMenu(const KUrl& url, QWidget* parent)
: QObject(parent)
, m_menu(0)
, m_url(url)
......@@ -67,7 +67,7 @@ void EditWithMenu::itemActivated(int item)
{
KService::Ptr service = m_offers[item];
KURL::List list;
KUrl::List list;
list.append(m_url);
KRun::run(*service, list);
......
......@@ -37,7 +37,7 @@ class EditWithMenu : public QObject
Q_OBJECT
public:
EditWithMenu(const KURL& url, QWidget* parent);
EditWithMenu(const KUrl& url, QWidget* parent);
Q3PopupMenu* menu();
private slots:
......@@ -46,7 +46,7 @@ private slots:
private:
KTrader::OfferList m_offers;
Q3PopupMenu* m_menu;
KURL m_url;
KUrl m_url;
};
......
......@@ -432,7 +432,7 @@ void LogDialog::slotOk()
chmod(QFile::encodeName(tempFileName), 0400);
// open file in preferred editor
KURL url;
KUrl url;
url.setPath(tempFileName);
(void) new KRun(url, 0, true, false);
}
......
......@@ -193,7 +193,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
const KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
if( args->count() )
{
KURL directory = args->url(0);
KUrl directory = args->url(0);
shell->openURL(directory);
}
else
......
......@@ -250,7 +250,7 @@ void SettingsDialog::addGeneralPage()
layout->addWidget(usernameedit);
QLabel *cvspathlabel = new QLabel( i18n("&Path to CVS executable, or 'cvs':"), generalPage );
cvspathedit = new KURLRequester(generalPage);
cvspathedit = new KUrlRequester(generalPage);
cvspathlabel->setBuddy(cvspathedit);
layout->addWidget(cvspathlabel);
......@@ -293,7 +293,7 @@ void SettingsDialog::addDiffPage()
layout->addWidget(tabwidthedit, 2, 1);
QLabel *extdifflabel = new QLabel(i18n("External diff &frontend:"), diffPage);
extdiffedit = new KURLRequester(diffPage);
extdiffedit = new KUrlRequester(diffPage);
extdifflabel->setBuddy(extdiffedit);
layout->addWidget(extdifflabel, 3, 0);
......
......@@ -31,7 +31,7 @@ class KIntNumInput;
class KLineEdit;
class KConfig;
class KColorButton;
class KURLRequester;
class KUrlRequester;
class AdvancedPage;
......@@ -71,10 +71,10 @@ private:
KConfig *config;
KIntNumInput *contextedit;
KIntNumInput *tabwidthedit;
KURLRequester *cvspathedit;
KUrlRequester *cvspathedit;
KLineEdit *usernameedit;
KLineEdit *diffoptedit;
KURLRequester *extdiffedit;
KUrlRequester *extdiffedit;
QCheckBox *remotestatusbox;
QCheckBox *localstatusbox;
FontButton* m_protocolFontBox;
......
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