1 files changed, 56 insertions, 55 deletions

diff --git a/microkde/kdeui/kactionclasses.cpp b/microkde/kdeui/kactionclasses.cpp
index 82e6c8b..c611865 100644
--- a/microkde/kdeui/kactionclasses.cpp
+++ b/microkde/kdeui/kactionclasses.cpp
@@ -28,9 +28,11 @@
 #include <assert.h>
 
 #include <qfontdatabase.h>
-#include <qobjectlist.h>
+#include <qobject.h>
 //US#include <qwhatsthis.h>
 #include <qtimer.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 //US#include <kaccel.h>
 //US#include <kapplication.h>
@@ -48,13 +50,13 @@
 //US added the following includefiles
 #include <kconfigbase.h>
 #include <qwidget.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qmenubar.h>
-#include <qmainwindow.h>
-#include <qtoolbar.h>
+#include <q3mainwindow.h>
+#include <q3toolbar.h>
 #include <qcombobox.h>
-#include <qmainwindow.h>
-
+#include <q3mainwindow.h>
+#include <qcoreapplication.h>
 
 static QFontDatabase *fontDataBase = 0;
 
@@ -83,7 +85,7 @@ static void get_fonts( QStringList &lst )
     lst.sort();
 }
 
-static QValueList<int> get_standard_font_sizes()
+static Q3ValueList<int> get_standard_font_sizes()
 {
     if ( !fontDataBase ) {
         fontDataBase = new QFontDatabase();
@@ -120,7 +122,7 @@ KToggleAction::KToggleAction( const QString& text, const KShortcut& cut,
   d = new KToggleActionPrivate;
 }
 
-KToggleAction::KToggleAction( const QString& text, const QIconSet& pix,
+KToggleAction::KToggleAction( const QString& text, const QIcon& pix,
                               const KShortcut& cut,
                               QObject* parent, const char* name )
   : KAction( text, pix, cut, parent, name )
@@ -136,7 +138,7 @@ KToggleAction::KToggleAction( const QString& text, const QString& pix,
   d = new KToggleActionPrivate;
 }
 
-KToggleAction::KToggleAction( const QString& text, const QIconSet& pix,
+KToggleAction::KToggleAction( const QString& text, const QIcon& pix,
                               const KShortcut& cut,
                               const QObject* receiver,
                               const char* slot, QObject* parent,
@@ -169,7 +171,7 @@ KToggleAction::~KToggleAction()
 
 int KToggleAction::plug( QWidget* widget, int index )
 {
-  if ( !widget->inherits("QPopupMenu") && !widget->inherits("KToolBar") )
+  if ( !widget->inherits("Q3PopupMenu") && !widget->inherits("KToolBar") )
   {
     kdWarning() << "Can not plug KToggleAction in " << widget->className() << endl;
     return -1;
@@ -184,11 +186,11 @@ int KToggleAction::plug( QWidget* widget, int index )
   if ( _index == -1 )
     return _index;
 
-  if ( widget->inherits("QPopupMenu") )
+  if ( widget->inherits("Q3PopupMenu") )
   {
     int id = itemId( _index );
     
-    static_cast<QPopupMenu*>(widget)->setItemChecked( id, d->m_checked );
+    static_cast<Q3PopupMenu*>(widget)->setItemChecked( id, d->m_checked );
   } else if ( widget->inherits( "KToolBar" ) ) {
 
     KToolBar *bar = static_cast<KToolBar *>( widget );
@@ -214,13 +216,12 @@ void KToggleAction::setChecked( bool c )
     updateChecked( i );
 
   if ( c && parent() && !exclusiveGroup().isEmpty() ) {
-    const QObjectList *list = parent()->children();
-    if ( list ) {
-      QObjectListIt it( *list );
-      for( ; it.current(); ++it ) {
-        if ( it.current()->inherits( "KToggleAction" ) && it.current() != this &&
-            static_cast<KToggleAction*>(it.current())->exclusiveGroup() == exclusiveGroup() ) {
-          KToggleAction *a = static_cast<KToggleAction*>(it.current());
+    const QObjectList list = parent()->children();
+    if ( !list.empty() ) {
+      for(QObjectList::const_iterator it=list.begin();it!=list.end();++it) {
+        if ( (*it)->inherits( "KToggleAction" ) && (*it) != this &&
+            static_cast<KToggleAction*>((*it))->exclusiveGroup() == exclusiveGroup() ) {
+          KToggleAction *a = static_cast<KToggleAction*>(*it);
           if( a->isChecked() ) {
             a->setChecked( false );
             emit a->toggled( false );
@@ -235,8 +236,8 @@ void KToggleAction::updateChecked( int id )
 {
   QWidget *w = container( id );
 
-  if ( w->inherits( "QPopupMenu" ) )
-    static_cast<QPopupMenu*>(w)->setItemChecked( itemId( id ), d->m_checked );
+  if ( w->inherits( "Q3PopupMenu" ) )
+    static_cast<Q3PopupMenu*>(w)->setItemChecked( itemId( id ), d->m_checked );
   else if ( w->inherits( "QMenuBar" ) )
     static_cast<QMenuBar*>(w)->setItemChecked( itemId( id ), d->m_checked );
   else if ( w->inherits( "KToolBar" ) )
@@ -283,7 +284,7 @@ KRadioAction::KRadioAction( const QString& text, const KShortcut& cut,
 {
 }
 
-KRadioAction::KRadioAction( const QString& text, const QIconSet& pix,
+KRadioAction::KRadioAction( const QString& text, const QIcon& pix,
                             const KShortcut& cut,
                             QObject* parent, const char* name )
 : KToggleAction( text, pix, cut, parent, name )
@@ -297,7 +298,7 @@ KRadioAction::KRadioAction( const QString& text, const QString& pix,
 {
 }
 
-KRadioAction::KRadioAction( const QString& text, const QIconSet& pix,
+KRadioAction::KRadioAction( const QString& text, const QIcon& pix,
                             const KShortcut& cut,
                             const QObject* receiver, const char* slot,
                             QObject* parent, const char* name )
@@ -349,7 +350,7 @@ public:
   }
   bool m_edit;
   bool m_menuAccelsEnabled;
-  QPopupMenu *m_menu;
+  Q3PopupMenu *m_menu;
   int m_current;
   int m_comboWidth;
   QStringList m_list;
@@ -387,7 +388,7 @@ KSelectAction::KSelectAction( const QString& text, const KShortcut& cut,
   d = new KSelectActionPrivate;
 }
 
-KSelectAction::KSelectAction( const QString& text, const QIconSet& pix,
+KSelectAction::KSelectAction( const QString& text, const QIcon& pix,
                               const KShortcut& cut,
                               QObject* parent, const char* name )
   : KAction( text, pix, cut, parent, name )
@@ -403,7 +404,7 @@ KSelectAction::KSelectAction( const QString& text, const QString& pix,
   d = new KSelectActionPrivate;
 }
 
-KSelectAction::KSelectAction( const QString& text, const QIconSet& pix,
+KSelectAction::KSelectAction( const QString& text, const QIcon& pix,
                               const KShortcut& cut,
                               const QObject* receiver,
                               const char* slot, QObject* parent,
@@ -439,7 +440,7 @@ KSelectAction::~KSelectAction()
 void KSelectAction::setCurrentItem( int id )
 {
     if ( id >= (int)d->m_list.count() ) {
-        ASSERT(id < (int)d->m_list.count());
+        Q_ASSERT(id < (int)d->m_list.count());
         return;
     }
 
@@ -479,13 +480,13 @@ void KSelectAction::setComboWidth( int width )
     updateComboWidth( i );
 
 }
-QPopupMenu* KSelectAction::popupMenu() const
+Q3PopupMenu* KSelectAction::popupMenu() const
 {
         kdDebug(129) << "KSelectAction::popupMenu()" << endl; // remove -- ellis
   if ( !d->m_menu )
   {
 //US    d->m_menu = new KPopupMenu(0L, "KSelectAction::popupMenu()");
-    d->m_menu = new QPopupMenu(0L, "QSelectAction::popupMenu()");
+    d->m_menu = new Q3PopupMenu(0L, "QSelectAction::popupMenu()");
     setupMenu();
     if ( d->m_current >= 0 )
       d->m_menu->setItemChecked( d->m_current, true );
@@ -643,12 +644,12 @@ int KSelectAction::plug( QWidget *widget, int index )
 //US    return -1;
   
   kdDebug(129) << "KAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
-  if ( widget->inherits("QPopupMenu") )
+  if ( widget->inherits("Q3PopupMenu") )
   {
     // Create the PopupMenu and store it in m_menu
     (void)popupMenu();
 
-    QPopupMenu* menu = static_cast<QPopupMenu*>( widget );
+    Q3PopupMenu* menu = static_cast<Q3PopupMenu*>( widget );
     int id;
     
     if ( hasIconSet() )
@@ -682,7 +683,7 @@ int KSelectAction::plug( QWidget *widget, int index )
     if ( cb )
     {
          cb->setMaximumHeight( 34 );
-      if (!isEditable()) cb->setFocusPolicy(QWidget::NoFocus);
+      if (!isEditable()) cb->setFocusPolicy(Qt::NoFocus);
       cb->setMinimumWidth( cb->sizeHint().width() );
       if ( d->m_comboWidth > 0 )
       {
@@ -852,7 +853,7 @@ KListAction::KListAction( const QString& text, const KShortcut& cut,
     connect( this, SIGNAL( activated( int ) ), receiver, slot );
 }
 
-KListAction::KListAction( const QString& text, const QIconSet& pix,
+KListAction::KListAction( const QString& text, const QIcon& pix,
                           const KShortcut& cut,
                           QObject* parent, const char* name )
   : KSelectAction( text, pix, cut, parent, name )
@@ -868,7 +869,7 @@ KListAction::KListAction( const QString& text, const QString& pix,
   d = new KListActionPrivate;
 }
 
-KListAction::KListAction( const QString& text, const QIconSet& pix,
+KListAction::KListAction( const QString& text, const QIcon& pix,
                           const KShortcut& cut, const QObject* receiver,
                           const char* slot, QObject* parent,
                           const char* name )
@@ -965,7 +966,7 @@ KRecentFilesAction::KRecentFilesAction( const QString& text,
 }
 
 KRecentFilesAction::KRecentFilesAction( const QString& text,
-                                        const QIconSet& pix,
+                                        const QIcon& pix,
                                         const KShortcut& cut,
                                         QObject* parent, const char* name,
                                         uint maxItems )
@@ -991,7 +992,7 @@ KRecentFilesAction::KRecentFilesAction( const QString& text,
 }
 
 KRecentFilesAction::KRecentFilesAction( const QString& text,
-                                        const QIconSet& pix,
+                                        const QIcon& pix,
                                         const KShortcut& cut,
                                         const QObject* receiver,
                                         const char* slot,
@@ -1201,7 +1202,7 @@ KFontAction::KFontAction( const QString& text, const KShortcut& cut,
     setEditable( true );
 }
 
-KFontAction::KFontAction( const QString& text, const QIconSet& pix,
+KFontAction::KFontAction( const QString& text, const QIcon& pix,
                           const KShortcut& cut,
                           QObject* parent, const char* name )
     : KSelectAction( text, pix, cut, parent, name )
@@ -1223,7 +1224,7 @@ KFontAction::KFontAction( const QString& text, const QString& pix,
     setEditable( true );
 }
 
-KFontAction::KFontAction( const QString& text, const QIconSet& pix,
+KFontAction::KFontAction( const QString& text, const QIcon& pix,
                           const KShortcut& cut,
                           const QObject* receiver, const char* slot,
                           QObject* parent, const char* name )
@@ -1361,7 +1362,7 @@ KFontSizeAction::KFontSizeAction( const QString& text,
   init();
 }
 
-KFontSizeAction::KFontSizeAction( const QString& text, const QIconSet& pix,
+KFontSizeAction::KFontSizeAction( const QString& text, const QIcon& pix,
                                   const KShortcut& cut,
                                   QObject* parent, const char* name )
   : KSelectAction( text, pix, cut, parent, name )
@@ -1377,7 +1378,7 @@ KFontSizeAction::KFontSizeAction( const QString& text, const QString& pix,
   init();
 }
 
-KFontSizeAction::KFontSizeAction( const QString& text, const QIconSet& pix,
+KFontSizeAction::KFontSizeAction( const QString& text, const QIcon& pix,
                                   const KShortcut& cut,
                                   const QObject* receiver,
                                   const char* slot, QObject* parent,
@@ -1414,9 +1415,9 @@ void KFontSizeAction::init()
     d = new KFontSizeActionPrivate;
 
     setEditable( true );
-    QValueList<int> sizes = get_standard_font_sizes();
+    Q3ValueList<int> sizes = get_standard_font_sizes();
     QStringList lst;
-    for ( QValueList<int>::Iterator it = sizes.begin(); it != sizes.end(); ++it )
+    for ( Q3ValueList<int>::Iterator it = sizes.begin(); it != sizes.end(); ++it )
         lst.append( QString::number( *it ) );
 
     setItems( lst );
@@ -1437,7 +1438,7 @@ void KFontSizeAction::setFontSize( int size )
     int index = items().findIndex( QString::number( size ) );
     if ( index == -1 ) {
         // Insert at the correct position in the list (to keep sorting)
-        QValueList<int> lst;
+        Q3ValueList<int> lst;
         // Convert to list of ints
         QStringList itemsList = items();
         for (QStringList::Iterator it = itemsList.begin() ; it != itemsList.end() ; ++it)
@@ -1450,7 +1451,7 @@ qDebug("KFontSizeAction::setFontSize heapsort not found.");
 //US        qHeapSort( lst );
         // Convert back to string list
         QStringList strLst;
-        for (QValueList<int>::Iterator it = lst.begin() ; it != lst.end() ; ++it)
+        for (Q3ValueList<int>::Iterator it = lst.begin() ; it != lst.end() ; ++it)
             strLst.append( QString::number(*it) );
         KSelectAction::setItems( strLst );
         // Find new current item
@@ -1492,7 +1493,7 @@ public:
   KActionMenuPrivate()
   {
 //US    m_popup = new KPopupMenu(0L,"KActionMenu::KActionMenuPrivate");
-    m_popup = new QPopupMenu(0L,"KActionMenu::KActionMenuPrivate");
+    m_popup = new Q3PopupMenu(0L,"KActionMenu::KActionMenuPrivate");
     m_delayed = true;
     m_stickyMenu = true;
   }
@@ -1502,7 +1503,7 @@ public:
   }
   
 //US  KPopupMenu *m_popup;
-  QPopupMenu *m_popup;
+  Q3PopupMenu *m_popup;
   bool m_delayed;
   bool m_stickyMenu;
 };
@@ -1522,7 +1523,7 @@ KActionMenu::KActionMenu( const QString& text, QObject* parent,
   setShortcutConfigurable( false );
 }
 
-KActionMenu::KActionMenu( const QString& text, const QIconSet& icon,
+KActionMenu::KActionMenu( const QString& text, const QIcon& icon,
                           QObject* parent, const char* name )
   : KAction( text, icon, 0, parent, name )
 {
@@ -1552,7 +1553,7 @@ void KActionMenu::popup( const QPoint& global )
 
 
 //US KPopupMenu* KActionMenu::popupMenu() const
-QPopupMenu* KActionMenu::popupMenu() const
+Q3PopupMenu* KActionMenu::popupMenu() const
 {
   return d->m_popup;
 }
@@ -1592,9 +1593,9 @@ int KActionMenu::plug( QWidget* widget, int index )
     return -1;
 */    
   kdDebug(129) << "KAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
-  if ( widget->inherits("QPopupMenu") )
+  if ( widget->inherits("Q3PopupMenu") )
   {
-    QPopupMenu* menu = static_cast<QPopupMenu*>( widget );
+    Q3PopupMenu* menu = static_cast<Q3PopupMenu*>( widget );
     int id;
     if ( hasIconSet() )
       id = menu->insertItem( iconSet(), text(), d->m_popup, -1, index );
@@ -1781,12 +1782,12 @@ int KToolBarPopupAction::plug( QWidget *widget, int index )
 }
 
 //US KPopupMenu *KToolBarPopupAction::popupMenu() const
-QPopupMenu *KToolBarPopupAction::popupMenu() const
+Q3PopupMenu *KToolBarPopupAction::popupMenu() const
 {
     if ( !m_popup ) {
         KToolBarPopupAction *that = const_cast<KToolBarPopupAction*>(this);
 //US        that->m_popup = new KPopupMenu;
-        that->m_popup = new QPopupMenu;
+        that->m_popup = new Q3PopupMenu;
     }
     return m_popup;
 }
@@ -1953,7 +1954,7 @@ void KWidgetAction::slotToolbarDestroyed()
 {
   //Q_ASSERT( m_widget ); // When exiting the app the widget could be destroyed before the toolbar.
 
-  ASSERT( isPlugged() );
+  Q_ASSERT( isPlugged() );
   if( !m_widget || !isPlugged() )
     return;
 
@@ -1974,9 +1975,9 @@ KActionSeparator::~KActionSeparator()
 
 int KActionSeparator::plug( QWidget *widget, int index )
 {
-  if ( widget->inherits("QPopupMenu") )
+  if ( widget->inherits("Q3PopupMenu") )
   {
-    QPopupMenu* menu = static_cast<QPopupMenu*>( widget );
+    Q3PopupMenu* menu = static_cast<Q3PopupMenu*>( widget );
 
     int id = menu->insertSeparator( index );