Mercurial > hg > easyhg-kdiff3
diff kdiff3/src/kreplacements/ShellContextMenu.cpp @ 70:5bbfe4784324
KDiff3 0.9.89 for Qt4
| author | joachim99 |
|---|---|
| date | Tue, 18 Apr 2006 20:19:57 +0000 |
| parents | 8febbfb1148c |
| children |
line wrap: on
line diff
--- a/kdiff3/src/kreplacements/ShellContextMenu.cpp Mon Apr 10 08:40:51 2006 +0000 +++ b/kdiff3/src/kreplacements/ShellContextMenu.cpp Tue Apr 18 20:19:57 2006 +0000 @@ -9,7 +9,7 @@ #include <qstringlist.h> #include <qwidget.h> #include <qdir.h> -#include <qpopupmenu.h> +#include <QMenu> #include "ShellContextMenu.h" #ifdef _DEBUG @@ -26,7 +26,7 @@ #define MAX_ID 10000 -void showShellContextMenu( const QString& itemPath, QPoint pt, QWidget* pParentWidget, QPopupMenu* pMenu ) +void showShellContextMenu( const QString& itemPath, QPoint pt, QWidget* pParentWidget, QMenu* pMenu ) { CShellContextMenu scm; scm.SetObjects(QDir::convertSeparators(itemPath)); @@ -127,7 +127,7 @@ } -UINT CShellContextMenu::ShowContextMenu(QWidget * pParentWidget, QPoint pt, QPopupMenu* pMenu ) +UINT CShellContextMenu::ShowContextMenu(QWidget * pParentWidget, QPoint pt, QMenu* pMenu ) { HWND hWnd = pParentWidget->winId(); int iMenuType = 0; // to know which version of IContextMenu is supported