mirror of
https://bitbucket.org/smil3y/kdelibs.git
synced 2025-02-23 18:32:49 +00:00
kfile: do not store the custom protocols in KUrlNavigator
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
dd88037d22
commit
5301a82e4c
3 changed files with 8 additions and 5 deletions
|
@ -169,7 +169,6 @@ public:
|
|||
QList<KUrlNavigatorButton*> m_navButtons;
|
||||
KUrlNavigatorButtonBase* m_toggleEditableMode;
|
||||
KUrl m_homeUrl;
|
||||
QStringList m_customProtocols;
|
||||
KUrlNavigator* q;
|
||||
};
|
||||
|
||||
|
@ -188,7 +187,6 @@ KUrlNavigator::Private::Private(KUrlNavigator* q, KFilePlacesModel* placesModel)
|
|||
m_navButtons(),
|
||||
m_toggleEditableMode(0),
|
||||
m_homeUrl(),
|
||||
m_customProtocols(QStringList()),
|
||||
q(q)
|
||||
{
|
||||
m_layout->setSpacing(0);
|
||||
|
@ -1112,13 +1110,12 @@ KUrlComboBox* KUrlNavigator::editor() const
|
|||
|
||||
void KUrlNavigator::setCustomProtocols(const QStringList &protocols)
|
||||
{
|
||||
d->m_customProtocols = protocols;
|
||||
d->m_protocols->setCustomProtocols(d->m_customProtocols);
|
||||
d->m_protocols->setCustomProtocols(protocols);
|
||||
}
|
||||
|
||||
QStringList KUrlNavigator::customProtocols() const
|
||||
{
|
||||
return d->m_customProtocols;
|
||||
return d->m_protocols->customProtocols();
|
||||
}
|
||||
|
||||
#include "moc_kurlnavigator.cpp"
|
||||
|
|
|
@ -62,6 +62,11 @@ void KUrlNavigatorProtocolCombo::setCustomProtocols(const QStringList& protocols
|
|||
}
|
||||
}
|
||||
|
||||
QStringList KUrlNavigatorProtocolCombo::customProtocols() const
|
||||
{
|
||||
return m_protocols;
|
||||
}
|
||||
|
||||
QSize KUrlNavigatorProtocolCombo::sizeHint() const
|
||||
{
|
||||
const QSize size = KUrlNavigatorButtonBase::sizeHint();
|
||||
|
|
|
@ -48,6 +48,7 @@ public:
|
|||
QString currentProtocol() const;
|
||||
|
||||
void setCustomProtocols(const QStringList &protocols);
|
||||
QStringList customProtocols() const;
|
||||
|
||||
virtual QSize sizeHint() const;
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue