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 /kate/part/kateviewhelpers.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 'kate/part/kateviewhelpers.cpp')
| -rw-r--r-- | kate/part/kateviewhelpers.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp index f858ae908..a7a88b945 100644 --- a/kate/part/kateviewhelpers.cpp +++ b/kate/part/kateviewhelpers.cpp @@ -1175,7 +1175,7 @@ KateViewEncodingAction::KateViewEncodingAction(KateDocument *_doc, KateView *_vi void KateViewEncodingAction::slotAboutToShow() { - TQStringList modes (KGlobal::charsets()->descriptiveEncodingNames()); + TQStringList modes (TDEGlobal::charsets()->descriptiveEncodingNames()); popupMenu()->clear (); for (uint z=0; z<modes.size(); ++z) @@ -1183,7 +1183,7 @@ void KateViewEncodingAction::slotAboutToShow() popupMenu()->insertItem ( modes[z], this, TQT_SLOT(setMode(int)), 0, z); bool found = false; - TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(KGlobal::charsets()->encodingForName(modes[z]), found); + TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()->encodingForName(modes[z]), found); if (found && codecForEnc) { @@ -1195,8 +1195,8 @@ void KateViewEncodingAction::slotAboutToShow() void KateViewEncodingAction::setMode (int mode) { - TQStringList modes (KGlobal::charsets()->descriptiveEncodingNames()); - doc->config()->setEncoding( KGlobal::charsets()->encodingForName( modes[mode] ) ); + TQStringList modes (TDEGlobal::charsets()->descriptiveEncodingNames()); + doc->config()->setEncoding( TDEGlobal::charsets()->encodingForName( modes[mode] ) ); // now we don't want the encoding changed again unless the user does so using the menu. doc->setEncodingSticky( true ); doc->reloadFile(); |