TQt4 port kpicosim

This enables compilation under both Qt3 and Qt4


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

1 files changed, 16 insertions, 16 deletions

diff --git a/src/kjtagdialog.cpp b/src/kjtagdialog.cpp
index a8d445e..e3d2305 100644
--- a/src/kjtagdialog.cpp
+++ b/src/kjtagdialog.cpp
@@ -18,32 +18,32 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 #include "kjtagdialog.h"
-#include <qmessagebox.h>
+#include <tqmessagebox.h>
 #include <kfiledialog.h>
 #include <kiconloader.h>
 
-KJTAGDialog::KJTAGDialog( QWidget *parent )
- : QDialog( parent )
+KJTAGDialog::KJTAGDialog( TQWidget *tqparent )
+ : TQDialog( tqparent )
 {
 
 	setFixedSize( 330, 300 ) ;
-	m_groupConfigure = new QGroupBox( "Configure", this ) ;
+	m_groupConfigure = new TQGroupBox( "Configure", this ) ;
 	m_groupConfigure->setFixedSize( 310, 45 ) ;
 	m_groupConfigure->move( 10, 10 ) ;
 
-	m_selectFileBtn  = new QPushButton( m_groupConfigure ) ;
+	m_selectFileBtn  = new TQPushButton( m_groupConfigure ) ;
 	m_selectFileBtn->setFixedSize( 30, 25 ) ;
 	m_selectFileBtn->move( 205, 15 ) ;
 	m_selectFileBtn->setPixmap( KGlobal::iconLoader()->loadIcon( "fileopen", KIcon::Small ) ) ;
-	connect( m_selectFileBtn, SIGNAL( clicked() ), this, SLOT( selectFileName() ) ) ;
+	connect( m_selectFileBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selectFileName() ) ) ;
 
-	m_configureBtn = new QPushButton( "Configure", m_groupConfigure ) ;
+	m_configureBtn = new TQPushButton( "Configure", m_groupConfigure ) ;
 	m_configureBtn->setFixedSize( 60, 25 ) ;
 	m_configureBtn->move( 240, 15 ) ;
 
-	connect( m_configureBtn, SIGNAL( clicked() ), this, SLOT( configure() ) ) ;
+	connect( m_configureBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( configure() ) ) ;
 	
-	m_bitFileLabel = new QLabel( "Bit file", m_groupConfigure ) ;
+	m_bitFileLabel = new TQLabel( "Bit file", m_groupConfigure ) ;
 	m_bitFileLabel->setFixedSize( 50, 25 ) ;
 	m_bitFileLabel->move( 10, 15 ) ;
 	
@@ -60,9 +60,9 @@ KJTAGDialog::KJTAGDialog( QWidget *parent )
 	m_debug->setFixedSize( 310, 200 ) ;
 	m_debug->move( 10, 60 ) ;
 	
-	m_programmer = new JTAGProgrammer( this ) ;
-	connect( m_programmer, SIGNAL( progress(int) ), this, SLOT( progress(int) ) ) ;
-	connect( m_programmer, SIGNAL( message(const char*) ), this, SLOT( addMessage(const char*) ) ) ;
+	m_programmer = new JTAGProgrammer( TQT_TQOBJECT(this) ) ;
+	connect( m_programmer, TQT_SIGNAL( progress(int) ), this, TQT_SLOT( progress(int) ) ) ;
+	connect( m_programmer, TQT_SIGNAL( message(const char*) ), this, TQT_SLOT( addMessage(const char*) ) ) ;
 
 	m_debug->insert( "This option is still very experimental!!\n"
                      "The code is tested with the Spartan-3 Development Board.\n"
@@ -79,7 +79,7 @@ KJTAGDialog::~KJTAGDialog()
 void KJTAGDialog::configure()
 {
 	m_debug->clear() ;
-	m_programmer->setBitFile( m_bitFileEdit->text() ) ;
+	m_programmer->setBitFile( m_bitFileEdit->text().ascii() ) ;
 	m_programmer->program() ;
 	m_progress->setProgress( 0 ) ;
 }
@@ -89,19 +89,19 @@ void KJTAGDialog::progress( int percent )
 	m_progress->setProgress( percent ) ;
 }
 
-void KJTAGDialog::setFilename( QString filename )
+void KJTAGDialog::setFilename( TQString filename )
 {
 	m_bitFileEdit->setText( filename ) ;
 }
 
-QString KJTAGDialog::getFilename()
+TQString KJTAGDialog::getFilename()
 {
 	return m_bitFileEdit->text() ;
 }
 
 void KJTAGDialog::selectFileName()
 {
-	QString filename = KFileDialog::getOpenFileName( QString::null, 
+	TQString filename = KFileDialog::getOpenFileName( TQString(), 
                                                     "*.bit|bit files\n*|All files", 
 		   										     this,
   												     "Select configuration file" ) ;