1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Examples: Fix unused variable warnings by Clang

Browse Source 
mainwindow.cpp(59,11):  warning: unused variable 'ROWS' [-Wunused-const-variable]
const int ROWS = 2;
mainwindow.cpp(60,11):  warning: unused variable 'COLUMNS' [-Wunused-const-variable]
const int COLUMNS = 3;
mainwindow.cpp(76,19):  warning: unused variable 'message' [-Wunused-const-variable]

Task-number: QTBUG-60635
Change-Id: I97c31462ffa826da9baa32c33c0ff0140bf46dfc
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
This commit is contained in:
Friedemann Kleint 2018-04-27 15:29:08 +02:00
parent 01c12a5c1a
commit 3e4b7223f1
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/widgets/mainwindows/mainwindow/mainwindow.cpp
View File

@ -187,6 +187,13 @@ void MainWindow::setupMenuBar()
#endif #endif
dockWidgetMenu = menuBar()->addMenu(tr("&Dock Widgets")); dockWidgetMenu = menuBar()->addMenu(tr("&Dock Widgets"));
QMenu *aboutMenu = menuBar()->addMenu(tr("About"));
QAction *aboutAct = aboutMenu->addAction(tr("&About"), this, &MainWindow::about);
aboutAct->setStatusTip(tr("Show the application's About box"));
QAction *aboutQtAct = aboutMenu->addAction(tr("About &Qt"), qApp, &QApplication::aboutQt);
aboutQtAct->setStatusTip(tr("Show the Qt library's About box"));
} }
void MainWindow::setDockOptions() void MainWindow::setDockOptions()
@ -476,3 +483,8 @@ void MainWindow::destroyDockWidget(QAction *action)
if (destroyDockWidgetMenu->isEmpty()) if (destroyDockWidgetMenu->isEmpty())
destroyDockWidgetMenu->setEnabled(false); destroyDockWidgetMenu->setEnabled(false);
} }
void MainWindow::about()
{
QMessageBox::about(this, tr("About MainWindows"), message);
}

2
examples/widgets/mainwindows/mainwindow/mainwindow.h
View File

@ -77,6 +77,8 @@ public slots:
void createDockWidget(); void createDockWidget();
void destroyDockWidget(QAction *action); void destroyDockWidget(QAction *action);
void about();
private: private:
void setupToolBar(); void setupToolBar();
void setupMenuBar(); void setupMenuBar();

4
examples/widgets/tutorials/modelview/6_treeview/mainwindow.cpp
View File

@ -55,10 +55,6 @@
#include <QStandardItem> #include <QStandardItem>
#include "mainwindow.h" #include "mainwindow.h"
const int ROWS = 2;
const int COLUMNS = 3;
MainWindow::MainWindow(QWidget *parent) MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent) : QMainWindow(parent)
{ {