summaryrefslogtreecommitdiffstats
path: root/kmail/xfaceconfigurator.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/xfaceconfigurator.cpp
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmail/xfaceconfigurator.cpp')
-rw-r--r--kmail/xfaceconfigurator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp
index 64b165ef2..5279b78b2 100644
--- a/kmail/xfaceconfigurator.cpp
+++ b/kmail/xfaceconfigurator.cpp
@@ -178,7 +178,7 @@ namespace KMail {
mTextEdit = new TQTextEdit( page );
page_vlay->addWidget( mTextEdit );
TQWhatsThis::add( mTextEdit, i18n( "Use this field to enter an arbitrary X-Face string." ) );
- mTextEdit->setFont( KGlobalSettings::fixedFont() );
+ mTextEdit->setFont( TDEGlobalSettings::fixedFont() );
mTextEdit->setWrapPolicy( TQTextEdit::Anywhere );
mTextEdit->setTextFormat( TQt::PlainText );
label2 = new KActiveLabel( i18n("Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www.xs4all.nl/~ace/X-Faces/</a>."), page );