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

List:       kde-commits
Subject:    extragear/graphics/digikam/digikam
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2011-01-17 12:03:55
Message-ID: 20110117120355.5DA07AC8B5 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1215049 by cgilles:

use more private internal container


 M  +6 -7      tagspopupmenu.cpp  
 M  +3 -2      tagspopupmenu.h  


--- trunk/extragear/graphics/digikam/digikam/tagspopupmenu.cpp #1215048:1215049
@@ -8,7 +8,8 @@
  *               hierarchical view of digiKam tags.
  *
  * Copyright (C) 2004 by Renchi Raju <renchi@pooh.tam.uiuc.edu>
- * Copyright (C) 2006-2009 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2006-2010 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2006-2010 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
  *
  * Parts of the drawing code are inspired by qmenu.cpp and qitemdelegate.cpp.
  * Copyright follows:
@@ -82,6 +83,8 @@
     bool m_checkBoxHidden;
 };
 
+// ------------------------------------------------------------------------
+
 class TagToggleMenuWidget : public QWidget
 {
 public:
@@ -261,7 +264,6 @@
 
     // seems KMenu does it like this
     option->maxIconWidth = style()->pixelMetric(QStyle::PM_SmallIconSize, 0, this);
-
     option->rect     = rect();
     option->menuRect = parentWidget()->rect();
 }
@@ -370,7 +372,7 @@
 
 // ------------------------------------------------------------------------
 
-class TagsPopupMenuPriv
+class TagsPopupMenu::TagsPopupMenuPriv
 {
 public:
 
@@ -408,10 +410,8 @@
 void TagsPopupMenu::setup(Mode mode)
 {
     d->mode = mode;
-
     KIconLoader* iconLoader = KIconLoader::global();
     d->addTagPix            = iconLoader->loadIcon("tag", KIconLoader::NoGroup, KIconLoader::SizeSmall);
-
     d->addTagActions    = new QActionGroup(this);
     d->toggleTagActions = new QActionGroup(this);
 
@@ -545,7 +545,7 @@
         QString t = a->title();
         t.replace('&',"&&");
 
-        TagToggleAction* action;
+        TagToggleAction* action = 0;
 
         if (d->mode == ASSIGN)
         {
@@ -666,7 +666,6 @@
 void TagsPopupMenu::slotAddTag(QAction* action)
 {
     int tagID = action->data().toInt();
-
     AlbumManager* man = AlbumManager::instance();
     TAlbum* parent    = man->findTAlbum(tagID);
 
--- trunk/extragear/graphics/digikam/digikam/tagspopupmenu.h #1215048:1215049
@@ -8,7 +8,8 @@
  *               hierarchical view of digiKam tags.
  *
  * Copyright (C) 2004-2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu>
- * Copyright (C) 2006-2009 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2006-2010 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2006-2010 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
@@ -39,7 +40,6 @@
 
 class Album;
 class TAlbum;
-class TagsPopupMenuPriv;
 
 class TagsPopupMenu : public KMenu
 {
@@ -79,6 +79,7 @@
 
 private:
 
+    class TagsPopupMenuPriv;
     TagsPopupMenuPriv* const d;
 };
 
[prev in list] [next in list] [prev in thread] [next in thread]