[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-bugs-dist
Subject: [Bug 76631] Namespace polution fixes for HP-UX
From: John Firebaugh <jfirebaugh () kde ! org>
Date: 2004-04-01 1:39:00
Message-ID: 20040401013900.21258.qmail () ktown ! kde ! org
[Download RAW message or body]
------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
http://bugs.kde.org/show_bug.cgi?id=76631
jfirebaugh kde org changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|UNCONFIRMED |RESOLVED
Resolution| |FIXED
------- Additional Comments From jfirebaugh kde org 2004-04-01 03:38 -------
CVS commit by firebaugh:
Workaround for HPUX namespace pollution.
CCMAIL: 76631-done bugs kde org
M +8 -8 panelmenuiteminfo.h 1.2
--- kdebase/kicker/ui/panelmenuiteminfo.h #1.1:1.2
@ -40,5 +40,5 @ class PanelMenuItemInfo
PanelMenuItemInfo(const QString& iconName, const QString& visibleName, const \
QObject* recvr, const QCString& slot, int id = -1)
- : m_icon(iconName), m_name(visibleName), m_slot(slot), m_recvr(recvr), \
m_id(id) {} + : m_icon(iconName), m_name(visibleName), m_slot_(slot), \
m_recvr(recvr), m_id(id) {}
PanelMenuItemInfo(const QString& iconName, const QString& visibleName, int \
id = -1) @ -46,5 +46,5 @ class PanelMenuItemInfo
PanelMenuItemInfo(const PanelMenuItemInfo& c)
- : m_icon(c.m_icon), m_name(c.m_name), m_slot(c.m_slot), \
m_recvr(c.m_recvr), m_id(c.m_id) {} + : m_icon(c.m_icon), \
m_name(c.m_name), m_slot_(c.m_slot_), m_recvr(c.m_recvr), m_id(c.m_id) {}
PanelMenuItemInfo& operator=(const PanelMenuItemInfo& c)
@ -52,5 +52,5 @ class PanelMenuItemInfo
m_icon = c.m_icon;
m_name = c.m_name;
- m_slot = c.m_slot;
+ m_slot_ = c.m_slot_;
m_recvr = c.m_recvr;
m_id = c.m_id;
@ -77,14 +77,14 @ class PanelMenuItemInfo
if (!m_icon.isEmpty())
{
- if (m_recvr && !m_slot.isEmpty())
+ if (m_recvr && !m_slot_.isEmpty())
{
- return menu->insertItem(SmallIconSet(m_icon), m_name, m_recvr, \
m_slot, 0, m_id); + return menu->insertItem(SmallIconSet(m_icon), \
m_name, m_recvr, m_slot_, 0, m_id); }
return menu->insertItem(SmallIconSet(m_icon), m_name, m_id);
}
- else if (m_recvr && !m_slot.isEmpty())
+ else if (m_recvr && !m_slot_.isEmpty())
{
- return menu->insertItem(m_name, m_recvr, m_slot, 0, m_id);
+ return menu->insertItem(m_name, m_recvr, m_slot_, 0, m_id);
}
@ -95,5 +95,5 @ class PanelMenuItemInfo
QString m_icon;
QString m_name;
- QCString m_slot;
+ QCString m_slot_; // HPUX namespace is polluted with m_slot
const QObject* m_recvr;
int m_id;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic