summaryrefslogtreecommitdiffstats
path: root/kioslaves
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 /kioslaves
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kioslaves')
-rw-r--r--kioslaves/imap4/mimeheader.cc4
-rw-r--r--kioslaves/mbox/mbox.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/kioslaves/imap4/mimeheader.cc b/kioslaves/imap4/mimeheader.cc
index 8b54b98c9..72e3827b3 100644
--- a/kioslaves/imap4/mimeheader.cc
+++ b/kioslaves/imap4/mimeheader.cc
@@ -701,9 +701,9 @@ mimeHeader::iconName ()
fileName =
KMimeType::mimeType (contentType.lower ())->icon (TQString(), false);
fileName =
- KGlobal::instance ()->iconLoader ()->iconPath (fileName, KIcon::Desktop);
+ TDEGlobal::instance ()->iconLoader ()->iconPath (fileName, KIcon::Desktop);
// if (fileName.isEmpty())
-// fileName = KGlobal::instance()->iconLoader()->iconPath( "unknown", KIcon::Desktop );
+// fileName = TDEGlobal::instance()->iconLoader()->iconPath( "unknown", KIcon::Desktop );
return fileName;
}
diff --git a/kioslaves/mbox/mbox.cc b/kioslaves/mbox/mbox.cc
index d351bdba0..3d56c09ff 100644
--- a/kioslaves/mbox/mbox.cc
+++ b/kioslaves/mbox/mbox.cc
@@ -44,7 +44,7 @@ int kdemain( int argc, char * argv[] )
{
KLocale::setMainCatalogue("tdelibs");
TDEInstance instance("kio_mbox");
- (void) KGlobal::locale();
+ (void) TDEGlobal::locale();
if (argc != 4) {
fprintf(stderr, "Usage: kio_mbox protocol "