diff options
Diffstat (limited to 'vcs/subversion')
33 files changed, 835 insertions, 835 deletions
diff --git a/vcs/subversion/commitdlg.cpp b/vcs/subversion/commitdlg.cpp index e227dd67..c456f7c2 100644 --- a/vcs/subversion/commitdlg.cpp +++ b/vcs/subversion/commitdlg.cpp @@ -19,20 +19,20 @@ ***************************************************************************/ #include "commitdlg.h" -#include <qevent.h> +#include <tqevent.h> #include <ktextedit.h> -CommitDlg::CommitDlg( QWidget* parent ) +CommitDlg::CommitDlg( TQWidget* parent ) : CommitDlgBase( parent ) { textMessage->installEventFilter(this); } -bool CommitDlg::eventFilter( QObject* obj, QEvent* ev ) +bool CommitDlg::eventFilter( TQObject* obj, TQEvent* ev ) { - if( ev->type() == QEvent::KeyPress ) + if( ev->type() == TQEvent::KeyPress ) { - QKeyEvent* k = static_cast<QKeyEvent*>(ev); + TQKeyEvent* k = static_cast<TQKeyEvent*>(ev); if( ( k->key() == Qt::Key_Return || k->key() == Qt::Key_Enter ) && k->state() == Qt::ControlButton ) { accept(); diff --git a/vcs/subversion/commitdlg.h b/vcs/subversion/commitdlg.h index 4ac54054..da63e2f5 100644 --- a/vcs/subversion/commitdlg.h +++ b/vcs/subversion/commitdlg.h @@ -27,9 +27,9 @@ class CommitDlg : public CommitDlgBase { Q_OBJECT public: - CommitDlg( QWidget* = 0 ); + CommitDlg( TQWidget* = 0 ); protected: - bool eventFilter( QObject* o, QEvent* e ); + bool eventFilter( TQObject* o, TQEvent* e ); }; #endif diff --git a/vcs/subversion/integrator/subversionintegrator.cpp b/vcs/subversion/integrator/subversionintegrator.cpp index a620deaf..32d28d27 100644 --- a/vcs/subversion/integrator/subversionintegrator.cpp +++ b/vcs/subversion/integrator/subversionintegrator.cpp @@ -28,8 +28,8 @@ static const KDevPluginInfo data("kdevsubversionintegrator"); typedef KDevGenericFactory<SubversionIntegrator> SubversionIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libsubversionintegrator, SubversionIntegratorFactory(data) ) -SubversionIntegrator::SubversionIntegrator(QObject* parent, const char* name, - const QStringList // args +SubversionIntegrator::SubversionIntegrator(TQObject* parent, const char* name, + const TQStringList // args ) :KDevVCSIntegrator(parent, name) { @@ -39,13 +39,13 @@ SubversionIntegrator::~SubversionIntegrator() { } -VCSDialog* SubversionIntegrator::fetcher(QWidget* // parent +VCSDialog* SubversionIntegrator::fetcher(TQWidget* // parent ) { return 0; } -VCSDialog* SubversionIntegrator::integrator(QWidget* parent) +VCSDialog* SubversionIntegrator::integrator(TQWidget* parent) { SvnIntegratorDlg *dlg = new SvnIntegratorDlg(parent); return dlg; diff --git a/vcs/subversion/integrator/subversionintegrator.h b/vcs/subversion/integrator/subversionintegrator.h index 546bdc5c..e9b62d70 100644 --- a/vcs/subversion/integrator/subversionintegrator.h +++ b/vcs/subversion/integrator/subversionintegrator.h @@ -22,17 +22,17 @@ #include <kdevvcsintegrator.h> -#include <qstringlist.h> +#include <tqstringlist.h> class SubversionIntegrator : public KDevVCSIntegrator { Q_OBJECT public: - SubversionIntegrator(QObject* parent, const char* name, const QStringList args = QStringList()); + SubversionIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~SubversionIntegrator(); - virtual VCSDialog* fetcher(QWidget* parent); - virtual VCSDialog* integrator(QWidget* parent); + virtual VCSDialog* fetcher(TQWidget* parent); + virtual VCSDialog* integrator(TQWidget* parent); }; diff --git a/vcs/subversion/integrator/svnintegratordlg.cpp b/vcs/subversion/integrator/svnintegratordlg.cpp index afed1d3e..05572278 100644 --- a/vcs/subversion/integrator/svnintegratordlg.cpp +++ b/vcs/subversion/integrator/svnintegratordlg.cpp @@ -26,7 +26,7 @@ #include <kio/job.h> #include <kurlrequester.h> #include <kdebug.h> -#include <qradiobutton.h> +#include <tqradiobutton.h> #include <kio/scheduler.h> #include <kprocess.h> #include <kdeversion.h> @@ -38,7 +38,7 @@ using namespace KIO; -SvnIntegratorDlg::SvnIntegratorDlg( QWidget *parent, const char *name ) +SvnIntegratorDlg::SvnIntegratorDlg( TQWidget *parent, const char *name ) : SvnIntegratorDlgBase( parent, name ) { repos1->setMode( KFile::Directory ); @@ -64,8 +64,8 @@ void SvnIntegratorDlg::accept() miscURL.setPath( servURL.path() + "/trunk/" ); list << miscURL; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 10; // MKDIR(list) s << cmd << list; KIO::SimpleJob* job = KIO::special( protocolUrl, parms, true ); @@ -74,8 +74,8 @@ void SvnIntegratorDlg::accept() return; } - QByteArray parms2; - QDataStream s2( parms2, IO_WriteOnly ); + TQByteArray parms2; + TQDataStream s2( parms2, IO_WriteOnly ); cmd = 5; //IMPORT servURL.setPath( servURL.path() + "/trunk/" ); s2 << cmd << servURL << KURL::fromPathOrURL( m_projectLocation ); @@ -94,12 +94,12 @@ void SvnIntegratorDlg::accept() delete rmproc; rmproc = NULL; - QByteArray parms3; - QDataStream s3( parms3, IO_WriteOnly ); + TQByteArray parms3; + TQDataStream s3( parms3, IO_WriteOnly ); int cmd2 = 1; //CHECKOUT int rev = -1; - s3 << cmd2 << servURL << KURL::fromPathOrURL( m_projectLocation ) << rev << QString( "HEAD" ); + s3 << cmd2 << servURL << KURL::fromPathOrURL( m_projectLocation ) << rev << TQString( "HEAD" ); SimpleJob *job2 = KIO::special( protocolUrl, parms3, true ); if( ! NetAccess::synchronousRun( job2, 0 ) ){ // Checkout failed @@ -108,13 +108,13 @@ void SvnIntegratorDlg::accept() } } -void SvnIntegratorDlg::init( const QString &projectName, const QString &projectLocation ) +void SvnIntegratorDlg::init( const TQString &projectName, const TQString &projectLocation ) { m_name = projectName; m_projectLocation = projectLocation; } -QWidget *SvnIntegratorDlg::self() +TQWidget *SvnIntegratorDlg::self() { return const_cast<SvnIntegratorDlg*>( this ); } diff --git a/vcs/subversion/integrator/svnintegratordlg.h b/vcs/subversion/integrator/svnintegratordlg.h index 96736023..f76cf95f 100644 --- a/vcs/subversion/integrator/svnintegratordlg.h +++ b/vcs/subversion/integrator/svnintegratordlg.h @@ -26,14 +26,14 @@ class SvnIntegratorDlg: public SvnIntegratorDlgBase, public VCSDialog { Q_OBJECT public: - SvnIntegratorDlg(QWidget *parent = 0, const char *name = 0); + SvnIntegratorDlg(TQWidget *parent = 0, const char *name = 0); virtual void accept(); - virtual void init(const QString &projectName, const QString &projectLocation); - virtual QWidget *self(); + virtual void init(const TQString &projectName, const TQString &projectLocation); + virtual TQWidget *self(); private: - QString m_name; - QString m_projectLocation; + TQString m_name; + TQString m_projectLocation; }; #endif diff --git a/vcs/subversion/kdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp index 9195c24c..7b4a42d3 100644 --- a/vcs/subversion/kdevsvnd.cpp +++ b/vcs/subversion/kdevsvnd.cpp @@ -25,8 +25,8 @@ #include <kfiledialog.h> #include <ktextedit.h> #include <kpassdlg.h> -#include <qdir.h> -#include <qfile.h> +#include <tqdir.h> +#include <tqfile.h> #include "config.h" @@ -36,71 +36,71 @@ #include "commitdlg.h" extern "C" { - KDE_EXPORT KDEDModule *create_kdevsvnd(const QCString &name) { + KDE_EXPORT KDEDModule *create_kdevsvnd(const TQCString &name) { return new KDevSvnd(name); } } -KDevSvnd::KDevSvnd(const QCString &name) +KDevSvnd::KDevSvnd(const TQCString &name) : KDEDModule(name) { } KDevSvnd::~KDevSvnd() {} -QString KDevSvnd::commitDialog(QString modifiedFiles) { +TQString KDevSvnd::commitDialog(TQString modifiedFiles) { CommitDlg commitDlg; commitDlg.setCaption(i18n("Enter Commit Log Message:")); commitDlg.listMessage->setText( modifiedFiles ); int result = commitDlg.exec(); - if ( result == QDialog::Accepted ) { + if ( result == TQDialog::Accepted ) { return commitDlg.textMessage->text(); } else - return QString::null; + return TQString::null; } -int KDevSvnd::sslServerTrustPrompt( QString errmsg, QString hostname, QString fingerPrint, QString validfrom, QString validuntil, QString issuerName, QString ascii_cert ) +int KDevSvnd::sslServerTrustPrompt( TQString errmsg, TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert ) { SvnSSLTrustPrompt dlg; dlg.setupCertInfo( hostname, fingerPrint, validfrom, validuntil, issuerName, ascii_cert ); dlg.setupFailedReasonMsg( errmsg ); int result = dlg.exec(); - if ( result == QDialog::Accepted ){ + if ( result == TQDialog::Accepted ){ return dlg.code(); } else{ return -1; } } -QString KDevSvnd::sslCertFile() +TQString KDevSvnd::sslCertFile() { - QString fileName = KFileDialog::getOpenFileName(QString::null,QString::null,0, i18n("Open SSL certificate file")); + TQString fileName = KFileDialog::getOpenFileName(TQString::null,TQString::null,0, i18n("Open SSL certificate file")); return fileName; } -QCString KDevSvnd::sslPasswdDlg(QString promptMsg) +TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg) { - QCString passwd; + TQCString passwd; int ret = KPasswordDialog::getPassword( passwd,promptMsg ); if( ret == KPasswordDialog::Accepted ){ - QCString retstr; + TQCString retstr; retstr.setNum(1); return retstr + passwd; } else{ - QCString nullstr; + TQCString nullstr; nullstr.setNum(-1); return nullstr; } } -// void KDevSvnd::registerMe(const QCString &app) +// void KDevSvnd::registerMe(const TQCString &app) // { // insert(app, "test", new TestObject(app)); // // When 'app' unregisters with DCOP, the TestObject will get deleted. // } // bool KSvnd::AreAnyFilesInSvn( const KURL::List& wclist ) { -// for ( QValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { +// for ( TQValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { // kdDebug( 9036 ) << "Checking file " << ( *it ) << endl; -// QDir bdir ( ( *it ).path() ); -// if ( bdir.exists() && QFile::exists( ( *it ).path() + "/.svn/entries" ) ) { +// TQDir bdir ( ( *it ).path() ); +// if ( bdir.exists() && TQFile::exists( ( *it ).path() + "/.svn/entries" ) ) { // return true; // } else if ( !bdir.exists() ) { // if ( isFileInSvnEntries( ( *it ).fileName(), ( *it ).directory() + "/.svn/entries" ) || isFileInExternals ( ( *it ).fileName(), ( *it ).directory()+"/.svn/dir-props" ) ) @@ -111,10 +111,10 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg) // } // // bool KSvnd::AreAnyFilesNotInSvn( const KURL::List& wclist ) { -// for ( QValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { +// for ( TQValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { // kdDebug( 9036 ) << "Checking file " << ( *it ) << endl; -// QDir bdir ( ( *it ).path() ); -// if ( bdir.exists() && !QFile::exists( ( *it ).path() + "/.svn/entries" ) ) { +// TQDir bdir ( ( *it ).path() ); +// if ( bdir.exists() && !TQFile::exists( ( *it ).path() + "/.svn/entries" ) ) { // return true; // } else if ( !bdir.exists() ) { // if ( !isFileInSvnEntries( ( *it ).fileName(),( *it ).directory() + "/.svn/entries" ) && !isFileInExternals ( ( *it ).fileName(), ( *it ).directory()+"/.svn/dir-props" ) ) @@ -125,10 +125,10 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg) // } // // bool KSvnd::AreAllFilesInSvn( const KURL::List& wclist ) { -// for ( QValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { +// for ( TQValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { // kdDebug( 9036 ) << "Checking file " << ( *it ) << endl; -// QDir bdir ( ( *it ).path() ); -// if ( bdir.exists() && !QFile::exists( ( *it ).path() + "/.svn/entries" ) ) { +// TQDir bdir ( ( *it ).path() ); +// if ( bdir.exists() && !TQFile::exists( ( *it ).path() + "/.svn/entries" ) ) { // return false; // } else if ( !bdir.exists() ) { // if ( !isFileInSvnEntries( ( *it ).fileName(),( *it ).directory() + "/.svn/entries" ) && !isFileInExternals ( ( *it ).fileName(), ( *it ).directory()+"/.svn/dir-props" ) ) @@ -139,10 +139,10 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg) // } // // bool KSvnd::AreAllFilesNotInSvn( const KURL::List& wclist ) { -// for ( QValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { +// for ( TQValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { // kdDebug( 9036 ) << "Checking file " << ( *it ) << endl; -// QDir bdir ( ( *it ).path() ); -// if ( bdir.exists() && QFile::exists( ( *it ).path() + "/.svn/entries" ) ) { +// TQDir bdir ( ( *it ).path() ); +// if ( bdir.exists() && TQFile::exists( ( *it ).path() + "/.svn/entries" ) ) { // return false; // } else if ( !bdir.exists() ) { // if ( isFileInSvnEntries( ( *it ).fileName(),( *it ).directory() + "/.svn/entries" ) || isFileInExternals ( ( *it ).fileName(), ( *it ).directory()+"/.svn/dir-props" ) ) @@ -152,11 +152,11 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg) // return true; // } // -// bool KSvnd::isFileInSvnEntries ( const QString filename, const QString entfile ) { -// QFile file( entfile ); +// bool KSvnd::isFileInSvnEntries ( const TQString filename, const TQString entfile ) { +// TQFile file( entfile ); // if ( file.open( IO_ReadOnly ) ) { -// QTextStream stream( &file ); -// QString line; +// TQTextStream stream( &file ); +// TQString line; // while ( !stream.atEnd() ) { // line = stream.readLine().simplifyWhiteSpace(); // if ( line == "name=\""+ filename + "\"" ) { @@ -169,11 +169,11 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg) // return false; // } // -// bool KSvnd::isFileInExternals ( const QString filename, const QString propfile ) { -// QFile file( propfile ); +// bool KSvnd::isFileInExternals ( const TQString filename, const TQString propfile ) { +// TQFile file( propfile ); // if ( file.open( IO_ReadOnly ) ) { -// QTextStream stream( &file ); -// QStringList line; +// TQTextStream stream( &file ); +// TQStringList line; // while ( !stream.atEnd() ) // line << stream.readLine().simplifyWhiteSpace(); // for ( uint i = 0 ; i < line.count(); i++ ) { @@ -202,38 +202,38 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg) // // bool KSvnd::anyNotValidWorkingCopy( const KURL::List& wclist ) { // bool result = true; //one negative match is enough -// for ( QValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { +// for ( TQValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { // //exception for .svn dirs // if ( ( *it ).path(-1).endsWith( "/.svn" ) ) // return true; // //if is a directory check whether it contains a .svn/entries file -// QDir dir( ( *it ).path() ); +// TQDir dir( ( *it ).path() ); // if ( dir.exists() ) { //it's a dir -// if ( !QFile::exists( ( *it ).path() + "/.svn/entries" ) ) +// if ( !TQFile::exists( ( *it ).path() + "/.svn/entries" ) ) // result = false; // } // // //else check if ./.svn/entries exists -// if ( !QFile::exists( ( *it ).directory() + "/.svn/entries" ) ) +// if ( !TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) // result = false; // } // return result; // } // // bool KSvnd::anyValidWorkingCopy( const KURL::List& wclist ) { -// for ( QValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { +// for ( TQValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { // //skip .svn dirs // if ( ( *it ).path(-1).endsWith( "/.svn" ) ) // continue; // //if is a directory check whether it contains a .svn/entries file -// QDir dir( ( *it ).path() ); +// TQDir dir( ( *it ).path() ); // if ( dir.exists() ) { //it's a dir -// if ( QFile::exists( ( *it ).path() + "/.svn/entries" ) ) +// if ( TQFile::exists( ( *it ).path() + "/.svn/entries" ) ) // return true; // } // // //else check if ./.svn/entries exists -// if ( QFile::exists( ( *it ).directory() + "/.svn/entries" ) ) +// if ( TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) // return true; // } // return false; @@ -242,7 +242,7 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg) // int KSvnd::getStatus( const KURL::List& list ) { // int result = 0; // uint files = 0, folders = 0, parentsentries = 0, parentshavesvn = 0, subdirhavesvn = 0, external = 0; -// for ( QValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { +// for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { // if ( isFolder ( ( *it ) ) ) { // folders++; // } else { @@ -251,13 +251,13 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg) // if ( isFileInSvnEntries ( (*it).filename(),( *it ).directory() + "/.svn/entries" ) ) { // normal subdir known in the working copy // parentsentries++; // } else if ( isFolder( *it ) ) { // other subfolders (either another module checkouted or an external, or something not known at all) -// if ( QFile::exists( ( *it ).path() + "/.svn/entries" ) ) +// if ( TQFile::exists( ( *it ).path() + "/.svn/entries" ) ) // subdirhavesvn++; // if ( isFileInExternals( (*it).filename(), ( *it ).directory() + "/.svn/dir-props" ) ) { // external++; // } // } -// if ( ( isFolder( ( *it ) ) && QFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || QFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //parent has a .svn ? +// if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //parent has a .svn ? // parentshavesvn++; // } // if ( files > 0 ) @@ -293,12 +293,12 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg) // } // // bool KSvnd::isFolder( const KURL& url ) { -// QDir d( url.path() ); +// TQDir d( url.path() ); // return d.exists(); // } // -// QStringList KSvnd::getActionMenu ( const KURL::List &list ) { -// QStringList result; +// TQStringList KSvnd::getActionMenu ( const KURL::List &list ) { +// TQStringList result; // int listStatus = getStatus( list ); // // if ( !(listStatus & SomeAreInParentsEntries) && @@ -347,8 +347,8 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg) // return result; // } // -// QStringList KSvnd::getTopLevelActionMenu ( const KURL::List &list ) { -// QStringList result; +// TQStringList KSvnd::getTopLevelActionMenu ( const KURL::List &list ) { +// TQStringList result; // int listStatus = getStatus( list ); // // @@ -364,28 +364,28 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg) // } // // #if 0 -// void KSvnd::notify(const QString& path, int action, int kind, const QString& mime_type, int content_state, int prop_state, long int revision, const QString& userstring) { +// void KSvnd::notify(const TQString& path, int action, int kind, const TQString& mime_type, int content_state, int prop_state, long int revision, const TQString& userstring) { // kdDebug(9036) << "KDED/Subversion : notify " << path << " action : " << action << " mime_type : " << mime_type << " content_state : " << content_state << " prop_state : " << prop_state << " revision : " << revision << " userstring : " << userstring << endl; -// QByteArray params; +// TQByteArray params; // -// QDataStream stream(params, IO_WriteOnly); +// TQDataStream stream(params, IO_WriteOnly); // stream << path << action << kind << mime_type << content_state << prop_state << revision << userstring; // -// emitDCOPSignal( "subversionNotify(QString,int,int,QString,int,int,long int,QString)", params ); +// emitDCOPSignal( "subversionNotify(TQString,int,int,TQString,int,int,long int,TQString)", params ); // } // -// void KSvnd::status(const QString& path, int text_status, int prop_status, int repos_text_status, int repos_prop_status, long int rev ) { +// void KSvnd::status(const TQString& path, int text_status, int prop_status, int repos_text_status, int repos_prop_status, long int rev ) { // kdDebug(9036) << "KDED/Subversion : status " << path << " " << text_status << " " << prop_status << " " // << repos_text_status << " " << repos_prop_status << " " << rev << endl; -// QByteArray params; +// TQByteArray params; // -// QDataStream stream(params, IO_WriteOnly); +// TQDataStream stream(params, IO_WriteOnly); // stream << path << text_status << prop_status << repos_text_status << repos_prop_status << rev; // -// emitDCOPSignal( "subversionStatus(QString,int,int,int,int,long int)", params ); +// emitDCOPSignal( "subversionStatus(TQString,int,int,int,int,long int)", params ); // } // -// void KSvnd::popupMessage( const QString& message ) { +// void KSvnd::popupMessage( const TQString& message ) { // kdDebug(9036) << "KDED/Subversion : popupMessage" << message << endl; // KMessageBox::information(0, message, i18n( "Subversion" ) ); // } diff --git a/vcs/subversion/kdevsvnd.h b/vcs/subversion/kdevsvnd.h index 831ebfdb..07943c18 100644 --- a/vcs/subversion/kdevsvnd.h +++ b/vcs/subversion/kdevsvnd.h @@ -24,7 +24,7 @@ #include <dcopclient.h> #include <kdedmodule.h> #include <kurl.h> -#include <qstringlist.h> +#include <tqstringlist.h> class KDevSvnd : public KDEDModule { @@ -35,15 +35,15 @@ K_DCOP //note: InSVN means parent is added. InRepos means itself is added enum { SomeAreFiles = 1, SomeAreFolders = 2, SomeAreInParentsEntries = 4, SomeParentsHaveSvn = 8, SomeHaveSvn = 16, SomeAreExternalToParent = 32, AllAreInParentsEntries = 64, AllParentsHaveSvn = 128, AllHaveSvn = 256, AllAreExternalToParent = 512, AllAreFolders = 1024 }; public: - KDevSvnd(const QCString &); + KDevSvnd(const TQCString &); ~KDevSvnd(); k_dcop: // void addAuthInfo(KIO::AuthInfo, long); - QString commitDialog(QString); - int sslServerTrustPrompt(QString certFailMsg, QString hostname, QString fingerPrint, QString validfrom, QString validuntil, QString issuerName, QString ascii_cert ); - QString sslCertFile(); - QCString sslPasswdDlg(QString promptMsg); + TQString commitDialog(TQString); + int sslServerTrustPrompt(TQString certFailMsg, TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert ); + TQString sslCertFile(); + TQCString sslPasswdDlg(TQString promptMsg); }; diff --git a/vcs/subversion/kdevsvnd_widgets.cpp b/vcs/subversion/kdevsvnd_widgets.cpp index 16e35ce3..8fd05950 100644 --- a/vcs/subversion/kdevsvnd_widgets.cpp +++ b/vcs/subversion/kdevsvnd_widgets.cpp @@ -13,12 +13,12 @@ */ #include "kdevsvnd_widgets.h" -#include <qpushbutton.h> -#include <qlistview.h> -#include <qlabel.h> +#include <tqpushbutton.h> +#include <tqlistview.h> +#include <tqlabel.h> #include <klocale.h> -SvnSSLTrustPrompt::SvnSSLTrustPrompt( QWidget* parent, const char* name, bool modal, WFlags f ) +SvnSSLTrustPrompt::SvnSSLTrustPrompt( TQWidget* parent, const char* name, bool modal, WFlags f ) :SvnSSLTrustPromptBase( parent, name, modal, f ) , m_code(-1) { @@ -27,24 +27,24 @@ SvnSSLTrustPrompt::SvnSSLTrustPrompt( QWidget* parent, const char* name, bool mo btnPermanent->setText(i18n("Accept Permanently")); btnTemporary->setText(i18n("Accept Temporarily")); btnReject->setText(i18n("Reject")); - connect( btnPermanent, SIGNAL(clicked()), this, SLOT(setPermanent()) ); - connect( btnTemporary, SIGNAL(clicked()), this, SLOT(setTemporary()) ); - connect( btnReject, SIGNAL(clicked()), this, SLOT(setRejected ()) ); + connect( btnPermanent, TQT_SIGNAL(clicked()), this, TQT_SLOT(setPermanent()) ); + connect( btnTemporary, TQT_SIGNAL(clicked()), this, TQT_SLOT(setTemporary()) ); + connect( btnReject, TQT_SIGNAL(clicked()), this, TQT_SLOT(setRejected ()) ); } SvnSSLTrustPrompt::~SvnSSLTrustPrompt() {} -void SvnSSLTrustPrompt::setupCertInfo( QString hostname, QString fingerPrint, QString validfrom, QString validuntil, QString issuerName, QString ascii_cert ) +void SvnSSLTrustPrompt::setupCertInfo( TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert ) { // setup texts - QListViewItem *host= new QListViewItem(listView1, i18n("Hostname"), hostname ); - QListViewItem *finger = new QListViewItem(listView1, i18n("FingerPrint"), fingerPrint ); - QListViewItem *validFrom = new QListViewItem(listView1, i18n("Valid From"), validfrom ); - QListViewItem *validUntil = new QListViewItem(listView1, i18n("Valid Until"), validuntil ); - QListViewItem *issName = new QListViewItem(listView1, i18n("Issuer"), issuerName ); - QListViewItem *cert = new QListViewItem(listView1, i18n("Cert"), ascii_cert ); + TQListViewItem *host= new TQListViewItem(listView1, i18n("Hostname"), hostname ); + TQListViewItem *finger = new TQListViewItem(listView1, i18n("FingerPrint"), fingerPrint ); + TQListViewItem *validFrom = new TQListViewItem(listView1, i18n("Valid From"), validfrom ); + TQListViewItem *validUntil = new TQListViewItem(listView1, i18n("Valid Until"), validuntil ); + TQListViewItem *issName = new TQListViewItem(listView1, i18n("Issuer"), issuerName ); + TQListViewItem *cert = new TQListViewItem(listView1, i18n("Cert"), ascii_cert ); } -void SvnSSLTrustPrompt::setupFailedReasonMsg( QString msg ) +void SvnSSLTrustPrompt::setupFailedReasonMsg( TQString msg ) { errMsgLabel->setText( msg ); } diff --git a/vcs/subversion/kdevsvnd_widgets.h b/vcs/subversion/kdevsvnd_widgets.h index c69fdb14..b0a2bec1 100644 --- a/vcs/subversion/kdevsvnd_widgets.h +++ b/vcs/subversion/kdevsvnd_widgets.h @@ -20,10 +20,10 @@ class SvnSSLTrustPrompt : public SvnSSLTrustPromptBase{ Q_OBJECT public: - SvnSSLTrustPrompt( QWidget* parent=0, const char* name=0, bool modal=true, WFlags f=0 ); + SvnSSLTrustPrompt( TQWidget* parent=0, const char* name=0, bool modal=true, WFlags f=0 ); ~SvnSSLTrustPrompt(); - void setupCertInfo( QString hostname, QString fingerPrint, QString validfrom, QString validuntil, QString issuerName, QString ascii_cert ); - void setupFailedReasonMsg( QString msg ); + void setupCertInfo( TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert ); + void setupFailedReasonMsg( TQString msg ); int code(); public slots: diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp index 85dcd883..4b16e68f 100644 --- a/vcs/subversion/subversion_core.cpp +++ b/vcs/subversion/subversion_core.cpp @@ -40,12 +40,12 @@ #include <ktempfile.h> #include <kprocess.h> #include <kstandarddirs.h> -#include <qtextcodec.h> -#include <qtextstream.h> -#include <qtextbrowser.h> +#include <tqtextcodec.h> +#include <tqtextstream.h> +#include <tqtextbrowser.h> #include <kmessagebox.h> #include <klocale.h> -#include <qregexp.h> +#include <tqregexp.h> #include <kapplication.h> #include <kinstance.h> @@ -55,13 +55,13 @@ using namespace KIO; using namespace SvnGlobal; subversionCore::subversionCore(subversionPart *part) -// : QObject(NULL, "subversion core"), DCOPObject("subversion") { - : QObject(NULL, "subversion core") { +// : TQObject(NULL, "subversion core"), DCOPObject("subversion") { + : TQObject(NULL, "subversion core") { m_part = part; m_widget = new subversionWidget(part, 0 , "subversionprocesswidget"); // m_logViewWidget = new SvnLogViewWidget( part, 0 ); // m_part->mainWindow()->embedOutputView( m_logViewWidget, i18n( "Subversion Log" ), i18n( "Subversion Log" ) ); -// if ( ! connectDCOPSignal("kded", "ksvnd", "subversionNotify(QString,int,int,QString,int,int,long int,QString)", "notification(QString,int,int,QString,int,int,long int,QString)", false ) ) +// if ( ! connectDCOPSignal("kded", "ksvnd", "subversionNotify(TQString,int,int,TQString,int,int,long int,TQString)", "notification(TQString,int,int,TQString,int,int,long int,TQString)", false ) ) // kdWarning() << "Failed to connect to kded dcop signal ! Notifications won't work..." << endl; m_fileInfoProvider = new SVNFileInfoProvider( part ); @@ -87,7 +87,7 @@ KDevVCSFileInfoProvider *subversionCore::fileInfoProvider() const { } //not used anymore -// void subversionCore::notification( const QString& path, int action, int kind, const QString& mime_type, int content_state ,int prop_state ,long int revision, const QString& userstring ) { +// void subversionCore::notification( const TQString& path, int action, int kind, const TQString& mime_type, int content_state ,int prop_state ,long int revision, const TQString& userstring ) { // kdDebug(9036) << "Subversion Notification : " // << "path : " << path // << "action: " << action @@ -118,16 +118,16 @@ void subversionCore::resolve( const KURL::List& list ) { servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" } kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl; - for ( QValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { + for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { kdDebug(9036) << "resolving: " << (*it).prettyURL() << endl; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 11; bool recurse = true; s << cmd << *it << recurse; SimpleJob * job = KIO::special(servURL, parms, true); job->setWindow( m_part->mainWindow()->main() ); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); } } @@ -135,32 +135,32 @@ void subversionCore::update( const KURL::List& list ) { KURL servURL = "kdevsvn+svn://blah/"; kdDebug(9036) << "Updating. servURL : " << servURL.prettyURL() << endl; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 2; int rev = -1; - s << cmd << list << rev << QString( "HEAD" ); + s << cmd << list << rev << TQString( "HEAD" ); SimpleJob * job = KIO::special(servURL, parms, false); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); initProcessDlg( (KIO::Job*)job, i18n("Subversion Update") , i18n("Subversion Update") ); } -void subversionCore::diff( const KURL::List& list, const QString& where){ +void subversionCore::diff( const KURL::List& list, const TQString& where){ kdDebug(9036) << "diff " << list << endl; KURL servURL = "kdevsvn+svn://this_is_a_fake_URL_and_this_is_normal/"; - for ( QValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 13; kdDebug(9036) << "diffing : " << (*it).prettyURL() << endl; int rev1=-1; int rev2=-1; - QString revkind1 = where; - QString revkind2 = "WORKING"; + TQString revkind1 = where; + TQString revkind2 = "WORKING"; s << cmd << *it << *it << rev1 << revkind1 << rev2 << revkind2 << true ; KIO::SimpleJob * job = KIO::special(servURL, parms, true); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); KIO::NetAccess::synchronousRun( job, 0 ); if ( diffresult.count() > 0 ) { //check kompare is available @@ -171,14 +171,14 @@ void subversionCore::diff( const KURL::List& list, const QString& where){ KTempFile tmpPatch = KTempFile(tmpDir.name()); // write the patch - QTextStream *stream = tmpPatch.textStream(); - stream->setCodec( QTextCodec::codecForName( "utf8" ) ); - for ( QStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) { + TQTextStream *stream = tmpPatch.textStream(); + stream->setCodec( TQTextCodec::codecForName( "utf8" ) ); + for ( TQStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) { ( *stream ) << ( *it2 ) << "\n"; } tmpPatch.close(); - QString ourCopy = tmpDir.name()+(*it).fileName(); + TQString ourCopy = tmpDir.name()+(*it).fileName(); KProcess copy; copy << "cp" << (*it).prettyURL(0,KURL::StripFileProtocol) << tmpDir.name(); @@ -197,9 +197,9 @@ void subversionCore::diff( const KURL::List& list, const QString& where){ // only diff KTempFile *tmp = new KTempFile; tmp->setAutoDelete(true); - QTextStream *stream = tmp->textStream(); - stream->setCodec( QTextCodec::codecForName( "utf8" ) ); - for ( QStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) { + TQTextStream *stream = tmp->textStream(); + stream->setCodec( TQTextCodec::codecForName( "utf8" ) ); + for ( TQStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) { ( *stream ) << ( *it2 ) << "\n"; } tmp->close(); @@ -209,17 +209,17 @@ void subversionCore::diff( const KURL::List& list, const QString& where){ } } else { //else do it with message box Subversion_Diff df; - for ( QStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) { + for ( TQStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) { df.text->append( *it2 ); } - QFont f = df.font(); + TQFont f = df.font(); f.setFixedPitch( true ); df.text->setFont( f ); df.exec(); } } else{ - QString diffTo = i18n("the local disk checked out copy."); + TQString diffTo = i18n("the local disk checked out copy."); if ( where=="HEAD"){ diffTo=i18n("the current svn HEAD version."); } @@ -230,18 +230,18 @@ void subversionCore::diff( const KURL::List& list, const QString& where){ } void subversionCore::diffAsync( const KURL &pathOrUrl1, const KURL &pathOrUrl2, - int rev1, QString revKind1, int rev2, QString revKind2, + int rev1, TQString revKind1, int rev2, TQString revKind2, bool recurse, bool pegdiff ) { KURL servURL = "kdevsvn+svn://blah/"; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 13; kdDebug(9036) << "diffing async : " << pathOrUrl1 << " and " << pathOrUrl2 << endl; s << cmd << pathOrUrl1 << pathOrUrl2 << rev1 << revKind1 << rev2 << revKind2 << recurse; s << pegdiff; KIO::SimpleJob * job = KIO::special(servURL, parms, false); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotDiffResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotDiffResult( KIO::Job * ) ) ); initProcessDlg( (KIO::Job*)job, pathOrUrl1.prettyURL(), pathOrUrl2.prettyURL() ); } @@ -252,16 +252,16 @@ void subversionCore::commit( const KURL::List& list, bool recurse, bool keeplock servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" } kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 103; s << cmd << recurse << keeplocks; - for ( QValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { + for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { kdDebug(9036) << "adding to list: " << (*it).prettyURL() << endl; s << *it; } SimpleJob * job = KIO::special(servURL, parms, false); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); if( list.count() == 1 ) initProcessDlg( (KIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Commit to remote repository") ); else if( list.count() > 1 ) @@ -269,7 +269,7 @@ void subversionCore::commit( const KURL::List& list, bool recurse, bool keeplock } // Right now, only one item for each action. void subversionCore::svnLog( const KURL::List& list, - int revstart, QString revKindStart, int revend, QString revKindEnd, + int revstart, TQString revKindStart, int revend, TQString revKindEnd, bool discorverChangedPath, bool strictNodeHistory ) { // ensure that part has repository information. This info is used to retrieve root repository URL @@ -281,26 +281,26 @@ void subversionCore::svnLog( const KURL::List& list, servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" } kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); // prepare arguments int cmd = 4; // int revstart = -1, revend = 0; -// QString revKindStart = "HEAD", revKindEnd = ""; +// TQString revKindStart = "HEAD", revKindEnd = ""; // bool repositLog = true, discorverChangedPath = true, strictNodeHistory = true; s << cmd << revstart << revKindStart << revend << revKindEnd; s << discorverChangedPath << strictNodeHistory; - for ( QValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { + for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { kdDebug(9036) << "svnCore: adding to list: " << (*it).prettyURL() << endl; s << *it; } SimpleJob * job = KIO::special(servURL, parms, false); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotLogResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotLogResult( KIO::Job * ) ) ); // progress info. LogView is allowed and meaninful only for one url in KDev3.4 initProcessDlg( (KIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Subversion Log View") ); } -void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, QString revKindStart, int revend, QString revKindEnd ) +void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, TQString revKindStart, int revend, TQString revKindEnd ) { KURL servURL = m_part->baseURL(); if ( servURL.isEmpty() ) servURL="kdevsvn+svn://blah/"; @@ -308,15 +308,15 @@ void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, QString servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" } kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); // prepare arguments int cmd = 14; s << cmd << url << (int)mode ; s << revstart << revKindStart << revend << revKindEnd ; SimpleJob * job = KIO::special(servURL, parms, false); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotBlameResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotBlameResult( KIO::Job * ) ) ); initProcessDlg( (KIO::Job*)job, url.prettyURL() , i18n("Subversion Blame") ); } @@ -325,75 +325,75 @@ void subversionCore::add( const KURL::List& list ) { KURL servURL = "kdevsvn+svn://blah/"; kdDebug(9036) << "Deleting servURL : " << servURL.prettyURL() << endl; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 6; s << cmd << list; // add/delete/revert works on local copy. Don't need to show progress dialog SimpleJob * job = KIO::special(servURL, parms, false); job->setWindow( m_part->mainWindow()->main() ); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); } void subversionCore::del( const KURL::List& list ) { KURL servURL = "kdevsvn+svn://blah/"; kdDebug(9036) << "Deleting servURL : " << servURL.prettyURL() << endl; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 7; s << cmd << list; // add/delete/revert works on local copy. Don't need to show progress dialog SimpleJob * job = KIO::special(servURL, parms, false); job->setWindow( m_part->mainWindow()->main() ); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); } void subversionCore::revert( const KURL::List& list ) { KURL servURL = "kdevsvn+svn://blah/"; kdDebug(9036) << "Reverting servURL : " << servURL.prettyURL() << endl; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 8; s << cmd << list; SimpleJob * job = KIO::special(servURL, parms, false); job->setWindow( m_part->mainWindow()->main() ); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); } void subversionCore::checkout() { svn_co checkoutDlg; - if ( checkoutDlg.exec() == QDialog::Accepted ) { + if ( checkoutDlg.exec() == TQDialog::Accepted ) { //checkout :) - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); KURL servURL ( checkoutDlg.serverURL->url() ); wcPath = checkoutDlg.localDir->url() + "/" + checkoutDlg.newDir->text(); int cmd = 1; int rev = -1; - s << cmd << servURL << KURL( wcPath ) << rev << QString( "HEAD" ); + s << cmd << servURL << KURL( wcPath ) << rev << TQString( "HEAD" ); servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" SimpleJob * job = KIO::special(servURL,parms, true); job->setWindow( m_part->mainWindow()->main() ); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotEndCheckout( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotEndCheckout( KIO::Job * ) ) ); } } void subversionCore::switchTree( const KURL &path, const KURL &repositUrl, - int revNum, const QString &revKind, bool recurse ) + int revNum, const TQString &revKind, bool recurse ) { KURL servURL = "kdevsvn+svn://blah/"; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); // prepare arguments int cmd = 12; s << cmd << path << repositUrl ; s << recurse << revNum << revKind; SimpleJob * job = KIO::special(servURL, parms, false); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); initProcessDlg( (KIO::Job*)job, repositUrl.prettyURL() , path.prettyURL() ); } @@ -401,66 +401,66 @@ void subversionCore::switchRelocate( const KURL &path, const KURL ¤tUrl, const KURL &newUrl, bool recurse ) { KURL servURL = "kdevsvn+svn://blah/"; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); // prepare arguments int cmd = 16; s << cmd << path << currentUrl << newUrl << recurse; SimpleJob * job = KIO::special(servURL, parms, false); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); // this doesn't contact repository } -void subversionCore::svnCopy( const KURL &src, int srcRev, const QString &srcRevKind, +void subversionCore::svnCopy( const KURL &src, int srcRev, const TQString &srcRevKind, const KURL &dest ) { KURL servURL = "kdevsvn+svn://blah/"; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); // prepare arguments int cmd = 17; s << cmd << src << srcRev << srcRevKind << dest; SimpleJob * job = KIO::special(servURL, parms, false); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); initProcessDlg( (KIO::Job*)job, src.prettyURL(), dest.prettyURL() ); } -void subversionCore::merge( const KURL &src1, int rev1, QString revKind1, - const KURL &src2, int rev2, QString revKind2, const KURL &wc_path, +void subversionCore::merge( const KURL &src1, int rev1, TQString revKind1, + const KURL &src2, int rev2, TQString revKind2, const KURL &wc_path, bool recurse, bool ignore_ancestry, bool force, bool dry_run ) { KURL servURL = "kdevsvn+svn://blah/"; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); // prepare arguments int cmd = 18; s << cmd << src1 << rev1 << revKind1 << src2 << rev2 << revKind2 << wc_path; s << recurse << ignore_ancestry << force << dry_run; SimpleJob * job = KIO::special(servURL, parms, false); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); initProcessDlg( (KIO::Job*)job, src1.prettyURL() + "\n" + src2.prettyURL() , wc_path.prettyURL() ); } -bool subversionCore::clientInfo( KURL path_or_url, bool recurse, QMap< KURL, SvnInfoHolder> &holderMap ) +bool subversionCore::clientInfo( KURL path_or_url, bool recurse, TQMap< KURL, SvnInfoHolder> &holderMap ) { KURL servURL = "kdevsvn+svn://blah/"; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 15; - s << cmd << path_or_url << -1 << QString("UNSPECIFIED") << -1 << QString("UNSPECIFIED") << recurse; + s << cmd << path_or_url << -1 << TQString("UNSPECIFIED") << -1 << TQString("UNSPECIFIED") << recurse; SimpleJob *job = KIO::special( servURL, parms, false ); - QMap<QString,QString> ma; + TQMap<TQString,TQString> ma; KIO::NetAccess::synchronousRun(job, 0, 0, 0, &ma ); // synchronize - QValueList<QString> keys = ma.keys(); - QValueList<QString>::Iterator begin = keys.begin(), end = keys.end(), it; + TQValueList<TQString> keys = ma.keys(); + TQValueList<TQString>::Iterator begin = keys.begin(), end = keys.end(), it; int curIdx, lastIdx; - QRegExp rx( "([0-9]*)(.*)" ); + TQRegExp rx( "([0-9]*)(.*)" ); for ( it = begin; it != end; /*++it*/) { kdDebug(9036) << "METADATA key: " << *it << " value: " << ma[ *it ] << endl; @@ -496,7 +496,7 @@ bool subversionCore::clientInfo( KURL path_or_url, bool recurse, QMap< KURL, Svn void subversionCore::slotEndCheckout( KIO::Job * job ) { if ( job->error() ) { job->showErrorDialog( m_part->mainWindow()->main() ); - emit checkoutFinished( QString::null ); + emit checkoutFinished( TQString::null ); } else emit checkoutFinished(wcPath); } @@ -513,9 +513,9 @@ void subversionCore::slotResult( KIO::Job * job ) { return; } KIO::MetaData ma = job->metaData(); - QValueList<QString> keys = ma.keys(); + TQValueList<TQString> keys = ma.keys(); qHeapSort( keys ); - QValueList<QString>::Iterator begin = keys.begin(), end = keys.end(), it; + TQValueList<TQString>::Iterator begin = keys.begin(), end = keys.end(), it; for ( it = begin; it != end; ++it ) { // kdDebug(9036) << "METADATA : " << *it << ":" << ma[ *it ] << endl; @@ -542,15 +542,15 @@ void subversionCore::slotLogResult( KIO::Job * job ) return; } - QValueList<SvnLogHolder> holderList; + TQValueList<SvnLogHolder> holderList; KIO::MetaData ma = job->metaData(); - QValueList<QString> keys = ma.keys(); - QRegExp rx( "([0-9]*)(.*)" ); + TQValueList<TQString> keys = ma.keys(); + TQRegExp rx( "([0-9]*)(.*)" ); int curIdx, lastIdx; - QString requestedUrl; + TQString requestedUrl; - for (QValueList<QString>::Iterator it = keys.begin(); it != keys.end(); /*++it*/ ){ + for (TQValueList<TQString>::Iterator it = keys.begin(); it != keys.end(); /*++it*/ ){ if ( rx.search( *it ) == -1 ){ kdDebug(9036) << " Exiting loop at line " << __LINE__ <<endl; return; // something is wrong ! :) @@ -601,14 +601,14 @@ void subversionCore::slotBlameResult( KIO::Job * job ) ) ); return; } - QValueList<SvnBlameHolder> blameList; + TQValueList<SvnBlameHolder> blameList; KIO::MetaData ma = job->metaData(); - QValueList<QString> keys = ma.keys(); - QRegExp rx( "([0-9]*)(.*)" ); + TQValueList<TQString> keys = ma.keys(); + TQRegExp rx( "([0-9]*)(.*)" ); int curIdx, lastIdx; - for (QValueList<QString>::Iterator it = keys.begin(); it != keys.end(); /*++it*/ ){ + for (TQValueList<TQString>::Iterator it = keys.begin(); it != keys.end(); /*++it*/ ){ if ( rx.search( *it ) == -1 ){ kdDebug(9036) << " Exiting loop at line " << __LINE__ <<endl; return; // something is wrong ! :) @@ -672,10 +672,10 @@ void subversionCore::slotDiffResult( KIO::Job * job ) return; } KIO::MetaData ma = job->metaData(); - QValueList<QString> keys = ma.keys(); + TQValueList<TQString> keys = ma.keys(); qHeapSort( keys ); - QValueList<QString>::Iterator begin = keys.begin(), end = keys.end(), it; - QStringList diffList; + TQValueList<TQString>::Iterator begin = keys.begin(), end = keys.end(), it; + TQStringList diffList; for ( it = begin; it != end; ++it ) { // kdDebug(9036) << "METADATA : " << *it << ":" << ma[ *it ] << endl; @@ -689,9 +689,9 @@ void subversionCore::slotDiffResult( KIO::Job * job ) if ( !KStandardDirs::findExe( "kompare" ).isNull() ) { KTempFile *tmp = new KTempFile; tmp->setAutoDelete(true); - QTextStream *stream = tmp->textStream(); - stream->setCodec( QTextCodec::codecForName( "utf8" ) ); - for ( QStringList::Iterator it2 = diffList.begin();it2 != diffList.end() ; ++it2 ) { + TQTextStream *stream = tmp->textStream(); + stream->setCodec( TQTextCodec::codecForName( "utf8" ) ); + for ( TQStringList::Iterator it2 = diffList.begin();it2 != diffList.end() ; ++it2 ) { ( *stream ) << ( *it2 ) << "\n"; } tmp->close(); @@ -700,12 +700,12 @@ void subversionCore::slotDiffResult( KIO::Job * job ) p->start(); } else { //else do it with message box - KMessageBox::information( NULL, i18n("You do not have kompare installed. We recommend you install kompare to view differences graphically.") + "\nhttp://www.caffeinated.me.uk/kompare/" , QString::null , "userDoesNotWantKompare" ); + KMessageBox::information( NULL, i18n("You do not have kompare installed. We recommend you install kompare to view differences graphically.") + "\nhttp://www.caffeinated.me.uk/kompare/" , TQString::null , "userDoesNotWantKompare" ); Subversion_Diff df; - for ( QStringList::Iterator it2 = diffList.begin();it2 != diffList.end() ; ++it2 ) { + for ( TQStringList::Iterator it2 = diffList.begin();it2 != diffList.end() ; ++it2 ) { df.text->append( *it2 ); } - QFont f = df.font(); + TQFont f = df.font(); f.setFixedPitch( true ); df.text->setFont( f ); df.exec(); @@ -716,19 +716,19 @@ void subversionCore::slotDiffResult( KIO::Job * job ) } } -void subversionCore::initProcessDlg( KIO::Job *job, const QString &src, const QString &dest ) +void subversionCore::initProcessDlg( KIO::Job *job, const TQString &src, const TQString &dest ) { SvnProgressDlg *progress = new SvnProgressDlg( true ); progress->setSourceUrl( src ); progress->setDestUrl( dest ); progress->setJob( job ); - connect( job, SIGNAL( totalSize(KIO::Job*, KIO::filesize_t) ), - progress, SLOT( slotTotalSize (KIO::Job*, KIO::filesize_t) ) ); - connect( job, SIGNAL( processedSize(KIO::Job*, KIO::filesize_t) ), - progress, SLOT( slotProcessedSize(KIO::Job*, KIO::filesize_t) ) ); + connect( job, TQT_SIGNAL( totalSize(KIO::Job*, KIO::filesize_t) ), + progress, TQT_SLOT( slotTotalSize (KIO::Job*, KIO::filesize_t) ) ); + connect( job, TQT_SIGNAL( processedSize(KIO::Job*, KIO::filesize_t) ), + progress, TQT_SLOT( slotProcessedSize(KIO::Job*, KIO::filesize_t) ) ); } -void subversionCore::createNewProject( const QString& // dirName +void subversionCore::createNewProject( const TQString& // dirName , const KURL& // importURL , bool // init ) { diff --git a/vcs/subversion/subversion_core.h b/vcs/subversion/subversion_core.h index 7cf86a28..1c9611c8 100644 --- a/vcs/subversion/subversion_core.h +++ b/vcs/subversion/subversion_core.h @@ -21,8 +21,8 @@ #ifndef __SUBVERSION_CORE_H__ #define __SUBVERSION_CORE_H__ -#include <qobject.h> -#include <qwidget.h> +#include <tqobject.h> +#include <tqwidget.h> #include <kio/job.h> #include <kurl.h> #include <ktempdir.h> @@ -37,8 +37,8 @@ class SvnBlameHolder; class SvnLogHolder; class SvnLogViewWidget; -// class subversionCore : public QObject, public DCOPObject -class subversionCore : public QObject { +// class subversionCore : public TQObject, public DCOPObject +class subversionCore : public TQObject { Q_OBJECT // K_DCOP @@ -51,35 +51,35 @@ public: void update( const KURL::List&); void commit( const KURL::List&, bool recurse, bool keeplocks ); void svnLog( const KURL::List& list, - int revstart, QString revKindStart, int revend, QString revKindEnd, + int revstart, TQString revKindStart, int revend, TQString revKindEnd, bool discorverChangedPath, bool strictNodeHistory ); - void blame( const KURL &url, SvnGlobal::UrlMode mode, int revstart, QString revKindStart, int revend, QString revKindEnd ); + void blame( const KURL &url, SvnGlobal::UrlMode mode, int revstart, TQString revKindStart, int revend, TQString revKindEnd ); void add( const KURL::List&); void del( const KURL::List&); - void diff( const KURL::List&, const QString& where); + void diff( const KURL::List&, const TQString& where); void diffAsync( const KURL &pathOrUrl1, const KURL &pathOrUrl2, - int rev1, QString revKind1, int rev2, QString revKind2, + int rev1, TQString revKind1, int rev2, TQString revKind2, bool recurse, bool pegdiff = false ); void revert( const KURL::List&); void resolve( const KURL::List&); void checkout(); void switchTree( const KURL &path, const KURL &repositUrl, - int revNum, const QString &revKind, bool recurse ); + int revNum, const TQString &revKind, bool recurse ); void switchRelocate( const KURL &path, const KURL ¤tUrl, const KURL &newUrl, bool recurse ); - void svnCopy( const KURL &src, int srcRev, const QString &srcRevKind, const KURL &dest ); - void merge( const KURL &src1, int rev1, QString revKind1, const KURL &src2, int rev2, QString revKind2, const KURL &wc_path, + void svnCopy( const KURL &src, int srcRev, const TQString &srcRevKind, const KURL &dest ); + void merge( const KURL &src1, int rev1, TQString revKind1, const KURL &src2, int rev2, TQString revKind2, const KURL &wc_path, bool recurse, bool ignore_ancestry, bool force, bool dry_run ); // This is blocking function. But the GUI is not blocked. // Information will be pulled solely from the working copy.Thus no network connections will be made. // Parameter holderMap is the map to be filled out by this method. Callers should preallocate this object. // Return true on success. Otherwise return false. - bool clientInfo( KURL path_or_url, bool recurse, QMap< KURL, SvnGlobal::SvnInfoHolder> &holderMap ); - void createNewProject( const QString& dirName, const KURL& importURL, bool init ); + bool clientInfo( KURL path_or_url, bool recurse, TQMap< KURL, SvnGlobal::SvnInfoHolder> &holderMap ); + void createNewProject( const TQString& dirName, const KURL& importURL, bool init ); KDevVCSFileInfoProvider *fileInfoProvider() const; - void initProcessDlg( KIO::Job *job, const QString &src, const QString &dest ); + void initProcessDlg( KIO::Job *job, const TQString &src, const TQString &dest ); // k_dcop: -// void notification( const QString&, int,int, const QString&, int,int ,long int, const QString& ); +// void notification( const TQString&, int,int, const TQString&, int,int ,long int, const TQString& ); private slots: void slotEndCheckout( KIO::Job * job ); @@ -89,14 +89,14 @@ private slots: void slotDiffResult( KIO::Job * job ); signals: - void checkoutFinished( QString dir ); + void checkoutFinished( TQString dir ); private: - QGuardedPtr<subversionWidget> m_widget; + TQGuardedPtr<subversionWidget> m_widget; subversionPart *m_part; - QString wcPath; + TQString wcPath; SVNFileInfoProvider *m_fileInfoProvider; - QStringList diffresult; //for diff commands ;) + TQStringList diffresult; //for diff commands ;) // be nice about tmp diff files: delete all of them when exiting. KTempDir* diffTmpDir; diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp index ee68575c..be0a4411 100644 --- a/vcs/subversion/subversion_fileinfo.cpp +++ b/vcs/subversion/subversion_fileinfo.cpp @@ -20,14 +20,14 @@ #include "subversion_fileinfo.h" #include "subversion_core.h" #include <kdebug.h> -#include <qfileinfo.h> -#include <qdir.h> +#include <tqfileinfo.h> +#include <tqdir.h> #include <kdevproject.h> #include <unistd.h> #include <kapplication.h> #include <kdevmainwindow.h> #include <kmainwindow.h> -#include <qregexp.h> +#include <tqregexp.h> #include <kio/netaccess.h> #include <klocale.h> @@ -47,7 +47,7 @@ SVNFileInfoProvider::~SVNFileInfoProvider() { } //synchronous -const VCSFileInfoMap *SVNFileInfoProvider::status( const QString &dirPath ) { +const VCSFileInfoMap *SVNFileInfoProvider::status( const TQString &dirPath ) { if ( !m_cachedDirEntries ) m_cachedDirEntries = new VCSFileInfoMap; // return m_cachedDirEntries; @@ -57,38 +57,38 @@ const VCSFileInfoMap *SVNFileInfoProvider::status( const QString &dirPath ) { if ( dirPath != m_previousDirPath ) { m_previousDirPath = dirPath; KURL servURL = "kdevsvn+http://fakeserver_this_is_normal_behavior/"; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 9; - QString rPath = projectDirectory( ); - rPath += QDir::separator() + dirPath; - kdDebug(9036) << "DIR : " << rPath << " " << KURL( QFileInfo( rPath ).absFilePath() ) << endl; + TQString rPath = projectDirectory( ); + rPath += TQDir::separator() + dirPath; + kdDebug(9036) << "DIR : " << rPath << " " << KURL( TQFileInfo( rPath ).absFilePath() ) << endl; -// s << cmd << KURL( QFileInfo( rPath ).absFilePath() ) << true << true; //original line +// s << cmd << KURL( TQFileInfo( rPath ).absFilePath() ) << true << true; //original line // Dukju Ahn: if checkRepos is set, status() accesses remote repository, // which causes significant delaym_owner especially when network speed is not fast enough. // Of course, the user cannot get information about the out-of-dateness of his local copy. - s << cmd << KURL( QFileInfo( rPath ).absFilePath() ) << false/*checkRepos*/ << false /*fullRecurse*/; + s << cmd << KURL( TQFileInfo( rPath ).absFilePath() ) << false/*checkRepos*/ << false /*fullRecurse*/; KIO::SimpleJob *job2 = KIO::special(servURL, parms, false); job2->setWindow( m_part->mainWindow()->main() ); - QMap<QString,QString> ma; + TQMap<TQString,TQString> ma; KIO::NetAccess::synchronousRun(job2, m_part->mainWindow()->main(), 0, 0, &ma ); - QValueList<QString> keys = ma.keys(); + TQValueList<TQString> keys = ma.keys(); qHeapSort( keys ); - QValueList<QString>::Iterator begin = keys.begin(), end = keys.end(), it; + TQValueList<TQString>::Iterator begin = keys.begin(), end = keys.end(), it; - QString path; + TQString path; int text_status = 0, prop_status = 0, repos_text_status = 0, repos_prop_status = 0; long int rev = 0; int curIdx, lastIdx; - QRegExp rx( "([0-9]*)(.*)" ); + TQRegExp rx( "([0-9]*)(.*)" ); for ( it = begin; it != end; ) { kdDebug(9036) << "METADATA : " << *it << ":" << ma[ *it ] << endl; if ( rx.search( *it ) == -1 ) return m_cachedDirEntries; // something is wrong ! :) @@ -130,7 +130,7 @@ const VCSFileInfoMap *SVNFileInfoProvider::status( const QString &dirPath ) { return m_cachedDirEntries; } -bool SVNFileInfoProvider::requestStatus( const QString &dirPath, void *callerData, bool recursive, bool checkRepos ) { +bool SVNFileInfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) { kdDebug(9036) << "##################################################################################### svn provider : request status" << endl; m_savedCallerData = callerData; // Flush old cache @@ -141,21 +141,21 @@ bool SVNFileInfoProvider::requestStatus( const QString &dirPath, void *callerDat m_previousDirPath = dirPath; } - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 9; - QString rPath = projectDirectory( ); - rPath += QDir::separator() + dirPath; + TQString rPath = projectDirectory( ); + rPath += TQDir::separator() + dirPath; if( ! m_part->isValidDirectory( rPath ) ){ return false; } - kdDebug(9036) << "DIR : " << rPath << " " << QFileInfo( rPath ).absFilePath() << endl; - s << cmd << KURL( QFileInfo( rPath ).absFilePath() ) << checkRepos << recursive; + kdDebug(9036) << "DIR : " << rPath << " " << TQFileInfo( rPath ).absFilePath() << endl; + s << cmd << KURL( TQFileInfo( rPath ).absFilePath() ) << checkRepos << recursive; KURL servURL = "kdevsvn+http://fakeserver_this_is_normal_behavior/"; job = KIO::special(servURL, parms, false); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); if( checkRepos ) m_part->svncore()->initProcessDlg( job, dirPath, i18n("Subversion File/Directory Status") ); return true; @@ -166,16 +166,16 @@ void SVNFileInfoProvider::slotResult( KIO::Job *j ) { j->showErrorDialog( m_part->mainWindow()->main() ); KIO::MetaData ma = j->metaData(); - QValueList<QString> keys = ma.keys(); + TQValueList<TQString> keys = ma.keys(); qHeapSort( keys ); - QValueList<QString>::Iterator begin = keys.begin(), end = keys.end(), it; + TQValueList<TQString>::Iterator begin = keys.begin(), end = keys.end(), it; - QString path; + TQString path; int text_status = 0, prop_status = 0, repos_text_status = 0, repos_prop_status = 0; long int rev = 0; int curIdx, lastIdx; - QRegExp rx( "([0-9]*)(.*)" ); + TQRegExp rx( "([0-9]*)(.*)" ); for ( it = begin; it != end; ) { kdDebug(9036) << "METADATA : " << *it << ":" << ma[ *it ] << endl; if ( rx.search( *it ) == -1 ) return; // something is wrong ! :) @@ -217,7 +217,7 @@ void SVNFileInfoProvider::slotResult( KIO::Job *j ) { emit statusReady(*m_cachedDirEntries, m_savedCallerData); } -void SVNFileInfoProvider::slotStatus( const QString& path,int text_status, int prop_status,int repos_text_status, int repos_prop_status, long int rev) { +void SVNFileInfoProvider::slotStatus( const TQString& path,int text_status, int prop_status,int repos_text_status, int repos_prop_status, long int rev) { // kdDebug(9036) << "##################################################################################### svn provider : slotstatus" // << " path " << path << " text_status " << text_status << " prop_status " << prop_status << " repos_text_status " << repos_text_status // << " repos_prop_status " << repos_prop_status << " rev " << rev @@ -226,8 +226,8 @@ void SVNFileInfoProvider::slotStatus( const QString& path,int text_status, int p if ( !m_cachedDirEntries ) m_cachedDirEntries = new VCSFileInfoMap; - QString wRev = QString::number( rev ); //work rev - QString rRev = QString::number( rev );// repo rev + TQString wRev = TQString::number( rev ); //work rev + TQString rRev = TQString::number( rev );// repo rev VCSFileInfo::FileState state = VCSFileInfo::Unknown; switch ( text_status ) { @@ -303,16 +303,16 @@ void SVNFileInfoProvider::slotStatus( const QString& path,int text_status, int p break; } - VCSFileInfo info(QFileInfo( path ).fileName(),wRev,rRev,state); + VCSFileInfo info(TQFileInfo( path ).fileName(),wRev,rRev,state); kdDebug(9036) << "Inserting " << info.toString() << endl; - m_cachedDirEntries->insert( QFileInfo( path ).fileName(), info); + m_cachedDirEntries->insert( TQFileInfo( path ).fileName(), info); } -QString SVNFileInfoProvider::projectDirectory() const { +TQString SVNFileInfoProvider::projectDirectory() const { return owner()->project()->projectDirectory(); } -const VCSFileInfoMap *SVNFileInfoProvider::statusExt( const QString &dirPath, +const VCSFileInfoMap *SVNFileInfoProvider::statusExt( const TQString &dirPath, bool checkRepos, bool fullRecurse, bool getAll, bool noIgnore ) { if ( !m_recursiveDirEntries ) @@ -322,30 +322,30 @@ const VCSFileInfoMap *SVNFileInfoProvider::statusExt( const QString &dirPath, m_recursiveDirEntries->clear(); m_recursivePreviousDirPath = dirPath; KURL servURL = "kdevsvn+http://fakeserver_this_is_normal_behavior/"; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 109; - QString rPath = projectDirectory( ); - rPath += QDir::separator() + dirPath; - kdDebug(9036) << "DIR : " << rPath << " " << KURL( QFileInfo( rPath ).absFilePath() ) << endl; - s << cmd << checkRepos << fullRecurse << getAll << noIgnore << -1 << "WORKING" << KURL( QFileInfo( rPath ).absFilePath() ); + TQString rPath = projectDirectory( ); + rPath += TQDir::separator() + dirPath; + kdDebug(9036) << "DIR : " << rPath << " " << KURL( TQFileInfo( rPath ).absFilePath() ) << endl; + s << cmd << checkRepos << fullRecurse << getAll << noIgnore << -1 << "WORKING" << KURL( TQFileInfo( rPath ).absFilePath() ); KIO::SimpleJob *job2 = KIO::special(servURL, parms, false); job2->setWindow( m_part->mainWindow()->main() ); - QMap<QString,QString> ma; + TQMap<TQString,TQString> ma; KIO::NetAccess::synchronousRun(job2, m_part->mainWindow()->main(), 0, 0, &ma ); - QValueList<QString> keys = ma.keys(); + TQValueList<TQString> keys = ma.keys(); qHeapSort( keys ); - QValueList<QString>::Iterator begin = keys.begin(), end = keys.end(), it; + TQValueList<TQString>::Iterator begin = keys.begin(), end = keys.end(), it; - QString path; + TQString path; int text_status = 0, prop_status = 0, repos_text_status = 0, repos_prop_status = 0; long int rev = 0; int curIdx, lastIdx; - QRegExp rx( "([0-9]*)(.*)" ); + TQRegExp rx( "([0-9]*)(.*)" ); for ( it = begin; it != end; ) { kdDebug(9036) << "METADATA : " << *it << ":" << ma[ *it ] << endl; if ( rx.search( *it ) == -1 ) return m_recursiveDirEntries; // something is wrong ! :) @@ -389,14 +389,14 @@ const VCSFileInfoMap *SVNFileInfoProvider::statusExt( const QString &dirPath, } void SVNFileInfoProvider::slotStatusExt( - const QString& reqPath, const QString& path,int text_status, int prop_status,int repos_text_status, int repos_prop_status, long int rev) + const TQString& reqPath, const TQString& path,int text_status, int prop_status,int repos_text_status, int repos_prop_status, long int rev) { if ( !m_recursiveDirEntries ) m_recursiveDirEntries = new VCSFileInfoMap; - QString wRev = QString::number( rev ); //work rev - QString rRev = QString::number( rev );// repo rev + TQString wRev = TQString::number( rev ); //work rev + TQString rRev = TQString::number( rev );// repo rev VCSFileInfo::FileState state = VCSFileInfo::Unknown; switch ( text_status ) { @@ -472,10 +472,10 @@ void SVNFileInfoProvider::slotStatusExt( break; } - QString relativeReqPath; + TQString relativeReqPath; if (reqPath == "./"){ // case of project top directory - QString reqAbsPath = projectDirectory(); + TQString reqAbsPath = projectDirectory(); if( path == reqAbsPath ){ //key of VCSInfo is project directory itself. So it is set to . @@ -486,7 +486,7 @@ void SVNFileInfoProvider::slotStatusExt( } } else { - QString reqAbsPath = projectDirectory() + QDir::separator() + reqPath; + TQString reqAbsPath = projectDirectory() + TQDir::separator() + reqPath; relativeReqPath = path.right( path.length() - reqAbsPath.length() - 1 ); if (relativeReqPath == reqAbsPath){ @@ -498,9 +498,9 @@ void SVNFileInfoProvider::slotStatusExt( VCSFileInfo info(relativeReqPath, wRev, rRev, state); m_recursiveDirEntries->insert( relativeReqPath, info ); -// VCSFileInfo info(QFileInfo( path ).fileName(),wRev,rRev,state); +// VCSFileInfo info(TQFileInfo( path ).fileName(),wRev,rRev,state); kdDebug(9036) << "Inserting " << info.toString() << endl; -// m_recursiveDirEntries->insert( QFileInfo( path ).fileName(), info); +// m_recursiveDirEntries->insert( TQFileInfo( path ).fileName(), info); } #include "subversion_fileinfo.moc" diff --git a/vcs/subversion/subversion_fileinfo.h b/vcs/subversion/subversion_fileinfo.h index 791d5e65..c78dfed6 100644 --- a/vcs/subversion/subversion_fileinfo.h +++ b/vcs/subversion/subversion_fileinfo.h @@ -21,7 +21,7 @@ #ifndef SVNFILEINFOPROVIDER_H #define SVNFILEINFOPROVIDER_H -#include <qmap.h> +#include <tqmap.h> #include <kdevversioncontrol.h> #include <kio/job.h> @@ -44,26 +44,26 @@ public: virtual ~SVNFileInfoProvider(); // -- Sync interface - virtual const VCSFileInfoMap *status( const QString &dirPath ); + virtual const VCSFileInfoMap *status( const TQString &dirPath ); // -- These two are used for subversionPart and subversionCore. Of couruse, others can use it. - const VCSFileInfoMap* statusExt( const QString &dirPath, bool checkRepos, bool fullRecurse, bool getAll, bool noIgnore ); - void slotStatusExt( const QString&, const QString& , int, int, int, int, long int ) ; + const VCSFileInfoMap* statusExt( const TQString &dirPath, bool checkRepos, bool fullRecurse, bool getAll, bool noIgnore ); + void slotStatusExt( const TQString&, const TQString& , int, int, int, int, long int ) ; // -- Async interface for requesting data - virtual bool requestStatus( const QString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ); + virtual bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ); - QString projectDirectory() const; + TQString projectDirectory() const; k_dcop: - void slotStatus( const QString& , int, int, int, int, long int ) ; + void slotStatus( const TQString& , int, int, int, int, long int ) ; public slots: void slotResult( KIO::Job * ); private: mutable void *m_savedCallerData; - mutable QString m_previousDirPath; - mutable QString m_recursivePreviousDirPath; + mutable TQString m_previousDirPath; + mutable TQString m_recursivePreviousDirPath; mutable VCSFileInfoMap *m_cachedDirEntries; mutable VCSFileInfoMap *m_recursiveDirEntries; KIO::SimpleJob *job; diff --git a/vcs/subversion/subversion_global.h b/vcs/subversion/subversion_global.h index 062d7fe9..620ed8df 100644 --- a/vcs/subversion/subversion_global.h +++ b/vcs/subversion/subversion_global.h @@ -16,7 +16,7 @@ #define SUBVERSION_GLOBAL_H #include <kurl.h> -#include <qdatetime.h> +#include <tqdatetime.h> namespace SvnGlobal { @@ -42,14 +42,14 @@ public: int kind; /* The root URL of the repository. */ KURL reposRootUrl; - QString reposUuid; + TQString reposUuid; }; class SvnRevision{ public: int revNum; - QString revKind; - QDateTime revDate; + TQString revKind; + TQDateTime revDate; }; } // end of namespace SvnGlobal diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp index b5201b16..af58f7c8 100644 --- a/vcs/subversion/subversion_part.cpp +++ b/vcs/subversion/subversion_part.cpp @@ -18,7 +18,7 @@ */ #include "subversion_part.h" -#include <qwhatsthis.h> +#include <tqwhatsthis.h> #include <kiconloader.h> #include <klocale.h> #include <kdevgenericfactory.h> @@ -40,16 +40,16 @@ #include "svn_mergewidget.h" #include "urlutil.h" -#include <qvbox.h> +#include <tqvbox.h> #include <kdialogbase.h> #include <kparts/part.h> #include <kdevpartcontroller.h> #include <kdevproject.h> #include <domutil.h> #include <kurlrequester.h> -#include <qradiobutton.h> +#include <tqradiobutton.h> #include <kdebug.h> -#include <qwidget.h> +#include <tqwidget.h> #include <kdevplugininfo.h> #include <kmessagebox.h> @@ -63,7 +63,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( data ) ) //bool g_projectWasJustCreated = false; -subversionPart::subversionPart(QObject *parent, const char *name, const QStringList& ) +subversionPart::subversionPart(TQObject *parent, const char *name, const TQStringList& ) : KDevVersionControl(&data, parent, name ? name : "Subversion" ) { setInstance(subversionFactory::instance()); m_projWidget = 0; @@ -74,18 +74,18 @@ subversionPart::subversionPart(QObject *parent, const char *name, const QStringL setupActions(); - connect( m_impl, SIGNAL(checkoutFinished(QString)), SIGNAL(finishedFetching(QString)) ); + connect( m_impl, TQT_SIGNAL(checkoutFinished(TQString)), TQT_SIGNAL(finishedFetching(TQString)) ); // Context menu - connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), this, SLOT(contextMenu(QPopupMenu *, const Context *)) ); - connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), this, SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), SIGNAL(stopButtonClicked(KDevPlugin*)), this, SLOT(slotStopButtonClicked(KDevPlugin*)) ); - connect( core(), SIGNAL(projectOpened()), this, SLOT(slotProjectOpened()) ); - connect( core(), SIGNAL(projectClosed()), this, SLOT(slotProjectClosed()) ); + connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); + connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); m_impl->processWidget()->setCaption(i18n( "Subversion Output" )); - mainWindow()->embedOutputView( (QWidget*)m_impl->processWidget(), i18n( "Subversion" ), i18n( "Subversion messages" ) ); - QWhatsThis::add((QWidget*)m_impl->processWidget(), i18n("<b>Subversion</b><p>Subversion operations window.")); + mainWindow()->embedOutputView( (TQWidget*)m_impl->processWidget(), i18n( "Subversion" ), i18n( "Subversion messages" ) ); + TQWhatsThis::add((TQWidget*)m_impl->processWidget(), i18n("<b>Subversion</b><p>Subversion operations window.")); } @@ -98,74 +98,74 @@ subversionPart::~subversionPart() { } void subversionPart::setupActions() { - actionCommit = new KAction( i18n("&Commit to Repository..."), 0, this, SLOT(slotActionCommit()), actionCollection(), "subversion_commit" ); + actionCommit = new KAction( i18n("&Commit to Repository..."), 0, this, TQT_SLOT(slotActionCommit()), actionCollection(), "subversion_commit" ); actionCommit->setToolTip( i18n("Commit file(s)") ); actionCommit->setWhatsThis( i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.") ); - /* actionDiff = new KAction( i18n("&Difference Between Revisions"), 0, this, SLOT(slotActionDiff()), + /* actionDiff = new KAction( i18n("&Difference Between Revisions"), 0, this, TQT_SLOT(slotActionDiff()), actionCollection(), "subversion_diff" ); actionDiff->setToolTip( i18n("Build difference") ); actionDiff->setWhatsThis( i18n("<b>Build difference</b><p>Builds difference between releases.") ); */ - actionAdd = new KAction( i18n("&Add to Repository"), 0, this, SLOT(slotActionAdd()), actionCollection(), "subversion_add" ); + actionAdd = new KAction( i18n("&Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()), actionCollection(), "subversion_add" ); actionAdd->setToolTip( i18n("Add file to repository") ); actionAdd->setWhatsThis( i18n("<b>Add file to repository</b><p>Adds file to repository.") ); - actionLog = new KAction( i18n("Show logs..."), 0, this, SLOT(slotLog()), actionCollection(), "subversion_log" ); - actionBlame = new KAction( i18n("Blame..."), 0, this, SLOT(slotBlame()), actionCollection(), "subversion_blame"); + actionLog = new KAction( i18n("Show logs..."), 0, this, TQT_SLOT(slotLog()), actionCollection(), "subversion_log" ); + actionBlame = new KAction( i18n("Blame..."), 0, this, TQT_SLOT(slotBlame()), actionCollection(), "subversion_blame"); - actionRemove = new KAction( i18n("&Remove From Repository"), 0, this, SLOT(slotActionDel()), actionCollection(), "subversion_remove" ); + actionRemove = new KAction( i18n("&Remove From Repository"), 0, this, TQT_SLOT(slotActionDel()), actionCollection(), "subversion_remove" ); actionRemove->setToolTip( i18n("Remove from repository") ); actionRemove->setWhatsThis( i18n("<b>Remove from repository</b><p>Removes file(s) from repository.") ); - actionUpdate = new KAction( i18n("&Update"), 0, this, SLOT(slotActionUpdate()), actionCollection(), "subversion_update" ); + actionUpdate = new KAction( i18n("&Update"), 0, this, TQT_SLOT(slotActionUpdate()), actionCollection(), "subversion_update" ); actionUpdate->setToolTip( i18n("Update") ); actionUpdate->setWhatsThis( i18n("<b>Update</b><p>Updates file(s) from repository.") ); - actionDiffLocal = new KAction( i18n("&Diff to BASE"), 0, this, SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_local" ); + actionDiffLocal = new KAction( i18n("&Diff to BASE"), 0, this, TQT_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_local" ); actionDiffLocal->setToolTip( i18n("Diff to BASE") ); actionDiffLocal->setWhatsThis( i18n("<b>Diff to disk</b><p>Diff current file to the BASE checked out copy.") ); - actionDiffHead = new KAction( i18n("&Diff to HEAD"), 0, this, SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_head" ); + actionDiffHead = new KAction( i18n("&Diff to HEAD"), 0, this, TQT_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_head" ); actionDiffHead->setToolTip( i18n("Diff to HEAD") ); actionDiffHead->setWhatsThis( i18n("<b>Diff HEAD</b><p>Diff the current file to HEAD in svn.") ); - actionRevert = new KAction( i18n("&Revert"), 0, this, SLOT(slotActionRevert()), actionCollection(), "subversion_revert" ); + actionRevert = new KAction( i18n("&Revert"), 0, this, TQT_SLOT(slotActionRevert()), actionCollection(), "subversion_revert" ); actionRevert->setToolTip( i18n("Revert") ); actionRevert->setWhatsThis( i18n("<b>Revert</b><p>Undo local changes.") ); /* actionAddToIgnoreList = new KAction( i18n("&Ignore in Subversion Operations"), 0, - this, SLOT(slotActionAddToIgnoreList()), actionCollection(), "subversion_ignore" ); + this, TQT_SLOT(slotActionAddToIgnoreList()), actionCollection(), "subversion_ignore" ); actionAddToIgnoreList->setToolTip( i18n("Ignore in Subversion operations") ); actionAddToIgnoreList->setWhatsThis( i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s).") ); actionRemoveFromIgnoreList = new KAction( i18n("Do &Not Ignore in Subversion Operations"), 0, - this, SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "subversion_donot_ignore" ); + this, TQT_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "subversion_donot_ignore" ); actionRemoveFromIgnoreList->setToolTip( i18n("Do not ignore in Subversion operations") ); actionRemoveFromIgnoreList->setWhatsThis( i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s).") ); */ actionResolve = new KAction( i18n("Re&solve Conflicting State"), 0, - this, SLOT(slotActionResolve()), actionCollection(), "subversion_resolve" ); + this, TQT_SLOT(slotActionResolve()), actionCollection(), "subversion_resolve" ); actionResolve->setToolTip( i18n("Resolve the conflicting state of a file after a merge") ); actionResolve->setWhatsThis( i18n("<b>Resolve the conflicting state</b><p>Remove the conflict state that can be set on a file after a merge failed.") ); actionSwitch = new KAction( i18n("Switch this working copy to URL.."), 0, - this, SLOT(slotSwitch()), actionCollection(), "subversion_switch" ); + this, TQT_SLOT(slotSwitch()), actionCollection(), "subversion_switch" ); // warn slogCopy(), slotMerge only works on context menu. There is no main-menu action actionCopy = new KAction( i18n("Copy this working copy to URL.."), 0, - this, SLOT(slotCopy()), actionCollection(), "subversion_copy" ); + this, TQT_SLOT(slotCopy()), actionCollection(), "subversion_copy" ); actionMerge = new KAction( i18n("Merge difference to working copy"), 0, - this, SLOT(slotMerge()), actionCollection(), "subversion_merge" ); + this, TQT_SLOT(slotMerge()), actionCollection(), "subversion_merge" ); } -QWidget* subversionPart::newProjectWidget( QWidget* parent ) { +TQWidget* subversionPart::newProjectWidget( TQWidget* parent ) { if ( !m_projWidget ) m_projWidget = new subversionProjectWidget(parent,"projectwidget"); return m_projWidget; } -void subversionPart::createNewProject( const QString& dirname ) { +void subversionPart::createNewProject( const TQString& dirname ) { if ( !m_projWidget ) return; m_impl->createNewProject( dirname, KURL( m_projWidget->importURL->url() ), m_projWidget->yes->isChecked() ); @@ -181,7 +181,7 @@ KDevVCSFileInfoProvider * subversionPart::fileInfoProvider() const { return m_impl->fileInfoProvider(); } -void subversionPart::contextMenu( QPopupMenu *popup, const Context *context ) { +void subversionPart::contextMenu( TQPopupMenu *popup, const Context *context ) { //no project, no subversion. Don't test on projectDirectory() here. If the user wants this project to have subversion support //give it to him. e.g. for out of root subprojects like with qmake if(!project()) @@ -213,48 +213,48 @@ if(!project()) if (context->hasType( Context::FileContext )) popup->insertSeparator(); - int id = subMenu->insertItem( actionCommit->text(), this, SLOT(slotCommit()) ); + int id = subMenu->insertItem( actionCommit->text(), this, TQT_SLOT(slotCommit()) ); // CvsService let to do log and diff operations only on one file (or directory) at time /* if (m_urls.count() == 1) { - subMenu->insertItem( actionDiff->text(), this, SLOT(slotDiff()) ); - subMenu->insertItem( actionLog->text(), this, SLOT(slotLog()) ); + subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) ); + subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); }*/ subMenu->setWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.")); - id = subMenu->insertItem( actionAdd->text(), this, SLOT(slotAdd()) ); + id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) ); subMenu->setWhatsThis(id, i18n("<b>Add file to repository</b><p>Adds file to repository.")); - id = subMenu->insertItem( actionRemove->text(), this, SLOT(slotDel()) ); + id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotDel()) ); subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository.")); - id = subMenu->insertItem( actionLog->text(), this, SLOT(slotLog()) ); + id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); subMenu->setWhatsThis(id, i18n("<b>Show logs..</b><p>View Logs")); - id = subMenu->insertItem( actionBlame->text(), this, SLOT(slotBlame()) ); + id = subMenu->insertItem( actionBlame->text(), this, TQT_SLOT(slotBlame()) ); subMenu->setWhatsThis(id, i18n("<b>Blame 0:HEAD </b><p>Show Annotate")); subMenu->insertSeparator(); - id = subMenu->insertItem( actionDiffLocal->text(), this, SLOT(slotDiffLocal()) ); + id = subMenu->insertItem( actionDiffLocal->text(), this, TQT_SLOT(slotDiffLocal()) ); subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to local disk.")); - id = subMenu->insertItem( actionDiffHead->text(), this, SLOT(slotDiffHead()) ); + id = subMenu->insertItem( actionDiffHead->text(), this, TQT_SLOT(slotDiffHead()) ); subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to repository.")); - id = subMenu->insertItem( actionUpdate->text(), this, SLOT(slotUpdate()) ); + id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) ); subMenu->setWhatsThis(id, i18n("<b>Update</b><p>Updates file(s) from repository.")); - id = subMenu->insertItem( actionRevert->text(), this, SLOT(slotRevert()) ); + id = subMenu->insertItem( actionRevert->text(), this, TQT_SLOT(slotRevert()) ); subMenu->setWhatsThis(id, i18n("<b>Revert</b><p>Undo local changes.") ); - id = subMenu->insertItem( actionResolve->text(), this, SLOT(slotResolve()) ); + id = subMenu->insertItem( actionResolve->text(), this, TQT_SLOT(slotResolve()) ); subMenu->setWhatsThis(id, i18n("<b>Resolve</b><p>Resolve conflicting state.") ); - id = subMenu->insertItem( actionSwitch->text(), this, SLOT(slotSwitch()) ); + id = subMenu->insertItem( actionSwitch->text(), this, TQT_SLOT(slotSwitch()) ); subMenu->setWhatsThis(id, i18n("<b>Switch</b><p>Switch working tree.") ); - id = subMenu->insertItem( actionCopy->text(), this, SLOT(slotCopy()) ); + id = subMenu->insertItem( actionCopy->text(), this, TQT_SLOT(slotCopy()) ); subMenu->setWhatsThis(id, i18n("<b>Copy</b><p>Copy from/between path/URLs") ); - id = subMenu->insertItem( actionMerge->text(), this, SLOT(slotMerge()) ); + id = subMenu->insertItem( actionMerge->text(), this, TQT_SLOT(slotMerge()) ); subMenu->setWhatsThis(id, i18n("<b>Merge</b><p>Merge difference to working copy") ); /* subMenu->insertSeparator(); - id = subMenu->insertItem( actionAddToIgnoreList->text(), this, SLOT(slotAddToIgnoreList()) ); + id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) ); subMenu->setWhatsThis(id, i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s).")); - id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, SLOT(slotRemoveFromIgnoreList()) ); + id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) ); subMenu->setWhatsThis(id, i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s).")); */ // Now insert in parent menu @@ -300,7 +300,7 @@ void subversionPart::slotResolve() { void subversionPart::slotSwitch() { if( m_urls.count() > 1 ){ - KMessageBox::error( (QWidget*)project()->mainWindow()->main(), + KMessageBox::error( (TQWidget*)project()->mainWindow()->main(), i18n("Please select only one item for subversion switch") ); return; } @@ -308,22 +308,22 @@ void subversionPart::slotSwitch() // retrieve repository info from local-copy metadata which will be displayed in dialog box KURL wcPath = m_urls.first(); - QMap< KURL, SvnGlobal::SvnInfoHolder> holderMap; + TQMap< KURL, SvnGlobal::SvnInfoHolder> holderMap; SvnGlobal::SvnInfoHolder holder; m_impl->clientInfo( wcPath, false, holderMap ); - QValueList< SvnGlobal::SvnInfoHolder > holderList = holderMap.values(); + TQValueList< SvnGlobal::SvnInfoHolder > holderList = holderMap.values(); holder = holderList.first(); // invoke dialog box - SvnSwitchDlg dlg( &holder, wcPath.path(), (QWidget*)project()->mainWindow()->main() ); + SvnSwitchDlg dlg( &holder, wcPath.path(), (TQWidget*)project()->mainWindow()->main() ); - if( dlg.exec() != QDialog::Accepted ){ + if( dlg.exec() != TQDialog::Accepted ){ return; } // check target url's validity KURL repositUrl = KURL( dlg.destUrl() ); if( !repositUrl.isValid() ){ - KMessageBox::error( (QWidget*)project()->mainWindow()->main(), + KMessageBox::error( (TQWidget*)project()->mainWindow()->main(), i18n("The destination URL is invalid") ); return; } @@ -333,7 +333,7 @@ void subversionPart::slotSwitch() else if( dlg.relocation() ) m_impl->switchRelocate( wcPath, dlg.currentUrl(), repositUrl, dlg.recursive() ); else - KMessageBox::error( (QWidget*)project()->mainWindow()->main(), + KMessageBox::error( (TQWidget*)project()->mainWindow()->main(), i18n("Fail to conduct subversion switch. No action was selected") ); } @@ -341,7 +341,7 @@ void subversionPart::slotCopy() { // error check if( m_urls.count() > 1 ){ - KMessageBox::error( (QWidget*)project()->mainWindow()->main(), + KMessageBox::error( (TQWidget*)project()->mainWindow()->main(), i18n("Please select only one item for subversion switch") ); return; } @@ -349,22 +349,22 @@ void subversionPart::slotCopy() // retrieve repository info from local-copy metadata which will be displayed in dialog box KURL wcPath = m_urls.first(); - QMap< KURL, SvnGlobal::SvnInfoHolder> holderMap; + TQMap< KURL, SvnGlobal::SvnInfoHolder> holderMap; SvnGlobal::SvnInfoHolder holder; m_impl->clientInfo( wcPath, false, holderMap ); - QValueList< SvnGlobal::SvnInfoHolder > holderList = holderMap.values(); + TQValueList< SvnGlobal::SvnInfoHolder > holderList = holderMap.values(); holder = holderList.first(); // start input dialog SvnCopyDialog dlg( wcPath.prettyURL(), &holder, - (QWidget*)project()->mainWindow()->main()); + (TQWidget*)project()->mainWindow()->main()); - if( dlg.exec() != QDialog::Accepted ) + if( dlg.exec() != TQDialog::Accepted ) return; // retrieve user input KURL srcUrl = dlg.sourceUrl(); int rev = dlg.revision(); - QString revKind = dlg.revKind(); + TQString revKind = dlg.revKind(); KURL dest = dlg.destUrl(); kdDebug(9036) << " SRC: " << srcUrl << " DEST: " << dest << " Revnum: " << rev << " RevKind: " << revKind << endl; @@ -376,15 +376,15 @@ void subversionPart::slotMerge() { // error check if( m_urls.count() > 1 ){ - KMessageBox::error( (QWidget*)project()->mainWindow()->main(), + KMessageBox::error( (TQWidget*)project()->mainWindow()->main(), i18n("Please select only one item for subversion merge") ); return; } if( m_urls.count() < 1 ) return; KURL wcTarget= m_urls.first(); - SvnMergeDialog dlg( wcTarget, (QWidget*)project()->mainWindow()->main() ); - if( dlg.exec() != QDialog::Accepted ) return; + SvnMergeDialog dlg( wcTarget, (TQWidget*)project()->mainWindow()->main() ); + if( dlg.exec() != TQDialog::Accepted ) return; KURL src1 = dlg.source1(); SvnRevision rev1 = dlg.rev1(); @@ -444,7 +444,7 @@ void subversionPart::slotActionDiffHead() { void subversionPart::slotCommit() { SVNFileSelectDlgCommit dialog( m_urls, this, 0 ); - if( dialog.exec() == QDialog::Accepted ){ + if( dialog.exec() == TQDialog::Accepted ){ KURL::List tobeCommittedUrls = dialog.checkedUrls(); bool recursive = dialog.recursive(); bool keepLocks = dialog.keepLocks(); @@ -458,16 +458,16 @@ void subversionPart::slotAdd() { void subversionPart::slotLog() { if (m_urls.count() > 1){ - KMessageBox::error( (QWidget*)project()->mainWindow()->main(), + KMessageBox::error( (TQWidget*)project()->mainWindow()->main(), i18n("Please select only one item for subversion log") ); return; } SvnLogViewOptionDlg dlg; if( dlg.exec() ){ int revstart = dlg.revstart(); - QString revkindstart = dlg.revKindStart(); + TQString revkindstart = dlg.revKindStart(); int revend = dlg.revend(); - QString revkindend = dlg.revKindEnd(); + TQString revkindend = dlg.revKindEnd(); bool strictNode = dlg.strictNode(); m_impl->svnLog (m_urls, revstart, revkindstart, revend, revkindend, true/*changedPath*/, strictNode); } else{ @@ -477,12 +477,12 @@ void subversionPart::slotLog() void subversionPart::slotBlame() { if (m_urls.count() > 1){ - KMessageBox::error( (QWidget*)project()->mainWindow()->main(), + KMessageBox::error( (TQWidget*)project()->mainWindow()->main(), i18n("Please select only one item to see annotate") ); return; } if (m_urls.count() < 1){ - KMessageBox::error( (QWidget*)project()->mainWindow()->main(), + KMessageBox::error( (TQWidget*)project()->mainWindow()->main(), i18n("Select file to see blame") ); return; } @@ -500,7 +500,7 @@ void subversionPart::slotDiffLocal() { // m_impl->diff (m_urls, "BASE"); if( m_urls.count() < 1 ){ // Impossible to reach here but.. - KMessageBox::error( (QWidget*)project()->mainWindow()->main(), + KMessageBox::error( (TQWidget*)project()->mainWindow()->main(), i18n("Select file or directory to see diff") ); return; } @@ -510,7 +510,7 @@ void subversionPart::slotDiffHead() { // m_impl->diff (m_urls, "HEAD"); if( m_urls.count() < 1 ){ // Impossible to reach here but.. - KMessageBox::error( (QWidget*)project()->mainWindow()->main(), + KMessageBox::error( (TQWidget*)project()->mainWindow()->main(), i18n("Select file or directory to see diff") ); return; } @@ -529,41 +529,41 @@ void subversionPart::slotProjectOpened() { } */ //loadOptions(); /// \FIXME slots - //connect( project(), SIGNAL(addedFilesToProject(const QStringList&)), this, SLOT(slotAddFilesToProject(const QStringList &)) ); - //connect( project(), SIGNAL(removedFilesFromProject(const QStringList&)), this, SLOT(slotRemovedFilesFromProject(const QStringList &)) ); + //connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) ); + //connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); } void subversionPart::slotProjectClosed() { kdDebug(9036) << "subversion :projectClosed" << endl; //saveOptions(); /// \FIXME slots - //disconnect( project(), SIGNAL(addedFilesToProject(const QStringList&)), this, SLOT(slotAddFilesToProject(const QStringList &)) ); - //disconnect( project(), SIGNAL(removedFilesFromProject(const QStringList&)), this, SLOT(slotRemovedFilesFromProject(const QStringList &)) ); + //disconnect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) ); + //disconnect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); } -void subversionPart::savePartialProjectSession(QDomElement* dom) { +void subversionPart::savePartialProjectSession(TQDomElement* dom) { kdDebug(9036) << "subversion : savePartialProjectSession" << endl; - QDomDocument doc = dom->ownerDocument(); - QDomElement svn = doc.createElement( "subversion" ); + TQDomDocument doc = dom->ownerDocument(); + TQDomElement svn = doc.createElement( "subversion" ); svn.setAttribute( "base", base.url() ); dom->appendChild( svn ); } -void subversionPart::restorePartialProjectSession(const QDomElement* dom) { +void subversionPart::restorePartialProjectSession(const TQDomElement* dom) { kdDebug(9036) << "subversion : restorePartialProjectSession" << endl; - QDomElement svn = dom->namedItem("subversion").toElement(); + TQDomElement svn = dom->namedItem("subversion").toElement(); base = svn.attribute( "base", "" ); } -bool subversionPart::isValidDirectory( const QString &dirPath) const { - QString svn = "/.svn/"; - QDir svndir( dirPath + svn ); - QString entriesFileName = dirPath + svn + "entries"; +bool subversionPart::isValidDirectory( const TQString &dirPath) const { + TQString svn = "/.svn/"; + TQDir svndir( dirPath + svn ); + TQString entriesFileName = dirPath + svn + "entries"; kdDebug(9036) << "dirpath " << dirPath+"/.svn/" << " exists:" << svndir.exists() << endl; - kdDebug(9036) << "entries " << entriesFileName << " exists:" << QFile::exists( entriesFileName ) << endl; + kdDebug(9036) << "entries " << entriesFileName << " exists:" << TQFile::exists( entriesFileName ) << endl; return svndir.exists() && - QFile::exists( entriesFileName ); + TQFile::exists( entriesFileName ); } #include "subversion_part.moc" diff --git a/vcs/subversion/subversion_part.h b/vcs/subversion/subversion_part.h index a4717772..7ce9e0cd 100644 --- a/vcs/subversion/subversion_part.h +++ b/vcs/subversion/subversion_part.h @@ -20,10 +20,10 @@ #define __KDEVPART_SUBVERSION_H__ -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <kdevplugin.h> #include <kurl.h> -#include <qpopupmenu.h> +#include <tqpopupmenu.h> #include <kdialogbase.h> #include "kdevversioncontrol.h" @@ -41,28 +41,28 @@ class subversionPart : public KDevVersionControl Q_OBJECT public: - subversionPart(QObject *parent, const char *name, const QStringList &); + subversionPart(TQObject *parent, const char *name, const TQStringList &); virtual ~subversionPart(); void setupActions(); - QWidget* newProjectWidget( QWidget* parent ); - void createNewProject( const QString& dirname ); + TQWidget* newProjectWidget( TQWidget* parent ); + void createNewProject( const TQString& dirname ); bool fetchFromRepository(); KDevVCSFileInfoProvider * fileInfoProvider() const; bool urlFocusedDocument( KURL &url ); - void restorePartialProjectSession(const QDomElement* ); - void savePartialProjectSession(QDomElement* ); + void restorePartialProjectSession(const TQDomElement* ); + void savePartialProjectSession(TQDomElement* ); void setBaseURL(const KURL& url ) { base = url; } KURL baseURL() { return base; } - virtual bool isValidDirectory( const QString &dirPath ) const; + virtual bool isValidDirectory( const TQString &dirPath ) const; KURL::List urls() { return m_urls; } subversionCore* svncore() { return m_impl; } signals: -// void finishedFetching( QString destinationDir ); +// void finishedFetching( TQString destinationDir ); private slots: - void contextMenu( QPopupMenu *popup, const Context *context ); + void contextMenu( TQPopupMenu *popup, const Context *context ); void slotActionUpdate(); void slotActionRevert(); void slotActionCommit(); @@ -88,7 +88,7 @@ private slots: void slotProjectOpened(); private: - QGuardedPtr<subversionCore> m_impl; + TQGuardedPtr<subversionCore> m_impl; KURL::List m_urls; KAction *actionCommit, @@ -107,11 +107,11 @@ private: *actionCopy, *actionMerge; - QGuardedPtr<subversionProjectWidget> m_projWidget; + TQGuardedPtr<subversionProjectWidget> m_projWidget; KURL base; public: - QMap< KURL, SvnGlobal::SvnInfoHolder > m_prjInfoMap; + TQMap< KURL, SvnGlobal::SvnInfoHolder > m_prjInfoMap; }; diff --git a/vcs/subversion/subversion_widget.cpp b/vcs/subversion/subversion_widget.cpp index acc2db0c..c27f845e 100644 --- a/vcs/subversion/subversion_widget.cpp +++ b/vcs/subversion/subversion_widget.cpp @@ -26,26 +26,26 @@ #include "subversion_widget.h" #include <ktextedit.h> #include <klocale.h> -#include <qtoolbutton.h> -#include <qpushbutton.h> +#include <tqtoolbutton.h> +#include <tqpushbutton.h> -subversionWidget::subversionWidget( subversionPart *part, QWidget *parent, const char* name ) +subversionWidget::subversionWidget( subversionPart *part, TQWidget *parent, const char* name ) : KTabWidget(parent) { m_part = part; m_edit = new KTextEdit( this ); m_edit->setReadOnly( TRUE ); tab()->addTab( m_edit, i18n("Notification") ); - m_closeButton = new QPushButton( tab() ); + m_closeButton = new TQPushButton( tab() ); m_closeButton->setText( i18n("Close") ); tab()->setCornerWidget(m_closeButton); - connect( m_closeButton, SIGNAL(clicked()), this, SLOT(closeCurrentTab()) ); + connect( m_closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeCurrentTab()) ); } subversionWidget::~subversionWidget() {} -void subversionWidget::append( QString notifications ) +void subversionWidget::append( TQString notifications ) { if( !m_edit ){ // should not happen @@ -55,7 +55,7 @@ void subversionWidget::append( QString notifications ) showPage( m_edit ); } -void subversionWidget::showLogResult( QValueList<SvnLogHolder> *holderList, QString reqUrl ) +void subversionWidget::showLogResult( TQValueList<SvnLogHolder> *holderList, TQString reqUrl ) { SvnLogViewWidget *widget = new SvnLogViewWidget( m_part, this ); widget->setLogResult( holderList ); @@ -65,7 +65,7 @@ void subversionWidget::showLogResult( QValueList<SvnLogHolder> *holderList, QStr tab()->showPage( widget ); } -void subversionWidget::showBlameResult( QValueList<SvnBlameHolder> *blamelist ) +void subversionWidget::showBlameResult( TQValueList<SvnBlameHolder> *blamelist ) { SvnBlameWidget *widget = new SvnBlameWidget( this ); widget->copyBlameData( blamelist ); @@ -75,7 +75,7 @@ void subversionWidget::showBlameResult( QValueList<SvnBlameHolder> *blamelist ) } void subversionWidget::closeCurrentTab() { - QWidget *current = tab()->currentPage(); + TQWidget *current = tab()->currentPage(); KTextEdit *edit = static_cast<KTextEdit*>(current); if( edit ){ if( edit == m_edit ) // main notification output should not be deleted @@ -87,13 +87,13 @@ void subversionWidget::closeCurrentTab() //////////////////////////////////////////////////////////////////////// -SvnIntSortListItem::SvnIntSortListItem( QListView* parent ) - :QListViewItem(parent) +SvnIntSortListItem::SvnIntSortListItem( TQListView* parent ) + :TQListViewItem(parent) {} SvnIntSortListItem::~SvnIntSortListItem() {} -int SvnIntSortListItem::compare( QListViewItem *item, int col, bool ascending ) const +int SvnIntSortListItem::compare( TQListViewItem *item, int col, bool ascending ) const { unsigned int myVal = this->text(col).toUInt(); @@ -103,7 +103,7 @@ int SvnIntSortListItem::compare( QListViewItem *item, int col, bool ascending ) return 0; } -SvnLogViewItem::SvnLogViewItem( QListView * parent ) +SvnLogViewItem::SvnLogViewItem( TQListView * parent ) :SvnIntSortListItem( parent ) { m_pathList = ""; @@ -124,11 +124,11 @@ SvnProgressDlg::SvnProgressDlg( bool showNow ) SvnProgressDlg::~SvnProgressDlg() {} -void SvnProgressDlg::setSourceUrl( const QString &src ) +void SvnProgressDlg::setSourceUrl( const TQString &src ) { sourceEdit->setText( src ); } -void SvnProgressDlg::setDestUrl( const QString &dest ) +void SvnProgressDlg::setDestUrl( const TQString &dest ) { destEdit->setText( dest ); } diff --git a/vcs/subversion/subversion_widget.h b/vcs/subversion/subversion_widget.h index 53d806d7..c2ff7e62 100644 --- a/vcs/subversion/subversion_widget.h +++ b/vcs/subversion/subversion_widget.h @@ -20,15 +20,15 @@ #ifndef __SUBVERSION_WIDGET_H__ #define __SUBVERSION_WIDGET_H__ -#include <qlistview.h> +#include <tqlistview.h> #include "svn_blamewidget.h" #include "svn_logviewwidget.h" -#include <qvaluelist.h> +#include <tqvaluelist.h> class subversionPart; #include <ktabwidget.h> #include <kio/defaultprogress.h> -#include <qguardedptr.h> +#include <tqguardedptr.h> class KTextEdit; class SvnLogHolder; class SvnBlameHolder; @@ -42,13 +42,13 @@ class subversionWidget : public KTabWidget { Q_OBJECT public: - subversionWidget(subversionPart *part, QWidget *parent, const char* name); + subversionWidget(subversionPart *part, TQWidget *parent, const char* name); ~subversionWidget(); // append what?. Append any text status outputs - void append( QString notifications ); - void showLogResult( QValueList<SvnLogHolder> *holderList, QString reqUrl ); - void showBlameResult( QValueList<SvnBlameHolder> *blamelist ); + void append( TQString notifications ); + void showLogResult( TQValueList<SvnLogHolder> *holderList, TQString reqUrl ); + void showBlameResult( TQValueList<SvnBlameHolder> *blamelist ); protected slots: void closeCurrentTab(); @@ -57,29 +57,29 @@ private: KTabWidget* tab(){ return this; } subversionPart *m_part; - QGuardedPtr<KTextEdit> m_edit; - QPushButton *m_closeButton; + TQGuardedPtr<KTextEdit> m_edit; + TQPushButton *m_closeButton; }; /** * reimplement compare(), to be able to sort any item by integer */ -class SvnIntSortListItem : public QListViewItem { +class SvnIntSortListItem : public TQListViewItem { public: - SvnIntSortListItem ( QListView* parent=0 ); + SvnIntSortListItem ( TQListView* parent=0 ); ~SvnIntSortListItem (); /** Returns < 0 if this item is less than i, 0 if they are equal and > 0 if this item is greater than i. */ - virtual int compare( QListViewItem* i, int col, bool ascending ) const; + virtual int compare( TQListViewItem* i, int col, bool ascending ) const; }; class SvnLogViewItem : public SvnIntSortListItem { public: - SvnLogViewItem( QListView* parent ); + SvnLogViewItem( TQListView* parent ); ~SvnLogViewItem(); - QString m_pathList; - QString m_message; + TQString m_pathList; + TQString m_message; }; ///////////////////////////////////////////////////////////// @@ -88,8 +88,8 @@ class SvnProgressDlg : public KIO::DefaultProgress { public: SvnProgressDlg( bool showNow = true ); ~SvnProgressDlg(); - void setSourceUrl( const QString & ); - void setDestUrl( const QString & ); + void setSourceUrl( const TQString & ); + void setDestUrl( const TQString & ); }; #endif diff --git a/vcs/subversion/svn_blamewidget.cpp b/vcs/subversion/svn_blamewidget.cpp index 5d186177..b4095389 100644 --- a/vcs/subversion/svn_blamewidget.cpp +++ b/vcs/subversion/svn_blamewidget.cpp @@ -14,23 +14,23 @@ #include "svn_blamewidget.h" #include "subversion_widget.h" -#include <qmap.h> -#include <qlistview.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qstringlist.h> -#include <qfont.h> +#include <tqmap.h> +#include <tqlistview.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqstringlist.h> +#include <tqfont.h> #include <klocale.h> #include <kmessagebox.h> -SvnBlameWidget::SvnBlameWidget( QWidget *parent, const char* name, bool modal, WFlags f ) - :QWidget( parent ) +SvnBlameWidget::SvnBlameWidget( TQWidget *parent, const char* name, bool modal, WFlags f ) + :TQWidget( parent ) { - m_layout = new QVBoxLayout( this, 1, 1 ); + m_layout = new TQVBoxLayout( this, 1, 1 ); m_layout->setMargin(1); - m_listView = new QListView( this ); + m_listView = new TQListView( this ); outView()->setAllColumnsShowFocus( TRUE ); outView()->addColumn( i18n("Line") ); outView()->addColumn( i18n("Rev") ); @@ -43,7 +43,7 @@ SvnBlameWidget::SvnBlameWidget( QWidget *parent, const char* name, bool modal, W SvnBlameWidget::~SvnBlameWidget() {} -void SvnBlameWidget::copyBlameData( QValueList<SvnBlameHolder> *blamelist ) +void SvnBlameWidget::copyBlameData( TQValueList<SvnBlameHolder> *blamelist ) { m_blamelist = *blamelist; } @@ -53,66 +53,66 @@ void SvnBlameWidget::show() outView()->clear(); outView()->setSortColumn(0); - QFont f = outView()->font(); + TQFont f = outView()->font(); f.setFixedPitch( true ); outView()->setFont( f ); - QValueList<SvnBlameHolder>::Iterator it; + TQValueList<SvnBlameHolder>::Iterator it; for( it = m_blamelist.begin(); it != m_blamelist.end(); ++it ){ SvnBlameHolder holder = *it; SvnIntSortListItem *item = new SvnIntSortListItem(outView()); - QString prettyDate = holder.date.left(16).replace(10, 1, ' '); + TQString prettyDate = holder.date.left(16).replace(10, 1, ' '); - item->setText(0, QString::number( holder.line+1 ) ); - item->setText(1, QString::number(holder.rev) ); + item->setText(0, TQString::number( holder.line+1 ) ); + item->setText(1, TQString::number(holder.rev) ); item->setText(2, prettyDate ); item->setText(3, holder.author ); item->setText(4, holder.content ); } outView()->sort(); - QWidget::show(); + TQWidget::show(); } -QListView* SvnBlameWidget::outView() +TQListView* SvnBlameWidget::outView() { return m_listView; } ///////////////////////////////////////////////////////////// -SvnBlameFileSelectDlg::SvnBlameFileSelectDlg( QWidget *parent ) - : QDialog( parent ) +SvnBlameFileSelectDlg::SvnBlameFileSelectDlg( TQWidget *parent ) + : TQDialog( parent ) { m_selected = ""; setCaption( i18n("Select one file to view annotation") ); - m_layout = new QGridLayout( this, 2, 2 ); - m_view = new QListView( this ); + m_layout = new TQGridLayout( this, 2, 2 ); + m_view = new TQListView( this ); m_view->addColumn( i18n("files") ); - m_okBtn = new QPushButton( i18n("OK"), this ); - m_cancelBtn = new QPushButton( i18n("Cancel"), this ); + m_okBtn = new TQPushButton( i18n("OK"), this ); + m_cancelBtn = new TQPushButton( i18n("Cancel"), this ); m_layout->addMultiCellWidget( m_view, 0, 0, 0, 1 ); m_layout->addWidget( m_okBtn, 1, 0 ); m_layout->addWidget( m_cancelBtn, 1, 1 ); - connect( m_okBtn, SIGNAL(clicked()), this, SLOT(accept()) ); - connect( m_cancelBtn, SIGNAL(clicked()), this, SLOT(reject()) ); + connect( m_okBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); + connect( m_cancelBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); } SvnBlameFileSelectDlg::~SvnBlameFileSelectDlg() {} -void SvnBlameFileSelectDlg::setCandidate( QStringList *list ) +void SvnBlameFileSelectDlg::setCandidate( TQStringList *list ) { - for( QValueList<QString>::iterator it = list->begin(); it != list->end(); ++it ){ - QListViewItem *item = new QListViewItem( m_view, *it ); + for( TQValueList<TQString>::iterator it = list->begin(); it != list->end(); ++it ){ + TQListViewItem *item = new TQListViewItem( m_view, *it ); } } -QString SvnBlameFileSelectDlg::selected() +TQString SvnBlameFileSelectDlg::selected() { return m_selected; } @@ -120,7 +120,7 @@ QString SvnBlameFileSelectDlg::selected() void SvnBlameFileSelectDlg::accept() { while( true ){ - QListViewItem *item = m_view->currentItem(); + TQListViewItem *item = m_view->currentItem(); if( item ){ m_selected = item->text(0); break; @@ -129,7 +129,7 @@ void SvnBlameFileSelectDlg::accept() KMessageBox::error( this, i18n("Select file from list to view annotation") ); } } - QDialog::accept(); + TQDialog::accept(); } #include "svn_blamewidget.moc" diff --git a/vcs/subversion/svn_blamewidget.h b/vcs/subversion/svn_blamewidget.h index 26bd0fa2..b0d01e12 100644 --- a/vcs/subversion/svn_blamewidget.h +++ b/vcs/subversion/svn_blamewidget.h @@ -16,9 +16,9 @@ #ifndef SVN_BLAMEWIDGET_H #define SVN_BLAMEWIDGET_H -#include <qwidget.h> -#include <qdialog.h> -#include <qvaluelist.h> +#include <tqwidget.h> +#include <tqdialog.h> +#include <tqvaluelist.h> class QVBoxLayout; class QListView; class QGridLayout; @@ -31,47 +31,47 @@ public: // ~SvnBlameHolder(){}; unsigned int line; long int rev; - QString date; - QString author; - QString content; + TQString date; + TQString author; + TQString content; }; class QListView; -class SvnBlameWidget : public QWidget { +class SvnBlameWidget : public TQWidget { Q_OBJECT public: - SvnBlameWidget( QWidget * parent = 0, const char * name = 0, bool modal = FALSE, WFlags f = 0 ); + SvnBlameWidget( TQWidget * parent = 0, const char * name = 0, bool modal = FALSE, WFlags f = 0 ); virtual ~SvnBlameWidget(); - void copyBlameData( QValueList<SvnBlameHolder> *blamelist ); + void copyBlameData( TQValueList<SvnBlameHolder> *blamelist ); void show(); - QListView* outView(); + TQListView* outView(); protected: - QValueList <SvnBlameHolder> m_blamelist; + TQValueList <SvnBlameHolder> m_blamelist; - QVBoxLayout *m_layout; - QListView *m_listView; + TQVBoxLayout *m_layout; + TQListView *m_listView; }; -class SvnBlameFileSelectDlg : public QDialog { +class SvnBlameFileSelectDlg : public TQDialog { Q_OBJECT public: - SvnBlameFileSelectDlg( QWidget *parent = 0L ); + SvnBlameFileSelectDlg( TQWidget *parent = 0L ); virtual ~SvnBlameFileSelectDlg(); - void setCandidate( QStringList *modifies ); - QString selected(); + void setCandidate( TQStringList *modifies ); + TQString selected(); protected: virtual void accept(); private: - QGridLayout *m_layout; - QListView *m_view; - QPushButton *m_okBtn; - QPushButton *m_cancelBtn; + TQGridLayout *m_layout; + TQListView *m_view; + TQPushButton *m_okBtn; + TQPushButton *m_cancelBtn; - QStringList *m_candidates; - QString m_selected; + TQStringList *m_candidates; + TQString m_selected; }; #endif diff --git a/vcs/subversion/svn_copywidget.cpp b/vcs/subversion/svn_copywidget.cpp index a5d74bcb..30b25fd7 100644 --- a/vcs/subversion/svn_copywidget.cpp +++ b/vcs/subversion/svn_copywidget.cpp @@ -5,18 +5,18 @@ #include <kurlrequester.h> #include <knuminput.h> #include <kcombobox.h> -#include <qradiobutton.h> +#include <tqradiobutton.h> -SvnCopyDialog::SvnCopyDialog( const QString &reqPath, SvnGlobal::SvnInfoHolder *holder, QWidget *parent ) +SvnCopyDialog::SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *parent ) : SvnCopyDialogBase( parent ) , m_holder(holder) { reqEdit->setText( reqPath ); - connect( urlRadio, SIGNAL(clicked()), this, SLOT(setSourceAsUrl()) ); - connect( pathRadio, SIGNAL(clicked()), this, SLOT(setSourceAsLocalPath()) ); - connect( revnumRadio, SIGNAL(toggled(bool)), revnumInput, SLOT(setEnabled(bool)) ); - connect( revnumRadio, SIGNAL(toggled(bool)), revkindCombo, SLOT(setDisabled(bool)) ); + connect( urlRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(setSourceAsUrl()) ); + connect( pathRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(setSourceAsLocalPath()) ); + connect( revnumRadio, TQT_SIGNAL(toggled(bool)), revnumInput, TQT_SLOT(setEnabled(bool)) ); + connect( revnumRadio, TQT_SIGNAL(toggled(bool)), revkindCombo, TQT_SLOT(setDisabled(bool)) ); // In many cases, users copy from reository to repository. This is for making tag/branche. // The case where copying from local path to repository may be lesser than the above one. @@ -45,12 +45,12 @@ int SvnCopyDialog::revision() return -1; } -QString SvnCopyDialog::revKind() +TQString SvnCopyDialog::revKind() { if( revkindRadio->isChecked() ) return revkindCombo->currentText(); else - return QString(""); + return TQString(""); } KURL SvnCopyDialog::destUrl() diff --git a/vcs/subversion/svn_copywidget.h b/vcs/subversion/svn_copywidget.h index cc00636d..8b80807e 100644 --- a/vcs/subversion/svn_copywidget.h +++ b/vcs/subversion/svn_copywidget.h @@ -13,12 +13,12 @@ class SvnCopyDialog : public SvnCopyDialogBase { Q_OBJECT public: - SvnCopyDialog( const QString &reqPath, SvnGlobal::SvnInfoHolder *holder, QWidget *parent ); + SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *parent ); ~SvnCopyDialog(); KURL sourceUrl(); int revision(); - QString revKind(); + TQString revKind(); KURL destUrl(); public slots: diff --git a/vcs/subversion/svn_fileselectdlg_commit.cpp b/vcs/subversion/svn_fileselectdlg_commit.cpp index 6217db56..0c014a9d 100644 --- a/vcs/subversion/svn_fileselectdlg_commit.cpp +++ b/vcs/subversion/svn_fileselectdlg_commit.cpp @@ -23,10 +23,10 @@ #include "subversion_fileinfo.h" #include "subversion_part.h" #include <kurl.h> -#include <qstring.h> -#include <qlistview.h> -#include <qfileinfo.h> -#include <qcheckbox.h> +#include <tqstring.h> +#include <tqlistview.h> +#include <tqfileinfo.h> +#include <tqcheckbox.h> #include <kdebug.h> #include <kmessagebox.h> #include "kdevmainwindow.h" @@ -34,7 +34,7 @@ #include <kdevproject.h> -SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart *part, QWidget* parent) +SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart *part, TQWidget* parent) :SvnCommitDlgBase( parent, "svnfileselectcommitdlg", true ) ,m_part(part) { @@ -43,7 +43,7 @@ SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart listView()->setColumnText(0, i18n("select") ); //col 0 listView()->addColumn( i18n("status") ); //col 1 listView()->addColumn( i18n("URL to commit") ); //col 2 - listView()->setColumnWidthMode( 2, QListView::Maximum ); + listView()->setColumnWidthMode( 2, TQListView::Maximum ); listView()->setSorting( 2, true ); recursiveChk->setChecked(false); keepLocksChk->setChecked(false); @@ -53,14 +53,14 @@ SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart VCSFileInfo vcsInfo; KURL::List tobeCommittedUrls; - for( QValueListConstIterator<KURL> it = urls.begin(); it != urls.end(); ++it ){ + for( TQValueListConstIterator<KURL> it = urls.begin(); it != urls.end(); ++it ){ KURL oneUrl(*it); - QFileInfo fileInfo(oneUrl.path()); + TQFileInfo fileInfo(oneUrl.path()); //fileInfo.convertToAbs(); if (fileInfo.isFile()){ KURL base_url( part->project()->projectDirectory()+"/" ); - QString dirPath = KURL::relativeURL( base_url, fileInfo.dirPath(TRUE) ); + TQString dirPath = KURL::relativeURL( base_url, fileInfo.dirPath(TRUE) ); vcsMap = ((SVNFileInfoProvider*)part->fileInfoProvider()) -> statusExt(dirPath, false/*repository access*/, true/*recurse*/, false/*getall*/, true/*noIgnore*/); vcsInfo = (*vcsMap)[fileInfo.fileName()]; @@ -78,14 +78,14 @@ SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart } else if (fileInfo.isDir()){ KURL base_url( part->project()->projectDirectory()+"/" ); - QString dirPath = KURL::relativeURL( base_url, fileInfo.absFilePath() ); + TQString dirPath = KURL::relativeURL( base_url, fileInfo.absFilePath() ); vcsMap = ((SVNFileInfoProvider*)part->fileInfoProvider()) -> statusExt(dirPath, false/*repository access*/, true/*recurse*/, false/*getall*/, true/*noIgnore*/); for (VCSFileInfoMap::ConstIterator it=vcsMap->begin(); it!=vcsMap->end(); ++it){ vcsInfo = it.data(); -// QString absPathStr( fileInfo.absFilePath() + "/" + it.key() ); - QString absPathStr( fileInfo.filePath() + "/" + it.key() ); +// TQString absPathStr( fileInfo.absFilePath() + "/" + it.key() ); + TQString absPathStr( fileInfo.filePath() + "/" + it.key() ); KURL urlFromStatus( absPathStr ); if( vcsInfo.state == VCSFileInfo::Added || vcsInfo.state == VCSFileInfo::Modified || vcsInfo.state == VCSFileInfo::Deleted || vcsInfo.state == VCSFileInfo::Replaced){ @@ -116,28 +116,28 @@ int SVNFileSelectDlgCommit::exec() { if (listView()->childCount() <= 0){ //TODO if klauncher fails, this spot is also reached. We should show correct error message to user - KMessageBox::information( (QWidget*)m_part->project()->mainWindow()->main(), i18n("No added/modified/deleted file(s) to commit") ); - return QDialog::Rejected; + KMessageBox::information( (TQWidget*)m_part->project()->mainWindow()->main(), i18n("No added/modified/deleted file(s) to commit") ); + return TQDialog::Rejected; } else{ return SvnCommitDlgBase::exec(); } } -void SVNFileSelectDlgCommit::insertItem( QString status, KURL url ) +void SVNFileSelectDlgCommit::insertItem( TQString status, KURL url ) { - QCheckListItem *item = new QCheckListItem( listView(), "", QCheckListItem::CheckBox ); + TQCheckListItem *item = new TQCheckListItem( listView(), "", TQCheckListItem::CheckBox ); item->setText( 1, status ); item->setText( 2, url.path() ); item->setOn(true); } KURL::List SVNFileSelectDlgCommit::checkedUrls() { - QPtrList<QListViewItem> lst; - QListViewItemIterator it( listView() ); + TQPtrList<TQListViewItem> lst; + TQListViewItemIterator it( listView() ); KURL::List tobeCommittedUrls; for ( ; it.current() ; ++it ) { - if ( ((QCheckListItem*)(it.current()))->isOn() ){ + if ( ((TQCheckListItem*)(it.current()))->isOn() ){ KURL tmpurl( it.current()->text(2) ); tobeCommittedUrls.push_back( tmpurl ); } @@ -145,7 +145,7 @@ KURL::List SVNFileSelectDlgCommit::checkedUrls() return tobeCommittedUrls; } -QListView* SVNFileSelectDlgCommit::listView() +TQListView* SVNFileSelectDlgCommit::listView() { return listView1; } diff --git a/vcs/subversion/svn_fileselectdlg_commit.h b/vcs/subversion/svn_fileselectdlg_commit.h index 1ce53e48..5789d15d 100644 --- a/vcs/subversion/svn_fileselectdlg_commit.h +++ b/vcs/subversion/svn_fileselectdlg_commit.h @@ -22,7 +22,7 @@ #define _svnfileselectdlgcommit_ #include "svn_commitdlgbase.h" -#include <qdialog.h> +#include <tqdialog.h> #include <kurl.h> class QString; @@ -35,9 +35,9 @@ class SVNFileSelectDlgCommit : public SvnCommitDlgBase{ Q_OBJECT public: - SVNFileSelectDlgCommit( KURL::List&, subversionPart* part, QWidget* parent = 0 ); + SVNFileSelectDlgCommit( KURL::List&, subversionPart* part, TQWidget* parent = 0 ); ~SVNFileSelectDlgCommit(); - void insertItem( QString status, KURL url ); + void insertItem( TQString status, KURL url ); KURL::List checkedUrls(); bool recursive(); bool keepLocks(); @@ -45,7 +45,7 @@ public: public slots: int exec(); protected: - QListView* listView(); + TQListView* listView(); subversionPart *m_part; }; diff --git a/vcs/subversion/svn_kio.cpp b/vcs/subversion/svn_kio.cpp index 16eccd14..3a39d33c 100644 --- a/vcs/subversion/svn_kio.cpp +++ b/vcs/subversion/svn_kio.cpp @@ -17,10 +17,10 @@ Boston, MA 02110-1301, USA. */ -#include <qcstring.h> -#include <qsocket.h> -#include <qdatetime.h> -#include <qbitarray.h> +#include <tqcstring.h> +#include <tqsocket.h> +#include <tqdatetime.h> +#include <tqbitarray.h> #include <stdlib.h> #include <math.h> @@ -39,7 +39,7 @@ #include <kurl.h> #include <ksock.h> #include <dcopclient.h> -#include <qcstring.h> +#include <tqcstring.h> #include <subversion-1/svn_sorts.h> #include <subversion-1/svn_path.h> @@ -49,7 +49,7 @@ #include <subversion-1/svn_cmdline.h> #include <kmimetype.h> -#include <qfile.h> +#include <tqfile.h> #include "svn_kio.h" #include <apr_portable.h> @@ -115,7 +115,7 @@ compare_items_as_paths (const svn_sort__item_t*a, const svn_sort__item_t*b) { return svn_path_compare_paths ((const char *)a->key, (const char *)b->key); } -kio_svnProtocol::kio_svnProtocol(const QCString &pool_socket, const QCString &app_socket) +kio_svnProtocol::kio_svnProtocol(const TQCString &pool_socket, const TQCString &app_socket) : SlaveBase("kio_svn", pool_socket, app_socket) { kdDebug(9036) << "kio_svnProtocol::kio_svnProtocol()" << endl; @@ -245,7 +245,7 @@ void kio_svnProtocol::recordCurrentURL(const KURL& url) { void kio_svnProtocol::get(const KURL& url ){ kdDebug(9036) << "kio_svn::get(const KURL& url)" << endl ; - QString remoteServer = url.host(); + TQString remoteServer = url.host(); infoMessage(i18n("Looking for %1...").arg( remoteServer ) ); apr_pool_t *subpool = svn_pool_create (pool); @@ -254,7 +254,7 @@ void kio_svnProtocol::get(const KURL& url ){ bt->string_stream = svn_stream_create(bt,subpool); svn_stream_set_write(bt->string_stream,write_to_string); - QString target = makeSvnURL( url ); + TQString target = makeSvnURL( url ); kdDebug(9036) << "SvnURL: " << target << endl; recordCurrentURL( KURL( target ) ); @@ -263,7 +263,7 @@ void kio_svnProtocol::get(const KURL& url ){ svn_opt_revision_t endrev; int idx = target.findRev( "?rev=" ); if ( idx != -1 ) { - QString revstr = target.mid( idx+5 ); + TQString revstr = target.mid( idx+5 ); #if 0 kdDebug(9036) << "revision string found " << revstr << endl; if ( revstr == "HEAD" ) { @@ -292,7 +292,7 @@ void kio_svnProtocol::get(const KURL& url ){ } // Send the mimeType as soon as it is known - QByteArray *cp = new QByteArray(); + TQByteArray *cp = new TQByteArray(); cp->setRawData( bt->target_string->data, bt->target_string->len ); KMimeType::Ptr mt = KMimeType::findByContent(*cp); kdDebug(9036) << "KMimeType returned : " << mt->name() << endl; @@ -303,7 +303,7 @@ void kio_svnProtocol::get(const KURL& url ){ //send data data(*cp); - data(QByteArray()); // empty array means we're done sending the data + data(TQByteArray()); // empty array means we're done sending the data finished(); svn_pool_destroy (subpool); } @@ -316,7 +316,7 @@ void kio_svnProtocol::stat(const KURL & url){ svn_node_kind_t kind; apr_pool_t *subpool = svn_pool_create (pool); - QString target = makeSvnURL( url); + TQString target = makeSvnURL( url); kdDebug(9036) << "SvnURL: " << target << endl; recordCurrentURL( KURL( target ) ); @@ -325,7 +325,7 @@ void kio_svnProtocol::stat(const KURL & url){ svn_opt_revision_t endrev; int idx = target.findRev( "?rev=" ); if ( idx != -1 ) { - QString revstr = target.mid( idx+5 ); + TQString revstr = target.mid( idx+5 ); #if 0 kdDebug(9036) << "revision string found " << revstr << endl; if ( revstr == "HEAD" ) { @@ -421,7 +421,7 @@ void kio_svnProtocol::listDir(const KURL& url){ apr_pool_t *subpool = svn_pool_create (pool); apr_hash_t *dirents; - QString target = makeSvnURL( url); + TQString target = makeSvnURL( url); kdDebug(9036) << "SvnURL: " << target << endl; recordCurrentURL( KURL( target ) ); @@ -430,7 +430,7 @@ void kio_svnProtocol::listDir(const KURL& url){ svn_opt_revision_t endrev; int idx = target.findRev( "?rev=" ); if ( idx != -1 ) { - QString revstr = target.mid( idx+5 ); + TQString revstr = target.mid( idx+5 ); svn_opt_parse_revision( &rev, &endrev, revstr.utf8(), subpool ); #if 0 kdDebug(9036) << "revision string found " << revstr << endl; @@ -490,7 +490,7 @@ void kio_svnProtocol::listDir(const KURL& url){ if (dirent->last_author) svn_utf_cstring_from_utf8 (&native_author, dirent->last_author, subpool); - if ( createUDSEntry(QString( native_entryname ), QString( native_author ), dirent->size, + if ( createUDSEntry(TQString( native_entryname ), TQString( native_author ), dirent->size, dirent->kind==svn_node_dir ? true : false, 0, entry) ) listEntry( entry, false ); } @@ -500,7 +500,7 @@ void kio_svnProtocol::listDir(const KURL& url){ svn_pool_destroy (subpool); } -bool kio_svnProtocol::createUDSEntry( const QString& filename, const QString& user, long long int size, bool isdir, time_t mtime, UDSEntry& entry) { +bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString& user, long long int size, bool isdir, time_t mtime, UDSEntry& entry) { kdDebug(9036) << "MTime : " << ( long )mtime << endl; kdDebug(9036) << "UDS filename : " << filename << endl; UDSAtom atom; @@ -538,8 +538,8 @@ bool kio_svnProtocol::createUDSEntry( const QString& filename, const QString& us // KURL ndest = dest; // nsrc.setProtocol( chooseProtocol( src.protocol() ) ); // ndest.setProtocol( chooseProtocol( dest.protocol() ) ); -// QString srcsvn = nsrc.url(); -// QString destsvn = ndest.url(); +// TQString srcsvn = nsrc.url(); +// TQString destsvn = ndest.url(); // // recordCurrentURL( nsrc ); // @@ -547,7 +547,7 @@ bool kio_svnProtocol::createUDSEntry( const QString& filename, const QString& us // svn_opt_revision_t rev; // int idx = srcsvn.findRev( "?rev=" ); // if ( idx != -1 ) { -// QString revstr = srcsvn.mid( idx+5 ); +// TQString revstr = srcsvn.mid( idx+5 ); // kdDebug(9036) << "revision string found " << revstr << endl; // if ( revstr == "HEAD" ) { // rev.kind = svn_opt_revision_head; @@ -587,7 +587,7 @@ void kio_svnProtocol::mkdir( const KURL::List& list, int /*permissions*/ ) { KURL::List::const_iterator it = list.begin(), end = list.end(); for ( ; it != end; ++it ) { - QString cur = makeSvnURL( *it ); + TQString cur = makeSvnURL( *it ); kdDebug( 9036 ) << "kio_svnProtocol::mkdir raw url for subversion : " << cur << endl; const char *_target = apr_pstrdup( subpool, svn_path_canonicalize( apr_pstrdup( subpool, cur.utf8() ), subpool ) ); (*(( const char ** )apr_array_push(( apr_array_header_t* )targets)) ) = _target; @@ -596,7 +596,7 @@ void kio_svnProtocol::mkdir( const KURL::List& list, int /*permissions*/ ) { initNotifier(false, false, false, subpool); svn_error_t *err = svn_client_mkdir(&commit_info,targets,ctx,subpool); if ( err ) { - error( KIO::ERR_COULD_NOT_MKDIR, QString::fromLocal8Bit(err->message) ); + error( KIO::ERR_COULD_NOT_MKDIR, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } @@ -611,7 +611,7 @@ void kio_svnProtocol::mkdir( const KURL& url, int /*permissions*/ ) { apr_pool_t *subpool = svn_pool_create (pool); svn_client_commit_info_t *commit_info = NULL; - QString target = makeSvnURL( url); + TQString target = makeSvnURL( url); kdDebug(9036) << "SvnURL: " << target << endl; recordCurrentURL( KURL( target ) ); @@ -636,7 +636,7 @@ void kio_svnProtocol::del( const KURL& url, bool /*isfile*/ ) { apr_pool_t *subpool = svn_pool_create (pool); svn_client_commit_info_t *commit_info = NULL; - QString target = makeSvnURL(url); + TQString target = makeSvnURL(url); kdDebug(9036) << "SvnURL: " << target << endl; recordCurrentURL( KURL( target ) ); @@ -665,8 +665,8 @@ void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite KURL ndest = dest; nsrc.setProtocol( chooseProtocol( src.protocol() ) ); ndest.setProtocol( chooseProtocol( dest.protocol() ) ); - QString srcsvn = nsrc.url(); - QString destsvn = ndest.url(); + TQString srcsvn = nsrc.url(); + TQString destsvn = ndest.url(); recordCurrentURL( nsrc ); @@ -674,7 +674,7 @@ void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite svn_opt_revision_t rev; int idx = srcsvn.findRev( "?rev=" ); if ( idx != -1 ) { - QString revstr = srcsvn.mid( idx+5 ); + TQString revstr = srcsvn.mid( idx+5 ); kdDebug(9036) << "revision string found " << revstr << endl; if ( revstr == "HEAD" ) { rev.kind = svn_opt_revision_head; @@ -703,10 +703,10 @@ void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite svn_pool_destroy (subpool); } -void kio_svnProtocol::special( const QByteArray& data ) { +void kio_svnProtocol::special( const TQByteArray& data ) { // kdDebug(9036) << "kio_svnProtocol::special" << endl; - QDataStream stream(data, IO_ReadOnly); + TQDataStream stream(data, IO_ReadOnly); int tmp; stream >> tmp; @@ -717,7 +717,7 @@ void kio_svnProtocol::special( const QByteArray& data ) { { KURL repository, wc; int revnumber; - QString revkind; + TQString revkind; stream >> repository; stream >> wc; stream >> revnumber; @@ -730,7 +730,7 @@ void kio_svnProtocol::special( const QByteArray& data ) { { KURL::List list; int revnumber; - QString revkind; + TQString revkind; stream >> list; stream >> revnumber; stream >> revkind; @@ -769,7 +769,7 @@ void kio_svnProtocol::special( const QByteArray& data ) { { kdDebug(9036) << "kio_svnProtocol LOG" << endl; int revstart, revend; - QString revkindstart, revkindend; + TQString revkindstart, revkindend; bool discorverChangedPath, strictNodeHistory; KURL::List targets; @@ -835,7 +835,7 @@ void kio_svnProtocol::special( const QByteArray& data ) { case SVN_STATUS_2: { KURL wc; - QString revkind; + TQString revkind; int revnumber; bool checkRepos, fullRecurse, getAll, noIgnore; stream >> checkRepos; @@ -871,7 +871,7 @@ void kio_svnProtocol::special( const QByteArray& data ) { KURL wc,url; bool recurse; int revnumber; - QString revkind; + TQString revkind; stream >> wc; stream >> url; stream >> recurse; @@ -897,7 +897,7 @@ void kio_svnProtocol::special( const QByteArray& data ) { KURL url1,url2; int rev1, rev2; bool recurse, pegdiff; - QString revkind1, revkind2; + TQString revkind1, revkind2; stream >> url1; stream >> url2; stream >> rev1; @@ -914,7 +914,7 @@ void kio_svnProtocol::special( const QByteArray& data ) { KURL url; int urlMode; int pegRev, startRev, endRev; - QString pegRevKind, startRevKind, endRevKind; + TQString pegRevKind, startRevKind, endRevKind; stream >> url; stream >> urlMode; // stream >> pegRev; @@ -931,7 +931,7 @@ void kio_svnProtocol::special( const QByteArray& data ) { { KURL pathOrUrl; int pegRev, rev; - QString pegRevKind, revKind; + TQString pegRevKind, revKind; bool recurse = false; stream >> pathOrUrl; stream >> pegRev; @@ -946,7 +946,7 @@ void kio_svnProtocol::special( const QByteArray& data ) { { KURL src, dest; int srcRev; - QString srcRevKind; + TQString srcRevKind; stream >> src; stream >> srcRev; stream >> srcRevKind; @@ -958,7 +958,7 @@ void kio_svnProtocol::special( const QByteArray& data ) { { KURL src1, src2, wc_target; int rev1, rev2; - QString revKind1, revKind2; + TQString revKind1, revKind2; bool recurse, ignore_ancestry, force, dry_run; stream >> src1 >> rev1 >> revKind1; stream >> src2 >> rev2 >> revKind2; @@ -978,16 +978,16 @@ void kio_svnProtocol::special( const QByteArray& data ) { /** * not used anywhere, anymore */ -void kio_svnProtocol::popupMessage( const QString& message ) { -// QByteArray params; -// QDataStream stream(params, IO_WriteOnly); +void kio_svnProtocol::popupMessage( const TQString& message ) { +// TQByteArray params; +// TQDataStream stream(params, IO_WriteOnly); // stream << message; // -// if ( !dcopClient()->send( "kded","ksvnd","popupMessage(QString)", params ) ) +// if ( !dcopClient()->send( "kded","ksvnd","popupMessage(TQString)", params ) ) // kdWarning() << "Communication with KDED:KSvnd failed" << endl; } -void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, QString pegRevKind,*/ int startRev, QString startRevKind, int endRev, QString endRevKind ) +void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, TQString pegRevKind,*/ int startRev, TQString startRevKind, int endRev, TQString endRevKind ) { kdDebug(9036) << " __TIME__ " << __TIME__ << endl; // kdDebug(9036) << " PegRev " << pegRev << pegRevKind << endl; @@ -1005,7 +1005,7 @@ void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, QString p svn_client_blame_receiver_t receiver = kio_svnProtocol::blameReceiver; svn_error_t *err = svn_client_blame( path_or_url, &rev1, &rev2, receiver, (void*)this, ctx, subpool ); if ( err ) - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); finished(); svn_pool_destroy (subpool); @@ -1014,11 +1014,11 @@ void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, QString p svn_error_t* kio_svnProtocol::blameReceiver( void *baton, apr_int64_t line_no, svn_revnum_t rev, const char *author, const char *date, const char *line, apr_pool_t *pool ) { kio_svnProtocol *p = (kio_svnProtocol*)baton; - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "LINE", QString::number(line_no) ); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "REV", QString::number(rev) ); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "AUTHOR", author ); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "DATE", date ); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "CONTENT", QString::fromLocal8Bit(line) ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "LINE", TQString::number(line_no) ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "REV", TQString::number(rev) ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "AUTHOR", author ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "DATE", date ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "CONTENT", TQString::fromLocal8Bit(line) ); p->incCounter(); return SVN_NO_ERROR; @@ -1029,7 +1029,7 @@ svn_error_t* kio_svnProtocol::blameReceiver( void *baton, apr_int64_t line_no, s Thus retreiving URL from WC should be done here, using subversion native API. Thus, svn_log should get another flag (bool repositHistory )specifying between file:/// or URL */ -void kio_svnProtocol::svn_log( int revstart, const QString& revkindstart, int revend, const QString& revkindend, +void kio_svnProtocol::svn_log( int revstart, const TQString& revkindstart, int revend, const TQString& revkindend, bool discorverChangedPaths, bool strictNodeHistory, const KURL::List& urls ) { @@ -1045,21 +1045,21 @@ void kio_svnProtocol::svn_log( int revstart, const QString& revkindstart, int re m_counter = 0; apr_array_header_t *targets = apr_array_make(subpool, 1+urls.count(), sizeof(const char *)); - for ( QValueListConstIterator<KURL> it = urls.begin(); it != urls.end() ; ++it ) { + for ( TQValueListConstIterator<KURL> it = urls.begin(); it != urls.end() ; ++it ) { KURL nurl = *it; const char *path = apr_pstrdup( subpool, svn_path_canonicalize( nurl.pathOrURL().utf8(), subpool ) ); kdDebug(9036) << path << endl; *(( const char ** )apr_array_push(( apr_array_header_t* )targets)) = path; - setMetaData(QString::number( counter() ).rightJustify( 10,'0' )+ "requrl", nurl.pathOrURL() ); + setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "requrl", nurl.pathOrURL() ); incCounter(); } svn_log_message_receiver_t receiver = kio_svnProtocol::receiveLogMessage; svn_error_t *err = svn_client_log2(targets, &rev1, &rev2, 0, discorverChangedPaths, strictNodeHistory, receiver, this, ctx, subpool); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } @@ -1073,12 +1073,12 @@ svn_error_t* kio_svnProtocol::receiveLogMessage(void *baton, apr_hash_t *changed const char *author, const char *date, const char *message, apr_pool_t *pool ) { kio_svnProtocol *p = (kio_svnProtocol*)baton; - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", QString::number(revision) ); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "author", author ); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "date", date ); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "logmsg", QString::fromLocal8Bit(message) ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", TQString::number(revision) ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "author", author ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "date", date ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "logmsg", TQString::fromLocal8Bit(message) ); if( changed_paths != NULL ){ - QString pathlist; + TQString pathlist; void *onePath; const char *pathkey; apr_hash_index_t *hi; @@ -1093,13 +1093,13 @@ svn_error_t* kio_svnProtocol::receiveLogMessage(void *baton, apr_hash_t *changed pathlist += "\n"; } kdDebug(9036) << "pathlist: " << pathlist <<endl; - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "pathlist", pathlist ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "pathlist", pathlist ); } p->incCounter(); return SVN_NO_ERROR; } -svn_opt_revision_t kio_svnProtocol::createRevision( int revision, const QString& revkind, apr_pool_t *pool ) { +svn_opt_revision_t kio_svnProtocol::createRevision( int revision, const TQString& revkind, apr_pool_t *pool ) { svn_opt_revision_t result;//,endrev; // TODO support svn_opt_revision_date if ( revision != -1 ) { @@ -1127,7 +1127,7 @@ svn_opt_revision_t kio_svnProtocol::createRevision( int revision, const QString& return result; } -void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int rev2,const QString& revkind1,const QString& revkind2,bool recurse, bool pegdiff ) +void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int rev2,const TQString& revkind1,const TQString& revkind2,bool recurse, bool pegdiff ) { kdDebug(9036) << "kio_svn::diff : " << url1.path() << " at revision " << rev1 << " or " << revkind1 << " with " << url2.path() << " at revision " << rev2 << " or " << revkind2 @@ -1141,8 +1141,8 @@ void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int // nurl1.setProtocol( chooseProtocol( url1.protocol() ) ); //svn+https -> https for eg // nurl2.setProtocol( chooseProtocol( url2.protocol() ) ); // recordCurrentURL( nurl1 ); -// QString source = makeSvnURL( nurl1 ); -// QString target = makeSvnURL( nurl2 ); +// TQString source = makeSvnURL( nurl1 ); +// TQString target = makeSvnURL( nurl2 ); // const char *path1 = svn_path_canonicalize( apr_pstrdup( subpool, source.utf8() ), subpool ); // const char *path2 = svn_path_canonicalize( apr_pstrdup( subpool, target.utf8() ), subpool ); @@ -1183,25 +1183,25 @@ void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int } if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } //read the content of the outfile now - QStringList tmp; + TQStringList tmp; apr_file_close(outfile); - QFile file(templ); + TQFile file(templ); if ( file.open( IO_ReadOnly ) ) { - QTextStream stream( &file ); - QString line; + TQTextStream stream( &file ); + TQString line; while ( !stream.atEnd() ) { line = stream.readLine(); tmp << line; } file.close(); } - for ( QStringList::Iterator itt = tmp.begin(); itt != tmp.end(); itt++ ) { - setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "diffresult", ( *itt ) ); + for ( TQStringList::Iterator itt = tmp.begin(); itt != tmp.end(); itt++ ) { + setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "diffresult", ( *itt ) ); m_counter++; } //delete temp file @@ -1211,7 +1211,7 @@ void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int svn_pool_destroy (subpool); } -void kio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumber, const QString& revkind, bool recurse) { +void kio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumber, const TQString& revkind, bool recurse) { kdDebug(9036) << "kio_svn::switch : " << wc.path() << " at revision " << revnumber << " or " << revkind << endl ; apr_pool_t *subpool = svn_pool_create (pool); @@ -1221,8 +1221,8 @@ void kio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumb nurl.setProtocol( chooseProtocol( repos.protocol() ) ); dest.setProtocol( "file" ); // recordCurrentURL( nurl ); -// QString source = dest.path(); -// QString target = makeSvnURL( repos ); +// TQString source = dest.path(); +// TQString target = makeSvnURL( repos ); const char *path = svn_path_canonicalize( apr_pstrdup( subpool, dest.path().utf8() ), subpool ); const char *url = svn_path_canonicalize( apr_pstrdup( subpool, nurl.url().utf8() ), subpool ); @@ -1233,7 +1233,7 @@ void kio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumb initNotifier(false, false, false, subpool); svn_error_t *err = svn_client_switch (NULL/*result revision*/, path, url, &rev, recurse, ctx, subpool); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit( err->message ) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit( err->message ) ); svn_pool_destroy (subpool); return; } @@ -1255,18 +1255,18 @@ void kio_svnProtocol::svn_switch_relocate( const KURL &wc, const KURL &origUrl, svn_error_t *err = svn_client_relocate( wcPath, fromUrl, toUrl, recurse, ctx, pool ); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit( err->message ) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit( err->message ) ); svn_pool_destroy (subpool); return; } m_counter = 0L; - setMetaData(QString::number( counter() ).rightJustify( 10,'0' )+ "string", - QString("switched to %1").arg( toUrl ) ); + setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string", + TQString("switched to %1").arg( toUrl ) ); finished(); svn_pool_destroy( subpool ); } -void kio_svnProtocol::update( const KURL::List &list, int revnumber, const QString& revkind ) { +void kio_svnProtocol::update( const KURL::List &list, int revnumber, const TQString& revkind ) { kdDebug(9036) << "kio_svn::update : __TIME__" << __TIME__ << endl; apr_pool_t *subpool = svn_pool_create (pool); @@ -1274,7 +1274,7 @@ void kio_svnProtocol::update( const KURL::List &list, int revnumber, const QStri apr_array_header_t *targets = apr_array_make(subpool, 1+list.count(), sizeof(const char *)); svn_opt_revision_t rev = createRevision( revnumber, revkind, subpool ); - for( QValueList<KURL>::ConstIterator it = list.begin(); it != list.end(); ++it ){ + for( TQValueList<KURL>::ConstIterator it = list.begin(); it != list.end(); ++it ){ KURL nurl = *it; *( const char ** )apr_array_push(targets) = svn_path_canonicalize( nurl.path().utf8(), subpool ); } @@ -1284,7 +1284,7 @@ void kio_svnProtocol::update( const KURL::List &list, int revnumber, const QStri true/*recurse*/, false/*ignore_external*/, ctx, subpool); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } @@ -1310,7 +1310,7 @@ void kio_svnProtocol::import( const KURL& repos, const KURL& wc ) { svn_error_t *err = svn_client_import2(&commit_info, path, url, nonrecursive, false, ctx, subpool); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } @@ -1319,7 +1319,7 @@ void kio_svnProtocol::import( const KURL& repos, const KURL& wc ) { finished(); } -void kio_svnProtocol::checkout( const KURL& repos, const KURL& wc, int revnumber, const QString& revkind ) { +void kio_svnProtocol::checkout( const KURL& repos, const KURL& wc, int revnumber, const TQString& revkind ) { kdDebug(9036) << "kio_svn::checkout : " << repos.url() << " into " << wc.path() << " at revision " << revnumber << " or " << revkind << endl ; apr_pool_t *subpool = svn_pool_create (pool); @@ -1327,9 +1327,9 @@ void kio_svnProtocol::checkout( const KURL& repos, const KURL& wc, int revnumber KURL dest = wc; nurl.setProtocol( chooseProtocol( repos.protocol() ) ); dest.setProtocol( "file" ); - QString target = makeSvnURL( repos ); + TQString target = makeSvnURL( repos ); recordCurrentURL( nurl ); - QString dpath = dest.path(); + TQString dpath = dest.path(); //find the requested revision svn_opt_revision_t rev = createRevision( revnumber, revkind, subpool ); @@ -1358,7 +1358,7 @@ void kio_svnProtocol::commit2(bool recurse, bool keeplocks, const KURL::List& wc apr_array_header_t *targets = apr_array_make(subpool, 1+wc.count(), sizeof(const char *)); - for ( QValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) { + for ( TQValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) { KURL nurl = *it; nurl.setProtocol( "file" ); recordCurrentURL( nurl ); @@ -1372,27 +1372,27 @@ void kio_svnProtocol::commit2(bool recurse, bool keeplocks, const KURL::List& wc if ( err ){ char errbuf[512]; svn_strerror(err->apr_err, errbuf, 512); - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) + "\n: " + QString::fromLocal8Bit(errbuf) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) + "\n: " + TQString::fromLocal8Bit(errbuf) ); svn_pool_destroy (subpool); return; } if ( commit_info ) { - for ( QValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) { + for ( TQValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) { KURL nurl = *it; nurl.setProtocol( "file" ); - QString userstring = i18n ( "Nothing to commit." ); + TQString userstring = i18n ( "Nothing to commit." ); if ( SVN_IS_VALID_REVNUM( commit_info->revision ) ) userstring = i18n( "Committed revision %1." ).arg(commit_info->revision); - setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "path", nurl.path() ); - setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "action", "0" ); - setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "kind", "0" ); - setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "mime_t", "" ); - setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "content", "0" ); - setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "prop", "0" ); - setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "rev" , QString::number( commit_info->revision ) ); - setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "string", userstring ); + setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "path", nurl.path() ); + setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "action", "0" ); + setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "kind", "0" ); + setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "mime_t", "" ); + setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "content", "0" ); + setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "prop", "0" ); + setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "rev" , TQString::number( commit_info->revision ) ); + setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "string", userstring ); m_counter++; } } @@ -1409,7 +1409,7 @@ void kio_svnProtocol::add(const KURL::List& list) { initNotifier(false, false, false, subpool); svn_error_t *err = NULL; - for( QValueList<KURL>::ConstIterator it = list.begin(); it != list.end(); ++it ){ + for( TQValueList<KURL>::ConstIterator it = list.begin(); it != list.end(); ++it ){ KURL nurl = (*it); nurl.setProtocol( "file" ); @@ -1420,7 +1420,7 @@ void kio_svnProtocol::add(const KURL::List& list) { if( err ) break; } if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } @@ -1438,7 +1438,7 @@ void kio_svnProtocol::wc_delete(const KURL::List& wc) { apr_array_header_t *targets = apr_array_make(subpool, 1+wc.count(), sizeof(const char *)); - for ( QValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) { + for ( TQValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) { KURL nurl = *it; nurl.setProtocol( "file" ); recordCurrentURL( nurl ); @@ -1449,7 +1449,7 @@ void kio_svnProtocol::wc_delete(const KURL::List& wc) { svn_error_t *err = svn_client_delete(&commit_info,targets,force,ctx,subpool); if ( err ) - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); finished(); svn_pool_destroy (subpool); @@ -1463,7 +1463,7 @@ void kio_svnProtocol::wc_revert(const KURL::List& wc) { apr_array_header_t *targets = apr_array_make(subpool, 1 + wc.count(), sizeof(const char *)); - for ( QValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) { + for ( TQValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) { KURL nurl = *it; nurl.setProtocol( "file" ); recordCurrentURL( nurl ); @@ -1473,7 +1473,7 @@ void kio_svnProtocol::wc_revert(const KURL::List& wc) { initNotifier(false, false, false, subpool); svn_error_t *err = svn_client_revert(targets,nonrecursive,ctx,subpool); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit( err->message ) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit( err->message ) ); svn_pool_destroy (subpool); return; } @@ -1482,13 +1482,13 @@ void kio_svnProtocol::wc_revert(const KURL::List& wc) { svn_pool_destroy (subpool); } -void kio_svnProtocol::wc_status(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, int revnumber, const QString& revkind) { +void kio_svnProtocol::wc_status(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, int revnumber, const TQString& revkind) { kdDebug(9036) << "kio_svnProtocol::wc_status() : " << wc.url() << " checkRepos " << checkRepos << " fullRecurse " << fullRecurse << " getAll " << getAll << endl; wc_status2( wc, checkRepos, fullRecurse, getAll, false, revnumber, revkind ); } -void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, bool noIgnore, int revnumber, const QString& revkind) { +void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, bool noIgnore, int revnumber, const TQString& revkind) { kdDebug(9036) << "kio_svnProtocol::wc_status2() : " << wc.url() << " checkRepos " << checkRepos << " fullRecurse " << fullRecurse << " getAll " << getAll << " noIgnore " << noIgnore << " revnumber " << revnumber << " revkind " << revkind << endl; kdDebug(9036) << " __TIME__ " << __TIME__ << endl; @@ -1506,7 +1506,7 @@ void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecur svn_error_t *err = svn_client_status(&result_rev, svn_path_canonicalize( nurl.path().utf8(), subpool ), &rev, kio_svnProtocol::status, this, fullRecurse, getAll, checkRepos, noIgnore, ctx, subpool); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } @@ -1515,7 +1515,7 @@ void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecur svn_pool_destroy (subpool); } -void kio_svnProtocol::svn_info( KURL pathOrUrl, int pegRev, QString pegRevKind, int rev, QString revKind, bool recurse ) +void kio_svnProtocol::svn_info( KURL pathOrUrl, int pegRev, TQString pegRevKind, int rev, TQString revKind, bool recurse ) { kdDebug(9036) << " kio_svnProtocol::svn_info(): pegRev " << pegRev << " pegKind " << pegRevKind << " rev " << rev << " revKind " << revKind << " recurse " << recurse << endl; @@ -1531,7 +1531,7 @@ void kio_svnProtocol::svn_info( KURL pathOrUrl, int pegRev, QString pegRevKind, ctx, pool ); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } @@ -1546,18 +1546,18 @@ svn_error_t* kio_svnProtocol::infoReceiver( void *baton, const char *path, if( !p ) return SVN_NO_ERROR; - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "PATH", QString::fromUtf8( path )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "URL", QString( info->URL ) ); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "REV", QString::number( info->rev )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "KIND", QString::number( info->kind )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "REPOS_ROOT_URL", QString( info->repos_root_URL ) ); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "REPOS_UUID", QString(info->repos_UUID) ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "PATH", TQString::fromUtf8( path )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "URL", TQString( info->URL ) ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "REV", TQString::number( info->rev )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "KIND", TQString::number( info->kind )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "REPOS_ROOT_URL", TQString( info->repos_root_URL ) ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "REPOS_UUID", TQString(info->repos_UUID) ); p->incCounter(); return SVN_NO_ERROR; } -void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const QString &srcRevKind, +void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const TQString &srcRevKind, const KURL &destUrl ) { kdDebug(9036) << " kio: svn_copy src: " << srcUrl << " Dest Url: " << destUrl << " revnum: " << srcRev << " revKind: " << srcRevKind << endl; @@ -1577,16 +1577,16 @@ void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const QString &s apr_status_t errcode = err->apr_err; char buf[512]; svn_strerror(errcode, buf, 512); - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(buf) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(buf) ); svn_pool_destroy (subpool); return; } if( commit_info ){ - setMetaData(QString::number( counter() ).rightJustify( 10,'0' )+ "string", + setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string", i18n("Copied Revision %1").arg( commit_info->revision) ); } else { - setMetaData(QString::number( counter() ).rightJustify( 10,'0' )+ "string", + setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string", i18n("Copied") ); } @@ -1594,8 +1594,8 @@ void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const QString &s svn_pool_destroy (subpool); } -void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, QString revKind1, - const KURL &src2, int revNum2, QString revKind2, +void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, TQString revKind1, + const KURL &src2, int revNum2, TQString revKind2, const KURL &target_wc, bool recurse, bool ignore_ancestry, bool force, bool dry_run ) { @@ -1616,7 +1616,7 @@ void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, QString revKind1, char buf[512]; svn_strerror(errcode, buf, 512); error( KIO::ERR_SLAVE_DEFINED, - QString::fromLocal8Bit(err->message) + "\n "+ QString::fromLocal8Bit(buf) ); + TQString::fromLocal8Bit(err->message) + "\n "+ TQString::fromLocal8Bit(buf) ); svn_pool_destroy (subpool); return; } @@ -1627,11 +1627,11 @@ void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, QString revKind1, //change the proto and remove trailing / //remove double / also -QString kio_svnProtocol::makeSvnURL ( const KURL& url ) const { - QString kproto = url.protocol(); +TQString kio_svnProtocol::makeSvnURL ( const KURL& url ) const { + TQString kproto = url.protocol(); KURL tpURL = url; tpURL.cleanPath( true ); - QString svnUrl; + TQString svnUrl; if ( kproto == "kdevsvn+http" ) { kdDebug(9036) << "http:/ " << url.url() << endl; tpURL.setProtocol("http"); @@ -1668,12 +1668,12 @@ QString kio_svnProtocol::makeSvnURL ( const KURL& url ) const { return tpURL.url(-1); } -QString kio_svnProtocol::chooseProtocol ( const QString& kproto ) const { - if ( kproto == "svn+http" ) return QString( "http" ); - else if ( kproto == "svn+https" ) return QString( "https" ); - else if ( kproto == "svn+ssh" ) return QString( "svn+ssh" ); - else if ( kproto == "svn" ) return QString( "svn" ); - else if ( kproto == "svn+file" ) return QString( "file" ); +TQString kio_svnProtocol::chooseProtocol ( const TQString& kproto ) const { + if ( kproto == "svn+http" ) return TQString( "http" ); + else if ( kproto == "svn+https" ) return TQString( "https" ); + else if ( kproto == "svn+ssh" ) return TQString( "svn+ssh" ); + else if ( kproto == "svn" ) return TQString( "svn" ); + else if ( kproto == "svn+file" ) return TQString( "file" ); return kproto; } /** Certificate is not yet valid. */ @@ -1691,18 +1691,18 @@ svn_error_t *kio_svnProtocol::trustSSLPrompt(svn_auth_cred_ssl_server_trust_t ** { kio_svnProtocol *p = (kio_svnProtocol*)baton; // prepare params. - QByteArray params, replyData; - QCString replyType; - QDataStream arg(params, IO_WriteOnly); + TQByteArray params, replyData; + TQCString replyType; + TQDataStream arg(params, IO_WriteOnly); arg << i18n( "The certificate from the server could not be trusted automatically. Do you want to trust this certificate? " ); - arg << QString::fromLocal8Bit(ci->hostname); - arg << QString::fromLocal8Bit(ci->fingerprint); - arg << QString::fromLocal8Bit(ci->valid_from) << QString::fromLocal8Bit(ci->valid_until); - arg << QString::fromLocal8Bit(ci->issuer_dname) << QString::fromLocal8Bit(ci->ascii_cert) ; + arg << TQString::fromLocal8Bit(ci->hostname); + arg << TQString::fromLocal8Bit(ci->fingerprint); + arg << TQString::fromLocal8Bit(ci->valid_from) << TQString::fromLocal8Bit(ci->valid_until); + arg << TQString::fromLocal8Bit(ci->issuer_dname) << TQString::fromLocal8Bit(ci->ascii_cert) ; // call dcop int ret = p->dcopClient()->call( "kded", "kdevsvnd", - "sslServerTrustPrompt(QString, QString, QString, QString, QString, QString, QString)", + "sslServerTrustPrompt(TQString, TQString, TQString, TQString, TQString, TQString, TQString)", params, replyType, replyData ); if (!ret){ kdWarning() << " failed to prompt SSL_Server_Trust_Prompt " << endl; @@ -1713,7 +1713,7 @@ svn_error_t *kio_svnProtocol::trustSSLPrompt(svn_auth_cred_ssl_server_trust_t ** return SVN_NO_ERROR; } int resultCode; - QDataStream replyStream( replyData, IO_ReadOnly ); + TQDataStream replyStream( replyData, IO_ReadOnly ); replyStream >> resultCode; if( resultCode == -1 ){ @@ -1742,21 +1742,21 @@ svn_error_t *kio_svnProtocol::clientCertSSLPrompt( { kdDebug(9036) << " clientCertSSLPrompt " << endl; // kio_svnProtocol *p = (kio_svnProtocol*)baton; -// QByteArray reply; -// QByteArray params; -// QCString replyType; +// TQByteArray reply; +// TQByteArray params; +// TQCString replyType; // call dcop // if (!p->dcopClient()->call("kded","kdevsvnd", "sslCertFile()",params,replyType,reply)) { // kdWarning()<<" Communication with dcop failed - fail to get certfile "<<endl; // return SVN_NO_ERROR; // } -// if (replyType != "QString") { +// if (replyType != "TQString") { // kdWarning()<<" unexpected reply type "<<endl; // return SVN_NO_ERROR; // } // save reply data -// QString fileName; -// QDataStream replyStream( reply, IO_ReadOnly ); +// TQString fileName; +// TQDataStream replyStream( reply, IO_ReadOnly ); // replyStream >> fileName; // allocate memory // *cred_p = (svn_auth_cred_ssl_client_cert_t*) apr_palloc (pool, sizeof(svn_auth_cred_ssl_client_cert_t)); @@ -1773,23 +1773,23 @@ svn_error_t *kio_svnProtocol::clientCertPasswdPrompt( kdDebug(9036) << " realm " << realm << " <--realm " << endl; // kio_svnProtocol *p = ( kio_svnProtocol* )baton; // // prepare dcop -// QByteArray reply; -// QByteArray params; -// QCString replyType; -// QDataStream arg( params, IO_WriteOnly ); -// arg << i18n( "Enter password for subversion repository access" ) + "\n" + QString(realm); +// TQByteArray reply; +// TQByteArray params; +// TQCString replyType; +// TQDataStream arg( params, IO_WriteOnly ); +// arg << i18n( "Enter password for subversion repository access" ) + "\n" + TQString(realm); // // call dcop -// if (!p->dcopClient()->call("kded","kdevsvnd", "sslPasswdDlg(QString)",params,replyType,reply)) { +// if (!p->dcopClient()->call("kded","kdevsvnd", "sslPasswdDlg(TQString)",params,replyType,reply)) { // kdWarning()<<" Communication with dcop failed - fail to show passwd dlg"<<endl; // return SVN_NO_ERROR; // } -// if (replyType != "QCString") { +// if (replyType != "TQCString") { // kdWarning()<<" unexpected reply type "<<endl; // return SVN_NO_ERROR; // } // // save reply data -// QCString retstr, passwd; -// QDataStream replyStream( reply, IO_ReadOnly ); +// TQCString retstr, passwd; +// TQDataStream replyStream( reply, IO_ReadOnly ); // replyStream >> retstr; // // if( retstr.left(1) == "-1" ){ @@ -1813,16 +1813,16 @@ svn_error_t *kio_svnProtocol::commitLogPrompt( const char **log_msg, const char apr_array_header_t *commit_items, void *baton, apr_pool_t *pool ) { *file = NULL; // if omitting this, it will segfault at import operation. - QCString replyType; - QByteArray params; - QByteArray reply; - QString result;// slist; - QStringList slist; + TQCString replyType; + TQByteArray params; + TQByteArray reply; + TQString result;// slist; + TQStringList slist; kio_svnProtocol *p = ( kio_svnProtocol* )baton; svn_stringbuf_t *message = NULL; for (int i = 0; i < commit_items->nelts; i++) { - QString list; + TQString list; svn_client_commit_item_t *item = ((svn_client_commit_item_t **) commit_items->elts)[i]; const char *path = item->path; char text_mod = '_', prop_mod = ' '; @@ -1856,25 +1856,25 @@ svn_error_t *kio_svnProtocol::commitLogPrompt( const char **log_msg, const char // slist += list; } - QDataStream stream(params, IO_WriteOnly); + TQDataStream stream(params, IO_WriteOnly); stream << slist.join("\n"); kdDebug(9036) << " __TIME__ " << __TIME__ << endl; - if ( !p->dcopClient()->call( "kded","kdevsvnd","commitDialog(QString)", params, replyType, reply ) ) { + if ( !p->dcopClient()->call( "kded","kdevsvnd","commitDialog(TQString)", params, replyType, reply ) ) { kdWarning() << "Communication with KDED:KDevSvnd failed" << endl; svn_error_t *err = svn_error_create( SVN_ERR_EXTERNAL_PROGRAM, NULL, apr_pstrdup( pool, "Fail to call kded_kdevsvnd via DCOP. If this is your first problem, try to restart KDE" ) ); return err; } - if ( replyType != "QString" ) { + if ( replyType != "TQString" ) { kdWarning() << "Unexpected reply type" << endl; svn_error_t *err = svn_error_create( SVN_ERR_EXTERNAL_PROGRAM, NULL, apr_pstrdup( pool, "Fail to call kded_kdevsvnd via DCOP." ) ); return err; } - QDataStream stream2 ( reply, IO_ReadOnly ); + TQDataStream stream2 ( reply, IO_ReadOnly ); stream2 >> result; if ( result.isNull() ) { //cancelled @@ -1893,7 +1893,7 @@ svn_error_t *kio_svnProtocol::commitLogPrompt( const char **log_msg, const char void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action_t action, svn_node_kind_t kind, const char *mime_type, svn_wc_notify_state_t content_state, svn_wc_notify_state_t prop_state, svn_revnum_t revision) { kdDebug(9036) << "NOTIFY : " << path << " updated at revision " << revision << " action : " << action << ", kind : " << kind << " , content_state : " << content_state << ", prop_state : " << prop_state << endl; - QString userstring; + TQString userstring; struct notify_baton *nb = ( struct notify_baton* ) baton; //// Convert notification to a user readable string @@ -1970,7 +1970,7 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action || content_state == svn_wc_notify_state_unknown) && (prop_state == svn_wc_notify_state_unchanged || prop_state == svn_wc_notify_state_unknown))) - userstring += QString( " " ) + path; + userstring += TQString( " " ) + path; } break; } @@ -2071,14 +2071,14 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action kio_svnProtocol *p = ( kio_svnProtocol* )nb->master; if (!p) kdDebug(9036) << " Null Pointer at Line " << __LINE__ << endl; - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "path" , QString::fromUtf8( path )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "action", QString::number( action )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "kind", QString::number( kind )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "mime_t", QString::fromUtf8( mime_type )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "content", QString::number( content_state )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "prop", QString::number( prop_state )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", QString::number( revision )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "string", userstring ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "path" , TQString::fromUtf8( path )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "action", TQString::number( action )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "kind", TQString::number( kind )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "mime_t", TQString::fromUtf8( mime_type )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "content", TQString::number( content_state )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "prop", TQString::number( prop_state )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", TQString::number( revision )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "string", userstring ); kdDebug(9036) << " kio_svnProtocol::notify() userstring " << userstring << endl; p->incCounter(); } @@ -2090,19 +2090,19 @@ void kio_svnProtocol::status(void *baton, const char *path, svn_wc_status_t *sta << ", repos prop status : " << status->repos_prop_status << endl; - QByteArray params; + TQByteArray params; kio_svnProtocol *p = ( kio_svnProtocol* )baton; - QDataStream stream(params, IO_WriteOnly); + TQDataStream stream(params, IO_WriteOnly); long int rev = status->entry ? status->entry->revision : 0; - stream << QString::fromUtf8( path ) << status->text_status << status->prop_status << status->repos_text_status << status->repos_prop_status << rev; - - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "path", QString::fromUtf8( path )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "text", QString::number( status->text_status )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "prop", QString::number( status->prop_status )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "reptxt", QString::number( status->repos_text_status )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "repprop", QString::number( status->repos_prop_status )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", QString::number( rev )); + stream << TQString::fromUtf8( path ) << status->text_status << status->prop_status << status->repos_text_status << status->repos_prop_status << rev; + + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "path", TQString::fromUtf8( path )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "text", TQString::number( status->text_status )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "prop", TQString::number( status->prop_status )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "reptxt", TQString::number( status->repos_text_status )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "repprop", TQString::number( status->repos_prop_status )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", TQString::number( rev )); p->incCounter(); } diff --git a/vcs/subversion/svn_kio.h b/vcs/subversion/svn_kio.h index 332a11a9..a66064d0 100644 --- a/vcs/subversion/svn_kio.h +++ b/vcs/subversion/svn_kio.h @@ -20,8 +20,8 @@ #ifndef _svn_H_ #define _svn_H_ -#include <qstring.h> -#include <qcstring.h> +#include <tqstring.h> +#include <tqcstring.h> #include <kurl.h> #include <kio/global.h> @@ -31,7 +31,7 @@ #include <subversion-1/svn_client.h> #include <subversion-1/svn_config.h> #include <sys/stat.h> -#include <qvaluelist.h> +#include <tqvaluelist.h> #include <subversion-1/svn_wc.h> #include "subversion_global.h" @@ -68,9 +68,9 @@ typedef struct notify_baton { class kio_svnProtocol : public KIO::SlaveBase { public: - kio_svnProtocol(const QCString &pool_socket, const QCString &app_socket); + kio_svnProtocol(const TQCString &pool_socket, const TQCString &app_socket); virtual ~kio_svnProtocol(); - virtual void special( const QByteArray& data ); + virtual void special( const TQByteArray& data ); virtual void get(const KURL& url); virtual void listDir(const KURL& url); virtual void stat(const KURL& url); @@ -79,31 +79,31 @@ class kio_svnProtocol : public KIO::SlaveBase virtual void del( const KURL& url, bool isfile ); // virtual void copy(const KURL & src, const KURL& dest, int permissions, bool overwrite); virtual void rename(const KURL& src, const KURL& dest, bool overwrite); - void checkout( const KURL& repos, const KURL& wc, int revnumber, const QString& revkind ); + void checkout( const KURL& repos, const KURL& wc, int revnumber, const TQString& revkind ); void import( const KURL& repos, const KURL& wc ); - void svn_switch( const KURL& wc, const KURL& url, int revnumber, const QString& revkind, bool recurse); + void svn_switch( const KURL& wc, const KURL& url, int revnumber, const TQString& revkind, bool recurse); void svn_switch_relocate( const KURL &wc, const KURL &origUrl, const KURL &newUrl, bool recurse ); - void svn_diff( const KURL& url1, const KURL& url2, int rev1, int rev2, const QString& revkind1, const QString& revkind2, bool recurse, bool pegdiff); + void svn_diff( const KURL& url1, const KURL& url2, int rev1, int rev2, const TQString& revkind1, const TQString& revkind2, bool recurse, bool pegdiff); //TODO fix with svn 1.2 : support a KURL::List -> svn_client_update2() - void update( const KURL::List &list, int revnumber, const QString& revkind ); + void update( const KURL::List &list, int revnumber, const TQString& revkind ); void commit( const KURL::List& wc ); void commit2( bool recurse, bool keeplocks, const KURL::List& wc ); - void blame( KURL url, SvnGlobal::UrlMode mode, /*int pegRev, QString pegRevKind,*/ int startRev, QString startRevKind, int endRev, QString endRevKind ); + void blame( KURL url, SvnGlobal::UrlMode mode, /*int pegRev, TQString pegRevKind,*/ int startRev, TQString startRevKind, int endRev, TQString endRevKind ); static svn_error_t* blameReceiver( void *baton, apr_int64_t line_no, svn_revnum_t rev, const char *author, const char *date, const char *line, apr_pool_t *pool ); - void svn_log( int revstart, const QString &revkindstart, int revend, const QString &revkindend, bool discorverChangedPath, bool strictNodeHistory, const KURL::List& targets ); + void svn_log( int revstart, const TQString &revkindstart, int revend, const TQString &revkindend, bool discorverChangedPath, bool strictNodeHistory, const KURL::List& targets ); static svn_error_t* receiveLogMessage(void *baton, apr_hash_t *changed_paths, svn_revnum_t revision, const char *author, const char *date, const char *message, apr_pool_t *pool ); void add( const KURL::List& wcList ); //these work using the working copy void wc_resolve( const KURL& wc, bool recurse = true ); void wc_delete( const KURL::List& wc ); void wc_revert( const KURL::List& wc ); - void wc_status(const KURL& wc, bool checkRepos=false, bool fullRecurse=true, bool getAll=true, int revnumber=-1, const QString& revkind="HEAD"); - void wc_status2(const KURL& wc, bool checkRepos=false, bool fullRecurse=true, bool getAll=true, bool noIgnore=false, int revnumber=-1, const QString& revkind="WORKING"); - void svn_info( KURL pathOrUrl, int pegRev, QString pegRevKind, int rev, QString revKind, bool recurse ); + void wc_status(const KURL& wc, bool checkRepos=false, bool fullRecurse=true, bool getAll=true, int revnumber=-1, const TQString& revkind="HEAD"); + void wc_status2(const KURL& wc, bool checkRepos=false, bool fullRecurse=true, bool getAll=true, bool noIgnore=false, int revnumber=-1, const TQString& revkind="WORKING"); + void svn_info( KURL pathOrUrl, int pegRev, TQString pegRevKind, int rev, TQString revKind, bool recurse ); static svn_error_t* infoReceiver( void *baton, const char *path, const svn_info_t *info, apr_pool_t *pool); - void svn_copy( const KURL &srcUrl, int srcRev, const QString &srcRevKind, const KURL &destUrl ); - void svn_merge( const KURL &src1, int rev1, QString revKind1, const KURL &src2, int rev2, QString revKind2, + void svn_copy( const KURL &srcUrl, int srcRev, const TQString &srcRevKind, const KURL &destUrl ); + void svn_merge( const KURL &src1, int rev1, TQString revKind1, const KURL &src2, int rev2, TQString revKind2, const KURL &target_wc, bool recurse, bool ignore_ancestry, bool force, bool dry_run ); @@ -116,23 +116,23 @@ class kio_svnProtocol : public KIO::SlaveBase static void status(void *baton, const char *path, svn_wc_status_t *status); static void progressCallback( apr_off_t progress, apr_off_t total, void *baton, apr_pool_t *pool); - QString chooseProtocol ( const QString& kproto ) const; - QString makeSvnURL ( const KURL& url ) const; + TQString chooseProtocol ( const TQString& kproto ) const; + TQString makeSvnURL ( const KURL& url ) const; void initNotifier(bool is_checkout, bool is_export, bool suppress_final_line, apr_pool_t *spool); void recordCurrentURL(const KURL& url); - void popupMessage( const QString& message ); + void popupMessage( const TQString& message ); int counter() { return m_counter; } void incCounter() { m_counter++; } - svn_opt_revision_t createRevision( int revision, const QString& revkind, apr_pool_t *pool ); + svn_opt_revision_t createRevision( int revision, const TQString& revkind, apr_pool_t *pool ); KURL myURL; svn_client_ctx_t *ctx; KIO::AuthInfo info; enum SVN_METHOD { - SVN_CHECKOUT=1, //KURL repository, KURL workingcopy, int revnumber=-1, QString revkind(HEAD, ...) //revnumber==-1 => use of revkind - SVN_UPDATE=2, // KURL wc (svn:///tmp/test, int revnumber=-1, QString revkind(HEAD, ...) // revnumber==-1 => use of revkind + SVN_CHECKOUT=1, //KURL repository, KURL workingcopy, int revnumber=-1, TQString revkind(HEAD, ...) //revnumber==-1 => use of revkind + SVN_UPDATE=2, // KURL wc (svn:///tmp/test, int revnumber=-1, TQString revkind(HEAD, ...) // revnumber==-1 => use of revkind SVN_COMMIT=3, SVN_LOG=4, SVN_IMPORT=5, @@ -155,7 +155,7 @@ class kio_svnProtocol : public KIO::SlaveBase }; private: - bool createUDSEntry( const QString& filename, const QString& user, long long int size, bool isdir, time_t mtime, KIO::UDSEntry& entry); + bool createUDSEntry( const TQString& filename, const TQString& user, long long int size, bool isdir, time_t mtime, KIO::UDSEntry& entry); apr_pool_t *pool; unsigned long int m_counter; }; diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp index ec35200e..e098eab0 100644 --- a/vcs/subversion/svn_logviewwidget.cpp +++ b/vcs/subversion/svn_logviewwidget.cpp @@ -27,72 +27,72 @@ #include <kmessagebox.h> #include <kdebug.h> #include <klocale.h> -#include <qradiobutton.h> -#include <qcombobox.h> +#include <tqradiobutton.h> +#include <tqcombobox.h> #include <knuminput.h> -#include <qcheckbox.h> +#include <tqcheckbox.h> -#include <qsplitter.h> -#include <qheader.h> -#include <qlistview.h> -#include <qlayout.h> -#include <qstringlist.h> +#include <tqsplitter.h> +#include <tqheader.h> +#include <tqlistview.h> +#include <tqlayout.h> +#include <tqstringlist.h> -SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, QWidget *parent) - :QWidget(parent), m_part(part) +SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent) + :TQWidget(parent), m_part(part) { - m_layout = new QGridLayout( this, 1, 1, 11, 6, "SvnLogViewWidgetBaseLayout"); + m_layout = new TQGridLayout( this, 1, 1, 11, 6, "SvnLogViewWidgetBaseLayout"); - splitter1 = new QSplitter( this, "splitter1" ); - splitter1->setOrientation( QSplitter::Horizontal ); + splitter1 = new TQSplitter( this, "splitter1" ); + splitter1->setOrientation( TQSplitter::Horizontal ); splitter1->setMargin(1); - listView1 = new QListView( splitter1, "listView1" ); + listView1 = new TQListView( splitter1, "listView1" ); listView1->addColumn( i18n( "Rev" ) ); listView1->addColumn( i18n( "Date" ) ); listView1->addColumn( i18n( "Author" ) ); listView1->addColumn( i18n( "Comment" ) ); - listView1->resize( QSize(1, 1).expandedTo(minimumSizeHint()) ); - QFont listView1_font( listView1->font() ); + listView1->resize( TQSize(1, 1).expandedTo(minimumSizeHint()) ); + TQFont listView1_font( listView1->font() ); listView1_font.setPointSize( 9 ); listView1->setFont( listView1_font ); listView1->setAllColumnsShowFocus( TRUE ); listView1->setShowSortIndicator( TRUE ); textEdit1 = new KTextEdit( splitter1, "textEdit1" ); - textEdit1->resize( QSize(1, 1).expandedTo(minimumSizeHint()) ); - QFont textEdit1_font( textEdit1->font() ); + textEdit1->resize( TQSize(1, 1).expandedTo(minimumSizeHint()) ); + TQFont textEdit1_font( textEdit1->font() ); textEdit1_font.setPointSize( 9 ); textEdit1->setFont( textEdit1_font ); - textEdit1->setFocusPolicy( QTextEdit::WheelFocus ); + textEdit1->setFocusPolicy( TQTextEdit::WheelFocus ); textEdit1->setReadOnly( TRUE ); m_layout->addWidget( splitter1, 0, 0 ); m_layout->setMargin(1); - resize( QSize(692, 343).expandedTo(minimumSizeHint()) ); + resize( TQSize(692, 343).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); - connect( listView1, SIGNAL(clicked( QListViewItem *)), this, SLOT(slotClicked(QListViewItem*)) ); - connect( listView1, SIGNAL(contextMenuRequested( QListViewItem*, const QPoint&, int )), - this, SLOT(contextMenuRequested(QListViewItem*, const QPoint&, int)) ); + connect( listView1, TQT_SIGNAL(clicked( TQListViewItem *)), this, TQT_SLOT(slotClicked(TQListViewItem*)) ); + connect( listView1, TQT_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint&, int )), + this, TQT_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int)) ); } SvnLogViewWidget::~SvnLogViewWidget() { } -void SvnLogViewWidget::setLogResult( QValueList<SvnLogHolder> *loglist ) +void SvnLogViewWidget::setLogResult( TQValueList<SvnLogHolder> *loglist ) { this->listView1->clear(); this->textEdit1->clear(); this->listView1->setSorting( 1, false ); - for( QValueList<SvnLogHolder>::Iterator it=loglist->begin(); it!=loglist->end(); ++it ){ + for( TQValueList<SvnLogHolder>::Iterator it=loglist->begin(); it!=loglist->end(); ++it ){ SvnLogHolder holder = *it; SvnLogViewItem *item = new SvnLogViewItem(this->listView1); - QString prettyDate = holder.date.left(16).replace(10, 1, ' '); + TQString prettyDate = holder.date.left(16).replace(10, 1, ' '); item->setText(0, holder.rev ); item->setText(1, prettyDate ); @@ -105,12 +105,12 @@ void SvnLogViewWidget::setLogResult( QValueList<SvnLogHolder> *loglist ) // this->listView1->show(); } -void SvnLogViewWidget::setRequestedUrl( QString reqUrl ) +void SvnLogViewWidget::setRequestedUrl( TQString reqUrl ) { m_reqUrl = reqUrl; } -void SvnLogViewWidget::slotClicked( QListViewItem *oneItem ) +void SvnLogViewWidget::slotClicked( TQListViewItem *oneItem ) { if( !oneItem ) return; SvnLogViewItem *item = dynamic_cast<SvnLogViewItem*>( oneItem ); @@ -120,16 +120,16 @@ void SvnLogViewWidget::slotClicked( QListViewItem *oneItem ) textEdit1->append( "\n\n" ); textEdit1->append( item->m_message + "\n" ); } -void SvnLogViewWidget::contextMenuRequested( QListViewItem *item, const QPoint & pos, int col ) +void SvnLogViewWidget::contextMenuRequested( TQListViewItem *item, const TQPoint & pos, int col ) { if( !item || col == -1 ) return; m_ctxLogItem = dynamic_cast<SvnLogViewItem*>(item); if( !m_ctxLogItem ) return; - QPopupMenu *menu = new QPopupMenu(this); - menu->insertItem( i18n("Blame this revision"), this, SLOT(blameThis()) ); - menu->insertItem( i18n("Difference to previous revision"), this, SLOT(diffToPrevious()) ); + TQPopupMenu *menu = new TQPopupMenu(this); + menu->insertItem( i18n("Blame this revision"), this, TQT_SLOT(blameThis()) ); + menu->insertItem( i18n("Difference to previous revision"), this, TQT_SLOT(diffToPrevious()) ); menu->exec( pos ); } void SvnLogViewWidget::blameThis() @@ -139,12 +139,12 @@ void SvnLogViewWidget::blameThis() return; } // note that blame is done on single file. - QStringList modifies = QStringList::split( "\n", m_ctxLogItem->m_pathList, false ); - QString selectedPath; + TQStringList modifies = TQStringList::split( "\n", m_ctxLogItem->m_pathList, false ); + TQString selectedPath; if( modifies.count() > 1 ){ SvnBlameFileSelectDlg dlg(this); dlg.setCandidate( &modifies ); - if( dlg.exec() == QDialog::Accepted ){ + if( dlg.exec() == TQDialog::Accepted ){ selectedPath = dlg.selected(); } else{ return; @@ -156,14 +156,14 @@ void SvnLogViewWidget::blameThis() return; } - QString relPath = selectedPath.section( '/', 1 ); + TQString relPath = selectedPath.section( '/', 1 ); - QValueList< SvnGlobal::SvnInfoHolder > holderList = m_part->m_prjInfoMap.values(); + TQValueList< SvnGlobal::SvnInfoHolder > holderList = m_part->m_prjInfoMap.values(); SvnGlobal::SvnInfoHolder holder; if( holderList.count() > 0 ){ // get full Url holder = holderList.first(); - QString absPath = holder.reposRootUrl.url(-1) + '/' + relPath; + TQString absPath = holder.reposRootUrl.url(-1) + '/' + relPath; kdDebug(9036) << " Blame requested on path " << absPath << endl; // get revision int revEnd = m_ctxLogItem->text(0).toInt(); @@ -188,17 +188,17 @@ void SvnLogViewWidget::diffToPrevious() true/*recurse*/, true/*peg_diff*/ ); } -SvnLogViewOptionDlg::SvnLogViewOptionDlg( QWidget *parent, const char* name, bool modal, WFlags f ) +SvnLogViewOptionDlg::SvnLogViewOptionDlg( TQWidget *parent, const char* name, bool modal, WFlags f ) : SvnLogViewOptionDlgBase( parent, name, modal,f ) { // radio1->setChecked(true); //repository log radio4->setChecked(true); //start revistion by revision keyword radio5->setChecked(true); //end revision by revision number reinstallRevisionSpecifiers(); - connect( intInput1, SIGNAL(valueChanged(int)), this, SLOT(setStartRevnumRadio()) ); - connect( comboBox1, SIGNAL(activated(const QString&)), this, SLOT(setStartRevkindRadio()) ); - connect( intInput2, SIGNAL(valueChanged(int)), this, SLOT(setEndRevnumRadio()) ); - connect( comboBox2, SIGNAL(activated(const QString&)), this, SLOT(setEndRevkindRadio()) ); + connect( intInput1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setStartRevnumRadio()) ); + connect( comboBox1, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(setStartRevkindRadio()) ); + connect( intInput2, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setEndRevnumRadio()) ); + connect( comboBox2, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(setEndRevkindRadio()) ); } SvnLogViewOptionDlg::~SvnLogViewOptionDlg() {} @@ -207,7 +207,7 @@ void SvnLogViewOptionDlg::reinstallRevisionSpecifiers() comboBox1->clear(); comboBox2->clear(); - QStringList items; + TQStringList items; items << "HEAD" << "BASE" << "PREV" << "COMMITTED"; comboBox1->insertStringList( items ); comboBox2->insertStringList( items ); @@ -220,10 +220,10 @@ int SvnLogViewOptionDlg::revstart() return intInput1->value(); } } -QString SvnLogViewOptionDlg::revKindStart() +TQString SvnLogViewOptionDlg::revKindStart() { if( !radio4->isChecked() ){ - return QString(""); + return TQString(""); } else{ return comboBox1->currentText(); } @@ -236,10 +236,10 @@ int SvnLogViewOptionDlg::revend() return intInput2->value(); } } -QString SvnLogViewOptionDlg::revKindEnd() +TQString SvnLogViewOptionDlg::revKindEnd() { if( !radio6->isChecked() ){ - return QString(""); + return TQString(""); } else{ return comboBox2->currentText(); } diff --git a/vcs/subversion/svn_logviewwidget.h b/vcs/subversion/svn_logviewwidget.h index e1738195..7f9a6d4d 100644 --- a/vcs/subversion/svn_logviewwidget.h +++ b/vcs/subversion/svn_logviewwidget.h @@ -24,11 +24,11 @@ #include "subversion_widget.h" #include "svn_logviewoptiondlgbase.h" // #include "subversion_part.h" -#include <qvaluelist.h> -#include <qlistview.h> +#include <tqvaluelist.h> +#include <tqlistview.h> class subversionPart; // class QWidget; -#include <qwidget.h> +#include <tqwidget.h> class KTextEdit; class QSplitter; class QGridLayout; @@ -38,48 +38,48 @@ class SvnLogHolder{ public: SvnLogHolder(){}; ~SvnLogHolder(){}; - QString author; - QString date; - QString logMsg; - QString pathList; - QString rev; + TQString author; + TQString date; + TQString logMsg; + TQString pathList; + TQString rev; }; -class SvnLogViewWidget : public /*SvnLogViewWidgetBase*/ QWidget { +class SvnLogViewWidget : public /*SvnLogViewWidgetBase*/ TQWidget { Q_OBJECT public: - SvnLogViewWidget(subversionPart *part, QWidget *parent); + SvnLogViewWidget(subversionPart *part, TQWidget *parent); virtual ~SvnLogViewWidget(); - void setLogResult( QValueList<SvnLogHolder> *loglist ); - void setRequestedUrl( QString url ); + void setLogResult( TQValueList<SvnLogHolder> *loglist ); + void setRequestedUrl( TQString url ); protected slots: - void slotClicked( QListViewItem* item ); - void contextMenuRequested( QListViewItem *item, const QPoint & pos, int col ); + void slotClicked( TQListViewItem* item ); + void contextMenuRequested( TQListViewItem *item, const TQPoint & pos, int col ); void blameThis(); void diffToPrevious(); private: - QString m_reqUrl; + TQString m_reqUrl; subversionPart *m_part; SvnLogViewItem* m_ctxLogItem; - QSplitter* splitter1; - QListView* listView1; + TQSplitter* splitter1; + TQListView* listView1; KTextEdit* textEdit1; - QGridLayout* m_layout; + TQGridLayout* m_layout; }; class SvnLogViewOptionDlg : public SvnLogViewOptionDlgBase { Q_OBJECT public: - SvnLogViewOptionDlg(QWidget *parent=0, const char* name=0, bool modal=TRUE, WFlags f=0); + SvnLogViewOptionDlg(TQWidget *parent=0, const char* name=0, bool modal=TRUE, WFlags f=0); ~SvnLogViewOptionDlg(); int revstart(); - QString revKindStart(); + TQString revKindStart(); int revend(); - QString revKindEnd(); + TQString revKindEnd(); bool strictNode(); public slots: void reinstallRevisionSpecifiers(); diff --git a/vcs/subversion/svn_mergewidget.cpp b/vcs/subversion/svn_mergewidget.cpp index fe9a0064..50731690 100644 --- a/vcs/subversion/svn_mergewidget.cpp +++ b/vcs/subversion/svn_mergewidget.cpp @@ -21,22 +21,22 @@ #include "svn_mergewidget.h" #include "subversion_global.h" #include <kurlrequester.h> -#include <qradiobutton.h> +#include <tqradiobutton.h> #include <knuminput.h> -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <kcombobox.h> using namespace SvnGlobal; -SvnMergeDialog::SvnMergeDialog( const KURL &wcTarget, QWidget *parent ) +SvnMergeDialog::SvnMergeDialog( const KURL &wcTarget, TQWidget *parent ) : SvnMergeOptionDialogBase( parent ) { dest->setURL( wcTarget.prettyURL() ); - connect( revnumbtn1, SIGNAL(toggled(bool)), revnum1, SLOT(setEnabled(bool)) ); - connect( revnumbtn1, SIGNAL(toggled(bool)), revkind1, SLOT(setDisabled(bool)) ); - connect( revnumbtn2, SIGNAL(toggled(bool)), revnum2, SLOT(setEnabled(bool)) ); - connect( revnumbtn2, SIGNAL(toggled(bool)), revkind2, SLOT(setDisabled(bool)) ); + connect( revnumbtn1, TQT_SIGNAL(toggled(bool)), revnum1, TQT_SLOT(setEnabled(bool)) ); + connect( revnumbtn1, TQT_SIGNAL(toggled(bool)), revkind1, TQT_SLOT(setDisabled(bool)) ); + connect( revnumbtn2, TQT_SIGNAL(toggled(bool)), revnum2, TQT_SLOT(setEnabled(bool)) ); + connect( revnumbtn2, TQT_SIGNAL(toggled(bool)), revkind2, TQT_SLOT(setDisabled(bool)) ); revkind1->setDisabled(true); revnum2->setDisabled(true); } diff --git a/vcs/subversion/svn_mergewidget.h b/vcs/subversion/svn_mergewidget.h index db905626..abaaea88 100644 --- a/vcs/subversion/svn_mergewidget.h +++ b/vcs/subversion/svn_mergewidget.h @@ -33,7 +33,7 @@ class SvnMergeDialog : public SvnMergeOptionDialogBase { Q_OBJECT public: - SvnMergeDialog( const KURL &wcTarget, QWidget *parent = NULL ); + SvnMergeDialog( const KURL &wcTarget, TQWidget *parent = NULL ); virtual ~SvnMergeDialog(); KURL source1(); diff --git a/vcs/subversion/svn_switchwidget.cpp b/vcs/subversion/svn_switchwidget.cpp index ec1b603c..7149cce2 100644 --- a/vcs/subversion/svn_switchwidget.cpp +++ b/vcs/subversion/svn_switchwidget.cpp @@ -1,18 +1,18 @@ #include <kurl.h> #include <klineedit.h> -#include <qcheckbox.h> -#include <qradiobutton.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> #include "svn_switchwidget.h" #include "subversion_global.h" SvnSwitchDlg::SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder, - const QString &wcPath, QWidget *parent ) + const TQString &wcPath, TQWidget *parent ) : SvnSwitchDlgBase( parent ) , m_info( holder ) { - connect( switchOnlyRadio, SIGNAL(clicked()), this, SLOT(resetCurrentRepositoryUrlEdit()) ); - connect( relocationRadio , SIGNAL(clicked()), this, SLOT(resetCurrentRepositoryUrlEdit()) ); + connect( switchOnlyRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetCurrentRepositoryUrlEdit()) ); + connect( relocationRadio , TQT_SIGNAL(clicked()), this, TQT_SLOT(resetCurrentRepositoryUrlEdit()) ); // set switch only switchOnlyRadio->setChecked( true ); wcUrlEdit->setText( wcPath ); @@ -22,11 +22,11 @@ SvnSwitchDlg::SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder, SvnSwitchDlg::~SvnSwitchDlg() {} -const QString SvnSwitchDlg::currentUrl() +const TQString SvnSwitchDlg::currentUrl() { return currentUrlEdit->text(); } -const QString SvnSwitchDlg::destUrl() +const TQString SvnSwitchDlg::destUrl() { return destUrlEdit->text(); } diff --git a/vcs/subversion/svn_switchwidget.h b/vcs/subversion/svn_switchwidget.h index 643fb4b9..a38ca0ff 100644 --- a/vcs/subversion/svn_switchwidget.h +++ b/vcs/subversion/svn_switchwidget.h @@ -13,11 +13,11 @@ class SvnSwitchDlg : public SvnSwitchDlgBase Q_OBJECT public: SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder, - const QString &wcPath, QWidget *parent = NULL ); + const TQString &wcPath, TQWidget *parent = NULL ); virtual ~SvnSwitchDlg(); - const QString currentUrl(); - const QString destUrl(); + const TQString currentUrl(); + const TQString destUrl(); bool recursive(); bool switchOnly(); bool relocation(); |