Rename Gnucash::Base to Gnucash::CoreApp

That name better reflects what the class represents
This commit is contained in:
Geert Janssens 2020-05-29 16:35:33 +02:00
parent 91473b1218
commit 2b8f91a191
6 changed files with 24 additions and 22 deletions

View File

@ -32,12 +32,12 @@ else()
endif() endif()
set(gnucash_noinst_HEADERS set(gnucash_noinst_HEADERS
gnucash-base.hpp gnucash-core-app.hpp
) )
set (gnucash_SOURCES set (gnucash_SOURCES
gnucash.cpp gnucash.cpp
gnucash-base.cpp gnucash-core-app.cpp
gnucash-gresources.c gnucash-gresources.c
${GNUCASH_RESOURCE_FILE} ${GNUCASH_RESOURCE_FILE}
) )
@ -62,7 +62,7 @@ target_link_libraries (gnucash
add_executable (gnucash-cli add_executable (gnucash-cli
gnucash-cli.cpp gnucash-cli.cpp
gnucash-base.cpp gnucash-core-app.cpp
${GNUCASH_RESOURCE_FILE} ${GNUCASH_RESOURCE_FILE}
${gnucash_noinst_HEADERS} ${gnucash_noinst_HEADERS}
) )
@ -285,7 +285,7 @@ gnc_add_scheme_targets(price-quotes
DEPENDS "scm-engine;scm-app-utils;scm-gnome-utils") DEPENDS "scm-engine;scm-app-utils;scm-gnome-utils")
set_local_dist(gnucash_DIST_local CMakeLists.txt environment.in generate-gnc-script set_local_dist(gnucash_DIST_local CMakeLists.txt environment.in generate-gnc-script
gnucash.cpp gnucash-cli.cpp gnucash-base.cpp gnucash.rc.in gnucash-valgrind.in gnucash-gresources.xml ${gresource_files} gnucash.cpp gnucash-cli.cpp gnucash-core-app.cpp gnucash.rc.in gnucash-valgrind.in gnucash-gresources.xml ${gresource_files}
price-quotes.scm ${gnucash_noinst_HEADERS} ${gnucash_EXTRA_DIST}) price-quotes.scm ${gnucash_noinst_HEADERS} ${gnucash_EXTRA_DIST})
set (gnucash_DIST ${gnucash_DIST_local} ${gnome_DIST} ${gnome_search_DIST} ${gnome_utils_DIST} set (gnucash_DIST ${gnucash_DIST_local} ${gnome_DIST} ${gnome_search_DIST} ${gnome_utils_DIST}

View File

@ -29,7 +29,7 @@
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#include "gnucash-base.hpp" #include "gnucash-core-app.hpp"
extern "C" { extern "C" {
#include <gnc-engine-guile.h> #include <gnc-engine-guile.h>
@ -110,7 +110,7 @@ fail:
int int
main(int argc, char ** argv) main(int argc, char ** argv)
{ {
Gnucash::Base application; Gnucash::CoreApp application;
application.parse_command_line (&argc, &argv); application.parse_command_line (&argc, &argv);
application.start (); application.start ();

View File

@ -1,5 +1,5 @@
/* /*
* gnucash-base.cpp -- Basic application object for gnucash binaries * gnucash-core-app.cpp -- Basic application object for gnucash binaries
* *
* Copyright (C) 2020 Geert Janssens <geert@kobaltwit.be> * Copyright (C) 2020 Geert Janssens <geert@kobaltwit.be>
* *
@ -32,7 +32,7 @@
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#include "gnucash-base.hpp" #include "gnucash-core-app.hpp"
extern "C" { extern "C" {
#include <gfec.h> #include <gfec.h>
@ -495,7 +495,7 @@ redirect_stdout (void)
#endif #endif
} }
Gnucash::Base::Base () Gnucash::CoreApp::CoreApp ()
{ {
#if !defined(G_THREADS_ENABLED) || defined(G_THREADS_IMPL_NONE) #if !defined(G_THREADS_ENABLED) || defined(G_THREADS_IMPL_NONE)
# error "No GLib thread implementation available!" # error "No GLib thread implementation available!"
@ -547,7 +547,7 @@ Gnucash::Base::Base ()
* before parsing any arguments if the GUI can't be initialized. * before parsing any arguments if the GUI can't be initialized.
*/ */
void void
Gnucash::Base::parse_command_line (int *argc, char ***argv) Gnucash::CoreApp::parse_command_line (int *argc, char ***argv)
{ {
#ifdef __MINGW64__ #ifdef __MINGW64__
wchar_t *tmp_log_to_filename = NULL; wchar_t *tmp_log_to_filename = NULL;
@ -667,25 +667,25 @@ Gnucash::Base::parse_command_line (int *argc, char ***argv)
} }
const char* const char*
Gnucash::Base::get_file_to_load (void) Gnucash::CoreApp::get_file_to_load (void)
{ {
return file_to_load; return file_to_load;
} }
int int
Gnucash::Base::get_no_file (void) Gnucash::CoreApp::get_no_file (void)
{ {
return nofile; return nofile;
} }
const char* const char*
Gnucash::Base::get_quotes_file (void) Gnucash::CoreApp::get_quotes_file (void)
{ {
return add_quotes_file; return add_quotes_file;
} }
void void
Gnucash::Base::start (void) Gnucash::CoreApp::start (void)
{ {
gnc_print_unstable_message(); gnc_print_unstable_message();

View File

@ -1,5 +1,5 @@
/* /*
* gnucash-base.hpp -- Basic application object for gnucash binaries * gnucash-core-app.hpp -- Core application object for gnucash binaries
* *
* Copyright (C) 2020 Geert Janssens <geert@kobaltwit.be> * Copyright (C) 2020 Geert Janssens <geert@kobaltwit.be>
* *
@ -21,15 +21,17 @@
* Boston, MA 02110-1301, USA gnu@gnu.org * Boston, MA 02110-1301, USA gnu@gnu.org
*/ */
#ifndef GNUCASH_BASE_HPP #ifndef GNUCASH_CORE_APP_HPP
#define GNUCASH_BASE_HPP #define GNUCASH_CORE_APP_HPP
#include <string>
namespace Gnucash { namespace Gnucash {
class Base class CoreApp
{ {
public: public:
Base (); CoreApp ();
void parse_command_line (int *argc, char ***argv); void parse_command_line (int *argc, char ***argv);
void start (void); void start (void);

View File

@ -29,7 +29,7 @@
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#include "gnucash-base.hpp" #include "gnucash-core-app.hpp"
extern "C" { extern "C" {
#include <dialog-new-user.h> #include <dialog-new-user.h>
@ -354,7 +354,7 @@ inner_main (void *data, [[maybe_unused]] int argc, [[maybe_unused]] char **argv)
int int
main(int argc, char ** argv) main(int argc, char ** argv)
{ {
Gnucash::Base application; Gnucash::CoreApp application;
application.parse_command_line (&argc, &argv); application.parse_command_line (&argc, &argv);
application.start(); application.start();

View File

@ -210,8 +210,8 @@ gnucash/gnome-utils/print-session.c
gnucash/gnome-utils/search-param.c gnucash/gnome-utils/search-param.c
gnucash/gnome-utils/tree-view-utils.c gnucash/gnome-utils/tree-view-utils.c
gnucash/gnome-utils/window-main-summarybar.c gnucash/gnome-utils/window-main-summarybar.c
gnucash/gnucash-base.cpp
gnucash/gnucash-cli.cpp gnucash/gnucash-cli.cpp
gnucash/gnucash-core-app.cpp
gnucash/gnucash.cpp gnucash/gnucash.cpp
gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in
gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in