Replace include guards with #pragma once as config.h requires it anyway

axkg · Apr 6, 2024 · 62539b7 · 62539b7
1 parent 26816c6
commit 62539b7
Show file tree

Hide file tree

Showing 34 changed files with 45 additions and 113 deletions.
diff --git a/src/tX_audiodevice.h b/src/tX_audiodevice.h
@@ -20,8 +20,7 @@
     Description: Header to tX_maingui.cc
 */
 
-#ifndef _h_tx_audiodevice
-#define _h_tx_audiodevice 1
+#pragma once
 
 #include "pthread.h"
 #include "tX_global.h"
@@ -204,5 +203,3 @@ class tX_jack_client {
 };
 
 #endif
-
-#endif
diff --git a/src/tX_audiofile.h b/src/tX_audiofile.h
@@ -20,8 +20,7 @@
     Description: Header to audiofile.cc
 */
 
-#ifndef _h_tx_audiofile
-#define _h_tx_audiofile 1
+#pragma once
 
 #define SOX_BLOCKSIZE 32000
 
@@ -152,5 +151,3 @@ class tx_audiofile {
 
     ~tx_audiofile();
 };
-
-#endif
diff --git a/src/tX_capabilities.h b/src/tX_capabilities.h
@@ -20,6 +20,8 @@
     Description: Aquire CAP_SYS_NICE through Linux' capabilities.
 */
 
+#pragma once
+
 #include <config.h>
 
 #ifdef USE_CAPABILITIES

diff --git a/src/tX_dial.h b/src/tX_dial.h
@@ -22,8 +22,7 @@
     Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
 */
 
-#ifndef __GTK_TX_DIAL_H__
-#define __GTK_TX_DIAL_H__
+#pragma once
 
 #include <config.h>
 #include <gdk/gdk.h>
@@ -74,5 +73,3 @@ void gtk_tx_dial_set_adjustment(GtkTxDial* tx_dial, GtkAdjustment* adjustment);
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
-
-#endif /* __GTK_TX_DIAL_H__ */
diff --git a/src/tX_dialog.h b/src/tX_dialog.h
@@ -20,9 +20,8 @@
     Description: Header to tX_dialog.c
 */
 
-#ifndef _H_TX_DIALOG_
-#define _H_TX_DIALOG_
-// #include <gdk/gdk.h>
+#pragma once
+
 #include <gtk/gtk.h>
 extern GtkWidget* opt_dialog;
 
@@ -32,4 +31,3 @@ extern void destroy_about();
 extern void init_tx_options(GtkWidget* dialog);
 extern void tX_set_icon(GtkWidget* widget);
 extern void apply_options(GtkWidget*);
-#endif
diff --git a/src/tX_endian.h b/src/tX_endian.h
@@ -20,8 +20,7 @@
     Description: header to tX_endian.c
 */
 
-#ifndef _H_TX_ENDIAN_
-#define _H_TX_ENDIAN_
+#pragma once
 
 #include <config.h>
 #ifdef WORDS_BIGENDIAN
@@ -60,5 +59,3 @@ extern void swap32(int32_t* val);
 #endif /* __cplusplus */
 
 #endif /* WORDS_BIGENDIAN */
-
-#endif /* _H_TX_ENDIAN_ */
diff --git a/src/tX_engine.h b/src/tX_engine.h
@@ -20,8 +20,7 @@
     Description: Header to tX_engine.cc
 */
 
-#ifndef _TX_ENGINE_H_
-#define _TX_ENGINE_H_
+#pragma once
 
 #include "tX_audiodevice.h"
 #include "tX_midiin.h"
@@ -107,4 +106,3 @@ class tX_engine {
     /*	void set_grab_request(); */
     bool is_stopped() { return stop_flag; }
 };
-#endif
diff --git a/src/tX_event.h b/src/tX_event.h
@@ -20,8 +20,7 @@
     Description: Header to tX_event.cc
 */
 
-#ifndef _h_tx_event_
-#define _h_tx_event_ 1
+#pragma once
 
 #include "tX_seqpar.h"
 #include "tX_types.h"
@@ -64,5 +63,3 @@ class tX_event {
             sp->exec_value(value);
     }
 };
-
-#endif
diff --git a/src/tX_extdial.h b/src/tX_extdial.h
@@ -18,8 +18,7 @@
     File: tX_extdial.h
 */
 
