Rename obsolete tq methods to standard names

7 files changed, 21 insertions, 21 deletions

diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index c818606d..1218a978 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -309,14 +309,14 @@ void KexiBlobTableEdit::executeCopyAction(const TQByteArray& data)
 	TQPixmap pixmap;
 	if (!pixmap.loadFromData(data))
 		return;
-	tqApp->tqclipboard()->setPixmap(pixmap, TQClipboard::Clipboard);
+	tqApp->clipboard()->setPixmap(pixmap, TQClipboard::Clipboard);
 }
 
 void KexiBlobTableEdit::handlePasteAction()
 {
 	if (isReadOnly())
 		return;
-	TQPixmap pm( tqApp->tqclipboard()->pixmap(TQClipboard::Clipboard) );
+	TQPixmap pm( tqApp->clipboard()->pixmap(TQClipboard::Clipboard) );
 	TQByteArray ba;
 	TQBuffer buffer( ba );
 	buffer.open( IO_WriteOnly );
diff --git a/kexi/widget/tableview/kexibooltableedit.cpp b/kexi/widget/tableview/kexibooltableedit.cpp
index c0753269..c4067dfd 100644
--- a/kexi/widget/tableview/kexibooltableedit.cpp
+++ b/kexi/widget/tableview/kexibooltableedit.cpp
@@ -135,7 +135,7 @@ void KexiBoolTableEdit::handleAction(const TQString& actionName)
 	if (actionName=="edit_paste") {
 		emit editRequested();
 		bool ok;
-		const int value = tqApp->tqclipboard()->text( TQClipboard::Clipboard ).toInt(&ok);
+		const int value = tqApp->clipboard()->text( TQClipboard::Clipboard ).toInt(&ok);
 		if (ok) {
 			m_currentValue = (value==0) ? TQVariant(false, 0) : TQVariant(true, 1);
 		}
diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp
index f45eb0e2..308e565e 100644
--- a/kexi/widget/tableview/kexicomboboxtableedit.cpp
+++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp
@@ -84,7 +84,7 @@ KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidg
 //	}
 //	setView( m_lineedit );
 
-//	tqlayout->addWidget(m_view);
+//	layout->addWidget(m_view);
 //	m_combo->setEditable( true );
 //	m_combo->clear();
 //	m_combo->insertStringList(f.enumHints());
@@ -434,7 +434,7 @@ void KexiComboBoxTableEdit::handleAction(const TQString& actionName)
 			m_lineedit->clear();
 		}
 //! @todo does not work with BLOBs!
-		setValueInInternalEditor( tqApp->tqclipboard()->text() );
+		setValueInInternalEditor( tqApp->clipboard()->text() );
 	}
 	else
 		KexiInputTableEdit::handleAction(actionName);
