onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-06-23 17:39:35 +02:00
Code Issues Releases Wiki Activity

fix: Stop using deprecated Qt methods

Browse Source
This commit is contained in:
Sirius Bakke
2019-07-22 17:08:51 +00:00
parent df4068f3b2
commit bb3a67b3ec
64 changed files with 147 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/import/PFImporter.cpp
View File

@@ -482,7 +482,7 @@ void PFImporter::convertTcpFlags(QList<int> &flags_list,
"are not supported."));
}
}
qSort(flags_list);
std::sort(begin(flags_list), end(flags_list));
}
FWObject* PFImporter::makeAddressObj(AddressSpec &as)

4
src/import/objectSignature.cpp
View File

@@ -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;
}

2
src/libgui/ActionsDialog.cpp
View File

@@ -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;

2
src/libgui/AskLibForCopyDialog.cpp
View File

@@ -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);

4
src/libgui/ClusterDialog.cpp
View File

@@ -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);
}

8
src/libgui/ClusterGroupDialog.cpp
View File

@@ -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;
}
}

6
src/libgui/ClusterInterfaceWidget.cpp
View File

@@ -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<Interface*>()))
@@ -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;
}
}

2
src/libgui/ClusterInterfacesSelectorWidget.cpp
View File

@@ -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;
}
}

4
src/libgui/DynamicGroupDialog.cpp
View File

@@ -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);
}

2
src/libgui/FWObjectDrag.cpp
View File

@@ -138,5 +138,5 @@ bool FWObjectDrag::decode( QDragEnterEvent *ev, list<FWObject*> &ol)
Qt::DropAction FWObjectDrag::start(Qt::DropActions action)
{
if (fwbdebug) qDebug("FWObjectDrag::start"/*, action*/);
return QDrag::start(action);
return QDrag::exec(action);
}

2
src/libgui/FWObjectDropArea.cpp
View File

@@ -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);

2
src/libgui/FWWindowPrint.cpp
View File

@@ -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"));

4
src/libgui/FindObjectWidget.cpp
View File

@@ -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;
}

2
src/libgui/FindWhereUsedWidget.cpp
View File

@@ -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];

8
src/libgui/FirewallDialog.cpp
View File

@@ -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;
}

2
src/libgui/FirewallInstallerCisco.cpp
View File

@@ -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;
}

2
src/libgui/FirewallInstallerJuniper.cpp
View File

@@ -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;
}

2
src/libgui/FirewallInstallerProcurve.cpp
View File

@@ -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;
}

2
src/libgui/FirewallInstallerUnx.cpp
View File

@@ -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;
}

10
src/libgui/FirewallSelectorWidget.cpp
View File

@@ -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;
}

2
src/libgui/GroupObjectDialog.cpp
View File

@@ -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);

2
src/libgui/HostDialog.cpp
View File

@@ -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);
}

4
src/libgui/IPv4Dialog.cpp
View File

@@ -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;
}
}

4
src/libgui/IPv6Dialog.cpp
View File

@@ -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;
}
}

8
src/libgui/InterfaceDialog.cpp
View File

@@ -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;
}

6
src/libgui/InterfaceEditorWidget.cpp
View File

@@ -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);
}

2
src/libgui/KeywordsDialog.cpp
View File

@@ -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;
}

2
src/libgui/LibExportDialog.cpp
View File

@@ -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);

4
src/libgui/ObjectIconView.cpp
View File

@@ -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);
}

4
src/libgui/ObjectListView.cpp
View File

@@ -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);

4
src/libgui/ObjectManipulator.cpp
View File

@@ -1203,7 +1203,7 @@ void ObjectManipulator::filterFirewallsFromSelection(vector<FWObject*> &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;

4
src/libgui/ObjectManipulator_create_new.cpp
View File

@@ -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;
}

8
src/libgui/ObjectManipulator_ops.cpp
View File

@@ -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;
}

2
src/libgui/ObjectManipulator_slots.cpp
View File

@@ -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;
}

2
src/libgui/ObjectTreeView.cpp
View File

@@ -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);

4
src/libgui/PrintingController.cpp
View File

@@ -194,7 +194,7 @@ int PrintingController::addObjectsToTable(list<FWObject*> &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);

40
src/libgui/ProjectPanel_file_ops.cpp
View File

@@ -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<FWObject*> &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 );
}
}

4
src/libgui/RCS.cpp
View File

@@ -423,7 +423,7 @@ RCS::RCS(const QString &file)
}
// sort list revisions; its defined like this:
// QList<Revision> 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;

4
src/libgui/RuleSetModel.cpp
View File

@@ -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;
}

14
src/libgui/RuleSetView.cpp
View File

@@ -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<QModelIndex> groups = itemsInGroups.keys();
qSort(groups);
std::sort(begin(groups), end(groups));
QListIterator<QModelIndex> 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;

4
src/libgui/SimpleTextEditor.cpp
View File

@@ -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;
}

10
src/libgui/TextFileEditor.cpp
View File

@@ -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)

2
src/libgui/clusterMembersDialog.cpp
View File

@@ -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);

2
src/libgui/findDialog.cpp
View File

@@ -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;
}

2
src/libgui/importAddressListWizard/ChooseObjectsPage.cpp
View File

@@ -73,7 +73,7 @@ void ChooseObjectsPage::initializePage()
{
QMessageBox::critical( nullptr , "Firewall Builder",
ex.toString().c_str(),
QString::null,QString::null);
QString(),QString());
}
}

4
src/libgui/importAddressListWizard/FileNamePage.cpp
View File

@@ -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;
}

4
src/libgui/importFirewallConfigurationWizard/IC_FileNamePage.cpp
View File

@@ -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;
}

2
src/libgui/instDialog_compile.cpp
View File

@@ -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
}

2
src/libgui/instDialog_ui_ops.cpp
View File

@@ -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);

2
src/libgui/linux24IfaceOptsDialog.cpp
View File

@@ -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;

4
src/libgui/listOfLibrariesModel.cpp
View File

@@ -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)

2
src/libgui/newClusterDialog.cpp
View File

@@ -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;
}
}

20
src/libgui/newFirewallDialog.cpp
View File

@@ -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;

2
src/libgui/newFirewallDialog_from_template.cpp
View File

@@ -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];

12
src/libgui/newHostDialog.cpp
View File

@@ -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;

2
src/libgui/pixFailoverOptionsDialog.cpp
View File

@@ -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;

2
src/libgui/pixosIfaceOptsDialog.cpp
View File

@@ -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;

2
src/libgui/platforms.cpp
View File

@@ -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;

4
src/libgui/secuwallosAdvancedDialog.cpp
View File

@@ -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;
}

2
src/libgui/upgradePredicate.h
View File

@@ -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;
}
};

6
src/libgui/utils.cpp
View File

@@ -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;
}

2
src/libgui/vlanOnlyIfaceOptsDialog.cpp
View File

@@ -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;

2
src/libgui/vrrpOptionsDialog.cpp
View File

@@ -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;

2
src/pflib/OSConfigurator_bsd_interfaces.cpp
View File

@@ -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");