Using #pragma once instead of the old header definition

14 files changed, 24 insertions, 60 deletions

diff --git a/remmina-plugins/common/remmina_plugin.h b/remmina-plugins/common/remmina_plugin.h
index bb6762f41..c0aac73a6 100644
--- a/remmina-plugins/common/remmina_plugin.h
+++ b/remmina-plugins/common/remmina_plugin.h
@@ -33,8 +33,7 @@
  *
  */
 
-#ifndef __REMMINAPLUGINCOMMON_H__
-#define __REMMINAPLUGINCOMMON_H__
+#pragma once
 
 #include "config.h"
 #include <gtk/gtk.h>
@@ -98,5 +97,4 @@ remmina_get_available_xdisplay (void) \
 	return display; \
 }
 
-#endif /* __REMMINAPLUGINCOMMON_H__ */
 
diff --git a/remmina-plugins/nx/nx_plugin.h b/remmina-plugins/nx/nx_plugin.h
index 9e792b528..8b235f845 100644
--- a/remmina-plugins/nx/nx_plugin.h
+++ b/remmina-plugins/nx/nx_plugin.h
@@ -1,6 +1,6 @@
 /*
  * Remmina - The GTK+ Remote Desktop Client
- * Copyright (C) 2010 Vic Lee 
+ * Copyright (C) 2010 Vic Lee
  * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo
  *
  * This program is free software; you can redistribute it and/or modify
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301, USA.
  *
  *  In addition, as a special exception, the copyright holders give
@@ -33,8 +33,7 @@
  *
  */
 
-#ifndef __REMMINAPLUGINNX_H__
-#define __REMMINAPLUGINNX_H__
+#pragma once
 
 #define GET_PLUGIN_DATA(gp) (RemminaPluginNxData*) g_object_get_data(G_OBJECT(gp), "plugin-data");
 
@@ -81,5 +80,3 @@ extern RemminaPluginService *remmina_plugin_nx_service;
 
 G_END_DECLS
 
-#endif
-
diff --git a/remmina-plugins/nx/nx_session.h b/remmina-plugins/nx/nx_session.h
index 406c54826..49a91dfdf 100644
--- a/remmina-plugins/nx/nx_session.h
+++ b/remmina-plugins/nx/nx_session.h
@@ -32,8 +32,7 @@
  *
  */
 
-#ifndef __REMMINANXSESSION_H__
-#define __REMMINANXSESSION_H__
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -105,5 +104,4 @@ void remmina_nx_session_bye(RemminaNXSession *nx);
 
 G_END_DECLS
 
-#endif  /* __REMMINANXSESSION_H__  */
 
diff --git a/remmina-plugins/nx/nx_session_manager.h b/remmina-plugins/nx/nx_session_manager.h
index 37ca2e464..35f4f7932 100644
--- a/remmina-plugins/nx/nx_session_manager.h
+++ b/remmina-plugins/nx/nx_session_manager.h
@@ -1,6 +1,6 @@
 /*
  * Remmina - The GTK+ Remote Desktop Client
- * Copyright (C) 2010 Vic Lee 
+ * Copyright (C) 2010 Vic Lee
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301, USA.
  *
  *  In addition, as a special exception, the copyright holders give
@@ -32,8 +32,7 @@
  *
  */
 
-#ifndef __REMMINANXSESSIONMANAGER_H__
-#define __REMMINANXSESSIONMANAGER_H__
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -41,5 +40,3 @@ void remmina_nx_session_manager_start(RemminaProtocolWidget *gp);
 
 G_END_DECLS
 
-#endif
-
diff --git a/remmina-plugins/rdp/rdp_channels.h b/remmina-plugins/rdp/rdp_channels.h
index 8d25c70c1..29864b03c 100644
--- a/remmina-plugins/rdp/rdp_channels.h
+++ b/remmina-plugins/rdp/rdp_channels.h
@@ -33,8 +33,7 @@
  */
 
 