-#ifndef _h_tx_extdial_
-#define _h_tx_extdial_
+#pragma once
 
 #include "tX_dial.h"
 #include <gtk/gtk.h>
@@ -56,5 +55,3 @@ class tX_extdial {
     static GCallback f_entry(GtkWidget* w, tX_extdial* ed);
     static GCallback f_adjustment(GtkWidget* w, tX_extdial* ed);
 };
-
-#endif
diff --git a/src/tX_flash.h b/src/tX_flash.h
@@ -20,8 +20,8 @@
     Description: Header to tX_flash.c
 */
 
-#ifndef __GTK_TX_FLASH_H__
-#define __GTK_TX_FLASH_H__
+#pragma once
+
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
@@ -70,4 +70,3 @@ void gtk_tx_flash_update_colors(GtkTxFlash* tx);
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
-#endif
diff --git a/src/tX_global.h b/src/tX_global.h
@@ -21,8 +21,7 @@
                  tX_global struct.
 */
 
-#ifndef _TX_GLOBAL_H
-#define _TX_GLOBAL_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -445,5 +444,3 @@ extern int _store_compress_xml;
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
-
-#endif
diff --git a/src/tX_knobloader.h b/src/tX_knobloader.h
@@ -20,8 +20,7 @@
     Description: Header to tX_knobloader.c
 */
 
-#ifndef _tX_knobloader_
-#define _tX_knobloader_ 1
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -43,5 +42,3 @@ extern void load_knob_pixs(int fontHeight, int scaleFactor);
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
-
-#endif
diff --git a/src/tX_ladspa.h b/src/tX_ladspa.h
@@ -20,8 +20,7 @@
     Description: Header to ladspa.cc - see there for more info
 */
 
-#ifndef _h_tx_ladspa
-#define _h_tx_ladspa 1
+#pragma once
 
 #include <ladspa.h>
 #include <list>
@@ -73,5 +72,3 @@ class LADSPA_Stereo_Plugin : public LADSPA_Plugin {
     static LADSPA_Stereo_Plugin* getPluginByIndex(int i);
     static LADSPA_Stereo_Plugin* getPluginByUniqueID(long ID);
 };
-
-#endif
diff --git a/src/tX_ladspa_class.h b/src/tX_ladspa_class.h
@@ -20,8 +20,7 @@
     Description: Header to tX_ladspa_class.cc - see there for more info
 */
 
-#ifndef _h_tx_ladspa_class
-#define _h_tx_ladspa_class 1
+#pragma once
 
 #include "tX_ladspa.h"
 #include "tX_vtt.h"
@@ -72,5 +71,3 @@ class LADSPA_Class { // Yeah, I know "class" name for C++ class - but it just se
     static void set_current_vtt(vtt_class* vtt) { current_vtt = vtt; }
     static vtt_class* get_current_vtt() { return current_vtt; }
 };
-
-#endif
diff --git a/src/tX_loaddlg.h b/src/tX_loaddlg.h
@@ -20,8 +20,8 @@
     Description: Header to tX_loaddlg.cc
 */
 
-#ifndef _h_tX_loaddlg
-#define _h_tX_loaddlg 1
+#pragma once
+
 #define TX_LOADDLG_MODE_SINGLE 0
 #define TX_LOADDLG_MODE_MULTI 1
 
@@ -34,5 +34,3 @@ extern void ld_set_filename(char* name);
 extern void ld_set_progress(gfloat progress);
 extern void ld_destroy();
 extern char* strip_path(char* name);
-
-#endif
diff --git a/src/tX_maingui.h b/src/tX_maingui.h
@@ -20,8 +20,7 @@
     Description: Header to tX_maingui.cc
 */
 
