summaryrefslogtreecommitdiffstats
path: root/kmail/kmfoldertree.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/kmfoldertree.cpp
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmail/kmfoldertree.cpp')
-rw-r--r--kmail/kmfoldertree.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index 63010f9b5..7bec817b6 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -149,7 +149,7 @@ TQPixmap KMFolderTreeItem::normalIcon(int size) const
if (mFolder && mFolder->useCustomIcons() ) {
icon = mFolder->normalIconPath();
}
- KIconLoader * il = KGlobal::instance()->iconLoader();
+ KIconLoader * il = TDEGlobal::instance()->iconLoader();
TQPixmap pm = il->loadIcon( icon, KIcon::Small, size,
KIcon::DefaultState, 0, true );
if ( mFolder && pm.isNull() ) {
@@ -170,7 +170,7 @@ TQPixmap KMFolderTreeItem::unreadIcon(int size) const
kmkernel->folderIsDraftOrOutbox( mFolder ) )
pm = normalIcon( size );
- KIconLoader * il = KGlobal::instance()->iconLoader();
+ KIconLoader * il = TDEGlobal::instance()->iconLoader();
if ( mFolder && mFolder->useCustomIcons() ) {
pm = il->loadIcon( mFolder->unreadIconPath(), KIcon::Small, size,
KIcon::DefaultState, 0, true );
@@ -488,11 +488,11 @@ void KMFolderTree::readConfig (void)
{
KConfigGroupSaver saver(conf, "Fonts");
if (!conf->readBoolEntry("defaultFonts",true)) {
- TQFont folderFont( KGlobalSettings::generalFont() );
+ TQFont folderFont( TDEGlobalSettings::generalFont() );
setFont(conf->readFontEntry("folder-font", &folderFont));
}
else
- setFont(KGlobalSettings::generalFont());
+ setFont(TDEGlobalSettings::generalFont());
}
// restore the layout