removed appsettings

[toast/confclerk.git] / src / gui / tabcontainer.cpp

diff --git a/src/gui/tabcontainer.cpp b/src/gui/tabcontainer.cpp
index f2e3fff0c5e3b824c0e27def2da3763a48c4c783..c03b2e10914e2673aca7824daa16fa60473b9147 100644 (file)
--- a/src/gui/tabcontainer.cpp
+++ b/src/gui/tabcontainer.cpp
@@ -35,8 +35,8 @@ TabContainer::TabContainer(QWidget *aParent)
     }
     else
     {
     }
     else
     {

-        QDate aStartDate = Conference::getById(AppSettings::confId()).start();
-        QDate aEndDate = Conference::getById(AppSettings::confId()).end();
+        QDate aStartDate = Conference::getById(Conference::activeConference()).start();
+        QDate aEndDate = Conference::getById(Conference::activeConference()).end();

         dayNavigator->setDates(aStartDate, aEndDate);
     }
 }
         dayNavigator->setDates(aStartDate, aEndDate);
     }
 }


@@ -44,7 +44,7 @@ TabContainer::TabContainer(QWidget *aParent)
 void TabContainer::updateTreeView(const QDate &aDate)
 {
     dayNavigator->show();
 void TabContainer::updateTreeView(const QDate &aDate)
 {
     dayNavigator->show();

-    loadEvents( aDate, AppSettings::confId() );
+    loadEvents( aDate, Conference::activeConference() );

     treeView->reset();
 }
 
     treeView->reset();
 }
 


@@ -101,5 +101,3 @@ void TabContainer::setDates(const QDate &aStart, const QDate &aEnd)
     dayNavigator->setDates(aStart, aEnd);
 }
 
     dayNavigator->setDates(aStart, aEnd);
 }
 

-
-