TQt4 port kvirc

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1238719 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 68 insertions, 68 deletions

diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index a6765587..adbbae71 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -36,29 +36,29 @@
 #include "kvi_kvs_script.h"
 #include "kvi_sourcesdate.h"
 
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qapplication.h>
-#include <qtooltip.h>
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qmessagebox.h>
-#include <qframe.h>
+#include <tqpushbutton.h>
+#include <tqlayout.h>
+#include <tqapplication.h>
+#include <tqtooltip.h>
+#include <tqlineedit.h>
+#include <tqlabel.h>
+#include <tqmessagebox.h>
+#include <tqframe.h>
 #include "kvi_tal_scrollview.h"
 #ifdef COMPILE_USE_QT4
-	#include <q3header.h>
+	#include <tq3header.h>
 
 #else
-	#include <qheader.h>
+	#include <tqheader.h>
 #endif
 #include "kvi_draganddrop.h"
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qmessagebox.h>
-#include <qevent.h>
+#include <tqpainter.h>
+#include <tqpixmap.h>
+#include <tqmessagebox.h>
+#include <tqevent.h>
 
 KviScriptManagementDialog * KviScriptManagementDialog::m_pInstance = 0;
-extern QRect g_rectManagementDialogGeometry;
+extern TQRect g_rectManagementDialogGeometry;
 
 
 #define LVI_ICON_SIZE 32
@@ -72,7 +72,7 @@ KviScriptAddonListViewItem::KviScriptAddonListViewItem(KviTalListView * v,KviKvs
 {
 	m_pAddon = new KviKvsScriptAddon(*a);
 	m_pListView = v;
-	QString t = "<nobr><b>";
+	TQString t = "<nobr><b>";
 	t += a->visibleName();
 	t += "</b> [";
 	t += a->version();
@@ -85,15 +85,15 @@ KviScriptAddonListViewItem::KviScriptAddonListViewItem(KviTalListView * v,KviKvs
 	t += "</font></nobr>";
 	m_szKey = a->visibleName().upper();
 #ifdef COMPILE_USE_QT4
-	m_pText = new QTextDocument();
+	m_pText = new TQTextDocument();
 	m_pText->setHtml(t);
 	m_pText->setDefaultFont(v->font());
 #else
-	m_pText = new QSimpleRichText(t,v->font());
+	m_pText = new TQSimpleRichText(t,v->font());
 #endif
 
-	QPixmap * p = a->icon();
-	m_pIcon = p ? new QPixmap(*p) : new QPixmap(LVI_ICON_SIZE,LVI_ICON_SIZE);
+	TQPixmap * p = a->icon();
+	m_pIcon = p ? new TQPixmap(*p) : new TQPixmap(LVI_ICON_SIZE,LVI_ICON_SIZE);
 }
 
 KviScriptAddonListViewItem::~KviScriptAddonListViewItem()
@@ -103,7 +103,7 @@ KviScriptAddonListViewItem::~KviScriptAddonListViewItem()
 	delete m_pAddon;
 }
 
-QString KviScriptAddonListViewItem::key(int,bool) const
+TQString KviScriptAddonListViewItem::key(int,bool) const
 {
 	return m_szKey;
 }
@@ -125,12 +125,12 @@ void KviScriptAddonListViewItem::setup()
 	setHeight(iHeight+2);
 }
 
