fixed bad project structure

.gitignore

@@ -5,4 +5,5 @@ release/*
 *.Debug
 *.Release
 Makefile
-ui_*
+ui_*
+bin/*

.qmake.conf

@@ -0,0 +1 @@
+top_srcdir=$$PWD/bin

SparrowBot.pro

@@ -1,5 +1,7 @@
 QT       += core gui network widgets
 
+BIN = bin
+
 TEMPLATE = subdirs
 CONFIG += ordered c++11
 SUBDIRS = ircbot \

app/app.pro

@@ -1,12 +1,12 @@
 QT       += core gui network widgets
 
-TARGET = ../../SparrowBot
+DESTDIR = $$top_srcdir
+
+TARGET = SparrowBot
 TEMPLATE = app
 CONFIG += c++11
 
-debug:LIBS += ../ircbot/debug/libircbot.a
+LIBS += $$top_srcdir/libircbot.a
-release:LIBS += ../ircbot/release/libircbot.a
-
 INCLUDEPATH += ../ircbot
 
 SOURCES = main.cpp \

app/main.cpp

@@ -5,10 +5,10 @@
 #include "regismodule.h"
 #include "sparrowmodule.h"
 
-class CustomModule : public Module
+class HelloWorldModule : public Module
 {
 public :
-    CustomModule() : Module() {}
+    HelloWorldModule() : Module() {}
 
     virtual bool messageHandler(Message msg)
     {
@@ -29,8 +29,8 @@ public :
 int main(int argc, char *argv[])
 {
     BotApp app = BotApp(argc, argv);
-    app.addModule(new CustomModule());
+    //app.addModule(new HelloWorldModule());
     app.addModule(new RegisModule());
-    app.addModule(new SparrowModule());
+    //app.addModule(new SparrowModule());
     return app.exec();
 }

app/regismodule.cpp

@@ -2,7 +2,7 @@
 #include "message.h"
 #include <time.h>
 
-RegisModule::RegisModule()
+RegisModule::RegisModule() : regisEnable(false)
 {
     std::srand(time(NULL));
     noms.push_back("Le chat");
@@ -35,7 +35,7 @@ RegisModule::RegisModule()
 
 bool RegisModule::messageHandler(Message msg)
 {
-    if(msg.args.contains("régis"))
+    if(msg.args.contains("régis ?"))
     {
         int nom1 = std::rand() % noms.size();
         int nom2 = std::rand() % noms.size();
@@ -44,6 +44,14 @@ bool RegisModule::messageHandler(Message msg)
         answer = say(noms[nom1] + " " + adjectifs[adjectif] + " " + verbes[verbe] + " " + noms[nom2] + ".");
         return true;
     }
+    else if(msg.args.compare("!initrégis") == 0)
+    {
+        regisEnable = true;
+        setNick("il_est_con_Regis");
+        answer = QString("NICK %1\r\n").arg(getNick());
+        return true;
+    }
+
     return false;
 }
 

app/regismodule.h

@@ -7,6 +7,7 @@
 
 class RegisModule : public Module
 {
+    bool regisEnable;
     std::vector<QString> noms;
     std::vector<QString> verbes;
     std::vector<QString> adjectifs;

ircbot/botapp.cpp

@@ -3,13 +3,13 @@
 #include "ircbot.h"
 #include "socketirc.h"
 
-BotApp::BotApp(int argc, char** argv) :
+BotApp::BotApp(int argc, char** argv) : nogui(false)
-    nogui(false),
-    server("irc.freenode.net"),
-    port(6667),
-    nick("SparrowBotDebug"),
-    chan("epicsparrow")
 {
+    QString server = QString("irc.freenode.net");
+    int port = 6667;
+    QString nick = QString("SparrowBotDebug");
+    QString chan = QString("epicsparrow");
+
     // parsing arguments
     for(int i=1; i<argc; ++i)
     {

ircbot/botapp.h

@@ -10,12 +10,7 @@ class MainWindow;
 
 class BotApp
 {
-    bool nogui = false;
+    bool nogui;
-    QString server = "irc.freenode.net";
-    int port = 6667;
-    QString nick = "SparrowBotDebug";
-    QString chan = "epicsparrow";
-
     SocketIRC* sock;
     IRCBot* bot;
     QCoreApplication* coreApp;

ircbot/ircbot.pro

@@ -1,5 +1,9 @@
 QT       += core gui network widgets
 
+DESTDIR = $$top_srcdir
+
+TARGET = ircbot
+
 TEMPLATE = lib
 CONFIG += staticlib c++11