diff options
| author |  Aleksei Bavshin | 2024-01-19 08:17:19 -0800 |
|---|---|---|
| committer |  GitHub | 2024-01-19 17:17:19 +0100 |
| commit | 0a2801101508e62e5e8a258c4280d264404fb9e1 (patch) | |
| tree | 290553f6ac4aaf0bf86b784ef9ec64b1e0c33ce4 /src/modules/dcc/DccVideoWindow.cpp | |
| parent | Update version to 5.2.0, update translations (#2590) (diff) | |
| download | KVIrc-0a2801101508e62e5e8a258c4280d264404fb9e1.tar.gz KVIrc-0a2801101508e62e5e8a258c4280d264404fb9e1.tar.bz2 KVIrc-0a2801101508e62e5e8a258c4280d264404fb9e1.zip | |
Fix build with Qt5 and WANT_DCC_VIDEO (#2592)
```
src/modules/dcc/DccVideoWindow.cpp: In member function ‘virtual const QString& DccVideoWindow::target()’:
src/modules/dcc/DccVideoWindow.cpp:660:40: error: cannot convert ‘QString’ to ‘QString*’ in assignment
```
Diffstat (limited to 'src/modules/dcc/DccVideoWindow.cpp')
| -rw-r--r-- | src/modules/dcc/DccVideoWindow.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/modules/dcc/DccVideoWindow.cpp b/src/modules/dcc/DccVideoWindow.cpp index 7f4f66ea4..7cf8058fe 100644 --- a/src/modules/dcc/DccVideoWindow.cpp +++ b/src/modules/dcc/DccVideoWindow.cpp @@ -396,7 +396,6 @@ DccVideoWindow::DccVideoWindow(DccDescriptor * dcc, const char * name) { m_pDescriptor = dcc; m_pSlaveThread = nullptr; - m_pszTarget = nullptr; m_pButtonBox = new KviTalHBox(this); @@ -557,12 +556,6 @@ DccVideoWindow::~DccVideoWindow() } KviThreadManager::killPendingEvents(this); - - if(m_pszTarget) - { - delete m_pszTarget; - m_pszTarget = nullptr; - } } void DccVideoWindow::resizeEvent(QResizeEvent *) @@ -654,11 +647,8 @@ void DccVideoWindow::connectionInProgress() const QString & DccVideoWindow::target() { // This may change on the fly... - if(!m_pszTarget) - m_pszTarget = new QString(); - - m_pszTarget = QString::asprintf("%s@%s:%s", m_pDescriptor->szNick.toUtf8().data(), m_pDescriptor->szIp.toUtf8().data(), m_pDescriptor->szPort.toUtf8().data()); - return *m_pszTarget; + m_szTarget = QString::asprintf("%s@%s:%s", m_pDescriptor->szNick.toUtf8().data(), m_pDescriptor->szIp.toUtf8().data(), m_pDescriptor->szPort.toUtf8().data()); + return m_szTarget; } void DccVideoWindow::getBaseLogFileName(QString & buffer) |