commit 2b5ae32bfa03c2436fed27de94c2edeade673526
Author: Jean-Marc Lasgouttes <[email protected]>
Date: Wed Jun 25 21:40:54 2025 +0200
Remove irrelevant references to boost
---
src/Counters.cpp | 3 +--
src/Exporter.cpp | 5 +----
src/LaTeXFeatures.cpp | 2 +-
src/frontends/alert.h | 2 +-
src/support/FileMonitor.cpp | 4 ++--
src/support/FileMonitor.h | 2 +-
src/support/docstring.h | 5 ++---
src/support/lstrings.cpp | 11 -----------
src/support/unicode.h | 2 +-
9 files changed, 10 insertions(+), 26 deletions(-)
diff --git a/src/Counters.cpp b/src/Counters.cpp
index dda0807faa..16bf76cda3 100644
--- a/src/Counters.cpp
+++ b/src/Counters.cpp
@@ -584,8 +584,7 @@ docstring Counters::counterLabel(docstring const & format,
{
docstring label = format;
- // FIXME: Using regexps would be better, but we compile boost without
- // wide regexps currently.
+ // FIXME: Using regexps would be better, but wide regexps are utf16 on
windows.
docstring const the = from_ascii("\\the");
while (true) {
//lyxerr << "label=" << label << endl;
diff --git a/src/Exporter.cpp b/src/Exporter.cpp
index 073842f280..61345cdb3c 100644
--- a/src/Exporter.cpp
+++ b/src/Exporter.cpp
@@ -68,10 +68,7 @@ CopyStatus copyFile(string const & format,
{
CopyStatus ret = force ? FORCE : SUCCESS;
- // This check could be changed to
- // boost::filesystem::equivalent(sourceFile, destFile) if export to
- // other directories than the document directory is desired.
- // Also don't overwrite files that already exist and are identical
+ // Don't overwrite files that already exist and are identical
// to the source files.
if ((only_tmp && !prefixIs(onlyPath(sourceFile.absFileName()),
package().temp_dir().absFileName()))
|| sourceFile.checksum() == destFile.checksum())
diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 98c862eb97..4aca4ab6cb 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -2211,7 +2211,7 @@ docstring const i18npreamble(docstring const & templ,
Language const * lang,
string const s2 = "\xf3\xb0\x80\x81"; // U+F0001
// FIXME UNICODE
// lyx::regex is not unicode-safe.
- // Should use QRegExp or (boost::u32regex, but that requires ICU)
+ // Could use QRegularExpression instead.
static regex const reg("_\\(([^\\)]+)\\)");
smatch sub;
while (regex_search(preamble, sub, reg)) {
diff --git a/src/frontends/alert.h b/src/frontends/alert.h
index dd1318614f..ed4de6a786 100644
--- a/src/frontends/alert.h
+++ b/src/frontends/alert.h
@@ -28,7 +28,7 @@ typedef unsigned short buttonid;
* a short summary. Strings should be gettextised.
* Please think about the poor user.
*
- * Remember to use boost::format. If you make any of these buttons
+ * Remember to use bformat(). If you make any of these buttons
* "Yes" or "No", I will personally come around to your house and
* slap you with fish, and not in an enjoyable way either.
*/
diff --git a/src/support/FileMonitor.cpp b/src/support/FileMonitor.cpp
index 8cf70a7199..e692f89cb1 100644
--- a/src/support/FileMonitor.cpp
+++ b/src/support/FileMonitor.cpp
@@ -173,7 +173,7 @@ void FileMonitor::connectToFileMonitorGuard()
QObject::connect(monitor_.get(), SIGNAL(fileChanged(bool)),
this, SIGNAL(fileChanged(bool)),
Qt::QueuedConnection);
- // Boost signal:
+ // nod signal:
QObject::connect(this, SIGNAL(fileChanged(bool)),
this, SLOT(changed(bool)));
}
@@ -187,7 +187,7 @@ connection FileMonitor::connect(slot const & slot)
void FileMonitor::changed(bool const exists)
{
- // emit boost signal
+ // emit nod signal
fileChanged_(exists);
}
diff --git a/src/support/FileMonitor.h b/src/support/FileMonitor.h
index 9a36a42251..87b11be8fb 100644
--- a/src/support/FileMonitor.h
+++ b/src/support/FileMonitor.h
@@ -42,7 +42,7 @@ typedef std::unique_ptr<ActiveFileMonitor>
ActiveFileMonitorPtr;
///
/// Watch a file:
/// FileMonitorPtr monitor = FileSystemWatcher::monitor(file_with_path);
-/// monitor.connect(...); //(using boost::signals2), or:
+/// monitor.connect(...); //(using nod), or:
/// connect(monitor, SIGNAL(fileChanged()),...); // (using Qt)
///
/// Remember that a unique_ptr is automatically deleted at the end of a scope
if
diff --git a/src/support/docstring.h b/src/support/docstring.h
index 40806e1f40..074c24f73d 100644
--- a/src/support/docstring.h
+++ b/src/support/docstring.h
@@ -16,9 +16,8 @@
#ifdef USE_WCHAR_T
// Prefer this if possible because GNU libstdc++ has usable
-// std::ctype<wchar_t> locale facets but not
-// std::ctype<boost::uint32_t>. gcc older than 3.4 is also missing
-// usable std::char_traits<boost::uint32_t>.
+// std::ctype<wchar_t> locale facets but maybe not
+// std::ctype<std::uint32_t>.
namespace lyx { typedef wchar_t char_type; }
#else
diff --git a/src/support/lstrings.cpp b/src/support/lstrings.cpp
index e26955dfb8..fce3a27697 100644
--- a/src/support/lstrings.cpp
+++ b/src/support/lstrings.cpp
@@ -1394,10 +1394,6 @@ template<typename String> vector<String> const
getVectorFromStringT(String const & str, String const & delim,
bool keepempty, bool trimit)
{
-// Lars would like this code to go, but for now his replacement (below)
-// doesn't fullfil the same function. I have, therefore, reactivated the
-// old code for now. Angus 11 Nov 2002.
-#if 1
vector<String> vec;
if (str.empty())
return vec;
@@ -1416,13 +1412,6 @@ getVectorFromStringT(String const & str, String const &
delim,
keys = keys.substr(start);
}
return vec;
-#else
- typedef boost::char_separator<typename String::value_type> Separator;
- typedef boost::tokenizer<Separator, typename String::const_iterator,
String> Tokenizer;
- Separator sep(delim.c_str());
- Tokenizer tokens(str, sep);
- return vector<String>(tokens.begin(), tokens.end());
-#endif
}
diff --git a/src/support/unicode.h b/src/support/unicode.h
index 2cbedf367f..a0f646cc20 100644
--- a/src/support/unicode.h
+++ b/src/support/unicode.h
@@ -39,7 +39,7 @@ namespace lyx {
* From a performance point of view it is best to use one static instance
* per thread for each in/out encoding pair. This can e.g. be achieved by
* using helpers for thread-local storage such as QThreadStorage or
- * boost::thread_specific_ptr. A single static instance protected by a mutex
+ * thread_local. A single static instance protected by a mutex
* would work as well, and might be preferable for exotic encoding pairs.
* Creating local IconvProcessor instances should be avoided because of the
* overhead in iconv_open().
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs