1 files changed, 97 insertions, 97 deletions

diff --git a/bibletime/frontend/searchdialog/csearchanalysis.cpp b/bibletime/frontend/searchdialog/csearchanalysis.cpp
index 2c64f21..8a0a656 100644
--- a/bibletime/frontend/searchdialog/csearchanalysis.cpp
+++ b/bibletime/frontend/searchdialog/csearchanalysis.cpp
@@ -21,20 +21,20 @@
 #include "util/ctoolclass.h"
 
 //Qt includes
-#include <qhbox.h>
-#include <qvbox.h>
-#include <qptrlist.h>
-#include <qpainter.h>
-#include <qlayout.h>
-#include <qmap.h>
-#include <qlineedit.h>
-#include <qtextedit.h>
-#include <qlabel.h>
-#include <qsizepolicy.h>
-#include <qpushbutton.h>
-#include <qheader.h>
-#include <qregexp.h>
-#include <qmessagebox.h>
+#include <tqhbox.h>
+#include <tqvbox.h>
+#include <tqptrlist.h>
+#include <tqpainter.h>
+#include <tqlayout.h>
+#include <tqmap.h>
+#include <tqlineedit.h>
+#include <tqtextedit.h>
+#include <tqlabel.h>
+#include <tqsizepolicy.h>
+#include <tqpushbutton.h>
+#include <tqheader.h>
+#include <tqregexp.h>
+#include <tqmessagebox.h>
 
 //KDE includes
 #include <kapplication.h>
@@ -67,7 +67,7 @@ const int LEGEND_WIDTH = 85;
 
 /****************************/
 
