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/kaction.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/kaction.cpp')
| -rw-r--r-- | tdeui/kaction.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tdeui/kaction.cpp b/tdeui/kaction.cpp index 89e397450..6fad7d34b 100644 --- a/tdeui/kaction.cpp +++ b/tdeui/kaction.cpp @@ -662,7 +662,7 @@ int KAction::plug( TQWidget *w, int index ) if ( m_parentCollection ) instance = m_parentCollection->instance(); else - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); id = menu->insertItem( d->iconSet( KIcon::Small, 0, instance ), d->text(), this,//dsweet TQT_SLOT( slotPopupActivated() ), keyQt, -1, index ); @@ -702,7 +702,7 @@ int KAction::plug( TQWidget *w, int index ) if ( m_parentCollection ) instance = m_parentCollection->instance(); else - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); if ( icon().isEmpty() && !iconSet().pixmap().isNull() ) // old code using TQIconSet directly { |