diff options
| author |  Fabio Bas | 2012-09-25 13:15:57 +0000 |
|---|---|---|
| committer | Fabio Bas | 2012-09-25 13:15:57 +0000 |
| commit | 4602a1a7ac1f4b2fd33bb1581f4eedd1edd65a9c (patch) | |
| tree | 2a36735ae8685b0d6011f1bfdf0d27ec6211089b /src/modules/dcc/DccVideoWindow.cpp | |
| parent | Properly sort the console windows when sorting by name is selected in the tre... (diff) | |
| download | KVIrc-4602a1a7ac1f4b2fd33bb1581f4eedd1edd65a9c.tar.gz KVIrc-4602a1a7ac1f4b2fd33bb1581f4eedd1edd65a9c.tar.bz2 KVIrc-4602a1a7ac1f4b2fd33bb1581f4eedd1edd65a9c.zip | |
qt5 support (sip): code only, no touch to build system by now
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6251 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/dcc/DccVideoWindow.cpp')
| -rw-r--r-- | src/modules/dcc/DccVideoWindow.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/modules/dcc/DccVideoWindow.cpp b/src/modules/dcc/DccVideoWindow.cpp index 5c74ba068..e671afa5b 100644 --- a/src/modules/dcc/DccVideoWindow.cpp +++ b/src/modules/dcc/DccVideoWindow.cpp @@ -46,7 +46,6 @@ #include <QToolTip> #include <QByteArray> #include <QBuffer> -#include <QTextDocument> //for Qt::escape #ifdef COMPILE_CRYPT_SUPPORT #include "KviCryptController.h" @@ -833,7 +832,7 @@ bool DccVideoWindow::event(QEvent *e) QString szMsg = "<b>"; szMsg += m_pDescriptor->szNick; szMsg += "</b> "; - szMsg += Qt::escape(QString(d.ptr())); + szMsg += KviQString::toHtmlEscaped(QString(d.ptr())); //qDebug("KviIrcServerParser_ctcp.cpp:975 debug: %s",szMsg.data()); g_pApp->notifierMessage(this,KVI_OPTION_MSGTYPE(KVI_OUT_ACTION).pixId(),szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime)); } @@ -887,7 +886,7 @@ bool DccVideoWindow::event(QEvent *e) } if(KVI_OPTION_BOOL(KviOption_boolPopupNotifierOnNewDccChatMessages)) { - QString szMsg = Qt::escape(QString(d.ptr())); + QString szMsg = KviQString::toHtmlEscaped(QString(d.ptr())); g_pApp->notifierMessage(this,KviIconManager::DccChatMsg,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime)); } } @@ -1054,7 +1053,3 @@ void DccVideoWindow::videoInputChanged(int ) // if(m_pSlaveThread) // m_pSlaveThread->restartRecording(m_pCDevices->currentIndex(), m_pCInputs->currentIndex(), m_pCStandards->currentIndex()); } - -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_DccVideoWindow.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES |