Some clang-formatting of Futatabi.

[nageru] / futatabi / clip_list.h

diff --git a/futatabi/clip_list.h b/futatabi/clip_list.h
index 0768c76cdbc1acdb67c37032eddefd331dd2b358..af3d1f524c42084ab77815f91cb4e30552cf5d07 100644 (file)
--- a/futatabi/clip_list.h
+++ b/futatabi/clip_list.h
@@ -5,8 +5,8 @@
 #include "state.pb.h"
 
 #include <QAbstractTableModel>
-#include <stdint.h>
 #include <map>
+#include <stdint.h>
 #include <string>
 #include <vector>
 
@@ -79,12 +79,12 @@ public:
 
        ClipListProto serialize() const;
 
-       void change_num_cameras(size_t num_cameras);  // Defaults to 1. Cannot decrease.
+       void change_num_cameras(size_t num_cameras);  // Defaults to 2. Cannot decrease.
        void emit_data_changed(size_t row) override;
 
        bool is_camera_column(int column) const
        {
-               return (column >= int(Column::CAMERA_1) && column < int(Column::CAMERA_1) + num_cameras);
+               return (column >= int(Column::CAMERA_1) && column < int(Column::CAMERA_1) + int(num_cameras));
        }
 
 signals:
@@ -92,7 +92,7 @@ signals:
 
 private:
        std::vector<Clip> clips;
-       size_t num_cameras = 1;
+       size_t num_cameras = 2;
 };
 
 class PlayList : public QAbstractTableModel, public DataChangedReceiver {
@@ -145,7 +145,7 @@ public:
 
        ClipListProto serialize() const;
 
-       void change_num_cameras(size_t num_cameras)  // Defaults to 1. Cannot decrease.
+       void change_num_cameras(size_t num_cameras)  // Defaults to 2. Cannot decrease.
        {
                this->num_cameras = num_cameras;
        }
@@ -160,7 +160,7 @@ private:
        int currently_playing_index = -1;
        double play_progress = 0.0;
        std::map<size_t, double> current_progress;
-       size_t num_cameras = 1;
+       size_t num_cameras = 2;
 };
 
 #endif  // !defined (_CLIP_LIST_H)