[gnome-commander] Use '#pragma once' in header files as guard
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] Use '#pragma once' in header files as guard
- Date: Sun, 4 Jun 2017 13:46:37 +0000 (UTC)
commit 71a974da142da23f7cd5ba0a1bb6b012bcaa04fd
Author: Uwe Scholz <uwescholz src gnome org>
Date: Sun Jun 4 14:50:24 2017 +0200
Use '#pragma once' in header files as guard
libgcmd/gnome-cmd-dialog.h | 7 +------
libgcmd/gnome-cmd-file-info.h | 5 +----
libgcmd/gnome-cmd-plugin.h | 5 +----
libgcmd/gnome-cmd-state.h | 5 +----
libgcmd/gnome-cmd-string-dialog.h | 7 +------
libgcmd/libgcmd-deps.h | 5 +----
libgcmd/libgcmd-utils.h | 5 +----
libgcmd/libgcmd-widget-factory.h | 5 +----
libgcmd/libgcmd.h | 5 +----
libgcmd/plugin-info.h | 5 +----
plugins/fileroller/file-roller-plugin.h | 4 +---
plugins/test/test-plugin.h | 5 +----
src/cap.h | 5 +----
src/dialogs/gnome-cmd-advrename-dialog.h | 5 +----
src/dialogs/gnome-cmd-advrename-regex-dialog.h | 5 +----
src/dialogs/gnome-cmd-chmod-dialog.h | 5 +----
src/dialogs/gnome-cmd-chown-dialog.h | 5 +----
src/dialogs/gnome-cmd-con-dialog.h | 5 +----
src/dialogs/gnome-cmd-delete-dialog.h | 5 +----
src/dialogs/gnome-cmd-edit-bookmark-dialog.h | 5 +----
src/dialogs/gnome-cmd-edit-profile-dialog.h | 5 +----
src/dialogs/gnome-cmd-file-props-dialog.h | 5 +----
src/dialogs/gnome-cmd-key-shortcuts-dialog.h | 5 +----
src/dialogs/gnome-cmd-make-copy-dialog.h | 5 +----
src/dialogs/gnome-cmd-manage-bookmarks-dialog.h | 5 +----
src/dialogs/gnome-cmd-manage-profiles-dialog.h | 5 +----
src/dialogs/gnome-cmd-mkdir-dialog.h | 5 +----
src/dialogs/gnome-cmd-options-dialog.h | 5 +----
src/dialogs/gnome-cmd-patternsel-dialog.h | 5 +----
src/dialogs/gnome-cmd-prepare-copy-dialog.h | 5 +----
src/dialogs/gnome-cmd-prepare-move-dialog.h | 5 +----
src/dialogs/gnome-cmd-prepare-xfer-dialog.h | 5 +----
src/dialogs/gnome-cmd-remote-dialog.h | 5 +----
src/dialogs/gnome-cmd-rename-dialog.h | 5 +----
src/dialogs/gnome-cmd-search-dialog.h | 5 +----
src/dict.h | 5 +----
src/dirlist.h | 5 +----
src/eggcellrendererkeys.h | 5 +----
src/filter.h | 5 +----
src/gnome-cmd-about-plugin.h | 5 +----
src/gnome-cmd-advrename-lexer.h | 5 +----
src/gnome-cmd-advrename-profile-component.h | 5 +----
src/gnome-cmd-app.h | 5 +----
src/gnome-cmd-chmod-component.h | 5 +----
src/gnome-cmd-chown-component.h | 5 +----
src/gnome-cmd-clist.h | 5 +----
src/gnome-cmd-cmdline.h | 5 +----
src/gnome-cmd-collection.h | 5 +----
src/gnome-cmd-combo.h | 5 +----
src/gnome-cmd-con-device.h | 5 +----
src/gnome-cmd-con-home.h | 5 +----
src/gnome-cmd-con-list.h | 5 +----
src/gnome-cmd-con-remote.h | 5 +----
src/gnome-cmd-con-smb.h | 5 +----
src/gnome-cmd-con.h | 5 +----
src/gnome-cmd-convert.h | 5 +----
src/gnome-cmd-data.h | 5 +----
src/gnome-cmd-dir-indicator.h | 5 +----
src/gnome-cmd-dir.h | 5 +----
src/gnome-cmd-file-collection.h | 6 +-----
src/gnome-cmd-file-list.h | 5 +----
src/gnome-cmd-file-popmenu.h | 5 +----
src/gnome-cmd-file-selector.h | 5 +----
src/gnome-cmd-file.h | 5 +----
src/gnome-cmd-gkeyfile-utils.h | 6 +-----
src/gnome-cmd-hintbox.h | 5 +----
src/gnome-cmd-includes.h | 5 +----
src/gnome-cmd-list-popmenu.h | 5 +----
src/gnome-cmd-main-menu.h | 5 +----
src/gnome-cmd-main-win.h | 6 +-----
src/gnome-cmd-menu-button.h | 5 +----
src/gnome-cmd-mime-config.h | 5 +----
src/gnome-cmd-notebook.h | 5 +----
src/gnome-cmd-path.h | 5 +----
src/gnome-cmd-pixmap.h | 5 +----
src/gnome-cmd-plain-path.h | 5 +----
src/gnome-cmd-python-plugin.h | 5 +----
src/gnome-cmd-quicksearch-popup.h | 5 +----
src/gnome-cmd-regex.h | 5 +----
src/gnome-cmd-selection-profile-component.h | 5 +----
src/gnome-cmd-smb-net.h | 6 +-----
src/gnome-cmd-smb-path.h | 5 +----
src/gnome-cmd-style.h | 5 +----
src/gnome-cmd-treeview.h | 5 +----
src/gnome-cmd-types.h | 5 +----
src/gnome-cmd-user-actions.h | 5 +----
src/gnome-cmd-xfer-progress-win.h | 5 +----
src/gnome-cmd-xfer.h | 5 +----
src/gnome-cmd-xml-config.h | 5 +----
src/handle.h | 5 +----
src/history.h | 5 +----
src/imageloader.h | 5 +----
src/intviewer/bm_byte.h | 6 +-----
src/intviewer/bm_chartype.h | 5 +----
src/intviewer/cp437.h | 5 +----
src/intviewer/datapresentation.h | 5 +----
src/intviewer/fileops.h | 5 +----
src/intviewer/gvtypes.h | 5 +----
src/intviewer/image-render.h | 5 +----
src/intviewer/inputmodes.h | 5 +----
src/intviewer/libgviewer.h | 5 +----
src/intviewer/scroll-box.h | 5 +----
src/intviewer/search-dlg.h | 5 +----
src/intviewer/search-progress-dlg.h | 5 +----
src/intviewer/searcher.h | 5 +----
src/intviewer/text-render.h | 5 +----
src/intviewer/viewer-utils.h | 5 +----
src/intviewer/viewer-widget.h | 5 +----
src/intviewer/viewer-window.h | 5 +----
src/ls_colors.h | 5 +----
src/owner.h | 5 +----
src/plugin_manager.h | 5 +----
src/tags/gnome-cmd-tags-doc.h | 5 +----
src/tags/gnome-cmd-tags-exiv2.h | 5 +----
src/tags/gnome-cmd-tags-file.h | 5 +----
src/tags/gnome-cmd-tags-poppler.h | 5 +----
src/tags/gnome-cmd-tags-taglib.h | 5 +----
src/tags/gnome-cmd-tags.h | 6 +-----
src/tuple.h | 5 +----
src/utils.h | 5 +----
src/widget-factory.h | 5 +----
121 files changed, 121 insertions(+), 493 deletions(-)
---
diff --git a/libgcmd/gnome-cmd-dialog.h b/libgcmd/gnome-cmd-dialog.h
index a355bec..48aa4f7 100644
--- a/libgcmd/gnome-cmd-dialog.h
+++ b/libgcmd/gnome-cmd-dialog.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_DIALOG_H__
-#define __GNOME_CMD_DIALOG_H__
+#pragma once
#define GNOME_CMD_TYPE_DIALOG (gnome_cmd_dialog_get_type ())
#define GNOME_CMD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNOME_CMD_TYPE_DIALOG,
GnomeCmdDialog))
@@ -61,7 +60,3 @@ GtkWidget *gnome_cmd_dialog_add_button (GnomeCmdDialog *dialog, const gchar *sto
void gnome_cmd_dialog_add_category (GnomeCmdDialog *dialog, GtkWidget *category);
void gnome_cmd_dialog_add_expanding_category (GnomeCmdDialog *dialog, GtkWidget *category);
-
-#endif //__GNOME_CMD_DIALOG_H__
-
-
diff --git a/libgcmd/gnome-cmd-file-info.h b/libgcmd/gnome-cmd-file-info.h
index 06d2ab3..e47c22a 100644
--- a/libgcmd/gnome-cmd-file-info.h
+++ b/libgcmd/gnome-cmd-file-info.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_FILE_INFO_H__
-#define __GNOME_CMD_FILE_INFO_H__
+#pragma once
#define GNOME_CMD_TYPE_FILE_INFO (gnome_cmd_file_info_get_type ())
#define GNOME_CMD_FILE_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNOME_CMD_TYPE_FILE_INFO,
GnomeCmdFileInfo))
@@ -53,5 +52,3 @@ inline void GnomeCmdFileInfo::setup(GnomeVFSURI *uri_setup, GnomeVFSFileInfo *in
this->info = info_setup;
this->uri = uri_setup;
}
-
-#endif //__GNOME_CMD_FILE_INFO_H__
diff --git a/libgcmd/gnome-cmd-plugin.h b/libgcmd/gnome-cmd-plugin.h
index 63fb3d9..8142d5c 100644
--- a/libgcmd/gnome-cmd-plugin.h
+++ b/libgcmd/gnome-cmd-plugin.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_PLUGIN_H__
-#define __GNOME_CMD_PLUGIN_H__
+#pragma once
#define GNOME_CMD_TYPE_PLUGIN (gnome_cmd_plugin_get_type ())
#define GNOME_CMD_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNOME_CMD_TYPE_PLUGIN,
GnomeCmdPlugin))
@@ -61,5 +60,3 @@ GList *gnome_cmd_plugin_create_popup_menu_items (GnomeCmdPlugin *plugin, GnomeCm
void gnome_cmd_plugin_update_main_menu_state (GnomeCmdPlugin *plugin, GnomeCmdState *state);
void gnome_cmd_plugin_configure (GnomeCmdPlugin *plugin);
-
-#endif //__GNOME_CMD_PLUGIN_H__
diff --git a/libgcmd/gnome-cmd-state.h b/libgcmd/gnome-cmd-state.h
index cc4865a..7971438 100644
--- a/libgcmd/gnome-cmd-state.h
+++ b/libgcmd/gnome-cmd-state.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_STATE_H__
-#define __GNOME_CMD_STATE_H__
+#pragma once
struct GnomeCmdState
{
@@ -31,5 +30,3 @@ struct GnomeCmdState
GList *active_dir_selected_files;
GList *inactive_dir_selected_files;
};
-
-#endif //__GNOME_CMD_STATE_H__
diff --git a/libgcmd/gnome-cmd-string-dialog.h b/libgcmd/gnome-cmd-string-dialog.h
index 8b69628..1c5b511 100644
--- a/libgcmd/gnome-cmd-string-dialog.h
+++ b/libgcmd/gnome-cmd-string-dialog.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_STRING_DIALOG_H__
-#define __GNOME_CMD_STRING_DIALOG_H__
+#pragma once
#define GNOME_CMD_TYPE_STRING_DIALOG (gnome_cmd_string_dialog_get_type ())
#define GNOME_CMD_STRING_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),
GNOME_CMD_TYPE_STRING_DIALOG, GnomeCmdStringDialog))
@@ -84,7 +83,3 @@ void gnome_cmd_string_dialog_set_cancel_cb (GnomeCmdStringDialog *dialog, GtkSig
void gnome_cmd_string_dialog_set_value (GnomeCmdStringDialog *dialog, gint row, const gchar *value);
void gnome_cmd_string_dialog_set_error_desc (GnomeCmdStringDialog *dialog, gchar *msg);
-
-#endif //__GNOME_CMD_STRING_DIALOG_H__
-
-
diff --git a/libgcmd/libgcmd-deps.h b/libgcmd/libgcmd-deps.h
index 37fdb21..fa3a7b6 100644
--- a/libgcmd/libgcmd-deps.h
+++ b/libgcmd/libgcmd-deps.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __LIBGCMD_DEPS_H__
-#define __LIBGCMD_DEPS_H__
+#pragma once
#include <glib.h>
#include <glib/gi18n.h>
@@ -36,5 +35,3 @@
#include <libgnomevfs/gnome-vfs-mime-handlers.h>
extern GtkWidget *main_win_widget;
-
-#endif //__LIBGCMD_DEPS_H__
diff --git a/libgcmd/libgcmd-utils.h b/libgcmd/libgcmd-utils.h
index 4d56e59..cdcc48a 100644
--- a/libgcmd/libgcmd-utils.h
+++ b/libgcmd/libgcmd-utils.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __LIB_GCMD_UTILS_H__
-#define __LIB_GCMD_UTILS_H__
+#pragma once
gchar *get_utf8 (const gchar *unknown);
@@ -47,5 +46,3 @@ inline gchar *get_bold_mono_text (const gchar *in)
g_free (escaped_text);
return result;
}
-
-#endif //__LIB_GCMD_UTILS_H__
diff --git a/libgcmd/libgcmd-widget-factory.h b/libgcmd/libgcmd-widget-factory.h
index 6315d7e..72c3730 100644
--- a/libgcmd/libgcmd-widget-factory.h
+++ b/libgcmd/libgcmd-widget-factory.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __LIBGCMD_WIDGET_FACTORY_H__
-#define __LIBGCMD_WIDGET_FACTORY_H__
+#pragma once
GtkWidget *lookup_widget (GtkWidget *widget, const gchar *widget_name);
@@ -171,5 +170,3 @@ const char *get_entry_text (GtkWidget *parent, const gchar *entry_name);
#else
void create_error_dialog (const gchar *msg, ...);
#endif
-
-#endif //__LIBGCMD_WIDGET_FACTORY_H__
diff --git a/libgcmd/libgcmd.h b/libgcmd/libgcmd.h
index de18bc6..a63a363 100644
--- a/libgcmd/libgcmd.h
+++ b/libgcmd/libgcmd.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __LIBGCMD_H__
-#define __LIBGCMD_H__
+#pragma once
#include <libgcmd/libgcmd-deps.h>
#include <libgcmd/libgcmd-utils.h>
@@ -31,5 +30,3 @@
#include <libgcmd/gnome-cmd-dialog.h>
#include <libgcmd/gnome-cmd-string-dialog.h>
#include <libgcmd/plugin-info.h>
-
-#endif //__LIBGCMD_H__
diff --git a/libgcmd/plugin-info.h b/libgcmd/plugin-info.h
index d303bdd..b89cc4c 100644
--- a/libgcmd/plugin-info.h
+++ b/libgcmd/plugin-info.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __PLUGIN_INFO_H__
-#define __PLUGIN_INFO_H__
+#pragma once
/* This one should be increased when an api-incompatible change
* is done to the plugin system. By doing that gcmd can detect
@@ -51,5 +50,3 @@ struct PluginInfo
* since it is needed to determinate the version of a plugin
*/
typedef PluginInfo *(*PluginInfoFunc)(void);
-
-#endif //__PLUGIN_INFO_H__
diff --git a/plugins/fileroller/file-roller-plugin.h b/plugins/fileroller/file-roller-plugin.h
index 4e7ec57..286871b 100644
--- a/plugins/fileroller/file-roller-plugin.h
+++ b/plugins/fileroller/file-roller-plugin.h
@@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __FILE_ROLLER_PLUGIN_H__
-#define __FILE_ROLLER_PLUGIN_H__
+#pragma once
#define PLUGIN_TYPE_SETTINGS (plugin_settings_get_type ())
G_DECLARE_FINAL_TYPE (PluginSettings, plugin_settings, GCMD, SETTINGS, GObject)
@@ -58,4 +57,3 @@ extern "C"
GnomeCmdPlugin *create_plugin ();
PluginInfo *get_plugin_info ();
}
-#endif //__FILE_ROLLER_PLUGIN_H__
diff --git a/plugins/test/test-plugin.h b/plugins/test/test-plugin.h
index 0dfc577..8ed144c 100644
--- a/plugins/test/test-plugin.h
+++ b/plugins/test/test-plugin.h
@@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __TEST_PLUGIN_H__
-#define __TEST_PLUGIN_H__
+#pragma once
#define TEST_PLUGIN(obj) \
GTK_CHECK_CAST (obj, test_plugin_get_type (), TestPlugin)
@@ -55,5 +54,3 @@ extern "C"
GnomeCmdPlugin *create_plugin ();
PluginInfo *get_plugin_info ();
}
-
-#endif //__TEST_PLUGIN_H__
diff --git a/src/cap.h b/src/cap.h
index b521848..d91ee26 100644
--- a/src/cap.h
+++ b/src/cap.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __CAP_H__
-#define __CAP_H__
+#pragma once
#include "gnome-cmd-file-list.h"
#include "gnome-cmd-dir.h"
@@ -28,5 +27,3 @@
void cap_cut_files (GnomeCmdFileList *fl, GList *files);
void cap_copy_files (GnomeCmdFileList *fl, GList *files);
void cap_paste_files (GnomeCmdDir *dir);
-
-#endif // __CAP_H__
diff --git a/src/dialogs/gnome-cmd-advrename-dialog.h b/src/dialogs/gnome-cmd-advrename-dialog.h
index 4b8f54d..aecf44e 100644
--- a/src/dialogs/gnome-cmd-advrename-dialog.h
+++ b/src/dialogs/gnome-cmd-advrename-dialog.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_ADVRENAME_DIALOG_H__
-#define __GNOME_CMD_ADVRENAME_DIALOG_H__
+#pragma once
#include "gnome-cmd-data.h"
#include "gnome-cmd-file-list.h"
@@ -66,5 +65,3 @@ struct GnomeCmdAdvrenameDialog
void unset();
void update_new_filenames();
};
-
-#endif // __GNOME_CMD_ADVRENAME_DIALOG_H__
diff --git a/src/dialogs/gnome-cmd-advrename-regex-dialog.h b/src/dialogs/gnome-cmd-advrename-regex-dialog.h
index d07366b..406cf11 100644
--- a/src/dialogs/gnome-cmd-advrename-regex-dialog.h
+++ b/src/dialogs/gnome-cmd-advrename-regex-dialog.h
@@ -19,12 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_ADVRENAME_REGEX_DIALOG_H__
-#define __GNOME_CMD_ADVRENAME_REGEX_DIALOG_H__
+#pragma once
#include "gnome-cmd-advrename-dialog.h"
#include "gnome-cmd-regex.h"
gboolean gnome_cmd_advrename_regex_dialog_new (const gchar *title, GtkWindow *parent, GnomeCmd::RegexReplace
*rx);
-
-#endif // __GNOME_CMD_ADVRENAME_REGEX_DIALOG_H__
diff --git a/src/dialogs/gnome-cmd-chmod-dialog.h b/src/dialogs/gnome-cmd-chmod-dialog.h
index 78609f9..c5c57b6 100644
--- a/src/dialogs/gnome-cmd-chmod-dialog.h
+++ b/src/dialogs/gnome-cmd-chmod-dialog.h
@@ -18,8 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_CHMOD_DIALOG_H__
-#define __GNOME_CMD_CHMOD_DIALOG_H__
+#pragma once
#define GNOME_CMD_TYPE_CHMOD_DIALOG (gnome_cmd_chmod_dialog_get_type ())
#define GNOME_CMD_CHMOD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),
GNOME_CMD_TYPE_CHMOD_DIALOG, GnomeCmdChmodDialog))
@@ -49,5 +48,3 @@ struct GnomeCmdChmodDialogClass
GtkWidget *gnome_cmd_chmod_dialog_new (GList *files);
-
-#endif // __GNOME_CMD_CHMOD_DIALOG_H__
diff --git a/src/dialogs/gnome-cmd-chown-dialog.h b/src/dialogs/gnome-cmd-chown-dialog.h
index 0da5fd1..6bdd677 100644
--- a/src/dialogs/gnome-cmd-chown-dialog.h
+++ b/src/dialogs/gnome-cmd-chown-dialog.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_CHOWN_DIALOG_H__
-#define __GNOME_CMD_CHOWN_DIALOG_H__
+#pragma once
#define GNOME_CMD_TYPE_CHOWN_DIALOG (gnome_cmd_chown_dialog_get_type ())
#define GNOME_CMD_CHOWN_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),
GNOME_CMD_TYPE_CHOWN_DIALOG, GnomeCmdChownDialog))
@@ -50,5 +49,3 @@ struct GnomeCmdChownDialogClass
GtkWidget *gnome_cmd_chown_dialog_new (GList *files);
-
-#endif // __GNOME_CMD_CHOWN_DIALOG_H__
diff --git a/src/dialogs/gnome-cmd-con-dialog.h b/src/dialogs/gnome-cmd-con-dialog.h
index 26b4989..c333f37 100644
--- a/src/dialogs/gnome-cmd-con-dialog.h
+++ b/src/dialogs/gnome-cmd-con-dialog.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_CON_DIALOG_H__
-#define __GNOME_CMD_CON_DIALOG_H__
+#pragma once
#include <gtk/gtkdialog.h>
@@ -31,5 +30,3 @@
GnomeCmdConRemote *gnome_cmd_connect_dialog_new (gboolean has_alias=TRUE);
gboolean gnome_cmd_connect_dialog_edit (GnomeCmdConRemote *server);
-
-#endif // __GNOME_CMD_CON_DIALOG_H__
diff --git a/src/dialogs/gnome-cmd-delete-dialog.h b/src/dialogs/gnome-cmd-delete-dialog.h
index 355fa2a..042ef70 100644
--- a/src/dialogs/gnome-cmd-delete-dialog.h
+++ b/src/dialogs/gnome-cmd-delete-dialog.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_DELETE_DIALOG_H__
-#define __GNOME_CMD_DELETE_DIALOG_H__
+#pragma once
void gnome_cmd_delete_dialog_show (GList *files);
-
-#endif // __GNOME_CMD_DELETE_DIALOG_H__
diff --git a/src/dialogs/gnome-cmd-edit-bookmark-dialog.h b/src/dialogs/gnome-cmd-edit-bookmark-dialog.h
index f436f2e..62d69f8 100644
--- a/src/dialogs/gnome-cmd-edit-bookmark-dialog.h
+++ b/src/dialogs/gnome-cmd-edit-bookmark-dialog.h
@@ -19,11 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_EDIT_BOOKMARK_DIALOG_H__
-#define __GNOME_CMD_EDIT_BOOKMARK_DIALOG_H__
+#pragma once
#include "gnome-cmd-data.h"
gboolean gnome_cmd_edit_bookmark_dialog (GtkWindow *parent, const gchar *title, gchar *&name, gchar *&path);
-
-#endif // __GNOME_CMD_EDIT_BOOKMARK_DIALOG_H__
diff --git a/src/dialogs/gnome-cmd-edit-profile-dialog.h b/src/dialogs/gnome-cmd-edit-profile-dialog.h
index 974bfaa..e5352e5 100644
--- a/src/dialogs/gnome-cmd-edit-profile-dialog.h
+++ b/src/dialogs/gnome-cmd-edit-profile-dialog.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_EDIT_PROFILE_DIALOG_H__
-#define __GNOME_CMD_EDIT_PROFILE_DIALOG_H__
+#pragma once
#include "gnome-cmd-data.h"
@@ -135,5 +134,3 @@ namespace GnomeCmd
gtk_widget_destroy (dialog);
}
}
-
-#endif // __GNOME_CMD_EDIT_PROFILE_DIALOG_H__
diff --git a/src/dialogs/gnome-cmd-file-props-dialog.h b/src/dialogs/gnome-cmd-file-props-dialog.h
index 07f1e8b..f161729 100644
--- a/src/dialogs/gnome-cmd-file-props-dialog.h
+++ b/src/dialogs/gnome-cmd-file-props-dialog.h
@@ -19,11 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_FILE_PROPS_DIALOG_H__
-#define __GNOME_CMD_FILE_PROPS_DIALOG_H__
+#pragma once
#include "gnome-cmd-file.h"
GtkWidget *gnome_cmd_file_props_dialog_create (GnomeCmdFile *f);
-
-#endif // __GNOME_CMD_FILE_PROPS_DIALOG_H__
diff --git a/src/dialogs/gnome-cmd-key-shortcuts-dialog.h b/src/dialogs/gnome-cmd-key-shortcuts-dialog.h
index 38f6fb5..a45031c 100644
--- a/src/dialogs/gnome-cmd-key-shortcuts-dialog.h
+++ b/src/dialogs/gnome-cmd-key-shortcuts-dialog.h
@@ -18,11 +18,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_KEY_SHORTCUTS_DIALOG_H__
-#define __GNOME_CMD_KEY_SHORTCUTS_DIALOG_H__
+#pragma once
#include "gnome-cmd-user-actions.h"
gboolean gnome_cmd_key_shortcuts_dialog_new (GnomeCmdUserActions &user_actions);
-
-#endif // __GNOME_CMD_KEY_SHORTCUTS_DIALOG_H__
diff --git a/src/dialogs/gnome-cmd-make-copy-dialog.h b/src/dialogs/gnome-cmd-make-copy-dialog.h
index 0a527e7..24ac220 100644
--- a/src/dialogs/gnome-cmd-make-copy-dialog.h
+++ b/src/dialogs/gnome-cmd-make-copy-dialog.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_MAKE_COPY_DIALOG_H__
-#define __GNOME_CMD_MAKE_COPY_DIALOG_H__
+#pragma once
#include "gnome-cmd-file.h"
@@ -51,5 +50,3 @@ struct GnomeCmdMakeCopyDialogClass
GtkWidget *gnome_cmd_make_copy_dialog_new (GnomeCmdFile *f, GnomeCmdDir *dir);
GtkType gnome_cmd_make_copy_dialog_get_type ();
-
-#endif // __GNOME_CMD_MAKE_COPY_DIALOG_H__
diff --git a/src/dialogs/gnome-cmd-manage-bookmarks-dialog.h b/src/dialogs/gnome-cmd-manage-bookmarks-dialog.h
index 7f07be0..b677f04 100644
--- a/src/dialogs/gnome-cmd-manage-bookmarks-dialog.h
+++ b/src/dialogs/gnome-cmd-manage-bookmarks-dialog.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_MANAGE_BOOKMARKS_DIALOG_H__
-#define __GNOME_CMD_MANAGE_BOOKMARKS_DIALOG_H__
+#pragma once
#include "gnome-cmd-data.h"
@@ -30,5 +29,3 @@ void gnome_cmd_bookmark_goto (GnomeCmdBookmark *bookmark);
void gnome_cmd_bookmark_add_current (GnomeCmdDir *dir);
void gnome_cmd_update_bookmark_dialog ();
-
-#endif // __GNOME_CMD_MANAGE_BOOKMARKS_DIALOG_H__
diff --git a/src/dialogs/gnome-cmd-manage-profiles-dialog.h b/src/dialogs/gnome-cmd-manage-profiles-dialog.h
index c8568ff..6493a5d 100644
--- a/src/dialogs/gnome-cmd-manage-profiles-dialog.h
+++ b/src/dialogs/gnome-cmd-manage-profiles-dialog.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_MANAGE_PROFILES_DIALOG_H__
-#define __GNOME_CMD_MANAGE_PROFILES_DIALOG_H__
+#pragma once
#include "gnome-cmd-data.h"
#include "gnome-cmd-menu-button.h"
@@ -384,5 +383,3 @@ namespace GnomeCmd
template <typename CONFIG, typename PROFILE, typename COMPONENT>
const char *ManageProfilesDialog<CONFIG,PROFILE,COMPONENT>::help_id;
}
-
-#endif // __GNOME_CMD_MANAGE_PROFILES_DIALOG_H__
diff --git a/src/dialogs/gnome-cmd-mkdir-dialog.h b/src/dialogs/gnome-cmd-mkdir-dialog.h
index f84afb0..1bc1544 100644
--- a/src/dialogs/gnome-cmd-mkdir-dialog.h
+++ b/src/dialogs/gnome-cmd-mkdir-dialog.h
@@ -19,11 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_MKDIR_DIALOG_H__
-#define __GNOME_CMD_MKDIR_DIALOG_H__
+#pragma once
#include "gnome-cmd-dir.h"
gboolean gnome_cmd_mkdir_dialog_new (GnomeCmdDir *dir, GnomeCmdFile *selected_file=NULL);
-
-#endif // __GNOME_CMD_MKDIR_DIALOG_H__
diff --git a/src/dialogs/gnome-cmd-options-dialog.h b/src/dialogs/gnome-cmd-options-dialog.h
index e43c30f..bfd8689 100644
--- a/src/dialogs/gnome-cmd-options-dialog.h
+++ b/src/dialogs/gnome-cmd-options-dialog.h
@@ -18,11 +18,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_OPTIONS_DIALOG_H__
-#define __GNOME_CMD_OPTIONS_DIALOG_H__
+#pragma once
#include "gnome-cmd-data.h"
gboolean gnome_cmd_options_dialog (GtkWindow *parent, GnomeCmdData::Options &cfg);
-
-#endif // __GNOME_CMD_OPTIONS_DIALOG_H__
diff --git a/src/dialogs/gnome-cmd-patternsel-dialog.h b/src/dialogs/gnome-cmd-patternsel-dialog.h
index b2795ae..f0a4fc4 100644
--- a/src/dialogs/gnome-cmd-patternsel-dialog.h
+++ b/src/dialogs/gnome-cmd-patternsel-dialog.h
@@ -18,8 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_PATTERNSEL_DIALOG_H__
-#define __GNOME_CMD_PATTERNSEL_DIALOG_H__
+#pragma once
#include "gnome-cmd-file-list.h"
@@ -50,5 +49,3 @@ struct GnomeCmdPatternselDialogClass
GtkWidget *gnome_cmd_patternsel_dialog_new (GnomeCmdFileList *fl, gboolean mode);
GtkType gnome_cmd_patternsel_dialog_get_type ();
-
-#endif // __GNOME_CMD_PATTERNSEL_DIALOG_H__
diff --git a/src/dialogs/gnome-cmd-prepare-copy-dialog.h b/src/dialogs/gnome-cmd-prepare-copy-dialog.h
index a1e925c..c4c084e 100644
--- a/src/dialogs/gnome-cmd-prepare-copy-dialog.h
+++ b/src/dialogs/gnome-cmd-prepare-copy-dialog.h
@@ -18,12 +18,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_PREPARE_COPY_DIALOG_H__
-#define __GNOME_CMD_PREPARE_COPY_DIALOG_H__
+#pragma once
#include "gnome-cmd-file-list.h"
#include "gnome-cmd-file-selector.h"
void gnome_cmd_prepare_copy_dialog_show (GnomeCmdFileSelector *from, GnomeCmdFileSelector *to);
-
-#endif // __GNOME_CMD_PREPARE_COPY_DIALOG_H__
diff --git a/src/dialogs/gnome-cmd-prepare-move-dialog.h b/src/dialogs/gnome-cmd-prepare-move-dialog.h
index 5559c2d..ff43e0f 100644
--- a/src/dialogs/gnome-cmd-prepare-move-dialog.h
+++ b/src/dialogs/gnome-cmd-prepare-move-dialog.h
@@ -18,12 +18,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_PREPARE_MOVE_DIALOG_H__
-#define __GNOME_CMD_PREPARE_MOVE_DIALOG_H__
+#pragma once
#include "gnome-cmd-file-list.h"
#include "gnome-cmd-file-selector.h"
void gnome_cmd_prepare_move_dialog_show (GnomeCmdFileSelector *from, GnomeCmdFileSelector *to);
-
-#endif // __GNOME_CMD_PREPARE_MOVE_DIALOG_H__
diff --git a/src/dialogs/gnome-cmd-prepare-xfer-dialog.h b/src/dialogs/gnome-cmd-prepare-xfer-dialog.h
index a923929..371a8e1 100644
--- a/src/dialogs/gnome-cmd-prepare-xfer-dialog.h
+++ b/src/dialogs/gnome-cmd-prepare-xfer-dialog.h
@@ -18,8 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_PREPARE_XFER_DIALOG_H__
-#define __GNOME_CMD_PREPARE_XFER_DIALOG_H__
+#pragma once
#include "gnome-cmd-dir.h"
#include "gnome-cmd-file-selector.h"
@@ -63,5 +62,3 @@ struct GnomeCmdPrepareXferDialogClass
GtkWidget *gnome_cmd_prepare_xfer_dialog_new (GnomeCmdFileSelector *from, GnomeCmdFileSelector *to);
GtkType gnome_cmd_prepare_xfer_dialog_get_type ();
-
-#endif // __GNOME_CMD_PREPARE_XFER_DIALOG_H__
diff --git a/src/dialogs/gnome-cmd-remote-dialog.h b/src/dialogs/gnome-cmd-remote-dialog.h
index 49edb53..009cfaf 100644
--- a/src/dialogs/gnome-cmd-remote-dialog.h
+++ b/src/dialogs/gnome-cmd-remote-dialog.h
@@ -18,8 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_REMOTE_DIALOG_H__
-#define __GNOME_CMD_REMOTE_DIALOG_H__
+#pragma once
#define GNOME_CMD_TYPE_REMOTE_DIALOG (gnome_cmd_remote_dialog_get_type ())
#define GNOME_CMD_REMOTE_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),
GNOME_CMD_TYPE_REMOTE_DIALOG, GnomeCmdRemoteDialog))
@@ -57,5 +56,3 @@ GType gnome_cmd_remote_dialog_get_type ();
GtkWidget *gnome_cmd_remote_dialog_new ();
void show_quick_connect_dialog ();
-
-#endif // __GNOME_CMD_REMOTE_DIALOG_H__
diff --git a/src/dialogs/gnome-cmd-rename-dialog.h b/src/dialogs/gnome-cmd-rename-dialog.h
index a7a7253..c3d39b0 100644
--- a/src/dialogs/gnome-cmd-rename-dialog.h
+++ b/src/dialogs/gnome-cmd-rename-dialog.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_RENAME_DIALOG_H__
-#define __GNOME_CMD_RENAME_DIALOG_H__
+#pragma once
#include "gnome-cmd-file.h"
@@ -53,5 +52,3 @@ struct GnomeCmdRenameDialogClass
GtkWidget *gnome_cmd_rename_dialog_new (GnomeCmdFile *f, gint x, gint y, gint width, gint height);
-
-#endif // __GNOME_CMD_RENAME_DIALOG_H__
diff --git a/src/dialogs/gnome-cmd-search-dialog.h b/src/dialogs/gnome-cmd-search-dialog.h
index d0f9004..a5aa19f 100644
--- a/src/dialogs/gnome-cmd-search-dialog.h
+++ b/src/dialogs/gnome-cmd-search-dialog.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_SEARCH_DIALOG_H__
-#define __GNOME_CMD_SEARCH_DIALOG_H__
+#pragma once
#include "gnome-cmd-data.h"
#include "gnome-cmd-dir.h"
@@ -60,5 +59,3 @@ struct GnomeCmdSearchDialog
explicit GnomeCmdSearchDialog(GnomeCmdData::SearchConfig &defaults);
~GnomeCmdSearchDialog();
};
-
-#endif // __GNOME_CMD_SEARCH_DIALOG_H__
diff --git a/src/dict.h b/src/dict.h
index b0bfe86..f343ce4 100644
--- a/src/dict.h
+++ b/src/dict.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __DICT_H
-#define __DICT_H
+#pragma once
#include <utility>
#include <map>
@@ -211,5 +210,3 @@ inline void load_data(DICT<std::string,std::string> &dict, void *a, unsigned n)
for (unsigned i=0; i<n; ++i, ++t)
dict.add(t->key,t->value);
}
-
-#endif
diff --git a/src/dirlist.h b/src/dirlist.h
index 08631fd..a40188a 100644
--- a/src/dirlist.h
+++ b/src/dirlist.h
@@ -19,12 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __DIRLIST_H__
-#define __DIRLIST_H__
+#pragma once
#include "gnome-cmd-dir.h"
void dirlist_list (GnomeCmdDir *dir, gboolean visprog);
void dirlist_cancel (GnomeCmdDir *dir);
-
-#endif // __DIRLIST_H__
diff --git a/src/eggcellrendererkeys.h b/src/eggcellrendererkeys.h
index 46b8cee..b1729ab 100644
--- a/src/eggcellrendererkeys.h
+++ b/src/eggcellrendererkeys.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __EGG_CELL_RENDERER_KEYS_H__
-#define __EGG_CELL_RENDERER_KEYS_H__
+#pragma once
#include <gtk/gtkcellrenderertext.h>
@@ -62,5 +61,3 @@ void egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys, guint k
void egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys, guint *keyval, GdkModifierType
*mask);
void egg_cell_renderer_keys_set_accel_mode (EggCellRendererKeys *keys, GtkCellRendererAccelMode accel_mode);
gchar *egg_accelerator_get_label (guint accel_key, GdkModifierType accel_mods);
-
-#endif // __GTK_CELL_RENDERER_KEYS_H__
diff --git a/src/filter.h b/src/filter.h
index 682d524..6cacd3a 100644
--- a/src/filter.h
+++ b/src/filter.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __FILTER_H__
-#define __FILTER_H__
+#pragma once
#include <fnmatch.h>
#include <regex.h>
@@ -53,5 +52,3 @@ inline gboolean gnome_cmd_filter_fnmatch (const gchar *pattern, const gchar *str
return pattern && string && fnmatch (pattern, string, FNM_NOESCAPE) == 0;
#endif
}
-
-#endif // __FILTER_H__
diff --git a/src/gnome-cmd-about-plugin.h b/src/gnome-cmd-about-plugin.h
index 3d2d65e..aabdac2 100644
--- a/src/gnome-cmd-about-plugin.h
+++ b/src/gnome-cmd-about-plugin.h
@@ -42,8 +42,7 @@
Author: Anders Carlsson <andersca codefactory se>
*/
-#ifndef __GNOME_CMD_ABOUT_PLUGIN_H__
-#define __GNOME_CMD_ABOUT_PLUGIN_H__
+#pragma once
#include <gtk/gtkdialog.h>
@@ -71,5 +70,3 @@ struct GnomeCmdAboutPluginClass
GType gnome_cmd_about_plugin_get_type (void) G_GNUC_CONST;
GtkWidget *gnome_cmd_about_plugin_new (PluginInfo *info);
-
-#endif // __GNOME_CMD_ABOUT_PLUGIN_H__
diff --git a/src/gnome-cmd-advrename-lexer.h b/src/gnome-cmd-advrename-lexer.h
index 995428b..54804f1 100644
--- a/src/gnome-cmd-advrename-lexer.h
+++ b/src/gnome-cmd-advrename-lexer.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_ADVRENAME_LEXER_H__
-#define __GNOME_CMD_ADVRENAME_LEXER_H__
+#pragma once
#include "gnome-cmd-file.h"
@@ -31,5 +30,3 @@
void gnome_cmd_advrename_reset_counter(int n, long start=1, int precision=-1, int step=1);
void gnome_cmd_advrename_parse_template(const char *template_string, gboolean &has_counters);
char *gnome_cmd_advrename_gen_fname(GnomeCmdFile *f, size_t new_fname_size=NAME_MAX);
-
-#endif // __GNOME_CMD_ADVRENAME_LEXER_H__
diff --git a/src/gnome-cmd-advrename-profile-component.h b/src/gnome-cmd-advrename-profile-component.h
index 00d35e8..f21431c 100644
--- a/src/gnome-cmd-advrename-profile-component.h
+++ b/src/gnome-cmd-advrename-profile-component.h
@@ -18,8 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_ADVRENAME_PROFILE_COMPONENT_H__
-#define __GNOME_CMD_ADVRENAME_PROFILE_COMPONENT_H__
+#pragma once
#include "gnome-cmd-data.h"
@@ -66,5 +65,3 @@ struct GnomeCmdAdvrenameProfileComponent
void set_sample_fname(const gchar *fname);
GtkTreeModel *get_regex_model() const;
};
-
-#endif // __GNOME_CMD_ADVRENAME_PROFILE_COMPONENT_H__
diff --git a/src/gnome-cmd-app.h b/src/gnome-cmd-app.h
index fe0f70c..2805574 100644
--- a/src/gnome-cmd-app.h
+++ b/src/gnome-cmd-app.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_APP_H__
-#define __GNOME_CMD_APP_H__
+#pragma once
#include "gnome-cmd-file.h"
#include "gnome-cmd-pixmap.h"
@@ -94,5 +93,3 @@ gboolean gnome_cmd_app_get_requires_terminal (GnomeCmdApp *app);
void gnome_cmd_app_set_requires_terminal (GnomeCmdApp *app, gboolean requires_terminal);
GnomeCmdPixmap *gnome_cmd_app_get_pixmap (GnomeCmdApp *app);
-
-#endif // __GNOME_CMD_APP_H__
diff --git a/src/gnome-cmd-chmod-component.h b/src/gnome-cmd-chmod-component.h
index c755bda..62a6985 100644
--- a/src/gnome-cmd-chmod-component.h
+++ b/src/gnome-cmd-chmod-component.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_CHMOD_COMPONENT_H__
-#define __GNOME_CMD_CHMOD_COMPONENT_H__
+#pragma once
#include "gnome-cmd-file.h"
@@ -56,5 +55,3 @@ GtkType gnome_cmd_chmod_component_get_type ();
GnomeVFSFilePermissions gnome_cmd_chmod_component_get_perms (GnomeCmdChmodComponent *component);
void gnome_cmd_chmod_component_set_perms (GnomeCmdChmodComponent *component, GnomeVFSFilePermissions perms);
-
-#endif // __GNOME_CMD_CHMOD_COMPONENT_H__
diff --git a/src/gnome-cmd-chown-component.h b/src/gnome-cmd-chown-component.h
index be4d806..f793c26 100644
--- a/src/gnome-cmd-chown-component.h
+++ b/src/gnome-cmd-chown-component.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_CHOWN_COMPONENT_H__
-#define __GNOME_CMD_CHOWN_COMPONENT_H__
+#pragma once
#include "gnome-cmd-file.h"
@@ -55,5 +54,3 @@ GtkType gnome_cmd_chown_component_get_type ();
void gnome_cmd_chown_component_set (GnomeCmdChownComponent *comp, uid_t owner, gid_t group);
uid_t gnome_cmd_chown_component_get_owner (GnomeCmdChownComponent *component);
gid_t gnome_cmd_chown_component_get_group (GnomeCmdChownComponent *component);
-
-#endif // __GNOME_CMD_CHOWN_COMPONENT_H__
diff --git a/src/gnome-cmd-clist.h b/src/gnome-cmd-clist.h
index 6411c77..40b3a32 100644
--- a/src/gnome-cmd-clist.h
+++ b/src/gnome-cmd-clist.h
@@ -18,8 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_CLIST_H__
-#define __GNOME_CMD_CLIST_H__
+#pragma once
#define GNOME_CMD_TYPE_CLIST (gnome_cmd_clist_get_type ())
#define GNOME_CMD_CLIST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNOME_CMD_TYPE_CLIST,
GnomeCmdCList))
@@ -60,5 +59,3 @@ void gnome_cmd_clist_set_voffset (GnomeCmdCList *clist, gint voffset);
gint gnome_cmd_clist_get_row (GnomeCmdCList *clist, gint x, gint y);
void gnome_cmd_clist_set_drag_row (GnomeCmdCList *clist, gint row);
-
-#endif // __GNOME_CMD_CLIST_H__
diff --git a/src/gnome-cmd-cmdline.h b/src/gnome-cmd-cmdline.h
index a3e18a0..34e3936 100644
--- a/src/gnome-cmd-cmdline.h
+++ b/src/gnome-cmd-cmdline.h
@@ -18,8 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_CMDLINE_H__
-#define __GNOME_CMD_CMDLINE_H__
+#pragma once
#define GNOME_CMD_TYPE_CMDLINE (gnome_cmd_cmdline_get_type ())
#define GNOME_CMD_CMDLINE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNOME_CMD_TYPE_CMDLINE,
GnomeCmdCmdline))
@@ -70,5 +69,3 @@ void gnome_cmd_cmdline_set_history (GnomeCmdCmdline *cmdline, GList *history);
void gnome_cmd_cmdline_show_history (GnomeCmdCmdline *cmdline);
gboolean gnome_cmd_cmdline_keypressed (GnomeCmdCmdline *cmdline, GdkEventKey *event);
-
-#endif // __GNOME_CMD_CMDLINE_H__
diff --git a/src/gnome-cmd-collection.h b/src/gnome-cmd-collection.h
index 17ba4f6..8288369 100644
--- a/src/gnome-cmd-collection.h
+++ b/src/gnome-cmd-collection.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_COLLECTION_H__
-#define __GNOME_CMD_COLLECTION_H__
+#pragma once
#include <glib.h>
@@ -54,5 +53,3 @@ namespace GnomeCmd
return list;
}
}
-
-#endif // __GNOME_CMD_COLLECTION_H__
diff --git a/src/gnome-cmd-combo.h b/src/gnome-cmd-combo.h
index e143e4f..73a7d59 100644
--- a/src/gnome-cmd-combo.h
+++ b/src/gnome-cmd-combo.h
@@ -31,8 +31,7 @@
* The orginal comments are left intact above
*/
-#ifndef __GNOME_CMD_COMBO_H__
-#define __GNOME_CMD_COMBO_H__
+#pragma once
#include "imageloader.h"
#include "gnome-cmd-pixmap.h"
@@ -112,5 +111,3 @@ inline void *GnomeCmdCombo::operator new (size_t size)
{
return g_object_new (GNOME_CMD_TYPE_COMBO, NULL);
}
-
-#endif // __GNOME_CMD_COMBO_H__
diff --git a/src/gnome-cmd-con-device.h b/src/gnome-cmd-con-device.h
index 94c2e0a..0aaea4a 100644
--- a/src/gnome-cmd-con-device.h
+++ b/src/gnome-cmd-con-device.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_CON_DEVICE_H__
-#define __GNOME_CMD_CON_DEVICE_H__
+#pragma once
#include "gnome-cmd-con.h"
@@ -71,5 +70,3 @@ void gnome_cmd_con_device_set_autovol (GnomeCmdConDevice *dev, const gboolean au
GnomeVFSVolume *gnome_cmd_con_device_get_vfs_volume (GnomeCmdConDevice *dev);
void gnome_cmd_con_device_set_vfs_volume (GnomeCmdConDevice *dev, GnomeVFSVolume *vfsvol);
-
-#endif // __GNOME_CMD_CON_DEVICE_H__
diff --git a/src/gnome-cmd-con-home.h b/src/gnome-cmd-con-home.h
index 3c36fb3..e1a39d9 100644
--- a/src/gnome-cmd-con-home.h
+++ b/src/gnome-cmd-con-home.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_CON_HOME_H__
-#define __GNOME_CMD_CON_HOME_H__
+#pragma once
#include "gnome-cmd-con.h"
@@ -47,5 +46,3 @@ struct GnomeCmdConHomeClass
GtkType gnome_cmd_con_home_get_type ();
GnomeCmdCon *gnome_cmd_con_home_new ();
-
-#endif // __GNOME_CMD_CON_HOME_H__
diff --git a/src/gnome-cmd-con-list.h b/src/gnome-cmd-con-list.h
index 1fb219e..a0e6e82 100644
--- a/src/gnome-cmd-con-list.h
+++ b/src/gnome-cmd-con-list.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_CON_LIST_H__
-#define __GNOME_CMD_CON_LIST_H__
+#pragma once
#include "gnome-cmd-data.h"
#include "gnome-cmd-con.h"
@@ -113,5 +112,3 @@ inline GList *get_remote_cons ()
{
return gnome_cmd_con_list_get_all_remote (gnome_cmd_con_list_get ());
}
-
-#endif // __GNOME_CMD_CON_LIST_H__
diff --git a/src/gnome-cmd-con-remote.h b/src/gnome-cmd-con-remote.h
index f85f44a..7505893 100644
--- a/src/gnome-cmd-con-remote.h
+++ b/src/gnome-cmd-con-remote.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_CON_REMOTE_H__
-#define __GNOME_CMD_CON_REMOTE_H__
+#pragma once
#include "gnome-cmd-con.h"
@@ -48,5 +47,3 @@ GtkType gnome_cmd_con_remote_get_type ();
GnomeCmdConRemote *gnome_cmd_con_remote_new (const gchar *alias, const std::string &uri_str,
GnomeCmdCon::Authentication auth=GnomeCmdCon::SAVE_PERMANENTLY);
void gnome_cmd_con_remote_set_host_name (GnomeCmdConRemote *con, const gchar *host_name);
-
-#endif // __GNOME_CMD_CON_REMOTE_H__
diff --git a/src/gnome-cmd-con-smb.h b/src/gnome-cmd-con-smb.h
index 70df099..8c6303f 100644
--- a/src/gnome-cmd-con-smb.h
+++ b/src/gnome-cmd-con-smb.h
@@ -18,8 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_CON_SMB_H__
-#define __GNOME_CMD_CON_SMB_H__
+#pragma once
#include "gnome-cmd-con.h"
@@ -42,5 +41,3 @@ inline GnomeCmdCon *gnome_cmd_con_smb_new ()
{
return GNOME_CMD_CON (g_object_new (GNOME_CMD_TYPE_CON_SMB, NULL));
}
-
-#endif // __GNOME_CMD_CON_SMB_H__
diff --git a/src/gnome-cmd-con.h b/src/gnome-cmd-con.h
index bcc55c8..44c1d96 100644
--- a/src/gnome-cmd-con.h
+++ b/src/gnome-cmd-con.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_CON_H__
-#define __GNOME_CMD_CON_H__
+#pragma once
#define GNOME_CMD_TYPE_CON (gnome_cmd_con_get_type ())
#define GNOME_CMD_CON(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNOME_CMD_TYPE_CON, GnomeCmdCon))
@@ -463,5 +462,3 @@ inline std::string &gnome_cmd_con_make_uri (std::string &s, ConnectionMethodID m
default: return s;
}
}
-
-#endif // __GNOME_CMD_CON_H__
diff --git a/src/gnome-cmd-convert.h b/src/gnome-cmd-convert.h
index 631872e..9a881e6 100644
--- a/src/gnome-cmd-convert.h
+++ b/src/gnome-cmd-convert.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_CONVERT_H__
-#define __GNOME_CMD_CONVERT_H__
+#pragma once
typedef gchar *(*GnomeCmdConvertFunc) (gchar *string);
@@ -35,5 +34,3 @@ gchar *gcmd_convert_uppercase (gchar *string);
gchar *gcmd_convert_sentence_case (gchar *string);
gchar *gcmd_convert_initial_caps (gchar *string);
gchar *gcmd_convert_toggle_case (gchar *string);
-
-#endif // __GNOME_CMD_CONVERT_H__
diff --git a/src/gnome-cmd-data.h b/src/gnome-cmd-data.h
index e3c3853..28e4370 100644
--- a/src/gnome-cmd-data.h
+++ b/src/gnome-cmd-data.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_DATA_H__
-#define __GNOME_CMD_DATA_H__
+#pragma once
#include <vector>
#include <string>
@@ -697,5 +696,3 @@ extern gchar *config_dir;
extern DICT<guint> gdk_key_names;
extern DICT<guint> gdk_modifiers_names;
-
-#endif // __GNOME_CMD_DATA_H__
diff --git a/src/gnome-cmd-dir-indicator.h b/src/gnome-cmd-dir-indicator.h
index bc7a8e7..2b2dcf8 100644
--- a/src/gnome-cmd-dir-indicator.h
+++ b/src/gnome-cmd-dir-indicator.h
@@ -18,8 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_DIR_INDICATOR_H__
-#define __GNOME_CMD_DIR_INDICATOR_H__
+#pragma once
#include "gnome-cmd-file-selector.h"
@@ -58,5 +57,3 @@ void gnome_cmd_dir_indicator_set_active (GnomeCmdDirIndicator *indicator, gboole
void gnome_cmd_dir_indicator_show_history (GnomeCmdDirIndicator *indicator);
void gnome_cmd_dir_indicator_show_bookmarks (GnomeCmdDirIndicator *indicator);
-
-#endif // __GNOME_CMD_DIR_INDICATOR_H__
diff --git a/src/gnome-cmd-dir.h b/src/gnome-cmd-dir.h
index 9a49e8f..4e39932 100644
--- a/src/gnome-cmd-dir.h
+++ b/src/gnome-cmd-dir.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_DIR_H__
-#define __GNOME_CMD_DIR_H__
+#pragma once
#define GNOME_CMD_TYPE_DIR (gnome_cmd_dir_get_type ())
#define GNOME_CMD_DIR(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNOME_CMD_TYPE_DIR, GnomeCmdDir))
@@ -170,5 +169,3 @@ inline gchar *gnome_cmd_dir_get_free_space (GnomeCmdDir *dir)
return gnome_vfs_format_file_size_for_display (free_space);
}
-
-#endif // __GNOME_CMD_DIR_H__
diff --git a/src/gnome-cmd-file-collection.h b/src/gnome-cmd-file-collection.h
index 38f1a57..9aa3a21 100644
--- a/src/gnome-cmd-file-collection.h
+++ b/src/gnome-cmd-file-collection.h
@@ -19,9 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_FILE_COLLECTION_H__
-#define __GNOME_CMD_FILE_COLLECTION_H__
-
+#pragma once
#include "gnome-cmd-file.h"
@@ -72,5 +70,3 @@ inline void GnomeCmdFileCollection::add(GList *files)
for (; files; files = files->next)
add(GNOME_CMD_FILE (files->data));
}
-
-#endif // __GNOME_CMD_FILE_COLLECTION_H__
diff --git a/src/gnome-cmd-file-list.h b/src/gnome-cmd-file-list.h
index 2081368..17009d8 100644
--- a/src/gnome-cmd-file-list.h
+++ b/src/gnome-cmd-file-list.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_FILE_LIST_H__
-#define __GNOME_CMD_FILE_LIST_H__
+#pragma once
#include "gnome-cmd-dir.h"
#include "gnome-cmd-clist.h"
@@ -267,5 +266,3 @@ void gnome_cmd_file_list_edit (GnomeCmdFileList *fl);
void gnome_cmd_file_list_show_quicksearch (GnomeCmdFileList *fl, gchar c);
gboolean gnome_cmd_file_list_quicksearch_shown (GnomeCmdFileList *fl);
-
-#endif // __GNOME_CMD_FILE_LIST_H__
diff --git a/src/gnome-cmd-file-popmenu.h b/src/gnome-cmd-file-popmenu.h
index b63e079..7f0d6ba 100644
--- a/src/gnome-cmd-file-popmenu.h
+++ b/src/gnome-cmd-file-popmenu.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_FILE_POPMENU_H__
-#define __GNOME_CMD_FILE_POPMENU_H__
+#pragma once
#include "gnome-cmd-file-list.h"
@@ -52,5 +51,3 @@ struct GnomeCmdFilePopmenuClass
GtkWidget *gnome_cmd_file_popmenu_new (GnomeCmdFileList *fl);
GtkType gnome_cmd_file_popmenu_get_type ();
-
-#endif // __GNOME_CMD_FILE_POPMENU_H__
diff --git a/src/gnome-cmd-file-selector.h b/src/gnome-cmd-file-selector.h
index ce9e63b..049e81b 100644
--- a/src/gnome-cmd-file-selector.h
+++ b/src/gnome-cmd-file-selector.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_FILE_SELECTOR_H__
-#define __GNOME_CMD_FILE_SELECTOR_H__
+#pragma once
#define GNOME_CMD_TYPE_FILE_SELECTOR (gnome_cmd_file_selector_get_type ())
#define GNOME_CMD_FILE_SELECTOR(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),
GNOME_CMD_TYPE_FILE_SELECTOR, GnomeCmdFileSelector))
@@ -160,5 +159,3 @@ inline FileSelectorID operator ! (FileSelectorID id)
default: return id;
}
}
-
-#endif // __GNOME_CMD_FILE_SELECTOR_H__
diff --git a/src/gnome-cmd-file.h b/src/gnome-cmd-file.h
index 259078f..7b489d7 100644
--- a/src/gnome-cmd-file.h
+++ b/src/gnome-cmd-file.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_FILE_H__
-#define __GNOME_CMD_FILE_H__
+#pragma once
#define GNOME_CMD_TYPE_FILE (gnome_cmd_file_get_type ())
#define GNOME_CMD_FILE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNOME_CMD_TYPE_FILE,
GnomeCmdFile))
@@ -204,5 +203,3 @@ inline GnomeVFSMimeApplication *GnomeCmdFile::get_default_application()
{
return info->mime_type ? gnome_vfs_mime_get_default_application (info->mime_type) : NULL;
}
-
-#endif // __GNOME_CMD_FILE_H__
diff --git a/src/gnome-cmd-gkeyfile-utils.h b/src/gnome-cmd-gkeyfile-utils.h
index 8a1eb27..19ad6c4 100644
--- a/src/gnome-cmd-gkeyfile-utils.h
+++ b/src/gnome-cmd-gkeyfile-utils.h
@@ -20,8 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_GKEYFILE_UTILS_H__
-#define __GNOME_CMD_GKEYFILE_UTILS_H__
+#pragma once
GKeyFile *gcmd_key_file_load_from_file (const gchar *file,
gboolean ignore_error);
@@ -29,6 +28,3 @@ GKeyFile *gcmd_key_file_load_from_file (const gchar *file,
gboolean gcmd_key_file_save_to_file (const gchar *file,
GKeyFile *key_file);
-
-#endif // __GNOME_CMD_GKEYFILE_UTILS_H__
-
diff --git a/src/gnome-cmd-hintbox.h b/src/gnome-cmd-hintbox.h
index 82653fe..e2531b5 100644
--- a/src/gnome-cmd-hintbox.h
+++ b/src/gnome-cmd-hintbox.h
@@ -19,12 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_HINTBOX_H__
-#define __GNOME_CMD_HINTBOX_H__
+#pragma once
#define GNOME_CMD_TYPE_HINT_BOX (gnome_cmd_hint_box_get_type ())
GType gnome_cmd_hint_box_get_type () G_GNUC_CONST;
GtkWidget *gnome_cmd_hint_box_new (const gchar *hint);
-
-#endif // __GNOME_CMD_HINTBOX_H__
diff --git a/src/gnome-cmd-includes.h b/src/gnome-cmd-includes.h
index f07d9ce..84e51be 100644
--- a/src/gnome-cmd-includes.h
+++ b/src/gnome-cmd-includes.h
@@ -19,12 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_INCLUDES_H__
-#define __GNOME_CMD_INCLUDES_H__
+#pragma once
#include <libgcmd/libgcmd.h>
#include <gtk/gtkmarshal.h>
typedef void *(*PthreadFunc)(void *);
-
-#endif // __GNOME_CMD_INCLUDES_H__
diff --git a/src/gnome-cmd-list-popmenu.h b/src/gnome-cmd-list-popmenu.h
index 78e0a74..1021f52 100644
--- a/src/gnome-cmd-list-popmenu.h
+++ b/src/gnome-cmd-list-popmenu.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_LIST_POPMENU_H__
-#define __GNOME_CMD_LIST_POPMENU_H__
+#pragma once
#include "gnome-cmd-file-selector.h"
@@ -47,5 +46,3 @@ struct GnomeCmdListPopmenuClass
GtkWidget *gnome_cmd_list_popmenu_new (GnomeCmdFileSelector *fs);
GtkType gnome_cmd_list_popmenu_get_type ();
-
-#endif // __GNOME_CMD_LIST_POPMENU_H__
diff --git a/src/gnome-cmd-main-menu.h b/src/gnome-cmd-main-menu.h
index a64e97f..6bd3b78 100644
--- a/src/gnome-cmd-main-menu.h
+++ b/src/gnome-cmd-main-menu.h
@@ -18,8 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_MAIN_MENU_H__
-#define __GNOME_CMD_MAIN_MENU_H__
+#pragma once
#include "gnome-cmd-file.h"
#include "plugin_manager.h"
@@ -60,5 +59,3 @@ void gnome_cmd_main_menu_update_bookmarks (GnomeCmdMainMenu *main_menu);
void gnome_cmd_main_menu_update_sens (GnomeCmdMainMenu *main_menu);
void gnome_cmd_main_menu_add_plugin_menu (GnomeCmdMainMenu *main_menu, PluginData *data);
-
-#endif // __GNOME_CMD_MAIN_MENU_H__
diff --git a/src/gnome-cmd-main-win.h b/src/gnome-cmd-main-win.h
index 36896dd..1c9bfaa 100644
--- a/src/gnome-cmd-main-win.h
+++ b/src/gnome-cmd-main-win.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_MAIN_WIN_H__
-#define __GNOME_CMD_MAIN_WIN_H__
+#pragma once
#include "gnome-cmd-file-selector.h"
#include "gnome-cmd-cmdline.h"
@@ -103,7 +102,4 @@ struct GnomeCmdMainWin
friend XML::xstream &operator << (XML::xstream &xml, GnomeCmdMainWin &mw);
};
-
extern GnomeCmdMainWin *main_win;
-
-#endif // __GNOME_CMD_MAIN_WIN_H__
diff --git a/src/gnome-cmd-menu-button.h b/src/gnome-cmd-menu-button.h
index 7960cb2..7ba5d01 100644
--- a/src/gnome-cmd-menu-button.h
+++ b/src/gnome-cmd-menu-button.h
@@ -19,13 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_MENU_BUTTON_H__
-#define __GNOME_CMD_MENU_BUTTON_H__
+#pragma once
GtkWidget *gnome_cmd_button_menu_new (const gchar *label, GtkWidget *menu);
GtkWidget *gnome_cmd_button_menu_new_from_stock (const gchar *stock_id, GtkWidget *menu);
GtkWidget *gnome_cmd_button_menu_new_from_stock (const gchar *stock_id, const gchar *label, GtkWidget *menu);
gulong gnome_cmd_button_menu_connect_handler (GtkWidget *button, GtkWidget *menu);
void gnome_cmd_button_menu_disconnect_handler (GtkWidget *button, GtkWidget *menu);
-
-#endif // __GNOME_CMD_MENU_BUTTON_H__
diff --git a/src/gnome-cmd-mime-config.h b/src/gnome-cmd-mime-config.h
index d74581f..39214e6 100644
--- a/src/gnome-cmd-mime-config.h
+++ b/src/gnome-cmd-mime-config.h
@@ -16,9 +16,6 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GNOME_CMD_MIME_CONFIG_H__
-#define __GNOME_CMD_MIME_CONFIG_H__
+#pragma once
void gnome_cmd_mime_config(void);
-
-#endif
diff --git a/src/gnome-cmd-notebook.h b/src/gnome-cmd-notebook.h
index f608925..ecb9f23 100644
--- a/src/gnome-cmd-notebook.h
+++ b/src/gnome-cmd-notebook.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_NOTEBOOK_H__
-#define __GNOME_CMD_NOTEBOOK_H__
+#pragma once
#include <gtk/gtk.h>
@@ -129,5 +128,3 @@ inline void GnomeCmdNotebook::next_page()
if (n>1)
set_current_page(0);
}
-
-#endif // __GNOME_CMD_NOTEBOOK_H__
diff --git a/src/gnome-cmd-path.h b/src/gnome-cmd-path.h
index a7092bc..2af7fa6 100644
--- a/src/gnome-cmd-path.h
+++ b/src/gnome-cmd-path.h
@@ -18,8 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_PATH_H__
-#define __GNOME_CMD_PATH_H__
+#pragma once
struct GnomeCmdPath
{
@@ -37,5 +36,3 @@ struct GnomeCmdPath
virtual GnomeCmdPath *get_parent() = 0;
virtual GnomeCmdPath *get_child(const gchar *child) = 0;
};
-
-#endif // __GNOME_CMD_PATH_H__
diff --git a/src/gnome-cmd-pixmap.h b/src/gnome-cmd-pixmap.h
index e1be5b6..533f487 100644
--- a/src/gnome-cmd-pixmap.h
+++ b/src/gnome-cmd-pixmap.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_PIXMAP_H__
-#define __GNOME_CMD_PIXMAP_H__
+#pragma once
struct GnomeCmdPixmap
{
@@ -51,5 +50,3 @@ inline void gnome_cmd_pixmap_free (GnomeCmdPixmap *pixmap)
g_free (pixmap);
}
-
-#endif // __GNOME_CMD_PIXMAP_H__
diff --git a/src/gnome-cmd-plain-path.h b/src/gnome-cmd-plain-path.h
index 10bd2db..1c46034 100644
--- a/src/gnome-cmd-plain-path.h
+++ b/src/gnome-cmd-plain-path.h
@@ -18,8 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_PLAIN_PATH_H__
-#define __GNOME_CMD_PLAIN_PATH_H__
+#pragma once
#include "gnome-cmd-path.h"
@@ -51,5 +50,3 @@ inline GnomeCmdPlainPath::GnomeCmdPlainPath(const GnomeCmdPlainPath &thePath)
{
path = g_strdup (thePath.path);
}
-
-#endif // __GNOME_CMD_PLAIN_PATH_H__
diff --git a/src/gnome-cmd-python-plugin.h b/src/gnome-cmd-python-plugin.h
index b743b5a..0e89226 100644
--- a/src/gnome-cmd-python-plugin.h
+++ b/src/gnome-cmd-python-plugin.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_PYTHON_PLUGIN_H__
-#define __GNOME_CMD_PYTHON_PLUGIN_H__
+#pragma once
#include "gnome-cmd-main-win.h"
@@ -37,5 +36,3 @@ void python_plugin_manager_shutdown ();
GList *gnome_cmd_python_plugin_get_list();
gboolean gnome_cmd_python_plugin_execute(const PythonPluginData *plugin, GnomeCmdMainWin *mw);
-
-#endif // __GNOME_CMD_PYTHON_PLUGIN_H__
diff --git a/src/gnome-cmd-quicksearch-popup.h b/src/gnome-cmd-quicksearch-popup.h
index 57afbd8..0bbfba8 100644
--- a/src/gnome-cmd-quicksearch-popup.h
+++ b/src/gnome-cmd-quicksearch-popup.h
@@ -18,8 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_QUICKSEARCH_POPUP_TYPES_H__
-#define __GNOME_CMD_QUICKSEARCH_POPUP_TYPES_H__
+#pragma once
#include "gnome-cmd-file-list.h"
@@ -57,5 +56,3 @@ struct GnomeCmdQuicksearchPopupClass
GtkType gnome_cmd_quicksearch_popup_get_type ();
GtkWidget *gnome_cmd_quicksearch_popup_new (GnomeCmdFileList *fl);
-
-#endif // __GNOME_CMD_QUICKSEARCH_POPUP_TYPES_H__
diff --git a/src/gnome-cmd-regex.h b/src/gnome-cmd-regex.h
index 195430c..359cf1d 100644
--- a/src/gnome-cmd-regex.h
+++ b/src/gnome-cmd-regex.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_REGEX_H__
-#define __GNOME_CMD_REGEX_H__
+#pragma once
#include <glib.h>
@@ -181,5 +180,3 @@ namespace GnomeCmd
return g_regex_replace (re, s, -1, 0, replacement.c_str(), G_REGEX_MATCH_NOTEMPTY, NULL);
}
}
-
-#endif // __GNOME_CMD_REGEX_H__
diff --git a/src/gnome-cmd-selection-profile-component.h b/src/gnome-cmd-selection-profile-component.h
index 42babc9..f12387d 100644
--- a/src/gnome-cmd-selection-profile-component.h
+++ b/src/gnome-cmd-selection-profile-component.h
@@ -18,8 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_SELECTION_PROFILE_COMPONENT_H__
-#define __GNOME_CMD_SELECTION_PROFILE_COMPONENT_H__
+#pragma once
#include "gnome-cmd-data.h"
@@ -62,5 +61,3 @@ struct GnomeCmdSelectionProfileComponent
void set_default_activation(GtkWindow *w);
};
-
-#endif // __GNOME_CMD_SELECTION_PROFILE_COMPONENT_H__
diff --git a/src/gnome-cmd-smb-net.h b/src/gnome-cmd-smb-net.h
index db2f0bb..aaa4520 100644
--- a/src/gnome-cmd-smb-net.h
+++ b/src/gnome-cmd-smb-net.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_SMB_NET_H__
-#define __GNOME_CMD_SMB_NET_H__
+#pragma once
enum SmbEntityType
{
@@ -38,7 +37,4 @@ struct SmbEntity
gchar *workgroup_name;
};
-
SmbEntity *gnome_cmd_smb_net_get_entity (const gchar *name);
-
-#endif // __GNOME_CMD_SMB_NET_H__
diff --git a/src/gnome-cmd-smb-path.h b/src/gnome-cmd-smb-path.h
index 69359e2..d1b1c1a 100644
--- a/src/gnome-cmd-smb-path.h
+++ b/src/gnome-cmd-smb-path.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_SMB_PATH_H__
-#define __GNOME_CMD_SMB_PATH_H__
+#pragma once
#include "gnome-cmd-path.h"
@@ -68,5 +67,3 @@ inline GnomeCmdSmbPath::~GnomeCmdSmbPath()
g_free (path);
g_free (display_path);
}
-
-#endif // __GNOME_CMD_SMB_PATH_H__
diff --git a/src/gnome-cmd-style.h b/src/gnome-cmd-style.h
index 26bb4d3..c182ac6 100644
--- a/src/gnome-cmd-style.h
+++ b/src/gnome-cmd-style.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_STYLE_H__
-#define __GNOME_CMD_STYLE_H__
+#pragma once
#include "gnome-cmd-data.h"
@@ -28,5 +27,3 @@ extern GtkStyle *list_style, *sel_list_style;
extern GtkStyle *alt_list_style, *alt_sel_list_style;
void gnome_cmd_style_create (GnomeCmdData::Options &cfg);
-
-#endif // __GNOME_CMD_STYLE_H__
diff --git a/src/gnome-cmd-treeview.h b/src/gnome-cmd-treeview.h
index 1d4b5e7..1e2a186 100644
--- a/src/gnome-cmd-treeview.h
+++ b/src/gnome-cmd-treeview.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_TREEVIEW_H__
-#define __GNOME_CMD_TREEVIEW_H__
+#pragma once
GtkTreeViewColumn *gnome_cmd_treeview_create_new_text_column (GtkTreeView *view, GtkCellRenderer *&renderer,
gint COL_ID, const gchar *title=NULL);
GtkTreeViewColumn *gnome_cmd_treeview_create_new_pixbuf_column (GtkTreeView *view, GtkCellRenderer
*&renderer, gint COL_ID, const gchar *title=NULL);
@@ -32,5 +31,3 @@ inline GtkTreeViewColumn *gnome_cmd_treeview_create_new_text_column (GtkTreeView
return gnome_cmd_treeview_create_new_text_column (view, renderer, COL_ID, title);
}
-
-#endif // __GNOME_CMD_TREEVIEW_H__
diff --git a/src/gnome-cmd-types.h b/src/gnome-cmd-types.h
index 5755859..c9c8f57 100644
--- a/src/gnome-cmd-types.h
+++ b/src/gnome-cmd-types.h
@@ -18,8 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_TYPES_H__
-#define __GNOME_CMD_TYPES_H__
+#pragma once
typedef gchar *GnomeCmdDateFormat;
@@ -178,5 +177,3 @@ struct GnomeCmdBookmark
gchar *path;
GnomeCmdBookmarkGroup *group;
};
-
-#endif // __GNOME_CMD_TYPES_H__
diff --git a/src/gnome-cmd-user-actions.h b/src/gnome-cmd-user-actions.h
index 2dd668b..5c83495 100644
--- a/src/gnome-cmd-user-actions.h
+++ b/src/gnome-cmd-user-actions.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_USER_ACTIONS_H__
-#define __GNOME_CMD_USER_ACTIONS_H__
+#pragma once
#include <string>
#include <map>
@@ -342,5 +341,3 @@ GNOME_CMD_USER_ACTION(help_keyboard);
GNOME_CMD_USER_ACTION(help_web);
GNOME_CMD_USER_ACTION(help_problem);
GNOME_CMD_USER_ACTION(help_about);
-
-#endif // __GNOME_CMD_USER_ACTIONS_H__
diff --git a/src/gnome-cmd-xfer-progress-win.h b/src/gnome-cmd-xfer-progress-win.h
index 4aaf368..c0427c2 100644
--- a/src/gnome-cmd-xfer-progress-win.h
+++ b/src/gnome-cmd-xfer-progress-win.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_XFER_PROGRESS_WIN_H__
-#define __GNOME_CMD_XFER_PROGRESS_WIN_H__
+#pragma once
#define GNOME_CMD_TYPE_XFER_PROGRESS_WIN (gnome_cmd_xfer_progress_win_get_type ())
#define GNOME_CMD_XFER_PROGRESS_WIN(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),
GNOME_CMD_TYPE_XFER_PROGRESS_WIN, GnomeCmdXferProgressWin))
@@ -62,5 +61,3 @@ void gnome_cmd_xfer_progress_win_set_total_progress (GnomeCmdXferProgressWin *wi
void gnome_cmd_xfer_progress_win_set_msg (GnomeCmdXferProgressWin *win, const gchar *string);
void gnome_cmd_xfer_progress_win_set_action (GnomeCmdXferProgressWin *win, const gchar *string);
-
-#endif // __GNOME_CMD_XFER_PROGRESS_WIN_H__
diff --git a/src/gnome-cmd-xfer.h b/src/gnome-cmd-xfer.h
index c56b56b..ff9d1f7 100644
--- a/src/gnome-cmd-xfer.h
+++ b/src/gnome-cmd-xfer.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_XFER_H__
-#define __GNOME_CMD_XFER_H__
+#pragma once
#include "gnome-cmd-dir.h"
#include "gnome-cmd-file-list.h"
@@ -62,5 +61,3 @@ gnome_cmd_xfer_tmp_download_multiple (GList *src_uri_list,
GnomeVFSXferOverwriteMode xferOverwriteMode,
GtkSignalFunc on_completed_func,
gpointer on_completed_data);
-
-#endif // __GNOME_CMD_XFER_H__
diff --git a/src/gnome-cmd-xml-config.h b/src/gnome-cmd-xml-config.h
index 2f79865..2c1d0e5 100644
--- a/src/gnome-cmd-xml-config.h
+++ b/src/gnome-cmd-xml-config.h
@@ -30,8 +30,7 @@
//
//////////////////////////////////////////////////////////////////////
-#ifndef __GNOME_CMD_XML_CONFIG_H__
-#define __GNOME_CMD_XML_CONFIG_H__
+#pragma once
#include <stack>
#include <string>
@@ -294,5 +293,3 @@ struct GnomeCmdData;
gboolean gnome_cmd_xml_config_parse (const gchar *xml, gsize xml_len, GnomeCmdData &cfg);
gboolean gnome_cmd_xml_config_load (const gchar *path, GnomeCmdData &cfg);
-
-#endif // __GNOME_CMD_XML_CONFIG_H__
diff --git a/src/handle.h b/src/handle.h
index f0b1bac..aaee2c1 100644
--- a/src/handle.h
+++ b/src/handle.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __HANDLE_H__
-#define __HANDLE_H__
+#pragma once
struct Handle
{
@@ -68,5 +67,3 @@ inline gpointer handle_get_ref (Handle *h)
return h->ref;
}
-
-#endif // __HANDLE_H__
diff --git a/src/history.h b/src/history.h
index d49ae92..adc31fa 100644
--- a/src/history.h
+++ b/src/history.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __HISTORY_H__
-#define __HISTORY_H__
+#pragma once
class History
{
@@ -72,5 +71,3 @@ inline History &History::operator = (GList *list)
return *this;
}
-
-#endif // __HISTORY_H__
diff --git a/src/imageloader.h b/src/imageloader.h
index 0382044..67de4b5 100644
--- a/src/imageloader.h
+++ b/src/imageloader.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __IMAGELOADER_H__
-#define __IMAGELOADER_H__
+#pragma once
#include "gnome-cmd-pixmap.h"
@@ -79,5 +78,3 @@ gboolean IMAGE_get_pixmap_and_mask (GnomeVFSFileType type,
GdkBitmap **mask);
void IMAGE_clear_mime_cache ();
-
-#endif // __IMAGELOADER_H__
diff --git a/src/intviewer/bm_byte.h b/src/intviewer/bm_byte.h
index 8c021ac..c7b020b 100644
--- a/src/intviewer/bm_byte.h
+++ b/src/intviewer/bm_byte.h
@@ -22,9 +22,7 @@
*
*/
-
-#ifndef __GVIEWER_BM_BYTE_H__
-#define __GVIEWER_BM_BYTE_H__
+#pragma once
#include <glib.h>
#include <glib-object.h>
@@ -47,5 +45,3 @@ struct GViewerBMByteData
GViewerBMByteData *create_bm_byte_data(const guint8 *pattern, const gint length);
void free_bm_byte_data(GViewerBMByteData *data);
-
-#endif /* __GLIBVIEWER_BM_BYTE_H__ */
diff --git a/src/intviewer/bm_chartype.h b/src/intviewer/bm_chartype.h
index 284151c..0e0d709 100644
--- a/src/intviewer/bm_chartype.h
+++ b/src/intviewer/bm_chartype.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef __GVIEWER_BM_CHARTYPE_H__
-#define __GVIEWER_BM_CHARTYPE_H__
+#pragma once
#include <glib.h>
#include <glib-object.h>
@@ -65,5 +64,3 @@ inline int bm_chartype_get_good_match_advancement(GViewerBMChartypeData *data)
{
return data->good[0];
}
-
-#endif /* __GLIBVIEWER_BM_CHARTYPE_H__ */
diff --git a/src/intviewer/cp437.h b/src/intviewer/cp437.h
index d5902d2..06d70af 100644
--- a/src/intviewer/cp437.h
+++ b/src/intviewer/cp437.h
@@ -22,9 +22,6 @@
*
*/
-#ifndef __CP437_H__
-#define __CP437_H__
+#pragma once
extern unsigned int ascii_cp437_to_unicode[256];
-
-#endif // __CP437_H__
diff --git a/src/intviewer/datapresentation.h b/src/intviewer/datapresentation.h
index 15c844f..bf7daf8 100644
--- a/src/intviewer/datapresentation.h
+++ b/src/intviewer/datapresentation.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef __LIBGVIEWER_DATA_PRESENTATION_H__
-#define __LIBGVIEWER_DATA_PRESENTATION_H__
+#pragma once
struct GVDataPresentation;
@@ -50,5 +49,3 @@ void gv_set_tab_size(GVDataPresentation *dp, guint tab_size);
offset_type gv_align_offset_to_line_start(GVDataPresentation *dp, offset_type offset);
offset_type gv_scroll_lines (GVDataPresentation *dp, offset_type current_offset, int delta);
offset_type gv_get_end_of_line_offset(GVDataPresentation *dp, offset_type start_of_line);
-
-#endif
diff --git a/src/intviewer/fileops.h b/src/intviewer/fileops.h
index 7bb2745..915b7c4 100644
--- a/src/intviewer/fileops.h
+++ b/src/intviewer/fileops.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef __LIBGVIEWER_FILEOPS_H__
-#define __LIBGVIEWER_FILEOPS_H__
+#pragma once
/*
File Handling functions (based on Midnight Commander's view.c)
@@ -68,5 +67,3 @@ offset_type gv_file_get_max_offset(ViewerFileOps *ops);
void gv_file_close (ViewerFileOps *ops);
void gv_file_free (ViewerFileOps *ops);
-
-#endif // __LIBGVIEWER_FILEOPS_H__
diff --git a/src/intviewer/gvtypes.h b/src/intviewer/gvtypes.h
index 39adbbd..c80a97e 100644
--- a/src/intviewer/gvtypes.h
+++ b/src/intviewer/gvtypes.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef __LIBGVIEWER_TYPES_H__
-#define __LIBGVIEWER_TYPES_H__
+#pragma once
/* TODO: Change these for Big-Endian machines */
@@ -48,5 +47,3 @@ typedef guint32 char_type;
*/
typedef unsigned long offset_type;
#define INVALID_OFFSET ((offset_type) -1)
-
-#endif // __LIBGVIEWER_TYPES_H__
diff --git a/src/intviewer/image-render.h b/src/intviewer/image-render.h
index 9a0ada7..519714f 100644
--- a/src/intviewer/image-render.h
+++ b/src/intviewer/image-render.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef __IMAGE_RENDER_H__
-#define __IMAGE_RENDER_H__
+#pragma once
#define TYPE_IMAGE_RENDER (image_render_get_type ())
#define IMAGE_RENDER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), TYPE_IMAGE_RENDER, ImageRender))
@@ -84,5 +83,3 @@ void image_render_set_scale_factor (ImageRender *obj, double scalefactor);
double image_render_get_scale_factor (ImageRender *obj);
void image_render_operation (ImageRender *obj, ImageRender::DISPLAYMODE op);
-
-#endif /* __IMAGE_RENDER_H__ */
diff --git a/src/intviewer/inputmodes.h b/src/intviewer/inputmodes.h
index eb960a0..b04a3df 100644
--- a/src/intviewer/inputmodes.h
+++ b/src/intviewer/inputmodes.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef __LIBGVIEWER_INPUT_MODES_H__
-#define __LIBGVIEWER_INPUT_MODES_H__
+#pragma once
#define is_displayable(c) (((c) >= 0x20) && ((c) < 0x7f))
@@ -123,5 +122,3 @@ offset_type gv_input_get_next_char_offset(GVInputModesData *imd, offset_type cur
*/
offset_type gv_input_get_previous_char_offset(GVInputModesData *imd, offset_type current_offset);
-
-#endif // __LIBGVIEWER_INPUT_MODES_H__
diff --git a/src/intviewer/libgviewer.h b/src/intviewer/libgviewer.h
index 953d9bb..7c2ead1 100644
--- a/src/intviewer/libgviewer.h
+++ b/src/intviewer/libgviewer.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef __LIB_GVIEWER_H__
-#define __LIB_GVIEWER_H__
+#pragma once
#include <gtk/gtk.h>
#include <gtk/gtkadjustment.h>
@@ -42,5 +41,3 @@
#include "search-dlg.h"
#include "searcher.h"
#include "search-progress-dlg.h"
-
-#endif
diff --git a/src/intviewer/scroll-box.h b/src/intviewer/scroll-box.h
index 625053d..36efb09 100644
--- a/src/intviewer/scroll-box.h
+++ b/src/intviewer/scroll-box.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef __SCROLL_BOX_H__
-#define __SCROLL_BOX_H__
+#pragma once
#define SCROLL_BOX(obj) GTK_CHECK_CAST (obj, scroll_box_get_type (), ScrollBox)
#define SCROLL_BOX_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, scroll_box_get_type (), ScrollBoxClass)
@@ -53,5 +52,3 @@ GtkAdjustment *scroll_box_get_v_adjustment (ScrollBox *obj);
void scroll_box_set_v_adjustment (ScrollBox *obj, GtkAdjustment *adjustment);
GtkRange *scroll_box_get_v_range(ScrollBox *obj);
-
-#endif /* __SCROLL_BOX_H__ */
diff --git a/src/intviewer/search-dlg.h b/src/intviewer/search-dlg.h
index 850d457..61bc875 100644
--- a/src/intviewer/search-dlg.h
+++ b/src/intviewer/search-dlg.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef __LIBGVIEWER_SEARCH_DLG_H__
-#define __LIBGVIEWER_SEARCH_DLG_H__
+#pragma once
#define GVIEWER_SEARCH_DLG(obj) GTK_CHECK_CAST (obj, gviewer_search_dlg_get_type(),
GViewerSearchDlg)
#define GVIEWER_SEARCH_DLG_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gviewer_search_dlg_get_type(),
GViewerSearchDlgClass)
@@ -63,5 +62,3 @@ guint8 *gviewer_search_dlg_get_search_hex_buffer (GViewerSearchDlg *sdlg, /*out*
gboolean gviewer_search_dlg_get_case_sensitive (GViewerSearchDlg *sdlg);
void gviewer_show_search_dlg (GtkWindow *parent);
-
-#endif /* __LIBGVIEWER_SEARCH_DLG_H__ */
diff --git a/src/intviewer/search-progress-dlg.h b/src/intviewer/search-progress-dlg.h
index f7ac63a..ccd2a85 100644
--- a/src/intviewer/search-progress-dlg.h
+++ b/src/intviewer/search-progress-dlg.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef __LIBGVIEWER_SEARCH_PROGRESS_DLG_H__
-#define __LIBGVIEWER_SEARCH_PROGRESS_DLG_H__
+#pragma once
#define GVIEWER_SEARCH_PROGRESS_DLG(obj) GTK_CHECK_CAST (obj,
gviewer_search_progress_dlg_get_type(), GViewerSearchProgressDlg)
#define GVIEWER_SEARCH_PROGRESS_DLG_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,
gviewer_search_progress_dlg_get_type(), GViewerSearchProgressDlgClass)
@@ -47,5 +46,3 @@ GType gviewer_search_progress_dlg_get_type ();
void gviewer_show_search_progress_dlg(GtkWindow *parent,
const gchar *searching_text,
gint *abort, gint *complete, gint *progress);
-
-#endif /* __LIBGVIEWER_SEARCH_PROGRESS_DLG_H__ */
diff --git a/src/intviewer/searcher.h b/src/intviewer/searcher.h
index eab9379..a9a6d02 100644
--- a/src/intviewer/searcher.h
+++ b/src/intviewer/searcher.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef SEARCHER_H
-#define SEARCHER_H
+#pragma once
#include <glib.h>
#include <glib-object.h>
@@ -122,5 +121,3 @@ gint * g_viewer_searcher_get_abort_indicator(GViewerSearcher *src);
(read glib's "atomic operations").
*/
gint * g_viewer_searcher_get_complete_indicator(GViewerSearcher *src);
-
-#endif /* SEARCHER_H */
diff --git a/src/intviewer/text-render.h b/src/intviewer/text-render.h
index 4bcfa66..55a1f6a 100644
--- a/src/intviewer/text-render.h
+++ b/src/intviewer/text-render.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef __TEXT_RENDER_H__
-#define __TEXT_RENDER_H__
+#pragma once
#define TYPE_TEXT_RENDER (text_render_get_type ())
#define TEXT_RENDER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), TYPE_TEXT_RENDER, TextRender))
@@ -112,5 +111,3 @@ offset_type text_render_get_last_displayed_offset(TextRender *w);
void text_render_ensure_offset_visible(TextRender *w, offset_type offset);
void text_render_set_marker(TextRender *w, offset_type start, offset_type end);
-
-#endif /* __TEXT_RENDER_H__ */
diff --git a/src/intviewer/viewer-utils.h b/src/intviewer/viewer-utils.h
index 23243ff..ff5f032 100644
--- a/src/intviewer/viewer-utils.h
+++ b/src/intviewer/viewer-utils.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef __LIBGVIEWER_UTILS_H__
-#define __LIBGVIEWER_UTILS_H__
+#pragma once
#define GVIEWER_DEFAULT_PATH_PREFIX "/gnome-commander/internal_viewer/"
@@ -42,5 +41,3 @@ inline char_type chartype_toupper(char_type ch)
}
#define CHARTYPE_CASE(ch,casesens) ((casesens)?ch:chartype_toupper(ch))
-
-#endif
diff --git a/src/intviewer/viewer-widget.h b/src/intviewer/viewer-widget.h
index 52d139c..1f13a3d 100644
--- a/src/intviewer/viewer-widget.h
+++ b/src/intviewer/viewer-widget.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef __GVIEWER_H__
-#define __GVIEWER_H__
+#pragma once
#define GVIEWER(obj) GTK_CHECK_CAST (obj, gviewer_get_type (), GViewer)
#define GVIEWER_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gviewer_get_type (), GViewerClass)
@@ -98,5 +97,3 @@ void gviewer_image_operation(GViewer *obj, ImageRender::DISPLAYMODE op);
void gviewer_copy_selection(GtkMenuItem *item, GViewer *obj);
TextRender *gviewer_get_text_render(GViewer *obj);
-
-#endif /* __GVIEWER_H__ */
diff --git a/src/intviewer/viewer-window.h b/src/intviewer/viewer-window.h
index 87df8d9..94f3b44 100644
--- a/src/intviewer/viewer-window.h
+++ b/src/intviewer/viewer-window.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef __GVIEWER_WINDOW_H__
-#define __GVIEWER_WINDOW_H__
+#pragma once
#include "gnome-cmd-includes.h"
#include "gnome-cmd-file.h"
@@ -89,5 +88,3 @@ void gviewer_window_get_current_settings(GViewerWindow *obj, /* out */ GViewerWi
void gviewer_window_set_settings(GViewerWindow *obj, /*in*/ GViewerWindowSettings *settings);
void gviewer_window_load_settings(/* out */ GViewerWindowSettings *settings);
-
-#endif
diff --git a/src/ls_colors.h b/src/ls_colors.h
index 27dc64c..7f8ebbe 100644
--- a/src/ls_colors.h
+++ b/src/ls_colors.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __LS_COLORS_H__
-#define __LS_COLORS_H__
+#pragma once
#include "gnome-cmd-file.h"
@@ -33,5 +32,3 @@ struct LsColor
void ls_colors_init ();
LsColor *ls_colors_get (GnomeCmdFile *f);
-
-#endif // __LS_COLORS_H__
diff --git a/src/owner.h b/src/owner.h
index 240b16f..9109a6e 100644
--- a/src/owner.h
+++ b/src/owner.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __OWNER_H__
-#define __OWNER_H__
+#pragma once
#include <grp.h>
#include <pwd.h>
@@ -270,5 +269,3 @@ inline const char *GnomeCmdOwner::get_name_by_gid(gid_t id)
}
extern GnomeCmdOwner gcmd_owner;
-
-#endif // __OWNER_H__
diff --git a/src/plugin_manager.h b/src/plugin_manager.h
index 7b2e772..f75f660 100644
--- a/src/plugin_manager.h
+++ b/src/plugin_manager.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __PLUGIN_MANAGER_H__
-#define __PLUGIN_MANAGER_H__
+#pragma once
#include <gmodule.h>
@@ -42,5 +41,3 @@ void plugin_manager_init ();
void plugin_manager_shutdown ();
GList *plugin_manager_get_all ();
void plugin_manager_show ();
-
-#endif // __PLUGIN_MANAGER_H__
diff --git a/src/tags/gnome-cmd-tags-doc.h b/src/tags/gnome-cmd-tags-doc.h
index 88efc5e..355e190 100644
--- a/src/tags/gnome-cmd-tags-doc.h
+++ b/src/tags/gnome-cmd-tags-doc.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_TAGS_DOC_H__
-#define __GNOME_CMD_TAGS_DOC_H__
+#pragma once
#include "gnome-cmd-file.h"
#include "gnome-cmd-tags.h"
@@ -29,5 +28,3 @@ void gcmd_tags_libgsf_init();
void gcmd_tags_libgsf_shutdown();
void gcmd_tags_libgsf_load_metadata(GnomeCmdFile *f);
-
-#endif // __GNOME_CMD_TAGS_DOC_H__
diff --git a/src/tags/gnome-cmd-tags-exiv2.h b/src/tags/gnome-cmd-tags-exiv2.h
index 3e631ee..2a11554 100644
--- a/src/tags/gnome-cmd-tags-exiv2.h
+++ b/src/tags/gnome-cmd-tags-exiv2.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_TAGS_EXIV2_H__
-#define __GNOME_CMD_TAGS_EXIV2_H__
+#pragma once
#include "gnome-cmd-file.h"
#include "gnome-cmd-tags.h"
@@ -29,5 +28,3 @@ void gcmd_tags_exiv2_init();
inline void gcmd_tags_exiv2_shutdown() {}
void gcmd_tags_exiv2_load_metadata(GnomeCmdFile *f);
-
-#endif // __GNOME_CMD_TAGS_EXIV2_H__
diff --git a/src/tags/gnome-cmd-tags-file.h b/src/tags/gnome-cmd-tags-file.h
index 3540295..18e43b4 100644
--- a/src/tags/gnome-cmd-tags-file.h
+++ b/src/tags/gnome-cmd-tags-file.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_TAGS_FILE_H__
-#define __GNOME_CMD_TAGS_FILE_H__
+#pragma once
#include "gnome-cmd-file.h"
#include "gnome-cmd-tags.h"
@@ -29,5 +28,3 @@ inline void gcmd_tags_file_init() {}
inline void gcmd_tags_file_shutdown() {}
void gcmd_tags_file_load_metadata(GnomeCmdFile *f);
-
-#endif // __GNOME_CMD_TAGS_FILE_H__
diff --git a/src/tags/gnome-cmd-tags-poppler.h b/src/tags/gnome-cmd-tags-poppler.h
index bd94301..f55e972 100644
--- a/src/tags/gnome-cmd-tags-poppler.h
+++ b/src/tags/gnome-cmd-tags-poppler.h
@@ -19,11 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_TAGS_POPPLER_H__
-#define __GNOME_CMD_TAGS_POPPLER_H__
+#pragma once
#include "gnome-cmd-file.h"
void gcmd_tags_poppler_load_metadata(GnomeCmdFile *f);
-
-#endif // __GNOME_CMD_TAGS_POPPLER_H__
diff --git a/src/tags/gnome-cmd-tags-taglib.h b/src/tags/gnome-cmd-tags-taglib.h
index 78a5df7..23e669c 100644
--- a/src/tags/gnome-cmd-tags-taglib.h
+++ b/src/tags/gnome-cmd-tags-taglib.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_TAGS_TAGLIB_H__
-#define __GNOME_CMD_TAGS_TAGLIB_H__
+#pragma once
#include "gnome-cmd-file.h"
@@ -28,5 +27,3 @@ void gcmd_tags_taglib_init();
inline void gcmd_tags_taglib_shutdown() {}
void gcmd_tags_taglib_load_metadata(GnomeCmdFile *f);
-
-#endif // __GNOME_CMD_TAGS_TAGLIB_H__
diff --git a/src/tags/gnome-cmd-tags.h b/src/tags/gnome-cmd-tags.h
index 05efbb7..9857fe6 100644
--- a/src/tags/gnome-cmd-tags.h
+++ b/src/tags/gnome-cmd-tags.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GNOME_CMD_TAGS_H__
-#define __GNOME_CMD_TAGS_H__
+#pragma once
#include <string>
#include <map>
@@ -595,6 +594,3 @@ inline const std::string GnomeCmdFileMetadata::operator[] (const GnomeCmdTag tag
return pos==metadata.end() ? NODATA : join(pos->second, ", ");
}
-
-
-#endif // __GNOME_CMD_TAGS_H__
diff --git a/src/tuple.h b/src/tuple.h
index a2d8822..125167f 100644
--- a/src/tuple.h
+++ b/src/tuple.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __TUPLE_H__
-#define __TUPLE_H__
+#pragma once
#include <utility>
@@ -78,5 +77,3 @@ inline triple<T1,T2,T3> make_triple(const T1 &t1, const T2 &t2, const T3 &t3)
{
return triple<T1,T2,T3>(t1,t2,t3);
}
-
-#endif // __TUPLE_H__
diff --git a/src/utils.h b/src/utils.h
index 32d44aa..74e840e 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -18,8 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __UTILS_H__
-#define __UTILS_H__
+#pragma once
#include <string>
#include <vector>
@@ -417,5 +416,3 @@ inline std::string join(const COLL<T, Compare, Allocator> &coll, const std::stri
}
gint get_string_pixel_size (const char *s, int len);
-
-#endif // __UTILS_H__
diff --git a/src/widget-factory.h b/src/widget-factory.h
index 0082b19..c4c3ab2 100644
--- a/src/widget-factory.h
+++ b/src/widget-factory.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __WIDGET_FACTORY_H__
-#define __WIDGET_FACTORY_H__
+#pragma once
#include "libgcmd/libgcmd-deps.h"
#include "gnome-cmd-combo.h"
@@ -34,5 +33,3 @@ inline GnomeCmdCombo *create_clist_combo (GtkWidget *parent, gint num_cols, gint
return combo;
}
-
-#endif // __WIDGET_FACTORY_H__
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
