Differential D3153 Diff 7653 libs/widgetutils/xmlgui/kxmlguibuilder.cpp

Changeset View

Standalone View

View Options

libs/widgetutils/xmlgui/kxmlguibuilder.cpp

Show All 34 Lines
35#include <QAction> 35​#include <QAction>
36#include <QMenu> 36​#include <QMenu>
37#include <QMenuBar> 37​#include <QMenuBar>
38#include <QStatusBar> 38​#include <QStatusBar>
39#include <QDebug> 39​#include <QDebug>
40 40​
41#include <kis_icon_utils.h> 41​#include <kis_icon_utils.h>
42 42​
43​#if defined(KAUTH_BEFORE_5_24)
44​# define authorizeAction authorizeKAction
45​#endif
46​
43using namespace KDEPrivate; 47​using namespace KDEPrivate;
44 48​
45class KXMLGUIBuilderPrivate 49​class KXMLGUIBuilderPrivate
46{ 50​{
47public: 51​public:
48 KXMLGUIBuilderPrivate() : m_client(0L) {} 52​ KXMLGUIBuilderPrivate() : m_client(0L) {}
49 ~KXMLGUIBuilderPrivate() { } 53​ ~KXMLGUIBuilderPrivate() { }
50 54​
▲ Show 20 Lines • Show All 110 Lines • ▼ Show 20 Line(s)156 if (tagName == d->tagMenu) {
161 // leaked if the child client is deleted without a proper removeClient call, though. 165​ // leaked if the child client is deleted without a proper removeClient call, though.
162 QWidget *p = parent; 166​ QWidget *p = parent;
163 while (p && !qobject_cast<QMainWindow *>(p)) { 167​ while (p && !qobject_cast<QMainWindow *>(p)) {
164 p = p->parentWidget(); 168​ p = p->parentWidget();
165 } 169​ }
166 170​
167 QString name = element.attribute(d->attrName); 171​ QString name = element.attribute(d->attrName);
168 172​
169 if (!KAuthorized::authorizeKAction(name)) { 173​ if (!KAuthorized::authorizeAction(name)) {
170 return 0; 174​ return 0;
171 } 175​ }
172 176​
173 QMenu *popup = new QMenu(p); 177​ QMenu *popup = new QMenu(p);
174 popup->setObjectName(name); 178​ popup->setObjectName(name);
175 179​
176 d->m_menumenuhandler->insertMenu(popup); 180​ d->m_menumenuhandler->insertMenu(popup);
177 181​
▲ Show 20 Lines • Show All 248 Lines • Show Last 20 Lines