projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: avoid de-duplication of user's CXXFLAGS
[quassel.git]
/
src
/
qtui
/
mainwin.cpp
diff --git
a/src/qtui/mainwin.cpp
b/src/qtui/mainwin.cpp
index
84246b8
..
84a3a84
100644
(file)
--- a/
src/qtui/mainwin.cpp
+++ b/
src/qtui/mainwin.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-202
0
by the Quassel Project *
+ * Copyright (C) 2005-202
2
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-809,7
+809,7
@@
void MainWin::changeActiveBufferView(int bufferViewId)
void MainWin::showPasswordChangeDlg()
{
if (Client::isCoreFeatureEnabled(Quassel::Feature::PasswordChange)) {
void MainWin::showPasswordChangeDlg()
{
if (Client::isCoreFeatureEnabled(Quassel::Feature::PasswordChange)) {
- PasswordChangeDlg{}.exec();
+ PasswordChangeDlg{
this
}.exec();
}
else {
QMessageBox box(QMessageBox::Warning,
}
else {
QMessageBox box(QMessageBox::Warning,
@@
-918,17
+918,17
@@
void MainWin::hideCurrentBuffer()
void MainWin::showNotificationsDlg()
{
void MainWin::showNotificationsDlg()
{
- SettingsPageDlg{new NotificationsSettingsPage{}}.exec();
+ SettingsPageDlg{new NotificationsSettingsPage{}
, this
}.exec();
}
void MainWin::onConfigureNetworksTriggered()
{
}
void MainWin::onConfigureNetworksTriggered()
{
- SettingsPageDlg{new NetworksSettingsPage{}}.exec();
+ SettingsPageDlg{new NetworksSettingsPage{}
, this
}.exec();
}
void MainWin::onConfigureViewsTriggered()
{
}
void MainWin::onConfigureViewsTriggered()
{
- SettingsPageDlg{new BufferViewSettingsPage{}}.exec();
+ SettingsPageDlg{new BufferViewSettingsPage{}
, this
}.exec();
}
void MainWin::onLockLayoutToggled(bool lock)
}
void MainWin::onLockLayoutToggled(bool lock)
@@
-1355,7
+1355,7
@@
void MainWin::setDisconnectedState()
void MainWin::userAuthenticationRequired(CoreAccount* account, bool* valid, const QString& errorMessage)
{
Q_UNUSED(errorMessage)
void MainWin::userAuthenticationRequired(CoreAccount* account, bool* valid, const QString& errorMessage)
{
Q_UNUSED(errorMessage)
- CoreConnectAuthDlg dlg(account);
+ CoreConnectAuthDlg dlg(account
, this
);
*valid = (dlg.exec() == QDialog::Accepted);
}
*valid = (dlg.exec() == QDialog::Accepted);
}
@@
-1384,8
+1384,14
@@
void MainWin::handleNoSslInCore(bool* accepted)
void MainWin::handleSslErrors(const QSslSocket* socket, bool* accepted, bool* permanently)
{
QString errorString = "<ul>";
void MainWin::handleSslErrors(const QSslSocket* socket, bool* accepted, bool* permanently)
{
QString errorString = "<ul>";
- foreach (const QSslError error, socket->sslErrors())
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
+ for (const auto& error : socket->sslErrors()) {
+#else
+ for (const auto& error : socket->sslHandshakeErrors()) {
+#endif
errorString += QString("<li>%1</li>").arg(error.errorString());
errorString += QString("<li>%1</li>").arg(error.errorString());
+ }
errorString += "</ul>";
QMessageBox box(QMessageBox::Warning,
errorString += "</ul>";
QMessageBox box(QMessageBox::Warning,
@@
-1401,7
+1407,7
@@
void MainWin::handleSslErrors(const QSslSocket* socket, bool* accepted, bool* pe
box.exec();
role = box.buttonRole(box.clickedButton());
if (role == QMessageBox::HelpRole) {
box.exec();
role = box.buttonRole(box.clickedButton());
if (role == QMessageBox::HelpRole) {
- SslInfoDlg dlg(socket);
+ SslInfoDlg dlg(socket
, this
);
dlg.exec();
}
} while (role == QMessageBox::HelpRole);
dlg.exec();
}
} while (role == QMessageBox::HelpRole);
@@
-1426,7
+1432,7
@@
void MainWin::handleCoreConnectionError(const QString& error)
void MainWin::showCoreConnectionDlg()
{
void MainWin::showCoreConnectionDlg()
{
- CoreConnectDlg dlg;
+ CoreConnectDlg dlg
{this}
;
if (dlg.exec() == QDialog::Accepted) {
AccountId accId = dlg.selectedAccount();
if (accId.isValid())
if (dlg.exec() == QDialog::Accepted) {
AccountId accId = dlg.selectedAccount();
if (accId.isValid())
@@
-1474,7
+1480,7
@@
void MainWin::showChannelList(NetworkId netId, const QString& channelFilters, bo
void MainWin::showNetworkConfig(NetworkId netId)
{
void MainWin::showNetworkConfig(NetworkId netId)
{
- SettingsPageDlg dlg{new NetworksSettingsPage{}};
+ SettingsPageDlg dlg{new NetworksSettingsPage{}
, this
};
if (netId.isValid())
qobject_cast<NetworksSettingsPage*>(dlg.currentPage())->bufferList_Open(netId);
dlg.exec();
if (netId.isValid())
qobject_cast<NetworksSettingsPage*>(dlg.currentPage())->bufferList_Open(netId);
dlg.exec();
@@
-1482,7
+1488,7
@@
void MainWin::showNetworkConfig(NetworkId netId)
void MainWin::showIgnoreList(QString newRule)
{
void MainWin::showIgnoreList(QString newRule)
{
- SettingsPageDlg dlg{new IgnoreListSettingsPage{}};
+ SettingsPageDlg dlg{new IgnoreListSettingsPage{}
, this
};
// prepare config dialog for new rule
if (!newRule.isEmpty())
qobject_cast<IgnoreListSettingsPage*>(dlg.currentPage())->editIgnoreRule(newRule);
// prepare config dialog for new rule
if (!newRule.isEmpty())
qobject_cast<IgnoreListSettingsPage*>(dlg.currentPage())->editIgnoreRule(newRule);
@@
-1491,7
+1497,7
@@
void MainWin::showIgnoreList(QString newRule)
void MainWin::showCoreInfoDlg()
{
void MainWin::showCoreInfoDlg()
{
- CoreInfoDlg{}.exec();
+ CoreInfoDlg{
this
}.exec();
}
void MainWin::showAwayLog()
}
void MainWin::showAwayLog()
@@
-1513,7
+1519,7
@@
void MainWin::awayLogDestroyed()
void MainWin::showSettingsDlg()
{
void MainWin::showSettingsDlg()
{
- auto dlg = new SettingsDlg();
+ auto dlg = new SettingsDlg(
this
);
// Category: Interface
dlg->registerSettingsPage(new AppearanceSettingsPage(dlg));
// Category: Interface
dlg->registerSettingsPage(new AppearanceSettingsPage(dlg));
@@
-1558,7
+1564,7
@@
void MainWin::showSettingsDlg()
void MainWin::showAboutDlg()
{
void MainWin::showAboutDlg()
{
- AboutDlg{}.exec();
+ AboutDlg{
this
}.exec();
}
void MainWin::showShortcutsDlg()
}
void MainWin::showShortcutsDlg()
@@
-1570,7
+1576,7
@@
void MainWin::showShortcutsDlg()
}
dlg.configure(true);
#else
}
dlg.configure(true);
#else
- SettingsPageDlg{new ShortcutsSettingsPage{QtUi::actionCollections()}}.exec();
+ SettingsPageDlg{new ShortcutsSettingsPage{QtUi::actionCollections()}
, this
}.exec();
#endif
}
#endif
}
@@
-1689,7
+1695,7
@@
void MainWin::messagesInserted(const QModelIndex& parent, int start, int end)
if (hasFocus && bufId == Client::bufferModel()->currentBuffer())
continue;
if (hasFocus && bufId == Client::bufferModel()->currentBuffer())
continue;
- // only show notifications for higlights or queries
+ // only show notifications for hig
h
lights or queries
if (bufType != BufferInfo::QueryBuffer && !(flags & Message::Highlight))
continue;
if (bufType != BufferInfo::QueryBuffer && !(flags & Message::Highlight))
continue;