1 files changed, 84 insertions, 84 deletions

diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp
index f0dff0878..6fe7fbdc4 100644
--- a/kexi/widget/utils/kexirecordnavigator.cpp
+++ b/kexi/widget/utils/kexirecordnavigator.cpp
@@ -18,12 +18,12 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <qtoolbutton.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qvalidator.h>
-#include <qtooltip.h>
-#include <qscrollview.h>
+#include <tqtoolbutton.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqvalidator.h>
+#include <tqtooltip.h>
+#include <tqscrollview.h>
 
 #include <klocale.h>
 #include <kiconloader.h>
@@ -46,9 +46,9 @@ class KexiRecordNavigatorPrivate
 		{
 		}
 		KexiRecordNavigatorHandler *handler;
-		QHBoxLayout *lyr;
+		TQHBoxLayout *lyr;
 
-		QLabel *editingIndicatorLabel;
+		TQLabel *editingIndicatorLabel;
 		bool editingIndicatorEnabled : 1;
 		bool editingIndicatorVisible : 1;
 };
@@ -65,103 +65,103 @@ KexiRecordNavigatorHandler::~KexiRecordNavigatorHandler()
 
 //--------------------------------------------------
 
-KexiRecordNavigator::KexiRecordNavigator(QWidget *parent, int leftMargin, const char *name)
- : QFrame(parent, name)
+KexiRecordNavigator::KexiRecordNavigator(TQWidget *tqparent, int leftMargin, const char *name)
+ : TQFrame(tqparent, name)
  , m_view(0)
  , m_isInsertingEnabled(true)
  , d( new KexiRecordNavigatorPrivate() )
 {
-	if (parent->inherits("QScrollView"))
-		setParentView( dynamic_cast<QScrollView*>(parent) );
-	setFrameStyle(QFrame::NoFrame);
-	d->lyr = new QHBoxLayout(this,0,0,"nav_lyr");
+	if (tqparent->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING))
+		setParentView( dynamic_cast<TQScrollView*>(tqparent) );
+	setFrameStyle(TQFrame::NoFrame);
+	d->lyr = new TQHBoxLayout(this,0,0,"nav_lyr");
 
-	m_textLabel = new QLabel(this);
+	m_textLabel = new TQLabel(this);
 	d->lyr->addWidget( m_textLabel  );
 	setLabelText(i18n("Row:"));
 		
-	int bw = 6+SmallIcon("navigator_first").width(); //QMIN( horizontalScrollBar()->height(), 20);
-	QFont f = font();
+	int bw = 6+SmallIcon("navigator_first").width(); //TQMIN( horizontalScrollBar()->height(), 20);
+	TQFont f = font();
 	f.setPixelSize((bw > 12) ? 12 : bw);
-	QFontMetrics fm(f);
+	TQFontMetrics fm(f);
 	m_nav1DigitWidth = fm.width("8");
 
-	d->lyr->addWidget( m_navBtnFirst = new QToolButton(this) );
+	d->lyr->addWidget( m_navBtnFirst = new TQToolButton(this) );
 	m_navBtnFirst->setFixedWidth(bw);
-	m_navBtnFirst->setFocusPolicy(NoFocus);
+	m_navBtnFirst->setFocusPolicy(TQ_NoFocus);
 	m_navBtnFirst->setIconSet( SmallIconSet("navigator_first") );
-	QToolTip::add(m_navBtnFirst, i18n("First row"));
+	TQToolTip::add(m_navBtnFirst, i18n("First row"));
 	
-	d->lyr->addWidget( m_navBtnPrev = new QToolButton(this) );
+	d->lyr->addWidget( m_navBtnPrev = new TQToolButton(this) );
 	m_navBtnPrev->setFixedWidth(bw);
-	m_navBtnPrev->setFocusPolicy(NoFocus);
+	m_navBtnPrev->setFocusPolicy(TQ_NoFocus);
 	m_navBtnPrev->setIconSet( SmallIconSet("navigator_prev") );
 	m_navBtnPrev->setAutoRepeat(true);
-	QToolTip::add(m_navBtnPrev, i18n("Previous row"));
+	TQToolTip::add(m_navBtnPrev, i18n("Previous row"));
 	
 	d->lyr->addSpacing( 6 );
 	
 	d->lyr->addWidget( m_navRecordNumber = new KLineEdit(this) );
-	m_navRecordNumber->setAlignment(AlignRight | AlignVCenter);
-	m_navRecordNumber->setFocusPolicy(ClickFocus);
+	m_navRecordNumber->tqsetAlignment(AlignRight | AlignVCenter);
+	m_navRecordNumber->setFocusPolicy(TQ_ClickFocus);
 	m_navRecordNumber->installEventFilter(this);
 //	m_navRowNumber->setFixedWidth(fw);