-#ifndef __REMMINA_RDP_CHANNELS_H
-#define __REMMINA_RDP_CHANNELS_H
+#pragma once
 
 #include <freerdp/freerdp.h>
 #include <freerdp/client/channels.h>
@@ -53,4 +52,3 @@ void remmina_rdp_OnChannelDisconnectedEventHandler(rdpContext* context, ChannelC
 
 G_END_DECLS
 
-#endif
diff --git a/remmina-plugins/rdp/rdp_cliprdr.h b/remmina-plugins/rdp/rdp_cliprdr.h
index 52ffebcc5..edc7f61a9 100644
--- a/remmina-plugins/rdp/rdp_cliprdr.h
+++ b/remmina-plugins/rdp/rdp_cliprdr.h
@@ -34,8 +34,7 @@
  *
  */
 
-#ifndef __REMMINA_RDP_CLIPRDR_H__
-#define __REMMINA_RDP_CLIPRDR_H__
+#pragma once
 
 
 #include <freerdp/freerdp.h>
@@ -48,5 +47,3 @@ void remmina_rdp_channel_cliprdr_process(RemminaProtocolWidget* gp, wMessage* ev
 void remmina_rdp_event_process_clipboard(RemminaProtocolWidget* gp, RemminaPluginRdpUiObject* ui);
 CLIPRDR_FORMAT_LIST *remmina_rdp_cliprdr_get_client_format_list(RemminaProtocolWidget* gp);
 
-
-#endif
diff --git a/remmina-plugins/rdp/rdp_event.h b/remmina-plugins/rdp/rdp_event.h
index 65be69fbe..9ea4b697c 100644
--- a/remmina-plugins/rdp/rdp_event.h
+++ b/remmina-plugins/rdp/rdp_event.h
@@ -32,8 +32,7 @@
  *
  */
 
-#ifndef __REMMINA_RDP_EVENT_H__
-#define __REMMINA_RDP_EVENT_H__
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -50,5 +49,3 @@ void *remmina_rdp_event_queue_ui_sync_retptr(RemminaProtocolWidget* gp, RemminaP
 
 G_END_DECLS
 
-#endif
-
diff --git a/remmina-plugins/rdp/rdp_file.h b/remmina-plugins/rdp/rdp_file.h
index db80cf0aa..6a84ac129 100644
--- a/remmina-plugins/rdp/rdp_file.h
+++ b/remmina-plugins/rdp/rdp_file.h
@@ -1,6 +1,6 @@
 /*
  * Remmina - The GTK+ Remote Desktop Client
- * Copyright (C) 2010-2011 Vic Lee 
+ * Copyright (C) 2010-2011 Vic Lee
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301, USA.
  *
  *  In addition, as a special exception, the copyright holders give
@@ -32,8 +32,7 @@
  *
  */
 
-#ifndef __REMMINA_RDP_FILE_H__
-#define __REMMINA_RDP_FILE_H__
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -44,5 +43,3 @@ gboolean remmina_rdp_file_export(RemminaFile* remminafile, const gchar* to_file)
 
 G_END_DECLS
 
-#endif
-
diff --git a/remmina-plugins/rdp/rdp_graphics.h b/remmina-plugins/rdp/rdp_graphics.h
index 9a39f68a1..fa9b4803a 100644
--- a/remmina-plugins/rdp/rdp_graphics.h
+++ b/remmina-plugins/rdp/rdp_graphics.h
@@ -1,6 +1,6 @@
 /*
  * Remmina - The GTK+ Remote Desktop Client
- * Copyright (C) 2010-2011 Vic Lee 
+ * Copyright (C) 2010-2011 Vic Lee
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301, USA.
  *
  *  In addition, as a special exception, the copyright holders give
@@ -32,12 +32,9 @@
  *
  */
 
-#ifndef __REMMINA_RDP_GRAPHICS_H__
-#define __REMMINA_RDP_GRAPHICS_H__
+#pragma once
 
 #include "rdp_plugin.h"
 
 void rf_register_graphics(rdpGraphics* graphics);
 
-#endif
-
diff --git a/remmina-plugins/rdp/rdp_plugin.h b/remmina-plugins/rdp/rdp_plugin.h
index 2146bac26..b58d39b75 100644
--- a/remmina-plugins/rdp/rdp_plugin.h
+++ b/remmina-plugins/rdp/rdp_plugin.h
@@ -33,8 +33,7 @@
  *
  */
 
-#ifndef __REMMINA_RDP_H__
-#define __REMMINA_RDP_H__
+#pragma once
 
 #include "common/remmina_plugin.h"
 #include <freerdp/freerdp.h>
@@ -330,5 +329,3 @@ void rf_object_free(RemminaProtocolWidget* gp, RemminaPluginRdpUiObject* obj);
 
 void remmina_rdp_event_event_push(RemminaProtocolWidget* gp, const RemminaPluginRdpEvent* e);
 
-#endif
-
diff --git a/remmina-plugins/rdp/rdp_settings.h b/remmina-plugins/rdp/rdp_settings.h
index bcf8a1c03..5e756e70c 100644
--- a/remmina-plugins/rdp/rdp_settings.h
+++ b/remmina-plugins/rdp/rdp_settings.h
@@ -32,8 +32,7 @@
  *
  */
 
-#ifndef __REMMINA_RDP_SETTINGS_H__
-#define __REMMINA_RDP_SETTINGS_H__
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -45,5 +44,3 @@ void remmina_rdp_settings_get_orientation_scale_prefs(int *desktopOrientation, i
 
 G_END_DECLS
 
-#endif
-
diff --git a/remmina-plugins/spice/spice_plugin.h b/remmina-plugins/spice/spice_plugin.h
index 5d333a9c7..3894fa582 100644
--- a/remmina-plugins/spice/spice_plugin.h
+++ b/remmina-plugins/spice/spice_plugin.h
@@ -32,8 +32,7 @@
  *
  */
 
-#ifndef __REMMINA_SPICE_PLUGIN_H__
-#define __REMMINA_SPICE_PLUGIN_H__
+#pragma once
 
 #include "common/remmina_plugin.h"
 #include <spice-client.h>
@@ -70,4 +69,3 @@ typedef struct _RemminaPluginSpiceData
 } RemminaPluginSpiceData;
 
 
-#endif /* __REMMINA_SPICE_PLUGIN_H__ */
diff --git a/remmina-plugins/telepathy/telepathy_channel_handler.h b/remmina-plugins/telepathy/telepathy_channel_handler.h
index 1002f6537..c14dcead9 100644
--- a/remmina-plugins/telepathy/telepathy_channel_handler.h
+++ b/remmina-plugins/telepathy/telepathy_channel_handler.h
@@ -32,8 +32,7 @@
  *
  */
 
-#ifndef __REMMINATPCHANNELHANDLER_H__
-#define __REMMINATPCHANNELHANDLER_H__
+#pragma once
 
 G_BEGIN_DECLS
 
diff --git a/remmina-plugins/telepathy/telepathy_handler.h b/remmina-plugins/telepathy/telepathy_handler.h
index a2394282c..da360a70a 100644
--- a/remmina-plugins/telepathy/telepathy_handler.h
+++ b/remmina-plugins/telepathy/telepathy_handler.h
@@ -1,6 +1,6 @@
 /*
  * Remmina - The GTK+ Remote Desktop Client
- * Copyright (C) 2010 Vic Lee 
+ * Copyright (C) 2010 Vic Lee
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301, USA.
  *
  *  In addition, as a special exception, the copyright holders give
@@ -32,8 +32,7 @@
  *
  */
 
-#ifndef __REMMINATPHANDLER_H__
-#define __REMMINATPHANDLER_H__
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -58,5 +57,3 @@ RemminaTpHandler* remmina_tp_handler_new(void);
 
 G_END_DECLS
 
-#endif
-