summaryrefslogtreecommitdiffstats
path: root/kmail/kmkernel.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
commita9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch)
treed087071b1e8fcf79698938efec19f8e48bab0799 /kmail/kmkernel.cpp
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmail/kmkernel.cpp')
-rw-r--r--kmail/kmkernel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 2bcf6c2a..11e291ef 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -161,7 +161,7 @@ KMKernel::KMKernel (TQObject *parent, const char *name) :
netCodec = TQTextCodec::codecForName("jis7");
// TQTextCodec *cdc = TQTextCodec::codecForName("jis7");
// TQTextCodec::setCodecForLocale(cdc);
- // KGlobal::locale()->setEncoding(cdc->mibEnum());
+ // TDEGlobal::locale()->setEncoding(cdc->mibEnum());
} else {
netCodec = TQTextCodec::codecForLocale();
}