aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
authorGravatar Fabio Bas2012-02-27 12:36:14 +0000
committerGravatar Fabio Bas2012-02-27 12:36:14 +0000
commit28ace5fca13b022ea2acb7658cb412f6c79a771a (patch)
tree8a6c6c8ec69d0fb633b8b8cff11a0ab79e095816 /src/modules
parentfixed window activation from "window" menu: it was not respecting mdi maximiz... (diff)
downloadKVIrc-28ace5fca13b022ea2acb7658cb412f6c79a771a.tar.gz
KVIrc-28ace5fca13b022ea2acb7658cb412f6c79a771a.tar.bz2
KVIrc-28ace5fca13b022ea2acb7658cb412f6c79a771a.zip
fixed compilation under win32
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6076 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/filetransferwindow/FileTransferWindow.cpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp
index 2693e39f7..44c7af243 100644
--- a/src/modules/filetransferwindow/FileTransferWindow.cpp
+++ b/src/modules/filetransferwindow/FileTransferWindow.cpp
@@ -436,29 +436,28 @@ void FileTransferWindow::rightButtonPressed(FileTransferItem *it,const QPoint &p
QString mimetype = KMimeType::findByPath(szFile)->name();
KService::List offers = KMimeTypeTrader::self()->query(mimetype,"Application");
- id = m_pLocalFilePopup->addAction(__tr2qs_ctx("&Open","filetransferwindow"),this,SLOT(openLocalFile()));
- m_pLocalFilePopup->setItemParameter(id,-1);
+ pAction = m_pLocalFilePopup->addAction(__tr2qs_ctx("&Open","filetransferwindow"),this,SLOT(openLocalFile()));
+ pAction->setData(-1);
m_pOpenFilePopup->clear();
- int id;
int idx = 0;
for(KService::List::Iterator itOffers = offers.begin();
itOffers != offers.end(); ++itOffers)
{
- id = m_pOpenFilePopup->addAction(
+ pAction = m_pOpenFilePopup->addAction(
SmallIcon((*itOffers).data()->icon()),
(*itOffers).data()->name()
);
- m_pOpenFilePopup->setItemParameter(id,idx);
+ pAction->setData(idx);
idx++;
}
m_pOpenFilePopup->addSeparator();
- id = m_pOpenFilePopup->addAction(__tr2qs_ctx("&Other...","filetransferwindow"),this,SLOT(openLocalFileWith()));
- m_pOpenFilePopup->setItemParameter(id,-1);
+ pAction = m_pOpenFilePopup->addAction(__tr2qs_ctx("&Other...","filetransferwindow"),this,SLOT(openLocalFileWith()));
+ pAction->setData(-1);
m_pLocalFilePopup->addAction(__tr2qs_ctx("Open &With","filetransferwindow"),m_pOpenFilePopup);
m_pLocalFilePopup->addSeparator();
@@ -469,8 +468,8 @@ void FileTransferWindow::rightButtonPressed(FileTransferItem *it,const QPoint &p
//-| Grifisx & Noldor |-
#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
- id = m_pLocalFilePopup->addAction(__tr2qs_ctx("&Open","filetransferwindow"),this,SLOT(openLocalFile()));
- m_pLocalFilePopup->setItemParameter(id,-1);
+ pAction = m_pLocalFilePopup->addAction(__tr2qs_ctx("&Open","filetransferwindow"),this,SLOT(openLocalFile()));
+ pAction->setData(-1);
m_pOpenFilePopup->addSeparator();
m_pLocalFilePopup->addAction(__tr2qs_ctx("Open &With","filetransferwindow"),this,SLOT(openLocalFileWith()));
m_pLocalFilePopup->addSeparator();