[Kst] kdeextragear-2/kst

[George Staikos]

CVS commit by staikos: 

Make usage counts sync up again - by removing the stale reference in
KstTopLevelView
CCMAIL: 84370-done at bugs.kde.org


  M +0 -2      devel-docs/RELEASE_PLAN   1.9
  M +15 -16    kst/ksttoplevelview.cpp   1.64


--- kdeextragear-2/kst/devel-docs/RELEASE_PLAN  #1.8:1.9
@@ -60,10 +60,8 @@
 - using QWaitCondition in update thread is bad - it's broken in all but the
   most recent Qt releases (George)
-- Kst Settings reportedly don't work (can someone explain?)
 - Barth can't get event vectors to 'work'.  What are they suppose to do?
         (Andrew?)
 - locking is missing in places - especially dialogs (plugin, etc) (Can
           George verify this? - Yes)
-- Deleting a window doesn't properly delete plots, leading to orphaned objects.
 - data wizard UI needs to be fixed
 - flicker was reintroduced (see layout mode for an example)

--- kdeextragear-2/kst/kst/ksttoplevelview.cpp  #1.63:1.64
@@ -607,5 +607,5 @@ bool KstTopLevelView::popupMenu(KPopupMe
   if (_selectionList.count() > 1) {
     if (_pressTarget && _mode == LayoutMode) {
-      KPopupMenu* pPopup;
+      KPopupMenu* subMenu;
 
       if (rc) {
@@ -613,20 +613,17 @@ bool KstTopLevelView::popupMenu(KPopupMe
       }
 
-      pPopup = new KPopupMenu(menu);
-      if (pPopup) {
-        pPopup->insertItem(i18n("Width"), this, SLOT(makeSameWidth()));
-        pPopup->insertItem(i18n("Height"), this, SLOT(makeSameHeight()));
-        pPopup->insertItem(i18n("Size"), this, SLOT(makeSameSize()));
-        menu->insertItem(i18n("Make Same"), pPopup);
-      }
+      subMenu = new KPopupMenu(menu);
+      subMenu->insertItem(i18n("Width"), this, SLOT(makeSameWidth()));
+      subMenu->insertItem(i18n("Height"), this, SLOT(makeSameHeight()));
+      subMenu->insertItem(i18n("Size"), this, SLOT(makeSameSize()));
+      menu->insertItem(i18n("Make Same"), subMenu);
 
-      pPopup = new KPopupMenu(menu);
-      if (pPopup) {
-        pPopup->insertItem(i18n("Left"), this, SLOT(alignLeft()));
-        pPopup->insertItem(i18n("Right"), this, SLOT(alignRight()));
-        pPopup->insertItem(i18n("Top"), this, SLOT(alignTop()));
-        pPopup->insertItem(i18n("Bottom"), this, SLOT(alignBottom()));
-        menu->insertItem(i18n("Align"), pPopup);
-      }
+      subMenu = new KPopupMenu(menu);
+      subMenu->insertItem(i18n("Left"), this, SLOT(alignLeft()));
+      subMenu->insertItem(i18n("Right"), this, SLOT(alignRight()));
+      subMenu->insertItem(i18n("Top"), this, SLOT(alignTop()));
+      subMenu->insertItem(i18n("Bottom"), this, SLOT(alignBottom()));
+
+      menu->insertItem(i18n("Align"), subMenu);
       menu->insertSeparator();
     }
@@ -643,4 +640,6 @@ bool KstTopLevelView::popupMenu(KPopupMe
   }
 
+  _pressTarget = 0L; // release reference
+
   return rc;
 }