-	m_navRecordNumberValidator = new QIntValidator(1, INT_MAX, this);
+	m_navRecordNumberValidator = new TQIntValidator(1, INT_MAX, TQT_TQOBJECT(this));
 	m_navRecordNumber->setValidator(m_navRecordNumberValidator);
 	m_navRecordNumber->installEventFilter(this);
-	QToolTip::add(m_navRecordNumber, i18n("Current row number"));
+	TQToolTip::add(m_navRecordNumber, i18n("Current row number"));
 	
 	KLineEdit *lbl_of = new KLineEdit(i18n("of"), this);
-	lbl_of->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Preferred);
+	lbl_of->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred);
 	lbl_of->setMaximumWidth(fm.width(lbl_of->text())+8);
 	lbl_of->setReadOnly(true);
 	lbl_of->setLineWidth(0);
-	lbl_of->setFocusPolicy(NoFocus);
-	lbl_of->setAlignment(AlignCenter);
+	lbl_of->setFocusPolicy(TQ_NoFocus);
+	lbl_of->tqsetAlignment(AlignCenter);
 	d->lyr->addWidget( lbl_of );
 	
 	d->lyr->addWidget( m_navRecordCount = new KLineEdit(this) );
-	m_navRecordCount->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Preferred);
+	m_navRecordCount->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred);
 	m_navRecordCount->setReadOnly(true);
 	m_navRecordCount->setLineWidth(0);
-	m_navRecordCount->setFocusPolicy(NoFocus);
-	m_navRecordCount->setAlignment(AlignLeft | AlignVCenter);
-	QToolTip::add(m_navRecordCount, i18n("Number of rows"));
+	m_navRecordCount->setFocusPolicy(TQ_NoFocus);
+	m_navRecordCount->tqsetAlignment(AlignLeft | AlignVCenter);
+	TQToolTip::add(m_navRecordCount, i18n("Number of rows"));
 
 	lbl_of->setFont(f);
 	m_navRecordNumber->setFont(f);
 	m_navRecordCount->setFont(f);
 	setFont(f);
 
-	d->lyr->addWidget( m_navBtnNext = new QToolButton(this) );
+	d->lyr->addWidget( m_navBtnNext = new TQToolButton(this) );
 	m_navBtnNext->setFixedWidth(bw);
-	m_navBtnNext->setFocusPolicy(NoFocus);
+	m_navBtnNext->setFocusPolicy(TQ_NoFocus);
 	m_navBtnNext->setIconSet( SmallIconSet("navigator_next") );
 	m_navBtnNext->setAutoRepeat(true);
-	QToolTip::add(m_navBtnNext, i18n("Next row"));
+	TQToolTip::add(m_navBtnNext, i18n("Next row"));
 	
-	d->lyr->addWidget( m_navBtnLast = new QToolButton(this) );
+	d->lyr->addWidget( m_navBtnLast = new TQToolButton(this) );
 	m_navBtnLast->setFixedWidth(bw);
-	m_navBtnLast->setFocusPolicy(NoFocus);
+	m_navBtnLast->setFocusPolicy(TQ_NoFocus);
 	m_navBtnLast->setIconSet( SmallIconSet("navigator_last") );
-	QToolTip::add(m_navBtnLast, i18n("Last row"));
+	TQToolTip::add(m_navBtnLast, i18n("Last row"));
 	
 	d->lyr->addSpacing( 6 );
-	d->lyr->addWidget( m_navBtnNew = new QToolButton(this) );
+	d->lyr->addWidget( m_navBtnNew = new TQToolButton(this) );
 	m_navBtnNew->setFixedWidth(bw);
-	m_navBtnNew->setFocusPolicy(NoFocus);
+	m_navBtnNew->setFocusPolicy(TQ_NoFocus);
 	m_navBtnNew->setIconSet( SmallIconSet("navigator_new") );
-	QToolTip::add(m_navBtnNew, i18n("New row"));
+	TQToolTip::add(m_navBtnNew, i18n("New row"));
 	m_navBtnNext->setEnabled(isInsertingEnabled());
 	
 	d->lyr->addSpacing( 6 );
 	d->lyr->addStretch(10);
 
