mirror of
https://git.lyx.org/repos/lyx.git
synced 2025-01-03 08:28:25 +00:00
Patch to please gcc 4.3. Less bloat in the include headers means that
we need to include explicitly some header files now. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22846 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
fadf8ba12e
commit
03fb3b0aec
@ -113,7 +113,7 @@ bool findNextInset(DocIterator & dit, vector<InsetCode> const & codes,
|
|||||||
while (tmpdit) {
|
while (tmpdit) {
|
||||||
Inset const * inset = tmpdit.nextInset();
|
Inset const * inset = tmpdit.nextInset();
|
||||||
if (inset
|
if (inset
|
||||||
&& find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()
|
&& std::find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()
|
||||||
&& (contents.empty() ||
|
&& (contents.empty() ||
|
||||||
static_cast<InsetCommand const *>(inset)->getFirstNonOptParam() == contents)) {
|
static_cast<InsetCommand const *>(inset)->getFirstNonOptParam() == contents)) {
|
||||||
dit = tmpdit;
|
dit = tmpdit;
|
||||||
@ -139,7 +139,7 @@ bool findInset(DocIterator & dit, vector<InsetCode> const & codes,
|
|||||||
if (same_content) {
|
if (same_content) {
|
||||||
Inset const * inset = tmpdit.nextInset();
|
Inset const * inset = tmpdit.nextInset();
|
||||||
if (inset
|
if (inset
|
||||||
&& find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()) {
|
&& std::find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()) {
|
||||||
contents = static_cast<InsetCommand const *>(inset)->getFirstNonOptParam();
|
contents = static_cast<InsetCommand const *>(inset)->getFirstNonOptParam();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1563,7 +1563,7 @@ void BufferView::gotoLabel(docstring const & label)
|
|||||||
for (InsetIterator it = inset_iterator_begin(buffer_.inset()); it; ++it) {
|
for (InsetIterator it = inset_iterator_begin(buffer_.inset()); it; ++it) {
|
||||||
vector<docstring> labels;
|
vector<docstring> labels;
|
||||||
it->getLabelList(buffer_, labels);
|
it->getLabelList(buffer_, labels);
|
||||||
if (find(labels.begin(), labels.end(), label) != labels.end()) {
|
if (std::find(labels.begin(), labels.end(), label) != labels.end()) {
|
||||||
setCursor(it);
|
setCursor(it);
|
||||||
showCursor();
|
showCursor();
|
||||||
return;
|
return;
|
||||||
|
@ -31,6 +31,8 @@
|
|||||||
#include "support/gettext.h"
|
#include "support/gettext.h"
|
||||||
#include "support/lstrings.h"
|
#include "support/lstrings.h"
|
||||||
|
|
||||||
|
#include <cstring>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
using namespace lyx::support;
|
using namespace lyx::support;
|
||||||
|
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
#include <exception>
|
#include <exception>
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
|
#include <iostream>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
using lyx::lyxerr;
|
using lyx::lyxerr;
|
||||||
|
@ -30,6 +30,7 @@
|
|||||||
#include <QInputDialog>
|
#include <QInputDialog>
|
||||||
|
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
|
#include <iostream>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
using namespace lyx::support;
|
using namespace lyx::support;
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
#include "support/debug.h"
|
#include "support/debug.h"
|
||||||
|
|
||||||
#include <boost/assert.hpp>
|
#include <boost/assert.hpp>
|
||||||
|
#include <climits>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
|
@ -14,6 +14,7 @@
|
|||||||
|
|
||||||
#include "Length.h"
|
#include "Length.h"
|
||||||
|
|
||||||
|
#include <cstdlib>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
@ -37,6 +37,7 @@
|
|||||||
#include "support/textutils.h"
|
#include "support/textutils.h"
|
||||||
|
|
||||||
#include <boost/tokenizer.hpp>
|
#include <boost/tokenizer.hpp>
|
||||||
|
#include <limits>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
using namespace lyx::support;
|
using namespace lyx::support;
|
||||||
|
@ -61,6 +61,7 @@
|
|||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
|
#include <cstring>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
using namespace lyx::support;
|
using namespace lyx::support;
|
||||||
|
@ -37,6 +37,8 @@
|
|||||||
#include <boost/assert.hpp>
|
#include <boost/assert.hpp>
|
||||||
#include <boost/next_prior.hpp>
|
#include <boost/next_prior.hpp>
|
||||||
|
|
||||||
|
#include <cstdlib>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
namespace lyx {
|
namespace lyx {
|
||||||
|
@ -43,6 +43,7 @@
|
|||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
#include <memory>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
using namespace lyx::support;
|
using namespace lyx::support;
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
#include "support/docstring.h"
|
#include "support/docstring.h"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
#include <cstring>
|
||||||
#include <ostream>
|
#include <ostream>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
@ -15,6 +15,7 @@
|
|||||||
|
|
||||||
#include <cerrno>
|
#include <cerrno>
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
|
#include <cstring>
|
||||||
#include <iconv.h>
|
#include <iconv.h>
|
||||||
#include <locale>
|
#include <locale>
|
||||||
|
|
||||||
|
@ -52,6 +52,8 @@
|
|||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
|
|
||||||
|
#include <cstdlib>
|
||||||
|
#include <cstring>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
Loading…
Reference in New Issue
Block a user