diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:21:02 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:21:02 -0600 |
commit | 8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a (patch) | |
tree | 19ff5ecf5e6b5168e5503677f18b85f3dfa91f95 /khtml/khtmlview.cpp | |
parent | 5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0 (diff) | |
download | tdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.tar.gz tdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.zip |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'khtml/khtmlview.cpp')
-rw-r--r-- | khtml/khtmlview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp index 2831550c3..14169e651 100644 --- a/khtml/khtmlview.cpp +++ b/khtml/khtmlview.cpp @@ -637,7 +637,7 @@ void KHTMLView::viewportResizeEvent (TQResizeEvent* e) }/*end if*/ #endif - KApplication::sendPostedEvents(viewport(), TQEvent::Paint); + TDEApplication::sendPostedEvents(viewport(), TQEvent::Paint); } // this is to get rid of a compiler virtual overload mismatch warning. do not remove @@ -1730,7 +1730,7 @@ void KHTMLView::keyReleaseEvent(TQKeyEvent *_ke) if( d->scrollSuspendPreActivate && _ke->key() != Key_Shift ) d->scrollSuspendPreActivate = false; if( _ke->key() == Key_Shift && d->scrollSuspendPreActivate && _ke->state() == TQt::ShiftButton - && !(KApplication::keyboardMouseState() & TQt::ShiftButton)) + && !(TDEApplication::keyboardMouseState() & TQt::ShiftButton)) { if (d->scrollTimerId) { @@ -1746,7 +1746,7 @@ void KHTMLView::keyReleaseEvent(TQKeyEvent *_ke) { if (d->accessKeysPreActivate && _ke->key() != Key_Control) d->accessKeysPreActivate=false; - if (d->accessKeysPreActivate && _ke->state() == TQt::ControlButton && !(KApplication::keyboardMouseState() & TQt::ControlButton)) + if (d->accessKeysPreActivate && _ke->state() == TQt::ControlButton && !(TDEApplication::keyboardMouseState() & TQt::ControlButton)) { displayAccessKeys(); m_part->setStatusBarText(i18n("Access Keys activated"),KHTMLPart::BarOverrideText); |