1 files changed, 19 insertions, 19 deletions

diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp
index 46e5220..bcb3666 100644
--- a/src/widgets/qpopupmenu.cpp
+++ b/src/widgets/qpopupmenu.cpp
@@ -631,7 +631,7 @@ void QPopupMenu::popup( const QPoint &pos, int indexAtPoint )
             h = height();
 	    if(indexAtPoint >= 0) { 
 		if(off_top) { //scroll to it
-		    register QMenuItem *mi = NULL;
+		    QMenuItem *mi = NULL;
 		    QMenuItemListIt it(*mitems);
 		    for(int tmp_y = 0; tmp_y < off_top && (mi=it.current()); ) {
 			QSize sz = style().sizeFromContents(QStyle::CT_PopupMenuItem, this,
@@ -794,7 +794,7 @@ void QPopupMenu::hilitSig( int id )
 void QPopupMenu::setFirstItemActive()
 {
     QMenuItemListIt it(*mitems);
-    register QMenuItem *mi;
+    QMenuItem *mi;
     int ai = 0;
     if(d->scroll.scrollable)
 	ai = d->scroll.topScrollableIndex;
@@ -817,7 +817,7 @@ void QPopupMenu::setFirstItemActive()
 
 void QPopupMenu::hideAllPopups()
 {
-    register QMenuData *top = this;		// find top level popup
+    QMenuData *top = this;		// find top level popup
     if ( !preventAnimation )
 	QTimer::singleShot( 10, this, SLOT(allowAnimation()) );
     preventAnimation = TRUE;
@@ -851,7 +851,7 @@ void QPopupMenu::hidePopups()
     preventAnimation = TRUE;
 
     QMenuItemListIt it(*mitems);
-    register QMenuItem *mi;
+    QMenuItem *mi;
     while ( (mi=it.current()) ) {
 	++it;
 	if ( mi->popup() && mi->popup()->parentMenu == this ) //avoid circularity
@@ -873,7 +873,7 @@ void QPopupMenu::hidePopups()
 
 bool QPopupMenu::tryMenuBar( QMouseEvent *e )
 {
-    register QMenuData *top = this;		// find top level
+    QMenuData *top = this;		// find top level
     while ( top->parentMenu )
 	top = top->parentMenu;
 #ifndef QT_NO_MENUBAR
@@ -909,7 +909,7 @@ bool QPopupMenu::tryMouseEvent( QPopupMenu *p, QMouseEvent * e)
 void QPopupMenu::byeMenuBar()
 {
 #ifndef QT_NO_MENUBAR
-    register QMenuData *top = this;		// find top level
+    QMenuData *top = this;		// find top level
     while ( top->parentMenu )
 	top = top->parentMenu;
 #endif
@@ -1075,7 +1075,7 @@ QSize QPopupMenu::updateSize(bool force_update, bool do_resize)
 	int height = 0;
 	int max_width = 0, max_height = 0;
 	QFontMetrics fm = fontMetrics();
-	register QMenuItem *mi;
+	QMenuItem *mi;
 	maxPMWidth = 0;
 	int maxWidgetWidth = 0;
 	tab = 0;
@@ -1258,7 +1258,7 @@ QSize QPopupMenu::updateSize(bool force_update, bool do_resize)
 void QPopupMenu::updateAccel( QWidget *parent )
 {
     QMenuItemListIt it(*mitems);
-    register QMenuItem *mi;
+    QMenuItem *mi;
 
     if ( parent ) {
 	delete autoaccel;
@@ -1349,7 +1349,7 @@ void QPopupMenu::enableAccel( bool enable )
 	autoaccel->setEnabled( enable );
     accelDisabled = !enable;		// rememeber when updateAccel
     QMenuItemListIt it(*mitems);
-    register QMenuItem *mi;
+    QMenuItem *mi;
     while ( (mi=it.current()) ) {		// do the same for sub popups
 	++it;
 	if ( mi->popup() )			// call recursively
@@ -1651,7 +1651,7 @@ void QPopupMenu::mousePressEvent( QMouseEvent *e )
 	}
 	return;
     }
-    register QMenuItem *mi = mitems->at(item);
+    QMenuItem *mi = mitems->at(item);
     if ( item != actItem )			// new item activated
 	setActiveItem( item );
 
@@ -1702,7 +1702,7 @@ void QPopupMenu::mouseReleaseEvent( QMouseEvent *e )
 	else
 	    byeMenuBar();
     } else {	// selected menu item!
-	register QMenuItem *mi = mitems->at(actItem);
+	QMenuItem *mi = mitems->at(actItem);
 	if ( mi ->widget() ) {
 	    QWidget* widgetAt = QApplication::widgetAt( e->globalPos(), TRUE );
 	    if ( widgetAt && widgetAt != this ) {
@@ -1815,7 +1815,7 @@ void QPopupMenu::mouseMoveEvent( QMouseEvent *e )
 	if ( (e->state() & Qt::MouseButtonMask) && !mouseBtDn )
 	    mouseBtDn = TRUE; // so mouseReleaseEvent will pop down
 
-	register QMenuItem *mi = mitems->at( item );
+	QMenuItem *mi = mitems->at( item );
 
 	if ( mi->widget() ) {
 	    QWidget* widgetAt = QApplication::widgetAt( e->globalPos(), TRUE );
@@ -2034,7 +2034,7 @@ void QPopupMenu::keyPressEvent( QKeyEvent *e )
 	QMenuItem* currentSelected = 0;
 	QMenuItem* firstAfterCurrent = 0;
 
-	register QMenuItem *m;
+	QMenuItem *m;
 	mi = 0;
 	int indx = 0;
 	int clashCount = 0;
@@ -2101,7 +2101,7 @@ void QPopupMenu::keyPressEvent( QKeyEvent *e )
     }
 #ifndef QT_NO_MENUBAR
     if ( !ok_key ) {				// send to menu bar
-	register QMenuData *top = this;		// find top level
+	QMenuData *top = this;		// find top level
 	while ( top->parentMenu )
 	    top = top->parentMenu;
 	if ( top->isMenuBar ) {
@@ -2118,7 +2118,7 @@ void QPopupMenu::keyPressEvent( QKeyEvent *e )
 	} else if ( dy < 0 ) {
 	    QMenuItemListIt it(*mitems);
 	    it.toLast();
-	    register QMenuItem *mi;
+	    QMenuItem *mi;
 	    int ai = count() - 1;
 	    while ( (mi=it.current()) ) {
 		--it;
@@ -2134,7 +2134,7 @@ void QPopupMenu::keyPressEvent( QKeyEvent *e )
     }
 
     if ( dy ) {				// highlight next/prev
-	register int i = actItem;
+	int i = actItem;
 	int c = mitems->count();
 	for(int n = c; n; n--) {
 	    i = i + dy;
@@ -2520,7 +2520,7 @@ void QPopupMenu::connectModal( QPopupMenu* receiver, bool doConnect )
 		    receiver, SLOT(modalActivation(int)) );
 
     QMenuItemListIt it(*mitems);
-    register QMenuItem *mi;
+    QMenuItem *mi;
     while ( (mi=it.current()) ) {
 	++it;
 	if ( mi->popup() && mi->popup() != receiver
@@ -2641,12 +2641,12 @@ bool QPopupMenu::customWhatsThis() const
  */
 bool QPopupMenu::focusNextPrevChild( bool next )
 {
-    register QMenuItem *mi;
+    QMenuItem *mi;
     int dy = next? 1 : -1;
     if ( dy && actItem < 0 ) {
 	setFirstItemActive();
     } else if ( dy ) {				// highlight next/prev
-	register int i = actItem;
+	int i = actItem;
 	int c = mitems->count();
 	int n = c;
 	while ( n-- ) {