pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compile fix.

Browse source
This commit is contained in:
Martin Rotter 2015-01-06 19:07:59 +01:00
parent 90797a5f18
commit b873890ce8
4 changed files with 36 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/feedsmodelcategory.cpp
View file

@ -28,10 +28,14 @@
#include <QSqlQuery> #include <QSqlQuery>
FeedsModelCategory::FeedsModelCategory(FeedsModelRootItem *parent_item) : FeedsModelRootItem(parent_item) { void FeedsModelCategory::init() {
m_kind = FeedsModelRootItem::Category; m_kind = FeedsModelRootItem::Category;
} }
FeedsModelCategory::FeedsModelCategory(FeedsModelRootItem *parent_item) : FeedsModelRootItem(parent_item) {
init();
}
FeedsModelCategory::FeedsModelCategory(const FeedsModelCategory &other) FeedsModelCategory::FeedsModelCategory(const FeedsModelCategory &other)
: FeedsModelRootItem(NULL) { : FeedsModelRootItem(NULL) {
m_kind = other.kind(); m_kind = other.kind();
@ -141,7 +145,9 @@ bool FeedsModelCategory::removeItself() {
return query_remove.exec(); return query_remove.exec();
} }
FeedsModelCategory::FeedsModelCategory(const QSqlRecord &record) : FeedsModelCategory(NULL) { FeedsModelCategory::FeedsModelCategory(const QSqlRecord &record) : FeedsModelRootItem(NULL) {
init();
setId(record.value(CAT_DB_ID_INDEX).toInt()); setId(record.value(CAT_DB_ID_INDEX).toInt());
setTitle(record.value(CAT_DB_TITLE_INDEX).toString()); setTitle(record.value(CAT_DB_TITLE_INDEX).toString());
setDescription(record.value(CAT_DB_DESCRIPTION_INDEX).toString()); setDescription(record.value(CAT_DB_DESCRIPTION_INDEX).toString());

3
src/core/feedsmodelcategory.h
View file

@ -45,6 +45,9 @@ class FeedsModelCategory : public FeedsModelRootItem {
// Removes category and all its children from persistent // Removes category and all its children from persistent
// database. // database.
bool removeItself(); bool removeItself();
private:
void init();
}; };
#endif // FEEDSMODELCLASSICCATEGORY_H #endif // FEEDSMODELCLASSICCATEGORY_H

38
src/core/feedsmodelfeed.cpp
View file

@ -36,24 +36,28 @@
#include <QXmlStreamReader> #include <QXmlStreamReader>
FeedsModelFeed::FeedsModelFeed(FeedsModelRootItem *parent_item) void FeedsModelFeed::init() {
: FeedsModelRootItem(parent_item), m_passwordProtected = false;
m_passwordProtected(false), m_username = QString();
m_username(QString()), m_password = QString();
m_password(QString()), m_status = Normal;
m_status(Normal), m_networkError = QNetworkReply::NoError;
m_networkError(QNetworkReply::NoError), m_type = Rss0X;
m_type(Rss0X), m_totalCount = 0;
m_totalCount(0), m_unreadCount = 0;
m_unreadCount(0), m_autoUpdateType = DontAutoUpdate;
m_autoUpdateType(DontAutoUpdate), m_autoUpdateInitialInterval = DEFAULT_AUTO_UPDATE_INTERVAL;
m_autoUpdateInitialInterval(DEFAULT_AUTO_UPDATE_INTERVAL), m_autoUpdateRemainingInterval = DEFAULT_AUTO_UPDATE_INTERVAL;
m_autoUpdateRemainingInterval(DEFAULT_AUTO_UPDATE_INTERVAL), m_encoding = QString();
m_encoding(QString()), m_url = QString();
m_url(QString()) {
m_kind = FeedsModelRootItem::Feed; m_kind = FeedsModelRootItem::Feed;
} }
FeedsModelFeed::FeedsModelFeed(FeedsModelRootItem *parent_item)
: FeedsModelRootItem(parent_item) {
init();
}
FeedsModelFeed::FeedsModelFeed(const FeedsModelFeed &other) FeedsModelFeed::FeedsModelFeed(const FeedsModelFeed &other)
: FeedsModelRootItem(NULL) { : FeedsModelRootItem(NULL) {
m_passwordProtected = other.passwordProtected(); m_passwordProtected = other.passwordProtected();
@ -577,7 +581,9 @@ QNetworkReply::NetworkError FeedsModelFeed::networkError() const {
} }
FeedsModelFeed::FeedsModelFeed(const QSqlRecord &record) : FeedsModelFeed(NULL) { FeedsModelFeed::FeedsModelFeed(const QSqlRecord &record) : FeedsModelRootItem(NULL) {
init();
setTitle(record.value(FDS_DB_TITLE_INDEX).toString()); setTitle(record.value(FDS_DB_TITLE_INDEX).toString());
setId(record.value(FDS_DB_ID_INDEX).toInt()); setId(record.value(FDS_DB_ID_INDEX).toInt());
setDescription(record.value(FDS_DB_DESCRIPTION_INDEX).toString()); setDescription(record.value(FDS_DB_DESCRIPTION_INDEX).toString());

3
src/core/feedsmodelfeed.h
View file

@ -194,6 +194,9 @@ class FeedsModelFeed : public FeedsModelRootItem {
// available. // available.
void updateMessages(const QList<Message> &messages); void updateMessages(const QList<Message> &messages);
private:
void init();
private: private:
bool m_passwordProtected; bool m_passwordProtected;
QString m_username; QString m_username;