[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-19 8:44:01
Message-ID: 20110119084401.E55EFAC8B7 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1215676 by cgilles:

polish


 M  +13 -20    tagfolderview.cpp  
 M  +6 -5      tagfolderview.h  


--- trunk/extragear/graphics/digikam/digikam/tagfolderview.cpp #1215675:1215676
@@ -7,9 +7,9 @@
  * Description : tags folder view.
  *
  * Copyright (C) 2005-2006 by Joern Ahrens <joern.ahrens@kdemail.net>
- * Copyright (C) 2006-2009 by Gilles Caulier <caulier dot gilles at gmail dot com>
- * Copyright (C) 2009 by Andi Clemens <andi dot clemens at gmx dot net>
- * Copyright (C) 2009 by Johannes Wienke <languitar at semipol dot de>
+ * Copyright (C) 2006-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmx dot net>
+ * Copyright (C) 2009-2011 by Johannes Wienke <languitar at semipol dot de>
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
@@ -27,16 +27,19 @@
 #include "tagfolderview.moc"
 
 // Qt includes
-#include <qaction.h>
-#include <qevent.h>
 
+#include <QAction>
+#include <QEvent>
+
 // KDE includes
+
 #include <kdebug.h>
 #include <kmenu.h>
 #include <klocale.h>
 #include <kiconloader.h>
 
 // Local includes
+
 #include "albummanager.h"
 #include "contextmenuhelper.h"
 #include "tagmodificationhelper.h"
@@ -44,9 +47,10 @@
 namespace Digikam
 {
 
-class TagFolderViewPriv
+class TagFolderView::TagFolderViewPriv
 {
 public:
+
     TagFolderViewPriv() :
         showFindDuplicateAction(true),
         model(0),
@@ -61,22 +65,18 @@
 
     QAction* resetIconAction;
     QAction* findDuplAction;
-
 };
 
-TagFolderView::TagFolderView(QWidget* parent, TagModel* model) :
-    TagTreeView(model, parent), d(new TagFolderViewPriv)
+TagFolderView::TagFolderView(QWidget* parent, TagModel* model)
+    : TagTreeView(model, parent), d(new TagFolderViewPriv)
 {
-
     d->model = model;
-
     d->resetIconAction = new QAction(SmallIcon("view-refresh"), i18n("Reset Tag Icon"), this);
     d->findDuplAction = new QAction(SmallIcon("tools-wizard"), i18n("Find Duplicates..."), this);
 
     setSortingEnabled(true);
     setSelectAlbumOnClick(true);
     setEnableContextMenu(true);
-
 }
 
 TagFolderView::~TagFolderView()
@@ -96,7 +96,6 @@
 
 void TagFolderView::addCustomContextMenuActions(ContextMenuHelper& cmh, Album* album)
 {
-
     TAlbum* tag = dynamic_cast<TAlbum*> (album);
 
     if (!tag)
@@ -127,12 +126,10 @@
             this, SLOT(slotTagNewFromABCMenu(const QString&)));
 
     d->resetIconAction->setEnabled(!tag->isRoot());
-
 }
 
 void TagFolderView::slotTagNewFromABCMenu(const QString& personName)
 {
-
     TAlbum* parent = currentAlbum();
 
     if (!parent)
@@ -141,12 +138,10 @@
     }
 
     tagModificationHelper()->slotTagNew(parent, personName, "tag-people");
-
 }
 
 void TagFolderView::handleCustomContextMenuAction(QAction* action, AlbumPointer<Album> album)
 {
-
     Album* a = album;
     TAlbum* tag = dynamic_cast<TAlbum*> (a);
 
@@ -169,8 +164,6 @@
     {
         emit signalFindDuplicatesInAlbum(tag);
     }
-
 }
 
-}
-
+} // namespace Digikam
--- trunk/extragear/graphics/digikam/digikam/tagfolderview.h #1215675:1215676
@@ -7,7 +7,7 @@
  * Description : tags folder view.
  *
  * Copyright (C) 2005-2006 by Joern Ahrens <joern.ahrens@kdemail.net>
- * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2006-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
@@ -26,8 +26,9 @@
 #define TAGFOLDERVIEW_H
 
 // Qt includes
-#include <qtreeview.h>
 
+#include <QTreeView>
+
 // Local includes
 
 #include "albumtreeview.h"
@@ -37,7 +38,6 @@
 
 class ContextMenuHelper;
 
-class TagFolderViewPriv;
 class TagFolderView: public TagTreeView
 {
     Q_OBJECT
@@ -104,10 +104,11 @@
     void slotTagNewFromABCMenu(const QString& personName);
 
 private:
-    TagFolderViewPriv* d;
 
+    class TagFolderViewPriv;
+    TagFolderViewPriv* const d;
 };
 
-}
+} // namespace Digikam
 
 #endif // TAGFOLDERVIEW_H
[prev in list] [next in list] [prev in thread] [next in thread]