FST: Mark wpa_supplicant callback functions get_peer_{first,next} static

[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 eeeda39..bbd45c6 100644 (file)
--- a/wpa_supplicant/wpa_gui-qt4/main.cpp
+++ b/wpa_supplicant/wpa_gui-qt4/main.cpp
@@ -2,38 +2,61 @@
  * 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"
 
+WpaGuiApp::WpaGuiApp(int &argc, char **argv) :
+       QApplication(argc, argv),
+       argc(argc),
+       argv(argv)
+{
+       w = NULL;
+}
+
+#if !defined(QT_NO_SESSIONMANAGER) && QT_VERSION < 0x050000
+void WpaGuiApp::saveState(QSessionManager &manager)
+{
+       QApplication::saveState(manager);
+       w->saveState();
+}
+#endif
+
+
 int main(int argc, char *argv[])
 {
-       QApplication app(argc, argv);
-       WpaGui w;
+       WpaGuiApp app(argc, argv);
+       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)) {
-               printf("Could not find a usable WinSock.dll\n");
+               /* printf("Could not find a usable WinSock.dll\n"); */
                return -1;
        }
 #endif /* CONFIG_NATIVE_WINDOWS */
 
-       w.show();
-       app.connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit()));
+       app.w = &w;
+
        ret = app.exec();
 
 #ifdef CONFIG_NATIVE_WINDOWS