1 files changed, 25 insertions, 25 deletions

diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
index 7cc62620..16bfffce 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqpainter.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqregexp.h>
 
 #include <kpopupmenu.h>
@@ -57,14 +57,14 @@ KexiQueryDesignerSQLHistory::drawContents(TQPainter *p, int cx, int cy, int cw,
 	for(HistoryEntry *it = m_history->first(); it; it = m_history->next())
 	{
 //		it->drawItem(p, visibleWidth());
-		if(clipping.intersects(it->tqgeometry(y, visibleWidth(), fontMetrics())))
+		if(clipping.intersects(it->geometry(y, visibleWidth(), fontMetrics())))
 		{
 			p->saveWorldMatrix();
 			p->translate(0, y);
-			it->drawItem(p, visibleWidth(), tqcolorGroup());
+			it->drawItem(p, visibleWidth(), colorGroup());
 			p->restoreWorldMatrix();
 		}
-		y += it->tqgeometry(y, visibleWidth(), fontMetrics()).height() + 5;
+		y += it->geometry(y, visibleWidth(), fontMetrics()).height() + 5;
 	}
 }
 
@@ -79,27 +79,27 @@ KexiQueryDesignerSQLHistory::contentsMousePressEvent(TQMouseEvent * e)
 		if(it.current()->isSelected())
 		{
 			//clear
-			it.current()->setSelected(false, tqcolorGroup());
-			updateContents(it.current()->tqgeometry(y, visibleWidth(), fontMetrics()));
+			it.current()->setSelected(false, colorGroup());
+			updateContents(it.current()->geometry(y, visibleWidth(), fontMetrics()));
 		}
 
-		if(it.current()->tqgeometry(y, visibleWidth(), fontMetrics()).contains(e->pos()))
+		if(it.current()->geometry(y, visibleWidth(), fontMetrics()).contains(e->pos()))
 		{
 			popupHistory = it.current();
 			pos = y;
 		}
-		y += it.current()->tqgeometry(y, visibleWidth(), fontMetrics()).height() + 5;
+		y += it.current()->geometry(y, visibleWidth(), fontMetrics()).height() + 5;
 	}
 
 	//now do update
 	if (popupHistory) {
 			if (m_selected && m_selected != popupHistory) {
-				m_selected->setSelected(false, tqcolorGroup());
-				updateContents(m_selected->tqgeometry(pos, visibleWidth(), fontMetrics()));
+				m_selected->setSelected(false, colorGroup());
+				updateContents(m_selected->geometry(pos, visibleWidth(), fontMetrics()));
 			}
 			m_selected = popupHistory;
-			m_selected->setSelected(true, tqcolorGroup());
-			updateContents(m_selected->tqgeometry(pos, visibleWidth(), fontMetrics()));
+			m_selected->setSelected(true, colorGroup());
+			updateContents(m_selected->geometry(pos, visibleWidth(), fontMetrics()));
 			if(e->button() == Qt::RightButton) {
 				m_popup->exec(e->globalPos());
 			}
@@ -121,7 +121,7 @@ KexiQueryDesignerSQLHistory::addEvent(const TQString& q, bool s, const TQString
 	if (he) {
 		if (he->statement()==q) {
 			he->updateTime(TQTime::currentTime());
-			tqrepaint();
+			repaint();
 			return;
 		}
 	}
@@ -137,25 +137,25 @@ KexiQueryDesignerSQLHistory::addEntry(HistoryEntry *e)
 	int y = 0;
 	for(HistoryEntry *it = m_history->first(); it; it = m_history->next())
 	{
-		y += it->tqgeometry(y, visibleWidth(), fontMetrics()).height() + 5;
+		y += it->geometry(y, visibleWidth(), fontMetrics()).height() + 5;
 	}
 
 	resizeContents(visibleWidth() - 1, y);
 	if (m_selected) {
-		m_selected->setSelected(false, tqcolorGroup());
+		m_selected->setSelected(false, colorGroup());
 	}
 	m_selected = e;
-	m_selected->setSelected(true, tqcolorGroup());
+	m_selected->setSelected(true, colorGroup());
 	ensureVisible(0,y+5);
 	updateContents();
 /*	ensureVisible(0, 0);
 	if (m_selected) {
-		m_selected->setSelected(false, tqcolorGroup());
+		m_selected->setSelected(false, colorGroup());
 	}
 	m_selected = e;
-	m_selected->setSelected(true, tqcolorGroup());
+	m_selected->setSelected(true, colorGroup());
 //	updateContents();
-	updateContents(m_selected->tqgeometry(0, visibleWidth(), fontMetrics()));*/
+	updateContents(m_selected->geometry(0, visibleWidth(), fontMetrics()));*/
 }
 
 /*void
@@ -180,7 +180,7 @@ KexiQueryDesignerSQLHistory::slotToClipboard()
 	if(!m_selected)
 		return;
 
-	TQApplication::tqclipboard()->setText(m_selected->statement(), TQClipboard::Clipboard);
+	TQApplication::clipboard()->setText(m_selected->statement(), TQClipboard::Clipboard);
 }
 
 void
@@ -326,7 +326,7 @@ HistoryEntry::highlight(const TQColorGroup &cg)
 	}
 	else
 	{
-		text = TQString("<font color=\"%1\">%2").tqarg(cg.highlightedText().name()).tqarg(statement);
+		text = TQString("<font color=\"%1\">%2").arg(cg.highlightedText().name()).arg(statement);
 	}
 
 	TQRegExp keywords("\\b(SELECT|UPDATE|INSERT|DELETE|DROP|FROM|WHERE|AND|OR|NOT|NULL|JOIN|LEFT|RIGHT|ON|INTO|TABLE)\\b");
@@ -334,9 +334,9 @@ HistoryEntry::highlight(const TQColorGroup &cg)
 	text = text.replace(keywords, "<b>\\1</b>");
 
 	if(!m_error.isEmpty())
-//		text += ("<br>"+i18n("Error: %1").tqarg(m_error));
-//		text += TQString("<br><font face=\"") + KGlobalSettings::generalFont().family() + TQString("\" size=\"-1\">") + i18n("Error: %1").tqarg(m_error) + "</font>";
-		text += TQString("<br><font face=\"") + KGlobalSettings::generalFont().family() + TQString("\">") + i18n("Error: %1").tqarg(m_error) + "</font>";
+//		text += ("<br>"+i18n("Error: %1").arg(m_error));
+//		text += TQString("<br><font face=\"") + KGlobalSettings::generalFont().family() + TQString("\" size=\"-1\">") + i18n("Error: %1").arg(m_error) + "</font>";
+		text += TQString("<br><font face=\"") + KGlobalSettings::generalFont().family() + TQString("\">") + i18n("Error: %1").arg(m_error) + "</font>";
 
 	kdDebug() << "HistoryEntry::highlight() text:" << text << endl;
 //	m_formated = new TQSimpleRichText(text, TQFont("courier", 8));
@@ -352,7 +352,7 @@ HistoryEntry::setSelected(bool selected, const TQColorGroup &cg)
 }
 
 TQRect
-HistoryEntry::tqgeometry(int y, int width, TQFontMetrics f)
+HistoryEntry::geometry(int y, int width, TQFontMetrics f)
 {
 	Q_UNUSED( f );