background: Replace ifdefs with #pragma once
This commit is contained in:
parent
d16cddeccf
commit
b32eab65a6
9 changed files with 10 additions and 39 deletions
|
@ -19,8 +19,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _BG_COLORS_SOURCE_H
|
#pragma once
|
||||||
#define _BG_COLORS_SOURCE_H
|
|
||||||
|
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
#include "bg-source.h"
|
#include "bg-source.h"
|
||||||
|
@ -37,5 +36,3 @@ gboolean bg_colors_source_add (BgColorsSource *self,
|
||||||
GtkTreeRowReference **ret_row_ref);
|
GtkTreeRowReference **ret_row_ref);
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
#endif /* _BG_COLORS_SOURCE_H */
|
|
||||||
|
|
|
@ -19,9 +19,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
#ifndef _BG_PICTURES_SOURCE_H
|
|
||||||
#define _BG_PICTURES_SOURCE_H
|
|
||||||
|
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
#include "bg-source.h"
|
#include "bg-source.h"
|
||||||
|
@ -46,5 +44,3 @@ gboolean bg_pictures_source_is_known (BgPicturesSource *bg_source
|
||||||
const char * const * bg_pictures_get_support_content_types (void);
|
const char * const * bg_pictures_get_support_content_types (void);
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
#endif /* _BG_PICTURES_SOURCE_H */
|
|
||||||
|
|
|
@ -18,8 +18,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _BG_SOURCE_H
|
#pragma once
|
||||||
#define _BG_SOURCE_H
|
|
||||||
|
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
#include <libgnome-desktop/gnome-desktop-thumbnail.h>
|
#include <libgnome-desktop/gnome-desktop-thumbnail.h>
|
||||||
|
@ -45,5 +44,3 @@ gint bg_source_get_thumbnail_width (BgSource *source);
|
||||||
GnomeDesktopThumbnailFactory* bg_source_get_thumbnail_factory (BgSource *source);
|
GnomeDesktopThumbnailFactory* bg_source_get_thumbnail_factory (BgSource *source);
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
#endif /* _BG_SOURCE_H */
|
|
||||||
|
|
|
@ -19,9 +19,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
#ifndef _BG_WALLPAPERS_SOURCE_H
|
|
||||||
#define _BG_WALLPAPERS_SOURCE_H
|
|
||||||
|
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
#include "bg-source.h"
|
#include "bg-source.h"
|
||||||
|
@ -34,5 +32,3 @@ G_DECLARE_FINAL_TYPE (BgWallpapersSource, bg_wallpapers_source, BG, WALLPAPERS_S
|
||||||
BgWallpapersSource *bg_wallpapers_source_new (GtkWidget *widget);
|
BgWallpapersSource *bg_wallpapers_source_new (GtkWidget *widget);
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
#endif /* _BG_WALLPAPERS_SOURCE_H */
|
|
||||||
|
|
|
@ -15,9 +15,7 @@
|
||||||
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
#ifndef _CC_BACKGROUND_GRILO_MINER_H
|
|
||||||
#define _CC_BACKGROUND_GRILO_MINER_H
|
|
||||||
|
|
||||||
#include <glib-object.h>
|
#include <glib-object.h>
|
||||||
|
|
||||||
|
@ -31,5 +29,3 @@ CcBackgroundGriloMiner *cc_background_grilo_miner_new (void);
|
||||||
void cc_background_grilo_miner_start (CcBackgroundGriloMiner *self);
|
void cc_background_grilo_miner_start (CcBackgroundGriloMiner *self);
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
#endif /* _CC_BACKGROUND_GRILO_MINER_H */
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __CC_BACKGROUND_ITEM_H
|
#pragma once
|
||||||
#define __CC_BACKGROUND_ITEM_H
|
|
||||||
|
|
||||||
#include <glib-object.h>
|
#include <glib-object.h>
|
||||||
#include <gdk-pixbuf/gdk-pixbuf.h>
|
#include <gdk-pixbuf/gdk-pixbuf.h>
|
||||||
|
@ -82,5 +81,3 @@ gboolean cc_background_item_compare (CcBackgroundItem *s
|
||||||
void cc_background_item_dump (CcBackgroundItem *item);
|
void cc_background_item_dump (CcBackgroundItem *item);
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
#endif /* __CC_BACKGROUND_ITEM_H */
|
|
||||||
|
|
|
@ -18,9 +18,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
#ifndef _CC_BACKGROUND_PANEL_H
|
|
||||||
#define _CC_BACKGROUND_PANEL_H
|
|
||||||
|
|
||||||
#include <shell/cc-panel.h>
|
#include <shell/cc-panel.h>
|
||||||
|
|
||||||
|
@ -30,5 +28,3 @@ G_BEGIN_DECLS
|
||||||
G_DECLARE_FINAL_TYPE (CcBackgroundPanel, cc_background_panel, CC, BACKGROUND_PANEL, CcPanel)
|
G_DECLARE_FINAL_TYPE (CcBackgroundPanel, cc_background_panel, CC, BACKGROUND_PANEL, CcPanel)
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
#endif /* _CC_BACKGROUND_PANEL_H */
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _CC_BACKGROUND_XML_H_
|
#pragma once
|
||||||
#define _CC_BACKGROUND_XML_H_
|
|
||||||
|
|
||||||
#include <libgnome-desktop/gnome-desktop-thumbnail.h>
|
#include <libgnome-desktop/gnome-desktop-thumbnail.h>
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
|
@ -46,6 +45,3 @@ gboolean cc_background_xml_load_list_finish (CcBackgroundXml *xml,
|
||||||
GError **error);
|
GError **error);
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
|
@ -43,10 +43,10 @@ enums_header = files(
|
||||||
common_sources += gnome.mkenums(
|
common_sources += gnome.mkenums(
|
||||||
enums + '.h',
|
enums + '.h',
|
||||||
sources: enums_header,
|
sources: enums_header,
|
||||||
fhead: '#ifndef __GDESKTOP_ENUMS_TYPES_H__\n#define __GDESKTOP_ENUMS_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n',
|
fhead: '#pragma once\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n',
|
||||||
fprod: '/* enumerations from "@filename@" */\n',
|
fprod: '/* enumerations from "@filename@" */\n',
|
||||||
vhead: 'GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define G_DESKTOP_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n',
|
vhead: 'GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define G_DESKTOP_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n',
|
||||||
ftail: 'G_END_DECLS\n\n#endif /* __GDESKTOP_ENUMS_TYPES_H__ */'
|
ftail: 'G_END_DECLS\n'
|
||||||
)
|
)
|
||||||
|
|
||||||
common_sources += gnome.mkenums(
|
common_sources += gnome.mkenums(
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue