diff options
Diffstat (limited to 'fluid/Project.cxx')
| -rw-r--r-- | fluid/Project.cxx | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/fluid/Project.cxx b/fluid/Project.cxx index 51cbbde27..10e4cea5c 100644 --- a/fluid/Project.cxx +++ b/fluid/Project.cxx @@ -35,7 +35,7 @@ /** Initialize a new project. */ -fld::Project::Project() +Project::Project() : undo(*this), tree(*this), i18n(*this), @@ -53,7 +53,7 @@ fld::Project::Project() in_project_dir(0), modflag(0), modflag_c(0), - layout(app::default_layout_preset) + layout(default_layout_preset) { app_work_dir_[0] = '\0'; set_header_file_name(".h"); @@ -64,7 +64,7 @@ fld::Project::Project() /** Clear all project resources. */ -fld::Project::~Project() { +Project::~Project() { if (header_file_name_) free(header_file_name_); if (code_file_name_) free(code_file_name_); if (include_guard_) free(include_guard_); @@ -74,7 +74,7 @@ fld::Project::~Project() { /** Reset all project setting to create a new empty project. */ -void fld::Project::reset() { +void Project::reset() { ::delete_all(); i18n.reset(); @@ -93,7 +93,7 @@ void fld::Project::reset() { /** Tell the project and i18n tab of the settings dialog to refresh themselves. */ -void fld::Project::update_settings_dialog() { +void Project::update_settings_dialog() { if (settings_window) { w_settings_project_tab->do_callback(w_settings_project_tab, LOAD); w_settings_i18n_tab->do_callback(w_settings_i18n_tab, LOAD); @@ -102,17 +102,17 @@ void fld::Project::update_settings_dialog() { // Setters for string members -void fld::Project::set_header_file_name(const char *name) { +void Project::set_header_file_name(const char *name) { if (header_file_name_) free(header_file_name_); header_file_name_ = name ? strdup(name) : 0; } -void fld::Project::set_code_file_name(const char *name) { +void Project::set_code_file_name(const char *name) { if (code_file_name_) free(code_file_name_); code_file_name_ = name ? strdup(name) : 0; } -void fld::Project::set_include_guard(const char *guard) { +void Project::set_include_guard(const char *guard) { if (include_guard_) free(include_guard_); include_guard_ = guard ? strdup(guard) : 0; } @@ -122,7 +122,7 @@ void fld::Project::set_include_guard(const char *guard) { \param[out] buf buffer to store result (ends with '/') \param[in] bufsize size of buffer */ -void fld::Project::projectfile_path(char *buf, int bufsize) const { +void Project::projectfile_path(char *buf, int bufsize) const { buf[0] = '\0'; if (!proj_filename) return; @@ -139,7 +139,7 @@ void fld::Project::projectfile_path(char *buf, int bufsize) const { Get the project file name including extension, for example `test.fl`. \return the file name without path */ -const char *fld::Project::projectfile_name() const { +const char *Project::projectfile_name() const { if (!proj_filename) return 0; return fl_filename_name(proj_filename); } @@ -149,7 +149,7 @@ const char *fld::Project::projectfile_name() const { \param[out] buf buffer to store result (ends with '/') \param[in] bufsize size of buffer */ -void fld::Project::codefile_path(char *buf, int bufsize) const { +void Project::codefile_path(char *buf, int bufsize) const { buf[0] = '\0'; char path[FL_PATH_MAX]; @@ -172,7 +172,7 @@ void fld::Project::codefile_path(char *buf, int bufsize) const { \param[out] buf buffer to store result \param[in] bufsize size of buffer */ -void fld::Project::codefile_name(char *buf, int bufsize) const { +void Project::codefile_name(char *buf, int bufsize) const { buf[0] = '\0'; const char *name = fl_filename_name(code_file_name_); @@ -196,7 +196,7 @@ void fld::Project::codefile_name(char *buf, int bufsize) const { \param[out] buf buffer to store result (ends with '/') \param[in] bufsize size of buffer */ -void fld::Project::headerfile_path(char *buf, int bufsize) const { +void Project::headerfile_path(char *buf, int bufsize) const { buf[0] = '\0'; char path[FL_PATH_MAX]; @@ -219,7 +219,7 @@ void fld::Project::headerfile_path(char *buf, int bufsize) const { \param[out] buf buffer to store result \param[in] bufsize size of buffer */ -void fld::Project::headerfile_name(char *buf, int bufsize) const { +void Project::headerfile_name(char *buf, int bufsize) const { buf[0] = '\0'; const char *name = fl_filename_name(header_file_name_); @@ -243,7 +243,7 @@ void fld::Project::headerfile_name(char *buf, int bufsize) const { \param[out] buf buffer to store result (ends with '/') \param[in] bufsize size of buffer */ -void fld::Project::stringsfile_path(char *buf, int bufsize) const { +void Project::stringsfile_path(char *buf, int bufsize) const { if (Fluid.batch_mode) { strlcpy(buf, Fluid.launch_path(), bufsize); } else { @@ -256,7 +256,7 @@ void fld::Project::stringsfile_path(char *buf, int bufsize) const { \param[out] buf buffer to store result \param[in] bufsize size of buffer */ -void fld::Project::stringsfile_name(char *buf, int bufsize) const { +void Project::stringsfile_name(char *buf, int bufsize) const { buf[0] = '\0'; if (!proj_filename) return; @@ -279,7 +279,7 @@ void fld::Project::stringsfile_name(char *buf, int bufsize) const { \param[out] buf buffer to store result \param[in] bufsize size of buffer */ -void fld::Project::basename(char *buf, int bufsize) const { +void Project::basename(char *buf, int bufsize) const { buf[0] = '\0'; if (!proj_filename) return; @@ -304,7 +304,7 @@ void fld::Project::basename(char *buf, int bufsize) const { \see leave_project_dir(), pwd, in_project_dir */ -void fld::Project::enter_project_dir() { +void Project::enter_project_dir() { if (in_project_dir < 0) { fprintf(stderr, "** Fluid internal error: enter_project_dir() calls unmatched\n"); return; @@ -338,7 +338,7 @@ void fld::Project::enter_project_dir() { Change the current working directory to the previous directory. \see enter_project_dir(), pwd, in_project_dir */ -void fld::Project::leave_project_dir() { +void Project::leave_project_dir() { if (in_project_dir == 0) { fprintf(stderr, "** Fluid internal error: leave_project_dir() calls unmatched\n"); return; @@ -356,7 +356,7 @@ void fld::Project::leave_project_dir() { /** Clear the project filename. */ -void fld::Project::clear_filename() { +void Project::clear_filename() { set_filename(0); } @@ -364,7 +364,7 @@ void fld::Project::clear_filename() { Set the filename of the current .fl design. \param[in] c the new absolute filename and path (may be NULL to clear) */ -void fld::Project::set_filename(const char *c) { +void Project::set_filename(const char *c) { if (proj_filename) free((void *)proj_filename); proj_filename = (c && *c) ? strdup(c) : 0; @@ -377,7 +377,7 @@ void fld::Project::set_filename(const char *c) { /** Write the strings that are used in i18n. */ -void fld::Project::write_strings() { +void Project::write_strings() { Fluid.flush_text_widgets(); if (!proj_filename) { Fluid.save_project_file(0); @@ -392,7 +392,7 @@ void fld::Project::write_strings() { char filename[FL_PATH_MAX]; snprintf(filename, FL_PATH_MAX, "%s%s", path, name); - int x = fld::io::write_strings(*this, filename); + int x = ::write_strings(*this, filename); if (Fluid.batch_mode) { if (x) { fprintf(stderr, "%s : %s\n", filename, strerror(errno)); @@ -425,7 +425,7 @@ void fld::Project::write_strings() { \param[in] mfc default -1 to let \c mf control \c modflag_c, 0 to mark the code files current, 1 to mark it out of date. -2 to ignore changes to mf. */ -void fld::Project::set_modflag(int mf, int mfc) { +void Project::set_modflag(int mf, int mfc) { const char *code_ext = 0; char new_title[FL_PATH_MAX]; |
