diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
commit | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch) | |
tree | d087071b1e8fcf79698938efec19f8e48bab0799 /kaddressbook/printing | |
parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kaddressbook/printing')
-rw-r--r-- | kaddressbook/printing/detailledstyle.cpp | 8 | ||||
-rw-r--r-- | kaddressbook/printing/kabentrypainter.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/printing/mikesstyle.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp index a9c0b8d3b..377669732 100644 --- a/kaddressbook/printing/detailledstyle.cpp +++ b/kaddressbook/printing/detailledstyle.cpp @@ -72,8 +72,8 @@ DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *na KConfig *config; TQFont font; bool kdeFonts; - TQFont standard = KGlobalSettings::generalFont(); - TQFont fixed = KGlobalSettings::fixedFont(); + TQFont standard = TDEGlobalSettings::generalFont(); + TQFont fixed = TDEGlobalSettings::fixedFont(); setPreview( "detailed-style.png" ); @@ -163,11 +163,11 @@ void DetailledPrintStyle::print( const KABC::Addressee::List &contacts, PrintPro } if ( mPageAppearance->cbStandardFonts->isChecked() ) { - TQFont standard = KGlobalSettings::generalFont(); + TQFont standard = TDEGlobalSettings::generalFont(); header = standard; headlines = standard; body = standard; - fixed = KGlobalSettings::fixedFont(); + fixed = TDEGlobalSettings::fixedFont(); comment = standard; } else { header.setFamily( mPageAppearance->kfcHeaderFont->currentText() ); diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp index d7be5bd53..0bf45386b 100644 --- a/kaddressbook/printing/kabentrypainter.cpp +++ b/kaddressbook/printing/kabentrypainter.cpp @@ -208,7 +208,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, // paint the birthday to the right: TQDateTime dt = addr.birthday(); if ( dt.isValid() ) { - line1 = KGlobal::locale()->formatDate( dt.date(), true ); + line1 = TDEGlobal::locale()->formatDate( dt.date(), true ); if ( !fake ) { // create a little (1/8) space on top of the letters: float ypos = y + ( (float)rect.height() ) * 0.125; diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp index 62f89d558..99ead8138 100644 --- a/kaddressbook/printing/mikesstyle.cpp +++ b/kaddressbook/printing/mikesstyle.cpp @@ -205,7 +205,7 @@ void MikesStyle::paintTagLine( TQPainter &p, const TQFont &font ) TQFontMetrics fm( font ); TQString text = i18n( "Printed on %1 by KAddressBook (http://www.kde.org)" ) - .arg( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); + .arg( TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); p.setPen( TQt::black ); p.drawText( 0, fm.height(), text ); |