Removed one comment and fixed typos.

[toast/confclerk.git] / src / orm / ormrecord.h

diff --git a/src/orm/ormrecord.h b/src/orm/ormrecord.h
index dfafc94bced31f606ed12af19aa6b4f996e8f1b8..85d32c29fc10cd00c26f2f074a2abb4ef02cefca 100644 (file)
--- a/src/orm/ormrecord.h
+++ b/src/orm/ormrecord.h
@@ -1,20 +1,21 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

+ * Copyright (C) 2011 Philipp Spitzer, gregor herrmann

  *
  *

- * This file is part of fosdem-schedule.
+ * This file is part of ConfClerk.

  *
  *

- * fosdem-schedule is free software: you can redistribute it and/or modify it
+ * ConfClerk 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.
  *
  * 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.
  *

- * fosdem-schedule is distributed in the hope that it will be useful, but
+ * ConfClerk 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
  * 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

- * fosdem-schedule.  If not, see <http://www.gnu.org/licenses/>.
+ * ConfClerk.  If not, see <http://www.gnu.org/licenses/>.

  */
 #ifndef ORMRECORD_H
 #define ORMRECORD_H
  */
 #ifndef ORMRECORD_H
 #define ORMRECORD_H


@@ -30,8 +31,8 @@
 class OrmException
 {
 public:
 class OrmException
 {
 public:

-    OrmException(const QString& text) : mText(text) {};
-    virtual ~OrmException(){};
+    OrmException(const QString& text) : mText(text) {}
+    virtual ~OrmException(){}

     virtual const QString& text() const { return mText; }
 private:
     QString mText;
     virtual const QString& text() const { return mText; }
 private:
     QString mText;


@@ -40,15 +41,15 @@ private:
 class OrmNoObjectException : public OrmException
 {
 public:
 class OrmNoObjectException : public OrmException
 {
 public:

-    OrmNoObjectException() : OrmException("No object exception"){};
-    ~OrmNoObjectException(){};
+    OrmNoObjectException() : OrmException("No object exception"){}
+    ~OrmNoObjectException(){}

 };
 
 class OrmSqlException : public OrmException
 {
 public:
 };
 
 class OrmSqlException : public OrmException
 {
 public:

-    OrmSqlException(const QString& text) : OrmException( QString("Sql error: ") + text ) {};
-    ~OrmSqlException(){};
+    OrmSqlException(const QString& text) : OrmException( QString("Sql error: ") + text ) {}
+    ~OrmSqlException(){}

 };
 
 template <typename T>
 };
 
 template <typename T>


@@ -92,8 +93,8 @@ T OrmRecord<T>::hydrate(const QSqlRecord& record)
 }
 
 // updates specified column 'col'
 }
 
 // updates specified column 'col'

-// if the value is not specified  as an argument,
-// it's taken from the reford itself
+// if the value is not specified as an argument,
+// it's taken from the record itself

 // see also: setValue() method for more details
 template <typename T>
 void OrmRecord<T>::update(QString col, QVariant value)
 // see also: setValue() method for more details
 template <typename T>
 void OrmRecord<T>::update(QString col, QVariant value)


@@ -105,7 +106,6 @@ void OrmRecord<T>::update(QString col, QVariant value)
     else // take 'col' value from the record; see setValue()
         query.bindValue(":col", convertToDb(this->value(col), this->value(col).type()));
     query.bindValue(":id", this->value("id"));
     else // take 'col' value from the record; see setValue()
         query.bindValue(":col", convertToDb(this->value(col), this->value(col).type()));
     query.bindValue(":id", this->value("id"));

-    //query.bindValue(":id", convertToDb(value("id"), QVariant::Int));

     query.exec();
 }
 
     query.exec();
 }
 


@@ -150,10 +150,6 @@ QList<T> OrmRecord<T>::load(QSqlQuery query)
             qDebug() << "Error: " << query.lastError().driverText() << "; Type: " << query.lastError().type();
             throw OrmSqlException(query.lastError().text());
         }
             qDebug() << "Error: " << query.lastError().driverText() << "; Type: " << query.lastError().type();
             throw OrmSqlException(query.lastError().text());
         }

-        else
-        {
-            /*qDebug() << "SQL OK";*/
-        }

     }
 
     QList<T> objects;
     }
 
     QList<T> objects;


@@ -161,7 +157,6 @@ QList<T> OrmRecord<T>::load(QSqlQuery query)
     {
         objects << hydrate(query.record());
     }
     {
         objects << hydrate(query.record());
     }

-    /*qDebug() << "Fetch done";*/

     return objects;
 }
 
     return objects;
 }