summaryrefslogtreecommitdiffabout
path: root/microkde/kdeui
Unidiff
Diffstat (limited to 'microkde/kdeui') (more/less context) (ignore whitespace changes)
-rw-r--r--microkde/kdeui/kactioncollection.cpp5
-rw-r--r--microkde/kdeui/klistview.cpp2
2 files changed, 4 insertions, 3 deletions
diff --git a/microkde/kdeui/kactioncollection.cpp b/microkde/kdeui/kactioncollection.cpp
index b819e76..69e5d02 100644
--- a/microkde/kdeui/kactioncollection.cpp
+++ b/microkde/kdeui/kactioncollection.cpp
@@ -140,37 +140,38 @@ KActionCollection::~KActionCollection()
140 } 140 }
141 141
142//US delete d->m_kaccel; 142//US delete d->m_kaccel;
143//US delete d->m_builderKAccel; 143//US delete d->m_builderKAccel;
144 delete d; d = 0; 144 delete d; d = 0;
145} 145}
146 146
147void KActionCollection::setWidget( QWidget* w ) 147void KActionCollection::setWidget( QWidget* w )
148{ 148{
149 //if ( d->m_actionDict.count() > 0 ) { 149 //if ( d->m_actionDict.count() > 0 ) {
150 // kdError(129) << "KActionCollection::setWidget(): must be called before any actions are added to collection!" << endl; 150 // kdError(129) << "KActionCollection::setWidget(): must be called before any actions are added to collection!" << endl;
151 // kdDebug(129) << kdBacktrace() << endl; 151 // kdDebug(129) << kdBacktrace() << endl;
152 //} 152 //}
153 //else 153 //else
154 if ( !d->m_widget ) { 154 if ( !d->m_widget ) {
155 d->m_widget = w; 155 d->m_widget = w;
156 qDebug("KActionCollection::setWidget: warning: KAccel is never used in microkde"); 156 //qDebug("KActionCollection::setWidget: warning: KAccel is never used in microkde");
157//US d->m_kaccel = new KAccel( w, this, "KActionCollection-KAccel" ); 157//US d->m_kaccel = new KAccel( w, this, "KActionCollection-KAccel" );
158 } 158 }
159 else if ( d->m_widget != w ) 159 else if ( d->m_widget != w )
160 kdWarning(129) << "KActionCollection::setWidget(): tried to change widget from " << d->m_widget << " to " << w << endl; 160 ;
161
161} 162}
162 163
163void KActionCollection::setAutoConnectShortcuts( bool b ) 164void KActionCollection::setAutoConnectShortcuts( bool b )
164{ 165{
165 d->m_bAutoConnectShortcuts = b; 166 d->m_bAutoConnectShortcuts = b;
166} 167}
167 168
168bool KActionCollection::isAutoConnectShortcuts() 169bool KActionCollection::isAutoConnectShortcuts()
169{ 170{
170 return d->m_bAutoConnectShortcuts; 171 return d->m_bAutoConnectShortcuts;
171} 172}
172 173
173bool KActionCollection::addDocCollection( KActionCollection* pDoc ) 174bool KActionCollection::addDocCollection( KActionCollection* pDoc )
174{ 175{
175 d->m_docList.append( pDoc ); 176 d->m_docList.append( pDoc );
176 return true; 177 return true;
diff --git a/microkde/kdeui/klistview.cpp b/microkde/kdeui/klistview.cpp
index b53a88a..2856f2d 100644
--- a/microkde/kdeui/klistview.cpp
+++ b/microkde/kdeui/klistview.cpp
@@ -502,33 +502,33 @@ void KListView::slotOnItem( QListViewItem *item )
502 d->autoSelect.start( d->autoSelectDelay, true ); 502 d->autoSelect.start( d->autoSelectDelay, true );
503 d->pCurrentItem = item; 503 d->pCurrentItem = item;
504 } 504 }
505} 505}
506 506
507void KListView::slotOnViewport() 507void KListView::slotOnViewport()
508{ 508{
509 if ( d->bChangeCursorOverItem ) 509 if ( d->bChangeCursorOverItem )
510 viewport()->unsetCursor(); 510 viewport()->unsetCursor();
511 511
512 d->autoSelect.stop(); 512 d->autoSelect.stop();
513 d->pCurrentItem = 0L; 513 d->pCurrentItem = 0L;
514} 514}
515 515
516void KListView::slotSettingsChanged(int category) 516void KListView::slotSettingsChanged(int category)
517{ 517{
518qDebug("KListView::slotSettingsChanged has to be verified"); 518 //qDebug("KListView::slotSettingsChanged has to be verified");
519/*US 519/*US
520 520
521 switch (category) 521 switch (category)
522 { 522 {
523 case KApplication::SETTINGS_MOUSE: 523 case KApplication::SETTINGS_MOUSE:
524 d->dragDelay = KGlobalSettings::dndEventDelay(); 524 d->dragDelay = KGlobalSettings::dndEventDelay();
525 d->bUseSingle = KGlobalSettings::singleClick(); 525 d->bUseSingle = KGlobalSettings::singleClick();
526 526
527 disconnect(this, SIGNAL (mouseButtonClicked (int, QListViewItem*, const QPoint &, int)), 527 disconnect(this, SIGNAL (mouseButtonClicked (int, QListViewItem*, const QPoint &, int)),
528 this, SLOT (slotMouseButtonClicked (int, QListViewItem*, const QPoint &, int))); 528 this, SLOT (slotMouseButtonClicked (int, QListViewItem*, const QPoint &, int)));
529 529
530 if( d->bUseSingle ) 530 if( d->bUseSingle )
531 connect (this, SIGNAL (mouseButtonClicked (int, QListViewItem*, const QPoint &, int)), 531 connect (this, SIGNAL (mouseButtonClicked (int, QListViewItem*, const QPoint &, int)),
532 this, SLOT (slotMouseButtonClicked( int, QListViewItem*, const QPoint &, int))); 532 this, SLOT (slotMouseButtonClicked( int, QListViewItem*, const QPoint &, int)));
533 533
534 d->bChangeCursorOverItem = KGlobalSettings::changeCursorOverIcon(); 534 d->bChangeCursorOverItem = KGlobalSettings::changeCursorOverIcon();