-void KviScriptAddonListViewItem::paintCell(QPainter * p,const QColorGroup & cg,int column,int width,int align)
+void KviScriptAddonListViewItem::paintCell(TQPainter * p,const TQColorGroup & cg,int column,int width,int align)
 {
 	#ifdef COMPILE_USE_QT4
 	if (isSelected())
 	{
-		QColor col(m_pListView->palette().highlight());
+		TQColor col(m_pListView->palette().highlight());
 		col.setAlpha(127);
 		p->setBrush(col);
 		p->drawRect(0, 0, m_pListView->visibleWidth(), height());
@@ -139,7 +139,7 @@ void KviScriptAddonListViewItem::paintCell(QPainter * p,const QColorGroup & cg,i
 	int afterIcon = LVI_BORDER + LVI_ICON_SIZE + LVI_SPACING;
 	int www = m_pListView->visibleWidth() - (afterIcon + LVI_BORDER);
 	p->translate(afterIcon,LVI_BORDER);
-	m_pText->setPageSize(QSizeF(www,height() - (LVI_BORDER * 2)));
+	m_pText->setPageSize(TQSizeF(www,height() - (LVI_BORDER * 2)));
 	m_pText->drawContents(p);
 	#else
 	p->drawPixmap(LVI_BORDER,LVI_BORDER,*m_pIcon);
@@ -148,12 +148,12 @@ void KviScriptAddonListViewItem::paintCell(QPainter * p,const QColorGroup & cg,i
 	m_pText->setWidth(www);
 	if(isSelected())
 	{
-		QColorGroup cg2(cg);
-		cg2.setColor(QColorGroup::HighlightedText,cg.text());
+		TQColorGroup cg2(cg);
+		cg2.setColor(TQColorGroup::HighlightedText,cg.text());
 	
-		m_pText->draw(p,afterIcon,LVI_BORDER,QRect(afterIcon,LVI_BORDER,www,height() - (LVI_BORDER * 2)),cg2);
+		m_pText->draw(p,afterIcon,LVI_BORDER,TQRect(afterIcon,LVI_BORDER,www,height() - (LVI_BORDER * 2)),cg2);
 	} else {
-		m_pText->draw(p,afterIcon,LVI_BORDER,QRect(afterIcon,LVI_BORDER,www,height() - (LVI_BORDER * 2)),cg);
+		m_pText->draw(p,afterIcon,LVI_BORDER,TQRect(afterIcon,LVI_BORDER,www,height() - (LVI_BORDER * 2)),cg);
 	}
 	#endif
 }
@@ -164,11 +164,11 @@ void KviScriptAddonListViewItem::paintCell(QPainter * p,const QColorGroup & cg,i
 
 
 
-KviScriptAddonListView::KviScriptAddonListView(QWidget * pParent)
+KviScriptAddonListView::KviScriptAddonListView(TQWidget * pParent)
 : KviListView(pParent)
 {
-	QPixmap * p = g_pIconManager->getImage("kvi_dialog_addons.png");
-	if(p)setBackgroundOverlayPixmap(p,Qt::AlignRight | Qt::AlignBottom);
+	TQPixmap * p = g_pIconManager->getImage("kvi_dialog_addons.png");
+	if(p)setBackgroundOverlayPixmap(p,TQt::AlignRight | TQt::AlignBottom);
 
 	setSelectionMode(Single);
 	header()->hide();
@@ -182,7 +182,7 @@ KviScriptAddonListView::~KviScriptAddonListView()
 {
 }
 
-void KviScriptAddonListView::resizeEvent(QResizeEvent * e)
+void KviScriptAddonListView::resizeEvent(TQResizeEvent * e)
 {
 	KviListView::resizeEvent(e);
 	int iWidth = visibleWidth();
@@ -191,8 +191,8 @@ void KviScriptAddonListView::resizeEvent(QResizeEvent * e)
 }
 
 
-KviScriptManagementDialog::KviScriptManagementDialog(QWidget * p)
-: QDialog(p,"" /*,WType_TopLevel | WStyle_Customize | WStyle_Title | WStyle_StaysOnTop | WStyle_DialogBorder*/)
+KviScriptManagementDialog::KviScriptManagementDialog(TQWidget * p)
+: TQDialog(p,"" /*,WType_TopLevel | WStyle_Customize | WStyle_Title | WStyle_StaysOnTop | WStyle_DialogBorder*/)
 {
 	setCaption(__tr2qs("Manage Script-Based Addons"));
 	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ADDONS)));
@@ -200,56 +200,56 @@ KviScriptManagementDialog::KviScriptManagementDialog(QWidget * p)
 
 	m_pInstance = this;
 
-	QGridLayout * g = new QGridLayout(this,11,3,4,5);
+	TQGridLayout * g = new TQGridLayout(this,11,3,4,5);
 	
-	/*QLabel * lb = new QLabel(this);
-	lb->setFrameStyle(QFrame::WinPanel | QFrame::Sunken);
+	/*TQLabel * lb = new TQLabel(this);
+	lb->setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
 
 	g->addMultiCellWidget(lb,0,10,0,0);
-	QPixmap * pix = g_pIconManager->getImage("kvi_dialog_addons.png");
+	TQPixmap * pix = g_pIconManager->getImage("kvi_dialog_addons.png");
 	if(pix)
 	{
 		lb->setPixmap(*pix);
 		lb->setFixedWidth(pix->width());
 	}
-	lb->setBackgroundColor(Qt::black);
-	lb->setAlignment(Qt::AlignBottom | Qt::AlignRight);
+	lb->setBackgroundColor(TQt::black);
+	lb->tqsetAlignment(TQt::AlignBottom | TQt::AlignRight);
 	*/
 	m_pListView = new KviScriptAddonListView(this);
 	g->addMultiCellWidget(m_pListView,0,10,1,1);
 
-	m_pConfigureButton = new QPushButton(__tr2qs("Configure"),this);
-	connect(m_pConfigureButton,SIGNAL(clicked()),this,SLOT(configureScript()));
+	m_pConfigureButton = new TQPushButton(__tr2qs("Configure"),this);
+	connect(m_pConfigureButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(configureScript()));
 	g->addWidget(m_pConfigureButton,0,2);
 
-	m_pHelpButton = new QPushButton(__tr2qs("Show Help"),this);
-	connect(m_pHelpButton,SIGNAL(clicked()),this,SLOT(showScriptHelp()));
+	m_pHelpButton = new TQPushButton(__tr2qs("Show Help"),this);
+	connect(m_pHelpButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(showScriptHelp()));
 	g->addWidget(m_pHelpButton,1,2);
 
 	g->addRowSpacing(2,40);
 
-	m_pUninstallButton = new QPushButton(__tr2qs("Uninstall"),this);
-	connect(m_pUninstallButton,SIGNAL(clicked()),this,SLOT(uninstallScript()));
+	m_pUninstallButton = new TQPushButton(__tr2qs("Uninstall"),this);
+	connect(m_pUninstallButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(uninstallScript()));
 	g->addWidget(m_pUninstallButton,3,2);
 
 	g->addRowSpacing(4,15);
 
-	QFrame *f = new QFrame(this);
-	f->setFrameStyle(QFrame::HLine | QFrame::Sunken);
+	TQFrame *f = new TQFrame(this);
+	f->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
 	g->addWidget(f,5,2);
 	
 	g->addRowSpacing(6,15);
 
-	m_pInstallButton = new QPushButton(__tr2qs("Install Addon..."),this);
-	connect(m_pInstallButton,SIGNAL(clicked()),this,SLOT(installScript()));
+	m_pInstallButton = new TQPushButton(__tr2qs("Install Addon..."),this);
+	connect(m_pInstallButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(installScript()));
 	g->addWidget(m_pInstallButton,7,2);
 
-	m_pGetScriptsButton = new QPushButton(__tr2qs("More Addons..."),this);
-	connect(m_pGetScriptsButton,SIGNAL(clicked()),this,SLOT(getMoreScripts()));
+	m_pGetScriptsButton = new TQPushButton(__tr2qs("More Addons..."),this);
+	connect(m_pGetScriptsButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(getMoreScripts()));
 	g->addWidget(m_pGetScriptsButton,8,2);
 
-	QPushButton * b = new QPushButton(__tr2qs("Close"),this);
-	connect(b,SIGNAL(clicked()),this,SLOT(closeClicked()));
+	TQPushButton * b = new TQPushButton(__tr2qs("Close"),this);
+	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(closeClicked()));
 	g->addWidget(b,10,2);
 
 	g->setRowStretch(9,1);
@@ -258,7 +258,7 @@ KviScriptManagementDialog::KviScriptManagementDialog(QWidget * p)
 	fillListView();
 
 	currentChanged(0);
-	connect(m_pListView,SIGNAL(currentChanged(KviTalListViewItem *)),this,SLOT(currentChanged(KviTalListViewItem *)));
+	connect(m_pListView,TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(currentChanged(KviTalListViewItem *)));
 	//currentToolBarChanged();
 
 	if(g_rectManagementDialogGeometry.y() < 5)
@@ -273,7 +273,7 @@ KviScriptManagementDialog::KviScriptManagementDialog(QWidget * p)
 
 KviScriptManagementDialog::~KviScriptManagementDialog()
 {
-	g_rectManagementDialogGeometry = QRect(pos().x(),pos().y(),size().width(),size().height());
+	g_rectManagementDialogGeometry = TQRect(pos().x(),pos().y(),size().width(),size().height());
 
 	//KviActionManager::instance()->customizeToolBarsDialogDestroyed();
 	m_pInstance = 0;
@@ -282,9 +282,9 @@ KviScriptManagementDialog::~KviScriptManagementDialog()
 void KviScriptManagementDialog::fillListView()
 {
 	m_pListView->clear();
-	KviPointerHashTable<QString,KviKvsScriptAddon> * d = KviKvsScriptAddonManager::instance()->addonDict();
+	KviPointerHashTable<TQString,KviKvsScriptAddon> * d = KviKvsScriptAddonManager::instance()->addonDict();
 	if(!d)return;
-	KviPointerHashTableIterator<QString,KviKvsScriptAddon> it(*d);
+	KviPointerHashTableIterator<TQString,KviKvsScriptAddon> it(*d);
 	KviScriptAddonListViewItem * item;
 	while(KviKvsScriptAddon * a = it.current())
 	{
@@ -329,11 +329,11 @@ void KviScriptManagementDialog::uninstallScript()
 	KviScriptAddonListViewItem * it = (KviScriptAddonListViewItem *)m_pListView->currentItem();
 	if(!it)return;
 
-	QString txt = "<p>";
-	txt += __tr2qs("Do you really want to uninstall the addon \"%1\" ?").arg(it->addon()->visibleName());
+	TQString txt = "<p>";
+	txt += __tr2qs("Do you really want to uninstall the addon \"%1\" ?").tqarg(it->addon()->visibleName());
 	txt += "</p>";
 	
-	if(QMessageBox::question(this,
+	if(TQMessageBox::question(this,
 		__tr2qs("Confirm addon uninstallation"),txt,__tr2qs("&Yes"),__tr2qs("&No"),0,1) != 0)return;
 
 	KviKvsScriptAddonManager::instance()->unregisterAddon(it->addon()->name(),g_pActiveWindow);
@@ -349,13 +349,13 @@ void KviScriptManagementDialog::getMoreScripts()
 
 void KviScriptManagementDialog::installScript()
 {
-	QString buffer;
+	TQString buffer;
 
-	if(!KviFileDialog::askForOpenFileName(buffer,__tr2qs("Please select the addon installation file"),QString::null,"install.kvs",false,true))return;
+	if(!KviFileDialog::askForOpenFileName(buffer,__tr2qs("Please select the addon installation file"),TQString(),"install.kvs",false,true))return;
 
-	buffer.replace("\\","\\\\");
+	buffer.tqreplace("\\","\\\\");
 
-	QString szCmd = "parse \"";
+	TQString szCmd = "parse \"";
 	szCmd += buffer;
 	szCmd += "\"";
 
@@ -368,9 +368,9 @@ void KviScriptManagementDialog::installScript()
 	//m_pListView->triggerUpdate();
 }
 
-void KviScriptManagementDialog::showEvent(QShowEvent * e)
+void KviScriptManagementDialog::showEvent(TQShowEvent * e)
 {
-//	QRect r = parentWidget() ? parentWidget()->rect() : QApplication::desktop()->rect();
+//	TQRect r = tqparentWidget() ? tqparentWidget()->rect() : TQApplication::desktop()->rect();
 //	int x = (r.width() - width()) / 2;
 //	int y = (r.height() - height()) / 2;
 //	move(x,y);
@@ -395,7 +395,7 @@ void KviScriptManagementDialog::display()
 	m_pInstance->show();
 }
 
-void KviScriptManagementDialog::closeEvent(QCloseEvent * e)
+void KviScriptManagementDialog::closeEvent(TQCloseEvent * e)
 {
 	e->ignore();
 	delete this;