From e3d027a25f13343ef4c344b7f4f596a731cb691d Mon Sep 17 00:00:00 2001 From: doitux Date: Sun, 9 Dec 2007 12:09:42 +0000 Subject: [PATCH] --- src/gui/qt/chattools/chattools.cpp | 3 +++ src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp | 7 ++----- src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h | 3 --- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/gui/qt/chattools/chattools.cpp b/src/gui/qt/chattools/chattools.cpp index 7452cb37..7a0918c0 100644 --- a/src/gui/qt/chattools/chattools.cpp +++ b/src/gui/qt/chattools/chattools.cpp @@ -49,6 +49,9 @@ void ChatTools::receiveMessage(QString playerName, QString message) { if(myTextBrowser) { + message = message.replace("<","<"); + message = message.replace(">",">"); + QString tempMsg; if(message.contains(QString::fromUtf8(myConfig->readConfigString("MyName").c_str()), Qt::CaseInsensitive)) { diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp index 6e220073..665229bc 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp @@ -53,8 +53,8 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(QWidget *parent, ConfigFile *c) connect( pushButton_Leave, SIGNAL( clicked() ), this, SLOT( leaveGame() ) ); connect( treeWidget_GameList, SIGNAL( currentItemChanged ( QTreeWidgetItem*, QTreeWidgetItem*) ), this, SLOT( gameSelected(QTreeWidgetItem*, QTreeWidgetItem*) ) ); connect( treeWidget_connectedPlayers, SIGNAL( currentItemChanged ( QTreeWidgetItem*, QTreeWidgetItem*) ), this, SLOT( playerSelected(QTreeWidgetItem*, QTreeWidgetItem*) ) ); - connect( lineEdit_ChatInput, SIGNAL( returnPressed () ), this, SLOT( sendChatMessage() ) ); - connect( lineEdit_ChatInput, SIGNAL( textChanged (QString) ), this, SLOT( checkChatInputLength(QString) ) ); + connect( lineEdit_ChatInput, SIGNAL( returnPressed () ), myChat, SLOT( sendMessage() ) ); + connect( lineEdit_ChatInput, SIGNAL( textChanged (QString) ), myChat, SLOT( checkInputLength(QString) ) ); connect( lineEdit_ChatInput, SIGNAL( textEdited (QString) ), myChat, SLOT( setChatTextEdited() ) ); connect( waitStartGameMsgBoxTimer, SIGNAL(timeout()), this, SLOT( showWaitStartGameMsgBox() )); @@ -751,9 +751,6 @@ void gameLobbyDialogImpl::kickPlayer() { pushButton_Kick->setEnabled(false); } -void gameLobbyDialogImpl::sendChatMessage() { myChat->sendMessage(); } -void gameLobbyDialogImpl::checkChatInputLength(QString string) { myChat->checkInputLength(string); } - void gameLobbyDialogImpl::keyPressEvent ( QKeyEvent * event ) { // std::cout << "key" << "\n"; diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h index 8ac03bf7..7896bbc3 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h @@ -94,9 +94,6 @@ public slots: void updateDialogBlinds(const GameData &gameData); void clearDialog(); - void sendChatMessage(); - void checkChatInputLength(QString string); - void keyPressEvent(QKeyEvent * keyEvent); bool event(QEvent * event); void hideShowGameDescription(bool show);