From cee429821aa6f1acc97fb482d325fb4eb37376ca Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:44:46 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kwordquiz/src/kwordquizview.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kwordquiz/src/kwordquizview.cpp') diff --git a/kwordquiz/src/kwordquizview.cpp b/kwordquiz/src/kwordquizview.cpp index bc6acc68..4b1f1cfc 100644 --- a/kwordquiz/src/kwordquizview.cpp +++ b/kwordquiz/src/kwordquizview.cpp @@ -141,7 +141,7 @@ void KWordQuizView::print(KPrinter *pPrinter) painter.drawLine(card_marg + card_width + card_text_marg, tPos + card_line_top, card_marg + card_width + card_width - card_text_marg, tPos + card_line_top); //draw headers - painter.setFont(KGlobalSettings::generalFont()); + painter.setFont(TDEGlobalSettings::generalFont()); painter.drawText(card_marg + card_text_marg, tPos, card_width, card_line_top, AlignAuto | AlignVCenter, horizontalHeader()->label(0)); painter.drawText(card_marg + card_width + card_text_marg, tPos, card_width, card_line_top, AlignAuto | AlignVCenter, horizontalHeader()->label(1)); //draw text @@ -167,7 +167,7 @@ void KWordQuizView::print(KPrinter *pPrinter) for (int rc = 0; rc < numRows(); ++rc) { painter.drawLine(lPos, tPos, lPos + gridWidth, tPos); - painter.setFont(KGlobalSettings::generalFont()); + painter.setFont(TDEGlobalSettings::generalFont()); painter.drawText(lPos, tPos, cw0 - pad, rowHeight(rc), AlignRight | AlignVCenter, TQString::number(rc + 1)); @@ -207,7 +207,7 @@ void KWordQuizView::doNewPage( TQPainter & painter, int res, int type ) TQRect w = painter.window(); - painter.setFont(KGlobalSettings::generalFont()); + painter.setFont(TDEGlobalSettings::generalFont()); if (type == 2) { @@ -238,7 +238,7 @@ void KWordQuizView::doNewPage( TQPainter & painter, int res, int type ) void KWordQuizView::doEndOfPage( TQPainter & painter, int vPos, int pageNum, int res, int type ) { int marg = res; - painter.setFont(KGlobalSettings::generalFont()); + painter.setFont(TDEGlobalSettings::generalFont()); TQRect w = painter.window(); TQRect r = painter.boundingRect(0, 0, 0, 0, AlignAuto, TQString::number(pageNum)); painter.drawText((w.width()/2) - (r.width()/2), w.height() - marg + 20, TQString::number(pageNum)); @@ -996,8 +996,8 @@ void KWordQuizView::addUndo( const TQString & caption ) void KWordQuizView::setFont( const TQFont & font) { TQTable::setFont(font); - horizontalHeader()->setFont(KGlobalSettings::generalFont()); - verticalHeader()->setFont(KGlobalSettings::generalFont()); + horizontalHeader()->setFont(TDEGlobalSettings::generalFont()); + verticalHeader()->setFont(TDEGlobalSettings::generalFont()); for (int i = 0; i < numRows(); ++i) adjustRow(i); //setRowHeight(i, fontMetrics().lineSpacing() ); } -- cgit v1.2.1