X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=proxy%2Fmain.cpp;h=eea07b0c2246656f8aee6229ef74c4a566952c49;hb=ea34109c6df04adac4a39d2e65dd2de7f69b8c43;hp=5170b654b242ec9cb24b3f358641705ffab8efce;hpb=0c0cc161ed4d40e39fc2534d3c8ee6f2a6784968;p=wordring-tm%2Fwordring-tm.git diff --git a/proxy/main.cpp b/proxy/main.cpp index 5170b65..eea07b0 100644 --- a/proxy/main.cpp +++ b/proxy/main.cpp @@ -1,7 +1,7 @@ #include "mainwindow.h" #include "tmeditorwidget.h" -#include "tmsocket.h" +#include "tmclientconnection.h" #include "httpserver.h" #include "tmhttp.h" #include "tmservice.h" @@ -123,11 +123,11 @@ int main(int argc, char *argv[]) settings.setValue("Database/root", path); } #ifdef QT_DEBUG - settings.setValue("WordringConnection/url", "ws://wordring.net/ws"); + settings.setValue("ServerConnection/url", "ws://wordring.net/ws"); #else - if(remove) settings.remove("WordringConnection/url"); - if(!settings.contains("WordringConnection/url")) - settings.setValue("WordringConnection/url", "ws://wordring.net/ws"); + if(remove) settings.remove("ServerConnection/url"); + if(!settings.contains("ServerConnection/url")) + settings.setValue("ServerConnection/url", "ws://wordring.net/ws"); #endif TM::Service *service = new TM::Service(&settings, &a);