-CSearchAnalysisDialog::CSearchAnalysisDialog( ListCSwordModuleInfo modules, QWidget* parentDialog ) : KDialogBase(Plain, i18n("Search analysis"), Close, Close, parentDialog, 0, true) {
+CSearchAnalysisDialog::CSearchAnalysisDialog( ListCSwordModuleInfo modules, TQWidget* parentDialog ) : KDialogBase(Plain, i18n("Search analysis"), Close, Close, parentDialog, 0, true) {
 	initView();
 	initConnections();
 	m_analysis->reset();
@@ -80,9 +80,9 @@ CSearchAnalysisDialog::~CSearchAnalysisDialog() {}
 
 /** Initializes this dialog. */
 void CSearchAnalysisDialog::initView() {
-	QVBoxLayout* layout = new QVBoxLayout(plainPage(),0);
+	TQVBoxLayout* layout = new TQVBoxLayout(plainPage(),0);
 
-	QPushButton* button = new QPushButton(plainPage(), "button");
+	TQPushButton* button = new TQPushButton(plainPage(), "button");
 	button->setIconSet(SmallIconSet("filesave"));
 	button->setText(i18n("Save search analysis as HTML"));
 	button->setFixedSize(button->sizeHint());
@@ -94,18 +94,18 @@ void CSearchAnalysisDialog::initView() {
 	m_analysisView->show();
 	layout->addWidget(m_analysisView);
 
-	connect(button, SIGNAL(clicked()), m_analysis, SLOT(saveAsHTML()));
+	connect(button, TQT_SIGNAL(clicked()), m_analysis, TQT_SLOT(saveAsHTML()));
 }
 
-/** Initializes the widgets SIGNAL and SLOT connections,. */
+/** Initializes the widgets TQT_SIGNAL and TQT_SLOT connections,. */
 void CSearchAnalysisDialog::initConnections() {}
 
 /****************************/
 /*  CSearchAnalysis         */
 /****************************/
 
-CSearchAnalysis::CSearchAnalysis(QObject *parent, const char *name )
-: QCanvas(parent,name) {
+CSearchAnalysis::CSearchAnalysis(TQObject *parent, const char *name )
+: TQCanvas(parent,name) {
 
 	m_scaleFactor = 0.0;
 	m_legend = 0;
@@ -113,17 +113,17 @@ CSearchAnalysis::CSearchAnalysis(QObject *parent, const char *name )
 	m_canvasItemList.resize(67);
 	m_canvasItemList.setAutoDelete(true);
 	resize(1,1);
-	connect(this, SIGNAL(resized()), SLOT(slotResized()));
+	connect(this, TQT_SIGNAL(resized()), TQT_SLOT(slotResized()));
 }
 
 CSearchAnalysis::~CSearchAnalysis() {}
 
-QDict<CSearchAnalysisItem>* CSearchAnalysis::getSearchAnalysisItemList() {
+TQDict<CSearchAnalysisItem>* CSearchAnalysis::getSearchAnalysisItemList() {
 	// Returns pointer to the search analysis items
 	return &m_canvasItemList;
 }
 
-/** Starts the analysis of the search result. This should be called only once because QCanvas handles the updates automatically. */
+/** Starts the analysis of the search result. This should be called only once because TQCanvas handles the updates automatically. */
 void CSearchAnalysis::analyse(ListCSwordModuleInfo modules) {
 	/**
 	* Steps of analysing our search result;
@@ -210,7 +210,7 @@ void CSearchAnalysis::setModules(ListCSwordModuleInfo modules) {
 void CSearchAnalysis::reset() {
 	m_scaleFactor = 0.0;
 
-	QDictIterator<CSearchAnalysisItem> it( m_canvasItemList ); // iterator for items
+	TQDictIterator<CSearchAnalysisItem> it( m_canvasItemList ); // iterator for items
 	while ( it.current() ) {
 		it.current()->hide();
 		++it;
@@ -231,7 +231,7 @@ void CSearchAnalysis::reset() {
 void CSearchAnalysis::slotResized() {
 	m_scaleFactor = (double)( (double)(height()-UPPER_BORDER-LOWER_BORDER-BAR_LOWER_BORDER-(m_moduleList.count()-1)*BAR_DELTAY)
 							  /(double)m_maxCount);
-	QDictIterator<CSearchAnalysisItem> it( m_canvasItemList );
+	TQDictIterator<CSearchAnalysisItem> it( m_canvasItemList );
 	while ( it.current() ) {
 		it.current()->setSize(BAR_WIDTH + (m_moduleList.count()-1)*BAR_DELTAX, height()-UPPER_BORDER-LOWER_BORDER);
 		it.current()->setY(UPPER_BORDER);
@@ -241,7 +241,7 @@ void CSearchAnalysis::slotResized() {
 }
 
 /** This function returns a color for each module */
-QColor CSearchAnalysis::getColor(int index) {
+TQColor CSearchAnalysis::getColor(int index) {
 	switch (index) {
 		case  0:
 		return Qt::red;
@@ -269,7 +269,7 @@ QColor CSearchAnalysis::getColor(int index) {
 }
 
 /** Returns the count of the book in the module */
-const unsigned int CSearchAnalysis::getCount( const QString book, CSwordModuleInfo* module ) {
+const unsigned int CSearchAnalysis::getCount( const TQString book, CSwordModuleInfo* module ) {
 	sword::ListKey& result = module->searchResult();
 	const int length = book.length();
 	unsigned int i = m_lastPosList[module];
@@ -290,8 +290,8 @@ const unsigned int CSearchAnalysis::getCount( const QString book, CSwordModuleIn
 //------------------------------------------------------------------
 //------------------------------------------------------------------
 
-CSearchAnalysisItem::CSearchAnalysisItem(QCanvas *parent, const int moduleCount, const QString &bookname, double *scaleFactor, ListCSwordModuleInfo* modules)
-: QCanvasRectangle(parent),
+CSearchAnalysisItem::CSearchAnalysisItem(TQCanvas *parent, const int moduleCount, const TQString &bookname, double *scaleFactor, ListCSwordModuleInfo* modules)
+: TQCanvasRectangle(parent),
 m_moduleList( modules ),
 m_scaleFactor(scaleFactor),
 m_bookName(bookname),
@@ -318,12 +318,12 @@ int CSearchAnalysisItem::getCountForModule( const int moduleIndex) {
 }
 
 /** Reimplementation. Draws the content of this item. */
-void CSearchAnalysisItem::draw(QPainter& painter) {
-	QFont f = painter.font();
+void CSearchAnalysisItem::draw(TQPainter& painter) {
+	TQFont f = painter.font();
 	f.setPointSize(ITEM_TEXT_SIZE);
 	painter.setFont(f);
 
-	setPen(QPen(black,1));
+	setPen(TQPen(black,1));
 	setBrush(Qt::red);
 	/**
 	* We have to paint so many bars as we have modules available (we use m_moduleCount)
@@ -343,12 +343,12 @@ void CSearchAnalysisItem::draw(QPainter& painter) {
 	while (drawn < m_moduleCount) {
 		for (index = 0; index < m_moduleCount; index++) {
 			if (m_resultCountArray[index] == Value) {
-				QPoint p1((int)x() + (m_moduleCount-drawn-1)*BAR_DELTAX,
+				TQPoint p1((int)x() + (m_moduleCount-drawn-1)*BAR_DELTAX,
 						  (int)height() + (int)y() - BAR_LOWER_BORDER - (m_moduleCount-drawn)*BAR_DELTAY);
-				QPoint p2(p1.x() + BAR_WIDTH,
+				TQPoint p2(p1.x() + BAR_WIDTH,
 						  p1.y() - (int)( !m_resultCountArray[index] ? 0 : ((m_resultCountArray[index])*(*m_scaleFactor))) );
-				QRect r(p1, p2);
-				painter.fillRect(r, QBrush(CSearchAnalysis::getColor(index)) );
+				TQRect r(p1, p2);
+				painter.fillRect(r, TQBrush(CSearchAnalysis::getColor(index)) );
 				painter.drawRect(r);
 				drawn++;
 			}
@@ -361,17 +361,17 @@ void CSearchAnalysisItem::draw(QPainter& painter) {
 		Value = newValue;
 	}
 	if (!m_bufferPixmap) {
-		m_bufferPixmap = new QPixmap();
+		m_bufferPixmap = new TQPixmap();
 		m_bufferPixmap->resize(width(),BAR_LOWER_BORDER);
 		m_bufferPixmap->fill();
-		QPainter p(m_bufferPixmap);
+		TQPainter p(m_bufferPixmap);
 		f = p.font();
 		f.setPointSize(ITEM_TEXT_SIZE);
 		p.setFont(f);
 		p.rotate(90);
-		p.drawText(QPoint(5,0), m_bookName);
+		p.drawText(TQPoint(5,0), m_bookName);
 	}
-	painter.drawPixmap(QPoint(int(x()),int(height()+y()-BAR_LOWER_BORDER)), *m_bufferPixmap);
+	painter.drawPixmap(TQPoint(int(x()),int(height()+y()-BAR_LOWER_BORDER)), *m_bufferPixmap);
 }
 
 /** Returns the width of this item. */
@@ -380,8 +380,8 @@ int CSearchAnalysisItem::width() {
 }
 
 /** Returns the tooltip for this item. */
-const QString CSearchAnalysisItem::getToolTip() {
-	QString ret = QString("<center><b>%1</b></center><hr/>").arg(m_bookName);
+const TQString CSearchAnalysisItem::getToolTip() {
+	TQString ret = TQString("<center><b>%1</b></center><hr/>").arg(m_bookName);
 	ret += "<table cellspacing=\"0\" cellpadding=\"3\" width=\"100%\" height=\"100%\" align=\"center\">";
 
 	//ToDo: Fix that loop
@@ -391,12 +391,12 @@ const QString CSearchAnalysisItem::getToolTip() {
 	for (ListCSwordModuleInfo::iterator it(m_moduleList->begin()); it != end_it; ++it) {
 		//  for (int i = 0; i < m_moduleCount; ++i) {
 		CSwordModuleInfo* info = (*it);
-		const QColor c = CSearchAnalysis::getColor(i);
+		const TQColor c = CSearchAnalysis::getColor(i);
 
 		ret.append(
-			QString("<tr bgcolor=\"white\"><td><b><font color=\"#%1\">%2</font></b></td><td>%3 (%4%)</td></tr>")
-			.arg(QString().sprintf("%02X%02X%02X",c.red(),c.green(),c.blue()))
-			.arg(info ? info->name() : QString::null)
+			TQString("<tr bgcolor=\"white\"><td><b><font color=\"#%1\">%2</font></b></td><td>%3 (%4%)</td></tr>")
+			.arg(TQString().sprintf("%02X%02X%02X",c.red(),c.green(),c.blue()))
+			.arg(info ? info->name() : TQString::null)
 			.arg( m_resultCountArray[i] )
 			.arg( (info && m_resultCountArray[i])? ((double)m_resultCountArray[i] / (double)info->searchResult().Count())*(double)100 : 0.0, 0, 'g', 2)
 		);
@@ -411,56 +411,56 @@ const QString CSearchAnalysisItem::getToolTip() {
 //------------------------------------------------------------------
 //------------------------------------------------------------------
 
-CSearchAnalysisView::CSearchAnalysisView(QCanvas* canvas, QWidget* parent)
-: QCanvasView(canvas, parent) {
-	setFocusPolicy(QWidget::WheelFocus);
+CSearchAnalysisView::CSearchAnalysisView(TQCanvas* canvas, TQWidget* parent)
+: TQCanvasView(canvas, parent) {
+	setFocusPolicy(TQWidget::WheelFocus);
 	m_toolTip = new ToolTip(this);
 	resize(sizeHint());
 }
 
 /** Returns the sizeHint for this view */
-QSize CSearchAnalysisView::sizeHint() {
+TQSize CSearchAnalysisView::sizeHint() {
 	if ( parentWidget() )
 		return parentWidget()->sizeHint();
-	return QCanvasView::sizeHint();
+	return TQCanvasView::sizeHint();
 }
 
 /** No descriptions */
-void CSearchAnalysisView::resizeEvent( QResizeEvent* e) {
-	QCanvasView::resizeEvent(e);
+void CSearchAnalysisView::resizeEvent( TQResizeEvent* e) {
+	TQCanvasView::resizeEvent(e);
 	canvas()->resize( canvas()->width(), viewport()->height() );
 }
 
-CSearchAnalysisView::ToolTip::ToolTip(QWidget* parent) : QToolTip(parent) {}
+CSearchAnalysisView::ToolTip::ToolTip(TQWidget* parent) : TQToolTip(parent) {}
 
-void CSearchAnalysisView::ToolTip::maybeTip(const QPoint& p) {
+void CSearchAnalysisView::ToolTip::maybeTip(const TQPoint& p) {
 	CSearchAnalysisView* view = dynamic_cast<CSearchAnalysisView*>(parentWidget());
 	if (!view)
 		return;
-	QPoint point(p);
+	TQPoint point(p);
 	point = view->viewport()->mapFrom(view, point);
 	CSearchAnalysisItem* i = view->itemAt( view->viewportToContents(point) );
 	if (!i)
 		return;
 
 	//get type of item and display correct text
-	QString text = i->getToolTip();
+	TQString text = i->getToolTip();
 	if (text.isEmpty())
 		return;
 
-	QPoint p1 = view->viewport()->mapTo(view, view->contentsToViewport(i->rect().topLeft()));
+	TQPoint p1 = view->viewport()->mapTo(view, view->contentsToViewport(i->rect().topLeft()));
 	p1.setY(0);
-	QPoint p2 = view->viewport()->mapTo(view, view->contentsToViewport(i->rect().bottomRight()));
+	TQPoint p2 = view->viewport()->mapTo(view, view->contentsToViewport(i->rect().bottomRight()));
 	p2.setY(view->height());
-	QRect r = QRect( p1, p2 );
+	TQRect r = TQRect( p1, p2 );
 	if (r.contains(p))
 		tip(r, text);
 }
 
 
 /** Returns the item at position p. If there no item at that point return 0. */
-CSearchAnalysisItem* CSearchAnalysisView::itemAt( const QPoint& p ) {
-	QCanvasItemList l = canvas()->collisions(p);
+CSearchAnalysisItem* CSearchAnalysisView::itemAt( const TQPoint& p ) {
+	TQCanvasItemList l = canvas()->collisions(p);
 	if (!l.count())
 		return 0;
 	return dynamic_cast<CSearchAnalysisItem*>(l.first());
@@ -469,25 +469,25 @@ CSearchAnalysisItem* CSearchAnalysisView::itemAt( const QPoint& p ) {
 //------------------------------------------------------------------
 //------------------------------------------------------------------
 
-CSearchAnalysisLegendItem::CSearchAnalysisLegendItem(QCanvas *parent, ListCSwordModuleInfo *list )
-: QCanvasRectangle(parent) {
+CSearchAnalysisLegendItem::CSearchAnalysisLegendItem(TQCanvas *parent, ListCSwordModuleInfo *list )
+: TQCanvasRectangle(parent) {
 	m_moduleList = list;
 }
 
 /** Reimplementation. Draws the content of this item. */
-void CSearchAnalysisLegendItem::draw (QPainter& painter) {
+void CSearchAnalysisLegendItem::draw (TQPainter& painter) {
 	painter.save();
 
-	setPen( QPen(black,2) );
+	setPen( TQPen(black,2) );
 	setBrush( Qt::white );
 	//the outer rectangle
-	QPoint p1( (int)x(), (int)y() );
-	QPoint p2( (int)x()+width(), (int)y() + height() );
-	QRect r(p1, p2);
+	TQPoint p1( (int)x(), (int)y() );
+	TQPoint p2( (int)x()+width(), (int)y() + height() );
+	TQRect r(p1, p2);
 	r.normalize();
 	painter.drawRect(r);
 
-	QFont f = painter.font();
+	TQFont f = painter.font();
 	f.setPointSize(ITEM_TEXT_SIZE);
 	painter.setFont(f);
 
@@ -496,14 +496,14 @@ void CSearchAnalysisLegendItem::draw (QPainter& painter) {
 	ListCSwordModuleInfo::iterator end_it = m_moduleList->end();
 	for (ListCSwordModuleInfo::iterator it(m_moduleList->begin()); it != end_it; ++it) {
 		// the module color indicators
-		QPoint p1( (int)x() + LEGEND_INNER_BORDER, (int)y() + LEGEND_INNER_BORDER + moduleIndex*(LEGEND_DELTAY + ITEM_TEXT_SIZE) );
-		QPoint p2(p1.x() + ITEM_TEXT_SIZE, p1.y() + ITEM_TEXT_SIZE);
-		QRect r(p1,p2);
-		painter.fillRect(r, QBrush(CSearchAnalysis::getColor(moduleIndex)) );
+		TQPoint p1( (int)x() + LEGEND_INNER_BORDER, (int)y() + LEGEND_INNER_BORDER + moduleIndex*(LEGEND_DELTAY + ITEM_TEXT_SIZE) );
+		TQPoint p2(p1.x() + ITEM_TEXT_SIZE, p1.y() + ITEM_TEXT_SIZE);
+		TQRect r(p1,p2);
+		painter.fillRect(r, TQBrush(CSearchAnalysis::getColor(moduleIndex)) );
 		r.normalize();
 		painter.drawRect(r);
 
-		QPoint p3( p2.x() + LEGEND_INNER_BORDER, p2.y() );
+		TQPoint p3( p2.x() + LEGEND_INNER_BORDER, p2.y() );
 		painter.drawText(p3, (*it)->name() );
 
 		++moduleIndex;
@@ -513,8 +513,8 @@ void CSearchAnalysisLegendItem::draw (QPainter& painter) {
 
 /** No descriptions */
 void CSearchAnalysis::saveAsHTML() {
-	const QString file = KFileDialog::getSaveFileName(QString::null,
-						 QString("*.html | %1").arg(i18n("HTML files")),
+	const TQString file = KFileDialog::getSaveFileName(TQString::null,
+						 TQString("*.html | %1").arg(i18n("HTML files")),
 						 0,
 						 i18n("Save Search Analysis"));
 	if (file.isNull()) {
@@ -523,13 +523,13 @@ void CSearchAnalysis::saveAsHTML() {
 
 	int moduleIndex = 0;
 	int count = 0;
-	QString countStr = "";
-	QString m_searchAnalysisHTML = "";
-	QString tableTitle = "";
-	QString tableTotals = "";
-	QString VerseRange = "";
-	const QString txtCSS = QString("<style type=\"text/css\">\ntd {border:1px solid black;}\nth {font-size: 130%; text-align:left; vertical-align:top;}\n</style>\n");
-	const QString metaEncoding = QString("<META http-equiv=Content-Type content=\"text/html; charset=utf-8\">");
+	TQString countStr = "";
+	TQString m_searchAnalysisHTML = "";
+	TQString tableTitle = "";
+	TQString tableTotals = "";
+	TQString VerseRange = "";
+	const TQString txtCSS = TQString("<style type=\"text/css\">\ntd {border:1px solid black;}\nth {font-size: 130%; text-align:left; vertical-align:top;}\n</style>\n");
+	const TQString metaEncoding = TQString("<META http-equiv=Content-Type content=\"text/html; charset=utf-8\">");
 	CSwordVerseKey key(0);
 	sword::ListKey searchResult;
 
@@ -537,7 +537,7 @@ void CSearchAnalysis::saveAsHTML() {
 
 	CSearchAnalysisItem* analysisItem = m_canvasItemList.find( key.book() );
 
-	QString text = "<html>\n<head>\n<title>" + i18n("BibleTime Search Analysis") + "</title>\n" + txtCSS + metaEncoding + "</head>\n<body>\n";
+	TQString text = "<html>\n<head>\n<title>" + i18n("BibleTime Search Analysis") + "</title>\n" + txtCSS + metaEncoding + "</head>\n<body>\n";
 	text += "<table>\n<tr><th>" + i18n("Search text :") + "</th><th>" + CSearchDialog::getSearchDialog()->searchText() + "</th></tr>\n";
 
 	tableTitle = "<tr><th align=\"left\">" + i18n("Book") + "</th>";
@@ -546,20 +546,20 @@ void CSearchAnalysis::saveAsHTML() {
 	moduleIndex = 0;
 	ListCSwordModuleInfo::iterator end_it = m_moduleList.end();
 	for (ListCSwordModuleInfo::iterator it(m_moduleList.begin()); it != end_it; ++it) {
-		tableTitle += QString("<th align=\"left\">") + (*it)->name() + QString("</th>");
+		tableTitle += TQString("<th align=\"left\">") + (*it)->name() + TQString("</th>");
 		searchResult = (*it)->searchResult();
 		countStr.setNum(searchResult.Count());
 
-		tableTotals += QString("<td align=\"right\">") + countStr + QString("</td>");
+		tableTotals += TQString("<td align=\"right\">") + countStr + TQString("</td>");
 		++moduleIndex;
 	}
-	tableTitle += QString("</tr>\n");
-	tableTotals += QString("</tr>\n");
+	tableTitle += TQString("</tr>\n");
+	tableTotals += TQString("</tr>\n");
 
 	m_searchAnalysisHTML = "";
 	bool ok = true;
 	while (ok) {
-		m_searchAnalysisHTML += QString("<tr><td>") + key.book() + QString("</td>");
+		m_searchAnalysisHTML += TQString("<tr><td>") + key.book() + TQString("</td>");
 		analysisItem = m_canvasItemList.find( key.book() );
 
 		//    for (moduleIndex = 0, m_moduleList.first(); m_moduleList.current(); m_moduleList.next(), ++moduleIndex) {
@@ -568,19 +568,19 @@ void CSearchAnalysis::saveAsHTML() {
 		for (ListCSwordModuleInfo::iterator it(m_moduleList.begin()); it != end_it; ++it) {
 			count = analysisItem->getCountForModule(moduleIndex);
 			countStr.setNum(count);
-			m_searchAnalysisHTML += QString("<td align=\"right\">") + countStr + QString("</td>");
+			m_searchAnalysisHTML += TQString("<td align=\"right\">") + countStr + TQString("</td>");
 
 			++moduleIndex;
 		}
-		m_searchAnalysisHTML += QString("</tr>\n");
+		m_searchAnalysisHTML += TQString("</tr>\n");
 		ok = key.next(CSwordVerseKey::UseBook);
 	}
 
-	text += QString("<table>\n") + tableTitle + tableTotals + m_searchAnalysisHTML + QString("</table>\n");
-	text += QString("<center>") + i18n("Created by") + QString(" <a href=\"http://www.bibletime.info/\">BibleTime</a></center>");
-	text += QString("</body></html>");
+	text += TQString("<table>\n") + tableTitle + tableTotals + m_searchAnalysisHTML + TQString("</table>\n");
+	text += TQString("<center>") + i18n("Created by") + TQString(" <a href=\"http://www.bibletime.info/\">BibleTime</a></center>");
+	text += TQString("</body></html>");
 
-	CToolClass::savePlainFile(file, text, false, QTextStream::UnicodeUTF8);
+	CToolClass::savePlainFile(file, text, false, TQTextStream::UnicodeUTF8);
 }
  
 	} //end of namespace Search::Analysis