initial public commit of qt4 portp1

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
@@ -22,6 +22,9 @@
 */
 
 #include <qcursor.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3PopupMenu>
 
 #include <klocale.h>
 #include <kdebug.h>
@@ -32,7 +35,7 @@
 #include "koeventpopupmenu.h"
 #include "koprefs.h"
 
-KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu()
+KOEventPopupMenu::KOEventPopupMenu(): Q3PopupMenu()
 {
     mCurrentIncidence = 0;
     mHasAdditionalItems = false;
@@ -53,11 +56,11 @@ KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu()
     mEditOnlyItems.append(insertItem (i18n("&Toggle Cancel"),
                                       this,SLOT(popupCancel())));
     isDisabled = false;  
-    mCatPopup = new QPopupMenu ( this );
+    mCatPopup = new Q3PopupMenu ( this );
     mCatPopup->setCheckable (true);
     connect(mCatPopup,SIGNAL( aboutToShow ()), this ,SLOT( fillCatPopup()));
     connect(mCatPopup,SIGNAL(  activated ( int ) ), this ,SLOT( computeCatPopup( int )));
-    mCalPopup = new QPopupMenu ( this );
+    mCalPopup = new Q3PopupMenu ( this );
     mCalPopup->setCheckable (true);
     connect(mCalPopup,SIGNAL( aboutToShow ()), this ,SLOT( fillCalPopup()));
     connect(mCalPopup,SIGNAL(  activated ( int ) ), this ,SLOT( computeCalPopup( int )));
@@ -65,7 +68,7 @@ KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu()
     //mEditOnlyItems.append(insertItem (i18n("Calendar"),mCalPopup ));
     insertItem (i18n("Categories"),mCatPopup );
     insertItem (i18n("Calendar"),mCalPopup );
-    QValueList<int>::Iterator it;
+    Q3ValueList<int>::Iterator it;
     for( it = mEditOnlyItems.begin(); it != mEditOnlyItems.end(); ++it ) {
         mSingleOnlyItems.append(*it);
     }
@@ -74,7 +77,7 @@ KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu()
 void KOEventPopupMenu::enableDefault( bool enable )
 {
     isDisabled = !enable;
-    QValueList<int>::Iterator it;
+    Q3ValueList<int>::Iterator it;
     for( it = mSingleOnlyItems.begin(); it != mSingleOnlyItems.end(); ++it ) {
         setItemEnabled(*it,enable);
     }
@@ -146,7 +149,7 @@ void KOEventPopupMenu::showIncidencePopup(Incidence *incidence)
     if (mCurrentIncidence) {
         // Enable/Disabled menu items only valid for editable events.
         if ( !isDisabled  ) {
-            QValueList<int>::Iterator it;
+            Q3ValueList<int>::Iterator it;
             for( it = mEditOnlyItems.begin(); it != mEditOnlyItems.end(); ++it ) {
                 setItemEnabled(*it,!mCurrentIncidence->isReadOnly());
             }
@@ -155,7 +158,7 @@ void KOEventPopupMenu::showIncidencePopup(Incidence *incidence)
     }
 }
 
-void KOEventPopupMenu::addAdditionalItem(const QIconSet &icon,const QString &text,
+void KOEventPopupMenu::addAdditionalItem(const QIcon &icon,const QString &text,
                                          const QObject *receiver, const char *member,
                                          bool editOnly)
 {