rename src/cmdline files to start with "ddcui_"

- differentiates file names from corresponding ddcutil files - makes it harder to accidentally edit wrong file in eclipse
rockowitz · Nov 9, 2021 · 2ec3d21 · 2ec3d21
1 parent 2342477
commit 2ec3d21
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 34 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -109,9 +109,9 @@ set(SOURCES
     src/core_widgets/number_entry_widget.cpp
     src/core_widgets/spin_slider.cpp
 
-    src/cmdline/cmd_parser.c
-    src/cmdline/cmd_parser_aux.c
-    src/cmdline/parsed_cmd.c
+    src/cmdline/ddcui_cmd_parser.c
+    src/cmdline/ddcui_cmd_parser_aux.c
+    src/cmdline/ddcui_parsed_cmd.c
 
     src/nongui/ddc_error.cpp 
     src/nongui/ddca_simulator.cpp

diff --git a/src/base/feature_selector.cpp b/src/base/feature_selector.cpp
@@ -13,7 +13,8 @@
 
 #include "base/core.h"
 #include "base/feature_selector.h"
-#include "cmdline/parsed_cmd.h"
+
+#include "cmdline/ddcui_parsed_cmd.h"
 
 
 // For feature selection dialog

diff --git a/src/base/feature_selector.h b/src/base/feature_selector.h
@@ -14,7 +14,7 @@
 
 #include "ddcutil_types.h"
 
-#include "cmdline/parsed_cmd.h"
+#include "cmdline/ddcui_parsed_cmd.h"
 
 
 class FeatureSelector    // : public QObject

diff --git a/src/base/global_state.h b/src/base/global_state.h
@@ -8,10 +8,10 @@
 
 // #include <QtWidgets/QtWidgets>   // to define Q_OBJECT
 
+#include "cmdline/ddcui_parsed_cmd.h"
 #include "base/other_options_state.h"
 #include "base/user_interface_options_state.h"
 #include "main/mainwindow.h"    // ugh - referencing out of base, to clean up
-#include "cmdline/parsed_cmd.h"
 
 
 class GlobalState {

diff --git a/src/base/other_options_state.h b/src/base/other_options_state.h
@@ -2,15 +2,15 @@
  *  Maintains the current state of the NC Feature Values dialog
  */
 
-// Copyright (C) 2018-2020 Sanford Rockowitz <rockowitz@minsoft.com>
+// Copyright (C) 2018-2021 Sanford Rockowitz <rockowitz@minsoft.com>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #ifndef OTHER_OPTIONS_STATE_H_
 #define OTHER_OPTIONS_STATE_H_
 
 #include <QtCore/QObject>
 
-#include "cmdline/parsed_cmd.h"
+#include "cmdline/ddcui_parsed_cmd.h"
 
 // move inside class?
 typedef enum {

diff --git a/src/base/user_interface_options_state.cpp b/src/base/user_interface_options_state.cpp
@@ -2,14 +2,15 @@
 //
 // Maintains the current state of the User Interface Options dialog
 
-// Copyright (C) 2018-2020 Sanford Rockowitz <rockowitz@minsoft.com>
+// Copyright (C) 2018-2021 Sanford Rockowitz <rockowitz@minsoft.com>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 // NB was originally named ui_options_state.h etc, but the ui prefix is
 // special, causes the user interface compiler to look for a dialog named ui_options_state_dialog
 
 #include "user_interface_options_state.h"
-#include "cmdline/parsed_cmd.h"
+
+#include "cmdline/ddcui_parsed_cmd.h"
 #include "core_widgets/enhanced_slider.h"
 
 #include "core.h"

diff --git a/src/base/user_interface_options_state.h b/src/base/user_interface_options_state.h
@@ -2,15 +2,15 @@
 //
 // Maintains the current state of the User Interface Options dialog
 
-// Copyright (C) 2018-2019 Sanford Rockowitz <rockowitz@minsoft.com>
+// Copyright (C) 2018-2021 Sanford Rockowitz <rockowitz@minsoft.com>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #ifndef USER_INTERFACE_OPTIONS_STATE_H_
 #define USER_INTERFACE_OPTIONS_STATE_H_
 
 #include <QtCore/QObject>
 
-#include "cmdline/parsed_cmd.h"
+#include "cmdline/ddcui_parsed_cmd.h"
 
 class UserInterfaceOptionsState : public QObject {
    Q_OBJECT

diff --git a/src/cmdline/cmd_parser.c → src/cmdline/ddcui_cmd_parser.c b/src/cmdline/cmd_parser.c → src/cmdline/ddcui_cmd_parser.c
@@ -24,10 +24,10 @@
 #include "c_util/string_util.h"
 #include "base/ddcui_parms.h"
 #include "base/feature_list.h"
+#include "ddcui_cmd_parser.h"
 
-#include "cmdline/cmd_parser_aux.h"
-#include "cmdline/parsed_cmd.h"
-#include "cmdline/cmd_parser.h"
+#include "ddcui_cmd_parser_aux.h"
+#include "ddcui_parsed_cmd.h"
 
 
 // Variables used by callback function

diff --git a/src/cmdline/cmd_parser.h → src/cmdline/ddcui_cmd_parser.h b/src/cmdline/cmd_parser.h → src/cmdline/ddcui_cmd_parser.h
@@ -3,11 +3,11 @@
 // Copyright (C) 2018-2021 Sanford Rockowitz <rockowitz@minsoft.com>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#ifndef CMD_PARSER_H_
-#define CMD_PARSER_H_
+#ifndef DDCUI_CMD_PARSER_H_
+#define DDCUI_CMD_PARSER_H_
 
-#include "cmdline/parsed_cmd.h"
+#include "ddcui_parsed_cmd.h"
 
 Parsed_Ddcui_Cmd * parse_ddcui_command(int argc, char * argv[]);
 
-#endif /* CMD_PARSER_H_ */
+#endif /* DDCUI_CMD_PARSER_H_ */
diff --git a/src/cmdline/cmd_parser_aux.c → src/cmdline/ddcui_cmd_parser_aux.c b/src/cmdline/cmd_parser_aux.c → src/cmdline/ddcui_cmd_parser_aux.c
@@ -3,7 +3,7 @@
  *  Functions and strings that are independent of the parser package used.
  */
 
-// Copyright (C) 2014-2018 Sanford Rockowitz <rockowitz@minsoft.com>
+// Copyright (C) 2014-2021 Sanford Rockowitz <rockowitz@minsoft.com>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 // #include <config.h>
@@ -20,7 +20,7 @@
 
 // #include "base/parms.h"
 
-#include "cmdline/cmd_parser_aux.h"
+#include "ddcui_cmd_parser_aux.h"
 
 bool all_digits(char * val, int ct) {
    // bool debug = false;

diff --git a/src/cmdline/cmd_parser_aux.h → src/cmdline/ddcui_cmd_parser_aux.h b/src/cmdline/cmd_parser_aux.h → src/cmdline/ddcui_cmd_parser_aux.h
@@ -3,16 +3,16 @@
  *  Functions and strings that are independent of the parser package used.
  */
 
-// Copyright (C) 20014-2019 Sanford Rockowitz <rockowitz@minsoft.com>
+// Copyright (C) 20014-2021 Sanford Rockowitz <rockowitz@minsoft.com>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 
-#ifndef CMD_PARSER_AUX_H_
-#define CMD_PARSER_AUX_H_
+#ifndef DDCUI_CMD_PARSER_AUX_H_
+#define DDCUI_CMD_PARSER_AUX_H_
 
 #include <string.h>
 
-#include "cmdline/parsed_cmd.h"
+#include "ddcui_parsed_cmd.h"
 
 
 bool all_digits(char * val, int ct);
@@ -28,4 +28,4 @@ extern char * trcfile_multiple_call_option_help;
 extern char * stats_multiple_call_option_help;
 extern char * maxtries_option_help;
 
-#endif /* CMD_PARSER_AUX_H_ */
+#endif /* DDCUI_CMD_PARSER_AUX_H_ */
diff --git a/src/cmdline/parsed_cmd.c → src/cmdline/ddcui_parsed_cmd.c b/src/cmdline/parsed_cmd.c → src/cmdline/ddcui_parsed_cmd.c
@@ -1,6 +1,6 @@
 /** \file parsed_cmd.c - parsed ddcui command line */
 
-// Copyright (C) 2018-2020 Sanford Rockowitz <rockowitz@minsoft.com>
+// Copyright (C) 2018-2021 Sanford Rockowitz <rockowitz@minsoft.com>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 
@@ -16,7 +16,7 @@
 #include "ddcutil_c_api.h"
 
 #include "c_util/data_structures.h"
-#include "cmdline/parsed_cmd.h"
+#include "ddcui_parsed_cmd.h"
 
 
 // all uses of this local function are safe,

diff --git a/src/cmdline/parsed_cmd.h → src/cmdline/ddcui_parsed_cmd.h b/src/cmdline/parsed_cmd.h → src/cmdline/ddcui_parsed_cmd.h
@@ -3,8 +3,8 @@
 // Copyright (C) 2018-2021 Sanford Rockowitz <rockowitz@minsoft.com>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#ifndef PARSED_CMD_H_
-#define PARSED_CMD_H_
+#ifndef DDCUI_PARSED_CMD_H_
+#define DDCUI_PARSED_CMD_H_
 
 #include <ddcutil_types.h>
 
@@ -123,4 +123,4 @@ Parsed_Ddcui_Cmd *  new_parsed_ddcui_cmd();
 void                free_parsed_ddcui_cmd(Parsed_Ddcui_Cmd * parsed_cmd);
 void                dbgrpt_parsed_ddcui_cmd(Parsed_Ddcui_Cmd * parsed_cmd);   // debugging function
 
-#endif /* PARSED_CMD_H_ */
+#endif /* DDCUI_PARSED_CMD_H_ */
diff --git a/src/main/main.cpp b/src/main/main.cpp
@@ -16,8 +16,8 @@ extern "C" {
 #include "c_util/string_util.h"
 #include "c_util/xdg_util.h"
 
-#include "cmdline/parsed_cmd.h"
-#include "cmdline/cmd_parser.h"
+#include "cmdline/ddcui_parsed_cmd.h"
+#include "cmdline/ddcui_cmd_parser.h"
 }
 
 #include "base/ddcui_parms.h"

diff --git a/src/main/mainwindow.h b/src/main/mainwindow.h
@@ -10,10 +10,10 @@
 
 #include <ddcutil_types.h>
 
+#include "cmdline/ddcui_parsed_cmd.h"
 #include "base/core.h"
 #include "base/user_interface_options_state.h"
 #include "base/other_options_state.h"
-#include "cmdline/parsed_cmd.h"
 #include "nongui/msgbox_queue.h"
 
 class DebugActionsDialog;