[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/kicker/kicker/core
From:       Wilco Greven <greven () kde ! org>
Date:       2005-08-25 15:53:16
Message-ID: 1124985196.976699.16913.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 453237 by wgreven:

Soo hard to type that extra e.


 M  +31 -31    panelextension.cpp  
 M  +3 -3      panelextension.h  


--- trunk/KDE/kdebase/kicker/kicker/core/panelextension.cpp #453236:453237
@@ -60,12 +60,12 @@
 PanelExtension::PanelExtension(const QString& configFile, QWidget *parent)
     : DCOPObject(QByteArray("Panel_") + QString::number((ulong)this).latin1()),
       KPanelExtension(configFile, 0, parent),
-      _opMnu(0),
+      m_opMenu(0),
       m_panelAddMenu(0),
-      m_removeMnu(0),
+      m_removeMenu(0),
       m_addExtensionMenu(0),
       m_removeExtensionMenu(0),
-      _configFile(configFile),
+      m_configFile(configFile),
       m_opMenuBuilt( false )
 {
     setAcceptDrops(!Kicker::self()->isImmutable());
@@ -129,15 +129,15 @@
 
 QMenu* PanelExtension::opMenu()
 {
-    if (_opMnu)
+    if (m_opMenu)
     {
-        return _opMnu;
+        return m_opMenu;
     }
 
-    _opMnu = new QMenu(this);
-    connect(_opMnu, SIGNAL(aboutToShow()), this, SLOT(slotBuildOpMenu()));
+    m_opMenu = new QMenu(this);
+    connect(m_opMenu, SIGNAL(aboutToShow()), this, SLOT(slotBuildOpMenu()));
 
-    return _opMnu;
+    return m_opMenu;
 }
 
 void PanelExtension::positionChange(Plasma::Position p)
@@ -257,23 +257,23 @@
 void PanelExtension::slotBuildOpMenu()
 {
     const int REMOVE_EXTENSION_ID = 1000;
-    if (m_opMenuBuilt || !_opMnu)
+    if (m_opMenuBuilt || !m_opMenu)
     {
-        if (_opMnu)
+        if (m_opMenu)
         {
             bool haveExtensions = ExtensionManager::self()->containers().count() > 0;
-            _opMnu->setItemEnabled(REMOVE_EXTENSION_ID, haveExtensions);
+            m_opMenu->setItemEnabled(REMOVE_EXTENSION_ID, haveExtensions);
         }
 
         return;
     }
 
-    _opMnu->clear();
+    m_opMenu->clear();
 
     delete m_panelAddMenu;
     m_panelAddMenu = 0;
-    delete m_removeMnu;
-    m_removeMnu = 0;
+    delete m_removeMenu;
+    m_removeMenu = 0;
     delete m_addExtensionMenu;
     m_addExtensionMenu = 0;
     delete m_removeExtensionMenu;
@@ -289,44 +289,44 @@
         // setup addmenu and removemenu
         if (_containerArea->canAddContainers())
         {
-            _opMnu->insertItem(isMenuBar ? i18n("Add &Applet to Menubar")
+            m_opMenu->insertItem(isMenuBar ? i18n("Add &Applet to Menubar")
                                          : i18n("Add &Applet to Panel..."),
                                _containerArea, SLOT(showAddAppletDialog()));
             m_panelAddMenu = new PanelAddButtonMenu(_containerArea, this);
-            _opMnu->insertItem(isMenuBar ? i18n("Add Appli&cation to Menubar")
+            m_opMenu->insertItem(isMenuBar ? i18n("Add Appli&cation to Menubar")
                                          : i18n("Add Appli&cation to Panel"),
                                m_panelAddMenu);
 
-            m_removeMnu = new RemoveContainerMenu(_containerArea, this);
-            _opMnu->insertItem(isMenuBar ? i18n("&Remove from Menubar")
+            m_removeMenu = new RemoveContainerMenu(_containerArea, this);
+            m_opMenu->insertItem(isMenuBar ? i18n("&Remove from Menubar")
                                          : i18n("&Remove From Panel"),
-                                         m_removeMnu);
-            _opMnu->insertSeparator();
+                                         m_removeMenu);
+            m_opMenu->insertSeparator();
 
             m_addExtensionMenu = new PanelAddExtensionMenu(this);
-            _opMnu->insertItem(i18n("Add New &Panel"), m_addExtensionMenu);
+            m_opMenu->insertItem(i18n("Add New &Panel"), m_addExtensionMenu);
             m_removeExtensionMenu = new PanelRemoveExtensionMenu(this);
-            _opMnu->insertItem(i18n("Remove Pa&nel"), m_removeExtensionMenu,
+            m_opMenu->insertItem(i18n("Remove Pa&nel"), m_removeExtensionMenu,
                                REMOVE_EXTENSION_ID);
-            _opMnu->setItemEnabled(REMOVE_EXTENSION_ID,
+            m_opMenu->setItemEnabled(REMOVE_EXTENSION_ID,
                             ExtensionManager::self()->containers().count() > 0);
-            _opMnu->insertSeparator();
+            m_opMenu->insertSeparator();
         }
 
         if (!isMenuBar)
         {
-            _opMnu->insertItem(SmallIconSet("lock"), i18n("&Lock Panel"),
+            m_opMenu->insertItem(SmallIconSet("lock"), i18n("&Lock Panel"),
                                Kicker::self(), SLOT(toggleLock()));
 
-            _opMnu->insertItem(SmallIconSet("configure"),
+            m_opMenu->insertItem(SmallIconSet("configure"),
                                i18n("&Configure Panel..."),
                                this, SLOT(showConfig()));
-            _opMnu->insertSeparator();
+            m_opMenu->insertSeparator();
         }
     }
     else if (!Kicker::self()->isKioskImmutable())
     {
-        _opMnu->insertItem(kickerImmutable? SmallIconSet("unlock") :
+        m_opMenu->insertItem(kickerImmutable? SmallIconSet("unlock") :
                                             SmallIconSet("lock"),
                            kickerImmutable ? i18n("Un&lock Panels") :
                                              i18n("&Lock Panels"),
@@ -336,14 +336,14 @@
     if (kapp->authorize("action/help"))
     {
         KHelpMenu* help = new KHelpMenu( this, KGlobal::instance()->aboutData(), false);
-        _opMnu->insertItem(SmallIconSet("help"), KStdGuiItem::help().text(), help->menu());
+        m_opMenu->insertItem(SmallIconSet("help"), KStdGuiItem::help().text(), help->menu());
     }
-    _opMnu->adjustSize();
+    m_opMenu->adjustSize();
 }
 
 void PanelExtension::showConfig()
 {
-    Kicker::self()->showConfig(_configFile);
+    Kicker::self()->showConfig(m_configFile);
 }
 
 MenubarExtension::MenubarExtension(const AppletInfo& info)
--- trunk/KDE/kdebase/kicker/kicker/core/panelextension.h #453236:453237
@@ -92,12 +92,12 @@
     virtual void populateContainerArea();
 
 private:
-    QMenu* _opMnu;
+    QMenu* m_opMenu;
     QMenu* m_panelAddMenu;
-    QMenu* m_removeMnu;
+    QMenu* m_removeMenu;
     QMenu* m_addExtensionMenu;
     QMenu* m_removeExtensionMenu;
-    QString _configFile;
+    QString m_configFile;
     bool m_opMenuBuilt;
 };
 
[prev in list] [next in list] [prev in thread] [next in thread]