Skip to content

Commit

Permalink
Update file paths
Browse files Browse the repository at this point in the history
  • Loading branch information
Blake-Madden committed Dec 21, 2024
1 parent 521fa8f commit 43a1288
Show file tree
Hide file tree
Showing 11 changed files with 37 additions and 44 deletions.
5 changes: 2 additions & 3 deletions src/import/html_encode.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#ifndef __HTML_ENCODE_H__
#define __HTML_ENCODE_H__

#include "../i18n-check/src/string_util.h"
#include "../util/string_util.h"
#include "html_extract_text.h"

namespace lily_of_the_valley
Expand All @@ -28,8 +28,7 @@ namespace lily_of_the_valley
@param encodeSpaces @c true to preserve consecutive spaces with `&#nbsp;`.
@returns A string encoded to HTML.*/
[[nodiscard]]
std::wstring
operator()(const std::wstring_view text, const bool encodeSpaces) const
std::wstring operator()(const std::wstring_view text, const bool encodeSpaces) const
{
std::wstring encoded_text;
if (text.empty())
Expand Down
2 changes: 1 addition & 1 deletion src/import/rtf_encode.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#ifndef __RTF_ENCODE_H__
#define __RTF_ENCODE_H__

#include "../i18n-check/src/string_util.h"
#include "../util/string_util.h"

namespace lily_of_the_valley
{
Expand Down
5 changes: 2 additions & 3 deletions src/import/rtf_extract_text.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#ifndef __RTF_EXTRACT_H__
#define __RTF_EXTRACT_H__

#include "../i18n-check/src/string_util.h"
#include "../util/string_util.h"
#include "extract_text.h"
#include "html_extract_text.h"
#include <iomanip>
Expand Down Expand Up @@ -267,8 +267,7 @@ namespace lily_of_the_valley
rtf_symbol() = delete;

[[nodiscard]]
bool
operator<(const rtf_symbol& that) const noexcept
bool operator<(const rtf_symbol& that) const noexcept
{
return (szKeyword.compare(that.szKeyword) < 0);
}
Expand Down
7 changes: 2 additions & 5 deletions src/ui/app.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
#define __BASEAPP_H__

#include "../debug/debug_profile.h"
#include "../i18n-check/src/donttranslate.h"
#include "../math/safe_math.h"
#include "../util/donttranslate.h"
#include "../util/logfile.h"
#include "../util/resource_manager.h"
#include "mainframe.h"
Expand Down Expand Up @@ -213,10 +213,7 @@ namespace Wisteria::UI
/// @param append @c true to append to the log file from today;
/// @c false to overwrite it.
/// @note This must be called before BaseApp::OnInit().
void AppendDailyLog(const bool append) noexcept
{
m_appendDailyLog = append;
}
void AppendDailyLog(const bool append) noexcept { m_appendDailyLog = append; }

/// @brief Sets a support email for the application.
/// @param email The email address.
Expand Down
13 changes: 6 additions & 7 deletions src/ui/controls/codeeditor.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#ifndef __CODE_EDITOR_H__
#define __CODE_EDITOR_H__

#include "../../i18n-check/src/donttranslate.h"
#include "../../i18n-check/src/string_util.h"
#include "../../util/donttranslate.h"
#include "../../util/string_util.h"
#include <map>
#include <set>
#include <vector>
Expand Down Expand Up @@ -234,8 +234,7 @@ namespace Wisteria::UI
struct wxStringCmpNoCase
{
[[nodiscard]]
bool
operator()(const wxString& s1, const wxString& s2) const
bool operator()(const wxString& s1, const wxString& s2) const
{
return s1.CmpNoCase(s2) < 0;
}
Expand All @@ -244,8 +243,7 @@ namespace Wisteria::UI
struct wxStringPartialCmpNoCase
{
[[nodiscard]]
bool
operator()(const wxString& s1, const wxString& s2) const
bool operator()(const wxString& s1, const wxString& s2) const
{
return s1.CmpNoCase(s2.substr(0, s1.length())) < 0;
}
Expand All @@ -269,7 +267,8 @@ namespace Wisteria::UI
using wxStringNoCaseMap = std::map<wxString, wxString, wxStringCmpNoCase>;
// Library name, string of function names, and map of function names
// and their respective full signature
using ObjectAndFunctionsMap = std::map<wxString, std::pair<wxString, wxStringNoCaseMap>, wxStringCmpNoCase>;
using ObjectAndFunctionsMap =
std::map<wxString, std::pair<wxString, wxStringNoCaseMap>, wxStringCmpNoCase>;

ObjectAndFunctionsMap m_libraryCollection;
ObjectAndFunctionsMap m_classCollection;
Expand Down
36 changes: 18 additions & 18 deletions src/ui/controls/formattedtextctrl.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,34 +14,34 @@

#include <wx/wx.h>
#if defined(__WXMSW__)
#include <richedit.h>
#include <wx/msw/dc.h>
#include <wx/msw/private.h>
#include <richedit.h>
#endif
#include <wx/textctrl.h>
#include "../../base/canvas.h"
#include "../../import/rtf_extract_text.h"
#include "../../util/clipboard_rtf.h"
#include "../../util/donttranslate.h"
#include <memory>
#include <string>
#include <vector>
#include <wx/busyinfo.h>
#include <wx/clipbrd.h>
#include <wx/datetime.h>
#include <wx/dcprint.h>
#include <wx/dcps.h>
#include <wx/fdrepdlg.h>
#include <wx/strconv.h>
#include <wx/file.h>
#include <wx/filename.h>
#include <wx/dcprint.h>
#include <wx/dcps.h>
#include <wx/html/htmprint.h>
#include <wx/print.h>
#include <wx/printdlg.h>
#include <wx/html/htmprint.h>
#include <wx/datetime.h>
#include <wx/busyinfo.h>
#include <wx/clipbrd.h>
#include <wx/strconv.h>
#include <wx/textctrl.h>
#include <wx/xrc/xmlres.h>
#include <memory>
#include <vector>
#include <string>
#include "../../import/rtf_extract_text.h"
#include "../../i18n-check/src/donttranslate.h"
#include "../../util/clipboard_rtf.h"
#include "../../base/canvas.h"

/// @private
static constexpr int TWIPS_PER_INCH = 1440;
constexpr static int TWIPS_PER_INCH = 1440;

namespace Wisteria::UI
{
Expand Down Expand Up @@ -504,7 +504,7 @@ namespace Wisteria::UI

wxDECLARE_DYNAMIC_CLASS(FormattedTextCtrl);
};
}
} // namespace Wisteria::UI

/** @}*/

Expand Down
2 changes: 1 addition & 1 deletion src/ui/controls/htmltablewin.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#define __HTML_TABLE_WINDOW_H__

#include "../../base/canvas.h"
#include "../../i18n-check/src/donttranslate.h"
#include "../../util/donttranslate.h"
#include <wx/clipbrd.h>
#include <wx/fdrepdlg.h>
#include <wx/file.h>
Expand Down
5 changes: 2 additions & 3 deletions src/ui/dialogs/functionbrowserdlg.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
#ifndef __FUNCTION_BROWSER_DLG_H__
#define __FUNCTION_BROWSER_DLG_H__

#include "../../i18n-check/src/string_util.h"
#include "../../import/html_encode.h"
#include "../../import/html_extract_text.h"
#include "../../util/string_util.h"
#include "../controls/sidebar.h"
#include "dialogwithhelp.h"
#include <set>
Expand Down Expand Up @@ -167,8 +167,7 @@ namespace Wisteria::UI
CategoryInfo() = default;

[[nodiscard]]
bool
operator<(const CategoryInfo& that) const noexcept
bool operator<(const CategoryInfo& that) const noexcept
{
return string_util::stricmp(m_name.c_str(), that.m_name.c_str()) < 0;
}
Expand Down
2 changes: 1 addition & 1 deletion src/util/resource_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#ifndef __RESOURCE_MANAGER_H__
#define __RESOURCE_MANAGER_H__

#include "../i18n-check/src/donttranslate.h"
#include "../math/mathematics.h"
#include "../util/donttranslate.h"
#include "memorymappedfile.h"
#include "zipcatalog.h"
#include <map>
Expand Down
2 changes: 1 addition & 1 deletion src/util/xml_format.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
#ifndef __XML_FORMAT_H__
#define __XML_FORMAT_H__

#include "../i18n-check/src/donttranslate.h"
#include "../import/html_encode.h"
#include "../math/mathematics.h"
#include "../util/donttranslate.h"
#include <cmath>
#include <cstdlib>
#include <cstring>
Expand Down
2 changes: 1 addition & 1 deletion tests/mapstests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <catch2/matchers/catch_matchers_floating_point.hpp>
#include "../src/util/frequencymap.h"
#include "../src/math/mathematics.h"
#include "../src/i18n-check/src/string_util.h"
#include "../src/util/string_util.h"

using namespace Catch::Matchers;

Expand Down

0 comments on commit 43a1288

Please sign in to comment.