X-Git-Url: https://git.toastfreeware.priv.at/toast/confclerk.git/blobdiff_plain/d17dd787eb05530a38141249728af13eaa91c78e..61346c970d0d600ce7dc5fad4ea8e4a5e629a048:/src/app/main.cpp diff --git a/src/app/main.cpp b/src/app/main.cpp index d70f890..29f36fb 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2010 Ixonos Plc. - * Copyright (C) 2011 Philipp Spitzer, gregor herrmann + * Copyright (C) 2011-2012 Philipp Spitzer, gregor herrmann, Stefan Stahl * * This file is part of ConfClerk. * @@ -17,17 +17,17 @@ * You should have received a copy of the GNU General Public License along with * ConfClerk. If not, see . */ -#include +#include "mainwindow.h" -#include +#include "sqlengine.h" #include "eventdialog.h" #include "application.h" #ifdef MAEMO -//#include -#include -#include +//#include "alarmdialog.h" +#include "alarmdbus.h" +#include "alarmdbusadaptorp.h" #endif /* MAEMO */ @@ -45,10 +45,7 @@ int main(int argc, char *argv[]) QCoreApplication::setApplicationName("ConfClerk"); QCoreApplication::setApplicationVersion(VERSION); - SqlEngine::initialize(); // creates "SQLITE" DB connection - QWidget *window; - window = new MainWindow; @@ -76,7 +73,7 @@ int main(int argc, char *argv[]) if(argc > 1) { - EventDialog dialog(atoi(argv[1]),window); + EventDialog dialog(atoi(argv[1]), window); dialog.exec(); } #endif