Merge branch 'master' into next

[i3/i3] / include / workspace.h

diff --git a/include/workspace.h b/include/workspace.h
index 907e959f0347e8903eef96bee29498698570f718..9ee6f156674976275f37220d46e4aa594b8459b8 100644 (file)
--- a/include/workspace.h
+++ b/include/workspace.h
@@ -8,8 +8,7 @@
  *              workspaces.
  *
  */
-#ifndef I3_WORKSPACE_H
-#define I3_WORKSPACE_H
+#pragma once
 
 #include "data.h"
 #include "tree.h"
@@ -69,25 +68,25 @@ void workspace_show_by_name(const char *num);
  * Returns the next workspace.
  *
  */
-Con* workspace_next(void);
+Con *workspace_next(void);
 
 /**
  * Returns the previous workspace.
  *
  */
-Con* workspace_prev(void);
+Con *workspace_prev(void);
 
 /**
  * Returns the next workspace on the same output
  *
  */
-Con* workspace_next_on_output(void);
+Con *workspace_next_on_output(void);
 
 /**
  * Returns the previous workspace on the same output
  *
  */
-Con* workspace_prev_on_output(void);
+Con *workspace_prev_on_output(void);
 
 /**
  * Focuses the previously focused workspace.
@@ -101,7 +100,6 @@ void workspace_back_and_forth(void);
  */
 Con *workspace_back_and_forth_get(void);
 
-
 #if 0
 /**
  * Assigns the given workspace to the given screen by correctly updating its
@@ -181,4 +179,3 @@ Con *workspace_attach_to(Con *ws);
  * The container inherits the layout from the workspace.
  */
 Con *workspace_encapsulate(Con *ws);
-#endif