fixed license headers in citra project

4 files changed, 16 insertions, 116 deletions

diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index 37ea9740..d55b9739 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -1,26 +1,6 @@
-/**
- * Copyright (C) 2013 citra Emulator
- *
- * @file    citra.cpp
- * @author  ShizZy <shizzy247@gmail.com>
- * @date    2013-09-04
- * @brief   Main entry point
- *
- * @section LICENSE
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details at
- * http://www.gnu.org/copyleft/gpl.html
- *
- * Official project repository can be found at:
- * http://code.google.com/p/gekko-gc-emu/
- */
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "common/common.h"
 #include "common/log_manager.h"
@@ -34,17 +14,9 @@
 
 #include "citra/citra.h"
 
-#define E_ERR -1
-
-//#define PLAY_FIFO_RECORDING
-
 /// Application entry point
 int __cdecl main(int argc, char **argv) {
-    //u32 tight_loop;
-
-    printf("citra starting...\n");
-
-	std::string program_dir = File::GetCurrentDir();
+    std::string program_dir = File::GetCurrentDir();
 
 	LogManager::Init();
 
@@ -52,7 +24,7 @@ int __cdecl main(int argc, char **argv) {
 
 	System::Init(emu_window);
 
-    std::string boot_filename = "C:\\Users\\eric\\Desktop\\3ds\\homebrew\\Mandelbrot3DS.elf";
+    std::string boot_filename = "homebrew.elf";
     std::string error_str;
     
     bool res = Loader::LoadFile(boot_filename, &error_str);
diff --git a/src/citra/citra.h b/src/citra/citra.h
index b3a07c00..5a2c60aa 100644
--- a/src/citra/citra.h
+++ b/src/citra/citra.h
@@ -1,29 +1,8 @@
-/**
- * Copyright (C) 2013 Citra Emulator
- *
- * @file    citra.h
- * @author  ShizZy <shizzy247@gmail.com>
- * @date    2013-09-04
- * @brief   Main entry point
- *
- * @section LICENSE
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details at
- * http://www.gnu.org/copyleft/gpl.html
- *
- * Official project repository can be found at:
- * http://code.google.com/p/gekko-gc-emu/
- */
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-#ifndef CITRA_CITRA_H
-#define CITRA_CITRA_H
+#pragma once
 
 #include "version.h"
 
@@ -32,4 +11,3 @@
 #define APP_TITLE       APP_NAME " " APP_VERSION
 #define	COPYRIGHT       "Copyright (C) 2013 Citra Emulator"
 
-#endif // CITRA_CITRA_H
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp
index 0192d859..442176d9 100644
--- a/src/citra/emu_window/emu_window_glfw.cpp
+++ b/src/citra/emu_window/emu_window_glfw.cpp
@@ -1,43 +1,13 @@
-/**
- * Copyright (C) 2013 Citra Emulator
- *
- * @file    emu_window_glfw.cpp
- * @author  ShizZy <shizzy@6bit.net>
- * @date    2013-09-04
- * @brief   Implementation implementation of EmuWindow class for GLFW
- *
- * @section LICENSE
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details at
- * http://www.gnu.org/copyleft/gpl.html
- *
- * Official project repository can be found at:
- * http://code.google.com/p/gekko-gc-emu/
- */
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "common/common.h"
 #include "video_core/video_core.h"
 #include "citra/emu_window/emu_window_glfw.h"
 
 static void OnKeyEvent(GLFWwindow* win, int key, int action) {
- //   EmuWindow_GLFW* emuwin = (EmuWindow_GLFW*)glfwGetWindowUserPointer(win);
-	//input_common::GCController::GCButtonState state;
-
-	//if (action == GLFW_PRESS) {
-	//	state = input_common::GCController::PRESSED;
-	//} else {
-	//	state = input_common::GCController::RELEASED;
-	//}
- //   for (int channel = 0; channel < 4 && emuwin->controller_interface(); ++channel) {
-	//	emuwin->controller_interface()->SetControllerStatus(channel, key, state);
- //   }
+    // TODO(bunnei): ImplementMe
 }
 
 static void OnWindowSizeEvent(GLFWwindow* win, int width, int height) {
diff --git a/src/citra/emu_window/emu_window_glfw.h b/src/citra/emu_window/emu_window_glfw.h
index c3feb6e5..6499315c 100644
--- a/src/citra/emu_window/emu_window_glfw.h
+++ b/src/citra/emu_window/emu_window_glfw.h
@@ -1,26 +1,6 @@
-/**
- * Copyright (C) 2013 Citra Emulator
- *
- * @file    emu_window_glfw.h
- * @author  ShizZy <shizzy@6bit.net>
- * @date    2013-09-04
- * @brief   Implementation implementation of EmuWindow class for GLFW
- *
- * @section LICENSE
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details at
- * http://www.gnu.org/copyleft/gpl.html
- *
- * Official project repository can be found at:
- * http://code.google.com/p/gekko-gc-emu/
- */
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once