Skip to content

Commit 17d316f

Browse files
authored
Merge pull request #339 from calband/cleanup_files
Wide variety of changes to make modernize CalChart.
2 parents e6e9c4e + 2912394 commit 17d316f

File tree

99 files changed

+6055
-2827
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+6055
-2827
lines changed

CMakeLists.txt

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -56,37 +56,45 @@ FLEX_TARGET (
5656
add_library (
5757
calchart_core
5858
STATIC
59-
${CMAKE_CURRENT_SOURCE_DIR}/src/core/animate.cpp
60-
${CMAKE_CURRENT_SOURCE_DIR}/src/core/animate.h
59+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartAnimation.cpp
60+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartAnimation.h
61+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartAnimationErrors.h
62+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartAnimationSheet.cpp
63+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartAnimationSheet.h
64+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartAnimationCommand.cpp
65+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartAnimationCommand.h
66+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartAnimationCompile.cpp
67+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartAnimationCompile.h
68+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartCoord.cpp
69+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartCoord.h
70+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartImage.cpp
71+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartImage.h
72+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartMovePointsTool.cpp
73+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartMovePointsTool.h
74+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartPoint.cpp
75+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartPoint.h
76+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartSelectTool.cpp
77+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartSelectTool.h
78+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartShapes.cpp
79+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartShapes.h
80+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartSheet.cpp
81+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartSheet.h
82+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartShow.cpp
83+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartShow.h
84+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartTypes.h
6185
${CMAKE_CURRENT_SOURCE_DIR}/src/core/animate_types.h
62-
${CMAKE_CURRENT_SOURCE_DIR}/src/core/animatecommand.cpp
63-
${CMAKE_CURRENT_SOURCE_DIR}/src/core/animatecommand.h
64-
${CMAKE_CURRENT_SOURCE_DIR}/src/core/animatecompile.cpp
65-
${CMAKE_CURRENT_SOURCE_DIR}/src/core/animatecompile.h
6686
${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_continuity.cpp
6787
${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_continuity.h
68-
${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_coord.cpp
69-
${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_coord.h
7088
${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_drawcommand.h
7189
${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_fileformat.h
72-
${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_image.cpp
73-
${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_image.h
7490
${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_parse_errors.h
75-
${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_point.cpp
76-
${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_point.h
77-
${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_shapes.cpp
78-
${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_shapes.h
79-
${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_sheet.cpp
80-
${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_sheet.h
81-
${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_show.cpp
82-
${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_show.h
8391
${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_text.cpp
8492
${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_text.h
85-
${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_types.h
8693
${CMAKE_CURRENT_SOURCE_DIR}/src/core/cont.cpp
8794
${CMAKE_CURRENT_SOURCE_DIR}/src/core/cont.h
8895
${CMAKE_CURRENT_SOURCE_DIR}/src/core/e7_transition_solver.cpp
8996
${CMAKE_CURRENT_SOURCE_DIR}/src/core/e7_transition_solver.h
97+
${CMAKE_CURRENT_SOURCE_DIR}/src/core/linmath.h
9098
${CMAKE_CURRENT_SOURCE_DIR}/src/core/math_utils.cpp
9199
${CMAKE_CURRENT_SOURCE_DIR}/src/core/math_utils.h
92100
${CMAKE_CURRENT_SOURCE_DIR}/src/core/modes.cpp
@@ -189,6 +197,8 @@ add_executable (
189197
${CMAKE_CURRENT_SOURCE_DIR}/src/AnimationPanel.h
190198
${CMAKE_CURRENT_SOURCE_DIR}/src/AnimationView.cpp
191199
${CMAKE_CURRENT_SOURCE_DIR}/src/AnimationView.h
200+
${CMAKE_CURRENT_SOURCE_DIR}/src/BackgroundImages.cpp
201+
${CMAKE_CURRENT_SOURCE_DIR}/src/BackgroundImages.h
192202
${CMAKE_CURRENT_SOURCE_DIR}/src/CCOmniviewCanvas.cpp
193203
${CMAKE_CURRENT_SOURCE_DIR}/src/CCOmniviewCanvas.h
194204
${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartApp.cpp
@@ -203,6 +213,8 @@ add_executable (
203213
${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartPreferences.h
204214
${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartSizes.cpp
205215
${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartSizes.h
216+
${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartSplash.cpp
217+
${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartSplash.h
206218
${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartToolBar.cpp
207219
${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartToolBar.h
208220
${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartView.cpp
@@ -229,6 +241,8 @@ add_executable (
229241
${CMAKE_CURRENT_SOURCE_DIR}/src/FieldControlsToolBar.h
230242
${CMAKE_CURRENT_SOURCE_DIR}/src/FieldThumbnailBrowser.cpp
231243
${CMAKE_CURRENT_SOURCE_DIR}/src/FieldThumbnailBrowser.h
244+
${CMAKE_CURRENT_SOURCE_DIR}/src/HostAppInterface.cpp
245+
${CMAKE_CURRENT_SOURCE_DIR}/src/HostAppInterface.h
232246
${CMAKE_CURRENT_SOURCE_DIR}/src/PointPicker.cpp
233247
${CMAKE_CURRENT_SOURCE_DIR}/src/PointPicker.h
234248
${CMAKE_CURRENT_SOURCE_DIR}/src/PreferencesContCellSetup.cpp
@@ -245,20 +259,18 @@ add_executable (
245259
${CMAKE_CURRENT_SOURCE_DIR}/src/PreferencesUtils.h
246260
${CMAKE_CURRENT_SOURCE_DIR}/src/PrintContinuityEditor.cpp
247261
${CMAKE_CURRENT_SOURCE_DIR}/src/PrintContinuityEditor.h
262+
${CMAKE_CURRENT_SOURCE_DIR}/src/PrintPostScriptDialog.cpp
263+
${CMAKE_CURRENT_SOURCE_DIR}/src/PrintPostScriptDialog.h
248264
${CMAKE_CURRENT_SOURCE_DIR}/src/SetupInstruments.cpp
249265
${CMAKE_CURRENT_SOURCE_DIR}/src/SetupInstruments.h
250266
${CMAKE_CURRENT_SOURCE_DIR}/src/SetupMarchers.cpp
251267
${CMAKE_CURRENT_SOURCE_DIR}/src/SetupMarchers.h
252-
${CMAKE_CURRENT_SOURCE_DIR}/src/TopFrame.cpp
253-
${CMAKE_CURRENT_SOURCE_DIR}/src/TopFrame.h
254268
${CMAKE_CURRENT_SOURCE_DIR}/src/TransitionSolverFrame.cpp
255269
${CMAKE_CURRENT_SOURCE_DIR}/src/TransitionSolverFrame.h
256270
${CMAKE_CURRENT_SOURCE_DIR}/src/TransitionSolverProgressFrame.cpp
257271
${CMAKE_CURRENT_SOURCE_DIR}/src/TransitionSolverProgressFrame.h
258272
${CMAKE_CURRENT_SOURCE_DIR}/src/TransitionSolverView.cpp
259273
${CMAKE_CURRENT_SOURCE_DIR}/src/TransitionSolverView.h
260-
${CMAKE_CURRENT_SOURCE_DIR}/src/background_image.cpp
261-
${CMAKE_CURRENT_SOURCE_DIR}/src/background_image.h
262274
${CMAKE_CURRENT_SOURCE_DIR}/src/basic_ui.cpp
263275
${CMAKE_CURRENT_SOURCE_DIR}/src/basic_ui.h
264276
${CMAKE_CURRENT_SOURCE_DIR}/src/cc_omniview_constants.h
@@ -269,24 +281,14 @@ add_executable (
269281
${CMAKE_CURRENT_SOURCE_DIR}/src/draw.cpp
270282
${CMAKE_CURRENT_SOURCE_DIR}/src/draw.h
271283
${CMAKE_CURRENT_SOURCE_DIR}/src/draw_utils.h
272-
${CMAKE_CURRENT_SOURCE_DIR}/src/field_canvas_shapes.cpp
273-
${CMAKE_CURRENT_SOURCE_DIR}/src/field_canvas_shapes.h
274-
${CMAKE_CURRENT_SOURCE_DIR}/src/ghost_module.cpp
275-
${CMAKE_CURRENT_SOURCE_DIR}/src/ghost_module.h
276-
${CMAKE_CURRENT_SOURCE_DIR}/src/linmath.h
284+
${CMAKE_CURRENT_SOURCE_DIR}/src/GhostModule.h
277285
${CMAKE_CURRENT_SOURCE_DIR}/src/mode_dialog.cpp
278286
${CMAKE_CURRENT_SOURCE_DIR}/src/mode_dialog.h
279287
${CMAKE_CURRENT_SOURCE_DIR}/src/mode_dialog_canvas.cpp
280288
${CMAKE_CURRENT_SOURCE_DIR}/src/mode_dialog_canvas.h
281289
${CMAKE_CURRENT_SOURCE_DIR}/src/platconf.h
282-
${CMAKE_CURRENT_SOURCE_DIR}/src/precomp.cpp
283-
${CMAKE_CURRENT_SOURCE_DIR}/src/precomp.h
284-
${CMAKE_CURRENT_SOURCE_DIR}/src/print_ps_dialog.cpp
285-
${CMAKE_CURRENT_SOURCE_DIR}/src/print_ps_dialog.h
286290
${CMAKE_CURRENT_SOURCE_DIR}/src/setup_wizards.cpp
287291
${CMAKE_CURRENT_SOURCE_DIR}/src/setup_wizards.h
288-
${CMAKE_CURRENT_SOURCE_DIR}/src/single_instance_ipc.cpp
289-
${CMAKE_CURRENT_SOURCE_DIR}/src/single_instance_ipc.h
290292
${CMAKE_CURRENT_SOURCE_DIR}/src/ui_enums.h
291293
${CalChartDocs}
292294
${CalChartResources}

0 commit comments

Comments
 (0)