From 24bf24af68ba0279fbdf649c415dc489b80e8aa7 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Sun, 6 Mar 2011 18:56:33 +0100 Subject: misc, translator --- src/fbgui.h | 1 - src/main.cpp | 19 ++++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/fbgui.h b/src/fbgui.h index d435c01..9bf4ce0 100644 --- a/src/fbgui.h +++ b/src/fbgui.h @@ -18,7 +18,6 @@ public: private: fbbrowser* _fbb; - }; #endif // FBGUI_H diff --git a/src/main.cpp b/src/main.cpp index 58615ed..25c7e03 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -20,10 +20,15 @@ void printHelp() int main(int argc, char *argv[]) { - QApplication *app = new QApplication(argc, argv, QApplication::GuiServer); - app->setOrganizationName("team_projekt_2011"); - app->setApplicationName("fbgui"); - app->setObjectName("test"); + QApplication app(argc, argv, QApplication::GuiServer); + app.setOrganizationName("team_projekt_2011"); + app.setApplicationName("fbgui"); + app.setObjectName("test"); + + // Translator, for later (maybe). + QTranslator translator; + translator.load(":" + QLocale::system().name()); + app.installTranslator(&translator); /* Parse cmdline argus. */ QMap clo; @@ -54,7 +59,7 @@ int main(int argc, char *argv[]) exit(EXIT_SUCCESS); } // Read the config file, for now hardcoded expected name. - QSettings confFileSettings(app->applicationDirPath() + "/fbgui.conf", QSettings::IniFormat); + QSettings confFileSettings(app.applicationDirPath() + "/fbgui.conf", QSettings::IniFormat); confFileSettings.setIniCodec("UTF-8"); if (clo.contains("url")) @@ -66,8 +71,8 @@ int main(int argc, char *argv[]) // Start fbgui. fbgui *gui = new fbgui(); - gui->setParent(app); + gui->setParent(&app); gui->startBrowser(); - return app->exec(); + return app.exec(); } -- cgit v1.2.3-55-g7522