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

List:       kde-commits
Subject:    playground/network/videocatcher/src
From:       Jonas Emanuel Müller <zanoi () zanoi ! net>
Date:       2010-12-05 17:05:05
Message-ID: 20101205170505.848C3AC8A4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1203916 by jonasemuller:

remove tableName parameter since the channel table name was hardcoded

 M  +3 -2      channelmodel.cpp  
 M  +1 -1      channelmodel.h  
 M  +2 -2      episodemodel.cpp  
 M  +1 -1      episodemodel.h  


--- trunk/playground/network/videocatcher/src/channelmodel.cpp #1203915:1203916
@@ -28,15 +28,16 @@
 
 struct ChannelModel::ChannelModelPrivate
 {
-    ChannelModelPrivate(QString tableName) : m_tableName(tableName)
+    ChannelModelPrivate() 
     {
     }
     QString m_tableName;
     QMap<int, QVariant> m_lastLoading;
 };
 
-ChannelModel::ChannelModel(QObject* parent, const QString &tableName) : \
QSqlRelationalTableModel(parent), d(new ChannelModelPrivate(tableName)) \
+	ChannelModel::ChannelModel(QObject* parent) : QSqlRelationalTableModel(parent), \
d(new ChannelModelPrivate())  {
+    d->m_tableName = "channels";
     QSqlQuery query(QString("CREATE TABLE IF NOT EXISTS %1 (\
         id INTEGER PRIMARY KEY AUTOINCREMENT,\
         title   TEXT,\
--- trunk/playground/network/videocatcher/src/channelmodel.h #1203915:1203916
@@ -52,7 +52,7 @@
 class ChannelModel : public QSqlRelationalTableModel
 {
 public:
-    explicit ChannelModel(QObject* parent = 0, const QString &tableName = \
"channels"); +    explicit ChannelModel(QObject* parent = 0);
     ~ChannelModel();
 
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
--- trunk/playground/network/videocatcher/src/episodemodel.cpp #1203915:1203916
@@ -41,9 +41,9 @@
     QString m_tableName;
 };
 
-EpisodeModel::EpisodeModel(QObject* parent, QString tableName) : \
QSqlRelationalTableModel(parent), d(new EpisodeModelPrivate) \
+EpisodeModel::EpisodeModel(QObject* parent) : QSqlRelationalTableModel(parent), \
d(new EpisodeModelPrivate)  {
-    d->m_tableName = tableName;
+    d->m_tableName = "episodes";
     QSqlQuery query(QString("CREATE TABLE IF NOT EXISTS %1 (\
         id INTEGER PRIMARY KEY AUTOINCREMENT,\
         status  INT,\
--- trunk/playground/network/videocatcher/src/episodemodel.h #1203915:1203916
@@ -54,7 +54,7 @@
 class EpisodeModel : public QSqlRelationalTableModel
 {
 public:
-    explicit EpisodeModel(QObject *parent = 0, QString tableName = "episodes");
+    explicit EpisodeModel(QObject *parent = 0);
     ~EpisodeModel();
 
     QModelIndex addEpisode(const QString &title, const QString &description, const \
int channelId, const double datePublished, const QString &videoUrl, const double \
videoSize);


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