From 6bd2eaa0b082914ac5ea62ee0406922c0aa8706c Mon Sep 17 00:00:00 2001 From: Stefan Gehn Date: Fri, 5 Oct 2001 19:48:01 +0000 Subject: [PATCH] make it compile with QT_NO_COMPAT svn path=/trunk/kdebase/konsole/; revision=116640 --- konsole/TEWidget.cpp | 2 +- konsole/schema.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/konsole/TEWidget.cpp b/konsole/TEWidget.cpp index f9cb8552..908e08c7 100644 --- a/konsole/TEWidget.cpp +++ b/konsole/TEWidget.cpp @@ -1205,7 +1205,7 @@ void TEWidget::calcGeometry() { //FIXME: set rimX == rimY == 0 when running in full screen mode. - scrollbar->resize(QApplication::style().scrollBarExtent().width(), + scrollbar->resize(QApplication::style().pixelMetric(QStyle::PM_ScrollBarExtent), contentsRect().height()); switch(scrollLoc) { diff --git a/konsole/schema.cpp b/konsole/schema.cpp index 6260ad03..53e1560f 100644 --- a/konsole/schema.cpp +++ b/konsole/schema.cpp @@ -365,7 +365,7 @@ bool ColorSchema::rereadSchemaFile() if (!(0 <= fi && fi <= TABLE_COLORS)) continue; if (!(0 <= tr && tr <= 1 )) continue; if (!(0 <= bo && bo <= 1 )) continue; - m_table[fi].color = kapp->palette().normal().text(); + m_table[fi].color = kapp->palette().active().text(); m_table[fi].transparent = tr; m_table[fi].bold = bo; } @@ -376,7 +376,7 @@ bool ColorSchema::rereadSchemaFile() if (!(0 <= fi && fi <= TABLE_COLORS)) continue; if (!(0 <= tr && tr <= 1 )) continue; if (!(0 <= bo && bo <= 1 )) continue; - m_table[fi].color = kapp->palette().normal().base(); + m_table[fi].color = kapp->palette().active().base(); m_table[fi].transparent = tr; m_table[fi].bold = bo; }