Refactoring

FACT-Team · Mar 14, 2015 · af38f7b · af38f7b
1 parent f782a3a
commit af38f7b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/gui/mainwindow/mainwindow.cpp b/src/gui/mainwindow/mainwindow.cpp
@@ -13,6 +13,7 @@ MainWindow::MainWindow(QWidget *parent) :
     setupSignalsSlots();
     StartedWindowsDialog w;
     w.exec();
+    updateUser();
 }
 
 void MainWindow::setupUi()

diff --git a/src/models/user.cpp b/src/models/user.cpp
@@ -124,7 +124,6 @@ void User::hydrat(int id)
 
     if(toCommit) {
         commit();
-        //hydrat(id);
     }
 
     delete user;

diff --git a/tests/models/projectmodeltest.cpp b/tests/models/projectmodeltest.cpp
@@ -11,6 +11,10 @@ ProjectModelTest::ProjectModelTest()
     p2.setName("vehicula");
     p2.setDescription("a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam");
     p2.setDailyRate(13);
+
+    Project p3("Nom");
+    QVariantHash q = p3.getDataMap();
+    bool b = p3 < p2;
 }
 
 void ProjectModelTest::equals1()
@@ -73,7 +77,8 @@ void ProjectModelTest::hydrat()
 
 void ProjectModelTest::remove()
 {
-    p1.remove();
+    p1.setToRemoved(true);
+    p1.commit();
     QVERIFY(Databases::ProjectDatabase::instance()->getProject(p1.getId()) == NULL);
 }
 void ProjectModelTest::getProjectsTable(void) {