aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/filetransferwindow
diff options
context:
space:
mode:
authorGravatar Fabio Bas2012-02-27 16:19:13 +0000
committerGravatar Fabio Bas2012-02-27 16:19:13 +0000
commit5917af93fe7c201b65ec770d34f5c73c87e2094c (patch)
tree21a31cd11bc6ef1ec158273b739a82f6ed845b7e /src/modules/filetransferwindow
parentfix for kde (diff)
downloadKVIrc-5917af93fe7c201b65ec770d34f5c73c87e2094c.tar.gz
KVIrc-5917af93fe7c201b65ec770d34f5c73c87e2094c.tar.bz2
KVIrc-5917af93fe7c201b65ec770d34f5c73c87e2094c.zip
fix for kde
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6080 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/filetransferwindow')
-rw-r--r--src/modules/filetransferwindow/FileTransferWindow.cpp10
-rw-r--r--src/modules/filetransferwindow/FileTransferWindow.h2
2 files changed, 7 insertions, 5 deletions
diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp
index 25799fa3f..8ec4e563e 100644
--- a/src/modules/filetransferwindow/FileTransferWindow.cpp
+++ b/src/modules/filetransferwindow/FileTransferWindow.cpp
@@ -391,7 +391,7 @@ void FileTransferWindow::rightButtonPressed(FileTransferItem *it,const QPoint &p
if(!m_pOpenFilePopup)
{
m_pOpenFilePopup= new QMenu(this);
- connect(m_pOpenFilePopup,SIGNAL(activated(int)),this,SLOT(openFilePopupActivated(int)));
+ connect(m_pOpenFilePopup,SIGNAL(triggered(QAction*)),this,SLOT(openFilePopupActivated(QAction*)));
}
m_pContextPopup->clear();
@@ -533,11 +533,13 @@ KviFileTransfer * FileTransferWindow::selectedTransfer()
return i->transfer();
}
-void FileTransferWindow::openFilePopupActivated(int id)
+void FileTransferWindow::openFilePopupActivated(QAction *pAction)
{
#ifdef COMPILE_KDE_SUPPORT
- int ip = m_pOpenFilePopup->itemParameter(id);
- if(ip < 0)return;
+ bool bOk=false;
+ int ip = pAction->data().toInt(bOk);
+ if(!bOk || ip < 0)
+ return;
KviFileTransfer * t = selectedTransfer();
if(!t)return;
diff --git a/src/modules/filetransferwindow/FileTransferWindow.h b/src/modules/filetransferwindow/FileTransferWindow.h
index fbf174248..2a6ed35c0 100644
--- a/src/modules/filetransferwindow/FileTransferWindow.h
+++ b/src/modules/filetransferwindow/FileTransferWindow.h
@@ -131,7 +131,7 @@ protected slots:
void openLocalFileWith();
void copyLocalFileToClipboard();
void openLocalFileFolder();
- void openFilePopupActivated(int id);
+ void openFilePopupActivated(QAction *pAction);
void openLocalFileTerminal();
void deleteLocalFile();
};