From f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:45:16 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- atlantik/libatlantikui/estatedetails.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'atlantik/libatlantikui/estatedetails.cpp') diff --git a/atlantik/libatlantikui/estatedetails.cpp b/atlantik/libatlantikui/estatedetails.cpp index 4a601ddf..e4e52ea1 100644 --- a/atlantik/libatlantikui/estatedetails.cpp +++ b/atlantik/libatlantikui/estatedetails.cpp @@ -174,11 +174,11 @@ void EstateDetails::paintEvent(TQPaintEvent *) // Estate name painter.setPen(TQt::white); - int fontSize = KGlobalSettings::generalFont().pointSize(); + int fontSize = TDEGlobalSettings::generalFont().pointSize(); if (fontSize == -1) - fontSize = KGlobalSettings::generalFont().pixelSize(); + fontSize = TDEGlobalSettings::generalFont().pixelSize(); - painter.setFont(TQFont(KGlobalSettings::generalFont().family(), fontSize * 2, TQFont::Bold)); + painter.setFont(TQFont(TDEGlobalSettings::generalFont().family(), fontSize * 2, TQFont::Bold)); painter.drawText(KDialog::marginHint(), KDialog::marginHint(), width()-KDialog::marginHint(), titleHeight, TQt::AlignJustify, m_estate->name()); painter.setPen(TQt::black); @@ -189,12 +189,12 @@ void EstateDetails::paintEvent(TQPaintEvent *) if (m_estate->estateGroup()) { xText = titleHeight - fontSize - KDialog::marginHint(); - painter.setFont(TQFont(KGlobalSettings::generalFont().family(), fontSize, TQFont::Bold)); + painter.setFont(TQFont(TDEGlobalSettings::generalFont().family(), fontSize, TQFont::Bold)); painter.drawText(5, xText, width()-10, titleHeight, TQt::AlignRight, m_estate->estateGroup()->name().upper()); } xText = titleHeight + fontSize + 5; - painter.setFont(TQFont(KGlobalSettings::generalFont().family(), fontSize, TQFont::Normal)); + painter.setFont(TQFont(TDEGlobalSettings::generalFont().family(), fontSize, TQFont::Normal)); } b_recreate = false; -- cgit v1.2.1