sync with master lf files to resolve conflicts

[proxmark3-svn] / client / proxgui.cpp

diff --git a/client/proxgui.cpp b/client/proxgui.cpp
index 7e87b5821c57c6ae10eab05003cf0aba38239053..12faab79cd3d7eb002d50b2dd53b06ce34989913 100644 (file)
--- a/client/proxgui.cpp
+++ b/client/proxgui.cpp
@@ -1,3 +1,13 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2009 Michael Gernoth <michael at gernoth.net>
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// GUI functions
+//-----------------------------------------------------------------------------
+
 #include "proxgui.h"
 #include "proxguiqt.h"
 
@@ -5,54 +15,54 @@ static ProxGuiQT *gui = NULL;
 
 extern "C" void ShowGraphWindow(void)
 {
-       if (!gui)
-               return;
-       
-       gui->ShowGraphWindow();
+  if (!gui)
+    return;
+
+  gui->ShowGraphWindow();
 }
 
 extern "C" void HideGraphWindow(void)
 {
-       if (!gui)
-               return;
-       
-       gui->HideGraphWindow();
+  if (!gui)
+    return;
+
+  gui->HideGraphWindow();
 }
 
 extern "C" void RepaintGraphWindow(void)
 {
-       if (!gui)
-               return;
+  if (!gui)
+    return;
 
-       gui->RepaintGraphWindow();
+  gui->RepaintGraphWindow();
 }
 
 extern "C" void MainGraphics(void)
 {
-       if (!gui)
-               return;
+  if (!gui)
+    return;
 
-       gui->MainLoop();
+  gui->MainLoop();
 }
 
 extern "C" void InitGraphics(int argc, char **argv)
 {
 #ifdef Q_WS_X11
-       bool useGUI = getenv("DISPLAY") != 0;
+  bool useGUI = getenv("DISPLAY") != 0;
 #else
-       bool useGUI = true;
+  bool useGUI = true;
 #endif
-       if (!useGUI)
-               return;
+  if (!useGUI)
+    return;
 
-       gui = new ProxGuiQT(argc, argv);
+  gui = new ProxGuiQT(argc, argv);
 }
 
 extern "C" void ExitGraphics(void)
 {
-       if (!gui)
-               return;
-       
-       delete gui;
-       gui = NULL;
+  if (!gui)
+    return;
+
+  delete gui;
+  gui = NULL;
 }