From bb3a67b3ec63c2bf0cfd9095051f82bb6945d60f Mon Sep 17 00:00:00 2001 From: Sirius Bakke Date: Mon, 22 Jul 2019 17:08:51 +0000 Subject: [PATCH] fix: Stop using deprecated Qt methods --- src/import/PFImporter.cpp | 2 +- src/import/objectSignature.cpp | 4 +- src/libgui/ActionsDialog.cpp | 2 +- src/libgui/AskLibForCopyDialog.cpp | 2 +- src/libgui/ClusterDialog.cpp | 4 +- src/libgui/ClusterGroupDialog.cpp | 8 ++-- src/libgui/ClusterInterfaceWidget.cpp | 6 +-- .../ClusterInterfacesSelectorWidget.cpp | 2 +- src/libgui/DynamicGroupDialog.cpp | 4 +- src/libgui/FWObjectDrag.cpp | 2 +- src/libgui/FWObjectDropArea.cpp | 2 +- src/libgui/FWWindowPrint.cpp | 2 +- src/libgui/FindObjectWidget.cpp | 4 +- src/libgui/FindWhereUsedWidget.cpp | 2 +- src/libgui/FirewallDialog.cpp | 8 ++-- src/libgui/FirewallInstallerCisco.cpp | 2 +- src/libgui/FirewallInstallerJuniper.cpp | 2 +- src/libgui/FirewallInstallerProcurve.cpp | 2 +- src/libgui/FirewallInstallerUnx.cpp | 2 +- src/libgui/FirewallSelectorWidget.cpp | 10 ++--- src/libgui/GroupObjectDialog.cpp | 2 +- src/libgui/HostDialog.cpp | 2 +- src/libgui/IPv4Dialog.cpp | 4 +- src/libgui/IPv6Dialog.cpp | 4 +- src/libgui/InterfaceDialog.cpp | 8 ++-- src/libgui/InterfaceEditorWidget.cpp | 6 +-- src/libgui/KeywordsDialog.cpp | 2 +- src/libgui/LibExportDialog.cpp | 2 +- src/libgui/ObjectIconView.cpp | 4 +- src/libgui/ObjectListView.cpp | 4 +- src/libgui/ObjectManipulator.cpp | 4 +- src/libgui/ObjectManipulator_create_new.cpp | 4 +- src/libgui/ObjectManipulator_ops.cpp | 8 ++-- src/libgui/ObjectManipulator_slots.cpp | 2 +- src/libgui/ObjectTreeView.cpp | 2 +- src/libgui/PrintingController.cpp | 4 +- src/libgui/ProjectPanel_file_ops.cpp | 40 +++++++++---------- src/libgui/RCS.cpp | 4 +- src/libgui/RuleSetModel.cpp | 4 +- src/libgui/RuleSetView.cpp | 14 +++---- src/libgui/SimpleTextEditor.cpp | 4 +- src/libgui/TextFileEditor.cpp | 10 ++--- src/libgui/clusterMembersDialog.cpp | 2 +- src/libgui/findDialog.cpp | 2 +- .../ChooseObjectsPage.cpp | 2 +- .../importAddressListWizard/FileNamePage.cpp | 4 +- .../IC_FileNamePage.cpp | 4 +- src/libgui/instDialog_compile.cpp | 2 +- src/libgui/instDialog_ui_ops.cpp | 2 +- src/libgui/linux24IfaceOptsDialog.cpp | 2 +- src/libgui/listOfLibrariesModel.cpp | 4 +- src/libgui/newClusterDialog.cpp | 2 +- src/libgui/newFirewallDialog.cpp | 20 +++++----- .../newFirewallDialog_from_template.cpp | 2 +- src/libgui/newHostDialog.cpp | 12 +++--- src/libgui/pixFailoverOptionsDialog.cpp | 2 +- src/libgui/pixosIfaceOptsDialog.cpp | 2 +- src/libgui/platforms.cpp | 2 +- src/libgui/secuwallosAdvancedDialog.cpp | 4 +- src/libgui/upgradePredicate.h | 2 +- src/libgui/utils.cpp | 6 +-- src/libgui/vlanOnlyIfaceOptsDialog.cpp | 2 +- src/libgui/vrrpOptionsDialog.cpp | 2 +- src/pflib/OSConfigurator_bsd_interfaces.cpp | 2 +- 64 files changed, 147 insertions(+), 147 deletions(-) diff --git a/src/import/PFImporter.cpp b/src/import/PFImporter.cpp index 8e9991f3e..8144e2577 100644 --- a/src/import/PFImporter.cpp +++ b/src/import/PFImporter.cpp @@ -482,7 +482,7 @@ void PFImporter::convertTcpFlags(QList &flags_list, "are not supported.")); } } - qSort(flags_list); + std::sort(begin(flags_list), end(flags_list)); } FWObject* PFImporter::makeAddressObj(AddressSpec &as) diff --git a/src/import/objectSignature.cpp b/src/import/objectSignature.cpp index d6ca0132e..2b786a483 100644 --- a/src/import/objectSignature.cpp +++ b/src/import/objectSignature.cpp @@ -926,8 +926,8 @@ void* ObjectSignature::dispatch(TCPService *obj, void*) flags = obj->getAllTCPFlagMasks(); for (it=flags.begin(); it!=flags.end(); ++it) flags_mask << *it; - qSort(flags_comp); - qSort(flags_mask); + std::sort(begin(flags_comp), end(flags_comp)); + std::sort(begin(flags_mask), end(flags_mask)); return this; } diff --git a/src/libgui/ActionsDialog.cpp b/src/libgui/ActionsDialog.cpp index 42817dc68..98f929311 100644 --- a/src/libgui/ActionsDialog.cpp +++ b/src/libgui/ActionsDialog.cpp @@ -145,7 +145,7 @@ void ActionsDialog::applyChanges() QMessageBox::information( this,"Firewall Builder", tr("Rule name for accounting is converted to the iptables\nchain name and therefore may not contain white space\nand special characters."), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); return; diff --git a/src/libgui/AskLibForCopyDialog.cpp b/src/libgui/AskLibForCopyDialog.cpp index 324dcc67d..2af938ce4 100644 --- a/src/libgui/AskLibForCopyDialog.cpp +++ b/src/libgui/AskLibForCopyDialog.cpp @@ -91,7 +91,7 @@ int AskLibForCopyDialog::addLib( FWObject *lib) string icn=":/Icons/"+lib->getTypeName()+"/icon-tree"; //Resources::global_res->getObjResourceStr(lib,"icon-tree").c_str(); QPixmap pm; - if ( ! QPixmapCache::find( icn.c_str(), pm) ) + if ( ! QPixmapCache::find( icn.c_str(), &pm) ) { pm.load( icn.c_str() ); QPixmapCache::insert( icn.c_str(), pm); diff --git a/src/libgui/ClusterDialog.cpp b/src/libgui/ClusterDialog.cpp index 430332c9b..d8ed81e8c 100644 --- a/src/libgui/ClusterDialog.cpp +++ b/src/libgui/ClusterDialog.cpp @@ -197,7 +197,7 @@ void ClusterDialog::validate(bool *res) QMessageBox::critical( this,"Firewall Builder", tr("Character \"/\" is not allowed in cluster object name"), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); blockSignals(false); } @@ -229,7 +229,7 @@ void ClusterDialog::applyChanges() blockSignals(true); autorename_chidren = (QMessageBox::warning( this,"Firewall Builder", dialog_txt, - tr("&Yes"), tr("&No"), QString::null, + tr("&Yes"), tr("&No"), QString(), 0, 1 )==0 ); blockSignals(false); } diff --git a/src/libgui/ClusterGroupDialog.cpp b/src/libgui/ClusterGroupDialog.cpp index a58d153e6..c643d2947 100644 --- a/src/libgui/ClusterGroupDialog.cpp +++ b/src/libgui/ClusterGroupDialog.cpp @@ -212,13 +212,13 @@ void ClusterGroupDialog::addIcon(FWObject *o, bool master) "/icon-ref").c_str(); QPixmap iface_pm; - if (!QPixmapCache::find(iface_icn_file, iface_pm)) + if (!QPixmapCache::find(iface_icn_file, &iface_pm)) { iface_pm.load(iface_icn_file); QPixmapCache::insert(iface_icn_file, iface_pm); } QPixmap fw_pm; - if (!QPixmapCache::find(fw_icn_file, fw_pm)) + if (!QPixmapCache::find(fw_icn_file, &fw_pm)) { fw_pm.load(fw_icn_file); QPixmapCache::insert(fw_icn_file, fw_pm); @@ -251,7 +251,7 @@ void ClusterGroupDialog::addIcon(FWObject *o, bool master) item->setText(col, tr("Invalid")); item->setToolTip( col, tr("Firewall %1 can not be used as a member of this cluster\n because its host OS or platform does not match those of the cluster.").arg(fw->getName().c_str())); - item->setBackgroundColor(col, QColor(255, 0, 0, 100)); + item->setBackground(col, QBrush(QColor(255, 0, 0, 100))); } item->setProperty("type", iface->getTypeName().c_str()); @@ -337,7 +337,7 @@ void ClusterGroupDialog::openClusterConfDialog() QMessageBox::critical( this, "Firewall Builder", tr("FWBuilder API error: %1").arg(ex.toString().c_str()), - tr("&Continue"), QString::null, QString::null, 0, 1); + tr("&Continue"), QString(), QString(), 0, 1); return; } } diff --git a/src/libgui/ClusterInterfaceWidget.cpp b/src/libgui/ClusterInterfaceWidget.cpp index 6acfe0670..33bfcd601 100644 --- a/src/libgui/ClusterInterfaceWidget.cpp +++ b/src/libgui/ClusterInterfaceWidget.cpp @@ -232,7 +232,7 @@ bool ClusterInterfaceWidget::isValid() QMessageBox::warning(this,"Firewall Builder", tr("Some of the cluster interfaces do not have any " "member firewall interface selected"), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); return false; } if (roots.values().contains(items.first())) @@ -242,7 +242,7 @@ bool ClusterInterfaceWidget::isValid() tr("Please select interface of the member firewall " "rather than the firewall object to be used " "with cluster interface"), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); return false; } if (!interfaceSelectable(ifacelist.list->selectedItems().first()->data(0, Qt::UserRole).value())) @@ -251,7 +251,7 @@ bool ClusterInterfaceWidget::isValid() QMessageBox::warning(this,"Firewall Builder", tr("%1 can not be used as cluster interface.") .arg(ifacelist.list->selectedItems().first()->text(0)), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); return false; } } diff --git a/src/libgui/ClusterInterfacesSelectorWidget.cpp b/src/libgui/ClusterInterfacesSelectorWidget.cpp index dcdbd647f..2415950e1 100644 --- a/src/libgui/ClusterInterfacesSelectorWidget.cpp +++ b/src/libgui/ClusterInterfacesSelectorWidget.cpp @@ -174,7 +174,7 @@ bool ClusterInterfacesSelectorWidget::isValid() QMessageBox::warning(this,"Firewall Builder", tr("Interface %1 of firewall %2 is used in more than one cluster interface.") .arg(iface1.second->getName().c_str()).arg(iface1.first->getName().c_str()), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); return false; } } diff --git a/src/libgui/DynamicGroupDialog.cpp b/src/libgui/DynamicGroupDialog.cpp index 79fbede54..6c37b314b 100644 --- a/src/libgui/DynamicGroupDialog.cpp +++ b/src/libgui/DynamicGroupDialog.cpp @@ -53,7 +53,7 @@ QWidget *DynamicItemDelegate::createEditor(QWidget *parent, if (index.column() == 0) { QToolButton *button = new QToolButton(parent); QPixmap pixmap; - if (!QPixmapCache::find(":/Icons/neg", pixmap)) { + if (!QPixmapCache::find(":/Icons/neg", &pixmap)) { pixmap.load(":/Icons/neg"); QPixmapCache::insert(":/Icons/neg", pixmap); } @@ -291,7 +291,7 @@ void DynamicGroupDialog::loadFWObject(FWObject *o) icon += "/icon-ref"; QPixmap pixmap; - if (!QPixmapCache::find(icon, pixmap)) { + if (!QPixmapCache::find(icon, &pixmap)) { pixmap.load(icon); QPixmapCache::insert(icon, pixmap); } diff --git a/src/libgui/FWObjectDrag.cpp b/src/libgui/FWObjectDrag.cpp index 100440012..16b48ad78 100644 --- a/src/libgui/FWObjectDrag.cpp +++ b/src/libgui/FWObjectDrag.cpp @@ -138,5 +138,5 @@ bool FWObjectDrag::decode( QDragEnterEvent *ev, list &ol) Qt::DropAction FWObjectDrag::start(Qt::DropActions action) { if (fwbdebug) qDebug("FWObjectDrag::start"/*, action*/); - return QDrag::start(action); + return QDrag::exec(action); } diff --git a/src/libgui/FWObjectDropArea.cpp b/src/libgui/FWObjectDropArea.cpp index 8bb797d83..9912f2439 100644 --- a/src/libgui/FWObjectDropArea.cpp +++ b/src/libgui/FWObjectDropArea.cpp @@ -99,7 +99,7 @@ void FWObjectDropArea::paintEvent(QPaintEvent *) QPixmap pm; QString icn_file = (":/Icons/"+object->getTypeName()+"/icon").c_str(); - if ( ! QPixmapCache::find( icn_file, pm) ) + if ( ! QPixmapCache::find( icn_file, &pm) ) { pm.load( icn_file ); QPixmapCache::insert( icn_file, pm); diff --git a/src/libgui/FWWindowPrint.cpp b/src/libgui/FWWindowPrint.cpp index 4e99180cc..10c1e21bd 100644 --- a/src/libgui/FWWindowPrint.cpp +++ b/src/libgui/FWWindowPrint.cpp @@ -214,7 +214,7 @@ void FWWindow::filePrint() QMessageBox::information( this,"Firewall Builder", tr("Printing aborted"), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); } else showStatusBarMessage(tr("Printing completed")); diff --git a/src/libgui/FindObjectWidget.cpp b/src/libgui/FindObjectWidget.cpp index 5a0f30346..6f5f502d5 100644 --- a/src/libgui/FindObjectWidget.cpp +++ b/src/libgui/FindObjectWidget.cpp @@ -466,7 +466,7 @@ loop: if ( QMessageBox::warning( this,"Firewall Builder", tr("Search hit the end of the policy rules."), - tr("&Continue at top"), tr("&Stop"), QString::null, 0, 1 )==0 ) + tr("&Continue at top"), tr("&Stop"), QString(), 0, 1 )==0 ) goto loop; } else @@ -475,7 +475,7 @@ loop: bool r= ( QMessageBox::warning( this,"Firewall Builder", tr("Search hit the end of the object tree."), - tr("&Continue at top"), tr("&Stop"), QString::null, 0, 1 )==0); + tr("&Continue at top"), tr("&Stop"), QString(), 0, 1 )==0); if (fwbdebug) qDebug("widget that has focus: %p",mw->focusWidget()); if (r) goto loop; } diff --git a/src/libgui/FindWhereUsedWidget.cpp b/src/libgui/FindWhereUsedWidget.cpp index e8f2ce067..8ce810624 100644 --- a/src/libgui/FindWhereUsedWidget.cpp +++ b/src/libgui/FindWhereUsedWidget.cpp @@ -200,7 +200,7 @@ void FindWhereUsedWidget::_find(FWObject *obj) // TODO: This is not ideal because lines are sorted alphabetically. // Rules should be sorted by their numbers numerically. QStringList keys = widget_items.keys(); - qSort(keys); + std::sort(begin(keys), end(keys)); foreach(QString k, keys) { QTreeWidgetItem *item = widget_items[k]; diff --git a/src/libgui/FirewallDialog.cpp b/src/libgui/FirewallDialog.cpp index af328f8aa..c306b5792 100644 --- a/src/libgui/FirewallDialog.cpp +++ b/src/libgui/FirewallDialog.cpp @@ -247,7 +247,7 @@ void FirewallDialog::validate(bool *res) QMessageBox::critical( this,"Firewall Builder", tr("Character \"/\" is not allowed in firewall object name"), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); blockSignals(false); } @@ -294,7 +294,7 @@ void FirewallDialog::applyChanges() blockSignals(true); autorename_chidren = (QMessageBox::warning( this,"Firewall Builder", dialog_txt, - tr("&Yes"), tr("&No"), QString::null, + tr("&Yes"), tr("&No"), QString(), 0, 1 )==0 ); blockSignals(false); } @@ -419,7 +419,7 @@ void FirewallDialog::openFWDialog() QMessageBox::critical( this,"Firewall Builder", tr("FWBuilder API error: %1").arg(ex.toString().c_str()), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); return; } @@ -442,7 +442,7 @@ void FirewallDialog::openOSDialog() QMessageBox::critical( this,"Firewall Builder", tr("FWBuilder API error: %1").arg(ex.toString().c_str()), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); return; } diff --git a/src/libgui/FirewallInstallerCisco.cpp b/src/libgui/FirewallInstallerCisco.cpp index 0cae9d37f..d73ff96a3 100644 --- a/src/libgui/FirewallInstallerCisco.cpp +++ b/src/libgui/FirewallInstallerCisco.cpp @@ -123,7 +123,7 @@ bool FirewallInstallerCisco::packInstallJobsList(Firewall*) QMessageBox::critical( inst_dlg, "Firewall Builder", tr("Can not read generated script %1").arg(ff), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); return false; } diff --git a/src/libgui/FirewallInstallerJuniper.cpp b/src/libgui/FirewallInstallerJuniper.cpp index c651b4974..fb4609d4a 100644 --- a/src/libgui/FirewallInstallerJuniper.cpp +++ b/src/libgui/FirewallInstallerJuniper.cpp @@ -121,7 +121,7 @@ bool FirewallInstallerJuniper::packInstallJobsList(Firewall*) QMessageBox::critical( inst_dlg, "Firewall Builder", tr("Can not read generated script %1").arg(ff), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); return false; } diff --git a/src/libgui/FirewallInstallerProcurve.cpp b/src/libgui/FirewallInstallerProcurve.cpp index 283db8cc1..85925c849 100644 --- a/src/libgui/FirewallInstallerProcurve.cpp +++ b/src/libgui/FirewallInstallerProcurve.cpp @@ -102,7 +102,7 @@ bool FirewallInstallerProcurve::packInstallJobsList(Firewall*) QMessageBox::critical( inst_dlg, "Firewall Builder", tr("Can not read generated script %1").arg(ff), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); return false; } diff --git a/src/libgui/FirewallInstallerUnx.cpp b/src/libgui/FirewallInstallerUnx.cpp index 458ba50b9..a3e058ace 100644 --- a/src/libgui/FirewallInstallerUnx.cpp +++ b/src/libgui/FirewallInstallerUnx.cpp @@ -136,7 +136,7 @@ bool FirewallInstallerUnx::packInstallJobsList(Firewall* fw) tr("Incorrect manifest format in generated script. " "Line with \"*\" is missing, can not find any files " "to copy to the firewall.\n%1").arg(cnf->script), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); return false; } diff --git a/src/libgui/FirewallSelectorWidget.cpp b/src/libgui/FirewallSelectorWidget.cpp index f85234d59..c372086f3 100644 --- a/src/libgui/FirewallSelectorWidget.cpp +++ b/src/libgui/FirewallSelectorWidget.cpp @@ -134,7 +134,7 @@ bool FirewallSelectorWidget::isValid() this, "Firewall Builder", tr("You should select at least one firewall to use " "with the cluster"), - "&Continue", QString::null, QString::null, 0, 1); + "&Continue", QString(), QString(), 0, 1); return false; } for ( int i = 0; i < fws.count(); i++) @@ -145,7 +145,7 @@ bool FirewallSelectorWidget::isValid() QMessageBox::critical( this, "Firewall Builder", tr("Host operation systems of chosen firewalls are different"), - "&Continue", QString::null, QString::null, 0, 1); + "&Continue", QString(), QString(), 0, 1); return false; } if (platform.isEmpty()) platform = fws.at(i).first->getStr("platform").c_str(); @@ -154,7 +154,7 @@ bool FirewallSelectorWidget::isValid() QMessageBox::critical( this, "Firewall Builder", tr("Platforms of chosen firewalls are different"), - "&Continue", QString::null, QString::null, 0, 1); + "&Continue", QString(), QString(), 0, 1); return false; } #ifdef COMPARE_MEMBER_VERSIONS_FOR_CLUSTER @@ -164,7 +164,7 @@ bool FirewallSelectorWidget::isValid() QMessageBox::critical( this, "Firewall Builder", tr("Versions of chosen firewalls are different"), - "&Continue", QString::null, QString::null, 0, 1); + "&Continue", QString(), QString(), 0, 1); return false; } #endif @@ -222,7 +222,7 @@ bool FirewallSelectorWidget::isValid() QMessageBox::critical( this, "Firewall Builder", tr("Cluster firewalls should have at least one common inteface"), - "&Continue", QString::null, QString::null, 0, 1); + "&Continue", QString(), QString(), 0, 1); } return ok; } diff --git a/src/libgui/GroupObjectDialog.cpp b/src/libgui/GroupObjectDialog.cpp index f23223e7a..d9a113619 100644 --- a/src/libgui/GroupObjectDialog.cpp +++ b/src/libgui/GroupObjectDialog.cpp @@ -389,7 +389,7 @@ void GroupObjectDialog::addIcon(FWObject *o, bool ref) (":/Icons/"+o->getTypeName()+((ref)?"/icon-ref":"/icon")).c_str(); QPixmap pm; - if ( ! QPixmapCache::find( icn_filename, pm) ) + if ( ! QPixmapCache::find( icn_filename, &pm) ) { pm.load( icn_filename ); QPixmapCache::insert( icn_filename, pm); diff --git a/src/libgui/HostDialog.cpp b/src/libgui/HostDialog.cpp index a0ec72479..e5c61831d 100644 --- a/src/libgui/HostDialog.cpp +++ b/src/libgui/HostDialog.cpp @@ -137,7 +137,7 @@ void HostDialog::applyChanges() blockSignals(true); autorename_chidren = (QMessageBox::warning( this,"Firewall Builder", dialog_txt, - tr("&Yes"), tr("&No"), QString::null, + tr("&Yes"), tr("&No"), QString(), 0, 1 )==0 ); blockSignals(false); } diff --git a/src/libgui/IPv4Dialog.cpp b/src/libgui/IPv4Dialog.cpp index 4182a0072..1ca919bf3 100644 --- a/src/libgui/IPv4Dialog.cpp +++ b/src/libgui/IPv4Dialog.cpp @@ -282,14 +282,14 @@ void IPv4Dialog::DNSlookup() this,"Firewall Builder", tr("DNS lookup failed for both names of the address object '%1' and the name of the host '%2'.") .arg(m_dialog->obj_name->text()).arg(name), - "&Continue", QString::null,QString::null, 0, 1 ); + "&Continue", QString(),QString(), 0, 1 ); return; } QMessageBox::warning( this,"Firewall Builder", tr("DNS lookup failed for name of the address object '%1'.") .arg(name), - "&Continue", QString::null,QString::null, 0, 1 ); + "&Continue", QString(),QString(), 0, 1 ); return; } } diff --git a/src/libgui/IPv6Dialog.cpp b/src/libgui/IPv6Dialog.cpp index 25a81ef5a..457d212d3 100644 --- a/src/libgui/IPv6Dialog.cpp +++ b/src/libgui/IPv6Dialog.cpp @@ -279,14 +279,14 @@ void IPv6Dialog::DNSlookup() this,"Firewall Builder", tr("DNS lookup failed for both names of the address object '%1' and the name of the host '%2'.") .arg(m_dialog->obj_name->text()).arg(name), - "&Continue", QString::null,QString::null, 0, 1 ); + "&Continue", QString(),QString(), 0, 1 ); return; } QMessageBox::warning( this,"Firewall Builder", tr("DNS lookup failed for name of the address object '%1'.") .arg(name), - "&Continue", QString::null,QString::null, 0, 1 ); + "&Continue", QString(),QString(), 0, 1 ); return; } } diff --git a/src/libgui/InterfaceDialog.cpp b/src/libgui/InterfaceDialog.cpp index 151219186..6582713b3 100644 --- a/src/libgui/InterfaceDialog.cpp +++ b/src/libgui/InterfaceDialog.cpp @@ -351,7 +351,7 @@ void InterfaceDialog::validate(bool *res) QMessageBox::critical( this,"Firewall Builder", err, - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); blockSignals(false); } @@ -385,7 +385,7 @@ void InterfaceDialog::validate(bool *res) QMessageBox::critical( this,"Firewall Builder", err, - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); blockSignals(false); } @@ -425,7 +425,7 @@ void InterfaceDialog::applyChanges() blockSignals(true); autorename_children = (QMessageBox::warning( this, "Firewall Builder", dialog_txt, - tr("&Yes"), tr("&No"), QString::null, + tr("&Yes"), tr("&No"), QString(), 0, 1 )==0 ); blockSignals(false); } @@ -537,7 +537,7 @@ void InterfaceDialog::openIfaceDialog() QMessageBox::critical( this,"Firewall Builder", tr("FWBuilder API error: %1").arg(ex.toString().c_str()), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); return; } diff --git a/src/libgui/InterfaceEditorWidget.cpp b/src/libgui/InterfaceEditorWidget.cpp index 7d88fc3eb..8d8953d1a 100644 --- a/src/libgui/InterfaceEditorWidget.cpp +++ b/src/libgui/InterfaceEditorWidget.cpp @@ -324,7 +324,7 @@ bool InterfaceEditorWidget::isValid() tr("Failover protocol %1 does not require IP address for interface %2") .arg(this->m_ui->protocol->currentText()) .arg(this->m_ui->name->text()), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); return false; } @@ -338,7 +338,7 @@ bool InterfaceEditorWidget::isValid() tr("Failover protocol %1 requires an IP address for interface %2") .arg(this->m_ui->protocol->currentText()) .arg(this->m_ui->name->text()), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); return false; } } @@ -522,5 +522,5 @@ void InterfaceEditorWidget::setError(const QString &title, void InterfaceEditorWidget::showError() { QMessageBox::warning(this, errorTitle, errorText, "&Continue", - QString::null, QString::null, 0, 1); + QString(), QString(), 0, 1); } diff --git a/src/libgui/KeywordsDialog.cpp b/src/libgui/KeywordsDialog.cpp index e6d54cf1c..5bd4609f4 100644 --- a/src/libgui/KeywordsDialog.cpp +++ b/src/libgui/KeywordsDialog.cpp @@ -137,7 +137,7 @@ bool KeywordsDialog::validateKeyword(QWidget *parent, const QString &keyword) if (keyword.contains(',')) { QMessageBox::warning(parent, "Firewall Builder", tr("Keyword cannot contain a comma"), "&OK", - QString::null, QString::null, 0, 1); + QString(), QString(), 0, 1); return false; } diff --git a/src/libgui/LibExportDialog.cpp b/src/libgui/LibExportDialog.cpp index 04ab3f495..87e9e83be 100644 --- a/src/libgui/LibExportDialog.cpp +++ b/src/libgui/LibExportDialog.cpp @@ -101,7 +101,7 @@ void LibExportDialog::init() QPixmap pm; QString icn = (":/Icons/" + (*i)->getTypeName() + "/icon-tree").c_str(); //QString icn = libicn.c_str(); - if ( ! QPixmapCache::find( icn, pm) ) + if ( ! QPixmapCache::find( icn, &pm) ) { pm.load( icn ); QPixmapCache::insert( icn, pm); diff --git a/src/libgui/ObjectIconView.cpp b/src/libgui/ObjectIconView.cpp index 2dcb6142c..c64ecfc63 100644 --- a/src/libgui/ObjectIconView.cpp +++ b/src/libgui/ObjectIconView.cpp @@ -131,7 +131,7 @@ QDrag* ObjectIconView::dragObject() //QPixmap pm = QPixmap::fromMimeSource( icn_filename ); QPixmap pm; - if ( ! QPixmapCache::find( icn, pm) ) + if ( ! QPixmapCache::find( icn, &pm) ) { pm.load( icn ); QPixmapCache::insert( icn, pm); @@ -229,7 +229,7 @@ void ObjectIconView::mouseMoveEvent ( QMouseEvent * event ) { startingDrag = false; QDrag *dr = dragObject(); - if (dr) dr->start(); + if (dr) dr->exec(); } QListWidget::mouseMoveEvent(event); } diff --git a/src/libgui/ObjectListView.cpp b/src/libgui/ObjectListView.cpp index afa262359..fad2e3fbe 100644 --- a/src/libgui/ObjectListView.cpp +++ b/src/libgui/ObjectListView.cpp @@ -136,7 +136,7 @@ QDrag* ObjectListView::dragObject() //QPixmap pm = QPixmap::fromMimeSource( icn_filename ); QPixmap pm; - if ( ! QPixmapCache::find( icn, pm) ) + if ( ! QPixmapCache::find( icn, &pm) ) { pm.load( icn ); QPixmapCache::insert( icn, pm); @@ -230,7 +230,7 @@ void ObjectListView::mouseMoveEvent(QMouseEvent *event) if (startingDrag) { QDrag *dr = dragObject(); - if (dr) dr->start(); + if (dr) dr->exec(); startingDrag = false; } QTreeWidget::mouseMoveEvent(event); diff --git a/src/libgui/ObjectManipulator.cpp b/src/libgui/ObjectManipulator.cpp index 596e2888a..ecfd95355 100644 --- a/src/libgui/ObjectManipulator.cpp +++ b/src/libgui/ObjectManipulator.cpp @@ -1203,7 +1203,7 @@ void ObjectManipulator::filterFirewallsFromSelection(vector &so, QMessageBox::warning(this, "Firewall Builder", QObject::tr("No firewalls assigned to cluster '%1'"). arg(cl->getName().c_str()), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); continue; } fo.insert(cl); @@ -1253,7 +1253,7 @@ FWObject* ObjectManipulator::prepareForInsertion(FWObject *target, FWObject *obj QMessageBox::critical( this,"Firewall Builder", err, - "&Continue", QString::null, QString::null, + "&Continue", QString(), QString(), 0, 1 ); return nullptr; diff --git a/src/libgui/ObjectManipulator_create_new.cpp b/src/libgui/ObjectManipulator_create_new.cpp index 3f9832516..40d9b7441 100644 --- a/src/libgui/ObjectManipulator_create_new.cpp +++ b/src/libgui/ObjectManipulator_create_new.cpp @@ -340,7 +340,7 @@ FWObject* ObjectManipulator::createObject(const QString &objType, "corresponding branch is missing in the object tree.\n" "Please repair the tree using command 'fwbedit checktree -f file.fwb'.") .arg(objType), - "&Continue", QString::null, QString::null, + "&Continue", QString(), QString(), 0, 1 ); return nullptr; } @@ -640,7 +640,7 @@ FWObject* ObjectManipulator::newStateSyncClusterGroup(QUndoCommand* macro) QMessageBox::warning( this,"Firewall Builder", tr("Cluster host OS %1 does not support state synchronization").arg(host_os), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); return nullptr; } diff --git a/src/libgui/ObjectManipulator_ops.cpp b/src/libgui/ObjectManipulator_ops.cpp index e581eec4c..b308b7103 100644 --- a/src/libgui/ObjectManipulator_ops.cpp +++ b/src/libgui/ObjectManipulator_ops.cpp @@ -415,7 +415,7 @@ FWObject* ObjectManipulator::actuallyPasteTo(FWObject *target, QMessageBox::warning( this,"Firewall Builder", ex.toString().c_str(), - "&Continue", QString::null,QString::null, + "&Continue", QString(),QString(), 0, 1 ); } @@ -592,7 +592,7 @@ void ObjectManipulator::deleteObject(FWObject *obj, QUndoCommand* macro) QMessageBox::warning( this,"Firewall Builder", ex.toString().c_str(), - "&Continue", QString::null,QString::null, + "&Continue", QString(),QString(), 0, 1 ); throw(ex); } @@ -766,7 +766,7 @@ void ObjectManipulator::addSubfolderSlot() if (folder.contains(',')) { QMessageBox::warning(this, "Firewall Builder", tr("Subfolder cannot contain a comma"), "&OK", - QString::null, QString::null, 0, 1); + QString(), QString(), 0, 1); return; } @@ -871,7 +871,7 @@ void ObjectManipulator::renameUserFolder() if (newFolderName.contains(',')) { QMessageBox::warning(this, "Firewall Builder", tr("Subfolder cannot contain a comma"), "&OK", - QString::null, QString::null, 0, 1); + QString(), QString(), 0, 1); return; } diff --git a/src/libgui/ObjectManipulator_slots.cpp b/src/libgui/ObjectManipulator_slots.cpp index 595c22bc1..ec231069a 100644 --- a/src/libgui/ObjectManipulator_slots.cpp +++ b/src/libgui/ObjectManipulator_slots.cpp @@ -335,7 +335,7 @@ void ObjectManipulator::delObj(QUndoCommand* macro) "disappear from the tree and all groups and rules that reference them.\n" "Do you still want to delete library %1?") .arg(QString::fromUtf8(obj->getName().c_str())), - tr("&Yes"), tr("&No"), QString::null, + tr("&Yes"), tr("&No"), QString(), 0, 1 )!=0 ) continue; } diff --git a/src/libgui/ObjectTreeView.cpp b/src/libgui/ObjectTreeView.cpp index a0345ebdb..90009291a 100644 --- a/src/libgui/ObjectTreeView.cpp +++ b/src/libgui/ObjectTreeView.cpp @@ -411,7 +411,7 @@ void ObjectTreeView::startDrag(Qt::DropActions supportedActions) FWObjectDrag *drag = new FWObjectDrag(dragobj, this); QPixmap pm; - if ( ! QPixmapCache::find( icn, pm) ) + if ( ! QPixmapCache::find( icn, &pm) ) { pm.load( icn ); QPixmapCache::insert( icn, pm); diff --git a/src/libgui/PrintingController.cpp b/src/libgui/PrintingController.cpp index 68fd9a871..dd4681d05 100644 --- a/src/libgui/PrintingController.cpp +++ b/src/libgui/PrintingController.cpp @@ -194,7 +194,7 @@ int PrintingController::addObjectsToTable(list &objects, QString icn = (":/Icons/"+type_name+"/icon").c_str(); QPixmap pm; - if ( ! QPixmapCache::find( icn, pm) ) + if ( ! QPixmapCache::find( icn, &pm) ) { pm.load( icn ); QPixmapCache::insert( icn, pm); @@ -383,7 +383,7 @@ void PrintingController::printLegend(bool newPageForSection) QString icn = ":/Icons/"+type_name+"/icon"; QPixmap pm; - if ( ! QPixmapCache::find( icn, pm) ) + if ( ! QPixmapCache::find( icn, &pm) ) { pm.load( icn ); QPixmapCache::insert( icn, pm); diff --git a/src/libgui/ProjectPanel_file_ops.cpp b/src/libgui/ProjectPanel_file_ops.cpp index b6f9c4f4e..fdcd15412 100644 --- a/src/libgui/ProjectPanel_file_ops.cpp +++ b/src/libgui/ProjectPanel_file_ops.cpp @@ -365,7 +365,7 @@ void ProjectPanel::fileDiscard() "\n" "All changes will be lost if you do this.\n"), tr("&Discard changes"), - tr("&Cancel"), QString::null, + tr("&Cancel"), QString(), 1 )==0 ) { /* need to close the file without asking and saving, then @@ -414,7 +414,7 @@ void ProjectPanel::fileAddToRCS() QMessageBox::information( this,"Firewall Builder", tr("File %1 has been added to RCS.").arg(rcs->getFileName()), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); } } @@ -423,7 +423,7 @@ void ProjectPanel::fileAddToRCS() QMessageBox::critical( this,"Firewall Builder", tr("Error adding file to RCS:\n%1").arg(ex.toString().c_str()), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); } @@ -500,7 +500,7 @@ void ProjectPanel::fileCompare() this,"Firewall Builder", tr("Error loading file %1:\n%2"). arg(fname1).arg(ex.toString().c_str()), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); return; } @@ -519,7 +519,7 @@ void ProjectPanel::fileCompare() this,"Firewall Builder", tr("Error loading file %1:\n%2"). arg(fname2).arg(ex.toString().c_str()), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); return; } @@ -574,7 +574,7 @@ void ProjectPanel::fileCompare() QMessageBox::critical( this,"Firewall Builder", tr("Can not open report file for writing. File '%1'").arg(fn), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); } @@ -586,7 +586,7 @@ void ProjectPanel::fileCompare() this,"Firewall Builder", tr("Unexpected error comparing files %1 and %2:\n%3"). arg(fname1).arg(fname2).arg(ex.toString().c_str()), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); } @@ -615,7 +615,7 @@ void ProjectPanel::fileExport() QMessageBox::critical( this,"Firewall Builder", tr("Please select a library you want to export."), - "&Continue", QString::null,QString::null, + "&Continue", QString(),QString(), 0, 1 ); return; @@ -640,7 +640,7 @@ void ProjectPanel::fileExport() this,"Firewall Builder", tr("The file %1 already exists.\nDo you want to overwrite it ?") .arg(fname), - tr("&Yes"), tr("&No"), QString::null, + tr("&Yes"), tr("&No"), QString(), 0, 1 )==1 ) return; st->setOpenFileDir(path); @@ -808,7 +808,7 @@ void ProjectPanel::exportLibraryTo(QString fname,list &selectedLibs, this,"Firewall Builder", QObject::tr("Error saving file %1: %2") .arg(fname).arg(err), - "&Continue", QString::null, QString::null, + "&Continue", QString(), QString(), 0, 1 ); } } @@ -914,7 +914,7 @@ FWObject* ProjectPanel::loadLibrary(const string &libfpath) tr("The program encountered error trying to load file %1.\n" "The file has not been loaded. Error:\n%2"). arg(libfpath.c_str()).arg(error_txt), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); } return last_new_lib; @@ -993,7 +993,7 @@ void ProjectPanel::loadStandardObjects() QMessageBox::critical( this,"Firewall Builder", tr("Error loading file:\n%1").arg(ex.toString().c_str()), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); } } @@ -1145,7 +1145,7 @@ bool ProjectPanel::loadFromRCS(RCS *_rcs) * extension" */ QFileInfo nfinfo(newFileName); - if (nfinfo.exists() && ofinfo.isSymLink() && ofinfo.readLink()==newFileName) + if (nfinfo.exists() && ofinfo.isSymLink() && ofinfo.symLinkTarget()==newFileName) { // .xml file is a symlink pointing at .fwb file // no need to rename @@ -1179,7 +1179,7 @@ bool ProjectPanel::loadFromRCS(RCS *_rcs) "but file '%3' already exists.\n" "Choose a different name for the new file.") .arg(fn).arg(newFileName).arg(newFileName), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); newFileName = chooseNewFileName( @@ -1195,7 +1195,7 @@ bool ProjectPanel::loadFromRCS(RCS *_rcs) this,"Firewall Builder", tr("Load operation cancelled and data file reverted" "to original version."), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); loadStandardObjects(); @@ -1212,7 +1212,7 @@ bool ProjectPanel::loadFromRCS(RCS *_rcs) tr("Firewall Builder uses file extension '.fwb'. Your data" "file '%1' \nhas been renamed '%2'") .arg(fn).arg(newFileName), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); } @@ -1255,7 +1255,7 @@ bool ProjectPanel::loadFromRCS(RCS *_rcs) this,"Firewall Builder", tr("The program encountered error trying to load data file.\n" "The file has not been loaded. Error:\n%1").arg(msg), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); } else { @@ -1274,7 +1274,7 @@ bool ProjectPanel::loadFromRCS(RCS *_rcs) tr("The program encountered error trying to load data file.\n" "The file has not been loaded. Error:\n%1").arg( error_txt), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); } // load standard objects so the window does not remain empty @@ -1364,7 +1364,7 @@ bool ProjectPanel::checkin(bool unlock) this,"Firewall Builder", tr("Error checking in file %1:\n%2") .arg(rcs->getFileName()).arg(ex.toString().c_str()), - tr("&Continue"), QString::null, QString::null, + tr("&Continue"), QString(), QString(), 0, 1 ); } /***********************************************************************/ @@ -1489,7 +1489,7 @@ void ProjectPanel::save() this,"Firewall Builder", tr("Error saving file %1: %2") .arg(rcs->getFileName()).arg(err), - tr("&Continue"), QString::null, QString::null, + tr("&Continue"), QString(), QString(), 0, 1 ); } } diff --git a/src/libgui/RCS.cpp b/src/libgui/RCS.cpp index 0578927d2..30e1ac01c 100644 --- a/src/libgui/RCS.cpp +++ b/src/libgui/RCS.cpp @@ -423,7 +423,7 @@ RCS::RCS(const QString &file) } // sort list revisions; its defined like this: // QList revisions - qSort(revisions); + std::sort(revisions.begin(), revisions.end()); inrcs = true; tracking_file = true; @@ -774,7 +774,7 @@ bool RCS::co(const QString &rev,bool force) app->activeWindow(),"Firewall Builder", tr("File is opened and locked by %1.\nYou can only open it read-only.") .arg(locked_by), - "Open &read-only", "&Cancel", QString::null, + "Open &read-only", "&Cancel", QString(), 0, 1 ) ) { case 0: ro=true; return false; diff --git a/src/libgui/RuleSetModel.cpp b/src/libgui/RuleSetModel.cpp index 250bfa6eb..a05ea5cee 100644 --- a/src/libgui/RuleSetModel.cpp +++ b/src/libgui/RuleSetModel.cpp @@ -1146,7 +1146,7 @@ bool RuleSetModel::insertObject(QModelIndex &index, FWObject *obj) QObject::tr( "A single interface belonging to " "this firewall is expected in this field."), - QString::null,QString::null); + QString(),QString()); } else if (RuleElementRGtw::cast(re)) { @@ -1157,7 +1157,7 @@ bool RuleSetModel::insertObject(QModelIndex &index, FWObject *obj) "here. You may also insert a host " "or a network adapter leading to " "a single ip adress."), - QString::null,QString::null); + QString(),QString()); } return false; } diff --git a/src/libgui/RuleSetView.cpp b/src/libgui/RuleSetView.cpp index 9842b27d2..e186e18a5 100644 --- a/src/libgui/RuleSetView.cpp +++ b/src/libgui/RuleSetView.cpp @@ -521,7 +521,7 @@ void RuleSetView::mouseMoveEvent( QMouseEvent* ev ) { QDrag* drag = dragObject(); if (drag) - drag->start(Qt::CopyAction | Qt::MoveAction); //just start dragging + drag->exec(Qt::CopyAction | Qt::MoveAction); //just start dragging startingDrag = false; return; } @@ -809,7 +809,7 @@ void RuleSetView::addColumnRelatedMenu(QMenu *menu, const QModelIndex &index, { QMessageBox::critical( nullptr , "Firewall Builder", ex.toString().c_str(), - QString::null,QString::null); + QString(),QString()); } negID->setEnabled(supports_neg && !re->isAny()); fndID->setEnabled(!re->isAny()); @@ -1143,7 +1143,7 @@ void RuleSetView::removeRule() { foreach(QModelIndex group, groups) { - qSort(itemsInGroups[group]); + std::sort(begin(itemsInGroups[group]), end(itemsInGroups[group])); Rule* first = md->nodeFromIndex(md->index(itemsInGroups[group].at(0), 0, group))->rule; Rule* last = md->nodeFromIndex(md->index(itemsInGroups[group].at(itemsInGroups[group].size() - 1), 0, group))->rule; @@ -1691,14 +1691,14 @@ void RuleSetView::removeFromGroup() // Remove groups from the end to the begin QList groups = itemsInGroups.keys(); - qSort(groups); + std::sort(begin(groups), end(groups)); QListIterator i(groups); i.toBack(); while (i.hasPrevious()) { QModelIndex group = i.previous(); - qSort(itemsInGroups[group]); + std::sort(begin(itemsInGroups[group]), end(itemsInGroups[group])); QModelIndex first = md->index(itemsInGroups[group].first(), 0, group); QModelIndex last = md->index(itemsInGroups[group].last(), 0, group); @@ -2393,7 +2393,7 @@ bool RuleSetView::validateForInsertion(RuleElement *re, FWObject *obj, bool quie QObject::tr( "A single interface belonging to this firewall is " "expected in this field."), - QString::null,QString::null); + QString(),QString()); } else if (RuleElementRGtw::cast(re)) { @@ -2403,7 +2403,7 @@ bool RuleSetView::validateForInsertion(RuleElement *re, FWObject *obj, bool quie "A single ip adress is expected here. You may also " "insert a host or a network adapter leading to a single " "ip adress."), - QString::null,QString::null); + QString(),QString()); } } return false; diff --git a/src/libgui/SimpleTextEditor.cpp b/src/libgui/SimpleTextEditor.cpp index 17d3edc70..f66fa3c97 100644 --- a/src/libgui/SimpleTextEditor.cpp +++ b/src/libgui/SimpleTextEditor.cpp @@ -71,7 +71,7 @@ void SimpleTextEditor::loadFromFile() if (QMessageBox::warning(this, tr("Firewall Builder"), tr("Warning: loading from file discards " "current contents of the script."), - "&Load", "&Cancel", QString::null, 0, 1 ) != 0) + "&Load", "&Cancel", QString(), 0, 1 ) != 0) { return; } @@ -88,7 +88,7 @@ void SimpleTextEditor::loadFromFile() QMessageBox::warning( this,"Firewall Builder", tr("Could not open file %1").arg(filename), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); return; } diff --git a/src/libgui/TextFileEditor.cpp b/src/libgui/TextFileEditor.cpp index 4eb181bab..8ba0fd24e 100644 --- a/src/libgui/TextFileEditor.cpp +++ b/src/libgui/TextFileEditor.cpp @@ -63,7 +63,7 @@ bool TextFileEditor::load() this, "Firewall Builder", tr("The file %1 does not exist but it will be created " "when you save your changes.").arg(file_name), - tr("&Open the file"), tr("&Cancel"), QString::null, 0, 1 ) == 1) + tr("&Open the file"), tr("&Cancel"), QString(), 0, 1 ) == 1) return false; return true; @@ -76,7 +76,7 @@ bool TextFileEditor::load() QMessageBox::critical( this, "Firewall Builder", tr("The file is read-only, you can't save the changes."), - tr("&View the file"), tr("&Cancel"), QString::null, 0, 1 )) + tr("&View the file"), tr("&Cancel"), QString(), 0, 1 )) { case 0: // open read-only m_dialog->editor->setReadOnly(true); @@ -123,7 +123,7 @@ void TextFileEditor::save() this,"Firewall Builder", tr("Error saving data to file '%1': %2") .arg(file_name).arg(owf.errorString()), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); return; } @@ -144,14 +144,14 @@ void TextFileEditor::save() this,"Firewall Builder", tr("Can not rename file %1 to %2: %3") .arg(tmp_file_name).arg(file_name).arg(wf.errorString()), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); } else QMessageBox::critical( this,"Firewall Builder", tr("Error saving data to a temporary file '%1': %2") .arg(tmp_file_name).arg(wf.errorString()), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); } void TextFileEditor::closeEvent(QCloseEvent* ev) diff --git a/src/libgui/clusterMembersDialog.cpp b/src/libgui/clusterMembersDialog.cpp index 0ada8242a..a65968d6b 100644 --- a/src/libgui/clusterMembersDialog.cpp +++ b/src/libgui/clusterMembersDialog.cpp @@ -378,7 +378,7 @@ QPixmap clusterMembersDialog::getIcon(FWObject *o) "/icon").c_str(); QPixmap pm; - if (!QPixmapCache::find(icn_file, pm)) + if (!QPixmapCache::find(icn_file, &pm)) { pm.load(icn_file); QPixmapCache::insert(icn_file, pm); diff --git a/src/libgui/findDialog.cpp b/src/libgui/findDialog.cpp index 2f4815b30..2928e0ef3 100644 --- a/src/libgui/findDialog.cpp +++ b/src/libgui/findDialog.cpp @@ -272,7 +272,7 @@ loop: if ( QMessageBox::warning( this,"Firewall Builder", tr("Search hit the end of the object tree."), - tr("&Continue at top"), tr("&Stop"), QString::null, 0, 1 )==0 ) goto loop; + tr("&Continue at top"), tr("&Stop"), QString(), 0, 1 )==0 ) goto loop; return; } diff --git a/src/libgui/importAddressListWizard/ChooseObjectsPage.cpp b/src/libgui/importAddressListWizard/ChooseObjectsPage.cpp index 73b57ce4b..9803cfac5 100644 --- a/src/libgui/importAddressListWizard/ChooseObjectsPage.cpp +++ b/src/libgui/importAddressListWizard/ChooseObjectsPage.cpp @@ -73,7 +73,7 @@ void ChooseObjectsPage::initializePage() { QMessageBox::critical( nullptr , "Firewall Builder", ex.toString().c_str(), - QString::null,QString::null); + QString(),QString()); } } diff --git a/src/libgui/importAddressListWizard/FileNamePage.cpp b/src/libgui/importAddressListWizard/FileNamePage.cpp index b6a0acd5c..4f3eadeef 100644 --- a/src/libgui/importAddressListWizard/FileNamePage.cpp +++ b/src/libgui/importAddressListWizard/FileNamePage.cpp @@ -68,7 +68,7 @@ bool FileNamePage::validatePage() { QMessageBox::critical( nullptr , "Firewall Builder", tr("File %1 does not exist").arg(file_name), - QString::null,QString::null); + QString(),QString()); return false; } @@ -76,7 +76,7 @@ bool FileNamePage::validatePage() { QMessageBox::critical( nullptr , "Firewall Builder", tr("Can not read file %1").arg(file_name), - QString::null,QString::null); + QString(),QString()); return false; } diff --git a/src/libgui/importFirewallConfigurationWizard/IC_FileNamePage.cpp b/src/libgui/importFirewallConfigurationWizard/IC_FileNamePage.cpp index 5ded429e2..fe1d1a3ef 100644 --- a/src/libgui/importFirewallConfigurationWizard/IC_FileNamePage.cpp +++ b/src/libgui/importFirewallConfigurationWizard/IC_FileNamePage.cpp @@ -65,7 +65,7 @@ bool IC_FileNamePage::validatePage() { QMessageBox::critical( nullptr , "Firewall Builder", tr("File %1 does not exist").arg(file_name), - QString::null,QString::null); + QString(),QString()); return false; } @@ -73,7 +73,7 @@ bool IC_FileNamePage::validatePage() { QMessageBox::critical( nullptr , "Firewall Builder", tr("Can not read file %1").arg(file_name), - QString::null,QString::null); + QString(),QString()); return false; } diff --git a/src/libgui/instDialog_compile.cpp b/src/libgui/instDialog_compile.cpp index b75784a1a..7b4bc8fee 100644 --- a/src/libgui/instDialog_compile.cpp +++ b/src/libgui/instDialog_compile.cpp @@ -169,7 +169,7 @@ QStringList instDialog::prepareArgForCompiler(Firewall *fw) this,"Firewall Builder", tr("Firewall platform is not specified in this object.\n\ Can't compile firewall policy."), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); return args; // still empty list } diff --git a/src/libgui/instDialog_ui_ops.cpp b/src/libgui/instDialog_ui_ops.cpp index 7e5b72cb0..131695fb6 100644 --- a/src/libgui/instDialog_ui_ops.cpp +++ b/src/libgui/instDialog_ui_ops.cpp @@ -132,7 +132,7 @@ QTreeWidgetItem* instDialog::createTreeItem(QTreeWidgetItem* parent, QString icn_filename = (":/Icons/" + fw->getTypeName() + "/icon").c_str(); QPixmap pm; - if ( ! QPixmapCache::find(icn_filename, pm)) + if ( ! QPixmapCache::find(icn_filename, &pm)) { pm.load(icn_filename); QPixmapCache::insert(icn_filename, pm); diff --git a/src/libgui/linux24IfaceOptsDialog.cpp b/src/libgui/linux24IfaceOptsDialog.cpp index b3b258da0..44ea9597a 100644 --- a/src/libgui/linux24IfaceOptsDialog.cpp +++ b/src/libgui/linux24IfaceOptsDialog.cpp @@ -202,7 +202,7 @@ bool linux24IfaceOptsDialog::validate() { QMessageBox::warning(this, "Firewall Builder", tr("Input not valid: %1").arg(message), "&Continue", - QString::null, QString::null, 0, 1); + QString(), QString(), 0, 1); focus->setFocus(); } return valid; diff --git a/src/libgui/listOfLibrariesModel.cpp b/src/libgui/listOfLibrariesModel.cpp index 86aed37d3..2c4ba405f 100644 --- a/src/libgui/listOfLibrariesModel.cpp +++ b/src/libgui/listOfLibrariesModel.cpp @@ -108,9 +108,9 @@ void ListOfLibrariesModel::sort(int column, Qt::SortOrder order) } if (order == Qt::AscendingOrder) - qSort(list.begin(), list.end(), ascendingLessThan); + std::sort(list.begin(), list.end(), ascendingLessThan); else - qSort(list.begin(), list.end(), decendingLessThan); + std::sort(list.begin(), list.end(), decendingLessThan); int pos = 0; foreach(QString itm, top_static_items) diff --git a/src/libgui/newClusterDialog.cpp b/src/libgui/newClusterDialog.cpp index 73681ad36..09ebc6dc2 100644 --- a/src/libgui/newClusterDialog.cpp +++ b/src/libgui/newClusterDialog.cpp @@ -330,7 +330,7 @@ void newClusterDialog::nextClicked() QMessageBox::critical( this, "Firewall Builder", tr("You should select at least one firewall to create a cluster"), - "&Continue", QString::null, QString::null, 0, 1); + "&Continue", QString(), QString(), 0, 1); return; } } diff --git a/src/libgui/newFirewallDialog.cpp b/src/libgui/newFirewallDialog.cpp index 8b148e1c7..e298ece87 100644 --- a/src/libgui/newFirewallDialog.cpp +++ b/src/libgui/newFirewallDialog.cpp @@ -321,7 +321,7 @@ void newFirewallDialog::getIPAddressOfFirewallByName() this,"Firewall Builder", tr("Address of %1 could not be obtained via DNS") .arg(m_dialog->obj_name->text()), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); } getInterfacesBusy = false; @@ -442,7 +442,7 @@ void newFirewallDialog::getInterfacesViaSNMP() QMessageBox::warning( this,"Firewall Builder", tr("Missing SNMP community string."), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); return ; } @@ -469,7 +469,7 @@ void newFirewallDialog::getInterfacesViaSNMP() this,"Firewall Builder", tr("Address of %1 could not be obtained via DNS") .arg(m_dialog->snmpIP->text()), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); getInterfacesBusy = false; return ; } @@ -532,7 +532,7 @@ void newFirewallDialog::nextClicked() QMessageBox::warning( this,"Firewall Builder", tr("Please select template"), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); showPage(CHOOSE_FW_TEMPLATE); return; @@ -666,7 +666,7 @@ void newFirewallDialog::showPage(const int page) this,"Firewall Builder", tr("Error loading template library:\n%1") .arg(ex.toString().c_str()), - tr("&Continue"), QString::null,QString::null, + tr("&Continue"), QString(),QString(), 0, 1 ); } } @@ -715,7 +715,7 @@ void newFirewallDialog::showPage(const int page) */ QPixmap pm; - if ( ! QPixmapCache::find( icn, pm) ) + if ( ! QPixmapCache::find( icn, &pm) ) { pm.load( icn ); QPixmapCache::insert( icn, pm); @@ -806,7 +806,7 @@ void newFirewallDialog::getInterfaceDataFromInterfaceEditor( { QMessageBox::warning( this,"Firewall Builder", ex.toString().c_str(), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); showPage( CONFIGURE_INTERFACES_MANUALLY ); return; } @@ -1028,7 +1028,7 @@ bool newFirewallDialog::validateAddressAndMask(const QString &addr, QMessageBox::warning( this,"Firewall Builder", tr("Invalid address '%1/%2'").arg(addr).arg(netm), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); return false; } try @@ -1042,7 +1042,7 @@ bool newFirewallDialog::validateAddressAndMask(const QString &addr, QMessageBox::warning( this,"Firewall Builder", tr("Invalid address '%1/%2'").arg(addr).arg(netm), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); return false; } } @@ -1057,7 +1057,7 @@ bool newFirewallDialog::validateAddressAndMask(const QString &addr, QMessageBox::warning( this,"Firewall Builder", tr("Invalid address '%1/%2'").arg(addr).arg(netm), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); return false; } return true; diff --git a/src/libgui/newFirewallDialog_from_template.cpp b/src/libgui/newFirewallDialog_from_template.cpp index 9ad7ce8cd..d5721b827 100644 --- a/src/libgui/newFirewallDialog_from_template.cpp +++ b/src/libgui/newFirewallDialog_from_template.cpp @@ -131,7 +131,7 @@ void newFirewallDialog::changedAddressesInNewFirewall() this, "Firewall Builder", tr("Can not find interface %1 in the interface editor data") .arg(intf->getName().c_str()), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); } else { EditedInterfaceData new_data = new_configuration[intf]; diff --git a/src/libgui/newHostDialog.cpp b/src/libgui/newHostDialog.cpp index a8f812389..b153c02af 100644 --- a/src/libgui/newHostDialog.cpp +++ b/src/libgui/newHostDialog.cpp @@ -280,7 +280,7 @@ void newHostDialog::getInterfacesViaSNMP() QMessageBox::warning( this,"Firewall Builder", tr("Missing SNMP community string."), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); return ; } @@ -302,7 +302,7 @@ void newHostDialog::getInterfacesViaSNMP() this,"Firewall Builder", tr("Address of %1 could not be obtained via DNS") .arg(m_dialog->obj_name->text()), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); getInterfacesBusy = false; return ; } @@ -411,7 +411,7 @@ void newHostDialog::showPage(const int page) FWObject *o=*m; QPixmap pm; - if ( ! QPixmapCache::find( icn, pm) ) + if ( ! QPixmapCache::find( icn, &pm) ) { pm.load( icn ); QPixmapCache::insert( icn, pm); @@ -526,7 +526,7 @@ bool newHostDialog::validateAddressAndMask(const QString &addr, QMessageBox::warning( this,"Firewall Builder", tr("Illegal address '%1/%2'").arg(addr).arg(netm), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); return false; } try @@ -540,7 +540,7 @@ bool newHostDialog::validateAddressAndMask(const QString &addr, QMessageBox::warning( this,"Firewall Builder", tr("Illegal address '%1/%2'").arg(addr).arg(netm), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); return false; } } @@ -555,7 +555,7 @@ bool newHostDialog::validateAddressAndMask(const QString &addr, QMessageBox::warning( this,"Firewall Builder", tr("Illegal address '%1/%2'").arg(addr).arg(netm), - "&Continue", QString::null, QString::null, 0, 1 ); + "&Continue", QString(), QString(), 0, 1 ); return false; } return true; diff --git a/src/libgui/pixFailoverOptionsDialog.cpp b/src/libgui/pixFailoverOptionsDialog.cpp index 409364a72..5045715ca 100644 --- a/src/libgui/pixFailoverOptionsDialog.cpp +++ b/src/libgui/pixFailoverOptionsDialog.cpp @@ -105,7 +105,7 @@ bool pixFailoverOptionsDialog::validate() { QMessageBox::warning(this, "Firewall Builder", tr("Input not valid: %1").arg(message), "&Continue", - QString::null, QString::null, 0, 1); + QString(), QString(), 0, 1); focus->setFocus(); } return valid; diff --git a/src/libgui/pixosIfaceOptsDialog.cpp b/src/libgui/pixosIfaceOptsDialog.cpp index f9aaea800..e87c1bf6e 100644 --- a/src/libgui/pixosIfaceOptsDialog.cpp +++ b/src/libgui/pixosIfaceOptsDialog.cpp @@ -170,7 +170,7 @@ bool pixosIfaceOptsDialog::validate() { QMessageBox::warning(this, "Firewall Builder", tr("Input not valid: %1").arg(message), "&Continue", - QString::null, QString::null, 0, 1); + QString(), QString(), 0, 1); focus->setFocus(); } return valid; diff --git a/src/libgui/platforms.cpp b/src/libgui/platforms.cpp index b43a01acb..9e363f42a 100644 --- a/src/libgui/platforms.cpp +++ b/src/libgui/platforms.cpp @@ -917,7 +917,7 @@ void setPlatform(QComboBox *platform, const QString &pl) platform_keys.push_back(key); } - qSort(platform_keys); + std::sort(begin(platform_keys), end(platform_keys)); QStringList::iterator iter; int ind = 0; diff --git a/src/libgui/secuwallosAdvancedDialog.cpp b/src/libgui/secuwallosAdvancedDialog.cpp index dcd93dac1..366f1fa4e 100644 --- a/src/libgui/secuwallosAdvancedDialog.cpp +++ b/src/libgui/secuwallosAdvancedDialog.cpp @@ -321,7 +321,7 @@ void secuwallosAdvancedDialog::buttonOpenURLClicked() { QMessageBox::warning (this, "Firewall Builder", - message, "&Continue", QString::null, QString::null, 0, 1); + message, "&Continue", QString(), QString(), 0, 1); } } @@ -417,7 +417,7 @@ bool secuwallosAdvancedDialog::validate() // display errror message QMessageBox::warning(this, "Firewall Builder", tr("Input not valid: %1").arg(message), "&Continue", - QString::null, QString::null, 0, 1); + QString(), QString(), 0, 1); } return valid; } diff --git a/src/libgui/upgradePredicate.h b/src/libgui/upgradePredicate.h index f4a39123a..aaf101101 100644 --- a/src/libgui/upgradePredicate.h +++ b/src/libgui/upgradePredicate.h @@ -52,7 +52,7 @@ directory with extension '.bak'.\n\ Are you sure you want to open it?"), QObject::tr("&Upgrade"), QObject::tr("&Do not load the file"), - QString::null, + QString(), 0, 1 )==0; } }; diff --git a/src/libgui/utils.cpp b/src/libgui/utils.cpp index b00f6b8a2..6475972ea 100644 --- a/src/libgui/utils.cpp +++ b/src/libgui/utils.cpp @@ -97,7 +97,7 @@ QAction* addPopupMenuItem(QObject *res, if(icn!="") { // pm = QPixmap::fromMimeSource( icn.c_str() ); - if ( ! QPixmapCache::find( icn.c_str(), pm) ) + if ( ! QPixmapCache::find( icn.c_str(), &pm) ) { pm.load( (":/"+icn).c_str() );//fromMimeSource( icn.c_str() ); QPixmapCache::insert( icn.c_str(), pm); @@ -453,7 +453,7 @@ void loadIcon(QPixmap &pm, FWObject *obj) void LoadPixmap(const QString &path, QPixmap &pm) { - if ( ! QPixmapCache::find( path, pm ) ) + if ( ! QPixmapCache::find( path, &pm ) ) { pm.load( path ); if (pm.width() == 0) @@ -624,6 +624,6 @@ static bool stringsCompare(const QString &a, const QString &b) QStringList sortStrings(const QStringList &list) { QStringList ret = list; - qSort(ret.begin(), ret.end(), stringsCompare); + std::sort(ret.begin(), ret.end(), stringsCompare); return ret; } diff --git a/src/libgui/vlanOnlyIfaceOptsDialog.cpp b/src/libgui/vlanOnlyIfaceOptsDialog.cpp index 1c0420193..e4dc2fa79 100644 --- a/src/libgui/vlanOnlyIfaceOptsDialog.cpp +++ b/src/libgui/vlanOnlyIfaceOptsDialog.cpp @@ -170,7 +170,7 @@ bool vlanOnlyIfaceOptsDialog::validate() { QMessageBox::warning(this, "Firewall Builder", tr("Input not valid: %1").arg(message), "&Continue", - QString::null, QString::null, 0, 1); + QString(), QString(), 0, 1); focus->setFocus(); } return valid; diff --git a/src/libgui/vrrpOptionsDialog.cpp b/src/libgui/vrrpOptionsDialog.cpp index cdcc75e09..3fe59774b 100644 --- a/src/libgui/vrrpOptionsDialog.cpp +++ b/src/libgui/vrrpOptionsDialog.cpp @@ -114,7 +114,7 @@ bool vrrpOptionsDialog::validate() { QMessageBox::warning(this, "Firewall Builder", tr("Input not valid: %1").arg(message), "&Continue", - QString::null, QString::null, 0, 1); + QString(), QString(), 0, 1); focus->setFocus(); } return valid; diff --git a/src/pflib/OSConfigurator_bsd_interfaces.cpp b/src/pflib/OSConfigurator_bsd_interfaces.cpp index 796df90ee..a18d4e00c 100644 --- a/src/pflib/OSConfigurator_bsd_interfaces.cpp +++ b/src/pflib/OSConfigurator_bsd_interfaces.cpp @@ -670,7 +670,7 @@ QString OSConfigurator_bsd::printAllInterfaceConfigurationLines() { QStringList keys = interface_configuration_lines.keys(); //keys.sort(); - qSort(keys.begin(), keys.end(), sort_interface_names); + std::sort(keys.begin(), keys.end(), sort_interface_names); QStringList res; foreach (QString iface, keys) res << interface_configuration_lines[iface].join("\n");