Abdelrazak Younes wrote:
Timothy Reaves wrote:
Bennett Helm wrote:
What I've needed to do to get Qt to work is not simply to compile Qt,
but actually install it. Then, with pkgconfig installed (from fink),
it picks up the Qt installation properly.
Once I get it to compile completely, I'll work on revising
compile/install instructions for OS X.
insets/.libs/libinsets.a(insetfloat.o) definition of (anonymous
namespace)::floatname(std::basic_string<char, std::char_traits<char>,
std::allocator<char> > const&, BufferParams const&)in section
(__TEXT,__text)
insets/.libs/libinsets.a(insetwrap.o) definition of (anonymous
namespace)::floatname(std::basic_string<char, std::char_traits<char>,
std::allocator<char> > const&, BufferParams const&)in section
(__TEXT,__text)
Ha! The anonymous namespace trick does not work very well with your
compiler apparently. What version of gcc do you have?
FYI, function in the anonymous namespace in a C file are supposedly
hidden to the rest of the world.
I have committed a fix:
Fix linking issue with MacOSX.
* insetcollapsable: new floatName method.
* insetfloat.C: floatname function deleted.
* insetwrap.C: floatname function deleted.
Modified:
lyx-devel/trunk/src/insets/insetcollapsable.C
lyx-devel/trunk/src/insets/insetcollapsable.h
lyx-devel/trunk/src/insets/insetfloat.C
lyx-devel/trunk/src/insets/insetwrap.C
Modified: lyx-devel/trunk/src/insets/insetcollapsable.C
URL:
http://www.lyx.org/trac/file/lyx-devel/trunk/src/insets/insetcollapsable.C?rev=15272
==============================================================================
--- lyx-devel/trunk/src/insets/insetcollapsable.C (original)
+++ lyx-devel/trunk/src/insets/insetcollapsable.C Sun Oct 8 10:47:26 2006
@@ -15,11 +15,14 @@
#include "insetcollapsable.h"
#include "buffer.h"
+#include "bufferparams.h"
#include "BufferView.h"
#include "cursor.h"
#include "debug.h"
#include "dispatchresult.h"
+#include "FloatList.h"
#include "FuncStatus.h"
+#include "gettext.h"
#include "LColor.h"
#include "lyxlex.h"
#include "funcrequest.h"
@@ -407,3 +410,11 @@
{
labelfont_ = font;
}
+
+string InsetCollapsable::floatName(string const & type, BufferParams
const & bp)
+{
+ FloatList const & floats = bp.getLyXTextClass().floats();
+ FloatList::const_iterator it = floats[type];
+ // FIXME UNICODE
+ return (it == floats.end()) ? type : lyx::to_utf8(_(it->second.name()));
+}
Modified: lyx-devel/trunk/src/insets/insetcollapsable.h
URL:
http://www.lyx.org/trac/file/lyx-devel/trunk/src/insets/insetcollapsable.h?rev=15272
==============================================================================
--- lyx-devel/trunk/src/insets/insetcollapsable.h (original)
+++ lyx-devel/trunk/src/insets/insetcollapsable.h Sun Oct 8 10:47:26 2006
@@ -19,6 +19,8 @@
#include "box.h"
#include "lyxfont.h"
+
+#include <string>
class LyXText;
class Paragraph;
@@ -94,6 +96,8 @@
InsetBase * editXY(LCursor & cur, int x, int y);
///
void setInlined() { status_ = Inlined; }
+ ///
+ std::string floatName(std::string const & type, BufferParams const &);
protected:
///
Modified: lyx-devel/trunk/src/insets/insetfloat.C
URL:
http://www.lyx.org/trac/file/lyx-devel/trunk/src/insets/insetfloat.C?rev=15272
==============================================================================
--- lyx-devel/trunk/src/insets/insetfloat.C (original)
+++ lyx-devel/trunk/src/insets/insetfloat.C Sun Oct 8 10:47:26 2006
@@ -114,27 +114,12 @@
//
// Lgb
-namespace {
-
-string floatname(string const & type, BufferParams const & bp)
-{
- FloatList const & floats = bp.getLyXTextClass().floats();
- FloatList::const_iterator it = floats[type];
- if (it == floats.end())
- return type;
-
- // FIXME UNICODE
- return lyx::to_utf8(_(it->second.name()));
-}
-
-} // namespace anon
-
InsetFloat::InsetFloat(BufferParams const & bp, string const & type)
: InsetCollapsable(bp)
{
// FIXME UNICODE
- setLabel(lyx::to_utf8(_("float: ")) + floatname(type, bp));
+ setLabel(lyx::to_utf8(_("float: ")) + floatName(type, bp));
LyXFont font(LyXFont::ALL_SANE);
font.decSize();
font.decSize();
@@ -375,7 +360,7 @@
{
params_.wide = w;
// FIXME UNICODE
- string lab = lyx::to_utf8(_("float: ")) + floatname(params_.type, bp);
+ string lab = lyx::to_utf8(_("float: ")) + floatName(params_.type, bp);
if (params_.wide)
lab += '*';
setLabel(lab);
@@ -386,7 +371,7 @@
{
params_.sideways = s;
// FIXME UNICODE
- string lab = lyx::to_utf8(_("float: ")) + floatname(params_.type, bp);
+ string lab = lyx::to_utf8(_("float: ")) + floatName(params_.type, bp);
if (params_.sideways)
lab += lyx::to_utf8(_(" (sideways)"));
setLabel(lab);
Modified: lyx-devel/trunk/src/insets/insetwrap.C
URL:
http://www.lyx.org/trac/file/lyx-devel/trunk/src/insets/insetwrap.C?rev=15272
==============================================================================
--- lyx-devel/trunk/src/insets/insetwrap.C (original)
+++ lyx-devel/trunk/src/insets/insetwrap.C Sun Oct 8 10:47:26 2006
@@ -44,24 +44,11 @@
using std::ostringstream;
-namespace {
-
-string floatname(string const & type, BufferParams const & bp)
-{
- FloatList const & floats = bp.getLyXTextClass().floats();
- FloatList::const_iterator it = floats[type];
- // FIXME UNICODE
- return (it == floats.end()) ? type : lyx::to_utf8(_(it->second.name()));
-}
-
-} // namespace anon
-
-
InsetWrap::InsetWrap(BufferParams const & bp, string const & type)
: InsetCollapsable(bp)
{
// FIXME UNICODE
- setLabel(lyx::to_utf8(_("wrap: ")) + floatname(type, bp));
+ setLabel(lyx::to_utf8(_("wrap: ")) + floatName(type, bp));
LyXFont font(LyXFont::ALL_SANE);
font.decSize();
font.decSize();
