From cf9f1be37ec6e597f98047576f16da7ee5c87e13 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Fri, 20 May 2016 18:04:08 +0100
Subject: [PATCH] fix very divese Qt3Support warnings
---
MantidPlot/src/ApplicationWindow.cpp | 148 +++++++++++++--------------
1 file changed, 74 insertions(+), 74 deletions(-)
diff --git a/MantidPlot/src/ApplicationWindow.cpp b/MantidPlot/src/ApplicationWindow.cpp
index e5edce7347e..826ea20fe6a 100644
--- a/MantidPlot/src/ApplicationWindow.cpp
+++ b/MantidPlot/src/ApplicationWindow.cpp
@@ -13674,8 +13674,8 @@ Graph3D *ApplicationWindow::openMatrixPlot3D(const QString &caption,
double xl, double xr, double yl,
double yr, double zl, double zr) {
QString name = matrix_name;
- name.remove("matrix<", true);
- name.remove(">");
+ name.remove("matrix<", Qt::CaseSensitive);
+ name.remove(">", Qt::CaseSensitive);
Matrix *m = matrix(name);
if (!m)
return 0;
@@ -13876,7 +13876,7 @@ ApplicationWindow *ApplicationWindow::importOPJ(const QString &filename,
app->setWindowTitle("MantidPlot - " + filename); // Mantid
app->restoreApplicationGeometry();
app->projectname = filename;
- app->recentProjects.remove(filename);
+ app->recentProjects.removeAll(filename);
app->recentProjects.push_front(filename);
app->updateRecentProjectsList();
@@ -13889,7 +13889,7 @@ ApplicationWindow *ApplicationWindow::importOPJ(const QString &filename,
filename.endsWith(".ogw", Qt::CaseInsensitive)) {
// cppcheck-suppress unusedScopedObject
ImportOPJ(this, filename);
- recentProjects.remove(filename);
+ recentProjects.removeAll(filename);
recentProjects.push_front(filename);
updateRecentProjectsList();
return this;
@@ -13901,12 +13901,12 @@ void ApplicationWindow::deleteFitTables() {
QList<QWidget *> *mLst = new QList<QWidget *>();
QList<MdiSubWindow *> windows = windowsList();
foreach (MdiSubWindow *w, windows) {
- if (w->isA("MultiLayer"))
+ if (QString(w->metaObject()->className()) == "MultiLayer")
mLst->append(w);
}
foreach (QWidget *ml, *mLst) {
- if (ml->isA("MultiLayer")) {
+ if (QString(ml->metaObject()->className()) == "MultiLayer") {
auto cml = dynamic_cast<MultiLayer *>(ml);
if (!cml)
continue;
@@ -13984,8 +13984,8 @@ void ApplicationWindow::updateRecentProjectsList() {
recentProjectsMenu->clear();
for (int i = 0; i < (int)recentProjects.size(); i++)
- recentProjectsMenu->insertItem("&" + QString::number(i + 1) + " " +
- recentProjects[i]);
+ recentProjectsMenu->addAction("&" + QString::number(i + 1) + " " +
+ recentProjects[i]);
}
void ApplicationWindow::updateRecentFilesList(QString fname) {
@@ -14024,10 +14024,10 @@ void ApplicationWindow::updateRecentFilesList(QString fname) {
// The file property could not parse the string, use as is
ostr << "&" << menuCount << " " << recentFiles[i].toStdString();
}
- QMenuItem *mi = new QMenuItem;
- mi->setText(QString::fromStdString(ostr.str()));
- mi->setData(recentFiles[i]);
- recentFilesMenu->insertItem(mi);
+ QString actionText = QString::fromStdString(ostr.str());
+ QAction *ma = new QAction(actionText, nullptr);
+ ma->setData(recentFiles[i]);
+ recentFilesMenu->addAction(ma);
menuCount++;
}
}
@@ -14229,9 +14229,9 @@ void ApplicationWindow::fitMultiPeak(int profile) {
return;
} else {
bool ok;
- int peaks = QInputDialog::getInteger(
+ int peaks = QInputDialog::getInteger(this,
tr("MantidPlot - Enter the number of peaks"), // Mantid
- tr("Peaks"), 2, 2, 1000000, 1, &ok, this);
+ tr("Peaks"), 2, 2, 1000000, 1, &ok);
if (ok && peaks) {
g->setActiveTool(
new MultiPeakFitTool(g, this, (MultiPeakFit::PeakProfile)profile,
@@ -14302,7 +14302,7 @@ void ApplicationWindow::parseCommandLineArguments(const QStringList &args) {
(str == "-r" || str == "--revision") ||
(str == "-a" || str == "--about") || (str == "-h" || str == "--help")) {
g_log.warning()
- << str.ascii()
+ << str.latin1()
<< ": This command line option must be used without other arguments!";
} else if ((str == "-d" || str == "--default-settings")) {
default_settings = true;
@@ -14320,7 +14320,7 @@ void ApplicationWindow::parseCommandLineArguments(const QStringList &args) {
else if (file_name.isEmpty() &&
(str.startsWith("-") || str.startsWith("--"))) {
g_log.warning()
- << "'" << str.ascii() << "' unknown command line option!\n"
+ << "'" << str.latin1() << "' unknown command line option!\n"
<< "Type 'MantidPlot -h'' to see the list of the valid options.";
unknown_opt_found = true;
break;
@@ -14360,7 +14360,7 @@ void ApplicationWindow::parseCommandLineArguments(const QStringList &args) {
return;
}
- workingDir = fi.dirPath(true);
+ workingDir = fi.absolutePath();
saveSettings(); // the recent projects must be saved
QStringList cmdArgs = args;
@@ -14402,11 +14402,11 @@ void ApplicationWindow::createLanguagesList() {
QString qmPath = d_translations_folder;
QDir dir(qmPath);
- QStringList fileNames = dir.entryList("qtiplot_*.qm");
+ QStringList fileNames = dir.entryList(QStringList("qtiplot_*.qm"));
for (int i = 0; i < (int)fileNames.size(); i++) {
QString locale = fileNames[i];
- locale = locale.mid(locale.find('_') + 1);
- locale.truncate(locale.find('.'));
+ locale = locale.mid(locale.indexOf('_') + 1);
+ locale.truncate(locale.indexOf('.'));
locales.push_back(locale);
}
locales.push_back("en");
@@ -14451,7 +14451,7 @@ QStringList ApplicationWindow::matrixNames() {
while (f) {
QList<MdiSubWindow *> folderWindows = f->windowsList();
foreach (MdiSubWindow *w, folderWindows) {
- if (w->isA("Matrix"))
+ if (QString(w->metaObject()->className()) == "Matrix")
names << w->objectName();
}
f = f->folderBelow();
@@ -14464,7 +14464,7 @@ QStringList ApplicationWindow::mantidmatrixNames() {
while (f) {
QList<MdiSubWindow *> folderWindows = f->windowsList();
foreach (MdiSubWindow *w, folderWindows) {
- if (w->isA("MantidMatrix"))
+ if (QString(w->metaObject()->className()) == "MantidMatrix")
names << w->objectName();
}
f = f->folderBelow();
@@ -14490,7 +14490,7 @@ bool ApplicationWindow::projectHas2DPlots() {
while (f) {
QList<MdiSubWindow *> folderWindows = f->windowsList();
foreach (MdiSubWindow *w, folderWindows) {
- if (w->isA("MultiLayer"))
+ if (QString(w->metaObject()->className()) == "MultiLayer")
return true;
}
f = f->folderBelow();
@@ -14526,7 +14526,7 @@ Folder *ApplicationWindow::appendProject(const QString &fn,
}
QTextStream fileTS(&file);
- fileTS.setEncoding(QTextStream::UnicodeUTF8);
+ fileTS.setCodec(QTextCodec::codecForName("UTF-8"));
QString baseName = fileInfo.fileName();
@@ -14623,18 +14623,18 @@ void ApplicationWindow::saveProjectFile(Folder *folder, const QString &fn,
text += saveProjectFolder(folder, windowCount, true);
text.prepend("<windows>\t" + QString::number(windowCount) + "\n");
- text.prepend("<scripting-lang>\t" + QString(scriptingEnv()->name()) + "\n");
+ text.prepend("<scripting-lang>\t" + QString(scriptingEnv()->objectName()) + "\n");
text.prepend("MantidPlot " + QString::number(maj_version) + "." +
QString::number(min_version) + "." +
QString::number(patch_version) + " project file\n");
QTextStream t(&f);
- t.setEncoding(QTextStream::UnicodeUTF8);
+ t.setCodec(QTextCodec::codecForName("UTF-8"));
t << text;
f.close();
if (compress) {
- file_compress(fn.ascii(), "w9");
+ file_compress(fn.latin1(), "w9");
}
QApplication::restoreOverrideCursor();
@@ -14653,7 +14653,7 @@ void ApplicationWindow::saveFolderAsProject(Folder *f) {
this, tr("Save project as"), workingDir, filter, &selectedFilter);
if (!fn.isEmpty()) {
QFileInfo fi(fn);
- workingDir = fi.dirPath(true);
+ workingDir = fi.absolutePath();
QString baseName = fi.fileName();
if (!baseName.contains("."))
fn.append(".qti");
@@ -14673,26 +14673,25 @@ void ApplicationWindow::showFolderPopupMenu(QTreeWidgetItem *it, const QPoint &p
QMenu cm(this);
QMenu window(this);
QMenu viewWindowsMenu(this);
- viewWindowsMenu.setCheckable(true);
cm.insertItem(tr("&Find..."), this, SLOT(showFindDialogue()));
cm.insertSeparator();
- cm.insertItem(tr("App&end Project..."), this, SLOT(appendProject()));
+ cm.addAction(tr("App&end Project..."), this, SLOT(appendProject()));
auto fli = dynamic_cast<FolderListItem *>(it);
if (!fli)
return;
if (fli->folder()->parent())
- cm.insertItem(tr("Save &As Project..."), this, SLOT(saveAsProject()));
+ cm.addAction(tr("Save &As Project..."), this, SLOT(saveAsProject()));
else
- cm.insertItem(tr("Save Project &As..."), this, SLOT(saveProjectAs()));
- cm.insertSeparator();
+ cm.addAction(tr("Save Project &As..."), this, SLOT(saveProjectAs()));
+ cm.addSeparator();
if (fromFolders && show_windows_policy != HideAll) {
- cm.insertItem(tr("&Show All Windows"), this, SLOT(showAllFolderWindows()));
- cm.insertItem(tr("&Hide All Windows"), this, SLOT(hideAllFolderWindows()));
- cm.insertSeparator();
+ cm.addAction(tr("&Show All Windows"), this, SLOT(showAllFolderWindows()));
+ cm.addAction(tr("&Hide All Windows"), this, SLOT(hideAllFolderWindows()));
+ cm.addSeparator();
}
if (fromFolders) {
@@ -14703,20 +14702,20 @@ void ApplicationWindow::showFolderPopupMenu(QTreeWidgetItem *it, const QPoint &p
window.addAction(actionNewFunctionPlot);
window.addAction(actionNewSurfacePlot);
window.addAction(actionNewTiledWindow);
- cm.insertItem(tr("New &Window"), &window);
+ cm.addMenu(&window)->setText(tr("New &Window"));
}
QStringList lst;
lst << tr("&None") << tr("&Windows in Active Folder");
for (int i = 0; i < lst.size(); ++i) {
- int id = viewWindowsMenu.insertItem(lst[i], this,
- SLOT(setShowWindowsPolicy(int)));
- viewWindowsMenu.setItemParameter(id, i);
- viewWindowsMenu.setItemChecked(id, show_windows_policy == i);
- }
- cm.insertItem(tr("&View Windows"), &viewWindowsMenu);
- cm.insertSeparator();
- cm.insertItem(tr("&Properties..."), this, SLOT(folderProperties()));
+ auto action = viewWindowsMenu.addAction(lst[i], this,
+ SLOT(setShowWindowsPolicy(int)));
+ action->setData(i);
+ action->setChecked(show_windows_policy == i);
+ }
+ cm.addMenu(&viewWindowsMenu)->setText(tr("&View Windows"));
+ cm.addSeparator();
+ cm.addAction(tr("&Properties..."), this, SLOT(folderProperties()));
if (fromFolders) {
cm.exec(folders->mapToGlobal(p));
} else {
@@ -14850,7 +14849,7 @@ void ApplicationWindow::addFolder() {
QStringList lst = currentFolder()->subfolders();
QString name = tr("New Folder");
- lst = lst.grep(name);
+ lst = lst.filter(name);
if (!lst.isEmpty())
name += " (" + QString::number(lst.size() + 1) + ")";
@@ -14872,7 +14871,7 @@ Folder *ApplicationWindow::addFolder(QString name, Folder *parent) {
}
QStringList lst = parent->subfolders();
- lst = lst.grep(name);
+ lst = lst.filter(name);
if (!lst.isEmpty())
name += " (" + QString::number(lst.size() + 1) + ")";
@@ -15093,10 +15092,10 @@ bool ApplicationWindow::changeFolder(Folder *newFolder, bool force) {
active_window->showMinimized(); // ws->setActiveWindow() makes minimized
// windows to be shown normally
else if (active_window_state == MdiSubWindow::Maximized) {
- if (active_window->isA("Graph3D"))
+ if (QString(active_window->metaObject()->className()) == "Graph3D")
static_cast<Graph3D *>(active_window)->setIgnoreFonts(true);
active_window->showMaximized();
- if (active_window->isA("Graph3D"))
+ if (QString(active_window->metaObject()->className()) == "Graph3D")
static_cast<Graph3D *>(active_window)->setIgnoreFonts(false);
}
}
@@ -15124,25 +15123,25 @@ void ApplicationWindow::addListViewItem(MdiSubWindow *w) {
return;
WindowListItem *it = new WindowListItem(lv, w);
- if (w->isA("Matrix")) {
+ if (QString(w->metaObject()->className()) == "Matrix") {
it->setIcon(0, getQPixmap("matrix_xpm"));
it->setText(1, tr("Matrix"));
} else if (w->inherits("Table")) {
it->setIcon(0, getQPixmap("worksheet_xpm"));
it->setText(1, tr("Table"));
- } else if (w->isA("Note")) {
+ } else if (QString(w->metaObject()->className()) == "Note") {
it->setIcon(0, getQPixmap("note_xpm"));
it->setText(1, tr("Note"));
- } else if (w->isA("MultiLayer")) {
+ } else if (QString(w->metaObject()->className()) == "MultiLayer") {
it->setIcon(0, getQPixmap("graph_xpm"));
it->setText(1, tr("Graph"));
- } else if (w->isA("Graph3D")) {
+ } else if (QString(w->metaObject()->className()) == "Graph3D") {
it->setIcon(0, getQPixmap("trajectory_xpm"));
it->setText(1, tr("3D Graph"));
- } else if (w->isA("MantidMatrix")) {
+ } else if (QString(w->metaObject()->className()) == "MantidMatrix") {
it->setIcon(0, getQPixmap("mantid_matrix_xpm"));
it->setText(1, tr("Workspace"));
- } else if (w->isA("InstrumentWindow")) {
+ } else if (QString(w->metaObject()->className()) == "InstrumentWindow") {
it->setText(1, tr("Instrument"));
} else {
it->setText(1, tr("Custom window"));
@@ -15175,19 +15174,19 @@ void ApplicationWindow::windowProperties() {
s += tr("Label") + ": " + static_cast<MdiSubWindow *>(w)->windowLabel() +
"\n\n";
- if (w->isA("Matrix")) {
+ if (QString(w->metaObject()->className()) == "Matrix") {
mbox->setIconPixmap(getQPixmap("matrix_xpm"));
s += tr("Type") + ": " + tr("Matrix") + "\n\n";
- } else if (w->inherits("Table")) {
+ } else if (QString(w->metaObject()->className()) == "Table") {
mbox->setIconPixmap(getQPixmap("worksheet_xpm"));
s += tr("Type") + ": " + tr("Table") + "\n\n";
- } else if (w->isA("Note")) {
+ } else if (QString(w->metaObject()->className()) == "Note") {
mbox->setIconPixmap(getQPixmap("note_xpm"));
s += tr("Type") + ": " + tr("Note") + "\n\n";
- } else if (w->isA("MultiLayer")) {
+ } else if (QString(w->metaObject()->className()) == "MultiLayer") {
mbox->setIconPixmap(getQPixmap("graph_xpm"));
s += tr("Type") + ": " + tr("Graph") + "\n\n";
- } else if (w->isA("Graph3D")) {
+ } else if (QString(w->metaObject()->className()) == "Graph3D") {
mbox->setIconPixmap(getQPixmap("trajectory_xpm"));
s += tr("Type") + ": " + tr("3D Graph") + "\n\n";
}
@@ -15284,7 +15283,7 @@ void ApplicationWindow::goToRow() {
if (!w)
return;
- if (w->inherits("Table") || w->isA("Matrix")) {
+ if (w->inherits("Table") || QString(w->metaObject()->className()) == "Matrix") {
bool ok;
int row = QInputDialog::getInteger(
this, tr("MantidPlot - Enter row number"), tr("Row"), // Mantid
@@ -15309,7 +15308,7 @@ void ApplicationWindow::goToColumn() {
if (!w)
return;
- if (w->inherits("Table") || w->isA("Matrix")) {
+ if (w->inherits("Table") || QString(w->metaObject()->className()) == "Matrix") {
bool ok;
int col = QInputDialog::getInteger(
this, tr("MantidPlot - Enter column number"), tr("Column"), // Mantid
@@ -15461,7 +15460,7 @@ void ApplicationWindow::cascade() {
if (!innerWidget) {
throw std::runtime_error("A non-MdiSubWindow detected in the MDI area");
}
- w->setActiveWindow();
+ w->activateWindow();
innerWidget->setNormal();
w->setGeometry(x, y, w->geometry().width(), w->geometry().height());
w->raise();
@@ -15660,7 +15659,7 @@ MultiLayer *ApplicationWindow::generate2DGraph(Graph::CurveType type) {
return multilayerPlot(table, table->selectedColumns(), type,
table->topSelectedRow(), table->bottomSelectedRow());
- } else if (w->isA("Matrix")) {
+ } else if (QString(w->metaObject()->className()) == "Matrix") {
Matrix *m = static_cast<Matrix *>(w);
return plotHistogram(m);
}
@@ -15827,7 +15826,7 @@ void ApplicationWindow::setToolbars() {
plotTools->setVisible(d_plot_tool_bar);
displayBar->setVisible(d_display_tool_bar);
formatToolBar->setVisible(d_format_tool_bar);
- plotTools->setEnabled(w && w->isA("MultiLayer"));
+ plotTools->setEnabled(w && QString(w->metaObject()->className()) == "MultiLayer");
}
void ApplicationWindow::saveFitFunctions(const QStringList &lst) {
@@ -15856,10 +15855,10 @@ void ApplicationWindow::saveFitFunctions(const QStringList &lst) {
if (!s.isEmpty()) {
NonLinearFit *fit = new NonLinearFit(this, 0);
- int pos1 = s.find("(", 0);
+ int pos1 = s.indexOf("(", 0);
fit->setObjectName(s.left(pos1));
- int pos2 = s.find(")", pos1);
+ int pos2 = s.indexOf(")", pos1);
QString par = s.mid(pos1 + 4, pos2 - pos1 - 4);
QStringList paramList =
par.split(QRegExp("[,;]+[\\s]*"), QString::SkipEmptyParts);
@@ -16263,11 +16262,12 @@ void ApplicationWindow::addUserMenu(const QString &topMenu) {
QMenu *customMenu = new QMenu(topMenu);
customMenu->setTitle(topMenu);
- customMenu->setName(topMenu);
+ customMenu->setObjectName(topMenu.toAscii().constData());
connect(customMenu, SIGNAL(triggered(QAction *)), this,
SLOT(performCustomAction(QAction *)));
d_user_menus.append(customMenu);
myMenuBar()->insertItem(tr(topMenu), customMenu);
+ myMenuBar()->addMenu(customMenu)->setText(tr(topMenu.toAscii().constData()));
}
void ApplicationWindow::addUserMenuAction(const QString &parentMenu,
@@ -16287,13 +16287,13 @@ void ApplicationWindow::addUserMenuAction(const QString &parentMenu,
return;
}
- QAction *scriptAction = new QAction(tr(niceName), topMenu);
+ QAction *scriptAction = new QAction(tr(niceName.toAscii().constData()), topMenu);
scriptAction->setData(itemData);
topMenu->addAction(scriptAction);
d_user_actions.append(scriptAction);
// Remove name from the list of removed interfaces if applicable
- removed_interfaces.remove(niceName);
+ removed_interfaces.removeAll(niceName);
}
void ApplicationWindow::removeUserMenu(const QString &parentMenu) {
@@ -16346,7 +16346,7 @@ QList<QMenu *> ApplicationWindow::menusList() {
QList<QMenu *> lst;
QObjectList children = this->children();
foreach (QObject *w, children) {
- if (w->isA("QMenu"))
+ if (QString(w->metaObject()->className()) == "QMenu")
lst << static_cast<QMenu *>(w);
}
return lst;
@@ -16359,7 +16359,7 @@ QList<QToolBar *> ApplicationWindow::toolBarsList() const {
QList<QToolBar *> lst;
QObjectList children = this->children();
foreach (QObject *w, children) {
- if (w->isA("QToolBar"))
+ if (QString(w->metaObject()->className()) == "QToolBar")
lst << static_cast<QToolBar *>(w);
}
return lst;
@@ -16450,7 +16450,7 @@ QString ApplicationWindow::endOfLine() {
*/
void ApplicationWindow::customMultilayerToolButtons(MultiLayer *w) {
if (!w) {
- btnPointer->setOn(true);
+ btnPointer->setChecked(true);
return;
}
@@ -16458,7 +16458,7 @@ void ApplicationWindow::customMultilayerToolButtons(MultiLayer *w) {
if (g) {
PlotToolInterface *tool = g->activeTool();
if (g->zoomOn())
- btnZoomIn->setOn(true);
+ btnZoomIn->setChecked(true);
else if (g->areRangeSelectorsOn()) {
} else if (dynamic_cast<PeakPickerTool *>(tool))
--
GitLab