Requiring C+11 & purging boost includes makes bind.h useless.

This was introduced at 3da25187.

INSTALL.autoconf

@@ -125,7 +125,7 @@ architecture at a time in the source code directory.  After you have
 installed the package for one architecture, use 'make distclean' before
 reconfiguring for another architecture.
 
-   On MacOS X 10.5 and later systems, you can create libraries and
+   On Mac OS X 10.5 and later systems, you can create libraries and
 executables that work on multiple system types--known as "fat" or
 "universal" binaries--by specifying multiple '-arch' options to the
 compiler but only a single '-arch' option to the preprocessor.  Like

NEWS

@@ -106,7 +106,7 @@ python 2.x and python 3.x.
 
 One oft-requested enhancement was to restore a keyboard shortcut for opening
 the 'settings' menu of graphics, reference, etc, insets. This is now Control-
-Alt-i, on Windows and Linux, and Control-Option-i on OSX (assuming you are
+Alt-i, on Windows and Linux, and Control-Option-i on macOS (assuming you are
 using the default keybindings).
 
 
@@ -1143,7 +1143,7 @@ All current 1.3.x users are encouraged to upgrade to this version.
 What's new in version 1.3.6?
 ----------------------------
 
-Unix and MacOSX users should consider this to be a bugfix release.
+Unix and Mac OS X users should consider this to be a bugfix release.
 
 To Windows users, however, LyX 1.3.6 is the first version of LyX
 to support the platform officially. This means that we've put a huge
@@ -1195,7 +1195,7 @@ This is a maintenance release which improves upon 1.3.2 in
 four main areas:
   * import of old LyX files and export to DocBook have been improved;
   * many small bugs in the Qt frontend have been fixed;
-  * MacOSX users can now compile LyX and enjoy the native MacOSX interface;
+  * Mac OS X users can now compile LyX and enjoy the native Mac OS X interface;
   * several languages now benefit from an improved translation of
     the user interface and documentation.
 

src/AspellChecker.cpp

@@ -102,7 +102,7 @@ struct AspellChecker::Private
 		return "data";
 	}
 	/// os package directory constants
-	/// macports on Mac OS X or
+	/// macports on macOS or
 	/// aspell rpms on Linux
 	const string osPackageBase(void)
 	{

src/Format.cpp

@@ -733,7 +733,7 @@ bool Formats::edit(Buffer const & buffer, FileName const & filename,
 		return editLinkBackFile(filename.absFileName().c_str());
 #else
 		Alert::error(_("Cannot edit file"),
-			     _("LinkBack files can only be edited on Apple Mac OSX."));
+			     _("LinkBack files can only be edited on macOS."));
 		return false;
 #endif // USE_MACOSX_PACKAGING
 	}

src/LyXRC.cpp

@@ -3203,7 +3203,7 @@ string const LyXRC::getDescription(LyXRCTags tag)
 		break;
 
 	case RC_MAC_LIKE_CURSOR_MOVEMENT:
-		str = _("Use the Mac OS X conventions for cursor movement");
+		str = _("Use the macOS conventions for cursor movement");
 		break;
 
 	case RC_SHOW_MACRO_LABEL:

src/Paragraph.cpp

@@ -72,7 +72,7 @@
 using namespace std;
 using namespace lyx::support;
 
-// OSX clang and msvc < 2015 do not support C++11 thread_local
+// (old?) macOS clang and msvc < 2015 do not support C++11 thread_local
 #if defined(__APPLE__)
 #define THREAD_LOCAL_STATIC static __thread
 #elif defined(_MSC_VER) && (_MSC_VER < 1900)

src/frontends/qt/FancyLineEdit.cpp

@@ -136,8 +136,7 @@ void FancyLineEdit::checkButtons(const QString &text)
 
 void FancyLineEdit::setClearButton(bool visible)
 {
-	// QLineEdit::setClearButtonEnabled() has been implemented in Qt 5.2.
-	// This is now the minimum required version
+	// FIXME: remove and adapt code
 	setClearButtonEnabled(visible);
 }
 

src/frontends/qt/GuiApplication.cpp

@@ -1094,7 +1094,7 @@ struct GuiApplication::Private
 	Qt::ApplicationState last_state_;
 
 #if defined(Q_OS_MAC) && (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-	/// Linkback mime handler for MacOSX.
