[Libreoffice-commits] core.git: include/vcl
Caolán McNamara
caolanm at redhat.com
Wed Feb 5 03:38:01 PST 2014
include/vcl/builder.hxx | 66 ++++++++++++++++++++++++------------------------
1 file changed, 33 insertions(+), 33 deletions(-)
New commits:
commit ee2fcbab6de42e2d631c0e0b1b4c66b0ca3ebc93
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 5 11:37:38 2014 +0000
C2872: ´Window´ : ambiguous symbol
Change-Id: Id5a342b9fdc5240b70b0985f4c6de9493162f10c
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 68392c1..9424306 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -42,7 +42,7 @@ class VCL_DLLPUBLIC VclBuilder: private boost::noncopyable
{
public:
typedef std::map<OString, OString> stringmap;
- typedef Window* (*customMakeWidget)(Window *pParent, stringmap &rVec);
+ typedef ::Window* (*customMakeWidget)(::Window *pParent, stringmap &rVec);
private:
typedef boost::ptr_map<OUString, osl::Module> ModuleMap;
//We store these until the builder is deleted, that way we can use the
@@ -71,10 +71,10 @@ private:
struct WinAndId
{
OString m_sID;
- Window *m_pWindow;
+ ::Window *m_pWindow;
short m_nResponseId;
PackingData m_aPackingData;
- WinAndId(const OString &rId, Window *pWindow, bool bVertical)
+ WinAndId(const OString &rId, ::Window *pWindow, bool bVertical)
: m_sID(rId)
, m_pWindow(pWindow)
, m_nResponseId(RET_CANCEL)
@@ -182,7 +182,7 @@ private:
}
};
- typedef std::map< Window*, stringmap> AtkMap;
+ typedef std::map< ::Window*, stringmap> AtkMap;
struct ParserState
{
@@ -207,7 +207,7 @@ private:
Translations m_aTranslations;
- std::map< Window*, Window*> m_aRedundantParentWidgets;
+ std::map< ::Window*, ::Window*> m_aRedundantParentWidgets;
std::vector<SizeGroup> m_aSizeGroups;
@@ -224,17 +224,17 @@ private:
OString m_sID;
OString m_sHelpRoot;
ResHookProc m_pStringReplace;
- Window *m_pParent;
+ ::Window *m_pParent;
bool m_bToplevelHasDeferredInit;
bool m_bToplevelHasDeferredProperties;
bool m_bToplevelParentFound;
ParserState *m_pParserState;
- Window *get_by_name(OString sID);
+ ::Window *get_by_name(OString sID);
void delete_by_name(OString sID);
class sortIntoBestTabTraversalOrder
- : public std::binary_function<const Window*, const Window*, bool>
+ : public std::binary_function<const ::Window*, const ::Window*, bool>
{
VclBuilder *m_pBuilder;
public:
@@ -242,22 +242,22 @@ private:
: m_pBuilder(pBuilder)
{
}
- bool operator()(const Window *pA, const Window *pB) const;
+ bool operator()(const ::Window *pA, const ::Window *pB) const;
};
/// XFrame to be able to extract labels and other properties of the UNO commands (like of .uno:Bold).
css::uno::Reference<css::frame::XFrame> m_xFrame;
public:
- VclBuilder(Window *pParent, OUString sUIRootDir, OUString sUIFile,
+ VclBuilder(::Window *pParent, OUString sUIRootDir, OUString sUIFile,
OString sID = OString(),
const com::sun::star::uno::Reference<com::sun::star::frame::XFrame> &rFrame = com::sun::star::uno::Reference<com::sun::star::frame::XFrame>());
~VclBuilder();
- Window *get_widget_root();
+ ::Window *get_widget_root();
//sID must exist and be of type T
template <typename T> T* get(T*& ret, OString sID)
{
- Window *w = get_by_name(sID);
+ ::Window *w = get_by_name(sID);
SAL_WARN_IF(!w, "vcl.layout", "widget \"" << sID.getStr() << "\" not found in .ui");
SAL_WARN_IF(!dynamic_cast<T*>(w),
"vcl.layout", ".ui widget \"" << sID.getStr() << "\" needs to correspond to vcl type " << typeid(T).name());
@@ -273,9 +273,9 @@ public:
return ret;
}
//sID may not exist, but must be of type T if it does
- template <typename T /*= Window if we had c++11*/> T* get(OString sID)
+ template <typename T /*= ::Window if we had c++11*/> T* get(OString sID)
{
- Window *w = get_by_name(sID);
+ ::Window *w = get_by_name(sID);
SAL_WARN_IF(w && !dynamic_cast<T*>(w),
"vcl.layout", ".ui widget \"" << sID.getStr() << "\" needs to correspond to vcl type " << typeid(T).name());
assert(!w || dynamic_cast<T*>(w));
@@ -285,13 +285,13 @@ public:
PopupMenu* get_menu(OString sID);
//given an sID return the response value for that widget
- short get_response(const Window *pWindow) const;
+ short get_response(const ::Window *pWindow) const;
- OString get_by_window(const Window *pWindow) const;
- void delete_by_window(const Window *pWindow);
+ OString get_by_window(const ::Window *pWindow) const;
+ void delete_by_window(const ::Window *pWindow);
//apply the properties of rProps to pWindow
- static void set_properties(Window *pWindow, const stringmap &rProps);
+ static void set_properties(::Window *pWindow, const stringmap &rProps);
//Convert _ gtk markup to ~ vcl markup
static OString convertMnemonicMarkup(const OString &rIn);
@@ -310,17 +310,17 @@ public:
void setDeferredProperties();
//Helpers to retrofit all the existing code to the builder
- static void reorderWithinParent(std::vector< Window*>& rChilds, bool bIsButtonBox);
- static void reorderWithinParent(Window &rWindow, sal_uInt16 nNewPosition);
+ static void reorderWithinParent(std::vector< ::Window*>& rChilds, bool bIsButtonBox);
+ static void reorderWithinParent(::Window &rWindow, sal_uInt16 nNewPosition);
css::uno::Reference<css::frame::XFrame> getFrame() { return m_xFrame; }
private:
- Window *insertObject(Window *pParent,
+ ::Window *insertObject(::Window *pParent,
const OString &rClass, const OString &rID,
stringmap &rProps, stringmap &rPangoAttributes,
stringmap &rAtkProps, std::vector<OString> &rItems);
- Window *makeObject(Window *pParent,
+ ::Window *makeObject(::Window *pParent,
const OString &rClass, const OString &rID,
stringmap &rVec, const std::vector<OString> &rItems);
@@ -338,10 +338,10 @@ private:
void handleTranslations(xmlreader::XmlReader &reader);
- void handleChild(Window *pParent, xmlreader::XmlReader &reader);
- Window* handleObject(Window *pParent, xmlreader::XmlReader &reader);
- void handlePacking(Window *pCurrent, xmlreader::XmlReader &reader);
- void applyPackingProperty(Window *pCurrent, xmlreader::XmlReader &reader);
+ void handleChild(::Window *pParent, xmlreader::XmlReader &reader);
+ ::Window* handleObject(::Window *pParent, xmlreader::XmlReader &reader);
+ void handlePacking(::Window *pCurrent, xmlreader::XmlReader &reader);
+ void applyPackingProperty(::Window *pCurrent, xmlreader::XmlReader &reader);
void collectProperty(xmlreader::XmlReader &reader, const OString &rID, stringmap &rVec);
void collectPangoAttribute(xmlreader::XmlReader &reader, stringmap &rMap);
void collectAtkAttribute(xmlreader::XmlReader &reader, stringmap &rMap);
@@ -356,21 +356,21 @@ private:
void handleRow(xmlreader::XmlReader &reader, const OString &rID, sal_Int32 nRowIndex);
void handleAdjustment(const OString &rID, stringmap &rProperties);
void handleTextBuffer(const OString &rID, stringmap &rProperties);
- void handleTabChild(Window *pParent, xmlreader::XmlReader &reader);
+ void handleTabChild(::Window *pParent, xmlreader::XmlReader &reader);
void handleMenu(xmlreader::XmlReader &reader, const OString &rID);
std::vector<OString> handleItems(xmlreader::XmlReader &reader, const OString &rID);
void handleSizeGroup(xmlreader::XmlReader &reader, const OString &rID);
- void handleAtkObject(xmlreader::XmlReader &reader, const OString &rID, Window *pWindow);
+ void handleAtkObject(xmlreader::XmlReader &reader, const OString &rID, ::Window *pWindow);
void handleActionWidget(xmlreader::XmlReader &reader);
- PackingData get_window_packing_data(const Window *pWindow) const;
- void set_window_packing_position(const Window *pWindow, sal_Int32 nPosition);
+ PackingData get_window_packing_data(const ::Window *pWindow) const;
+ void set_window_packing_position(const ::Window *pWindow, sal_Int32 nPosition);
- Window* prepareWidgetOwnScrolling(Window *pParent, WinBits &rWinStyle);
- void cleanupWidgetOwnScrolling(Window *pScrollParent, Window *pWindow, stringmap &rMap);
+ ::Window* prepareWidgetOwnScrolling(::Window *pParent, WinBits &rWinStyle);
+ void cleanupWidgetOwnScrolling(::Window *pScrollParent, ::Window *pWindow, stringmap &rMap);
void set_response(OString sID, short nResponse);
};
@@ -401,7 +401,7 @@ public:
{
return m_pUIBuilder->get<T>(ret, sID);
}
- template <typename T /*= Window if we had c++11*/> T* get(OString sID)
+ template <typename T /*= ::Window if we had c++11*/> T* get(OString sID)
{
return m_pUIBuilder->get<T>(sID);
}
More information about the Libreoffice-commits
mailing list