Architecture changed to allow easier addition of new phone books. Norwegian phonebook...

[jenirok] / src / gui / main.cpp

diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 0bce49a..215c254 100644 (file)
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -16,8 +16,6 @@
  *
  */
 
-#include <QtCore/QTranslator>
-#include <QtCore/QLocale>
 #include <QtCore/QObject>
 #include <QtGui/QApplication>
 #include "mainwindow.h"
@@ -25,14 +23,13 @@
 #include "resultwindow.h"
 #include "detailwindow.h"
 #include "eniro.h"
+#include "settings.h"
 
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    QTranslator translator;
-    translator.load(":/translations/" + QLocale::system().name());
-    app.installTranslator(&translator);
+    Settings::instance()->loadLanguage(app);
 
     MainWindow window;
     ResultWindow results(&window);
@@ -43,8 +40,8 @@ int main(int argc, char *argv[])
     QObject::connect(&window, SIGNAL(search(SearchDialog::SearchDetails&)),
                      &results, SLOT(search(SearchDialog::SearchDetails&)));
 
-    QObject::connect(&results, SIGNAL(itemSelected(Eniro::Result const&)),
-                     &details, SLOT(loadData(Eniro::Result const&)));
+    QObject::connect(&results, SIGNAL(itemSelected(Source::Result const&)),
+                     &details, SLOT(loadData(Source::Result const&)));
 
     return app.exec();
 }