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/kstdaction.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/kstdaction.cpp')
| -rw-r--r-- | tdeui/kstdaction.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tdeui/kstdaction.cpp b/tdeui/kstdaction.cpp index befd93fc1..2f33e4843 100644 --- a/tdeui/kstdaction.cpp +++ b/tdeui/kstdaction.cpp @@ -64,13 +64,13 @@ KAction* create( StdAction id, const char *name, const TQObject *recvr, const ch case Preferences: case HelpContents: { - const TDEAboutData *aboutData = KGlobal::instance()->aboutData(); + const TDEAboutData *aboutData = TDEGlobal::instance()->aboutData(); /* TODO KDE4 const TDEAboutData *aboutData; if ( parent ) aboutData = parent->instance()->aboutData(); else - aboutData = KGlobal::instance()->aboutData(); + aboutData = TDEGlobal::instance()->aboutData(); */ TQString appName = (aboutData) ? aboutData->programName() : TQString::fromLatin1(tqApp->name()); sLabel = i18n(pInfo->psLabel).arg(appName); |