-	connect(m_navBtnPrev,SIGNAL(clicked()),this,SLOT(slotPrevButtonClicked()));
-	connect(m_navBtnNext,SIGNAL(clicked()),this,SLOT(slotNextButtonClicked()));
-	connect(m_navBtnLast,SIGNAL(clicked()),this,SLOT(slotLastButtonClicked()));
-	connect(m_navBtnFirst,SIGNAL(clicked()),this,SLOT(slotFirstButtonClicked()));
-	connect(m_navBtnNew,SIGNAL(clicked()),this,SLOT(slotNewButtonClicked()));
+	connect(m_navBtnPrev,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotPrevButtonClicked()));
+	connect(m_navBtnNext,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotNextButtonClicked()));
+	connect(m_navBtnLast,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotLastButtonClicked()));
+	connect(m_navBtnFirst,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotFirstButtonClicked()));
+	connect(m_navBtnNew,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotNewButtonClicked()));
 
 	setRecordCount(0);
 	setCurrentRecordNumber(0);
@@ -185,30 +185,30 @@ void KexiRecordNavigator::setInsertingEnabled(bool set)
 
 void KexiRecordNavigator::setEnabled( bool set )
 {
-	QFrame::setEnabled(set);
+	TQFrame::setEnabled(set);
 	if (set && !m_isInsertingEnabled)
 		m_navBtnNew->setEnabled( false );
 }
 
