Link to, and adjust types for, the PCSC framework included with OSX

[mech_eap.git] / wpa_supplicant / wpa_gui-qt4 / main.cpp

diff --git a/wpa_supplicant/wpa_gui-qt4/main.cpp b/wpa_supplicant/wpa_gui-qt4/main.cpp
index c5e285f..bbd45c6 100644 (file)
--- a/wpa_supplicant/wpa_gui-qt4/main.cpp
+++ b/wpa_supplicant/wpa_gui-qt4/main.cpp
@@ -2,40 +2,27 @@
  * wpa_gui - Application startup
  * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
  */
 
 #ifdef CONFIG_NATIVE_WINDOWS
 #include <winsock.h>
 #endif /* CONFIG_NATIVE_WINDOWS */
 #include <QApplication>
+#include <QtCore/QLibraryInfo>
+#include <QtCore/QTranslator>
 #include "wpagui.h"
 
-
-class WpaGuiApp : public QApplication
-{
-public:
-       WpaGuiApp(int &argc, char **argv);
-
-#ifndef QT_NO_SESSIONMANAGER
-       virtual void saveState(QSessionManager &manager);
-#endif
-
-       WpaGui *w;
-};
-
-WpaGuiApp::WpaGuiApp(int &argc, char **argv) : QApplication(argc, argv)
+WpaGuiApp::WpaGuiApp(int &argc, char **argv) :
+       QApplication(argc, argv),
+       argc(argc),
+       argv(argv)
 {
+       w = NULL;
 }
 
-#ifndef QT_NO_SESSIONMANAGER
+#if !defined(QT_NO_SESSIONMANAGER) && QT_VERSION < 0x050000
 void WpaGuiApp::saveState(QSessionManager &manager)
 {
        QApplication::saveState(manager);
@@ -47,9 +34,19 @@ void WpaGuiApp::saveState(QSessionManager &manager)
 int main(int argc, char *argv[])
 {
        WpaGuiApp app(argc, argv);
-       WpaGui w(&app);
+       QTranslator translator;
+       QString locale;
+       QString resourceDir;
        int ret;
 
+       locale = QLocale::system().name();
+       resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+       if (!translator.load("wpa_gui_" + locale, resourceDir))
+               translator.load("wpa_gui_" + locale, "lang");
+       app.installTranslator(&translator);
+
+       WpaGui w(&app);
+
 #ifdef CONFIG_NATIVE_WINDOWS
        WSADATA wsaData;
        if (WSAStartup(MAKEWORD(2, 0), &wsaData)) {