Merge https://github.com/Forkk/MultiMC5

Conflicts:
	gui/mainwindow.ui

1 files changed, 39 insertions, 0 deletions

diff --git a/data/userinfo.h b/data/userinfo.h
new file mode 100644
index 00000000..ccfc741e
--- /dev/null
+++ b/data/userinfo.h
@@ -0,0 +1,39 @@
+/* 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.
+ */
+
+#ifndef USERINFO_H
+#define USERINFO_H
+
+#include <QObject>
+
+class UserInfo : public QObject
+{
+	Q_OBJECT
+public:
+	explicit UserInfo(const QString& username, const QString& password, QObject *parent = 0);
+	explicit UserInfo(const UserInfo& other);
+	
+	QString getUsername() const;
+	void setUsername(const QString& username);
+	
+	QString getPassword() const;
+	void setPassword(const QString& password);
+	
+protected:
+	QString username;
+	QString password;
+};
+
+#endif // USERINFO_H