diff --git a/kexi/widget/tableview/kexitableedit.cpp b/kexi/widget/tableview/kexitableedit.cpp
index e531b814..b082bd95 100644
--- a/kexi/widget/tableview/kexitableedit.cpp
+++ b/kexi/widget/tableview/kexitableedit.cpp
@@ -101,7 +101,7 @@ void KexiTableEdit::resize(int w, int h)
 {
 	TQWidget::resize(w, h);
 	if (m_view) {
-		if (!tqlayout()) { //if there is tqlayout (eg. KexiInputTableEdit), resize is automatic
+		if (!layout()) { //if there is layout (eg. KexiInputTableEdit), resize is automatic
 			m_view->move(0,0);
 			m_view->resize(w, h);
 		}
diff --git a/kexi/widget/tableview/kexitableview.h b/kexi/widget/tableview/kexitableview.h
index fc488c83..b602168a 100644
--- a/kexi/widget/tableview/kexitableview.h
+++ b/kexi/widget/tableview/kexitableview.h
@@ -504,7 +504,7 @@ protected:
 	 *value is set to the default value. */
 	bool isDefaultValueDisplayed(KexiTableItem *item, int col, TQVariant* value = 0);
 
-	//! painting and tqlayout
+	//! painting and layout
 	void drawContents(TQPainter *p, int cx, int cy, int cw, int ch);
 	void createBuffer(int width, int height);
 	void paintCell(TQPainter* p, KexiTableItem *item, int col, int row, const TQRect &cr, bool print=false);
diff --git a/kexi/widget/tableview/kexitableviewdata.cpp b/kexi/widget/tableview/kexitableviewdata.cpp
index 6a15b0db..a4e45daf 100644
--- a/kexi/widget/tableview/kexitableviewdata.cpp
+++ b/kexi/widget/tableview/kexitableviewdata.cpp
@@ -509,8 +509,8 @@ int KexiTableViewData::cmpStr(Item item1, Item item2)
 	const TQString &as = m_leftTmp.toString();
 	const TQString &bs = m_rightTmp.toString();
 
-	const TQChar *a = as.tqunicode();
-	const TQChar *b = bs.tqunicode();
+	const TQChar *a = as.unicode();
+	const TQChar *b = bs.unicode();
 
 	if ( a == b )
 		return 0;
@@ -524,16 +524,16 @@ int KexiTableViewData::cmpStr(Item item1, Item item2)
 
 	int l=TQMIN(as.length(),bs.length());
 
-	au = a->tqunicode();
-	bu = b->tqunicode();
+	au = a->unicode();
+	bu = b->unicode();
 	au = (au <= 0x17e ? charTable[au] : 0xffff);
 	bu = (bu <= 0x17e ? charTable[bu] : 0xffff);
 
 	while (l-- && au == bu)
 	{
 		a++,b++;
-		au = a->tqunicode();
-		bu = b->tqunicode();
+		au = a->unicode();
+		bu = b->unicode();
 		au = (au <= 0x17e ? charTable[au] : 0xffff);
 		bu = (bu <= 0x17e ? charTable[bu] : 0xffff);
 	}
diff --git a/kexi/widget/tableview/kexitableviewheader.cpp b/kexi/widget/tableview/kexitableviewheader.cpp
index d217337b..cab7f791 100644
--- a/kexi/widget/tableview/kexitableviewheader.cpp
+++ b/kexi/widget/tableview/kexitableviewheader.cpp
@@ -34,7 +34,7 @@ class KexiTableViewHeaderStyle : public KexiUtils::StyleProxy
 		KexiTableViewHeaderStyle(TQStyle *parentStyle, TQWidget *widget)
 		 : KexiUtils::StyleProxy(parentStyle)
 		{
-			setBackgroundColor( widget->tqpalette().active().background() );
+			setBackgroundColor( widget->palette().active().background() );
 		}
 		~KexiTableViewHeaderStyle() {}
 
@@ -65,7 +65,7 @@ KexiTableViewHeader::KexiTableViewHeader(TQWidget * parent, const char * name)
 	, m_selectedSection(-1)
 	, m_styleChangeEnabled(true)
 {
-	styleChange( tqstyle() );
+	styleChange( style() );
 	installEventFilter(this);
 	connect(this, TQT_SIGNAL(sizeChange(int,int,int)), 
 		this, TQT_SLOT(slotSizeChange(int,int,int)));
@@ -81,7 +81,7 @@ void KexiTableViewHeader::styleChange( TQStyle& oldStyle )
 	if (!m_styleChangeEnabled)
 		return;
 	m_styleChangeEnabled = false;
-	setStyle( new KexiTableViewHeaderStyle(&tqApp->tqstyle(), this) );
+	setStyle( new KexiTableViewHeaderStyle(&tqApp->style(), this) );
 	m_styleChangeEnabled = true;
 }
 
@@ -126,7 +126,7 @@ bool KexiTableViewHeader::eventFilter(TQObject * watched, TQEvent * e)
 			TQString tip = m_toolTips[ section ];
 			if (tip.isEmpty()) { //try label
 				TQFontMetrics fm(font());
-				int minWidth = fm.width( label( section ) ) + tqstyle().pixelMetric( TQStyle::PM_HeaderMargin );
+				int minWidth = fm.width( label( section ) ) + style().pixelMetric( TQStyle::PM_HeaderMargin );
 				TQIconSet *iset = iconSet( section );
 				if (iset)
 					minWidth += (2+iset->pixmap( TQIconSet::Small, TQIconSet::Normal ).width()); //taken from TQHeader::sectionSizeHint()
@@ -186,16 +186,16 @@ void KexiTableViewHeader::paintSection( TQPainter * p, int index, const TQRect &
 {
 	const bool paintSelection = index==m_selectedSection && index != -1;
 	if (paintSelection) {
-		static_cast<KexiTableViewHeaderStyle&>(tqstyle()).setBackgroundColor(
+		static_cast<KexiTableViewHeaderStyle&>(style()).setBackgroundColor(
 			KexiUtils::blendedColors( 
-				tqpalette().active().background(), m_selectionBackgroundColor, 2, 1) );
+				palette().active().background(), m_selectionBackgroundColor, 2, 1) );
 	}
 
 	TQHeader::paintSection( p, index, fr );
 
 	if (paintSelection) { //revert the color for subsequent paints
-		static_cast<KexiTableViewHeaderStyle&>(tqstyle()).setBackgroundColor(
-			tqpalette().active().background());
+		static_cast<KexiTableViewHeaderStyle&>(style()).setBackgroundColor(
+			palette().active().background());
 	}
 }