1 files changed, 9 insertions, 9 deletions

diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp
index db9dbb14..ba4c8f9e 100644
--- a/kexi/widget/kexiscrollview.cpp
+++ b/kexi/widget/kexiscrollview.cpp
@@ -52,8 +52,8 @@ KexiScrollView::KexiScrollView(TQWidget *parent, bool preview)
  , m_scrollViewNavPanel(0)
 {
 	setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
-	viewport()->setPaletteBackgroundColor(tqcolorGroup().mid());
-	TQColor fc = tqpalette().active().foreground(),
+	viewport()->setPaletteBackgroundColor(colorGroup().mid());
+	TQColor fc = palette().active().foreground(),
 		bc = viewport()->paletteBackgroundColor();
 	m_helpColor = KexiUtils::blendedColors(fc, bc, 1, 2);
 //	m_helpColor = TQColor((fc.red()+bc.red()*2)/3, (fc.green()+bc.green()*2)/3, 
@@ -80,7 +80,7 @@ KexiScrollView::KexiScrollView(TQWidget *parent, bool preview)
 //! @todo allow to hide navigator
 		updateScrollBars();
 		m_scrollViewNavPanel = new KexiRecordNavigator(this, leftMargin(), "nav");
-		m_scrollViewNavPanel->tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred);
+		m_scrollViewNavPanel->setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred);
 	}
 }
 
@@ -173,11 +173,11 @@ KexiScrollView::refreshContentsSize()
 			change = true;
 		}
 		if (change) {
-	tqrepaint();
-	viewport()->tqrepaint();
+	repaint();
+	viewport()->repaint();
 	repaintContents();
 	updateContents(0, 0, 2000,2000);
-	clipper()->tqrepaint();
+	clipper()->repaint();
 
 			resizeContents(w, h);
 		}
@@ -257,8 +257,8 @@ KexiScrollView::contentsMouseMoveEvent(TQMouseEvent *ev)
 		for(TQObject *o = list->first(); o; o = list->next())
 		{
 			TQWidget *w = (TQWidget*)o;
-			tmpx = TQMAX(tmpx, (w->tqgeometry().right() + 10));
-			tmpy = TQMAX(tmpy, (w->tqgeometry().bottom() + 10));
+			tmpx = TQMAX(tmpx, (w->geometry().right() + 10));
+			tmpy = TQMAX(tmpy, (w->geometry().bottom() + 10));
 		}
 		delete list;
 
@@ -345,7 +345,7 @@ KexiScrollView::drawContents( TQPainter * p, int clipx, int clipy, int clipw, in
 		//draw right and bottom borders
 		const int wx = childX(m_widget);
 		const int wy = childY(m_widget);
-		p->setPen(tqpalette().active().foreground());
+		p->setPen(palette().active().foreground());
 		p->drawLine(wx+m_widget->width(), wy, wx+m_widget->width(), wy+m_widget->height());
 		p->drawLine(wx, wy+m_widget->height(), wx+m_widget->width(), wy+m_widget->height());
 //kdDebug() << "KexiScrollView::drawContents() " << wy+m_widget->height() << endl;