diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /tdeui/kactioncollection.cpp | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/kactioncollection.cpp')
| -rw-r--r-- | tdeui/kactioncollection.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tdeui/kactioncollection.cpp b/tdeui/kactioncollection.cpp index 9cc76902b..9654d0ffd 100644 --- a/tdeui/kactioncollection.cpp +++ b/tdeui/kactioncollection.cpp @@ -462,7 +462,7 @@ void KActionCollection::setInstance( TDEInstance *instance ) if ( instance ) d->m_instance = instance; else - d->m_instance = KGlobal::instance(); + d->m_instance = TDEGlobal::instance(); } TDEInstance *KActionCollection::instance() const |