git-svn-id: svn://imanolbarba.net/PAD@55 c2ee353e-ed0d-4329-bf56-03aec153487f

Imanol-Mikel Barba Sabariego
1 parent ca680146
Showing 6 changed files with 6 additions and 25 deletions
QChatClient/QChatClient.pro.user
QChatClient/chatinputtext.cpp
QChatClient/chatroom.cpp
QChatClient/main.cpp
build-QChatClient-Desktop-Debug/QChatClient
build-QChatClient-Desktop-Debug/main.o
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 2.7.0, 2014-01-07T00:45:31. -->
+<!-- Written by QtCreator 2.7.1, 2014-01-07T07:37:08. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -51,9 +51,9 @@
  <data>
   <variable>ProjectExplorer.Project.Target.0</variable>
   <valuemap type="QVariantMap">
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
-   <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">{430bae4e-c8d6-488c-936e-c89fd5587cd0}</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 5.0.1 (qt5)</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 5.0.1 (qt5)</value>
+   <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">{c01623e0-8a32-406c-bbaa-3e691c0f6afc}</value>
    <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
@@ -189,6 +189,7 @@
     <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
     <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
     <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
@@ -246,7 +247,7 @@
  </data>
  <data>
   <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
-  <value type="QString">{0fd5067a-d849-4d4e-9457-800baef2de83}</value>
+  <value type="QString">{fd24a9a9-cdbc-49b3-845c-b174fda2a7ac}</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
 #include "chatinputtext.h"
  
-#include <QTextCodec>
-
 chatInputText::chatInputText(QWidget *parent) :
     QTextEdit(parent)
 {
@@ -233,7 +233,6 @@ void Chatroom::relayMsg(string msg)
  
 void Chatroom::newChat(QString peerNick)
 {
-    cout << "add chat" << endl;
     chatMutex.lock();
     ChatWindow* newchat = new ChatWindow(peerNick,this);
     activeChats.insert(std::pair<string,ChatWindow*>(peerNick.toStdString(),newchat));
@@ -245,7 +244,6 @@ void Chatroom::newChat(QString peerNick)
 void Chatroom::removeChat(QString &nickname)
 {
     freeChats(false);
-    cout << "move to inactive" << endl;
     chatMutex.lock();
     ChatWindow* chat = (ChatWindow*) activeChats.find(nickname.toStdString())->second;
     inactiveChats.insert(std::pair<string,ChatWindow*>(nickname.toStdString(),chat));
@@ -401,7 +399,6 @@ void Chatroom::freeChats(bool active)
     {
         for(it = inactiveChats.begin(); it != inactiveChats.end(); it++)
         {
-            cout << "delete from inactive" << endl;
             ChatWindow* chat = (ChatWindow*) it->second;
             delete chat;
         }
-#include "loginscreen.h"
 #include "chatroom.h"
 #include <QApplication>
-#include <signal.h>
-#include <execinfo.h>
-
-
-void handler(int sig)
-{
-  void *array[10];
-  size_t size;
-  size = backtrace(array, 10);
-  fprintf(stderr, "SEGFAULT\n");
-  backtrace_symbols_fd(array, size, STDERR_FILENO);
-  exit(1);
-}
-
  
 int main(int argc, char *argv[])
 {