diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:30 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:30 -0600 |
commit | 29df04c24350cc76a41e2410d1c92445f9338b98 (patch) | |
tree | c2b9cde128e24275393a83d9eaec58b2ef12d109 /kommander/factory/kommanderfactory.cpp | |
parent | c70534eef6085384ef7ddff369a154dbc8901917 (diff) | |
download | tdewebdev-29df04c24350cc76a41e2410d1c92445f9338b98.tar.gz tdewebdev-29df04c24350cc76a41e2410d1c92445f9338b98.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kommander/factory/kommanderfactory.cpp')
-rw-r--r-- | kommander/factory/kommanderfactory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp index c291fe9c..1aa27412 100644 --- a/kommander/factory/kommanderfactory.cpp +++ b/kommander/factory/kommanderfactory.cpp @@ -1481,9 +1481,9 @@ void KommanderFactory::loadImages( const TQString &dir ) TQString KommanderFactory::translate( const TQString& sourceText, const TQString& comment ) { if (!sourceText.isEmpty() && !comment.isEmpty()) - return KGlobal::locale()->translate(comment.utf8(), sourceText.utf8()); + return TDEGlobal::locale()->translate(comment.utf8(), sourceText.utf8()); else if (!sourceText.isEmpty()) - return KGlobal::locale()->translate(sourceText.utf8()); + return TDEGlobal::locale()->translate(sourceText.utf8()); else return sourceText; } |