Commit f9b7b235 authored by David Faure's avatar David Faure

Fix deprecation warnings

parent 4a256e9b
...@@ -108,7 +108,7 @@ KonqHistoryView::KonqHistoryView(QWidget *parent) ...@@ -108,7 +108,7 @@ KonqHistoryView::KonqHistoryView(QWidget *parent)
connect(sortGroup, &QActionGroup::triggered, this, &KonqHistoryView::slotSortChange); connect(sortGroup, &QActionGroup::triggered, this, &KonqHistoryView::slotSortChange);
m_searchLineEdit = new KLineEdit(this); m_searchLineEdit = new KLineEdit(this);
m_searchLineEdit->setClickMessage(i18n("Search in history")); m_searchLineEdit->setPlaceholderText(i18n("Search in history"));
m_searchLineEdit->setClearButtonShown(true); m_searchLineEdit->setClearButtonShown(true);
connect(m_searchLineEdit, &KLineEdit::textChanged, this, &KonqHistoryView::slotFilterTextChanged); connect(m_searchLineEdit, &KLineEdit::textChanged, this, &KonqHistoryView::slotFilterTextChanged);
......
...@@ -242,13 +242,6 @@ void SessionRestoreDialog::slotClicked(bool checked) ...@@ -242,13 +242,6 @@ void SessionRestoreDialog::slotClicked(bool checked)
m_dontShowChecked = checked; m_dontShowChecked = checked;
} }
static void setCheckState(QTreeWidgetItem *item, int column, Qt::CheckState state)
{
const bool blocked = item->treeWidget()->blockSignals(true);
item->setCheckState(column, state);
item->treeWidget()->blockSignals(blocked);
}
void SessionRestoreDialog::slotItemChanged(QTreeWidgetItem *item, int column) void SessionRestoreDialog::slotItemChanged(QTreeWidgetItem *item, int column)
{ {
Q_ASSERT(item); Q_ASSERT(item);
......
...@@ -614,14 +614,14 @@ KonqFrameBase *KonqFrameTabs::currentTab() const ...@@ -614,14 +614,14 @@ KonqFrameBase *KonqFrameTabs::currentTab() const
bool KonqFrameTabs::eventFilter(QObject *watched, QEvent *event) bool KonqFrameTabs::eventFilter(QObject *watched, QEvent *event)
{ {
if (KonqSettings::mouseMiddleClickClosesTab()) { if (KonqSettings::mouseMiddleClickClosesTab()) {
KTabBar *bar = qobject_cast<KTabBar *>(tabBar()); QTabBar *bar = tabBar();
if (watched == bar && if (watched == bar &&
(event->type() == QEvent::MouseButtonPress || (event->type() == QEvent::MouseButtonPress ||
event->type() == QEvent::MouseButtonRelease)) { event->type() == QEvent::MouseButtonRelease)) {
QMouseEvent *e = static_cast<QMouseEvent *>(event); QMouseEvent *e = static_cast<QMouseEvent *>(event);
if (e->button() == Qt::MidButton) { if (e->button() == Qt::MidButton) {
if (event->type() == QEvent::MouseButtonRelease) { if (event->type() == QEvent::MouseButtonRelease) {
const int index = bar->selectTab(e->pos()); const int index = bar->tabAt(e->pos());
slotCloseRequest(widget(index)); slotCloseRequest(widget(index));
} }
e->accept(); e->accept();
......
...@@ -952,15 +952,13 @@ void KonqViewManager::loadViewConfigFromGroup(const KConfigGroup &profileGroup, ...@@ -952,15 +952,13 @@ void KonqViewManager::loadViewConfigFromGroup(const KConfigGroup &profileGroup,
} }
// Window size // Window size
if (!m_pMainWindow->initialGeometrySet()) { if (profileGroup.readEntry("FullScreen", false)) {
if (profileGroup.readEntry("FullScreen", false)) { // Full screen on
// Full screen on m_pMainWindow->setWindowState(m_pMainWindow->windowState() | Qt::WindowFullScreen);
m_pMainWindow->setWindowState(m_pMainWindow->windowState() | Qt::WindowFullScreen); } else {
} else { // Full screen off
// Full screen off m_pMainWindow->setWindowState(m_pMainWindow->windowState() & ~Qt::WindowFullScreen);
m_pMainWindow->setWindowState(m_pMainWindow->windowState() & ~Qt::WindowFullScreen); applyWindowSize(profileGroup);
applyWindowSize(profileGroup);
}
} }
//qDebug() << "done"; //qDebug() << "done";
......
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