diff options
author | Simon Rettberg | 2018-07-24 13:08:25 +0200 |
---|---|---|
committer | Simon Rettberg | 2018-07-24 13:08:25 +0200 |
commit | 9ba63d1460db41c219b638212b42476164fcfdff (patch) | |
tree | 55e3249c18c50ec8e90278e639732988845c990c /src/server/mainwindow/mainwindow.h | |
parent | [server] Fix logic error (diff) | |
download | pvs2-9ba63d1460db41c219b638212b42476164fcfdff.tar.gz pvs2-9ba63d1460db41c219b638212b42476164fcfdff.tar.xz pvs2-9ba63d1460db41c219b638212b42476164fcfdff.zip |
Update code style, fix compiler warnings
- Use nullptr instead of NULL for better warnings in case of mistakes
- Get rid of VLAs which are not in C++11 actually
- Fix implicit signed <-> unsigned mismatches by adding checks and casts
Diffstat (limited to 'src/server/mainwindow/mainwindow.h')
-rw-r--r-- | src/server/mainwindow/mainwindow.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h index 4e99747..43804a7 100644 --- a/src/server/mainwindow/mainwindow.h +++ b/src/server/mainwindow/mainwindow.h @@ -44,8 +44,8 @@ private: Qt::ToolBarArea _tbArea; int _tilesX; int _tilesY; - QImage* _backgroundImage = NULL; - QLabel* _examModeLabel = NULL; + QImage* _backgroundImage = nullptr; + QLabel* _examModeLabel = nullptr; /* virtual columns to preserve the aspect ratio of the loaded room */ @@ -79,7 +79,7 @@ private: QPoint closestFreeSlot(QPoint preferredPixels, ConnectionFrame* toIgnore); void placeFrameInFreeSlot(ConnectionFrame* frame, QPoint preferred = QPoint(-1, -1)); - ConnectionFrame* createFrame(const QString &computerId = QString(), const QPoint *gridPosition = NULL, bool fromRoomplan = false); + ConnectionFrame* createFrame(const QString &computerId = QString(), const QPoint *gridPosition = nullptr, bool fromRoomplan = false); void savePosition(ConnectionFrame *cf); void startVncServerIfNecessary(int from); void tellClientCurrentSituation(Client* client); |