Use nullptr in place of 0 or NULL

[libs/gui.git] / source / graphics / monitor.h

diff --git a/source/graphics/monitor.h b/source/graphics/monitor.h
index d5e49bb3dbb210bc420f0bef3ff7e050b2cf728a..b74cea898a6398390cce90d21ad20bcea06fb000 100644 (file)
--- a/source/graphics/monitor.h
+++ b/source/graphics/monitor.h
@@ -3,19 +3,28 @@
 
 #include <list>
 #include <string>
+#include "videomode.h"
 
 namespace Msp {
 namespace Graphics {
 
-struct VideoMode;
-
 struct Monitor
 {
-       unsigned index;
-       std::list<const VideoMode *> video_modes;
-       const VideoMode *desktop_mode;
+       struct Settings
+       {
+               const VideoMode *mode = nullptr;
+               VideoRotation rotation = ROTATE_NORMAL;
+               int x = 0;
+               int y = 0;
+       };
 
-       Monitor();
+       unsigned index = 0;
+       std::string name;
+       std::list<const VideoMode *> video_modes;
+       Settings desktop_settings;
+       Settings current_settings;
+       const Monitor *next_left = nullptr;
+       const Monitor *next_right = nullptr;
 };
 
 } // namespace Graphics