-bool KexiRecordNavigator::eventFilter( QObject *o, QEvent *e )
+bool KexiRecordNavigator::eventFilter( TQObject *o, TQEvent *e )
 {
-	if (o==m_navRecordNumber) {
+	if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(m_navRecordNumber)) {
 		bool recordEntered = false;
 		bool ret;
-		if (e->type()==QEvent::KeyPress) {
-			QKeyEvent *ke = static_cast<QKeyEvent*>(e);
+		if (e->type()==TQEvent::KeyPress) {
+			TQKeyEvent *ke = TQT_TQKEYEVENT(e);
 			switch (ke->key()) {
-			case Qt::Key_Escape: {
+			case TQt::Key_Escape: {
 				ke->accept();
 				m_navRecordNumber->undo();
 				if (m_view)
 					m_view->setFocus();
 				return true;
 			}
-			case Qt::Key_Enter:
-			case Qt::Key_Return:
-			case Qt::Key_Tab:
-			case Qt::Key_BackTab: 
+			case TQt::Key_Enter:
+			case TQt::Key_Return:
+			case TQt::Key_Tab:
+			case TQt::Key_BackTab: 
 			{
 				recordEntered=true;
 				ke->accept(); //to avoid pressing Enter later
@@ -217,10 +217,10 @@ bool KexiRecordNavigator::eventFilter( QObject *o, QEvent *e )
 			default:;
 			}
 		}
-		else if (e->type()==QEvent::FocusOut) {
-			if (static_cast<QFocusEvent*>(e)->reason()!=QFocusEvent::Tab
-				&& static_cast<QFocusEvent*>(e)->reason()!=QFocusEvent::Backtab
-				&& static_cast<QFocusEvent*>(e)->reason()!=QFocusEvent::Other)
+		else if (e->type()==TQEvent::FocusOut) {
+			if (TQT_TQFOCUSEVENT(e)->reason()!=TQFocusEvent::Tab
+				&& TQT_TQFOCUSEVENT(e)->reason()!=TQFocusEvent::Backtab
+				&& TQT_TQFOCUSEVENT(e)->reason()!=TQFocusEvent::Other)
 				recordEntered=true;
 			ret = false;
 		}
@@ -230,7 +230,7 @@ bool KexiRecordNavigator::eventFilter( QObject *o, QEvent *e )
 			uint r = m_navRecordNumber->text().toUInt(&ok);
 			if (!ok || r<1)
 				r = (recordCount()>0)?1:0;
-			if (m_view && (hasFocus() || e->type()==QEvent::KeyPress))
+			if (m_view && (hasFocus() || e->type()==TQEvent::KeyPress))
 				m_view->setFocus();
 			setCurrentRecordNumber(r);
 			emit recordNumberEntered(r);
@@ -253,14 +253,14 @@ void KexiRecordNavigator::setCurrentRecordNumber(uint r)
 	uint recCnt = recordCount();
 	if (r>(recCnt+(m_isInsertingEnabled?1:0)))
 		r = recCnt+(m_isInsertingEnabled?1:0);
-	QString n;
+	TQString n;
 	if (r>0)
-		n = QString::number(r);
+		n = TQString::number(r);
 	else
 		n = " ";
 //	if (d->navRecordNumber->text().length() != n.length()) {//resize
 //		d->navRecordNumber->setFixedWidth(
-//			d->nav1DigitWidth*QMAX( QMAX(n.length(),2)+1,d->navRecordCount->text().length()+1)+6 
+//			d->nav1DigitWidth*TQMAX( TQMAX(n.length(),2)+1,d->navRecordCount->text().length()+1)+6 
 //		);
 //	}
 
@@ -283,7 +283,7 @@ void KexiRecordNavigator::updateButtons(uint recCnt)
 
 void KexiRecordNavigator::setRecordCount(uint count)
 {
-	const QString & n = QString::number(count);
+	const TQString & n = TQString::number(count);
 	if (m_isInsertingEnabled && currentRecordNumber()==0) {
 		setCurrentRecordNumber(1);
 	}
@@ -297,7 +297,7 @@ void KexiRecordNavigator::setRecordCount(uint count)
 		}
 	}
 	//update row number widget's width
-	const int w = m_nav1DigitWidth*QMAX( QMAX(n.length(),2)+1,m_navRecordNumber->text().length()+1)+6;
+	const int w = m_nav1DigitWidth*TQMAX( TQMAX(n.length(),2)+1,m_navRecordNumber->text().length()+1)+6;
 	if (m_navRecordNumber->width()!=w) //resize
 		m_navRecordNumber->setFixedWidth(w);
 
@@ -326,18 +326,18 @@ uint KexiRecordNavigator::recordCount() const
 	return r;
 }
 
-void KexiRecordNavigator::setParentView(QScrollView *view)
+void KexiRecordNavigator::setParentView(TQScrollView *view)
 {
 	m_view = view;
 }
 
 void KexiRecordNavigator::updateGeometry(int leftMargin)
 {
-	QFrame::updateGeometry();
+	TQFrame::updateGeometry();
 	if (m_view) {
 		int navWidth;
 		if (m_view->horizontalScrollBar()->isVisible()) {
-			navWidth = sizeHint().width();
+			navWidth = tqsizeHint().width();
 		}
 		else {
 			navWidth = leftMargin + m_view->clipper()->width();
@@ -345,23 +345,23 @@ void KexiRecordNavigator::updateGeometry(int leftMargin)
 		
 		setGeometry(
 			m_view->frameWidth(),
-			m_view->height() - m_view->horizontalScrollBar()->sizeHint().height()-m_view->frameWidth(),
+			m_view->height() - m_view->horizontalScrollBar()->tqsizeHint().height()-m_view->frameWidth(),
 			navWidth,
-			m_view->horizontalScrollBar()->sizeHint().height()
+			m_view->horizontalScrollBar()->tqsizeHint().height()
 		);
 
 		m_view->updateScrollBars();
 	}
 }
 
-void KexiRecordNavigator::setHBarGeometry( QScrollBar & hbar, int x, int y, int w, int h )
+void KexiRecordNavigator::setHBarGeometry( TQScrollBar & hbar, int x, int y, int w, int h )
 {
 	hbar.setGeometry( x + width(), y, w - width(), h );
 }
 
-void KexiRecordNavigator::setLabelText(const QString& text)
+void KexiRecordNavigator::setLabelText(const TQString& text)
 {
-	m_textLabel->setText(text.isEmpty() ? QString::null : (QString::fromLatin1(" ")+text+" "));
+	m_textLabel->setText(text.isEmpty() ? TQString() : (TQString::tqfromLatin1(" ")+text+" "));
 }
 
 void KexiRecordNavigator::setInsertingButtonVisible(bool set)
@@ -428,9 +428,9 @@ void KexiRecordNavigator::setEditingIndicatorEnabled(bool set)
 	d->editingIndicatorEnabled = set;
 	if (d->editingIndicatorEnabled) {
 		if (!d->editingIndicatorLabel) {
-			d->editingIndicatorLabel = new QLabel(this);
-			d->editingIndicatorLabel->setAlignment(Qt::AlignCenter);
-			QPixmap pix;
+			d->editingIndicatorLabel = new TQLabel(this);
+			d->editingIndicatorLabel->tqsetAlignment(TQt::AlignCenter);
+			TQPixmap pix;
 			pix.convertFromImage( *KexiRecordMarker::penImage() );
 			d->editingIndicatorLabel->setFixedWidth( pix.width() + 2*2 );
 			d->lyr->insertWidget( 0, d->editingIndicatorLabel );
@@ -451,14 +451,14 @@ void KexiRecordNavigator::showEditingIndicator(bool show)
 	if (!d->editingIndicatorEnabled)
 		return;
 	if (d->editingIndicatorVisible) {
-		QPixmap pix;
+		TQPixmap pix;
 		pix.convertFromImage( *KexiRecordMarker::penImage() );
 		d->editingIndicatorLabel->setPixmap( pix );
-		QToolTip::add( d->editingIndicatorLabel, i18n("Editing indicator") );
+		TQToolTip::add( d->editingIndicatorLabel, i18n("Editing indicator") );
 	}
 	else {
-		d->editingIndicatorLabel->setPixmap( QPixmap() );
-		QToolTip::remove( d->editingIndicatorLabel );
+		d->editingIndicatorLabel->setPixmap( TQPixmap() );
+		TQToolTip::remove( d->editingIndicatorLabel );
 	}
 }