diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
| commit | 48d4a26399959121f33d2bc3bfe51c7827b654fc (patch) | |
| tree | 5ae5e6e00d3ba330b7b8be9bc097154b6bc739e8 /vcs/subversion | |
| parent | 7e701ace6592d09e1f2c0cf28c7d6d872d78f4f5 (diff) | |
| download | tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.tar.gz tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.zip | |
TQt4 port kdevelop
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'vcs/subversion')
42 files changed, 329 insertions, 312 deletions
diff --git a/vcs/subversion/commitdlg.cpp b/vcs/subversion/commitdlg.cpp index c456f7c2..df519d02 100644 --- a/vcs/subversion/commitdlg.cpp +++ b/vcs/subversion/commitdlg.cpp @@ -22,8 +22,8 @@ #include <tqevent.h> #include <ktextedit.h> -CommitDlg::CommitDlg( TQWidget* parent ) - : CommitDlgBase( parent ) +CommitDlg::CommitDlg( TQWidget* tqparent ) + : CommitDlgBase( tqparent ) { textMessage->installEventFilter(this); } @@ -32,8 +32,8 @@ bool CommitDlg::eventFilter( TQObject* obj, TQEvent* ev ) { if( ev->type() == TQEvent::KeyPress ) { - TQKeyEvent* k = static_cast<TQKeyEvent*>(ev); - if( ( k->key() == Qt::Key_Return || k->key() == Qt::Key_Enter ) && k->state() == Qt::ControlButton ) + TQKeyEvent* k = TQT_TQKEYEVENT(ev); + if( ( k->key() == TQt::Key_Return || k->key() == TQt::Key_Enter ) && k->state() == TQt::ControlButton ) { accept(); return true; @@ -44,4 +44,4 @@ bool CommitDlg::eventFilter( TQObject* obj, TQEvent* ev ) #include "commitdlg.moc" -//kate: space-indent on; indent-width 4; replace-tabs on; auto-insert-doxygen on; indent-mode cstyle; +//kate: space-indent on; indent-width 4; tqreplace-tabs on; auto-insert-doxygen on; indent-mode cstyle; diff --git a/vcs/subversion/commitdlg.h b/vcs/subversion/commitdlg.h index da63e2f5..f940511c 100644 --- a/vcs/subversion/commitdlg.h +++ b/vcs/subversion/commitdlg.h @@ -26,6 +26,7 @@ class CommitDlg : public CommitDlgBase { Q_OBJECT + TQ_OBJECT public: CommitDlg( TQWidget* = 0 ); protected: @@ -34,4 +35,4 @@ protected: #endif -//kate: space-indent on; indent-width 4; replace-tabs on; auto-insert-doxygen on; indent-mode cstyle; +//kate: space-indent on; indent-width 4; tqreplace-tabs on; auto-insert-doxygen on; indent-mode cstyle; diff --git a/vcs/subversion/commitdlgbase.ui b/vcs/subversion/commitdlgbase.ui index 76499a60..a36bf402 100644 --- a/vcs/subversion/commitdlgbase.ui +++ b/vcs/subversion/commitdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>CommitDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>CommitDlgBase</cstring> </property> @@ -19,9 +19,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <vbox> <property name="name"> @@ -40,9 +40,9 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -58,14 +58,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>220</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton1</cstring> </property> @@ -73,7 +73,7 @@ <string>&OK</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton2</cstring> </property> @@ -103,7 +103,7 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktextedit.h</includehint> <includehint>ktextedit.h</includehint> diff --git a/vcs/subversion/integrator/subversionintegrator.cpp b/vcs/subversion/integrator/subversionintegrator.cpp index 32d28d27..8c0c4ef9 100644 --- a/vcs/subversion/integrator/subversionintegrator.cpp +++ b/vcs/subversion/integrator/subversionintegrator.cpp @@ -28,10 +28,10 @@ static const KDevPluginInfo data("kdevsubversionintegrator"); typedef KDevGenericFactory<SubversionIntegrator> SubversionIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libsubversionintegrator, SubversionIntegratorFactory(data) ) -SubversionIntegrator::SubversionIntegrator(TQObject* parent, const char* name, +SubversionIntegrator::SubversionIntegrator(TQObject* tqparent, const char* name, const TQStringList // args ) - :KDevVCSIntegrator(parent, name) + :KDevVCSIntegrator(tqparent, name) { } @@ -39,15 +39,15 @@ SubversionIntegrator::~SubversionIntegrator() { } -VCSDialog* SubversionIntegrator::fetcher(TQWidget* // parent +VCSDialog* SubversionIntegrator::fetcher(TQWidget* // tqparent ) { return 0; } -VCSDialog* SubversionIntegrator::integrator(TQWidget* parent) +VCSDialog* SubversionIntegrator::integrator(TQWidget* tqparent) { - SvnIntegratorDlg *dlg = new SvnIntegratorDlg(parent); + SvnIntegratorDlg *dlg = new SvnIntegratorDlg(tqparent); return dlg; } diff --git a/vcs/subversion/integrator/subversionintegrator.h b/vcs/subversion/integrator/subversionintegrator.h index e9b62d70..d5ae7fad 100644 --- a/vcs/subversion/integrator/subversionintegrator.h +++ b/vcs/subversion/integrator/subversionintegrator.h @@ -27,12 +27,13 @@ class SubversionIntegrator : public KDevVCSIntegrator { Q_OBJECT + TQ_OBJECT public: - SubversionIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList()); + SubversionIntegrator(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); ~SubversionIntegrator(); - virtual VCSDialog* fetcher(TQWidget* parent); - virtual VCSDialog* integrator(TQWidget* parent); + virtual VCSDialog* fetcher(TQWidget* tqparent); + virtual VCSDialog* integrator(TQWidget* tqparent); }; diff --git a/vcs/subversion/integrator/svnintegratordlg.cpp b/vcs/subversion/integrator/svnintegratordlg.cpp index 05572278..cc074f8b 100644 --- a/vcs/subversion/integrator/svnintegratordlg.cpp +++ b/vcs/subversion/integrator/svnintegratordlg.cpp @@ -38,8 +38,8 @@ using namespace KIO; -SvnIntegratorDlg::SvnIntegratorDlg( TQWidget *parent, const char *name ) - : SvnIntegratorDlgBase( parent, name ) +SvnIntegratorDlg::SvnIntegratorDlg( TQWidget *tqparent, const char *name ) + : SvnIntegratorDlgBase( tqparent, name ) { repos1->setMode( KFile::Directory ); } diff --git a/vcs/subversion/integrator/svnintegratordlg.h b/vcs/subversion/integrator/svnintegratordlg.h index f76cf95f..3e464f3e 100644 --- a/vcs/subversion/integrator/svnintegratordlg.h +++ b/vcs/subversion/integrator/svnintegratordlg.h @@ -25,8 +25,9 @@ class SvnIntegratorDlg: public SvnIntegratorDlgBase, public VCSDialog { Q_OBJECT + TQ_OBJECT public: - SvnIntegratorDlg(TQWidget *parent = 0, const char *name = 0); + SvnIntegratorDlg(TQWidget *tqparent = 0, const char *name = 0); virtual void accept(); virtual void init(const TQString &projectName, const TQString &projectLocation); diff --git a/vcs/subversion/integrator/svnintegratordlgbase.ui b/vcs/subversion/integrator/svnintegratordlgbase.ui index a2ec9982..27c1fc76 100644 --- a/vcs/subversion/integrator/svnintegratordlgbase.ui +++ b/vcs/subversion/integrator/svnintegratordlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SvnIntegratorDlgBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SvnIntegratorDlgBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -47,7 +47,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>doNothing</cstring> </property> @@ -72,7 +72,7 @@ out of kdevelop, you will not be able to perform any subversion operations.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>createProject</cstring> </property> @@ -94,7 +94,7 @@ NOTE: The repository has to exist. e.g. has been created with 'svnadmin'</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -103,15 +103,15 @@ e.g. has been created with 'svnadmin'</string> file:///home/user/subversion/mynewproject</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>repositoryLabel1</cstring> </property> @@ -156,7 +156,7 @@ http://localhost/svn/projectname/trunk</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>131</height> @@ -181,7 +181,7 @@ http://localhost/svn/projectname/trunk</string> <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/vcs/subversion/kdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp index 7b4a42d3..b83959e8 100644 --- a/vcs/subversion/kdevsvnd.cpp +++ b/vcs/subversion/kdevsvnd.cpp @@ -55,7 +55,7 @@ TQString KDevSvnd::commitDialog(TQString modifiedFiles) { if ( result == TQDialog::Accepted ) { return commitDlg.textMessage->text(); } else - return TQString::null; + return TQString(); } int KDevSvnd::sslServerTrustPrompt( TQString errmsg, TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert ) { @@ -71,7 +71,7 @@ int KDevSvnd::sslServerTrustPrompt( TQString errmsg, TQString hostname, TQString } TQString KDevSvnd::sslCertFile() { - TQString fileName = KFileDialog::getOpenFileName(TQString::null,TQString::null,0, i18n("Open SSL certificate file")); + TQString fileName = KFileDialog::getOpenFileName(TQString(),TQString(),0, i18n("Open SSL certificate file")); return fileName; } TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg) @@ -239,9 +239,9 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg) // return false; // } // -// int KSvnd::getStatus( const KURL::List& list ) { +// int KSvnd::gettqStatus( const KURL::List& list ) { // int result = 0; -// uint files = 0, folders = 0, parentsentries = 0, parentshavesvn = 0, subdirhavesvn = 0, external = 0; +// uint files = 0, folders = 0, tqparentsentries = 0, tqparentshavesvn = 0, subdirhavesvn = 0, external = 0; // for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { // if ( isFolder ( ( *it ) ) ) { // folders++; @@ -249,7 +249,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg) // files++; // } // if ( isFileInSvnEntries ( (*it).filename(),( *it ).directory() + "/.svn/entries" ) ) { // normal subdir known in the working copy -// parentsentries++; +// tqparentsentries++; // } else if ( isFolder( *it ) ) { // other subfolders (either another module checkouted or an external, or something not known at all) // if ( TQFile::exists( ( *it ).path() + "/.svn/entries" ) ) // subdirhavesvn++; @@ -257,8 +257,8 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg) // external++; // } // } -// if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //parent has a .svn ? -// parentshavesvn++; +// if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //tqparent has a .svn ? +// tqparentshavesvn++; // } // if ( files > 0 ) // result |= SomeAreFiles; @@ -268,15 +268,15 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg) // } // if ( folders > 0 ) // result |= SomeAreFolders; -// if ( parentsentries == list.count() ) { +// if ( tqparentsentries == list.count() ) { // result |= AllAreInParentsEntries; // result |= SomeAreInParentsEntries; -// } else if ( parentsentries != 0 ) +// } else if ( tqparentsentries != 0 ) // result |= SomeAreInParentsEntries; -// if ( parentshavesvn == list.count() ) { +// if ( tqparentshavesvn == list.count() ) { // result |= AllParentsHaveSvn; // result |= SomeParentsHaveSvn; -// } else if ( parentshavesvn > 0 ) +// } else if ( tqparentshavesvn > 0 ) // result |= SomeParentsHaveSvn; // if ( subdirhavesvn == list.count() ) { // result |= AllHaveSvn; @@ -299,18 +299,18 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg) // // TQStringList KSvnd::getActionMenu ( const KURL::List &list ) { // TQStringList result; -// int listStatus = getStatus( list ); +// int listtqStatus = gettqStatus( list ); // -// if ( !(listStatus & SomeAreInParentsEntries) && -// !(listStatus & SomeAreExternalToParent) && -// !(listStatus & SomeHaveSvn)) { -// if( list.size() == 1 && listStatus & SomeAreFolders) { +// if ( !(listtqStatus & SomeAreInParentsEntries) && +// !(listtqStatus & SomeAreExternalToParent) && +// !(listtqStatus & SomeHaveSvn)) { +// if( list.size() == 1 && listtqStatus & SomeAreFolders) { // result << "Checkout"; // result << "Export"; // // result << "CreateRepository"; // result << "Import"; // } -// } else if ( (listStatus & AllAreInParentsEntries) ) { +// } else if ( (listtqStatus & AllAreInParentsEntries) ) { // result << "Diff"; // //In SVN // // result << "ShowLog"; @@ -320,7 +320,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg) // // result << "Update to revision..." // result << "Rename"; // result << "Delete"; -// if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) { +// if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) { // result << "Revert"; // // result << "Cleanup"; // } @@ -328,19 +328,19 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg) // // result << "BranchTag"; // result << "Switch"; // result << "Merge"; -// if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) { +// if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) { // // result << "Export"; // // result << "Relocate"; // result << "_SEPARATOR_"; // result << "Add"; // } // result << "_SEPARATOR_"; -// if( listStatus & SomeAreFiles && !(listStatus & SomeAreFolders)) { +// if( listtqStatus & SomeAreFiles && !(listtqStatus & SomeAreFolders)) { // result << "Blame"; // } // result << "CreatePatch"; // -// if( list.size() == 1 && listStatus & SomeAreFolders) { +// if( list.size() == 1 && listtqStatus & SomeAreFolders) { // // result << "ApplyPatchToFolder"; // } // } @@ -349,12 +349,12 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg) // // TQStringList KSvnd::getTopLevelActionMenu ( const KURL::List &list ) { // TQStringList result; -// int listStatus = getStatus( list ); +// int listtqStatus = gettqStatus( list ); // // -// if ( ( listStatus & AllParentsHaveSvn && -// ( ( listStatus & SomeAreExternalToParent ) || ( listStatus & SomeAreInParentsEntries ) ) -// || ( listStatus & SomeHaveSvn ) ) +// if ( ( listtqStatus & AllParentsHaveSvn && +// ( ( listtqStatus & SomeAreExternalToParent ) || ( listtqStatus & SomeAreInParentsEntries ) ) +// || ( listtqStatus & SomeHaveSvn ) ) // ) { // result << "Update"; // result << "Commit"; @@ -382,7 +382,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg) // TQDataStream stream(params, IO_WriteOnly); // stream << path << text_status << prop_status << repos_text_status << repos_prop_status << rev; // -// emitDCOPSignal( "subversionStatus(TQString,int,int,int,int,long int)", params ); +// emitDCOPSignal( "subversiontqStatus(TQString,int,int,int,int,long int)", params ); // } // // void KSvnd::popupMessage( const TQString& message ) { diff --git a/vcs/subversion/kdevsvnd.h b/vcs/subversion/kdevsvnd.h index 07943c18..4d292b02 100644 --- a/vcs/subversion/kdevsvnd.h +++ b/vcs/subversion/kdevsvnd.h @@ -29,10 +29,11 @@ class KDevSvnd : public KDEDModule { Q_OBJECT +//TQ_OBJECT K_DCOP - //note: InSVN means parent is added. InRepos means itself is added + //note: InSVN means tqparent 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 TQCString &); diff --git a/vcs/subversion/kdevsvnd_widgets.cpp b/vcs/subversion/kdevsvnd_widgets.cpp index 8fd05950..abbd46cf 100644 --- a/vcs/subversion/kdevsvnd_widgets.cpp +++ b/vcs/subversion/kdevsvnd_widgets.cpp @@ -18,8 +18,8 @@ #include <tqlabel.h> #include <klocale.h> -SvnSSLTrustPrompt::SvnSSLTrustPrompt( TQWidget* parent, const char* name, bool modal, WFlags f ) - :SvnSSLTrustPromptBase( parent, name, modal, f ) +SvnSSLTrustPrompt::SvnSSLTrustPrompt( TQWidget* tqparent, const char* name, bool modal, WFlags f ) + :SvnSSLTrustPromptBase( tqparent, name, modal, f ) , m_code(-1) { listView1->setColumnText( 0, "Items" ); diff --git a/vcs/subversion/kdevsvnd_widgets.h b/vcs/subversion/kdevsvnd_widgets.h index b0a2bec1..c23514c1 100644 --- a/vcs/subversion/kdevsvnd_widgets.h +++ b/vcs/subversion/kdevsvnd_widgets.h @@ -19,8 +19,9 @@ class SvnSSLTrustPrompt : public SvnSSLTrustPromptBase{ Q_OBJECT + TQ_OBJECT public: - SvnSSLTrustPrompt( TQWidget* parent=0, const char* name=0, bool modal=true, WFlags f=0 ); + SvnSSLTrustPrompt( TQWidget* tqparent=0, const char* name=0, bool modal=true, WFlags f=0 ); ~SvnSSLTrustPrompt(); void setupCertInfo( TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert ); void setupFailedReasonMsg( TQString msg ); diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp index 4b16e68f..f49ac302 100644 --- a/vcs/subversion/subversion_core.cpp +++ b/vcs/subversion/subversion_core.cpp @@ -223,7 +223,7 @@ void subversionCore::diff( const KURL::List& list, const TQString& where){ if ( where=="HEAD"){ diffTo=i18n("the current svn HEAD version."); } - KMessageBox::information( 0, i18n("No differences between the file and %1").arg(diffTo), i18n("No difference") ); + KMessageBox::information( 0, i18n("No differences between the file and %1").tqarg(diffTo), i18n("No difference") ); } diffresult.clear(); } @@ -496,7 +496,7 @@ bool subversionCore::clientInfo( KURL path_or_url, bool recurse, TQMap< KURL, Sv void subversionCore::slotEndCheckout( KIO::Job * job ) { if ( job->error() ) { job->showErrorDialog( m_part->mainWindow()->main() ); - emit checkoutFinished( TQString::null ); + emit checkoutFinished( TQString() ); } else emit checkoutFinished(wcPath); } @@ -700,7 +700,7 @@ 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/" , TQString::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() , "userDoesNotWantKompare" ); Subversion_Diff df; for ( TQStringList::Iterator it2 = diffList.begin();it2 != diffList.end() ; ++it2 ) { df.text->append( *it2 ); diff --git a/vcs/subversion/subversion_core.h b/vcs/subversion/subversion_core.h index 1c9611c8..d06e9bc9 100644 --- a/vcs/subversion/subversion_core.h +++ b/vcs/subversion/subversion_core.h @@ -40,6 +40,7 @@ class SvnLogViewWidget; // class subversionCore : public TQObject, public DCOPObject class subversionCore : public TQObject { Q_OBJECT + TQ_OBJECT // K_DCOP public: diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp index be0a4411..021860bd 100644 --- a/vcs/subversion/subversion_fileinfo.cpp +++ b/vcs/subversion/subversion_fileinfo.cpp @@ -32,11 +32,11 @@ #include <kio/netaccess.h> #include <klocale.h> -SVNFileInfoProvider::SVNFileInfoProvider(subversionPart *parent, const char *name) - : KDevVCSFileInfoProvider( parent, "svnfileinfoprovider" ), +SVNFileInfoProvider::SVNFileInfoProvider(subversionPart *tqparent, const char *name) + : KDevVCSFileInfoProvider( tqparent, "svnfileinfoprovider" ), m_cachedDirEntries( 0 ), m_recursiveDirEntries(0) { Q_UNUSED(name); - m_part = parent; + m_part = tqparent; } SVNFileInfoProvider::~SVNFileInfoProvider() { @@ -123,14 +123,14 @@ const VCSFileInfoMap *SVNFileInfoProvider::status( const TQString &dirPath ) { if ( rx.search( *it ) == -1 ) break; // something is wrong ! :) curIdx = rx.cap( 1 ).toInt(); } - slotStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev); + slottqStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev); } } kdDebug(9036) << " Returning VcsFileInfoMap. provider::status() finished " << endl; return m_cachedDirEntries; } -bool SVNFileInfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) { +bool SVNFileInfoProvider::requesttqStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) { kdDebug(9036) << "##################################################################################### svn provider : request status" << endl; m_savedCallerData = callerData; // Flush old cache @@ -157,7 +157,7 @@ bool SVNFileInfoProvider::requestStatus( const TQString &dirPath, void *callerDa job = KIO::special(servURL, parms, false); 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") ); + m_part->svncore()->initProcessDlg( job, dirPath, i18n("Subversion File/Directory tqStatus") ); return true; } @@ -210,14 +210,14 @@ void SVNFileInfoProvider::slotResult( KIO::Job *j ) { if ( rx.search( *it ) == -1 ) break; // something is wrong ! :) curIdx = rx.cap( 1 ).toInt(); } - slotStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev); + slottqStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev); } if ( m_cachedDirEntries ) emit statusReady(*m_cachedDirEntries, m_savedCallerData); } -void SVNFileInfoProvider::slotStatus( const TQString& path,int text_status, int prop_status,int repos_text_status, int repos_prop_status, long int rev) { +void SVNFileInfoProvider::slottqStatus( 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 diff --git a/vcs/subversion/subversion_fileinfo.h b/vcs/subversion/subversion_fileinfo.h index c78dfed6..50e6a209 100644 --- a/vcs/subversion/subversion_fileinfo.h +++ b/vcs/subversion/subversion_fileinfo.h @@ -37,10 +37,11 @@ Provider for SVN file information class SVNFileInfoProvider : public KDevVCSFileInfoProvider, public DCOPObject/*, virtual public DCOPClient*/ { Q_OBJECT +// TQ_OBJECT K_DCOP public: - SVNFileInfoProvider( subversionPart *parent, const char *name = 0); + SVNFileInfoProvider( subversionPart *tqparent, const char *name = 0); virtual ~SVNFileInfoProvider(); // -- Sync interface @@ -50,12 +51,12 @@ public: void slotStatusExt( const TQString&, const TQString& , int, int, int, int, long int ) ; // -- Async interface for requesting data - virtual bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ); + virtual bool requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ); TQString projectDirectory() const; k_dcop: - void slotStatus( const TQString& , int, int, int, int, long int ) ; + void slottqStatus( const TQString& , int, int, int, int, long int ) ; public slots: void slotResult( KIO::Job * ); diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp index af58f7c8..d9869854 100644 --- a/vcs/subversion/subversion_part.cpp +++ b/vcs/subversion/subversion_part.cpp @@ -63,8 +63,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( data ) ) //bool g_projectWasJustCreated = false; -subversionPart::subversionPart(TQObject *parent, const char *name, const TQStringList& ) - : KDevVersionControl(&data, parent, name ? name : "Subversion" ) { +subversionPart::subversionPart(TQObject *tqparent, const char *name, const TQStringList& ) + : KDevVersionControl(&data, tqparent, name ? name : "Subversion" ) { setInstance(subversionFactory::instance()); m_projWidget = 0; @@ -159,9 +159,9 @@ void subversionPart::setupActions() { this, TQT_SLOT(slotMerge()), actionCollection(), "subversion_merge" ); } -TQWidget* subversionPart::newProjectWidget( TQWidget* parent ) { +TQWidget* subversionPart::newProjectWidget( TQWidget* tqparent ) { if ( !m_projWidget ) - m_projWidget = new subversionProjectWidget(parent,"projectwidget"); + m_projWidget = new subversionProjectWidget(tqparent,"projectwidget"); return m_projWidget; } @@ -220,44 +220,44 @@ if(!project()) 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.")); + subMenu->tqsetWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.")); id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) ); - subMenu->setWhatsThis(id, i18n("<b>Add file to repository</b><p>Adds file to repository.")); + subMenu->tqsetWhatsThis(id, i18n("<b>Add file to repository</b><p>Adds file to repository.")); id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotDel()) ); - subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository.")); + subMenu->tqsetWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository.")); id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); - subMenu->setWhatsThis(id, i18n("<b>Show logs..</b><p>View Logs")); + subMenu->tqsetWhatsThis(id, i18n("<b>Show logs..</b><p>View Logs")); id = subMenu->insertItem( actionBlame->text(), this, TQT_SLOT(slotBlame()) ); - subMenu->setWhatsThis(id, i18n("<b>Blame 0:HEAD </b><p>Show Annotate")); + subMenu->tqsetWhatsThis(id, i18n("<b>Blame 0:HEAD </b><p>Show Annotate")); subMenu->insertSeparator(); id = subMenu->insertItem( actionDiffLocal->text(), this, TQT_SLOT(slotDiffLocal()) ); - subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to local disk.")); + subMenu->tqsetWhatsThis(id, i18n("<b>Diff</b><p>Diff file to local disk.")); id = subMenu->insertItem( actionDiffHead->text(), this, TQT_SLOT(slotDiffHead()) ); - subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to repository.")); + subMenu->tqsetWhatsThis(id, i18n("<b>Diff</b><p>Diff file to repository.")); id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) ); - subMenu->setWhatsThis(id, i18n("<b>Update</b><p>Updates file(s) from repository.")); + subMenu->tqsetWhatsThis(id, i18n("<b>Update</b><p>Updates file(s) from repository.")); id = subMenu->insertItem( actionRevert->text(), this, TQT_SLOT(slotRevert()) ); - subMenu->setWhatsThis(id, i18n("<b>Revert</b><p>Undo local changes.") ); + subMenu->tqsetWhatsThis(id, i18n("<b>Revert</b><p>Undo local changes.") ); id = subMenu->insertItem( actionResolve->text(), this, TQT_SLOT(slotResolve()) ); - subMenu->setWhatsThis(id, i18n("<b>Resolve</b><p>Resolve conflicting state.") ); + subMenu->tqsetWhatsThis(id, i18n("<b>Resolve</b><p>Resolve conflicting state.") ); id = subMenu->insertItem( actionSwitch->text(), this, TQT_SLOT(slotSwitch()) ); - subMenu->setWhatsThis(id, i18n("<b>Switch</b><p>Switch working tree.") ); + subMenu->tqsetWhatsThis(id, i18n("<b>Switch</b><p>Switch working tree.") ); id = subMenu->insertItem( actionCopy->text(), this, TQT_SLOT(slotCopy()) ); - subMenu->setWhatsThis(id, i18n("<b>Copy</b><p>Copy from/between path/URLs") ); + subMenu->tqsetWhatsThis(id, i18n("<b>Copy</b><p>Copy from/between path/URLs") ); id = subMenu->insertItem( actionMerge->text(), this, TQT_SLOT(slotMerge()) ); - subMenu->setWhatsThis(id, i18n("<b>Merge</b><p>Merge difference to working copy") ); + subMenu->tqsetWhatsThis(id, i18n("<b>Merge</b><p>Merge difference to working copy") ); /* subMenu->insertSeparator(); id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) ); - subMenu->setWhatsThis(id, i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s).")); + subMenu->tqsetWhatsThis(id, i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s).")); 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).")); + subMenu->tqsetWhatsThis(id, i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s).")); */ - // Now insert in parent menu + // Now insert in tqparent menu popup->insertItem( i18n("Subversion"), subMenu ); } } diff --git a/vcs/subversion/subversion_part.h b/vcs/subversion/subversion_part.h index 7ce9e0cd..decd355f 100644 --- a/vcs/subversion/subversion_part.h +++ b/vcs/subversion/subversion_part.h @@ -39,13 +39,14 @@ class SvnInfoHolder; class subversionPart : public KDevVersionControl { Q_OBJECT + TQ_OBJECT public: - subversionPart(TQObject *parent, const char *name, const TQStringList &); + subversionPart(TQObject *tqparent, const char *name, const TQStringList &); virtual ~subversionPart(); void setupActions(); - TQWidget* newProjectWidget( TQWidget* parent ); + TQWidget* newProjectWidget( TQWidget* tqparent ); void createNewProject( const TQString& dirname ); bool fetchFromRepository(); KDevVCSFileInfoProvider * fileInfoProvider() const; diff --git a/vcs/subversion/subversion_widget.cpp b/vcs/subversion/subversion_widget.cpp index c27f845e..96f7d7f4 100644 --- a/vcs/subversion/subversion_widget.cpp +++ b/vcs/subversion/subversion_widget.cpp @@ -29,8 +29,8 @@ #include <tqtoolbutton.h> #include <tqpushbutton.h> -subversionWidget::subversionWidget( subversionPart *part, TQWidget *parent, const char* name ) - : KTabWidget(parent) +subversionWidget::subversionWidget( subversionPart *part, TQWidget *tqparent, const char* name ) + : KTabWidget(tqparent) { m_part = part; m_edit = new KTextEdit( this ); @@ -87,8 +87,8 @@ void subversionWidget::closeCurrentTab() //////////////////////////////////////////////////////////////////////// -SvnIntSortListItem::SvnIntSortListItem( TQListView* parent ) - :TQListViewItem(parent) +SvnIntSortListItem::SvnIntSortListItem( TQListView* tqparent ) + :TQListViewItem(tqparent) {} SvnIntSortListItem::~SvnIntSortListItem() {} @@ -103,8 +103,8 @@ int SvnIntSortListItem::compare( TQListViewItem *item, int col, bool ascending ) return 0; } -SvnLogViewItem::SvnLogViewItem( TQListView * parent ) - :SvnIntSortListItem( parent ) +SvnLogViewItem::SvnLogViewItem( TQListView * tqparent ) + :SvnIntSortListItem( tqparent ) { m_pathList = ""; m_message = ""; diff --git a/vcs/subversion/subversion_widget.h b/vcs/subversion/subversion_widget.h index f479c885..0108da81 100644 --- a/vcs/subversion/subversion_widget.h +++ b/vcs/subversion/subversion_widget.h @@ -41,8 +41,9 @@ class TQPushButton; class subversionWidget : public KTabWidget { Q_OBJECT + TQ_OBJECT public: - subversionWidget(subversionPart *part, TQWidget *parent, const char* name); + subversionWidget(subversionPart *part, TQWidget *tqparent, const char* name); ~subversionWidget(); // append what?. Append any text status outputs @@ -66,7 +67,7 @@ private: */ class SvnIntSortListItem : public TQListViewItem { public: - SvnIntSortListItem ( TQListView* parent=0 ); + SvnIntSortListItem ( TQListView* tqparent=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. */ @@ -75,7 +76,7 @@ public: class SvnLogViewItem : public SvnIntSortListItem { public: - SvnLogViewItem( TQListView* parent ); + SvnLogViewItem( TQListView* tqparent ); ~SvnLogViewItem(); TQString m_pathList; diff --git a/vcs/subversion/subversiondiff.ui b/vcs/subversion/subversiondiff.ui index dab4ca0e..14c5f307 100644 --- a/vcs/subversion/subversiondiff.ui +++ b/vcs/subversion/subversiondiff.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Subversion_Diff</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>Subversion_Diff</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextBrowser"> + <widget class="TQTextBrowser"> <property name="name"> <cstring>text</cstring> </property> @@ -36,7 +36,7 @@ <set>AutoAll</set> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -60,14 +60,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -96,5 +96,5 @@ <slot>accept()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/vcs/subversion/subversionprojectwidget.ui b/vcs/subversion/subversionprojectwidget.ui index 3977ce4c..4d2c3d95 100644 --- a/vcs/subversion/subversionprojectwidget.ui +++ b/vcs/subversion/subversionprojectwidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>subversionProjectWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>subversionProjectWidget</cstring> </property> @@ -19,15 +19,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -45,7 +45,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>init</cstring> </property> @@ -56,7 +56,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>yes</cstring> </property> @@ -67,7 +67,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>no</cstring> </property> @@ -81,7 +81,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/vcs/subversion/svn_blamewidget.cpp b/vcs/subversion/svn_blamewidget.cpp index b4095389..1060158b 100644 --- a/vcs/subversion/svn_blamewidget.cpp +++ b/vcs/subversion/svn_blamewidget.cpp @@ -24,8 +24,8 @@ #include <klocale.h> #include <kmessagebox.h> -SvnBlameWidget::SvnBlameWidget( TQWidget *parent, const char* name, bool modal, WFlags f ) - :TQWidget( parent ) +SvnBlameWidget::SvnBlameWidget( TQWidget *tqparent, const char* name, bool modal, WFlags f ) + :TQWidget( tqparent ) { m_layout = new TQVBoxLayout( this, 1, 1 ); m_layout->setMargin(1); @@ -64,7 +64,7 @@ void SvnBlameWidget::show() SvnBlameHolder holder = *it; SvnIntSortListItem *item = new SvnIntSortListItem(outView()); - TQString prettyDate = holder.date.left(16).replace(10, 1, ' '); + TQString prettyDate = holder.date.left(16).tqreplace(10, 1, ' '); item->setText(0, TQString::number( holder.line+1 ) ); item->setText(1, TQString::number(holder.rev) ); @@ -84,8 +84,8 @@ TQListView* SvnBlameWidget::outView() ///////////////////////////////////////////////////////////// -SvnBlameFileSelectDlg::SvnBlameFileSelectDlg( TQWidget *parent ) - : TQDialog( parent ) +SvnBlameFileSelectDlg::SvnBlameFileSelectDlg( TQWidget *tqparent ) + : TQDialog( tqparent ) { m_selected = ""; setCaption( i18n("Select one file to view annotation") ); diff --git a/vcs/subversion/svn_blamewidget.h b/vcs/subversion/svn_blamewidget.h index ff446177..7cba3077 100644 --- a/vcs/subversion/svn_blamewidget.h +++ b/vcs/subversion/svn_blamewidget.h @@ -40,8 +40,9 @@ class TQListView; class SvnBlameWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SvnBlameWidget( TQWidget * parent = 0, const char * name = 0, bool modal = FALSE, WFlags f = 0 ); + SvnBlameWidget( TQWidget * tqparent = 0, const char * name = 0, bool modal = FALSE, WFlags f = 0 ); virtual ~SvnBlameWidget(); void copyBlameData( TQValueList<SvnBlameHolder> *blamelist ); void show(); @@ -55,8 +56,9 @@ protected: class SvnBlameFileSelectDlg : public TQDialog { Q_OBJECT + TQ_OBJECT public: - SvnBlameFileSelectDlg( TQWidget *parent = 0L ); + SvnBlameFileSelectDlg( TQWidget *tqparent = 0L ); virtual ~SvnBlameFileSelectDlg(); void setCandidate( TQStringList *modifies ); TQString selected(); diff --git a/vcs/subversion/svn_co.ui b/vcs/subversion/svn_co.ui index 4ea22290..ade29e25 100644 --- a/vcs/subversion/svn_co.ui +++ b/vcs/subversion/svn_co.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>svn_co</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>svn_co</cstring> </property> @@ -27,7 +27,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>server</cstring> </property> @@ -46,15 +46,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -80,15 +80,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -109,7 +109,7 @@ </widget> </hbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -137,15 +137,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>isStandard</cstring> </property> @@ -156,7 +156,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton1_2</cstring> </property> @@ -170,7 +170,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>local</cstring> </property> @@ -189,15 +189,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -223,15 +223,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -251,9 +251,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -269,22 +269,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>191</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>ok</cstring> </property> @@ -295,7 +295,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancel</cstring> </property> @@ -325,7 +325,7 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/vcs/subversion/svn_commitdlgbase.ui b/vcs/subversion/svn_commitdlgbase.ui index 9151d566..c06a32fc 100644 --- a/vcs/subversion/svn_commitdlgbase.ui +++ b/vcs/subversion/svn_commitdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SvnCommitDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SvnCommitDlgBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQListView" row="0" column="0" rowspan="1" colspan="3"> <column> <property name="text"> <string>Column 1</string> @@ -56,14 +56,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>335</width> <height>30</height> </size> </property> </spacer> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>keepLocksChk</cstring> </property> @@ -74,15 +74,15 @@ <string></string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="2"> + <widget class="TQLayoutWidget" row="2" column="2"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton3</cstring> </property> @@ -90,7 +90,7 @@ <string>O&K</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton3_2</cstring> </property> @@ -100,7 +100,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>recursiveChk</cstring> </property> @@ -127,5 +127,5 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/vcs/subversion/svn_copydlgwidget.ui b/vcs/subversion/svn_copydlgwidget.ui index 00a4d5c7..586c93cc 100644 --- a/vcs/subversion/svn_copydlgwidget.ui +++ b/vcs/subversion/svn_copydlgwidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SvnCopyDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SvnCopyDialogBase</cstring> </property> @@ -27,7 +27,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="5" column="1"> + <widget class="TQPushButton" row="5" column="1"> <property name="name"> <cstring>okBtn</cstring> </property> @@ -45,14 +45,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>110</width> <height>31</height> </size> </property> </spacer> - <widget class="QPushButton" row="5" column="2"> + <widget class="TQPushButton" row="5" column="2"> <property name="name"> <cstring>cancelBtn</cstring> </property> @@ -60,7 +60,7 @@ <string>Cancel</string> </property> </widget> - <widget class="QButtonGroup" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQButtonGroup" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>buttonGroup3</cstring> </property> @@ -76,7 +76,7 @@ <cstring>destRequester</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -86,7 +86,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -94,7 +94,7 @@ <string>Requested Local Path</string> </property> </widget> - <widget class="QButtonGroup" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQButtonGroup" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>buttonGroup2</cstring> </property> @@ -121,7 +121,7 @@ <number>-1</number> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>revnumRadio</cstring> </property> @@ -129,7 +129,7 @@ <string>Specify by number:</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>revkindRadio</cstring> </property> @@ -170,7 +170,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -189,7 +189,7 @@ <bool>false</bool> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>urlRadio</cstring> </property> @@ -197,7 +197,7 @@ <string>Specify by the repository URL of this item</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>pathRadio</cstring> </property> @@ -223,7 +223,7 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kurlrequester.h</includehint> diff --git a/vcs/subversion/svn_copywidget.cpp b/vcs/subversion/svn_copywidget.cpp index 30b25fd7..e781ca10 100644 --- a/vcs/subversion/svn_copywidget.cpp +++ b/vcs/subversion/svn_copywidget.cpp @@ -7,8 +7,8 @@ #include <kcombobox.h> #include <tqradiobutton.h> -SvnCopyDialog::SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *parent ) - : SvnCopyDialogBase( parent ) +SvnCopyDialog::SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *tqparent ) + : SvnCopyDialogBase( tqparent ) , m_holder(holder) { reqEdit->setText( reqPath ); diff --git a/vcs/subversion/svn_copywidget.h b/vcs/subversion/svn_copywidget.h index 8b80807e..eb29ca39 100644 --- a/vcs/subversion/svn_copywidget.h +++ b/vcs/subversion/svn_copywidget.h @@ -12,8 +12,9 @@ class KURL; class SvnCopyDialog : public SvnCopyDialogBase { Q_OBJECT + TQ_OBJECT public: - SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *parent ); + SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *tqparent ); ~SvnCopyDialog(); KURL sourceUrl(); diff --git a/vcs/subversion/svn_fileselectdlg_commit.cpp b/vcs/subversion/svn_fileselectdlg_commit.cpp index 0c014a9d..1b4d9c83 100644 --- a/vcs/subversion/svn_fileselectdlg_commit.cpp +++ b/vcs/subversion/svn_fileselectdlg_commit.cpp @@ -34,8 +34,8 @@ #include <kdevproject.h> -SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart *part, TQWidget* parent) - :SvnCommitDlgBase( parent, "svnfileselectcommitdlg", true ) +SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart *part, TQWidget* tqparent) + :SvnCommitDlgBase( tqparent, "svnfileselectcommitdlg", true ) ,m_part(part) { this->setCaption(i18n("Select Files to Commit")); @@ -86,17 +86,17 @@ SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart vcsInfo = it.data(); // TQString absPathStr( fileInfo.absFilePath() + "/" + it.key() ); TQString absPathStr( fileInfo.filePath() + "/" + it.key() ); - KURL urlFromStatus( absPathStr ); + KURL urlFromtqStatus( absPathStr ); if( vcsInfo.state == VCSFileInfo::Added || vcsInfo.state == VCSFileInfo::Modified || vcsInfo.state == VCSFileInfo::Deleted || vcsInfo.state == VCSFileInfo::Replaced){ - this->insertItem( VCSFileInfo::state2String( vcsInfo.state ), urlFromStatus ); + this->insertItem( VCSFileInfo::state2String( vcsInfo.state ), urlFromtqStatus ); -// tobeCommittedUrls.push_back( urlFromStatus ); -// kdDebug(9036) << "slotCommit() @ DirCase adding " << urlFromStatus.prettyURL() << endl; +// tobeCommittedUrls.push_back( urlFromtqStatus ); +// kdDebug(9036) << "slotCommit() @ DirCase adding " << urlFromtqStatus.prettyURL() << endl; } else{ - kdDebug(9036) << "slotCommit() @ DirCase ignoring " << urlFromStatus.prettyURL() << endl; + kdDebug(9036) << "slotCommit() @ DirCase ignoring " << urlFromtqStatus.prettyURL() << endl; } } diff --git a/vcs/subversion/svn_fileselectdlg_commit.h b/vcs/subversion/svn_fileselectdlg_commit.h index 700ac6ab..1a3cf74a 100644 --- a/vcs/subversion/svn_fileselectdlg_commit.h +++ b/vcs/subversion/svn_fileselectdlg_commit.h @@ -33,9 +33,10 @@ class subversionPart; class SVNFileSelectDlgCommit : public SvnCommitDlgBase{ Q_OBJECT + TQ_OBJECT public: - SVNFileSelectDlgCommit( KURL::List&, subversionPart* part, TQWidget* parent = 0 ); + SVNFileSelectDlgCommit( KURL::List&, subversionPart* part, TQWidget* tqparent = 0 ); ~SVNFileSelectDlgCommit(); void insertItem( TQString status, KURL url ); KURL::List checkedUrls(); diff --git a/vcs/subversion/svn_kio.cpp b/vcs/subversion/svn_kio.cpp index 3a39d33c..416f32c0 100644 --- a/vcs/subversion/svn_kio.cpp +++ b/vcs/subversion/svn_kio.cpp @@ -223,7 +223,7 @@ svn_error_t* kio_svnProtocol::checkAuth(svn_auth_cred_simple_t **cred, void *bat p->info.url = p->myURL; p->info.username = username; //( const char* )svn_auth_get_parameter( p->ctx->auth_baton, SVN_AUTH_PARAM_DEFAULT_USERNAME ); if (realm) { - p->info.prompt = i18n("Username and Password for %1.").arg(realm); + p->info.prompt = i18n("Username and Password for %1.").tqarg(realm); } // if ( !p->checkCachedAuthentication( p->info ) ){ @@ -246,7 +246,7 @@ void kio_svnProtocol::get(const KURL& url ){ kdDebug(9036) << "kio_svn::get(const KURL& url)" << endl ; TQString remoteServer = url.host(); - infoMessage(i18n("Looking for %1...").arg( remoteServer ) ); + infoMessage(i18n("Looking for %1...").tqarg( remoteServer ) ); apr_pool_t *subpool = svn_pool_create (pool); kbaton *bt = (kbaton*)apr_pcalloc(subpool, sizeof(*bt)); @@ -261,7 +261,7 @@ void kio_svnProtocol::get(const KURL& url ){ //find the requested revision svn_opt_revision_t rev; svn_opt_revision_t endrev; - int idx = target.findRev( "?rev=" ); + int idx = target.tqfindRev( "?rev=" ); if ( idx != -1 ) { TQString revstr = target.mid( idx+5 ); #if 0 @@ -323,7 +323,7 @@ void kio_svnProtocol::stat(const KURL & url){ //find the requested revision svn_opt_revision_t rev; svn_opt_revision_t endrev; - int idx = target.findRev( "?rev=" ); + int idx = target.tqfindRev( "?rev=" ); if ( idx != -1 ) { TQString revstr = target.mid( idx+5 ); #if 0 @@ -428,7 +428,7 @@ void kio_svnProtocol::listDir(const KURL& url){ //find the requested revision svn_opt_revision_t rev; svn_opt_revision_t endrev; - int idx = target.findRev( "?rev=" ); + int idx = target.tqfindRev( "?rev=" ); if ( idx != -1 ) { TQString revstr = target.mid( idx+5 ); svn_opt_parse_revision( &rev, &endrev, revstr.utf8(), subpool ); @@ -545,7 +545,7 @@ bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString& // // //find the requested revision // svn_opt_revision_t rev; -// int idx = srcsvn.findRev( "?rev=" ); +// int idx = srcsvn.tqfindRev( "?rev=" ); // if ( idx != -1 ) { // TQString revstr = srcsvn.mid( idx+5 ); // kdDebug(9036) << "revision string found " << revstr << endl; @@ -672,7 +672,7 @@ void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite //find the requested revision svn_opt_revision_t rev; - int idx = srcsvn.findRev( "?rev=" ); + int idx = srcsvn.tqfindRev( "?rev=" ); if ( idx != -1 ) { TQString revstr = srcsvn.mid( idx+5 ); kdDebug(9036) << "revision string found " << revstr << endl; @@ -1261,7 +1261,7 @@ void kio_svnProtocol::svn_switch_relocate( const KURL &wc, const KURL &origUrl, } m_counter = 0L; setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string", - TQString("switched to %1").arg( toUrl ) ); + TQString("switched to %1").tqarg( toUrl ) ); finished(); svn_pool_destroy( subpool ); } @@ -1384,7 +1384,7 @@ void kio_svnProtocol::commit2(bool recurse, bool keeplocks, const KURL::List& wc TQString userstring = i18n ( "Nothing to commit." ); if ( SVN_IS_VALID_REVNUM( commit_info->revision ) ) - userstring = i18n( "Committed revision %1." ).arg(commit_info->revision); + userstring = i18n( "Committed revision %1." ).tqarg(commit_info->revision); 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" ); @@ -1584,7 +1584,7 @@ void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const TQString & if( commit_info ){ setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string", - i18n("Copied Revision %1").arg( commit_info->revision) ); + i18n("Copied Revision %1").tqarg( commit_info->revision) ); } else { setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string", i18n("Copied") ); @@ -1661,7 +1661,7 @@ TQString kio_svnProtocol::makeSvnURL ( const KURL& url ) const { tpURL.setProtocol("file"); svnUrl = tpURL.url(-1); //hack : add one more / after file:/ - int idx = svnUrl.find("/"); + int idx = svnUrl.tqfind("/"); svnUrl.insert( idx, "//" ); return svnUrl; } @@ -1750,7 +1750,7 @@ svn_error_t *kio_svnProtocol::clientCertSSLPrompt( // kdWarning()<<" Communication with dcop failed - fail to get certfile "<<endl; // return SVN_NO_ERROR; // } -// if (replyType != "TQString") { +// if (replyType != TQSTRING_OBJECT_NAME_STRING) { // kdWarning()<<" unexpected reply type "<<endl; // return SVN_NO_ERROR; // } @@ -1867,7 +1867,7 @@ svn_error_t *kio_svnProtocol::commitLogPrompt( const char **log_msg, const char return err; } - if ( replyType != "TQString" ) { + if ( replyType != TQSTRING_OBJECT_NAME_STRING ) { 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." ) ); @@ -1900,42 +1900,42 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action switch ( action ) { case svn_wc_notify_add : //add if (mime_type && (svn_mime_type_is_binary (mime_type))) - userstring = i18n( "A (bin) %1" ).arg( path ); + userstring = i18n( "A (bin) %1" ).tqarg( path ); else - userstring = i18n( "A %1" ).arg( path ); + userstring = i18n( "A %1" ).tqarg( path ); break; case svn_wc_notify_copy: //copy - userstring = i18n( "Copied %1 " ).arg( path ); + userstring = i18n( "Copied %1 " ).tqarg( path ); break; case svn_wc_notify_delete: //delete nb->received_some_change = TRUE; - userstring = i18n( "D %1" ).arg( path ); + userstring = i18n( "D %1" ).tqarg( path ); break; case svn_wc_notify_restore : //restore - userstring=i18n( "Restored %1." ).arg( path ); + userstring=i18n( "Restored %1." ).tqarg( path ); break; case svn_wc_notify_revert : //revert - userstring=i18n( "Reverted %1." ).arg( path ); + userstring=i18n( "Reverted %1." ).tqarg( path ); break; case svn_wc_notify_failed_revert: //failed revert - userstring=i18n( "Failed to revert %1.\nTry updating instead." ).arg( path ); + userstring=i18n( "Failed to revert %1.\nTry updating instead." ).tqarg( path ); break; case svn_wc_notify_resolved: //resolved - userstring=i18n( "Resolved conflicted state of %1." ).arg( path ); + userstring=i18n( "Resolved conflicted state of %1." ).tqarg( path ); break; case svn_wc_notify_skip: //skip if ( content_state == svn_wc_notify_state_missing ) - userstring=i18n("Skipped missing target %1.").arg( path ); + userstring=i18n("Skipped missing target %1.").tqarg( path ); else - userstring=i18n("Skipped %1.").arg( path ); + userstring=i18n("Skipped %1.").tqarg( path ); break; case svn_wc_notify_update_delete: //update_delete nb->received_some_change = TRUE; - userstring=i18n( "D %1" ).arg( path ); + userstring=i18n( "D %1" ).tqarg( path ); break; case svn_wc_notify_update_add: //update_add nb->received_some_change = TRUE; - userstring=i18n( "A %1" ).arg( path ); + userstring=i18n( "A %1" ).tqarg( path ); break; case svn_wc_notify_update_update: //update_update { @@ -1980,25 +1980,25 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action if (SVN_IS_VALID_REVNUM (revision)) { if (nb->is_export) { if ( nb->in_external ) - userstring = i18n("Exported external at revision %1.").arg( revision ); + userstring = i18n("Exported external at revision %1.").tqarg( revision ); else - userstring = i18n("Exported revision %1.").arg( revision ); + userstring = i18n("Exported revision %1.").tqarg( revision ); } else if (nb->is_checkout) { if ( nb->in_external ) - userstring = i18n("Checked out external at revision %1.").arg( revision ); + userstring = i18n("Checked out external at revision %1.").tqarg( revision ); else - userstring = i18n("Checked out revision %1.").arg( revision); + userstring = i18n("Checked out revision %1.").tqarg( revision); } else { if (nb->received_some_change) { if ( nb->in_external ) - userstring=i18n("Updated external to revision %1.").arg( revision ); + userstring=i18n("Updated external to revision %1.").tqarg( revision ); else - userstring = i18n("Updated to revision %1.").arg( revision); + userstring = i18n("Updated to revision %1.").tqarg( revision); } else { if ( nb->in_external ) - userstring = i18n("External at revision %1.").arg( revision ); + userstring = i18n("External at revision %1.").tqarg( revision ); else - userstring = i18n("At revision %1.").arg( revision); + userstring = i18n("At revision %1.").tqarg( revision); } } } else /* no revision */ { @@ -2026,30 +2026,30 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action break; case svn_wc_notify_update_external: //update_external nb->in_external = TRUE; - userstring = i18n("Fetching external item into %1." ).arg( path ); + userstring = i18n("Fetching external item into %1." ).tqarg( path ); break; case svn_wc_notify_status_completed: //status_completed if (SVN_IS_VALID_REVNUM (revision)) - userstring = i18n( "Status against revision: %1.").arg( revision ); + userstring = i18n( "tqStatus against revision: %1.").tqarg( revision ); break; case svn_wc_notify_status_external: //status_external - userstring = i18n("Performing status on external item at %1.").arg( path ); + userstring = i18n("Performing status on external item at %1.").tqarg( path ); break; case svn_wc_notify_commit_modified: //commit_modified - userstring = i18n( "Sending %1").arg( path ); + userstring = i18n( "Sending %1").tqarg( path ); break; case svn_wc_notify_commit_added: //commit_added if (mime_type && svn_mime_type_is_binary (mime_type)) { - userstring = i18n( "Adding (bin) %1.").arg( path ); + userstring = i18n( "Adding (bin) %1.").tqarg( path ); } else { - userstring = i18n( "Adding %1.").arg( path ); + userstring = i18n( "Adding %1.").tqarg( path ); } break; case svn_wc_notify_commit_deleted: //commit_deleted - userstring = i18n( "Deleting %1.").arg( path ); + userstring = i18n( "Deleting %1.").tqarg( path ); break; case svn_wc_notify_commit_replaced: //commit_replaced - userstring = i18n( "Replacing %1.").arg( path ); + userstring = i18n( "Replacing %1.").tqarg( path ); break; case svn_wc_notify_commit_postfix_txdelta: //commit_postfix_txdelta if (! nb->sent_first_txdelta) { @@ -2062,7 +2062,7 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action break; case svn_wc_notify_blame_revision: //blame_revision - userstring = i18n("Blame %1.").arg(path); + userstring = i18n("Blame %1.").tqarg(path); break; default: break; diff --git a/vcs/subversion/svn_logviewoptiondlgbase.ui b/vcs/subversion/svn_logviewoptiondlgbase.ui index 149c82e1..a642a0cf 100644 --- a/vcs/subversion/svn_logviewoptiondlgbase.ui +++ b/vcs/subversion/svn_logviewoptiondlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SvnLogViewOptionDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SvnLogViewOptionDlgBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="3" column="0"> + <widget class="TQPushButton" row="3" column="0"> <property name="name"> <cstring>pushButton1</cstring> </property> @@ -27,7 +27,7 @@ <string>&OK</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>checkBox1</cstring> </property> @@ -38,7 +38,7 @@ <string></string> </property> </widget> - <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>buttonGroup2_2</cstring> </property> @@ -49,7 +49,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radio5</cstring> </property> @@ -57,7 +57,7 @@ <string>&By Revision Number</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>radio6</cstring> </property> @@ -65,7 +65,7 @@ <string>B&y Revision Specifier</string> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>comboBox2</cstring> </property> @@ -80,7 +80,7 @@ </widget> </grid> </widget> - <widget class="QPushButton" row="3" column="1"> + <widget class="TQPushButton" row="3" column="1"> <property name="name"> <cstring>pushButton2</cstring> </property> @@ -88,7 +88,7 @@ <string>C&ancel</string> </property> </widget> - <widget class="QButtonGroup" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>buttonGroup2</cstring> </property> @@ -99,7 +99,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>comboBox1</cstring> </property> @@ -112,7 +112,7 @@ <number>0</number> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radio3</cstring> </property> @@ -120,7 +120,7 @@ <string>&By Revision Number</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>radio4</cstring> </property> @@ -148,7 +148,7 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp index e098eab0..e30e64ee 100644 --- a/vcs/subversion/svn_logviewwidget.cpp +++ b/vcs/subversion/svn_logviewwidget.cpp @@ -38,13 +38,13 @@ #include <tqlayout.h> #include <tqstringlist.h> -SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent) - :TQWidget(parent), m_part(part) +SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *tqparent) + :TQWidget(tqparent), m_part(part) { m_layout = new TQGridLayout( this, 1, 1, 11, 6, "SvnLogViewWidgetBaseLayout"); splitter1 = new TQSplitter( this, "splitter1" ); - splitter1->setOrientation( TQSplitter::Horizontal ); + splitter1->setOrientation( Qt::Horizontal ); splitter1->setMargin(1); listView1 = new TQListView( splitter1, "listView1" ); @@ -52,7 +52,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent) listView1->addColumn( i18n( "Date" ) ); listView1->addColumn( i18n( "Author" ) ); listView1->addColumn( i18n( "Comment" ) ); - listView1->resize( TQSize(1, 1).expandedTo(minimumSizeHint()) ); + listView1->resize( TQSize(1, 1).expandedTo(tqminimumSizeHint()) ); TQFont listView1_font( listView1->font() ); listView1_font.setPointSize( 9 ); listView1->setFont( listView1_font ); @@ -60,17 +60,17 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent) listView1->setShowSortIndicator( TRUE ); textEdit1 = new KTextEdit( splitter1, "textEdit1" ); - textEdit1->resize( TQSize(1, 1).expandedTo(minimumSizeHint()) ); + textEdit1->resize( TQSize(1, 1).expandedTo(tqminimumSizeHint()) ); TQFont textEdit1_font( textEdit1->font() ); textEdit1_font.setPointSize( 9 ); textEdit1->setFont( textEdit1_font ); - textEdit1->setFocusPolicy( TQTextEdit::WheelFocus ); + textEdit1->setFocusPolicy( Qt::WheelFocus ); textEdit1->setReadOnly( TRUE ); m_layout->addWidget( splitter1, 0, 0 ); m_layout->setMargin(1); - resize( TQSize(692, 343).expandedTo(minimumSizeHint()) ); + resize( TQSize(692, 343).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); connect( listView1, TQT_SIGNAL(clicked( TQListViewItem *)), this, TQT_SLOT(slotClicked(TQListViewItem*)) ); @@ -92,7 +92,7 @@ void SvnLogViewWidget::setLogResult( TQValueList<SvnLogHolder> *loglist ) SvnLogHolder holder = *it; SvnLogViewItem *item = new SvnLogViewItem(this->listView1); - TQString prettyDate = holder.date.left(16).replace(10, 1, ' '); + TQString prettyDate = holder.date.left(16).tqreplace(10, 1, ' '); item->setText(0, holder.rev ); item->setText(1, prettyDate ); @@ -188,8 +188,8 @@ void SvnLogViewWidget::diffToPrevious() true/*recurse*/, true/*peg_diff*/ ); } -SvnLogViewOptionDlg::SvnLogViewOptionDlg( TQWidget *parent, const char* name, bool modal, WFlags f ) -: SvnLogViewOptionDlgBase( parent, name, modal,f ) +SvnLogViewOptionDlg::SvnLogViewOptionDlg( TQWidget *tqparent, const char* name, bool modal, WFlags f ) +: SvnLogViewOptionDlgBase( tqparent, name, modal,f ) { // radio1->setChecked(true); //repository log radio4->setChecked(true); //start revistion by revision keyword diff --git a/vcs/subversion/svn_logviewwidget.h b/vcs/subversion/svn_logviewwidget.h index 918d6e47..04c18249 100644 --- a/vcs/subversion/svn_logviewwidget.h +++ b/vcs/subversion/svn_logviewwidget.h @@ -47,8 +47,9 @@ class SvnLogHolder{ class SvnLogViewWidget : public /*SvnLogViewWidgetBase*/ TQWidget { Q_OBJECT + TQ_OBJECT public: - SvnLogViewWidget(subversionPart *part, TQWidget *parent); + SvnLogViewWidget(subversionPart *part, TQWidget *tqparent); virtual ~SvnLogViewWidget(); void setLogResult( TQValueList<SvnLogHolder> *loglist ); void setRequestedUrl( TQString url ); @@ -73,8 +74,9 @@ private: class SvnLogViewOptionDlg : public SvnLogViewOptionDlgBase { Q_OBJECT + TQ_OBJECT public: - SvnLogViewOptionDlg(TQWidget *parent=0, const char* name=0, bool modal=TRUE, WFlags f=0); + SvnLogViewOptionDlg(TQWidget *tqparent=0, const char* name=0, bool modal=TRUE, WFlags f=0); ~SvnLogViewOptionDlg(); int revstart(); TQString revKindStart(); diff --git a/vcs/subversion/svn_mergeoptiondlgbase.ui b/vcs/subversion/svn_mergeoptiondlgbase.ui index 0ad25c83..078e5b84 100644 --- a/vcs/subversion/svn_mergeoptiondlgbase.ui +++ b/vcs/subversion/svn_mergeoptiondlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SvnMergeOptionDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SvnMergeOptionDialogBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -45,7 +45,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>buttonGroup2</cstring> </property> @@ -72,7 +72,7 @@ <number>-1</number> </property> </widget> - <widget class="QRadioButton" row="3" column="0"> + <widget class="TQRadioButton" row="3" column="0"> <property name="name"> <cstring>revnumbtn1</cstring> </property> @@ -83,7 +83,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="3" column="2"> + <widget class="TQRadioButton" row="3" column="2"> <property name="name"> <cstring>revkindbtn1</cstring> </property> @@ -135,7 +135,7 @@ <cstring>src1</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -143,7 +143,7 @@ <string>Source URL or working path:</string> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -153,7 +153,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>buttonGroup2_2</cstring> </property> @@ -164,7 +164,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="3" column="0"> + <widget class="TQRadioButton" row="3" column="0"> <property name="name"> <cstring>revnumbtn2</cstring> </property> @@ -172,7 +172,7 @@ <string>Number:</string> </property> </widget> - <widget class="QRadioButton" row="3" column="2"> + <widget class="TQRadioButton" row="3" column="2"> <property name="name"> <cstring>revkindbtn2</cstring> </property> @@ -188,7 +188,7 @@ <cstring>src2</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -251,7 +251,7 @@ <number>-1</number> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -261,7 +261,7 @@ </widget> </grid> </widget> - <widget class="QPushButton" row="7" column="1"> + <widget class="TQPushButton" row="7" column="1"> <property name="name"> <cstring>okBtn</cstring> </property> @@ -279,14 +279,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>171</width> <height>31</height> </size> </property> </spacer> - <widget class="QPushButton" row="7" column="2"> + <widget class="TQPushButton" row="7" column="2"> <property name="name"> <cstring>cancelBtn</cstring> </property> @@ -294,7 +294,7 @@ <string>Cancel</string> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>forceCheck</cstring> </property> @@ -302,7 +302,7 @@ <string>--force (Force to delete locally modified or unversioned items.)</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>nonRecurse</cstring> </property> @@ -310,7 +310,7 @@ <string>--non-recursive</string> </property> </widget> - <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>ignoreAncestryCheck</cstring> </property> @@ -318,7 +318,7 @@ <string>--ignore-ancestry</string> </property> </widget> - <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>dryRunCheck</cstring> </property> @@ -351,7 +351,7 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/vcs/subversion/svn_mergewidget.cpp b/vcs/subversion/svn_mergewidget.cpp index 50731690..8d3e5158 100644 --- a/vcs/subversion/svn_mergewidget.cpp +++ b/vcs/subversion/svn_mergewidget.cpp @@ -28,8 +28,8 @@ using namespace SvnGlobal; -SvnMergeDialog::SvnMergeDialog( const KURL &wcTarget, TQWidget *parent ) - : SvnMergeOptionDialogBase( parent ) +SvnMergeDialog::SvnMergeDialog( const KURL &wcTarget, TQWidget *tqparent ) + : SvnMergeOptionDialogBase( tqparent ) { dest->setURL( wcTarget.prettyURL() ); diff --git a/vcs/subversion/svn_mergewidget.h b/vcs/subversion/svn_mergewidget.h index abaaea88..da2a46dc 100644 --- a/vcs/subversion/svn_mergewidget.h +++ b/vcs/subversion/svn_mergewidget.h @@ -32,8 +32,9 @@ class KURL; class SvnMergeDialog : public SvnMergeOptionDialogBase { Q_OBJECT + TQ_OBJECT public: - SvnMergeDialog( const KURL &wcTarget, TQWidget *parent = NULL ); + SvnMergeDialog( const KURL &wcTarget, TQWidget *tqparent = NULL ); virtual ~SvnMergeDialog(); KURL source1(); diff --git a/vcs/subversion/svn_switchdlgbase.ui b/vcs/subversion/svn_switchdlgbase.ui index 02257196..a715a7e2 100644 --- a/vcs/subversion/svn_switchdlgbase.ui +++ b/vcs/subversion/svn_switchdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SvnSwitchDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SvnSwitchDlgBase</cstring> </property> @@ -19,12 +19,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>nonRecurseCheck</cstring> </property> <property name="text"> - <string>Non-recursive. (Switch its immediate children only)</string> + <string>Non-recursive. (Switch its immediate tqchildren only)</string> </property> </widget> <widget class="Line" row="5" column="0" rowspan="1" colspan="2"> @@ -41,9 +41,9 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget" row="6" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="6" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>150</width> <height>30</height> @@ -100,7 +100,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -116,7 +116,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -132,7 +132,7 @@ <bool>true</bool> </property> </widget> - <widget class="QButtonGroup" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -143,7 +143,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>switchOnlyRadio</cstring> </property> @@ -151,7 +151,7 @@ <string>svn switch</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>relocationRadio</cstring> </property> @@ -161,7 +161,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -199,10 +199,10 @@ <includes> <include location="local" impldecl="in implementation">svn_switchdlgbase.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot>Form1_destroyed( QObject * )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/vcs/subversion/svn_switchwidget.cpp b/vcs/subversion/svn_switchwidget.cpp index 7149cce2..97744b06 100644 --- a/vcs/subversion/svn_switchwidget.cpp +++ b/vcs/subversion/svn_switchwidget.cpp @@ -7,8 +7,8 @@ #include "subversion_global.h" SvnSwitchDlg::SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder, - const TQString &wcPath, TQWidget *parent ) - : SvnSwitchDlgBase( parent ) + const TQString &wcPath, TQWidget *tqparent ) + : SvnSwitchDlgBase( tqparent ) , m_info( holder ) { connect( switchOnlyRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetCurrentRepositoryUrlEdit()) ); diff --git a/vcs/subversion/svn_switchwidget.h b/vcs/subversion/svn_switchwidget.h index a38ca0ff..1d06f303 100644 --- a/vcs/subversion/svn_switchwidget.h +++ b/vcs/subversion/svn_switchwidget.h @@ -11,9 +11,10 @@ namespace SvnGlobal class SvnSwitchDlg : public SvnSwitchDlgBase { Q_OBJECT + TQ_OBJECT public: SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder, - const TQString &wcPath, TQWidget *parent = NULL ); + const TQString &wcPath, TQWidget *tqparent = NULL ); virtual ~SvnSwitchDlg(); const TQString currentUrl(); diff --git a/vcs/subversion/svnssltrustpromptbase.ui b/vcs/subversion/svnssltrustpromptbase.ui index a94e345c..f2a5cdc9 100644 --- a/vcs/subversion/svnssltrustpromptbase.ui +++ b/vcs/subversion/svnssltrustpromptbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SvnSSLTrustPromptBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SvnSSLTrustPromptBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>btnPermanent</cstring> </property> @@ -30,7 +30,7 @@ <string></string> </property> </widget> - <widget class="QListView" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQListView" row="1" column="0" rowspan="1" colspan="3"> <column> <property name="text"> <string></string> @@ -57,7 +57,7 @@ <cstring>listView1</cstring> </property> </widget> - <widget class="QPushButton" row="2" column="2"> + <widget class="TQPushButton" row="2" column="2"> <property name="name"> <cstring>btnReject</cstring> </property> @@ -68,7 +68,7 @@ <string></string> </property> </widget> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>btnTemporary</cstring> </property> @@ -79,14 +79,14 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>errMsgLabel</cstring> </property> <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -112,5 +112,5 @@ <slot>accept()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> |