-#ifndef _h_tx_maingui
-#define _h_tx_maingui 1
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -94,4 +93,3 @@ class tX_cursor {
 
 extern GCallback menu_delete_all_events_for_sp(GtkWidget*, tX_seqpar* sp);
 extern bool tX_shutdown;
-#endif
diff --git a/src/tX_midiin.h b/src/tX_midiin.h
@@ -20,8 +20,7 @@
     Description: Header to tX_midiin.cc
 */
 
-#ifndef _tx_midiin_h
-#define _tx_midiin_h 1
+#pragma once
 
 #include <libxml/encoding.h>
 #include <libxml/parser.h>
@@ -137,5 +136,3 @@ class tX_midiin {
 };
 
 #endif // USE_ALSA_MIDI_IN
-
-#endif // ndef _tx_midiin_h
diff --git a/src/tX_mouse.h b/src/tX_mouse.h
@@ -20,8 +20,7 @@
     Description: Header to tX_mouse.cc
 */
 
-#ifndef _h_tx_mouse
-#define _h_tx_mouse
+#pragma once
 
 #include <config.h>
 
@@ -147,4 +146,3 @@ class tx_mouse {
     static gboolean linux_input_wrap(GIOChannel* source, GIOCondition condition, gpointer data);
 };
 
-#endif
diff --git a/src/tX_panel.h b/src/tX_panel.h
@@ -17,8 +17,7 @@
 
 */
 
-#ifndef _h_tX_panel_
-#define _h_tX_panel_
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -62,4 +61,3 @@ class tX_panel {
 };
 
 extern void tX_panel_make_label_bold(GtkWidget* widget);
-#endif
diff --git a/src/tX_pbutton.h b/src/tX_pbutton.h
@@ -20,8 +20,7 @@
     Description: Header to tX_pbutton.cc
 */
 
-#ifndef _tx_pbutton_h_
-#define _tx_pbutton_h_ 1
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -52,4 +51,3 @@ extern void tx_icons_init(int size);
 extern GtkWidget* create_top_button(int icon_id);
 extern GtkWidget* tx_xpm_label_box(tX_icon id, const gchar* label_text, GtkWidget** labelwidget = (GtkWidget**)NULL);
 extern GtkWidget* tx_xpm_button_new(tX_icon id, const char* label, int toggle, GtkWidget** labelwidget = (GtkWidget**)NULL);
-#endif
diff --git a/src/tX_prelis.h b/src/tX_prelis.h
@@ -20,9 +20,7 @@
     Description: Header to tX_prelis.cc
 */
 
-#ifndef _h_tX_prelis
-#define _h_tX_prelis
+#pragma once
 
 extern void prelis_stop();
 extern void prelis_start(char* name);
-#endif
diff --git a/src/tX_seqpar.h b/src/tX_seqpar.h
@@ -20,16 +20,15 @@
     Description: Header to tX_seqpar.cc
 */
 
+#pragma once
+
 #include "tX_extdial.h"
 #include "tX_global.h"
 #include "tX_midiin.h"
 #include <gtk/gtk.h>
 #include <list>
 #include <pthread.h>
 
-#ifndef _tx_seqpar_h
-#define _tx_seqpar_h 1
-
 #define NO_MOUSE_MAPPING 0
 #define MOUSE_MAPPING_OK 1
 
@@ -477,5 +476,3 @@ class tX_seqpar_vttfx_int : public tX_seqpar_vttfx {
 
     static GCallback gtk_callback(GtkWidget*, tX_seqpar_vttfx_int*);
 };
-
-#endif
diff --git a/src/tX_sequencer.h b/src/tX_sequencer.h
@@ -20,8 +20,7 @@
     Description: Header to tX_sequencer.cc
 */
 
-#ifndef _h_tx_sequencer_
-#define _h_tx_sequencer_ 1
+#pragma once
 
 #include <glib.h>
 #include <list>
@@ -101,5 +100,3 @@ class tX_sequencer {
 };
 
 extern tX_sequencer sequencer;
-
-#endif
diff --git a/src/tX_tape.h b/src/tX_tape.h
@@ -20,8 +20,7 @@
     Description: Header to tX_tape.cc
 */
 
-#ifndef _h_tx_tapedeck_
-#define _h_tx_tapedeck_ 1
+#pragma once
 
 #include "tX_types.h"
 #include "wav_file.h"
@@ -39,5 +38,3 @@ class tx_tapedeck {
 
     tx_tapedeck();
 };
-
-#endif
diff --git a/src/tX_types.h b/src/tX_types.h
@@ -21,8 +21,7 @@
                  available define USE_X86_TYPES on i386 machines
 */
 
-#ifndef _H_TX_TYPES
-#define _H_TX_TYPES
+#pragma once
 
 #define f_prec float
 #define d_prec double
@@ -38,5 +37,3 @@
 #define int32_t long
 
 #endif
-
-#endif
diff --git a/src/tX_ui_callbacks.h b/src/tX_ui_callbacks.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include <gtk/gtk.h>
 
 void on_tx_options_destroy(GObject* object,