Move to private file

src/collectionpage/collectiongeneralpage.cpp

@@ -23,7 +23,7 @@
 #include <PimCommonAkonadi/CollectionAnnotationsAttribute>
 #include "folder/foldercollection.h"
 #include "kernel/mailkernel.h"
-#include "util/mailutil.h"
+#include "util/mailutil_p.h"
 
 #include <PimCommon/PimUtil>
 #include <AgentManager>

src/folder/foldertreeview.cpp

@@ -17,6 +17,7 @@
 */
 
 #include "foldertreeview.h"
+#include "util/mailutil_p.h"
 #include "kernel/mailkernel.h"
 
 #include <CollectionStatistics>

src/util/mailutil.cpp

@@ -37,6 +37,7 @@
 *******************************************************************************/
 
 #include "mailutil.h"
+#include "mailutil_p.h"
 
 #include "mailcommon_debug.h"
 #include "calendarinterface.h"

src/util/mailutil.h

@@ -91,20 +91,6 @@ enum SearchDirection {
     BackwardSearch
 };
 
-/**
-   * Returns the index of the next unread collection following a given index.
-   *
-   * @param model The item model to search in.
-   * @param current The index of the collection where the search will start.
-   * @param direction The direction of search.
-   * @param ignoreCollectionCallback A callback method to ignore certain
-   *        collections by returning @c true.
-   */
-QModelIndex nextUnreadCollection(QAbstractItemModel *model,
-                                 const QModelIndex &current,
-                                 SearchDirection direction,
-                                 bool (*ignoreCollectionCallback)(const Akonadi::Collection &collection) = 0);
-
 MAILCOMMON_EXPORT Akonadi::Collection parentCollectionFromItem(const Akonadi::Item &item);
 
 MAILCOMMON_EXPORT QString realFolderPath(const QString &path);
@@ -121,8 +107,6 @@ MAILCOMMON_EXPORT QString convertFolderPathToCollectionStr(const QString &folder
 
 MAILCOMMON_EXPORT bool foundMailer();
 MAILCOMMON_EXPORT bool isLocalCollection(const QString &resource);
-
-bool ignoreNewMailInFolder(const Akonadi::Collection &collection);
 MAILCOMMON_EXPORT MailCommon::ExpireCollectionAttribute *expirationCollectionAttribute(const Akonadi::Collection &collection, bool &mustDeleteExpirationAttribute);
 }
 

src/util/mailutil_p.h

@@ -0,0 +1,83 @@
+/*******************************************************************************
+**
+** Filename   : util
+** Created on : 03 April, 2005
+** Copyright  : (c) 2005 Till Adam
+** Email      : <adam@kde.org>
+**
+*******************************************************************************/
+
+/*******************************************************************************
+**
+**   This program is free software; you can redistribute it and/or modify
+**   it under the terms of the GNU General Public License as published by
+**   the Free Software Foundation; either version 2 of the License, or
+**   (at your option) any later version.
+**
+**   It is distributed in the hope that it will be useful, but
+**   WITHOUT ANY WARRANTY; without even the implied warranty of
+**   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+**   General Public License for more details.
+**
+**   You should have received a copy of the GNU General Public License
+**   along with this program; if not, write to the Free Software
+**   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+**
+**   In addition, as a special exception, the copyright holders give
+**   permission to link the code of this program with any edition of
+**   the Qt library by Trolltech AS, Norway (or with modified versions
+**   of Qt that use the same license as Qt), and distribute linked
+**   combinations including the two.  You must obey the GNU General
+**   Public License in all respects for all of the code used other than
+**   Qt.  If you modify this file, you may extend this exception to
+**   your version of the file, but you are not obligated to do so.  If
+**   you do not wish to do so, delete this exception statement from
+**   your version.
+**
+*******************************************************************************/
+#ifndef MAILCOMMON_MAILUTIL_P_H
+#define MAILCOMMON_MAILUTIL_P_H
+
+#include "mailcommon_export.h"
+#include "mailutil.h"
+
+#include <AgentInstance>
+#include <Collection>
+
+namespace Akonadi
+{
+class Item;
+}
+
+class QAbstractItemModel;
+class QModelIndex;
+class QString;
+
+namespace MailCommon
+{
+/**
+ * The Util namespace contains a collection of helper functions use in
+ * various places.
+ */
+namespace Util
+{
+/**
+   * Returns the index of the next unread collection following a given index.
+   *
+   * @param model The item model to search in.
+   * @param current The index of the collection where the search will start.
+   * @param direction The direction of search.
+   * @param ignoreCollectionCallback A callback method to ignore certain
+   *        collections by returning @c true.
+   */
+QModelIndex nextUnreadCollection(QAbstractItemModel *model,
+                                 const QModelIndex &current,
+                                 SearchDirection direction,
+                                 bool (*ignoreCollectionCallback)(const Akonadi::Collection &collection) = 0);
+
+bool ignoreNewMailInFolder(const Akonadi::Collection &collection);
+}
+
+}
+
+#endif