diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /konqueror/konq_view.cc | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/konq_view.cc')
| -rw-r--r-- | konqueror/konq_view.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc index 58ed78b38..6a7234c60 100644 --- a/konqueror/konq_view.cc +++ b/konqueror/konq_view.cc @@ -1342,9 +1342,9 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) void KonqView::setActiveInstance() { if ( m_bBuiltinView || !m_pPart->instance() /*never!*/) - KGlobal::_activeInstance = KGlobal::instance(); + TDEGlobal::_activeInstance = TDEGlobal::instance(); else - KGlobal::_activeInstance = m_pPart->instance(); + TDEGlobal::_activeInstance = m_pPart->instance(); } bool KonqView::prepareReload( KParts::URLArgs& args ) |