Commit f6b30d12 authored by David Faure's avatar David Faure
Browse files

Patch by Roberto Raggi to replace show reimplementations with showEvent or...

Patch by Roberto Raggi to replace show reimplementations with showEvent or setVisible, since show isn't virtual in Qt4.

svn path=/trunk/KDE/kdebase/konqueror/; revision=646824
parent 39f1420d
......@@ -149,11 +149,11 @@ void KonqExtensionManager::slotUser1()
setChanged(false);
}
void KonqExtensionManager::show()
void KonqExtensionManager::showEvent(QShowEvent *event)
{
d->pluginSelector->load();
KDialog::show();
KDialog::showEvent(event);
}
#include "konq_extensionmanager.moc"
......@@ -48,7 +48,9 @@ class KonqExtensionManager : public KDialog
void slotApply();
void slotDefault();
void slotUser1();
virtual void show();
protected:
virtual void showEvent(QShowEvent *event);
private:
KonqExtensionManagerPrivate *d;
......
......@@ -4539,7 +4539,7 @@ void KonqMainWindow::setCaption( const QString &caption )
}
}
void KonqMainWindow::show()
void KonqMainWindow::showEvent(QShowEvent *event)
{
// We need to check if our toolbars are shown/hidden here, and set
// our menu items accordingly. We can't do it in the constructor because
......@@ -4549,7 +4549,7 @@ void KonqMainWindow::show()
updateBookmarkBar(); // hide if empty
// Call parent method
KParts::MainWindow::show();
KParts::MainWindow::showEvent(event);
}
QString KonqExtendedBookmarkOwner::currentUrl() const
......
......@@ -199,11 +199,6 @@ public:
/// Overloaded of KMainWindow
virtual void setCaption( const QString &caption );
/**
* Reimplemented for internal reasons. The API is not affected.
*/
virtual void show();
/**
* Change URL displayed in the location bar
*/
......@@ -522,7 +517,12 @@ protected Q_SLOTS:
protected:
virtual bool eventFilter(QObject*obj,QEvent *ev);
/**
* Reimplemented for internal reasons. The API is not affected.
*/
virtual void showEvent(QShowEvent *event);
void fillHistoryPopup( QMenu *menu, const QList<HistoryEntry*> &history );
bool makeViewsFollow( const KUrl & url, const KParts::URLArgs &args, const QString & serviceType,
......
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