diff options
| author |   Renaud G <renaud@rolisteam.org> | 2016-09-25 10:04:28 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2016-09-25 10:04:28 +0200 |
| commit | fac053c3aacc0e2ede8a85ff41e27eed1c360f6f (patch) | |
| tree | c91ff176e60f1f6e634107b4e7a7282e831975ee /irc | |
| parent | dbb57d52d351e340ce69fccaedbdf758b04ed8fe (diff) | |
| parent | e225f2edfd365d1709df2cb5bb2f752ec8d82c1c (diff) | |
| download | OneRoll-fac053c3aacc0e2ede8a85ff41e27eed1c360f6f.tar.gz OneRoll-fac053c3aacc0e2ede8a85ff41e27eed1c360f6f.zip | |
Merge branch 'master' of github.com:Rolisteam/DiceParser
Diffstat (limited to 'irc')
| -rw-r--r-- | irc/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | irc/botircdiceparser.cpp | 1 |
2 files changed, 11 insertions, 12 deletions
diff --git a/irc/CMakeLists.txt b/irc/CMakeLists.txt index d43ffed..af77dfb 100644 --- a/irc/CMakeLists.txt +++ b/irc/CMakeLists.txt @@ -10,23 +10,23 @@ set(CMAKE_AUTOMOC ON) # Find the QtWidgets library find_package(Qt5Core) -find_package(Qt5Gui) -find_package(Qt5Widgets) +#fsind_package(Qt5Gui) +#find_package(Qt5Widgets) find_package(Qt5Network) -SET(mainwindow_SOURCES mainwindow.cpp) -SET(mainwindow_HEADERS mainwindow.h) -SET(mainwindow_FORMS mainwindow.ui) +#SET(mainwindow_SOURCES mainwindow.cpp) +#SET(mainwindow_HEADERS mainwindow.h) +#SET(mainwindow_FORMS mainwindow.ui) set(EXECUTABLE_OUTPUT_PATH bin/) -include_directories(${Qt5Core_INCLUDES} ${Qt5Gui_INCLUDES} ${Qt5Widgets_INCLUDES} ${Qt5Network_INCLUDES} ../) -add_definitions(${Qt5Core_DEFINITIONS} ${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS}) +include_directories(${Qt5Core_INCLUDES} ${Qt5Network_INCLUDES} ../) +add_definitions(${Qt5Core_DEFINITIONS} ${Qt5Network_DEFINITIONS}) -qt5_wrap_ui(UI_HEADERS mainwindow.ui) -#set(MODE "cli") +#qt5_wrap_ui(UI_HEADERS mainwindow.ui) +set(MODE "cli") ADD_DEFINITIONS( @@ -68,13 +68,11 @@ add_executable( ../node/sortresult.cpp ../node/startingnode.cpp ../node/ifnode.cpp - ${UI_HEADERS} botircdiceparser.cpp main.cpp) -target_link_libraries(irc ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES}) +target_link_libraries(irc ${Qt5Core_LIBRARIES} ${Qt5Network_LIBRARIES}) INSTALL_TARGETS(/bin irc) - #qt5_use_modules() diff --git a/irc/botircdiceparser.cpp b/irc/botircdiceparser.cpp index 87d47ff..eb2e3c1 100644 --- a/irc/botircdiceparser.cpp +++ b/irc/botircdiceparser.cpp @@ -37,6 +37,7 @@ BotIrcDiceParser::BotIrcDiceParser(QObject *parent) : // Connect signals and slots! connect(m_socket, SIGNAL(readyRead()), this, SLOT(readData())); connect(m_socket,SIGNAL(connected()),this,SLOT(authentificationProcess())); + connect(m_socket,SIGNAL(disconnected()),this,SLOT(connectToServer())); connect(m_socket,SIGNAL(error(QAbstractSocket::SocketError)),this,SLOT(errorOccurs(QAbstractSocket::SocketError))); } |