Import and export fixing.

src/core/feedsmodel.cpp

@@ -570,40 +570,6 @@ bool FeedsModel::mergeRootItem(FeedsModelRootItem *root_item, QString &output_me
   return true;
 }
 
-bool FeedsModel::doesItemContainSameItem(FeedsModelRootItem *parent, FeedsModelRootItem *item) {
-  if (parent == NULL || item == NULL) {
-    return false;
-  }
-
-  switch (item->kind()) {
-    case FeedsModelRootItem::Category: {
-      foreach (FeedsModelRootItem *child, parent->childItems()) {
-        if (child->kind() == FeedsModelRootItem::Category && child->title() == item->title()) {
-          return true;
-        }
-      }
-
-      return false;
-    }
-
-    case FeedsModelRootItem::Feed: {
-      foreach (FeedsModelRootItem *child, parent->childItems()) {
-        if (child->kind() == FeedsModelRootItem::Feed &&
-            static_cast<FeedsModelFeed*>(child)->url() == static_cast<FeedsModelFeed*>(item)->url()) {
-          return true;
-        }
-      }
-
-      return false;
-    }
-
-    default:
-      return false;
-  }
-}
-
-
-
 void FeedsModel::reloadChangedLayout(QModelIndexList list) {
   while (!list.isEmpty()) {
     QModelIndex indx = list.takeFirst();

src/core/feedsmodel.h

@@ -139,7 +139,6 @@ class FeedsModel : public QAbstractItemModel {
     // Takes structure residing under given root item and adds feeds/categories from
     // it to active structure.
     bool mergeRootItem(FeedsModelRootItem *root_item, QString &output_message);
-    bool doesItemContainSameItem(FeedsModelRootItem *parent, FeedsModelRootItem *item);
 
   public slots:
     // Feeds operations.

src/core/feedsmodelcategory.cpp

@@ -27,21 +27,20 @@
 #include <QSqlQuery>
 
 
-FeedsModelCategory::FeedsModelCategory(FeedsModelRootItem *parent_item)
+FeedsModelCategory::FeedsModelCategory(FeedsModelRootItem *parent_item) : FeedsModelRootItem(parent_item) {
-  : FeedsModelRootItem(parent_item) {
   m_kind = FeedsModelRootItem::Category;
 }
 
 FeedsModelCategory::FeedsModelCategory(const FeedsModelCategory &other)
   : FeedsModelRootItem(NULL) {
   m_kind = other.kind();
-  m_title = other.title();
   m_id = other.id();
+  m_title = other.title();
+  m_description = other.description();
   m_icon = other.icon();
+  m_creationDate = other.creationDate();
   m_childItems = other.childItems();
   m_parentItem = other.parent();
-  m_creationDate = other.creationDate();
-  m_description = other.description();
 }
 
 FeedsModelCategory::~FeedsModelCategory() {
@@ -58,7 +57,7 @@ QVariant FeedsModelCategory::data(int column, int role) const {
                               m_description,
                               m_childItems.size() == 0 ?
                                 tr("\n\nThis category does not contain any nested items.") :
-                                "");
+                                QString());
       }
       else if (column == FDS_MODEL_COUNTS_INDEX) {
         //: Tooltip for "unread" column of feed list.

src/core/feedsmodelfeed.cpp

@@ -38,13 +38,19 @@
 
 FeedsModelFeed::FeedsModelFeed(FeedsModelRootItem *parent_item)
   : FeedsModelRootItem(parent_item),
+    m_passwordProtected(false),
+    m_username(QString()),
+    m_password(QString()),
     m_status(Normal),
     m_networkError(QNetworkReply::NoError),
     m_type(Rss0X),
     m_totalCount(0),
     m_unreadCount(0),
     m_autoUpdateType(DontAutoUpdate),
-    m_autoUpdateInitialInterval(DEFAULT_AUTO_UPDATE_INTERVAL) {
+    m_autoUpdateRemainingInterval(DEFAULT_AUTO_UPDATE_INTERVAL),
+    m_autoUpdateInitialInterval(DEFAULT_AUTO_UPDATE_INTERVAL),
+    m_encoding(QString()),
+    m_url(QString()) {
   m_kind = FeedsModelRootItem::Feed;
 }
 

src/core/feedsmodelrootitem.cpp

@@ -24,6 +24,12 @@
 
 FeedsModelRootItem::FeedsModelRootItem(FeedsModelRootItem *parent_item)
   : m_kind(FeedsModelRootItem::RootItem),
+    m_id(NO_PARENT_CATEGORY),
+    m_title(QString()),
+    m_description(QString()),
+    m_icon(QIcon()),
+    m_creationDate(QDateTime()),
+    m_childItems(QList<FeedsModelRootItem*>()),
     m_parentItem(parent_item) {
   setupFonts();
 }

src/gui/feedsview.cpp

@@ -185,8 +185,7 @@ void FeedsView::executeNextAutoUpdate() {
     m_globalAutoUpdateRemainingInterval = m_globalAutoUpdateInitialInterval;
   }
 
-  qDebug("Starting auto-update event, pass %d/%d.",
+  qDebug("Starting auto-update event, pass %d/%d.", m_globalAutoUpdateRemainingInterval, m_globalAutoUpdateInitialInterval);
-         m_globalAutoUpdateRemainingInterval, m_globalAutoUpdateInitialInterval);
 
   // Pass needed interval data and lets the model decide which feeds
   // should be updated in this pass.

src/gui/formimportexport.ui

@@ -96,7 +96,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>