+	/// Linkback mime handler for macOS.
 	QMacPasteboardMimeGraphics mac_pasteboard_mime_;
 #endif
 
@@ -1172,7 +1172,7 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
 
 	if (platformName() == "xcb") {
 		// doubleClickInterval() is 400 ms on X11 which is just too long.
-		// On Windows and Mac OS X, the operating system's value is used.
+		// On Windows and macOS, the operating system's value is used.
 		// On Microsoft Windows, calling this function sets the double
 		// click interval for all applications. So we don't!
 		QApplication::setDoubleClickInterval(300);
@@ -2972,7 +2972,7 @@ bool GuiApplication::event(QEvent * e)
 {
 	switch(e->type()) {
 	case QEvent::FileOpen: {
-		// Open a file; this happens only on Mac OS X for now.
+		// Open a file; this happens only on macOS for now.
 		//
 		// We do this asynchronously because on startup the batch
 		// commands are not executed here yet and the gui is not ready

src/frontends/qt/GuiClipboard.cpp

@@ -541,11 +541,11 @@ bool GuiClipboard::isInternal() const
 
 bool GuiClipboard::hasInternal() const
 {
-	// Windows and Mac OS X does not have the concept of ownership;
+	// Windows and macOS does not have the concept of ownership;
 	// the clipboard is a fully global resource so all applications
 	// are notified of changes. However, on Windows ownership is
 	// emulated by Qt through the OleIsCurrentClipboard() API, while
-	// on Mac OS X we deal with this issue by ourself.
+	// on macOS we deal with this issue by ourself.
 #ifndef Q_OS_MAC
 	return true;
 #else

src/frontends/qt/GuiFontMetrics.cpp

@@ -78,8 +78,6 @@ int const strwidth_cache_max_cost = 1024 * 1024;
 // Limit breakstr_cache_ total cost to 10MB of string data.
 // This is useful for documents with very large insets.
 int const breakstr_cache_max_cost = 10 * 1024 * 1024;
-// Qt 5.x already has its own caching of QTextLayout objects
-// but it does not seem to work well on MacOS X.
 #if defined(Q_OS_MAC)
 // For some reason, the built-in cache of QTextLayout does not work or
 // exist on macOS.
@@ -424,7 +422,7 @@ getTextLayout_helper(TextLayoutHelper const & tlh, double const wordspacing,
 	ptl->setFont(font);
 #ifdef BIDI_USE_FLAG
 	/* Use undocumented flag to enforce drawing direction
-	 * FIXME: This does not work with Qt 5.11 (ticket #11284).
+	 * This does not work with some Qt versions (ticket #11284).
 	 */
 	ptl->setFlags(tlh.rtl ? Qt::TextForceRightToLeft : Qt::TextForceLeftToRight);
 #endif
@@ -527,7 +525,7 @@ GuiFontMetrics::breakString_helper(docstring const & s, int first_wid, int wid,
 	QTextLayout tl;
 #ifdef BIDI_USE_FLAG
 	/* Use undocumented flag to enforce drawing direction
-	 * FIXME: This does not work with Qt 5.11 (ticket #11284).
+	 * This does not work with some Qt versions (ticket #11284).
 	 */
 	tl.setFlags(rtl ? Qt::TextForceRightToLeft : Qt::TextForceLeftToRight);
 #endif

src/frontends/qt/GuiIdListModel.cpp

@@ -66,10 +66,6 @@ bool GuiIdListModel::setData(QModelIndex const & index,
 	if (role == Qt::DecorationRole)
 		// nothing to do
 		return true;
-	if (role == Qt::UserRole - 1)
-		// This role is set by Qt <= 5.5 if setEditable()
-		// of the item is false
-		return true;
 	// If we assert here, it's because we're trying to set an
 	// unrecognized role.
 	LATTEST(false);

src/frontends/qt/GuiLyXFiles.cpp

@@ -613,12 +613,7 @@ void GuiLyXFiles::passParams(string const & data)
 
 void GuiLyXFiles::selectItem(QString const & item)
 {
-	/* Using an intermediary variable flags is needed up to at least
-	 * Qt 5.5 because of a subtle namespace issue. See:
-	 *   https://stackoverflow.com/questions/10755058/qflags-enum-type-conversion-fails-all-of-a-sudden
-	 * for details.*/
-	Qt::MatchFlags const flags(Qt::MatchExactly|Qt::MatchRecursive);
-	QList<QTreeWidgetItem *> twi = filesLW->findItems(item, flags);
+	QList<QTreeWidgetItem *> twi = filesLW->findItems(item, Qt::MatchExactly | Qt::MatchRecursive);
 	if (!twi.isEmpty())
 		twi.first()->setSelected(true);
 }

src/frontends/qt/GuiView.cpp

@@ -122,8 +122,6 @@
 #define EXPORT_in_THREAD 1
 
 
-#include "support/bind.h"
-
 #include <sstream>
 
 #ifdef HAVE_SYS_TIME_H
@@ -142,6 +140,8 @@ namespace lyx {
 using support::addExtension;
 using support::changeExtension;
 using support::removeExtension;
+using std::bind;
+using std::placeholders::_1;
 
 namespace frontend {
 
@@ -1523,7 +1523,7 @@ void GuiView::updateWindowTitle(GuiWorkArea * wa)
 	}
 	title += from_ascii(" - LyX");
 	setWindowTitle(toqstr(title));
-	// Sets the path for the window: this is used by OSX to
+	// Sets the path for the window: this is used by macOS to
 	// allow a context click on the title bar showing a menu
 	// with the path up to the file
 	setWindowFilePath(toqstr(buf.absFileName()));
@@ -1788,7 +1788,7 @@ bool GuiView::event(QEvent * e)
 	}
 #else
 	// Pre 6.8: OS-dependent
-	// 1. Mac OS X
+	// 1. macOS
 	// Limit to Q_OS_MAC as this unnecessarily would also
 	// trigger on Linux with grave performance issues
 #ifdef Q_OS_MAC

src/frontends/qt/GuiWorkArea.cpp

@@ -789,7 +789,7 @@ void GuiWorkArea::mouseMoveEvent(QMouseEvent * e)
 	// QAbstractScrollArea::mouseMoveEvent, the event is triggered falsely when quickly
 	// double tapping a touchpad. To test: try to select a word by quickly double tapping
 	// on a touchpad while hovering the cursor over that word in the work area.
-	// This bug does not occur on Qt versions 5.10.1 and below. Only Windows seems to be affected.
+	// Only Windows seems to be affected.
 	// ML thread: https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg211699.html
 	// Qt bugtracker: https://bugreports.qt.io/browse/QTBUG-85431
 	// Bug was fixed in Qt 5.15.1

src/frontends/qt/InGuiThread.h

@@ -16,11 +16,11 @@
 #include <QObject>
 #include <QWaitCondition>
 
-#include "support/bind.h"
-
 namespace lyx {
 
 using std::function;
+using std::ref;
+using std::bind;
 
 namespace frontend {
 

src/frontends/qt/LayoutBox.cpp

@@ -320,7 +320,7 @@ void LayoutBox::Private::setFilter(QString const & s)
 		lastSel_ = filterModel_->mapToSource(filterModel_->index(sel, 0)).row();
 
 	filter_ = s;
-	filterModel_->setFilterRegExp(charFilterRegExp(filter_));
+	filterModel_->setFilterRegularExpression(charFilterRegExp(filter_));
 	countCategories();
 
 	// restore old selection

src/frontends/qt/Menus.cpp

@@ -92,7 +92,7 @@ namespace frontend {
 
 namespace {
 
-// MacOSX specific stuff is at the end.
+// macOS specific stuff is at the end.
 
 class MenuDefinition;
 
@@ -2327,8 +2327,8 @@ struct Menus::Impl {
 	void expand(MenuDefinition const & frommenu, MenuDefinition & tomenu,
 		BufferView const *) const;
 
-	/// Initialize specific MACOS X menubar
-	void macxMenuBarInit(QMenuBar * qmb);
+	/// Initialize specific macOS menubar
+	void macMenuBarInit(QMenuBar * qmb);
 
 	/// Mac special menu.
 	/** This defines a menu whose entries list the FuncRequests
@@ -2378,9 +2378,9 @@ MenuDefinition Menus::Impl::mac_special_menu_;
   that this menubar will be used also when one of LyX' dialogs has
   focus. (JMarc)
 */
-void Menus::Impl::macxMenuBarInit(QMenuBar * qmb)
+void Menus::Impl::macMenuBarInit(QMenuBar * qmb)
 {
-	/* The qt/mac menu code has special code for specifying the role
+	/* The macOS menu code has special code for specifying the role
 	   of a menu entry. However, it does not work very well with our
 	   scheme of creating menus on demand, and therefore we need to
 	   put these entries in a special invisible menu. (JMarc)
@@ -2410,7 +2410,7 @@ void Menus::Impl::macxMenuBarInit(QMenuBar * qmb)
 	const size_t num_entries = sizeof(entries) / sizeof(entries[0]);
 	const bool first_call = mac_special_menu_.empty();
 
-	LYXERR(Debug::GUI, "Creating Mac OS X special menu bar");
+	LYXERR(Debug::GUI, "Creating macOS special menu bar");
 	// the special menu for Menus. Fill it up only once.
 	if (first_call) {
 		for (size_t i = 0 ; i < num_entries ; ++i) {
@@ -2726,13 +2726,13 @@ void Menus::fillMenuBar(QMenuBar * qmb, GuiView * view, bool initial)
 		// the first time a QMenuBar is created. Otherwise Qt will
 		// create duplicate items in the application menu. It seems
 		// that Qt does not remove them when the QMenubar is cleared.
-		d->macxMenuBarInit(qmb);
+		d->macMenuBarInit(qmb);
 #endif
 	} else {
 		// Clear all menubar contents before filling it.
 		qmb->clear();
 #if (defined(Q_OS_MAC))
-		d->macxMenuBarInit(qmb);
+		d->macMenuBarInit(qmb);
 #endif
 	}
 

src/frontends/qt/ui/PrefInputUi.ui

@@ -98,7 +98,7 @@
       <item row="3" column="0" colspan="3">
        <widget class="QCheckBox" name="dontswapCB">
         <property name="toolTip">
-         <string>Mac OS X specific setting for use with emacs bindings. Takes effect next time LyX is launched.</string>
+         <string>macOS specific setting for use with emacs bindings. Takes effect next time LyX is launched.</string>
         </property>
         <property name="text">
          <string>Do not swap Apple and Control keys</string>

src/insets/RenderGraphic.cpp

@@ -28,8 +28,6 @@
 #include "support/filetools.h"
 #include "support/gettext.h"
 
-#include "support/bind.h"
-
 using namespace std;
 
 namespace lyx {

src/support/ForkedCalls.cpp

@@ -21,8 +21,6 @@
 #include "support/os.h"
 #include "support/Timeout.h"
 
-#include "support/bind.h"
-
 #include <cerrno>
 #include <cstring>
 #include <list>
@@ -50,6 +48,10 @@ using namespace std;
 
 
 namespace lyx {
+
+using std::placeholders::_1;
+using std::bind;
+
 namespace support {
 
 namespace {

src/support/Makefile.am

@@ -35,7 +35,6 @@ liblyxsupport_a_SOURCES = \
 	FileMonitor.h \
 	FileMonitor.cpp \
 	RandomAccessList.h \
-	bind.h \
 	Cache.h \
 	Changer.h \
 	checksum.cpp \

src/support/Package.h

@@ -10,7 +10,7 @@
  *
  * A store of the paths to the various different directories used
  * by LyX. These paths differ markedly from one OS to another,
- * following the local Windows, MacOS X or Posix conventions.
+ * following the local Windows, macOS or Posix conventions.
  */
 
 #ifndef PACKAGE_H

src/support/bind.h

@@ -1,24 +0,0 @@
-// -*- C++ -*-
-/**
- * \file bind.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Peter Kümmel
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#ifndef LYX_BIND_H
-#define LYX_BIND_H
-
-namespace lyx
-{
-	using std::placeholders::_1;
-	using std::placeholders::_2;
-	using std::bind;
-	using std::ref;
-} // namespace
-
-
-#endif

src/support/convert.cpp

@@ -15,7 +15,7 @@
 #include "support/docstring.h"
 
 #include <sstream>
-//needed for Mac OSX 10.5.2 Leopard
+// needed for Mac OS X 10.5.2 Leopard
 #include <cstdlib>
 
 using namespace std;

src/support/socktools.cpp

@@ -51,7 +51,7 @@ int accept(int)
 
 #include <cerrno>
 #include <string>
-//needed for Mac OSX 10.5.2 Leopard
+// needed for Mac OS X 10.5.2 Leopard
 #include <cstring>
 
 using namespace std;