summaryrefslogtreecommitdiffstats
path: root/kmail/kmcommands.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/kmcommands.cpp
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmail/kmcommands.cpp')
-rw-r--r--kmail/kmcommands.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index d2d9ca37..7108fff6 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -743,7 +743,7 @@ KMCommand::Result KMShowMsgSrcCommand::execute()
viewer->setCaption( i18n("Message as Plain Text") );
viewer->setText(str);
if( mFixedFont )
- viewer->setFont(KGlobalSettings::fixedFont());
+ viewer->setFont(TDEGlobalSettings::fixedFont());
// Well, there is no widget to be seen here, so we have to use TQCursor::pos()
// Update: (GS) I'm not going to make this code behave according to Xinerama
@@ -1605,10 +1605,10 @@ KMPrintCommand::KMPrintCommand( TQWidget *parent, KMMessage *msg,
mUseFixedFont( useFixedFont ), mEncoding( encoding )
{
if ( GlobalSettings::useDefaultFonts() )
- mOverrideFont = KGlobalSettings::generalFont();
+ mOverrideFont = TDEGlobalSettings::generalFont();
else {
KConfigGroup fonts( KMKernel::config(), "Fonts" );
- TQString tmp = fonts.readEntry( "print-font", KGlobalSettings::generalFont().toString() );
+ TQString tmp = fonts.readEntry( "print-font", TDEGlobalSettings::generalFont().toString() );
mOverrideFont.fromString( tmp );
}
}