Some KURL*->KUrl*

svn path=/trunk/KDE/kdebase/konqueror/; revision=501545
This commit is contained in:
Laurent Montel 2006-01-23 11:01:30 +00:00
parent 68a0c9affb
commit 64fda17ca2
27 changed files with 45 additions and 45 deletions

View file

@ -32,7 +32,7 @@ class KUser;
class KEmailSettings;
class QEvent;
class QObject;
class KURL;
class KUrl;
class Config;
/**

View file

@ -15,7 +15,7 @@ class QString;
class KPushButton;
class KQuery;
class KURL;
class KUrl;
class KfindTabWidget;
class Kfind: public QWidget

View file

@ -14,7 +14,7 @@
class QString;
class KQuery;
class KURL;
class KUrl;
class KFileItem;
class KfindTabWidget;
class KfindWindow;

View file

@ -577,7 +577,7 @@ bool clientApp::doIt()
KURL::List srcLst;
if (argc == 1) {
while(true) {
KURL src = KURLRequesterDlg::getURL();
KURL src = KUrlRequesterDlg::getURL();
if (!src.isEmpty()) {
if (!src.isValid()) {
KMessageBox::error(0, i18n("Unable to download from an invalid URL."));

View file

@ -1414,7 +1414,7 @@ void KonqMainWindow::slotOpenLocation()
// Don't pre-fill the url, as it is auto-selected and thus overwrites the
// X clipboard, making it impossible to paste in the url you really wanted.
// Another example of why the X clipboard sux
KURLRequesterDlg dlg( QString::null, this, 0, true);
KUrlRequesterDlg dlg( QString::null, this, 0, true);
dlg.setCaption( i18n("Open Location") );
// Set current directory for relative paths.
// Testcase: konqueror www.kde.org; Ctrl+O; file in $HOME; would open http://$file
@ -2892,7 +2892,7 @@ bool KonqMainWindow::askForTarget(const QString& text, KURL& url)
{
const KURL initialUrl = (viewCount()==2) ? otherView(m_currentView)->url() : m_currentView->url();
QString label = text.arg( m_currentView->url().pathOrURL() );
KURLRequesterDlg dlg(initialUrl.pathOrURL(), label, this, "urlrequester", true);
KUrlRequesterDlg dlg(initialUrl.pathOrURL(), label, this, "urlrequester", true);
dlg.setCaption(i18n("Enter Target"));
dlg.urlRequester()->setMode( KFile::File | KFile::ExistingOnly | KFile::Directory );
if (dlg.exec())
@ -2909,7 +2909,7 @@ bool KonqMainWindow::askForTarget(const QString& text, KURL& url)
return false;
}
void KonqMainWindow::slotRequesterClicked( KURLRequester *req )
void KonqMainWindow::slotRequesterClicked( KUrlRequester *req )
{
req->fileDialog()->setMode(KFile::Directory|KFile::ExistingOnly);
}
@ -3184,7 +3184,7 @@ void KonqMainWindow::initCombo()
connect( m_combo, SIGNAL(showPageSecurity()),
this, SLOT(showPageSecurity()) );
m_pURLCompletion = new KURLCompletion();
m_pURLCompletion = new KUrlCompletion();
m_pURLCompletion->setCompletionMode( s_pCompletion->completionMode() );
// This only turns completion off. ~ is still there in the result

View file

@ -79,7 +79,7 @@ class ViewModeGUIClient;
class KonqMainWindowIface;
class KonqDirPart;
class KonqRun;
class KURLRequester;
class KUrlRequester;
class KZip;
struct HistoryEntry;
@ -544,7 +544,7 @@ protected:
bool askForTarget(const QString& text, KURL& url);
private Q_SLOTS:
void slotRequesterClicked( KURLRequester * );
void slotRequesterClicked( KUrlRequester * );
void slotIntro();
/**
* Loads the url displayed currently in the lineedit of the locationbar, by
@ -727,7 +727,7 @@ private:
QLabel* m_locationLabel;
QPointer<KonqCombo> m_combo;
static KConfig *s_comboConfig;
KURLCompletion *m_pURLCompletion;
KUrlCompletion *m_pURLCompletion;
// just a reference to KonqHistoryManager's completionObject
static KCompletion *s_pCompletion;

View file

@ -19,7 +19,7 @@
#include <kparts/plugin.h>
class KURL;
class KUrl;
class KInstance;
/**

View file

@ -110,7 +110,7 @@
</size>
</property>
</spacer>
<widget class="KURLRequester">
<widget class="KUrlRequester">
<property name="name">
<cstring>urlRequester</cstring>
</property>

View file

@ -31,7 +31,7 @@
#include <kservice.h>
class KURL;
class KUrl;
class KURISearchFilterEngine

View file

@ -119,7 +119,7 @@ Automatic detection is performed using the &lt;b&gt;Web Proxy Auto-Discovery Pro
</size>
</property>
</spacer>
<widget class="KURLRequester">
<widget class="KUrlRequester">
<property name="name">
<cstring>location</cstring>
</property>

View file

@ -59,12 +59,12 @@ KSocksConfig::KSocksConfig(KInstance *inst, QWidget *parent)
connect(base->bg, SIGNAL(clicked(int)), this, SLOT(methodChanged(int)));
// The custom library
connect(base->_c_customPath, SIGNAL(openFileDialog(KURLRequester *)), this, SLOT(chooseCustomLib(KURLRequester *)));
connect(base->_c_customPath, SIGNAL(openFileDialog(KUrlRequester *)), this, SLOT(chooseCustomLib(KUrlRequester *)));
connect(base->_c_customPath, SIGNAL(textChanged(const QString&)),
this, SLOT(customPathChanged(const QString&)));
// Additional libpaths
connect(base->_c_newPath, SIGNAL(openFileDialog(KURLRequester *)), this, SLOT(chooseCustomLib(KURLRequester *)));
connect(base->_c_newPath, SIGNAL(openFileDialog(KUrlRequester *)), this, SLOT(chooseCustomLib(KUrlRequester *)));
connect(base->_c_newPath, SIGNAL(returnPressed(const QString&)),
this, SLOT(addThisLibrary(const QString&)));
connect(base->_c_newPath, SIGNAL(textChanged(const QString&)),
@ -140,7 +140,7 @@ void KSocksConfig::testClicked()
}
void KSocksConfig::chooseCustomLib(KURLRequester * url)
void KSocksConfig::chooseCustomLib(KUrlRequester * url)
{
url->setMode( KFile::Directory );
/* QString newFile = KFileDialog::getOpenFileName();

View file

@ -56,7 +56,7 @@ private Q_SLOTS:
void enableChanged();
void methodChanged(int id);
void testClicked();
void chooseCustomLib(KURLRequester *url);
void chooseCustomLib(KUrlRequester *url);
void customPathChanged(const QString&);
void addLibrary();
void libTextChanged(const QString& lib);

View file

@ -123,7 +123,7 @@
<cstring>_c_customPath</cstring>
</property>
</widget>
<widget class="KURLRequester">
<widget class="KUrlRequester">
<property name="name">
<cstring>_c_customPath</cstring>
</property>
@ -207,7 +207,7 @@
<string>This is the list of additional paths that will be searched.</string>
</property>
</widget>
<widget class="KURLRequester">
<widget class="KUrlRequester">
<property name="name">
<cstring>_c_newPath</cstring>
</property>

View file

@ -125,7 +125,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, QString group, KInstance *
label = new QLabel(i18n("Home &URL:"), this);
hlay->addWidget( label );
homeURL = new KURLRequester(this);
homeURL = new KUrlRequester(this);
homeURL->setMode(KFile::Directory);
homeURL->setCaption(i18n("Select Home Folder"));
hlay->addWidget( homeURL );

View file

@ -30,7 +30,7 @@ class QSpinBox;
class Q3VButtonGroup;
class KConfig;
class KURLRequester;
class KUrlRequester;
//-----------------------------------------------------------------------------
@ -59,7 +59,7 @@ private:
QLabel *winPixmap;
KURLRequester *homeURL;
KUrlRequester *homeURL;
Q3VButtonGroup *bgOneProcess;
//QLabel *fileTips;

View file

@ -76,7 +76,7 @@ DesktopPathConfig::DesktopPathConfig(KInstance *inst, QWidget *parent )
row++;
tmpLabel = new QLabel(i18n("Des&ktop path:"), this);
lay->addWidget(tmpLabel, row, 0);
urDesktop = new KURLRequester(this);
urDesktop = new KUrlRequester(this);
urDesktop->setMode( KFile::Directory );
tmpLabel->setBuddy( urDesktop );
lay->addMultiCellWidget(urDesktop, row, row, 1, RO_LASTCOL);
@ -91,7 +91,7 @@ DesktopPathConfig::DesktopPathConfig(KInstance *inst, QWidget *parent )
row++;
tmpLabel = new QLabel(i18n("A&utostart path:"), this);
lay->addWidget(tmpLabel, row, 0);
urAutostart = new KURLRequester(this);
urAutostart = new KUrlRequester(this);
urAutostart->setMode( KFile::Directory );
tmpLabel->setBuddy( urAutostart );
lay->addMultiCellWidget(urAutostart, row, row, 1, RO_LASTCOL);
@ -107,7 +107,7 @@ DesktopPathConfig::DesktopPathConfig(KInstance *inst, QWidget *parent )
row++;
tmpLabel = new QLabel(i18n("D&ocuments path:"), this);
lay->addWidget(tmpLabel, row, 0);
urDocument = new KURLRequester(this);
urDocument = new KUrlRequester(this);
urDocument->setMode( KFile::Directory );
tmpLabel->setBuddy( urDocument );
lay->addMultiCellWidget(urDocument, row, row, 1, RO_LASTCOL);

View file

@ -25,7 +25,7 @@ class QPushButton;
class KConfig;
class KListView;
class KURLRequester;
class KUrlRequester;
namespace KIO { class Job; }
@ -47,9 +47,9 @@ private Q_SLOTS:
private:
// Desktop Paths
KURLRequester *urDesktop;
KURLRequester *urAutostart;
KURLRequester *urDocument;
KUrlRequester *urDesktop;
KUrlRequester *urAutostart;
KUrlRequester *urDocument;
bool moveDir( const KURL & src, const KURL & dest, const QString & type );
bool m_ok;

View file

@ -116,7 +116,7 @@ KJavaOptions::KJavaOptions( KConfig* config, QString group,
pathHB->setSpacing( 10 );
QLabel* pathLA = new QLabel( i18n( "&Path to Java executable, or 'java':" ),
pathHB );
pathED = new KURLRequester( pathHB );
pathED = new KUrlRequester( pathHB );
connect( pathED, SIGNAL(textChanged( const QString& )), this, SLOT(slotChanged()) );
pathLA->setBuddy( pathED );

View file

@ -23,7 +23,7 @@
class KColorButton;
class KConfig;
class KListView;
class KURLRequester;
class KUrlRequester;
class KIntNumInput;
class QCheckBox;
@ -112,7 +112,7 @@ private:
QCheckBox* enableShutdownCB;
KIntNumInput* serverTimeoutSB;
QLineEdit* addArgED;
KURLRequester* pathED;
KUrlRequester* pathED;
bool _removeJavaDomainSettings;
JavaDomainListView *domainSpecific;

View file

@ -17,7 +17,7 @@
class KColorButton;
class KConfig;
class KURLRequester;
class KUrlRequester;
class QCheckBox;
class QComboBox;
class QLineEdit;

View file

@ -128,7 +128,7 @@
<string>&amp;New</string>
</property>
</widget>
<widget class="KURLRequester" row="0" column="0" rowspan="1" colspan="2">
<widget class="KUrlRequester" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>dirEdit</cstring>
</property>

View file

@ -28,7 +28,7 @@
class QWidget;
class QPainter;
class QCustomEvent;
class KURL;
class KUrl;
class KonqSidebar;

View file

@ -490,7 +490,7 @@ void Sidebar_Widget::slotSetName( )
void Sidebar_Widget::slotSetURL( )
{
KURLRequesterDlg dlg( m_currentButton->URL, i18n("Enter a URL:"), this, "url_dlg" );
KUrlRequesterDlg dlg( m_currentButton->URL, i18n("Enter a URL:"), this, "url_dlg" );
dlg.fileDialog()->setMode( KFile::Directory );
if (dlg.exec())
{

View file

@ -557,7 +557,7 @@ void KURLDesktopFileDlg::initDialog( const QString& textFileName, const QString&
KHBox * urlBox = new KHBox( plainPage() );
topLayout->addWidget( urlBox );
label = new QLabel( textUrl, urlBox );
m_urlRequester = new KURLRequester( defaultUrl, urlBox);
m_urlRequester = new KUrlRequester( defaultUrl, urlBox);
m_urlRequester->setObjectName("urlRequester");
m_urlRequester->setMode( KFile::File | KFile::Directory );

View file

@ -34,7 +34,7 @@ namespace KIO { class Job; }
class KDirWatch;
class KLineEdit;
class KURLRequester;
class KUrlRequester;
/**
* The 'New' submenu, both for the File menu and the RMB popup menu.
@ -180,7 +180,7 @@ private:
/**
* @internal
* Dialog to ask for a filename and a URL, when creating a link to a URL.
* Basically a merge of KLineEditDlg and KURLRequesterDlg ;)
* Basically a merge of KLineEditDlg and KUrlRequesterDlg ;)
* @author David Faure <faure@kde.org>
*/
class KURLDesktopFileDlg : public KDialogBase
@ -214,7 +214,7 @@ private:
/**
* The URL requester for the URL :)
*/
KURLRequester *m_urlRequester;
KUrlRequester *m_urlRequester;
/**
* True if the filename was manually edited.

View file

@ -73,7 +73,7 @@ KonqBgndDialog::KonqBgndDialog( QWidget* parent,
// picture
m_radioPicture = new QRadioButton( i18n("&Picture:"), m_buttonGroup );
groupLayout->addWidget( m_radioPicture, 1, 0 );
m_comboPicture = new KURLComboRequester( m_buttonGroup );
m_comboPicture = new KUrlComboRequester( m_buttonGroup );
groupLayout->addMultiCellWidget( m_comboPicture, 1, 1, 1, 2 );
initPictures();

View file

@ -27,7 +27,7 @@
#include <kdialog.h>
class KColorButton;
class KURLRequester;
class KUrlRequester;
class QGroupBox;
class QRadioButton;
class QFrame;
@ -67,7 +67,7 @@ private:
QGroupBox* m_buttonGroup;
QRadioButton* m_radioColor;
QRadioButton* m_radioPicture;
KURLRequester* m_comboPicture;
KUrlRequester* m_comboPicture;
KColorButton* m_buttonColor;
};