aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Skoland <davidskoland@gmail.com>2017-01-15 20:43:14 +0100
committerDavid Skoland <davidskoland@gmail.com>2017-01-15 20:43:14 +0100
commitf42417f9e287c772a14a9a637ebe3b06d6ef41f0 (patch)
tree3fac3ee5696012eed0169421bbd779eb1ce371b4
parentee0b796ff8841bfbaf1d414af76f32a328e2adc3 (diff)
added the courtroom class
-rw-r--r--Attorney_Online_remake.pro6
-rw-r--r--aoapplication.h2
-rw-r--r--courtroom.cpp8
-rw-r--r--courtroom.h19
-rw-r--r--lobby.h8
-rw-r--r--path_functions.cpp7
6 files changed, 39 insertions, 11 deletions
diff --git a/Attorney_Online_remake.pro b/Attorney_Online_remake.pro
index f8a203fa..1f2af983 100644
--- a/Attorney_Online_remake.pro
+++ b/Attorney_Online_remake.pro
@@ -27,7 +27,8 @@ SOURCES += main.cpp\
aopacket.cpp \
packet_distribution.cpp \
hex_functions.cpp \
- encryption_functions.cpp
+ encryption_functions.cpp \
+ courtroom.cpp
HEADERS += lobby.h \
text_file_functions.h \
@@ -42,4 +43,5 @@ HEADERS += lobby.h \
datatypes.h \
aopacket.h \
hex_functions.h \
- encryption_functions.h
+ encryption_functions.h \
+ courtroom.h
diff --git a/aoapplication.h b/aoapplication.h
index 0b8d453b..d37dc861 100644
--- a/aoapplication.h
+++ b/aoapplication.h
@@ -5,11 +5,11 @@
#include "datatypes.h"
#include <QApplication>
-#include <QMainWindow>
#include <QVector>
class NetworkManager;
class Lobby;
+class Courtroom;
class AOApplication : public QApplication
{
diff --git a/courtroom.cpp b/courtroom.cpp
new file mode 100644
index 00000000..ead897f6
--- /dev/null
+++ b/courtroom.cpp
@@ -0,0 +1,8 @@
+#include "courtroom.h"
+
+#include "aoapplication.h"
+
+Courtroom::Courtroom(AOApplication *parent) : QMainWindow(parent)
+{
+
+}
diff --git a/courtroom.h b/courtroom.h
new file mode 100644
index 00000000..7edb4fca
--- /dev/null
+++ b/courtroom.h
@@ -0,0 +1,19 @@
+#ifndef COURTROOM_H
+#define COURTROOM_H
+
+#include <QMainWindow>
+
+class AOApplication;
+
+class Courtroom : public QMainWindow
+{
+ Q_OBJECT
+public:
+ explicit Courtroom(AOApplication *parent = 0);
+
+signals:
+
+public slots:
+};
+
+#endif // COURTROOM_H
diff --git a/lobby.h b/lobby.h
index becf0e8a..520cc791 100644
--- a/lobby.h
+++ b/lobby.h
@@ -1,16 +1,16 @@
#ifndef LOBBY_H
#define LOBBY_H
+#include "aoimage.h"
+#include "aobutton.h"
+#include "aopacket.h"
+
#include <QMainWindow>
#include <QListWidget>
#include <QLabel>
#include <QPlainTextEdit>
#include <QLineEdit>
-#include "aoimage.h"
-#include "aobutton.h"
-#include "aopacket.h"
-
class AOApplication;
class Lobby : public QMainWindow
diff --git a/path_functions.cpp b/path_functions.cpp
index 3be93174..4a3cdb77 100644
--- a/path_functions.cpp
+++ b/path_functions.cpp
@@ -1,9 +1,10 @@
-#include <QDir>
+#include "path_functions.h"
#include "global_variables.h"
#include "text_file_functions.h"
-#include "path_functions.h"
+#include <QDir>
+#include <QDebug>
QString get_base_path(){
return (QDir::currentPath() + "/base/");
@@ -18,5 +19,3 @@ QString get_default_theme_path()
{
return get_base_path() + "themes/default/";
}
-
-