summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/qaction.cpp2
-rw-r--r--src/widgets/qbuttongroup.cpp6
-rw-r--r--src/widgets/qlcdnumber.cpp2
-rw-r--r--src/widgets/qmenubar.cpp8
-rw-r--r--src/widgets/qmenudata.cpp8
-rw-r--r--src/widgets/qpopupmenu.cpp38
6 files changed, 32 insertions, 32 deletions
diff --git a/src/widgets/qaction.cpp b/src/widgets/qaction.cpp
index 3dd6b27..3f58a88 100644
--- a/src/widgets/qaction.cpp
+++ b/src/widgets/qaction.cpp
@@ -597,7 +597,7 @@ QAction::~QAction()
*/
void QAction::setIconSet( const QIconSet& icon )
{
- register QIconSet *i = d->iconset;
+ QIconSet *i = d->iconset;
if ( !icon.isNull() )
d->iconset = new QIconSet( icon );
else
diff --git a/src/widgets/qbuttongroup.cpp b/src/widgets/qbuttongroup.cpp
index 8737804..c2d7e2e 100644
--- a/src/widgets/qbuttongroup.cpp
+++ b/src/widgets/qbuttongroup.cpp
@@ -371,7 +371,7 @@ void QButtonGroup::buttonPressed()
// introduce a QButtonListIt if calling anything
int id = -1;
QButton *bt = (QButton *)sender(); // object that sent the signal
- for ( register QButtonItem *i=buttons->first(); i; i=buttons->next() )
+ for ( QButtonItem *i=buttons->first(); i; i=buttons->next() )
if ( bt == i->button ) { // button was clicked
id = i->id;
break;
@@ -391,7 +391,7 @@ void QButtonGroup::buttonReleased()
// introduce a QButtonListIt if calling anything
int id = -1;
QButton *bt = (QButton *)sender(); // object that sent the signal
- for ( register QButtonItem *i=buttons->first(); i; i=buttons->next() )
+ for ( QButtonItem *i=buttons->first(); i; i=buttons->next() )
if ( bt == i->button ) { // button was clicked
id = i->id;
break;
@@ -414,7 +414,7 @@ void QButtonGroup::buttonClicked()
#if defined(QT_CHECK_NULL)
Q_ASSERT( bt );
#endif
- for ( register QButtonItem *i=buttons->first(); i; i=buttons->next() ) {
+ for ( QButtonItem *i=buttons->first(); i; i=buttons->next() ) {
if ( bt == i->button ) { // button was clicked
id = i->id;
break;
diff --git a/src/widgets/qlcdnumber.cpp b/src/widgets/qlcdnumber.cpp
index 4398907..76e9288 100644
--- a/src/widgets/qlcdnumber.cpp
+++ b/src/widgets/qlcdnumber.cpp
@@ -396,7 +396,7 @@ void QLCDNumber::setNumDigits( int numDigits )
bool doDisplay = ndigits == 0;
if ( numDigits == ndigits ) // no change
return;
- register int i;
+ int i;
int dif;
if ( numDigits > ndigits ) { // expand
dif = numDigits - ndigits;
diff --git a/src/widgets/qmenubar.cpp b/src/widgets/qmenubar.cpp
index e832fd4..2d158ad 100644
--- a/src/widgets/qmenubar.cpp
+++ b/src/widgets/qmenubar.cpp
@@ -785,7 +785,7 @@ void QMenuBar::hidePopups()
bool anyVisible = FALSE;
#endif
QMenuItemListIt it(*mitems);
- register QMenuItem *mi;
+ QMenuItem *mi;
while ( (mi=it.current()) ) {
++it;
if ( mi->popup() && mi->popup()->isVisible() ) {
@@ -1337,7 +1337,7 @@ void QMenuBar::keyPressEvent( QKeyEvent *e )
}
if ( dx ) { // highlight next/prev
- register int i = actItem;
+ int i = actItem;
int c = mitems->count();
int n = c;
while ( n-- ) {
@@ -1362,7 +1362,7 @@ void QMenuBar::keyPressEvent( QKeyEvent *e )
QMenuItem* currentSelected = 0;
QMenuItem* firstAfterCurrent = 0;
- register QMenuItem *m;
+ QMenuItem *m;
int indx = 0;
int clashCount = 0;
while ( (m=it.current()) ) {
@@ -1534,7 +1534,7 @@ void QMenuBar::setupAccelerators()
autoaccel = 0;
QMenuItemListIt it(*mitems);
- register QMenuItem *mi;
+ QMenuItem *mi;
while ( (mi=it.current()) ) {
++it;
if ( !mi->isEnabledAndVisible() ) // ### when we have a good solution for the accel vs. focus widget problem, remove that. That is only a workaround
diff --git a/src/widgets/qmenudata.cpp b/src/widgets/qmenudata.cpp
index 518ea6b..a0ff49d 100644
--- a/src/widgets/qmenudata.cpp
+++ b/src/widgets/qmenudata.cpp
@@ -260,7 +260,7 @@ int QMenuData::insertAny( const QString *text, const QPixmap *pixmap,
if ( id < 0 ) // -2, -3 etc.
id = get_seq_id();
- register QMenuItem *mi = new QMenuItem;
+ QMenuItem *mi = new QMenuItem;
Q_CHECK_PTR( mi );
mi->ident = id;
if ( widget != 0 ) {
@@ -842,7 +842,7 @@ void QMenuData::removeItemAt( int index )
void QMenuData::clear()
{
- register QMenuItem *mi = mitems->first();
+ QMenuItem *mi = mitems->first();
while ( mi ) {
if ( mi->popup_menu )
menuDelPopup( mi->popup_menu );
@@ -1041,7 +1041,7 @@ void QMenuData::changeItem( int id, const QPixmap &pixmap )
QMenuData *parent;
QMenuItem *mi = findItem( id, &parent );
if ( mi ) { // item found
- register QPixmap *i = mi->pixmap_data;
+ QPixmap *i = mi->pixmap_data;
bool fast_refresh = i != 0 &&
i->width() == pixmap.width() &&
i->height() == pixmap.height() &&
@@ -1103,7 +1103,7 @@ void QMenuData::changeItemIconSet( int id, const QIconSet &icon )
QMenuData *parent;
QMenuItem *mi = findItem( id, &parent );
if ( mi ) { // item found
- register QIconSet *i = mi->iconset_data;
+ QIconSet *i = mi->iconset_data;
bool fast_refresh = i != 0;
if ( !icon.isNull() )
mi->iconset_data = new QIconSet( icon );
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-- ) {
generated by cgit v1.2.1 (git 2.18.0) at 2024-10-20 19:22:40 +0000