Commit 34d13c4f authored by Stephan Kulow's avatar Stephan Kulow
Browse files

deprecated--

svn path=/trunk/KDE/kdebase/konqueror/; revision=537398
parent dc33796a
...@@ -255,7 +255,7 @@ QWidget * KonqLogoAction::createToolBarWidget( QToolBar * parent ) ...@@ -255,7 +255,7 @@ QWidget * KonqLogoAction::createToolBarWidget( QToolBar * parent )
/////////// ///////////
KonqViewModeAction::KonqViewModeAction( const QString& desktopEntryName, KonqViewModeAction::KonqViewModeAction( const QString& desktopEntryName,
const QString &text, const QString &icon, const QString &text, const KIcon &icon,
KActionCollection *parent, const char *name ) KActionCollection *parent, const char *name )
: KAction( icon, text, parent, name ), : KAction( icon, text, parent, name ),
m_desktopEntryName( desktopEntryName ) m_desktopEntryName( desktopEntryName )
......
...@@ -98,7 +98,7 @@ class KonqViewModeAction : public KAction, public QActionWidgetFactory ...@@ -98,7 +98,7 @@ class KonqViewModeAction : public KAction, public QActionWidgetFactory
Q_OBJECT Q_OBJECT
public: public:
KonqViewModeAction( const QString& desktopEntryName, KonqViewModeAction( const QString& desktopEntryName,
const QString &text, const QString &icon, const QString &text, const KIcon &icon,
KActionCollection *parent, const char *name ); KActionCollection *parent, const char *name );
virtual ~KonqViewModeAction(); virtual ~KonqViewModeAction();
......
...@@ -4899,7 +4899,7 @@ void KonqMainWindow::updateViewModeActions() ...@@ -4899,7 +4899,7 @@ void KonqMainWindow::updateViewModeActions()
{ {
// default service on this action: the current one (i.e. the first one) // default service on this action: the current one (i.e. the first one)
QString text = itname; QString text = itname;
QString icon = (*it)->icon(); QString icon((*it)->icon());
QString desktopEntryName = (*it)->desktopEntryName(); QString desktopEntryName = (*it)->desktopEntryName();
// if we previously changed the viewmode (see slotViewModeToggle!) // if we previously changed the viewmode (see slotViewModeToggle!)
...@@ -4929,7 +4929,7 @@ void KonqMainWindow::updateViewModeActions() ...@@ -4929,7 +4929,7 @@ void KonqMainWindow::updateViewModeActions()
KonqViewModeAction *tbAction = new KonqViewModeAction( desktopEntryName, KonqViewModeAction *tbAction = new KonqViewModeAction( desktopEntryName,
text, text,
icon, KIcon(icon),
actionCollection(), actionCollection(),
desktopEntryName.prepend( "viewmode_" ).toLatin1() ); // prefix to avoid conflicts in the actioncollection desktopEntryName.prepend( "viewmode_" ).toLatin1() ); // prefix to avoid conflicts in the actioncollection
......
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