summaryrefslogtreecommitdiffstats
path: root/logic/OpSys.cpp
diff options
context:
space:
mode:
authorAndrew <forkk@forkk.net>2013-11-04 19:58:56 -0600
committerAndrew <forkk@forkk.net>2013-11-04 19:58:56 -0600
commit5083a6a8090fa03d3c1800c1f9588079ca11e9f9 (patch)
tree7c2e88c7184a7f5acf5e7a03be5c5f0bf6904113 /logic/OpSys.cpp
parentdc3b0fcb2b74aeede37b08216b203cab284f7fce (diff)
parentbb7e8985f6d189de0acac6a1c3033cb16378c1fb (diff)
downloadMultiMC-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.tar
MultiMC-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.tar.gz
MultiMC-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.tar.lz
MultiMC-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.tar.xz
MultiMC-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.zip
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Diffstat (limited to 'logic/OpSys.cpp')
-rw-r--r--logic/OpSys.cpp35
1 files changed, 27 insertions, 8 deletions
diff --git a/logic/OpSys.cpp b/logic/OpSys.cpp
index f101fd08..e001b7f3 100644
--- a/logic/OpSys.cpp
+++ b/logic/OpSys.cpp
@@ -1,23 +1,42 @@
+/* Copyright 2013 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
#include "OpSys.h"
OpSys OpSys_fromString(QString name)
{
- if(name == "linux")
+ if (name == "linux")
return Os_Linux;
- if(name == "windows")
+ if (name == "windows")
return Os_Windows;
- if(name == "osx")
+ if (name == "osx")
return Os_OSX;
return Os_Other;
}
QString OpSys_toString(OpSys name)
{
- switch(name)
+ switch (name)
{
- case Os_Linux: return "linux";
- case Os_OSX: return "osx";
- case Os_Windows: return "windows";
- default: return "other";
+ case Os_Linux:
+ return "linux";
+ case Os_OSX:
+ return "osx";
+ case Os_Windows:
+ return "windows";
+ default:
+ return "other";
}
} \ No newline at end of file