Diffstat (limited to 'korganizer/koeventpopupmenu.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | korganizer/koeventpopupmenu.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp index fc4d9a4..81047c1 100644 --- a/korganizer/koeventpopupmenu.cpp +++ b/korganizer/koeventpopupmenu.cpp | |||
@@ -23,4 +23,7 @@ | |||
23 | 23 | ||
24 | #include <qcursor.h> | 24 | #include <qcursor.h> |
25 | //Added by qt3to4: | ||
26 | #include <Q3ValueList> | ||
27 | #include <Q3PopupMenu> | ||
25 | 28 | ||
26 | #include <klocale.h> | 29 | #include <klocale.h> |
@@ -33,5 +36,5 @@ | |||
33 | #include "koprefs.h" | 36 | #include "koprefs.h" |
34 | 37 | ||
35 | KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu() | 38 | KOEventPopupMenu::KOEventPopupMenu(): Q3PopupMenu() |
36 | { | 39 | { |
37 | mCurrentIncidence = 0; | 40 | mCurrentIncidence = 0; |
@@ -54,9 +57,9 @@ KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu() | |||
54 | this,SLOT(popupCancel()))); | 57 | this,SLOT(popupCancel()))); |
55 | isDisabled = false; | 58 | isDisabled = false; |
56 | mCatPopup = new QPopupMenu ( this ); | 59 | mCatPopup = new Q3PopupMenu ( this ); |
57 | mCatPopup->setCheckable (true); | 60 | mCatPopup->setCheckable (true); |
58 | connect(mCatPopup,SIGNAL( aboutToShow ()), this ,SLOT( fillCatPopup())); | 61 | connect(mCatPopup,SIGNAL( aboutToShow ()), this ,SLOT( fillCatPopup())); |
59 | connect(mCatPopup,SIGNAL( activated ( int ) ), this ,SLOT( computeCatPopup( int ))); | 62 | connect(mCatPopup,SIGNAL( activated ( int ) ), this ,SLOT( computeCatPopup( int ))); |
60 | mCalPopup = new QPopupMenu ( this ); | 63 | mCalPopup = new Q3PopupMenu ( this ); |
61 | mCalPopup->setCheckable (true); | 64 | mCalPopup->setCheckable (true); |
62 | connect(mCalPopup,SIGNAL( aboutToShow ()), this ,SLOT( fillCalPopup())); | 65 | connect(mCalPopup,SIGNAL( aboutToShow ()), this ,SLOT( fillCalPopup())); |
@@ -66,5 +69,5 @@ KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu() | |||
66 | insertItem (i18n("Categories"),mCatPopup ); | 69 | insertItem (i18n("Categories"),mCatPopup ); |
67 | insertItem (i18n("Calendar"),mCalPopup ); | 70 | insertItem (i18n("Calendar"),mCalPopup ); |
68 | QValueList<int>::Iterator it; | 71 | Q3ValueList<int>::Iterator it; |
69 | for( it = mEditOnlyItems.begin(); it != mEditOnlyItems.end(); ++it ) { | 72 | for( it = mEditOnlyItems.begin(); it != mEditOnlyItems.end(); ++it ) { |
70 | mSingleOnlyItems.append(*it); | 73 | mSingleOnlyItems.append(*it); |
@@ -75,5 +78,5 @@ void KOEventPopupMenu::enableDefault( bool enable ) | |||
75 | { | 78 | { |
76 | isDisabled = !enable; | 79 | isDisabled = !enable; |
77 | QValueList<int>::Iterator it; | 80 | Q3ValueList<int>::Iterator it; |
78 | for( it = mSingleOnlyItems.begin(); it != mSingleOnlyItems.end(); ++it ) { | 81 | for( it = mSingleOnlyItems.begin(); it != mSingleOnlyItems.end(); ++it ) { |
79 | setItemEnabled(*it,enable); | 82 | setItemEnabled(*it,enable); |
@@ -147,5 +150,5 @@ void KOEventPopupMenu::showIncidencePopup(Incidence *incidence) | |||
147 | // Enable/Disabled menu items only valid for editable events. | 150 | // Enable/Disabled menu items only valid for editable events. |
148 | if ( !isDisabled ) { | 151 | if ( !isDisabled ) { |
149 | QValueList<int>::Iterator it; | 152 | Q3ValueList<int>::Iterator it; |
150 | for( it = mEditOnlyItems.begin(); it != mEditOnlyItems.end(); ++it ) { | 153 | for( it = mEditOnlyItems.begin(); it != mEditOnlyItems.end(); ++it ) { |
151 | setItemEnabled(*it,!mCurrentIncidence->isReadOnly()); | 154 | setItemEnabled(*it,!mCurrentIncidence->isReadOnly()); |
@@ -156,5 +159,5 @@ void KOEventPopupMenu::showIncidencePopup(Incidence *incidence) | |||
156 | } | 159 | } |
157 | 160 | ||
158 | void KOEventPopupMenu::addAdditionalItem(const QIconSet &icon,const QString &text, | 161 | void KOEventPopupMenu::addAdditionalItem(const QIcon &icon,const QString &text, |
159 | const QObject *receiver, const char *member, | 162 | const QObject *receiver, const char *member, |
160 | bool editOnly) | 163 | bool editOnly) |