diff --git a/autolaunch.sh b/autolaunch.sh index ee51d31..4c64364 100644 --- a/autolaunch.sh +++ b/autolaunch.sh @@ -5,10 +5,10 @@ read -s -p "git password ?" pass mkdir build while true do - git pull https://$user:$pass@epicsparrow.com/Anselme/sparrowbot.git + git pull https://'$user':'$pass'@epicsparrow.com/Anselme/sparrowbot.git cd build qmake-qt5 ../SparrowBot.pro make - ./SparrowBot -nogui + ./SparrowBot -nogui nick=SparrowBot chan=epicsparrow server=irc.freenode.net port=6667 cd .. done diff --git a/main.cpp b/main.cpp index 102a32b..08566fb 100644 --- a/main.cpp +++ b/main.cpp @@ -5,21 +5,45 @@ int main(int argc, char *argv[]) { + bool nogui = false; + QString server = "irc.freenode.net"; + int port = 6667; + QString nick = "SparrowBotDebug"; + QString chan = "epicsparrow"; + + // parsing arguments + for(int i=1; i 1 && QString(argv[1]).compare("-nogui") == 0; - // set up UI if(!nogui) { diff --git a/socketirc.cpp b/socketirc.cpp index b3a6550..1e2dca6 100644 --- a/socketirc.cpp +++ b/socketirc.cpp @@ -7,7 +7,7 @@ SocketIRC::SocketIRC() : server("irc.freenode.net"), port(6667), isConnected(fal connect(&sock, SIGNAL(disconnected()), this, SLOT(onDisconnect())); } -void SocketIRC::setServer(std::string server_) +void SocketIRC::setServer(QString server_) { server = server_; } @@ -28,7 +28,7 @@ void SocketIRC::connectToServer(QCoreApplication* app_) { app = app_; - sock.connectToHost(QString(server.c_str()), quint16(port)); + sock.connectToHost(server, quint16(port)); if(!sock.waitForConnected(3000)) { std::cerr << "failed to connect : " << sock.errorString().toStdString() << std::endl; diff --git a/socketirc.h b/socketirc.h index fbe6f55..b09ef5c 100644 --- a/socketirc.h +++ b/socketirc.h @@ -13,14 +13,14 @@ class SocketIRC : public QObject public: SocketIRC(); - void setServer(std::string server_); + void setServer(QString server_); void setPort(int port_); void connectToServer(QCoreApplication* app_); private: QCoreApplication* app; - std::string server; + QString server; int port; QTcpSocket sock; bool isConnected;