diff --git a/src/commandline.cpp b/src/commandline.cpp index 66788bd..fd49ca9 100644 --- a/src/commandline.cpp +++ b/src/commandline.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include class CommandLineData diff --git a/src/commandline_part.cpp b/src/commandline_part.cpp index f26613b..3037cd1 100644 --- a/src/commandline_part.cpp +++ b/src/commandline_part.cpp @@ -30,10 +30,10 @@ commandline_part::commandline_part(TQObject *parent, const char *name,KCmdLineAr KInstance * inst = tdesvnPartFactory::instance(); KGlobal::locale()->insertCatalogue(inst->instanceName()); KGlobal::dirs()->addResourceType( inst->instanceName() + "data", - KStandardDirs::kde_default("data")+ TQString::fromLatin1( inst->instanceName() ) + '/' ); + KStandardDirs::kde_default("data")+ TQString::tqfromLatin1( inst->instanceName() ) + '/' ); - m_pCPart = new CommandExec(this,TQString(name?TQString(name)+TQString("_exec"):TQString::fromLatin1("command_executer")).ascii(),args); + m_pCPart = new CommandExec(this,TQString(name?TQString(name)+TQString("_exec"):TQString::tqfromLatin1("command_executer")).ascii(),args); } commandline_part::~commandline_part() diff --git a/src/helpers/stringhelper.h b/src/helpers/stringhelper.h index c8b628d..80ad576 100644 --- a/src/helpers/stringhelper.h +++ b/src/helpers/stringhelper.h @@ -21,7 +21,7 @@ #define STRINGHELPER_H #include -#include +#include namespace helpers { @@ -57,7 +57,7 @@ public: } v /= 1024.0; } - return TQString("%1 %2Byte").arg(v,0,'f',pre?2:0).arg(pre?TQString(TQChar(pre)):TQString("")); + return TQString("%1 %2Byte").tqarg(v,0,'f',pre?2:0).tqarg(pre?TQString(TQChar(pre)):TQString("")); } }; diff --git a/src/kiosvn/kiolistener.cpp b/src/kiosvn/kiolistener.cpp index 16ff6e4..f08dc18 100644 --- a/src/kiosvn/kiolistener.cpp +++ b/src/kiosvn/kiolistener.cpp @@ -116,9 +116,9 @@ void KioListener::contextNotify (const char * path,svn_wc_notify_action_t action case svn_wc_notify_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; } break; @@ -126,33 +126,33 @@ void KioListener::contextNotify (const char * path,svn_wc_notify_action_t action break; case svn_wc_notify_delete: //delete m_HasChanges = 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 m_HasChanges = TRUE; - userstring=i18n( "D %1" ).arg( path ); + userstring=i18n( "D %1" ).tqarg( path ); break; case svn_wc_notify_update_add: //update_add m_HasChanges = TRUE; - userstring=i18n( "A %1" ).arg( path ); + userstring=i18n( "A %1" ).tqarg( path ); break; case svn_wc_notify_update_update: //update_update { @@ -195,13 +195,13 @@ void KioListener::contextNotify (const char * path,svn_wc_notify_action_t action { if (!m_External) { if (SVN_IS_VALID_REVNUM(revision)) { - userstring = i18n("Finished at revision %1.").arg(revision); + userstring = i18n("Finished at revision %1.").tqarg(revision); } else { userstring = i18n("Finished."); } } else { if (SVN_IS_VALID_REVNUM(revision)) { - userstring = i18n("Finished external at revision %1.").arg(revision); + userstring = i18n("Finished external at revision %1.").tqarg(revision); } else { userstring = i18n("Finished external."); } @@ -212,30 +212,30 @@ void KioListener::contextNotify (const char * path,svn_wc_notify_action_t action break; case svn_wc_notify_update_external: //update_external m_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( "Status 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 (!m_FirstTxDelta) { diff --git a/src/kiosvn/kiosvn.cpp b/src/kiosvn/kiosvn.cpp index 59c9434..0773d6d 100644 --- a/src/kiosvn/kiosvn.cpp +++ b/src/kiosvn/kiosvn.cpp @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include @@ -671,13 +671,13 @@ void kio_svnProtocol::status(const KURL&wc,bool cR,bool rec) } //TQDataStream stream(params, IO_WriteOnly); setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+"path",dlist[j]->path()); - setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+"text",TQString::number(dlist[j]->textStatus())); + setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+"text",TQString::number(dlist[j]->texttqStatus())); setMetaData(TQString::number(m_pData->m_Listener.counter() ).rightJustify( 10,'0' )+ "prop", - TQString::number(dlist[j]->propStatus())); + TQString::number(dlist[j]->proptqStatus())); setMetaData(TQString::number(m_pData->m_Listener.counter() ).rightJustify( 10,'0' )+ "reptxt", - TQString::number(dlist[j]->reposTextStatus())); + TQString::number(dlist[j]->reposTexttqStatus())); setMetaData(TQString::number(m_pData->m_Listener.counter() ).rightJustify( 10,'0' )+ "repprop", - TQString::number(dlist[j]->reposPropStatus())); + TQString::number(dlist[j]->reposProptqStatus())); setMetaData(TQString::number(m_pData->m_Listener.counter() ).rightJustify( 10,'0' )+ "rev", TQString::number(dlist[j]->entry().cmtRev())); m_pData->m_Listener.incCounter(); @@ -724,7 +724,7 @@ void kio_svnProtocol::commit(const KURL::List&url) for (unsigned j=0;jtext(); m_StorePasswordButton->setText( m_StorePasswordButton->text()+TQString(" (%1)") - .arg((Kdesvnsettings::passwords_in_wallet()?i18n("into KDE Wallet"):i18n("into subversions simple storage")))); + .tqarg((Kdesvnsettings::passwords_in_wallet()?i18n("into KDE Wallet"):i18n("into subversions simple storage")))); if (!realm.isEmpty()) { m_RealmLabel->setText(m_RealmLabel->text()+" "+realm); - resize( TQSize(334, 158).expandedTo(minimumSizeHint()) ); + resize( TQSize(334, 158).expandedTo(tqminimumSizeHint()) ); } } diff --git a/src/ksvnwidgets/authdlg.ui b/src/ksvnwidgets/authdlg.ui index 6b18120..b3facca 100644 --- a/src/ksvnwidgets/authdlg.ui +++ b/src/ksvnwidgets/authdlg.ui @@ -32,7 +32,7 @@ - layout4 + tqlayout4 @@ -82,7 +82,7 @@ - layout3 + tqlayout3 @@ -129,7 +129,7 @@ Expanding - + 90 20 diff --git a/src/ksvnwidgets/depthform.ui b/src/ksvnwidgets/depthform.ui index 384bf72..bb738b1 100644 --- a/src/ksvnwidgets/depthform.ui +++ b/src/ksvnwidgets/depthform.ui @@ -57,7 +57,7 @@ <i>empty depth</i><br>Just the named directory, no entries. Updates will not pull in any files or subdirectories not already present. </p> <p> -<i>Files depth</i><br>Folder and its file children, but not subdirs. Updates will pull in any files not already present, but not subdirectories. +<i>Files depth</i><br>Folder and its file tqchildren, but not subdirs. Updates will pull in any files not already present, but not subdirectories. </p> <p> <i>Immediate depth</i><br> @@ -80,7 +80,7 @@ Equivalent to the pre-1.5 default update behavior. Expanding - + 40 20 diff --git a/src/ksvnwidgets/depthselector.cpp b/src/ksvnwidgets/depthselector.cpp index 4d1675b..6e9bb74 100644 --- a/src/ksvnwidgets/depthselector.cpp +++ b/src/ksvnwidgets/depthselector.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include @@ -42,11 +42,11 @@ DepthSelector::DepthSelector(TQWidget *parent, const char *name) m_recurse->setChecked( TRUE ); m_recurse->setText(i18n( "Recursive" )); DepthFormLayout->addWidget( m_recurse ); - m_recurse->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); + m_recurse->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); DepthFormLayout->addItem(m_leftspacer); } DepthFormLayout->setMargin(0); - setMinimumSize(minimumSizeHint()); + setMinimumSize(tqminimumSizeHint()); adjustSize(); } @@ -56,11 +56,11 @@ DepthSelector::~DepthSelector() void DepthSelector::addItemWidget(TQWidget*aWidget) { DepthFormLayout->removeItem(m_leftspacer); - aWidget->reparent(this,geometry().topLeft()); + aWidget->reparent(this,tqgeometry().topLeft()); DepthFormLayout->addWidget(aWidget); - aWidget->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); + aWidget->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); DepthFormLayout->addItem(m_leftspacer); - setMinimumSize(minimumSizeHint()); + setMinimumSize(tqminimumSizeHint()); } /*! diff --git a/src/ksvnwidgets/diffbrowser.cpp b/src/ksvnwidgets/diffbrowser.cpp index 8e273cd..1e87d29 100644 --- a/src/ksvnwidgets/diffbrowser.cpp +++ b/src/ksvnwidgets/diffbrowser.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include /*! \fn DiffBrowser::DiffBrowser(TQWidget*parent=0,const char*name=0) @@ -96,7 +96,7 @@ void DiffBrowser::saveDiff() TQFile tfile(saveTo); if (tfile.exists()) { if (KMessageBox::warningYesNo(TQT_TQWIDGET(KApplication::activeModalWidget()), - i18n("File %1 exists - overwrite?").arg(saveTo)) + i18n("File %1 exists - overwrite?").tqarg(saveTo)) !=KMessageBox::Yes) { return; } diff --git a/src/ksvnwidgets/encodingselector.ui b/src/ksvnwidgets/encodingselector.ui index e1ce254..cb5249a 100644 --- a/src/ksvnwidgets/encodingselector.ui +++ b/src/ksvnwidgets/encodingselector.ui @@ -49,7 +49,7 @@ Select encoding: - + AlignVCenter|AlignRight diff --git a/src/ksvnwidgets/logmessage.ui b/src/ksvnwidgets/logmessage.ui index 25e08a8..2199705 100644 --- a/src/ksvnwidgets/logmessage.ui +++ b/src/ksvnwidgets/logmessage.ui @@ -47,7 +47,7 @@ Review affected items - + AlignCenter @@ -92,7 +92,7 @@ - layout5 + tqlayout5 @@ -167,7 +167,7 @@ Enter a log message - + AlignCenter @@ -181,7 +181,7 @@ - layout6 + tqlayout6 diff --git a/src/ksvnwidgets/logmsg_impl.cpp b/src/ksvnwidgets/logmsg_impl.cpp index 97d67b1..037a66f 100644 --- a/src/ksvnwidgets/logmsg_impl.cpp +++ b/src/ksvnwidgets/logmsg_impl.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include @@ -224,7 +224,7 @@ void Logmsg_impl::initHistory() KConfigGroup cs(Kdesvnsettings::self()->config(),"log_messages"); TQString s = TQString(); unsigned int current = 0; - TQString key = TQString("log_%0").arg(current); + TQString key = TQString("log_%0").tqarg(current); s = cs.readEntry(key,TQString()); while (s!=TQString()) { if (currentconfig(),"log_messages"); for (unsigned int i = 0; i < sLogHistory.size();++i) { - cs.writeEntry(TQString("log_%0").arg(i),sLogHistory[i]); + cs.writeEntry(TQString("log_%0").tqarg(i),sLogHistory[i]); } cs.sync(); } else { @@ -449,11 +449,11 @@ TQString Logmsg_impl::getLogmessage(const logActionEntries&_on, void Logmsg_impl::addItemWidget(TQWidget*aWidget) { m_DepthSelector->addItemWidget(aWidget); -/* aWidget->reparent(this,geometry().topLeft()); +/* aWidget->reparent(this,tqgeometry().topLeft()); m_ItemsLayout->addWidget(aWidget); - kdDebug()<<"SizeHint: "<minimumSizeHint()<< endl; - aWidget->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); - setMinimumHeight(minimumSizeHint().height());*/ + kdDebug()<<"SizeHint: "<tqminimumSizeHint()<< endl; + aWidget->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); + setMinimumHeight(tqminimumSizeHint().height());*/ } Logmsg_impl::logActionEntries Logmsg_impl::selectedEntries() diff --git a/src/ksvnwidgets/revertform.ui b/src/ksvnwidgets/revertform.ui index dacca01..1f413dc 100644 --- a/src/ksvnwidgets/revertform.ui +++ b/src/ksvnwidgets/revertform.ui @@ -20,7 +20,7 @@ 0 - + 0 20 @@ -50,7 +50,7 @@ m_DepthSelect - + 0 20 diff --git a/src/ksvnwidgets/revertform_impl.cpp b/src/ksvnwidgets/revertform_impl.cpp index 8b18508..91ad876 100644 --- a/src/ksvnwidgets/revertform_impl.cpp +++ b/src/ksvnwidgets/revertform_impl.cpp @@ -29,7 +29,7 @@ RevertFormImpl::RevertFormImpl(TQWidget*parent,const char*name) :RevertForm(parent,name) { - setMinimumSize(minimumSizeHint()); + setMinimumSize(tqminimumSizeHint()); } /*! diff --git a/src/ksvnwidgets/ssltrustprompt_impl.cpp b/src/ksvnwidgets/ssltrustprompt_impl.cpp index 2aca6b9..1791e80 100644 --- a/src/ksvnwidgets/ssltrustprompt_impl.cpp +++ b/src/ksvnwidgets/ssltrustprompt_impl.cpp @@ -36,7 +36,7 @@ SslTrustPrompt_impl::SslTrustPrompt_impl(const TQString&host,TQWidget *parent, c :SslTrustPrompt(parent, name) { m_MainLabel->setText("

"+ - i18n("Error validating server certificate for '%1'").arg(host)+ + i18n("Error validating server certificate for '%1'").tqarg(host)+ TQString("

")); } diff --git a/src/settings/cmdexecsettings.ui b/src/settings/cmdexecsettings.ui index c35e2f6..6e73492 100644 --- a/src/settings/cmdexecsettings.ui +++ b/src/settings/cmdexecsettings.ui @@ -29,7 +29,7 @@ - layout2 + tqlayout2 @@ -84,7 +84,7 @@ - layout2 + tqlayout2 @@ -102,7 +102,7 @@ Standard message: - + AlignVCenter|AlignRight @@ -118,7 +118,7 @@ Expanding - + 20 16 diff --git a/src/settings/diffmergesettings.ui b/src/settings/diffmergesettings.ui index 86c8e2f..106fb72 100644 --- a/src/settings/diffmergesettings.ui +++ b/src/settings/diffmergesettings.ui @@ -75,7 +75,7 @@ - layout2 + tqlayout2 @@ -88,13 +88,13 @@ see "Whats this" for details - + WordBreak|AlignCenter - layout2 + tqlayout2 @@ -107,7 +107,7 @@ Conflict resolver program: - + AlignVCenter|AlignRight @@ -118,7 +118,7 @@ External merge program: - + AlignVCenter|AlignRight @@ -156,7 +156,7 @@ Default: <tt>kdiff3 %o %m %n -o %t</tt> External diff display: - + AlignVCenter|AlignRight @@ -220,7 +220,7 @@ When %1 and %2 is given, tdesvn let this display make the diff. For that it it m Expanding - + 20 16 diff --git a/src/settings/dispcolor_settings.ui b/src/settings/dispcolor_settings.ui index d2bc5c7..a395cac 100644 --- a/src/settings/dispcolor_settings.ui +++ b/src/settings/dispcolor_settings.ui @@ -32,7 +32,7 @@ - layout2 + tqlayout2 @@ -72,7 +72,7 @@ Locked items: - + AlignVCenter|AlignRight @@ -91,7 +91,7 @@ Not versioned items: - + AlignVCenter|AlignRight @@ -102,7 +102,7 @@ Remote changed items: - + AlignVCenter|AlignRight @@ -113,7 +113,7 @@ Added items: - + AlignVCenter|AlignRight @@ -124,7 +124,7 @@ Deleted items: - + AlignVCenter|AlignRight @@ -167,7 +167,7 @@ Conflicted items: - + AlignVCenter|AlignRight @@ -178,7 +178,7 @@ Missed items: - + AlignVCenter|AlignRight @@ -189,7 +189,7 @@ Local changed items: - + AlignVCenter|AlignRight @@ -200,7 +200,7 @@ Item needs lock: - + AlignVCenter|AlignRight @@ -224,7 +224,7 @@ Expanding - + 20 40 diff --git a/src/settings/display_settings.ui b/src/settings/display_settings.ui index 82d92e4..b06c50b 100644 --- a/src/settings/display_settings.ui +++ b/src/settings/display_settings.ui @@ -21,7 +21,7 @@ - layout1 + tqlayout1 @@ -127,7 +127,7 @@ If networking is disabled, then this flag is ignored. - layout2_2 + tqlayout2_2 @@ -160,7 +160,7 @@ When kde-default is wanted for opening on double click, enter &quot;default& - layout3 + tqlayout3 @@ -205,7 +205,7 @@ When kde-default is wanted for opening on double click, enter &quot;default& Expanding - + 20 16 diff --git a/src/settings/revisiontree_settings.ui b/src/settings/revisiontree_settings.ui index b8a9ce4..7373eea 100644 --- a/src/settings/revisiontree_settings.ui +++ b/src/settings/revisiontree_settings.ui @@ -66,7 +66,7 @@ - layout4 + tqlayout4 @@ -79,7 +79,7 @@ Color for added items: - + AlignVCenter|AlignRight @@ -95,7 +95,7 @@ - layout3 + tqlayout3 @@ -108,7 +108,7 @@ Color for deleted items: - + AlignVCenter|AlignRight @@ -124,7 +124,7 @@ - layout2 + tqlayout2 @@ -137,7 +137,7 @@ Color for copied items: - + AlignVCenter|AlignRight @@ -153,7 +153,7 @@ - layout5 + tqlayout5 @@ -166,7 +166,7 @@ Color for renamed items: - + AlignVCenter|AlignRight @@ -182,7 +182,7 @@ - layout6 + tqlayout6 @@ -195,7 +195,7 @@ Color for modified items: - + AlignVCenter|AlignRight @@ -219,7 +219,7 @@ Expanding - + 20 40 diff --git a/src/settings/subversion_settings.ui b/src/settings/subversion_settings.ui index d3caac1..6e40fcf 100644 --- a/src/settings/subversion_settings.ui +++ b/src/settings/subversion_settings.ui @@ -230,7 +230,7 @@ On networked repositories (eg., not opened via file:// protocol) this may get re Expanding - + 20 16 diff --git a/src/svnfrontend/blamedisplay_impl.cpp b/src/svnfrontend/blamedisplay_impl.cpp index d7d3ecc..06727a5 100644 --- a/src/svnfrontend/blamedisplay_impl.cpp +++ b/src/svnfrontend/blamedisplay_impl.cpp @@ -45,8 +45,8 @@ #include #include #include -#include -#include +#include +#include #define COL_LINENR 0 #define COL_REV 1 @@ -100,7 +100,7 @@ public: BlameDisplayItem(KListView*,BlameDisplayItem*,const svn::AnnotateLine&,bool,BlameDisplay_impl*); virtual ~BlameDisplayItem(){} virtual int compare(TQListViewItem *i, int col, bool ascending)const; - virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); + virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); virtual int rtti()const{return 1000;} virtual int width( const TQFontMetrics & fm, const TQListView * lv, int c ) const; @@ -116,7 +116,7 @@ public: } TQString _line = m_Content.tLine(); _line.replace("\t"," "); - setText(COL_LINE,TQString("%1").arg(_line)); + setText(COL_LINE,TQString("%1").tqarg(_line)); } protected: @@ -153,17 +153,17 @@ int BlameDisplayItem::width (const TQFontMetrics & fm, const TQListView * lv, in void BlameDisplayItem::display() { if (m_disp){ - setText(COL_REV,TQString("%1").arg(m_Content.revision())); + setText(COL_REV,TQString("%1").tqarg(m_Content.revision())); setText(COL_AUT,m_Content.tAuthor()); if (m_Content.date().isValid()) { setText(COL_DATE,KGlobal::locale()->formatDateTime(m_Content.date())); } } - setText(COL_LINENR,TQString("%1").arg(m_Content.lineNumber()+1)); + setText(COL_LINENR,TQString("%1").tqarg(m_Content.lineNumber()+1)); TQString _line = m_Content.tLine(); _line.replace("\t"," "); - setText(COL_LINE,TQString("%1").arg(_line)); + setText(COL_LINE,TQString("%1").tqarg(_line)); } int BlameDisplayItem::compare(TQListViewItem *item, int col, bool ascending)const @@ -182,10 +182,10 @@ int BlameDisplayItem::compare(TQListViewItem *item, int col, bool ascending)cons return k->m_Content.lineNumber()-m_Content.lineNumber(); } -void BlameDisplayItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) +void BlameDisplayItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) { - if (alignment & (AlignTop || AlignBottom) == 0) - alignment |= AlignVCenter; + if (tqalignment & (AlignTop || AlignBottom) == 0) + tqalignment |= AlignVCenter; /* don't copy string */ const TQString & str = text(column);; @@ -202,7 +202,7 @@ void BlameDisplayItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colum if (Kdesvnsettings::self()->colored_blame()) { _bgColor = cb->rev2color(m_Content.revision()); } else { - _bgColor = listView()->viewport()->colorGroup().base(); + _bgColor = listView()->viewport()->tqcolorGroup().base(); } } @@ -213,7 +213,7 @@ void BlameDisplayItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colum if (str.isEmpty()) return; - p->drawText(BORDER, 0, width - 2*BORDER, height(), alignment, str); + p->drawText(BORDER, 0, width - 2*BORDER, height(), tqalignment, str); } class BlameDisplayData @@ -344,7 +344,7 @@ const TQColor BlameDisplay_impl::rev2color(svn_revnum_t r )const { return m_Data->m_shadingMap[r]; } else { - return m_BlameList->viewport()->colorGroup().base(); + return m_BlameList->viewport()->tqcolorGroup().base(); } } @@ -411,7 +411,7 @@ void BlameDisplay_impl::showCommit(BlameDisplayItem*bit) } KDialogBase* dlg = new KDialogBase( TQT_TQWIDGET(KApplication::activeModalWidget()), - "simplelog",true,TQString(i18n("Logmessage for revision %1").arg(bit->rev())), + "simplelog",true,TQString(i18n("Logmessage for revision %1").tqarg(bit->rev())), KDialogBase::Close); TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget(); KTextBrowser*ptr = new KTextBrowser(Dialog1Layout); @@ -447,7 +447,7 @@ void BlameDisplay_impl::displayBlame(SimpleLogCb*_cb,const TQString&item,const s int buttons = KDialogBase::Close|KDialogBase::User1|KDialogBase::User2; KDialogBase * dlg = new KDialogBase( TQT_TQWIDGET(KApplication::activeModalWidget()), - name,true,TQString(i18n("Blame %1")).arg(item),buttons,KDialogBase::Close,false, + name,true,TQString(i18n("Blame %1")).tqarg(item),buttons,KDialogBase::Close,false, KGuiItem(i18n("Goto line")),KGuiItem(i18n("Log message for revision"),"tdesvnlog")); TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget(); diff --git a/src/svnfrontend/cacheentry.h b/src/svnfrontend/cacheentry.h index fd9ae64..1b36a95 100644 --- a/src/svnfrontend/cacheentry.h +++ b/src/svnfrontend/cacheentry.h @@ -569,7 +569,7 @@ public: ValidRemoteOnly():m_List(){} void operator()(const std::pair&_data) { - if(_data.second.isValid() && _data.second.content()->validReposStatus()&&!_data.second.content()->validLocalStatus()) { + if(_data.second.isValid() && _data.second.content()->validRepostqStatus()&&!_data.second.content()->validLocaltqStatus()) { m_List.push_back(_data.second.content()); } } diff --git a/src/svnfrontend/ccontextlistener.cpp b/src/svnfrontend/ccontextlistener.cpp index 691b288..2cf3bd0 100644 --- a/src/svnfrontend/ccontextlistener.cpp +++ b/src/svnfrontend/ccontextlistener.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include class CContextListenerData @@ -296,7 +296,7 @@ bool CContextListener::contextSslClientCertPwPrompt (TQString & password, TQCString npass; int keep = 1; int res = KPasswordDialog::getPassword(npass, - i18n("Enter password for realm %1").arg(realm), + i18n("Enter password for realm %1").tqarg(realm), &keep); emit waitShow(false); if (res!=KPasswordDialog::Accepted) { diff --git a/src/svnfrontend/commandexec.cpp b/src/svnfrontend/commandexec.cpp index 81212a9..431125c 100644 --- a/src/svnfrontend/commandexec.cpp +++ b/src/svnfrontend/commandexec.cpp @@ -40,7 +40,7 @@ #include #include -#include +#include #include #include @@ -211,7 +211,7 @@ int CommandExec::exec() bool found = connect(this,TQT_SIGNAL(executeMe()),this,slotCmd.ascii()); if (!found) { - slotCmd=i18n("Command \"%1\" not implemented or known").arg(m_pCPart->cmd); + slotCmd=i18n("Command \"%1\" not implemented or known").tqarg(m_pCPart->cmd); KMessageBox::sorry(0,slotCmd,i18n("SVN Error")); return -1; } @@ -606,7 +606,7 @@ bool CommandExec::askRevision() TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); Rangeinput_impl*rdlg; rdlg = new Rangeinput_impl(Dialog1Layout); - dlg.resize( TQSize(120,60).expandedTo(dlg.minimumSizeHint())); + dlg.resize( TQSize(120,60).expandedTo(dlg.tqminimumSizeHint())); rdlg->setStartOnly(m_pCPart->single_revision); if (dlg.exec()==TQDialog::Accepted) { Rangeinput_impl::revision_range range = rdlg->getRange(); diff --git a/src/svnfrontend/copymoveview.ui b/src/svnfrontend/copymoveview.ui index f16b5b0..3c29ac2 100644 --- a/src/svnfrontend/copymoveview.ui +++ b/src/svnfrontend/copymoveview.ui @@ -26,7 +26,7 @@ <p align="right">Rename</p> - + WordBreak|AlignVCenter|AlignLeft @@ -37,7 +37,7 @@ this long text - + AlignCenter @@ -48,13 +48,13 @@ to - + AlignVCenter|AlignLeft - layout5 + tqlayout5 @@ -67,7 +67,7 @@ /there/ - + AlignVCenter|AlignRight diff --git a/src/svnfrontend/copymoveview_impl.cpp b/src/svnfrontend/copymoveview_impl.cpp index f635cf8..98e3d60 100644 --- a/src/svnfrontend/copymoveview_impl.cpp +++ b/src/svnfrontend/copymoveview_impl.cpp @@ -88,7 +88,7 @@ TQString CopyMoveView_impl::getMoveCopyTo(bool*ok,bool*force,bool move, TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); CopyMoveView_impl*ptr=new CopyMoveView_impl(base,old,(move),Dialog1Layout); TQString nName = TQString(); - dlg.resize( TQSize(500,160).expandedTo(dlg.minimumSizeHint()) ); + dlg.resize( TQSize(500,160).expandedTo(dlg.tqminimumSizeHint()) ); if (dlg.exec()!=TQDialog::Accepted) { if (ok) *ok = false; } else { diff --git a/src/svnfrontend/createrepo_dlg.ui b/src/svnfrontend/createrepo_dlg.ui index 0ca5ef5..552ba72 100644 --- a/src/svnfrontend/createrepo_dlg.ui +++ b/src/svnfrontend/createrepo_dlg.ui @@ -21,7 +21,7 @@ - layout1 + tqlayout1 @@ -34,7 +34,7 @@ Type of repository: - + AlignVCenter|AlignRight @@ -74,7 +74,7 @@ Path to repository: - + AlignVCenter|AlignRight @@ -119,7 +119,7 @@ Create trunk, tags and branches folder - If this is set then the base layout (<tt>/trunk</tt>,<tt>/branches</tt> and <tt>/tags</tt>) will created after opening the fresh repository. + If this is set then the base tqlayout (<tt>/trunk</tt>,<tt>/branches</tt> and <tt>/tags</tt>) will created after opening the fresh repository. diff --git a/src/svnfrontend/dumprepo_dlg.ui b/src/svnfrontend/dumprepo_dlg.ui index 5238574..e060c20 100644 --- a/src/svnfrontend/dumprepo_dlg.ui +++ b/src/svnfrontend/dumprepo_dlg.ui @@ -21,7 +21,7 @@ - layout1 + tqlayout1 @@ -42,7 +42,7 @@ Repository to dump: - + AlignVCenter|AlignRight @@ -53,7 +53,7 @@ Dump into: - + AlignVCenter|AlignRight @@ -105,7 +105,7 @@ - layout6 + tqlayout6 @@ -118,7 +118,7 @@ End revision: - + AlignVCenter|AlignRight @@ -129,7 +129,7 @@ Start revision: - + AlignVCenter|AlignRight diff --git a/src/svnfrontend/editproperty_impl.cpp b/src/svnfrontend/editproperty_impl.cpp index 9c5ffba..00fb964 100644 --- a/src/svnfrontend/editproperty_impl.cpp +++ b/src/svnfrontend/editproperty_impl.cpp @@ -44,7 +44,7 @@ EditProperty_impl::EditProperty_impl(TQWidget *parent, const char *name) fileComments += i18n("If present, make the file executable.
" "This property can not be set on a directory. " "A non-recursive attempt will fail, and a recursive attempt " - "will set the property only on the file children of the folder."); + "will set the property only on the file tqchildren of the folder."); fileComments += i18n("Keywords to be expanded into the contents of a file.
" "They can be inserted into documents by placing a keyword anchor " "which is formatted as $KeywordName$.
" @@ -80,7 +80,7 @@ EditProperty_impl::EditProperty_impl(TQWidget *parent, const char *name) dirComments += i18n("If present, make the file executable.
" "This property can not be set on a directory. " "A non-recursive attempt will fail, and a recursive attempt " - "will set the property only on the file children of the folder."); + "will set the property only on the file tqchildren of the folder."); /* TRANSLATORS: Do not translate "example" in the URL because this is according TRANSLATORS: to http://www.rfc-editor.org/rfc/rfc2606.txt a reserved URL.*/ dirComments += i18n("A newline separated list of module specifiers, each " diff --git a/src/svnfrontend/editpropsdlg.ui b/src/svnfrontend/editpropsdlg.ui index 68aa585..c0bab16 100644 --- a/src/svnfrontend/editpropsdlg.ui +++ b/src/svnfrontend/editpropsdlg.ui @@ -21,7 +21,7 @@ - layout1 + tqlayout1 @@ -37,7 +37,7 @@ Expanding - + 107 20 @@ -79,7 +79,7 @@ - layout24 + tqlayout24 @@ -105,7 +105,7 @@ - layout23 + tqlayout23 @@ -121,7 +121,7 @@ Expanding - + 20 60 @@ -154,7 +154,7 @@ helpButton - + 36 36 @@ -185,7 +185,7 @@ Expanding - + 20 50 diff --git a/src/svnfrontend/filelistviewitem.cpp b/src/svnfrontend/filelistviewitem.cpp index 812ee69..a285590 100644 --- a/src/svnfrontend/filelistviewitem.cpp +++ b/src/svnfrontend/filelistviewitem.cpp @@ -118,7 +118,7 @@ void FileListViewItem::setStat(const svn::StatusPtr&stat) init(); } -void FileListViewItem::refreshStatus(bool childs,TQPtrList*exclude,bool depsonly) +void FileListViewItem::refreshtqStatus(bool childs,TQPtrList*exclude,bool depsonly) { FileListViewItem*it; @@ -133,18 +133,18 @@ void FileListViewItem::refreshStatus(bool childs,TQPtrList*exclude,bool it = static_cast(parent()); if (!childs) { if (it && (!exclude || exclude->find(it)==-1)) { - it->refreshStatus(false,exclude); + it->refreshtqStatus(false,exclude); } } else if (firstChild()){ it = static_cast(firstChild()); while (it) { if (!exclude || exclude->find(it)==-1) { - it->refreshStatus(true,exclude); + it->refreshtqStatus(true,exclude); } it = static_cast(it->nextSibling()); } } - repaint(); + tqrepaint(); } void FileListViewItem::makePixmap() @@ -192,7 +192,7 @@ void FileListViewItem::update() setText(COL_STATUS,infoText()); setText(COL_LAST_AUTHOR,cmtAuthor()); setText(COL_LAST_DATE,KGlobal::locale()->formatDateTime(fullDate())); - setText(COL_LAST_REV,TQString("%1").arg(cmtRev())); + setText(COL_LAST_REV,TQString("%1").tqarg(cmtRev())); setText(COL_IS_LOCKED,lockOwner()); } @@ -228,7 +228,7 @@ void FileListViewItem::removeChilds() } } -void FileListViewItem::updateStatus(const svn::StatusPtr&s) +void FileListViewItem::updatetqStatus(const svn::StatusPtr&s) { setStat(s); } @@ -247,11 +247,11 @@ SvnItem* FileListViewItem::getParentItem()const return temp->fullName(); } -void FileListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) +void FileListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) { bool colors = Kdesvnsettings::colored_state(); if (!colors||m_bgColor==NONE) { - KListViewItem::paintCell(p,cg,column,width,alignment); + KListViewItem::paintCell(p,cg,column,width,tqalignment); return; } TQColorGroup _cg = cg; @@ -285,7 +285,7 @@ void FileListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colum _bgColor = Kdesvnsettings::color_need_lock(); break; default: - KListViewItem::paintCell(p,cg,column,width,alignment); + KListViewItem::paintCell(p,cg,column,width,tqalignment); return; break; } @@ -301,7 +301,7 @@ void FileListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colum _cg.setColor(TQColorGroup::Base,_bgColor); } } - TQListViewItem::paintCell(p, _cg, column, width, alignment); + TQListViewItem::paintCell(p, _cg, column, width, tqalignment); } const svn::Revision&FileListViewItem::correctPeg()const diff --git a/src/svnfrontend/filelistviewitem.h b/src/svnfrontend/filelistviewitem.h index c1685fa..cc82456 100644 --- a/src/svnfrontend/filelistviewitem.h +++ b/src/svnfrontend/filelistviewitem.h @@ -44,8 +44,8 @@ public: virtual ~FileListViewItem(); virtual int compare( TQListViewItem* i, int col, bool ascending ) const; - virtual void updateStatus(const svn::StatusPtr&s); - virtual void refreshStatus(bool childs=false,TQPtrList *exclude = 0,bool depsonly=false); + virtual void updatetqStatus(const svn::StatusPtr&s); + virtual void refreshtqStatus(bool childs=false,TQPtrList *exclude = 0,bool depsonly=false); #if 0 virtual void refreshMe(); @@ -60,7 +60,7 @@ public: virtual SvnItem* getParentItem()const; virtual FileListViewItem*fItem(){return this;} virtual void setStat(const svn::StatusPtr&); - virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); + virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); virtual void setOpen(bool o); virtual void setOpenNoBlock(bool o); diff --git a/src/svnfrontend/fillcachethread.cpp b/src/svnfrontend/fillcachethread.cpp index 92c805e..e2ee7f4 100644 --- a/src/svnfrontend/fillcachethread.cpp +++ b/src/svnfrontend/fillcachethread.cpp @@ -110,7 +110,7 @@ void FillCacheThread::run() rl.fillCache(Head.revnum()); } i=Head.revnum(); - m_SvnContextListener->contextNotify(i18n("Cache filled up to revision %1").arg(i)); + m_SvnContextListener->contextNotify(i18n("Cache filled up to revision %1").tqarg(i)); } } catch (const svn::Exception&e) { m_SvnContextListener->contextNotify(e.msg()); diff --git a/src/svnfrontend/fronthelpers/checkoutinfo.ui b/src/svnfrontend/fronthelpers/checkoutinfo.ui index ee7f673..048711e 100644 --- a/src/svnfrontend/fronthelpers/checkoutinfo.ui +++ b/src/svnfrontend/fronthelpers/checkoutinfo.ui @@ -21,7 +21,7 @@ - layout2 + tqlayout2 @@ -64,7 +64,7 @@ Enter URL: - + AlignVCenter|AlignRight @@ -96,7 +96,7 @@ - layout2 + tqlayout2 @@ -134,7 +134,7 @@ - layout4 + tqlayout4 @@ -144,7 +144,7 @@ m_DepthSelector - + 20 20 diff --git a/src/svnfrontend/fronthelpers/cursorstack.h b/src/svnfrontend/fronthelpers/cursorstack.h index cadad9b..4daf061 100644 --- a/src/svnfrontend/fronthelpers/cursorstack.h +++ b/src/svnfrontend/fronthelpers/cursorstack.h @@ -39,7 +39,7 @@ public: * Create instance and changes the application cursor to \a c * \param c cursortype to set. */ - CursorStack(TQt::CursorShape c = TQt::WaitCursor) + CursorStack(TQt::tqCursorShape c = TQt::WaitCursor) { KApplication::setOverrideCursor(TQCursor(c)); } diff --git a/src/svnfrontend/fronthelpers/propertylist.cpp b/src/svnfrontend/fronthelpers/propertylist.cpp index 7dd0d9d..1b9a2d2 100644 --- a/src/svnfrontend/fronthelpers/propertylist.cpp +++ b/src/svnfrontend/fronthelpers/propertylist.cpp @@ -71,7 +71,7 @@ void Propertylist::displayList(const svn::PathPropertiesMapListPtr&propList,bool } } viewport()->setUpdatesEnabled(true); - viewport()->repaint(); + viewport()->tqrepaint(); } void Propertylist::clear() diff --git a/src/svnfrontend/fronthelpers/rangeinput_impl.cpp b/src/svnfrontend/fronthelpers/rangeinput_impl.cpp index 1cd37f6..e21eaca 100644 --- a/src/svnfrontend/fronthelpers/rangeinput_impl.cpp +++ b/src/svnfrontend/fronthelpers/rangeinput_impl.cpp @@ -21,7 +21,7 @@ #include "helpers/sub2qt.h" #include -#include +#include #include #include #include @@ -36,8 +36,8 @@ Rangeinput_impl::Rangeinput_impl(TQWidget *parent, const char *name) m_endRevInput->setRange(0,INT_MAX,1,false); m_startRevInput->setValue(1); m_endRevInput->setValue(1); - m_startDateInput->setDateTime(TQDateTime::currentDateTime ()); - m_stopDateInput->setDateTime(TQDateTime::currentDateTime ()); + m_startDateInput->setDateTime(TQDateTime::tqcurrentDateTime ()); + m_stopDateInput->setDateTime(TQDateTime::tqcurrentDateTime ()); m_stopDateInput->setEnabled(false); m_startDateInput->setEnabled(false); m_stopHeadButton->setChecked(true); @@ -186,8 +186,8 @@ void Rangeinput_impl::setStartOnly(bool theValue) m_startRevBox->setTitle(i18n( "Start with revision" )); } updateGeometry(); - setMinimumSize(minimumSizeHint()); - resize( TQSize(397, 272).expandedTo(minimumSizeHint()) ); + setMinimumSize(tqminimumSizeHint()); + resize( TQSize(397, 272).expandedTo(tqminimumSizeHint()) ); } #include "rangeinput_impl.moc" diff --git a/src/svnfrontend/graphtree/revgraphview.cpp b/src/svnfrontend/graphtree/revgraphview.cpp index 89d36f7..bb2bb3c 100644 --- a/src/svnfrontend/graphtree/revgraphview.cpp +++ b/src/svnfrontend/graphtree/revgraphview.cpp @@ -412,28 +412,28 @@ const TQString&RevGraphView::getLabelstring(const TQString&nodeName) TQString res; switch (it1.data().Action) { case 'D': - res = i18n("Deleted at revision %1").arg(it1.data().rev); + res = i18n("Deleted at revision %1").tqarg(it1.data().rev); break; case 'A': res = i18n("Added at revision %1 as %2") - .arg(it1.data().rev) - .arg(it1.data().name); + .tqarg(it1.data().rev) + .tqarg(it1.data().name); break; case 'C': case 1: - res = i18n("Copied to %1 at revision %2").arg(it1.data().name).arg(it1.data().rev); + res = i18n("Copied to %1 at revision %2").tqarg(it1.data().name).tqarg(it1.data().rev); break; case 2: - res = i18n("Renamed to %1 at revision %2").arg(it1.data().name).arg(it1.data().rev); + res = i18n("Renamed to %1 at revision %2").tqarg(it1.data().name).tqarg(it1.data().rev); break; case 'M': - res = i18n("Modified at revision %1").arg(it1.data().rev); + res = i18n("Modified at revision %1").tqarg(it1.data().rev); break; case 'R': - res = i18n("Replaced at revision %1").arg(it1.data().rev); + res = i18n("Replaced at revision %1").tqarg(it1.data().rev); break; default: - res=i18n("Revision %1").arg(it1.data().rev); + res=i18n("Revision %1").tqarg(it1.data().rev); break; } m_LabelMap[nodeName]=res; @@ -450,7 +450,7 @@ void RevGraphView::dumpRevtree() TQTextStream* stream = dotTmpFile->textStream(); if (!stream) { - showText(i18n("Could not open tempfile %1 for writing.").arg(dotTmpFile->name())); + showText(i18n("Could not open tempfile %1 for writing.").tqarg(dotTmpFile->name())); return; } @@ -481,7 +481,7 @@ void RevGraphView::dumpRevtree() for (it1=m_Tree.begin();it1!=m_Tree.end();++it1) { *stream << " " << it1.key() << "[ " - << "shape=box, " + << "tqshape=box, " << "label=\""<start(KProcess::NotifyOnExit,KProcess::Stdout)) { TQString arguments; for (unsigned c=0;cargs().count();++c) { - arguments+=TQString(" %1").arg(renderProcess->args()[c].data()); + arguments+=TQString(" %1").tqarg(renderProcess->args()[c].data()); } - TQString error = i18n("Could not start process \"%1\".").arg(arguments); + TQString error = i18n("Could not start process \"%1\".").tqarg(arguments); showText(error); renderProcess=0; //delete renderProcess;< @@ -542,19 +542,19 @@ TQString RevGraphView::toolTip(const TQString&_nodename,bool full)const res = TQString(""); if (!full) { - res+=TQString("%1").arg(it.data().name); + res+=TQString("%1").tqarg(it.data().name); res += i18n("
Revision: %1
Author: %2
Date: %3
Log: %4") - .arg(it.data().rev) - .arg(it.data().Author) - .arg(it.data().Date) - .arg(sm); + .tqarg(it.data().rev) + .tqarg(it.data().Author) + .tqarg(it.data().Date) + .tqarg(sm); } else { res+=""; res+=rstart; - res+=i18n("Revision%1%2%3").arg(csep).arg(it.data().rev).arg(rend); - res+=rstart+i18n("Author%1%2%3").arg(csep).arg(it.data().Author).arg(rend); - res+=rstart+i18n("Date%1%2%3").arg(csep).arg(it.data().Date).arg(rend); - res+=rstart+i18n("Log%1%2%3").arg(csep).arg(sm).arg(rend); + res+=i18n("Revision%1%2%3").tqarg(csep).tqarg(it.data().rev).tqarg(rend); + res+=rstart+i18n("Author%1%2%3").tqarg(csep).tqarg(it.data().Author).tqarg(rend); + res+=rstart+i18n("Date%1%2%3").tqarg(csep).tqarg(it.data().Date).tqarg(rend); + res+=rstart+i18n("Log%1%2%3").tqarg(csep).tqarg(sm).tqarg(rend); res+="
"+it.data().name+"
"; } return res; diff --git a/src/svnfrontend/graphtree/revisiontree.cpp b/src/svnfrontend/graphtree/revisiontree.cpp index 152a2b7..335994e 100644 --- a/src/svnfrontend/graphtree/revisiontree.cpp +++ b/src/svnfrontend/graphtree/revisiontree.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #define INTERNALCOPY 1 @@ -104,13 +104,13 @@ bool RtreeData::getLogs(const TQString&reposRoot,const svn::Revision&startr,cons } else if (Kdesvnsettings::network_on()) { m_Client->log(reposRoot,endr,startr,m_OldHistory,startr,true,false,0); } else { - KMessageBox::error(0,i18n("Could not retrieve logs, reason:\n%1").arg(i18n("No logcache possible due broken database and networking not allowed."))); + KMessageBox::error(0,i18n("Could not retrieve logs, reason:\n%1").tqarg(i18n("No logcache possible due broken database and networking not allowed."))); return false; } } } catch (const svn::Exception&ce) { kdDebug()<progress=new KProgressDialog( - parent,"progressdlg",i18n("Scanning logs"),i18n("Scanning the logs for %1").arg(origin),true); + parent,"progressdlg",i18n("Scanning logs"),i18n("Scanning the logs for %1").tqarg(origin),true); m_Data->progress->setMinimumDuration(100); m_Data->progress->show(); m_Data->progress->setAllowCancel(true); @@ -237,7 +237,7 @@ bool RevisionTree::topDownScan() break; } label = i18n("%1
Check change entry %2 of %3") - .arg(olabel).arg(i).arg(m_Data->m_OldHistory[j].changedPaths.count()); + .tqarg(olabel).tqarg(i).tqarg(m_Data->m_OldHistory[j].changedPaths.count()); m_Data->progress->setLabel(label); kapp->processEvents(); } @@ -278,7 +278,7 @@ bool RevisionTree::topDownScan() cancel=true; break; } - label = i18n("%1
Check change entry %2 of %3").arg(olabel).arg(i).arg(m_Data->m_OldHistory[j].changedPaths.count()); + label = i18n("%1
Check change entry %2 of %3").tqarg(olabel).tqarg(i).tqarg(m_Data->m_OldHistory[j].changedPaths.count()); m_Data->progress->setLabel(label); kapp->processEvents(); } @@ -331,7 +331,7 @@ bool RevisionTree::topDownScan() cancel=true; break; } - label = i18n("%1
Check change entry %2 of %3").arg(olabel).arg(i).arg(m_Data->m_OldHistory[j].changedPaths.count()); + label = i18n("%1
Check change entry %2 of %3").tqarg(olabel).tqarg(i).tqarg(m_Data->m_OldHistory[j].changedPaths.count()); m_Data->progress->setLabel(label); kapp->processEvents(); } @@ -364,7 +364,7 @@ static TQString uniqueNodeName(long rev,const TQString&path) res.replace("\"","_quot_"); res.replace(" ","_space_"); TQString n; n.sprintf("%05ld",rev); - res = "\""+n+TQString("_%1\"").arg(res); + res = "\""+n+TQString("_%1\"").tqarg(res); return res; } diff --git a/src/svnfrontend/graphtree/revtreewidget.cpp b/src/svnfrontend/graphtree/revtreewidget.cpp index 171e688..2652e3c 100644 --- a/src/svnfrontend/graphtree/revtreewidget.cpp +++ b/src/svnfrontend/graphtree/revtreewidget.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include "revgraphview.h" @@ -44,7 +44,7 @@ RevTreeWidget::RevTreeWidget(TQObject*lt,svn::Client*cl, TQWidget* parent, const m_Splitter->setOrientation( Qt::Vertical ); m_RevGraphView = new RevGraphView(lt,cl, m_Splitter, "m_RevGraphView" ); - m_RevGraphView->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 2, m_RevGraphView->sizePolicy().hasHeightForWidth() ) ); + m_RevGraphView->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 2, m_RevGraphView->sizePolicy().hasHeightForWidth() ) ); connect(m_RevGraphView,TQT_SIGNAL(dispDetails(const TQString&)),this,TQT_SLOT(setDetailText(const TQString&))); connect(m_RevGraphView, TQT_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), @@ -63,10 +63,10 @@ RevTreeWidget::RevTreeWidget(TQObject*lt,svn::Client*cl, TQWidget* parent, const ); m_Detailstext = new KTextBrowser( m_Splitter, "m_Detailstext" ); - m_Detailstext->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, m_Detailstext->sizePolicy().hasHeightForWidth() ) ); + m_Detailstext->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, m_Detailstext->sizePolicy().hasHeightForWidth() ) ); m_Detailstext->setResizePolicy( KTextBrowser::Manual ); RevTreeWidgetLayout->addWidget( m_Splitter ); - resize( TQSize(600, 480).expandedTo(minimumSizeHint()) ); + resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); TQValueList list = Kdesvnsettings::tree_detail_height(); if (list.count()==2 && (list[0]>0||list[1]>0)) { diff --git a/src/svnfrontend/hotcopydlg.ui b/src/svnfrontend/hotcopydlg.ui index 6dd3193..a226642 100644 --- a/src/svnfrontend/hotcopydlg.ui +++ b/src/svnfrontend/hotcopydlg.ui @@ -18,7 +18,7 @@ - layout2 + tqlayout2 @@ -31,7 +31,7 @@ Destination folder: - + AlignVCenter|AlignRight @@ -58,7 +58,7 @@ Repository to copy: - + WordBreak|AlignVCenter|AlignRight diff --git a/src/svnfrontend/importdir_logmsg.cpp b/src/svnfrontend/importdir_logmsg.cpp index 62637e8..5d3d113 100644 --- a/src/svnfrontend/importdir_logmsg.cpp +++ b/src/svnfrontend/importdir_logmsg.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include @@ -81,7 +81,7 @@ bool Importdir_logmsg::createDir() void Importdir_logmsg::createDirboxDir(const TQString & which) { - m_createDirBox->setText(i18n("Create subdir %1 on import").arg(which.isEmpty()?i18n("(Last part)"):which)); + m_createDirBox->setText(i18n("Create subdir %1 on import").tqarg(which.isEmpty()?i18n("(Last part)"):which)); } #include "importdir_logmsg.moc" diff --git a/src/svnfrontend/itemdisplay.cpp b/src/svnfrontend/itemdisplay.cpp index 1d60730..fb8795b 100644 --- a/src/svnfrontend/itemdisplay.cpp +++ b/src/svnfrontend/itemdisplay.cpp @@ -82,13 +82,13 @@ bool ItemDisplay::filterOut(const SvnItem*item) /*! - \fn ItemDisplay::filterOut(const svn::Status&) + \fn ItemDisplay::filterOut(const svn::tqStatus&) */ bool ItemDisplay::filterOut(const svn::StatusPtr&item) { bool res = false; - if (!item->validReposStatus()) { + if (!item->validRepostqStatus()) { if ((!Kdesvnsettings::display_unknown_files() && !item->isVersioned()) || (Kdesvnsettings::hide_unchanged_files() && item->isRealVersioned() && !item->isModified() && !item->entry().isDir())) { res = true; diff --git a/src/svnfrontend/itemdisplay.h b/src/svnfrontend/itemdisplay.h index 2c3ffbc..f4d1f28 100644 --- a/src/svnfrontend/itemdisplay.h +++ b/src/svnfrontend/itemdisplay.h @@ -32,7 +32,7 @@ class SvnItem; namespace svn { - class Status; + class tqStatus; } class ItemDisplay diff --git a/src/svnfrontend/loaddmpdlg.ui b/src/svnfrontend/loaddmpdlg.ui index 470a266..0c4070c 100644 --- a/src/svnfrontend/loaddmpdlg.ui +++ b/src/svnfrontend/loaddmpdlg.ui @@ -18,7 +18,7 @@ - layout9 + tqlayout9 @@ -31,7 +31,7 @@ Load into folder: - + AlignVCenter|AlignRight @@ -48,7 +48,7 @@ Dump file: - + AlignVCenter|AlignRight @@ -64,7 +64,7 @@ Load into repository: - + AlignVCenter|AlignRight diff --git a/src/svnfrontend/merge_dlg.ui b/src/svnfrontend/merge_dlg.ui index 547b07b..82aea40 100644 --- a/src/svnfrontend/merge_dlg.ui +++ b/src/svnfrontend/merge_dlg.ui @@ -21,7 +21,7 @@ - layout5 + tqlayout5 @@ -29,7 +29,7 @@ - layout6 + tqlayout6 @@ -52,7 +52,7 @@ Source 1: - + AlignVCenter|AlignRight @@ -68,7 +68,7 @@ Source 2: - + AlignVCenter|AlignRight @@ -79,7 +79,7 @@ Output to: - + AlignVCenter|AlignRight @@ -87,7 +87,7 @@ - layout4 + tqlayout4 @@ -145,7 +145,7 @@ m_RangeInput - + 40 40 diff --git a/src/svnfrontend/mergedlg_impl.cpp b/src/svnfrontend/mergedlg_impl.cpp index b0c1d87..44a07c5 100644 --- a/src/svnfrontend/mergedlg_impl.cpp +++ b/src/svnfrontend/mergedlg_impl.cpp @@ -53,7 +53,7 @@ MergeDlg_impl::MergeDlg_impl(TQWidget *parent, const char *name,bool src1,bool s m_OutLabel->hide(); } adjustSize(); - setMinimumSize(minimumSizeHint()); + setMinimumSize(tqminimumSizeHint()); m_useExternMerge->setChecked(Kdesvnsettings::extern_merge_default()); } @@ -190,7 +190,7 @@ bool MergeDlg_impl::getMergeRange(Rangeinput_impl::revision_range&range,bool*for dlg.setHelp("merging-items","tdesvn"); TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); ptr = new MergeDlg_impl(Dialog1Layout,"merge_range_dlg",false,false,false); - dlg.resize( TQSize(480,360).expandedTo(dlg.minimumSizeHint()) ); + dlg.resize( TQSize(480,360).expandedTo(dlg.tqminimumSizeHint()) ); if (dlg.exec()!=TQDialog::Accepted) { return false; } diff --git a/src/svnfrontend/propertiesdlg.cpp b/src/svnfrontend/propertiesdlg.cpp index 717b0c2..ec1f24d 100644 --- a/src/svnfrontend/propertiesdlg.cpp +++ b/src/svnfrontend/propertiesdlg.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/svnfrontend/stopdlg.cpp b/src/svnfrontend/stopdlg.cpp index 305d5d6..e67d126 100644 --- a/src/svnfrontend/stopdlg.cpp +++ b/src/svnfrontend/stopdlg.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -49,15 +49,15 @@ StopDlg::StopDlg(TQObject*listener,TQWidget *parent, const char *name,const TQSt mCancelText = actionButton(KDialogBase::Cancel)->text(); TQFrame* mainWidget = plainPage(); - layout = new TQVBoxLayout(mainWidget, 10); + tqlayout = new TQVBoxLayout(mainWidget, 10); mLabel = new TQLabel(text, mainWidget); - layout->addWidget(mLabel); + tqlayout->addWidget(mLabel); m_ProgressBar=new KProgress(15,mainWidget); m_ProgressBar->setCenterIndicator (false); m_ProgressBar->setTextEnabled(false); - layout->addWidget(m_ProgressBar); + tqlayout->addWidget(m_ProgressBar); m_NetBar = new KProgress(15,mainWidget); - layout->addWidget(m_NetBar); + tqlayout->addWidget(m_NetBar); mWait = false; m_LogWindow = 0; @@ -162,9 +162,9 @@ void StopDlg::slotExtraMessage(const TQString&msg) if (!m_LogWindow) { TQFrame* mainWidget = plainPage(); m_LogWindow = new KTextBrowser(mainWidget); - layout->addWidget(m_LogWindow); + tqlayout->addWidget(m_LogWindow); m_LogWindow->show(); - resize( TQSize(500, 400).expandedTo(minimumSizeHint()) ); + resize( TQSize(500, 400).expandedTo(tqminimumSizeHint()) ); } if (m_lastLogLines >= Kdesvnsettings::self()->cmdline_log_minline() && isHidden() ) { @@ -184,11 +184,11 @@ void StopDlg::slotNetProgres(long long int current, long long int max) TQString s1 = helpers::ByteToString()(current); if (max > -1 && max != m_NetBar->totalSteps()) { TQString s2 = helpers::ByteToString()(max); - m_NetBar->setFormat(i18n("%1 of %2").arg(s1).arg(s2)); + m_NetBar->setFormat(i18n("%1 of %2").tqarg(s1).tqarg(s2)); m_NetBar->setTotalSteps(max); } if (max == -1) { - m_NetBar->setFormat(i18n("%1 transferred.").arg(s1)); + m_NetBar->setFormat(i18n("%1 transferred.").tqarg(s1)); m_NetBar->setTotalSteps(current+1); } m_NetBar->setValue(current); diff --git a/src/svnfrontend/stopdlg.h b/src/svnfrontend/stopdlg.h index 635957f..973d30e 100644 --- a/src/svnfrontend/stopdlg.h +++ b/src/svnfrontend/stopdlg.h @@ -62,7 +62,7 @@ protected: bool m_netBarShown; TQTime m_StopTick; KTextBrowser*m_LogWindow; - TQVBoxLayout*layout; + TQVBoxLayout*tqlayout; TQString m_lastLog; unsigned int m_lastLogLines; diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp index 6374ac5..6e102ea 100644 --- a/src/svnfrontend/svnactions.cpp +++ b/src/svnfrontend/svnactions.cpp @@ -78,10 +78,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include #include @@ -442,7 +442,7 @@ void SvnActions::makeTree(const TQString&what,const svn::Revision&_rev,const svn } kdDebug()<<"Logs for "<m_ParentList->realWidget(),"historylist",true,i18n("History of %1").arg(info.url().mid(reposRoot.length())), + KDialogBase dlg(m_Data->m_ParentList->realWidget(),"historylist",true,i18n("History of %1").tqarg(info.url().mid(reposRoot.length())), KDialogBase::Ok, KDialogBase::Ok,true); TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); @@ -599,7 +599,7 @@ void SvnActions::slotMakeCat(const svn::Revision&start, const TQString&what, con TQByteArray co = file.readAll(); if (co.size()) { - KDialogBase*dlg = createDialog(&ptr,TQString(i18n("Content of %1")).arg(disp),false,"cat_display_dlg"); + KDialogBase*dlg = createDialog(&ptr,TQString(i18n("Content of %1")).tqarg(disp),false,"cat_display_dlg"); if (dlg) { ptr->setFont(KGlobalSettings::fixedFont()); ptr->setWordWrap(TQTextEdit::NoWrap); @@ -791,7 +791,7 @@ TQString SvnActions::getInfo(const TQString& _what,const svn::Revision&rev,const text+=rb+i18n("Lock comment")+cs+ (*it).lockEntry().Comment()+re; } else { - svn::SharedPointer d; + svn::SharedPointer d; if (checkReposLockCache(_what,d)&& d && d->lockEntry().Locked()) { text+=rb+i18n("Lock token")+cs+(d->lockEntry().Token())+re; text+=rb+i18n("Owner")+cs+(d->lockEntry().Owner())+re; @@ -876,7 +876,7 @@ void SvnActions::slotProperties() TQValueList delList; dlg.changedItems(setList,delList); changeProperties(setList,delList,k->fullName()); - k->refreshStatus(); + k->refreshtqStatus(); EMIT_FINISHED; } @@ -972,18 +972,18 @@ bool SvnActions::makeCommit(const svn::Targets&targets) for (unsigned int i = 0; i < _Cache.count();++i) { _p = _Cache[i]->path(); if (_Cache[i]->isRealVersioned()&& ( - _Cache[i]->textStatus()==svn_wc_status_modified|| - _Cache[i]->textStatus()==svn_wc_status_added|| - _Cache[i]->textStatus()==svn_wc_status_replaced|| - _Cache[i]->textStatus()==svn_wc_status_deleted|| - _Cache[i]->propStatus()==svn_wc_status_modified + _Cache[i]->texttqStatus()==svn_wc_status_modified|| + _Cache[i]->texttqStatus()==svn_wc_status_added|| + _Cache[i]->texttqStatus()==svn_wc_status_replaced|| + _Cache[i]->texttqStatus()==svn_wc_status_deleted|| + _Cache[i]->proptqStatus()==svn_wc_status_modified ) ) { - if (_Cache[i]->textStatus()==svn_wc_status_deleted) { + if (_Cache[i]->texttqStatus()==svn_wc_status_deleted) { _check.append(Logmsg_impl::logActionEntry(_p,i18n("Delete"),Logmsg_impl::logActionEntry::DELETE)); } else { _check.append(Logmsg_impl::logActionEntry(_p,i18n("Commit"),Logmsg_impl::logActionEntry::COMMIT)); } - } else if (_Cache[i]->textStatus()==svn_wc_status_missing) { + } else if (_Cache[i]->texttqStatus()==svn_wc_status_missing) { _uncheck.append(Logmsg_impl::logActionEntry(_p,i18n("Delete and Commit"),Logmsg_impl::logActionEntry::MISSING_DELETE)); } else if (!_Cache[i]->isVersioned()) { _uncheck.append(Logmsg_impl::logActionEntry(_p,i18n("Add and Commit"),Logmsg_impl::logActionEntry::ADD_COMMIT)); @@ -1031,7 +1031,7 @@ bool SvnActions::makeCommit(const svn::Targets&targets) return false; } EMIT_REFRESH; - emit sendNotify(i18n("Committed revision %1.").arg(nnum.toString())); + emit sendNotify(i18n("Committed revision %1.").tqarg(nnum.toString())); return true; } @@ -1232,7 +1232,7 @@ void SvnActions::makeDiffinternal(const TQString&p1,const svn::Revision&r1,const TQByteArray ex; KTempDir tdir; tdir.setAutoDelete(true); - TQString tn = TQString("%1/%2").arg(tdir.name()).arg("/svndiff"); + TQString tn = TQString("%1/%2").tqarg(tdir.name()).tqarg("/svndiff"); bool ignore_content = Kdesvnsettings::diff_ignore_content(); TQWidget*parent = p?p:m_Data->m_ParentList->realWidget(); TQStringList extraOptions; @@ -1296,7 +1296,7 @@ void SvnActions::makeNorecDiff(const TQString&p1,const svn::Revision&r1,const TQ KTempDir tdir; tdir.setAutoDelete(true); kdDebug()<<"Non recourse diff"<m_SvnContextListener,_p?_p:m_Data->m_ParentList->realWidget(),0,"Diffing","Diffing - hit cancel for abort"); @@ -1458,8 +1458,8 @@ void SvnActions::prepareUpdate(bool ask) return; } rdlg->setStartOnly(true); - /* just here cause layout has changed meanwhile */ - dlg->resize( TQSize(120,60).expandedTo(dlg->minimumSizeHint()) ); + /* just here cause tqlayout has changed meanwhile */ + dlg->resize( TQSize(120,60).expandedTo(dlg->tqminimumSizeHint()) ); int result; if ((result=dlg->exec())==TQDialog::Accepted) { Rangeinput_impl::revision_range range = rdlg->getRange(); @@ -1511,7 +1511,7 @@ void SvnActions::makeAdd(bool rec) ++liter; if (cur->isVersioned()) { KMessageBox::error(m_Data->m_ParentList->realWidget(),i18n("
The entry
%1
is versioned - break.
") - .arg(cur->fullName())); + .tqarg(cur->fullName())); return; } items.push_back(svn::Path(cur->fullName())); @@ -1521,7 +1521,7 @@ void SvnActions::makeAdd(bool rec) #if 0 while ((cur=liter.current())!=0){ ++liter; - //cur->refreshStatus(); + //cur->refreshtqStatus(); //emit sigRefreshCurrent(static_cast(cur->parent())); } @@ -1721,7 +1721,7 @@ void SvnActions::slotRevert() while ((cur=liter.current())!=0){ if (!cur->isVersioned()) { KMessageBox::error(m_Data->m_ParentList->realWidget(),i18n("
The entry
%1
is not versioned - break.
") - .arg(cur->fullName())); + .tqarg(cur->fullName())); return; } displist.append(cur->fullName()); @@ -2178,7 +2178,7 @@ bool SvnActions::makeMove(const TQString&Old,const TQString&New,bool force) return false; } if (nnum != svn::Revision::UNDEFINED) { - emit sendNotify(i18n("Committed revision %1.").arg(nnum.toString())); + emit sendNotify(i18n("Committed revision %1.").tqarg(nnum.toString())); } EMIT_REFRESH; return true; @@ -2295,15 +2295,15 @@ void SvnActions::makeUnlock(const TQStringList&what,bool breakit) /*! - \fn SvnActions::makeStatus(const TQString&what, svn::StatusEntries&dlist) + \fn SvnActions::maketqStatus(const TQString&what, svn::StatusEntries&dlist) */ -bool SvnActions::makeStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where,bool rec,bool all) +bool SvnActions::maketqStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where,bool rec,bool all) { bool display_ignores = Kdesvnsettings::display_ignored_files(); - return makeStatus(what,dlist,where,rec,all,display_ignores); + return maketqStatus(what,dlist,where,rec,all,display_ignores); } -bool SvnActions::makeStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where,bool rec,bool all,bool display_ignores,bool updates) +bool SvnActions::maketqStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where,bool rec,bool all,bool display_ignores,bool updates) { bool disp_remote_details = Kdesvnsettings::details_on_remote_listing(); TQString ex; @@ -2326,7 +2326,7 @@ void SvnActions::checkAddItems(const TQString&path,bool print_error_box) svn::StatusEntries rlist; TQStringList displist; svn::Revision where = svn::Revision::HEAD; - if (!makeStatus(path,dlist,where,true,true,false,false)) { + if (!maketqStatus(path,dlist,where,true,true,false,false)) { return; } for (unsigned int i = 0; igetList().count();++i) { svn::StatusPtr ptr = m_CThread->getList()[i]; if (m_CThread->getList()[i]->isRealVersioned()&& ( - m_CThread->getList()[i]->textStatus()==svn_wc_status_modified|| - m_CThread->getList()[i]->textStatus()==svn_wc_status_added|| - m_CThread->getList()[i]->textStatus()==svn_wc_status_deleted|| - m_CThread->getList()[i]->textStatus()==svn_wc_status_replaced|| - m_CThread->getList()[i]->propStatus()==svn_wc_status_modified + m_CThread->getList()[i]->texttqStatus()==svn_wc_status_modified|| + m_CThread->getList()[i]->texttqStatus()==svn_wc_status_added|| + m_CThread->getList()[i]->texttqStatus()==svn_wc_status_deleted|| + m_CThread->getList()[i]->texttqStatus()==svn_wc_status_replaced|| + m_CThread->getList()[i]->proptqStatus()==svn_wc_status_modified ) ) { m_Data->m_Cache.insertKey(ptr,ptr->path()); - } else if (m_CThread->getList()[i]->textStatus()==svn_wc_status_conflicted) { + } else if (m_CThread->getList()[i]->texttqStatus()==svn_wc_status_conflicted) { m_Data->m_conflictCache.insertKey(ptr,ptr->path()); } } @@ -2478,11 +2478,11 @@ void SvnActions::checkUpdateThread() bool newer=false; for (unsigned int i = 0; i < m_UThread->getList().count();++i) { svn::StatusPtr ptr = m_UThread->getList()[i]; - if (ptr->validReposStatus()) { + if (ptr->validRepostqStatus()) { m_Data->m_UpdateCache.insertKey(ptr,ptr->path()); - ptr->textStatus(); - ptr->propStatus(); - if (!(ptr->validLocalStatus())) { + ptr->texttqStatus(); + ptr->proptqStatus(); + if (!(ptr->validLocaltqStatus())) { newer = true; } } @@ -2514,7 +2514,7 @@ bool SvnActions::checkUpdatesRunning() void SvnActions::addModifiedCache(const svn::StatusPtr&what) { - if (what->textStatus()==svn_wc_status_conflicted) { + if (what->texttqStatus()==svn_wc_status_conflicted) { m_Data->m_conflictCache.insertKey(what,what->path()); } else { m_Data->m_Cache.insertKey(what,what->path()); @@ -2539,9 +2539,9 @@ bool SvnActions::checkReposLockCache(const TQString&path) return m_Data->m_repoLockCache.findSingleValid(path,false); } -bool SvnActions::checkReposLockCache(const TQString&path,svn::SharedPointer&t) +bool SvnActions::checkReposLockCache(const TQString&path,svn::SharedPointer&t) { - /// @todo create a method where svn::Status* will be a parameter so no copy is needed but just reading content + /// @todo create a method where svn::tqStatus* will be a parameter so no copy is needed but just reading content return m_Data->m_repoLockCache.findSingleValid(path,t); } @@ -2599,7 +2599,7 @@ void SvnActions::customEvent(TQCustomEvent * e) return; } else if (e&&e->type()==EVENT_LOGCACHE_STATUS && m_FCThread && m_FCThread->running()) { FillCacheStatusEvent*fev=(FillCacheStatusEvent*)e; - emit sigCacheStatus(fev->current(),fev->max()); + emit sigCachetqStatus(fev->current(),fev->max()); } } @@ -2638,11 +2638,11 @@ void SvnActions::removeFromUpdateCache(const TQStringList&what,bool exact_only) bool SvnActions::isUpdated(const TQString&path)const { - svn::SharedPointer d; + svn::SharedPointer d; return m_Data->m_UpdateCache.findSingleValid(path,d); } -bool SvnActions::getUpdated(const TQString&path,svn::SharedPointer&d)const +bool SvnActions::getUpdated(const TQString&path,svn::SharedPointer&d)const { return m_Data->m_UpdateCache.findSingleValid(path,d); } diff --git a/src/svnfrontend/svnactions.h b/src/svnfrontend/svnactions.h index dc7645a..02f0bcb 100644 --- a/src/svnfrontend/svnactions.h +++ b/src/svnfrontend/svnactions.h @@ -95,15 +95,15 @@ public: void makeLock(const TQStringList&,const TQString&,bool); void makeUnlock(const TQStringList&,bool); - bool makeStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where, bool rec=false,bool all=true); - bool makeStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where, bool rec,bool all,bool display_ignored,bool updates=false); + bool maketqStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where, bool rec=false,bool all=true); + bool maketqStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where, bool rec,bool all,bool display_ignored,bool updates=false); bool makeList(const TQString&url,svn::DirEntries&dlist,svn::Revision&where,bool rec=false); bool createModifiedCache(const TQString&base); bool checkModifiedCache(const TQString&path); bool checkConflictedCache(const TQString&path); bool checkReposLockCache(const TQString&path); - bool checkReposLockCache(const TQString&path,svn::SharedPointer&t); + bool checkReposLockCache(const TQString&path,svn::SharedPointer&t); void addModifiedCache(const svn::StatusPtr&what); void deleteFromModifiedCache(const TQString&what); @@ -152,7 +152,7 @@ public: bool createUpdateCache(const TQString&what); bool checkUpdateCache(const TQString&path)const; bool isUpdated(const TQString&path)const; - bool getUpdated(const TQString&path,svn::SharedPointer&d)const; + bool getUpdated(const TQString&path,svn::SharedPointer&d)const; void clearUpdateCache(); void removeFromUpdateCache(const TQStringList&what,bool exact_only); void stopCheckModThread(); @@ -242,7 +242,7 @@ signals: void sigRefreshIcons(bool); void sigExtraLogMsg(const TQString&); void sigGotourl(const TQString&); - void sigCacheStatus(TQ_LONG,TQ_LONG); + void sigCachetqStatus(TQ_LONG,TQ_LONG); protected slots: virtual void wroteStdin(KProcess*); diff --git a/src/svnfrontend/svnfiletip.cpp b/src/svnfrontend/svnfiletip.cpp index bf772e8..3619f7e 100644 --- a/src/svnfrontend/svnfiletip.cpp +++ b/src/svnfrontend/svnfiletip.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include @@ -46,12 +46,12 @@ SvnFileTip::SvnFileTip(TQScrollView*parent) { m_iconLabel = new TQLabel(this); m_textLabel = new TQLabel(this); - m_textLabel->setAlignment(TQt::AlignAuto | TQt::AlignTop); + m_textLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignTop); - TQGridLayout* layout = new TQGridLayout(this, 1, 2, 8, 0); - layout->addWidget(m_iconLabel, 0, 0); - layout->addWidget(m_textLabel, 0, 1); - layout->setResizeMode(TQLayout::Fixed); + TQGridLayout* tqlayout = new TQGridLayout(this, 1, 2, 8, 0); + tqlayout->addWidget(m_iconLabel, 0, 0); + tqlayout->addWidget(m_textLabel, 0, 1); + tqlayout->setResizeMode(TQLayout::Fixed); setPalette( TQToolTip::palette() ); setMargin( 1 ); @@ -190,7 +190,7 @@ void SvnFileTip::drawContents( TQPainter *p ) } if ( m_corners[m_corner].isNull()) - m_corners[m_corner].load( locate( "data", TQString::fromLatin1( "konqueror/pics/%1.png" ).arg( names[m_corner] ) ) ); + m_corners[m_corner].load( locate( "data", TQString::tqfromLatin1( "konqueror/pics/%1.png" ).tqarg( names[m_corner] ) ) ); TQPixmap &pix = m_corners[m_corner]; diff --git a/src/svnfrontend/svnitem.cpp b/src/svnfrontend/svnitem.cpp index dee0435..55015a3 100644 --- a/src/svnfrontend/svnitem.cpp +++ b/src/svnfrontend/svnitem.cpp @@ -68,7 +68,7 @@ protected: }; SvnItem_p::SvnItem_p() - :ref_count(),m_Stat(new svn::Status()) + :ref_count(),m_Stat(new svn::tqStatus()) { init(); } @@ -238,11 +238,11 @@ TQPixmap SvnItem::getPixmap(const TQPixmap&_p,int size,bool overlay) SvnActions*wrap = getWrapper(); bool mod = false; TQPixmap p2 = TQPixmap(); - if (p_Item->m_Stat->textStatus()==svn_wc_status_conflicted) { + if (p_Item->m_Stat->texttqStatus()==svn_wc_status_conflicted) { m_bgColor = CONFLICT; if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnconflicted",KIcon::Desktop,size); - } else if (p_Item->m_Stat->textStatus ()==svn_wc_status_missing) { + } else if (p_Item->m_Stat->texttqStatus ()==svn_wc_status_missing) { m_bgColor = MISSING; } else if (isLocked()||wrap->checkReposLockCache(fullName())) { if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnlocked",KIcon::Desktop,size); @@ -253,10 +253,10 @@ TQPixmap SvnItem::getPixmap(const TQPixmap&_p,int size,bool overlay) } else if (wrap->isUpdated(p_Item->m_Stat->path())) { if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnupdates",KIcon::Desktop,size); m_bgColor = UPDATES; - } else if (p_Item->m_Stat->textStatus()==svn_wc_status_deleted) { + } else if (p_Item->m_Stat->texttqStatus()==svn_wc_status_deleted) { if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvndeleted",KIcon::Desktop,size); m_bgColor = DELETED; - } else if (p_Item->m_Stat->textStatus()==svn_wc_status_added ) { + } else if (p_Item->m_Stat->texttqStatus()==svn_wc_status_added ) { if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnadded",KIcon::Desktop,size); m_bgColor = ADDED; } else if (isModified()) { @@ -358,26 +358,26 @@ bool SvnItem::isRealVersioned()const bool SvnItem::isIgnored()const { - return p_Item->m_Stat->textStatus()==svn_wc_status_ignored; + return p_Item->m_Stat->texttqStatus()==svn_wc_status_ignored; } bool SvnItem::isRemoteAdded()const { return getWrapper()->isUpdated(p_Item->m_Stat->path()) && - p_Item->m_Stat->validReposStatus()&&!p_Item->m_Stat->validLocalStatus(); + p_Item->m_Stat->validRepostqStatus()&&!p_Item->m_Stat->validLocaltqStatus(); } TQString SvnItem::infoText()const { TQString info_text = ""; if (getWrapper()->isUpdated(p_Item->m_Stat->path())) { - if (p_Item->m_Stat->validReposStatus()&&!p_Item->m_Stat->validLocalStatus()) { + if (p_Item->m_Stat->validRepostqStatus()&&!p_Item->m_Stat->validLocaltqStatus()) { info_text = i18n("Added in repository"); } else { info_text = i18n("Needs update"); } } else { - switch(p_Item->m_Stat->textStatus ()) { + switch(p_Item->m_Stat->texttqStatus ()) { case svn_wc_status_modified: info_text = i18n("Locally modified"); break; @@ -412,7 +412,7 @@ TQString SvnItem::infoText()const break; } if (info_text.isEmpty()) { - switch (p_Item->m_Stat->propStatus ()) { + switch (p_Item->m_Stat->proptqStatus ()) { case svn_wc_status_modified: info_text = i18n("Property modified"); break; @@ -444,7 +444,7 @@ TQString SvnItem::lockOwner()const if (p_Item->m_Stat->entry().lockEntry().Locked()) { return p_Item->m_Stat->entry().lockEntry().Owner(); } - svn::SharedPointer tmp; + svn::SharedPointer tmp; if (getWrapper()->checkReposLockCache(fullName(),tmp) && tmp) { return tmp->lockEntry().Owner(); } @@ -457,8 +457,8 @@ TQString SvnItem::lockOwner()const */ bool SvnItem::isModified()const { - return p_Item->m_Stat->textStatus ()==svn_wc_status_modified||p_Item->m_Stat->propStatus()==svn_wc_status_modified - ||p_Item->m_Stat->textStatus ()==svn_wc_status_replaced; + return p_Item->m_Stat->texttqStatus ()==svn_wc_status_modified||p_Item->m_Stat->proptqStatus()==svn_wc_status_modified + ||p_Item->m_Stat->texttqStatus ()==svn_wc_status_replaced; } const svn::StatusPtr& SvnItem::stat()const @@ -472,22 +472,22 @@ const svn::StatusPtr& SvnItem::stat()const */ bool SvnItem::isNormal()const { - return p_Item->m_Stat->textStatus()==svn_wc_status_normal; + return p_Item->m_Stat->texttqStatus()==svn_wc_status_normal; } bool SvnItem::isMissing()const { - return p_Item->m_Stat->textStatus()==svn_wc_status_missing; + return p_Item->m_Stat->texttqStatus()==svn_wc_status_missing; } bool SvnItem::isDeleted()const { - return p_Item->m_Stat->textStatus()==svn_wc_status_deleted; + return p_Item->m_Stat->texttqStatus()==svn_wc_status_deleted; } bool SvnItem::isConflicted()const { - return p_Item->m_Stat->textStatus()==svn_wc_status_conflicted; + return p_Item->m_Stat->texttqStatus()==svn_wc_status_conflicted; } /*! diff --git a/src/svnfrontend/svnitem.h b/src/svnfrontend/svnitem.h index 76c2533..11458fa 100644 --- a/src/svnfrontend/svnitem.h +++ b/src/svnfrontend/svnitem.h @@ -68,7 +68,7 @@ public: virtual TQString getParentDir()const=0; virtual SvnItem* getParentItem()const=0; virtual const svn::Revision&correctPeg()const=0; - virtual void refreshStatus(bool childs=false,TQPtrList *exclude = 0,bool depsonly=false)=0; + virtual void refreshtqStatus(bool childs=false,TQPtrList *exclude = 0,bool depsonly=false)=0; TQPixmap getPixmap(int size,bool overlay=true); TQPixmap getPixmap(const TQPixmap&,int size,bool overlay=true); diff --git a/src/svnfrontend/svnlogdlg.ui b/src/svnfrontend/svnlogdlg.ui index 5b1ca1e..1c139cb 100644 --- a/src/svnfrontend/svnlogdlg.ui +++ b/src/svnfrontend/svnlogdlg.ui @@ -21,7 +21,7 @@ - layout5 + tqlayout5 @@ -29,7 +29,7 @@ - layout4 + tqlayout4 @@ -81,7 +81,7 @@ Expanding - + 107 20 @@ -246,7 +246,7 @@ - layout3 + tqlayout3 @@ -321,7 +321,7 @@ Expanding - + 42 20 diff --git a/src/svnfrontend/svnlogdlgimp.cpp b/src/svnfrontend/svnlogdlgimp.cpp index fb14366..a81ce18 100644 --- a/src/svnfrontend/svnlogdlgimp.cpp +++ b/src/svnfrontend/svnlogdlgimp.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include @@ -100,7 +100,7 @@ LogListViewItem::LogListViewItem(KListView*_parent,const svn::LogEntry&_entry) setMultiLinesEnabled(false); _revision=_entry.revision; fullDate=svn::DateTime(_entry.date); - setText(COL_REV,TQString("%1").arg(_revision)); + setText(COL_REV,TQString("%1").tqarg(_revision)); setText(COL_AUTHOR,_entry.author); setText(COL_DATE,helpers::sub2qt::apr_time2qtString(_entry.date)); _message = _entry.message; @@ -154,7 +154,7 @@ LogChangePathItem::LogChangePathItem(KListView*parent,const svn::LogChangePathEn _source = e.copyFromPath; if (e.copyFromRevision>-1) { - setText(2,i18n("%1 at revision %2").arg(e.copyFromPath).arg(e.copyFromRevision)); + setText(2,i18n("%1 at revision %2").tqarg(e.copyFromPath).tqarg(e.copyFromRevision)); } } @@ -262,7 +262,7 @@ void SvnLogDlgImp::dispLog(const svn::SharedPointer&_log,con m_Entries = _log; kdDebug()<<"What: "<screenGeometry(scnum); KConfigGroupSaver cs(Kdesvnsettings::self()->config(), groupName); TQSize sizeToSave = size(); - Kdesvnsettings::self()->config()->writeEntry( TQString::fromLatin1("Width %1").arg( desk.width()), + Kdesvnsettings::self()->config()->writeEntry( TQString::tqfromLatin1("Width %1").tqarg( desk.width()), TQString::number( sizeToSave.width()), true, false); - Kdesvnsettings::self()->config()->writeEntry( TQString::fromLatin1("Height %1").arg( desk.height()), + Kdesvnsettings::self()->config()->writeEntry( TQString::tqfromLatin1("Height %1").tqarg( desk.height()), TQString::number( sizeToSave.height()), true, false); } @@ -455,11 +455,11 @@ TQSize SvnLogDlgImp::dialogSize() int w, h; int scnum = TQApplication::desktop()->screenNumber(parentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); - w = sizeHint().width(); - h = sizeHint().height(); + w = tqsizeHint().width(); + h = tqsizeHint().height(); KConfigGroupSaver cs(Kdesvnsettings::self()->config(), groupName); - w = Kdesvnsettings::self()->config()->readNumEntry( TQString::fromLatin1("Width %1").arg( desk.width()), w ); - h = Kdesvnsettings::self()->config()->readNumEntry( TQString::fromLatin1("Height %1").arg( desk.height()), h ); + w = Kdesvnsettings::self()->config()->readNumEntry( TQString::tqfromLatin1("Width %1").tqarg( desk.width()), w ); + h = Kdesvnsettings::self()->config()->readNumEntry( TQString::tqfromLatin1("Height %1").tqarg( desk.height()), h ); return( TQSize( w, h ) ); } diff --git a/src/svnfrontend/tcontextlistener.cpp b/src/svnfrontend/tcontextlistener.cpp index 486af86..53d7892 100644 --- a/src/svnfrontend/tcontextlistener.cpp +++ b/src/svnfrontend/tcontextlistener.cpp @@ -188,9 +188,9 @@ void ThreadContextListener::contextProgress(long long int current, long long int TQString s1 = helpers::ByteToString()(current); if (max>-1) { TQString s2 = helpers::ByteToString()(max); - msg = i18n("%1 of %2 transferred.").arg(s1).arg(s2); + msg = i18n("%1 of %2 transferred.").tqarg(s1).tqarg(s2); } else { - msg = i18n("%1 transferred.").arg(s1); + msg = i18n("%1 transferred.").tqarg(s1); } _notify->msg = msg; ev->setData((void*)_notify); diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp index 23563fd..131ea18 100644 --- a/src/svnfrontend/tdesvnfilelist.cpp +++ b/src/svnfrontend/tdesvnfilelist.cpp @@ -65,7 +65,7 @@ #include #include #include -#include +#include #include #include #include @@ -235,7 +235,7 @@ tdesvnfilelist::tdesvnfilelist(KActionCollection*aCollect,TQWidget *parent, cons this,TQT_SLOT(slotDropped(TQDropEvent*,TQListViewItem*))); connect(m_SvnWrapper,TQT_SIGNAL(sigGotourl(const TQString&)),this,TQT_SLOT(_openURL(const TQString&))); - connect(m_SvnWrapper,TQT_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG)),this,TQT_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG))); + connect(m_SvnWrapper,TQT_SIGNAL(sigCachetqStatus(TQ_LONG,TQ_LONG)),this,TQT_SIGNAL(sigCachetqStatus(TQ_LONG,TQ_LONG))); connect(m_SvnWrapper,TQT_SIGNAL(sigThreadsChanged()),this,TQT_SLOT(enableActions())); m_pList->connectDirTimer(TQT_TQOBJECT(this)); @@ -655,7 +655,7 @@ bool tdesvnfilelist::checkDirs(const TQString&_what,FileListViewItem * _parent) } // prevent this from checking unversioned folder. FIXME: what happen when we do open url on a non-working-copy folder?? if (!isWorkingCopy()|| (!_parent) || ((_parent) && (_parent->isVersioned()))) { - if (!m_SvnWrapper->makeStatus(what,dlist,m_pList->m_remoteRevision) ) { + if (!m_SvnWrapper->maketqStatus(what,dlist,m_pList->m_remoteRevision) ) { kdDebug() << "unable makeStatus" <isVersioned() && !filterOut((*it))) { - // if empty, we may want to create a default svn::Status for each folder inside this _parent + // if empty, we may want to create a default svn::tqStatus for each folder inside this _parent // iterate over TQDir and create new filelistviewitem checkUnversionedDirs(_parent); } @@ -706,7 +706,7 @@ bool tdesvnfilelist::checkDirs(const TQString&_what,FileListViewItem * _parent) if (ownupdates) { kdDebug()<<"Enable update"<setUpdatesEnabled(true); - viewport()->repaint(); + viewport()->tqrepaint(); } return true; } @@ -723,7 +723,7 @@ void tdesvnfilelist::insertDirs(FileListViewItem * _parent,svn::StatusEntries&dl for (it = dlist.begin();it!=dlist.end();++it) { /* if (_t.elapsed()>300) { viewport()->setUpdatesEnabled(true); - viewport()->repaint(); + viewport()->tqrepaint(); viewport()->setUpdatesEnabled(false); _t.restart(); }*/ @@ -756,7 +756,7 @@ void tdesvnfilelist::insertDirs(FileListViewItem * _parent,svn::StatusEntries&dl void tdesvnfilelist::slotDirAdded(const TQString&newdir,FileListViewItem*k) { if (k) { - k->refreshStatus(); + k->refreshtqStatus(); } if (!isWorkingCopy()) { if (k) { @@ -779,7 +779,7 @@ void tdesvnfilelist::slotDirAdded(const TQString&newdir,FileListViewItem*k) } svn::StatusPtr stat; try { - stat = m_SvnWrapper->svnclient()->singleStatus(newdir); + stat = m_SvnWrapper->svnclient()->singletqStatus(newdir); } catch (const svn::ClientException&e) { m_LastException = e.msg(); kdDebug()<<"Catched on singlestatus"<< endl; @@ -1051,7 +1051,7 @@ void tdesvnfilelist::slotClientException(const TQString&what) void tdesvnfilelist::slotNotifyMessage(const TQString&what) { emit sigLogMessage(what); - kapp->processEvents(20); + kapp->tqprocessEvents(20); } void tdesvnfilelist::slotChangeToRepository() @@ -1103,7 +1103,7 @@ void tdesvnfilelist::slotItemDoubleClicked(TQListViewItem*item) } } else { if ( KRun::runCommand(feditor + " " + fki->kdeName(rev).prettyURL()) <= 0) { - KMessageBox::error(this,i18n("Failed: %1 %2").arg(feditor).arg(fki->fullName())); + KMessageBox::error(this,i18n("Failed: %1 %2").tqarg(feditor).tqarg(fki->fullName())); } } } @@ -1115,7 +1115,7 @@ void tdesvnfilelist::slotCleanupAction() if (!which) which = static_cast(firstChild()); if (!which||!which->isDir()) return; if (m_SvnWrapper->makeCleanup(which->fullName())) { - which->refreshStatus(true); + which->refreshtqStatus(true); } } @@ -1126,7 +1126,7 @@ void tdesvnfilelist::slotResolved() if (!which) which = static_cast(firstChild()); if (!which) return; m_SvnWrapper->slotResolved(which->fullName()); - which->refreshStatus(true); + which->refreshtqStatus(true); slotRescanIcons(false); } @@ -1273,7 +1273,7 @@ void tdesvnfilelist::refreshCurrentTree() if (item->fullName()==baseUri()) { if (!refreshItem(item)) { setUpdatesEnabled(true); - viewport()->repaint(); + viewport()->tqrepaint(); return; } else { refreshRecursive(item); @@ -1286,7 +1286,7 @@ void tdesvnfilelist::refreshCurrentTree() } kdDebug()<<"Refresh time: "<repaint(); + viewport()->tqrepaint(); TQTimer::singleShot(1,this,TQT_SLOT(readSupportData())); //m_pList->startScan(); } @@ -1301,7 +1301,7 @@ void tdesvnfilelist::refreshCurrent(SvnItem*cur) setUpdatesEnabled(false); refreshRecursive(cur->fItem()); setUpdatesEnabled(true); - viewport()->repaint(); + viewport()->tqrepaint(); } bool tdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down) @@ -1327,7 +1327,7 @@ bool tdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down) TQString what = (_parent!=0?_parent->fullName():baseUri()); svn::StatusEntries dlist; - if (!m_SvnWrapper->makeStatus(what,dlist,m_pList->m_remoteRevision)) { + if (!m_SvnWrapper->maketqStatus(what,dlist,m_pList->m_remoteRevision)) { kdDebug()<<"Fehler bei makestatus fuer "<fullName()==(*it)->path()) { currentSync.removeRef(k); - k->updateStatus(*it); + k->updatetqStatus(*it); if (filterOut(k)) { dispchanged=true; delete k; @@ -1657,7 +1657,7 @@ void tdesvnfilelist::contentsDragMoveEvent( TQDragMoveEvent* event) if (tmpRect!=m_pList->mOldDropHighlighter) { cleanHighLighter(); m_pList->mOldDropHighlighter=tmpRect; - viewport()->repaint(tmpRect); + viewport()->tqrepaint(tmpRect); kapp->processEvents(); } } @@ -1673,7 +1673,7 @@ void tdesvnfilelist::viewportPaintEvent(TQPaintEvent *ev) KListView::viewportPaintEvent(ev); if (m_pList->mOldDropHighlighter.isValid() && ev->rect().intersects(m_pList->mOldDropHighlighter)) { TQPainter painter(viewport()); - tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, m_pList->mOldDropHighlighter, colorGroup(), + tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, m_pList->mOldDropHighlighter, tqcolorGroup(), TQStyle::Style_FocusAtBorder); } } @@ -1683,7 +1683,7 @@ void tdesvnfilelist::cleanHighLighter() if (m_pList->mOldDropHighlighter.isValid()) { TQRect rect=m_pList->mOldDropHighlighter; m_pList->mOldDropHighlighter=TQRect(); - viewport()->repaint(rect, true); + viewport()->tqrepaint(rect, true); } } @@ -2038,7 +2038,7 @@ void tdesvnfilelist::dispDummy() TQLabel dummy(this,0,WStyle_NoBorder|WShowModal); TQSize csize = size(); dummy.setText(i18n("Please wait until job is finished")); - dummy.resize(dummy.minimumSizeHint()); + dummy.resize(dummy.tqminimumSizeHint()); if (dummy.width()<=width()&&dummy.height()<=height()) { dummy.move(csize.width()/2-dummy.width()/2,csize.height()/2-dummy.height()/2); } @@ -2307,7 +2307,7 @@ void tdesvnfilelist::slotMkBaseDirs() targets.append(parentDir+"/trunk"); targets.append(parentDir+"/branches"); targets.append(parentDir+"/tags"); - TQString msg = i18n("Automatic generated base layout by tdesvn"); + TQString msg = i18n("Automatic generated base tqlayout by tdesvn"); isopen = m_SvnWrapper->makeMkdir(targets,msg); if (isopen) { slotDirAdded(targets[0],0); @@ -2401,9 +2401,9 @@ bool tdesvnfilelist::refreshItem(FileListViewItem*item) return false; } try { - item->setStat(svnclient()->singleStatus(item->fullName(),false,m_pList->m_remoteRevision)); + item->setStat(svnclient()->singletqStatus(item->fullName(),false,m_pList->m_remoteRevision)); } catch (const svn::ClientException&e) { - item->setStat(new svn::Status()); + item->setStat(new svn::tqStatus()); return false; } return true; @@ -2600,7 +2600,7 @@ void tdesvnfilelist::_dirwatchTimeout() m_pList->dirItems.clear(); viewport()->setUpdatesEnabled(true); if (repaintit) { -// viewport()->repaint(); +// viewport()->tqrepaint(); } } @@ -2683,7 +2683,7 @@ void tdesvnfilelist::contentsMouseMoveEvent( TQMouseEvent *e ) FileListViewItem*item = isExecuteArea( vp ) ? static_cast(itemAt( vp )) : 0L; if (item) { - vp.setY( itemRect( item ).y() ); + vp.setY( tqitemRect( item ).y() ); TQRect rect( viewportToContents( vp ), TQSize(20, item->height()) ); m_pList->m_fileTip->setItem( static_cast(item), rect, item->pixmap(0)); m_pList->m_fileTip->setPreview(KGlobalSettings::showFilePreview(item->fullName())/*&&isWorkingCopy()*/ @@ -2758,7 +2758,7 @@ void tdesvnfilelist::slotSettingsChanged() if (m_pList->reReadSettings()) { refreshCurrentTree(); } else { - viewport()->repaint(); + viewport()->tqrepaint(); } enableActions(); sort(); @@ -2783,7 +2783,7 @@ void tdesvnfilelist::slotRelocate() path = k->fullName(); fromUrl = k->Url(); CheckoutInfo_impl*ptr; - KDialogBase * dlg = createDialog(&ptr,i18n("Relocate path %1").arg(path),true,"relocate_dlg"); + KDialogBase * dlg = createDialog(&ptr,i18n("Relocate path %1").tqarg(path),true,"relocate_dlg"); if (dlg) { ptr->setStartUrl(fromUrl); ptr->disableAppend(true); @@ -2839,9 +2839,9 @@ void tdesvnfilelist::checkUnversionedDirs( FileListViewItem * _parent ) // else // entry.kind = svn_node_file; // -// svn::Status stat(fi->fileName(), &wc_stat); +// svn::tqStatus stat(fi->fileName(), &wc_stat); - svn::StatusPtr stat(new svn::Status(fi->absFilePath())); + svn::StatusPtr stat(new svn::tqStatus(fi->absFilePath())); // start copying insertDirs FileListViewItem * item; @@ -2886,13 +2886,13 @@ void tdesvnfilelist::rescanIconsRec(FileListViewItem*startAt,bool checkNewer,boo if (!_s) { return; } - svn::SharedPointer d; + svn::SharedPointer d; while (_s) { //_s->makePixmap(); if (!no_update) { if (m_SvnWrapper->getUpdated(_s->stat()->path(),d) && d) { - _s->updateStatus(d); + _s->updatetqStatus(d); } else { _s->update(); } @@ -3077,7 +3077,7 @@ void tdesvnfilelist::slotUnfoldTree() } if (t.elapsed()>=200) { sdlg.slotTick(); - kapp->processEvents(20); + kapp->tqprocessEvents(20); t.restart(); } ((FileListViewItem*)item)->setOpenNoBlock(true); @@ -3087,8 +3087,8 @@ void tdesvnfilelist::slotUnfoldTree() } setFocus(); setUpdatesEnabled(true); - viewport()->repaint(); - repaint(); + viewport()->tqrepaint(); + tqrepaint(); m_SvnWrapper->slotCancel(false); } @@ -3132,7 +3132,7 @@ void tdesvnfilelist::slotChangeProperties(const svn::PropertiesMap&pm,const TQVa FileListViewItem* which = singleSelected(); kdDebug()<<(which?which->fullName():"nix") << " -> " << path<fullName()==path) { - which->refreshStatus(); + which->refreshtqStatus(); refreshCurrent(which); _propListTimeout(); } diff --git a/src/svnfrontend/tdesvnfilelist.h b/src/svnfrontend/tdesvnfilelist.h index b121138..97cb902 100644 --- a/src/svnfrontend/tdesvnfilelist.h +++ b/src/svnfrontend/tdesvnfilelist.h @@ -190,7 +190,7 @@ signals: void sigUrlChanged(const TQString&); void sigProplist(const svn::PathPropertiesMapListPtr&,bool,const TQString&); void sigListError(); - void sigCacheStatus(TQ_LONG,TQ_LONG); + void sigCachetqStatus(TQ_LONG,TQ_LONG); public slots: virtual void refreshCurrentTree(); diff --git a/src/svnqt/cache/DatabaseException.cpp b/src/svnqt/cache/DatabaseException.cpp index 199a5f9..880c041 100644 --- a/src/svnqt/cache/DatabaseException.cpp +++ b/src/svnqt/cache/DatabaseException.cpp @@ -7,6 +7,6 @@ svn::cache::DatabaseException::DatabaseException(const TQString&msg,int aNumber) : Exception(msg),m_number(aNumber) { if (aNumber>-1) { - setMessage(TQString("(Code %1) %2").arg(aNumber).arg(msg)); + setMessage(TQString("(Code %1) %2").tqarg(aNumber).tqarg(msg)); } } diff --git a/src/svnqt/cache/LogCache.cpp b/src/svnqt/cache/LogCache.cpp index 4dcb27b..fd62eee 100644 --- a/src/svnqt/cache/LogCache.cpp +++ b/src/svnqt/cache/LogCache.cpp @@ -154,7 +154,7 @@ public: int i = 0; TQString _key = dbFile; while (TQSqlDatabase::contains(_key)) { - _key = TQString("%1-%2").arg(dbFile).arg(i++); + _key = TQString("%1-%2").tqarg(dbFile).tqarg(i++); } // qDebug("The repository key is now: %s",_key.TOUTF8().data()); TQDataBase _db = TQSqlDatabase::addDatabase(SQLTYPE,_key); diff --git a/src/svnqt/cache/ReposLog.cpp b/src/svnqt/cache/ReposLog.cpp index 34aa99f..d63d1d3 100644 --- a/src/svnqt/cache/ReposLog.cpp +++ b/src/svnqt/cache/ReposLog.cpp @@ -360,15 +360,15 @@ bool svn::cache::ReposLog::log(const svn::Path&what,const svn::Revision&_start, svn::Revision peg = date2numberRev(_peg,true); svn::Revision end = date2numberRev(_end,true); svn::Revision start = date2numberRev(_start,true); - TQString query_string = TQString(s_q).arg(what.native()).arg(what.native()).arg((peg==svn::Revision::UNDEFINED?"":TQString(" AND revision<=%1").arg(peg.revnum()))); + TQString query_string = TQString(s_q).tqarg(what.native()).tqarg(what.native()).tqarg((peg==svn::Revision::UNDEFINED?"":TQString(" AND revision<=%1").tqarg(peg.revnum()))); if (peg==svn::Revision::UNDEFINED) { peg = latestCachedRev(); } if (!itemExists(peg,what)) { - throw svn::cache::DatabaseException(TQString("Entry '%1' does not exists at revision %2").arg(what.native()).arg(peg.toString())); + throw svn::cache::DatabaseException(TQString("Entry '%1' does not exists at revision %2").tqarg(what.native()).tqarg(peg.toString())); } if (limit>0) { - query_string+=TQString(" LIMIT %1").arg(limit); + query_string+=TQString(" LIMIT %1").tqarg(limit); } TQSqlQuery _q(TQString(),m_Database); TQSqlQuery _q2(TQString(),m_Database); @@ -384,7 +384,7 @@ bool svn::cache::ReposLog::log(const svn::Path&what,const svn::Revision&_start, target[revision].author=_q.value(1).toString(); target[revision].date=_q.value(2).toLongLong(); target[revision].message=_q.value(3).toString(); - query_string=s_e.arg(revision); + query_string=s_e.tqarg(revision); _q2.prepare(query_string); if (!_q2.exec()) { qDebug("Could not select values: %s",_q2.lastError().text().TOUTF8().data()); @@ -416,7 +416,7 @@ bool svn::cache::ReposLog::itemExists(const svn::Revision&peg,const svn::Path&pa #if 0 static TQString _s1("select revision from changeditems where changeditem='%1' and action='A' and revision<=%2 order by revision desc limit 1"); TQSqlQuery _q(TQString(),m_Database); - TQString query_string=TQString(_s1).arg(path.native()).arg(peg.revnum()); + TQString query_string=TQString(_s1).tqarg(path.native()).tqarg(peg.revnum()); if (!_q.exec(query_string)) { qDebug("Could not select values: %s",_q.lastError().text().TOUTF8().data()); qDebug(_q.lastQuery().TOUTF8().data()); @@ -429,10 +429,10 @@ bool svn::cache::ReposLog::itemExists(const svn::Revision&peg,const svn::Path&pa static TQString _s2("select revision from changeditem where changeditem in (%1) and action='D' and revision>%2 and revision<=%3 order by revision desc limit 1"); TQStringList p_list; while (_p.length()>0) { - p_list.append(TQString("'%1'").arg(_p.native())); + p_list.append(TQString("'%1'").tqarg(_p.native())); _p.removeLast(); } - query_string=TQString(_s2).arg(p_list.join(",")).arg(); + query_string=TQString(_s2).tqarg(p_list.join(",")).tqarg(); #endif return true; } diff --git a/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp b/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp index d104e66..46e165f 100644 --- a/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp +++ b/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp @@ -81,7 +81,7 @@ public: sqlite3_stmt *stmt; - uint skippedStatus: 1; // the status of the fetchNext() that's skipped + uint skippedtqStatus: 1; // the status of the fetchNext() that's skipped uint skipRow: 1; // skip the next fetchNext()? uint utf8: 1; TQSqlRecord rInf; @@ -90,7 +90,7 @@ public: static const uint initial_cache_size = 128; TQSQLite3ResultPrivate::TQSQLite3ResultPrivate(TQSQLite3Result* res) : q(res), access(0), - stmt(0), skippedStatus(false), skipRow(false), utf8(false) + stmt(0), skippedtqStatus(false), skipRow(false), utf8(false) { } @@ -98,7 +98,7 @@ void TQSQLite3ResultPrivate::cleanup() { finalize(); rInf.clear(); - skippedStatus = false; + skippedtqStatus = false; skipRow = false; q->setAt(TQSql::BeforeFirst); q->setActive(false); @@ -143,7 +143,7 @@ bool TQSQLite3ResultPrivate::fetchNext(TQSqlCachedResult::ValueCache &values, in // already fetched Q_ASSERT(!initialFetch); skipRow = false; - return skippedStatus; + return skippedtqStatus; } skipRow = initialFetch; @@ -226,7 +226,7 @@ bool TQSQLite3Result::reset (const TQString &query) return false; } - d->skippedStatus = d->fetchNext(cache(), 0, true); + d->skippedtqStatus = d->fetchNext(cache(), 0, true); setSelect(!d->rInf.isEmpty()); setActive(true); diff --git a/src/svnqt/cache/test/sqlite.cpp b/src/svnqt/cache/test/sqlite.cpp index 937c332..07b5148 100644 --- a/src/svnqt/cache/test/sqlite.cpp +++ b/src/svnqt/cache/test/sqlite.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include "svnqt/client.hpp" #include "svnqt/svnqttypes.hpp" diff --git a/src/svnqt/client.hpp b/src/svnqt/client.hpp index 68d0aa0..4fb6015 100644 --- a/src/svnqt/client.hpp +++ b/src/svnqt/client.hpp @@ -125,7 +125,7 @@ namespace svn * @param revision list specific revision when browsing remote, on working copies parameter will ignored * @param detailed_remote if on remote listing detailed item info should get if possible * that may slow so should configureable in frontends! - * @return vector with Status entries. + * @return vector with tqStatus entries. */ virtual StatusEntries status (const Path& path, @@ -146,10 +146,10 @@ namespace svn * @param path File to gather status. * @param update if check against repository if new updates are there (for WC only) * @param revision list specific revision when browsing remote, on working copies parameter will ignored - * @return a Status with Statis.isVersioned = FALSE + * @return a tqStatus with Statis.isVersioned = FALSE */ virtual StatusPtr - singleStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException)=0; + singletqStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException)=0; /** * Executes a revision checkout. @@ -428,7 +428,7 @@ namespace svn * @param native_eol Either "LF", "CR" or "CRLF" or NULL. * @param ignore_externals don't process externals definitions as part of this operation. * @param recurse if true, export recursively.
- Otherwise, export just the directory represented by from and its immediate non-directory children. + Otherwise, export just the directory represented by from and its immediate non-directory tqchildren. */ virtual svn_revnum_t doExport (const Path & srcPath, diff --git a/src/svnqt/client_impl.hpp b/src/svnqt/client_impl.hpp index 4e2ea60..25d5b62 100644 --- a/src/svnqt/client_impl.hpp +++ b/src/svnqt/client_impl.hpp @@ -96,7 +96,7 @@ namespace svn * @param revision list specific revision when browsing remote, on working copies parameter will ignored * @param detailed_remote if on remote listing detailed item info should get if possible * that may slow so should configureable in frontends! - * @return vector with Status entries. + * @return vector with tqStatus entries. */ virtual StatusEntries status (const Path& path, @@ -117,10 +117,10 @@ namespace svn * @param path File to gather status. * @param update if check against repository if new updates are there (for WC only) * @param revision list specific revision when browsing remote, on working copies parameter will ignored - * @return a Status with Statis.isVersioned = FALSE + * @return a tqStatus with Statis.isVersioned = FALSE */ virtual StatusPtr - singleStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException); + singletqStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException); /** * Executes a revision checkout. @@ -398,7 +398,7 @@ namespace svn * @param overwrite overwrite existing files * @param native_eol Either "LF", "CR" or "CRLF" or NULL. * @param ignore_externals don't process externals definitions as part of this operation. - * @param recurse if true, export recursively. Otherwise, export just the directory represented by from and its immediate non-directory children. + * @param recurse if true, export recursively. Otherwise, export just the directory represented by from and its immediate non-directory tqchildren. */ virtual svn_revnum_t doExport (const Path & srcPath, diff --git a/src/svnqt/client_status.cpp b/src/svnqt/client_status.cpp index 1c58610..4468b0d 100644 --- a/src/svnqt/client_status.cpp +++ b/src/svnqt/client_status.cpp @@ -269,7 +269,7 @@ namespace svn } static StatusEntries - localStatus (const Path& path, + localtqStatus (const Path& path, Depth depth, const bool get_all, const bool update, @@ -342,28 +342,28 @@ namespace svn status = (svn_wc_status2_t *) item->value; filePath = (const char *) item->key; - entries.push_back (StatusPtr(new Status(filePath, status))); + entries.push_back (StatusPtr(new tqStatus(filePath, status))); } return entries; } static StatusPtr - dirEntryToStatus (const Path& path, DirEntryPtr dirEntry) + dirEntryTotqStatus (const Path& path, DirEntryPtr dirEntry) { TQString url = path.path(); url += TQString::FROMUTF8("/"); url += dirEntry->name(); - return StatusPtr(new Status (url, dirEntry)); + return StatusPtr(new tqStatus (url, dirEntry)); } static StatusPtr - infoEntryToStatus(const Path&,const InfoEntry&infoEntry) + infoEntryTotqStatus(const Path&,const InfoEntry&infoEntry) { - return StatusPtr(new Status(infoEntry.url(),infoEntry)); + return StatusPtr(new tqStatus(infoEntry.url(),infoEntry)); } static StatusEntries - remoteStatus (Client * client, + remotetqStatus (Client * client, const Path& path, Depth depth, const bool , @@ -385,7 +385,7 @@ namespace svn DirEntryPtr dirEntry = *it; if (dirEntry->name().isEmpty()) continue; - entries.push_back(dirEntryToStatus (path, dirEntry)); + entries.push_back(dirEntryTotqStatus (path, dirEntry)); } return entries; } @@ -402,16 +402,16 @@ namespace svn const StringArray & changelists) throw (ClientException) { if (Url::isValid (path.path())) { - return remoteStatus (this, path, depth, get_all, update, + return remotetqStatus (this, path, depth, get_all, update, no_ignore,revision,m_context,detailed_remote); } else { - return localStatus (path, depth, get_all, update, + return localtqStatus (path, depth, get_all, update, no_ignore, hide_externals,changelists, m_context); } } static StatusPtr - localSingleStatus (const Path& path, Context * context,bool update=false) + localSingletqStatus (const Path& path, Context * context,bool update=false) { svn_error_t *error; apr_hash_t *status_hash; @@ -470,26 +470,26 @@ namespace svn status = (svn_wc_status2_t *) item->value; filePath = (const char *) item->key; - return StatusPtr(new Status (filePath, status)); + return StatusPtr(new tqStatus (filePath, status)); }; static StatusPtr - remoteSingleStatus (Client * client, const Path& path,const Revision revision, Context * ) + remoteSingletqStatus (Client * client, const Path& path,const Revision revision, Context * ) { InfoEntries infoEntries = client->info(path,DepthEmpty,revision,Revision(Revision::UNDEFINED)); if (infoEntries.size () == 0) - return StatusPtr(new Status()); + return StatusPtr(new tqStatus()); else - return infoEntryToStatus (path, infoEntries [0]); + return infoEntryTotqStatus (path, infoEntries [0]); } StatusPtr - Client_impl::singleStatus (const Path& path,bool update,const Revision revision) throw (ClientException) + Client_impl::singletqStatus (const Path& path,bool update,const Revision revision) throw (ClientException) { if (Url::isValid (path.path())) - return remoteSingleStatus (this, path,revision, m_context); + return remoteSingletqStatus (this, path,revision, m_context); else - return localSingleStatus (path, m_context,update); + return localSingletqStatus (path, m_context,update); } bool diff --git a/src/svnqt/diff_data.cpp b/src/svnqt/diff_data.cpp index 756e771..f1837ce 100644 --- a/src/svnqt/diff_data.cpp +++ b/src/svnqt/diff_data.cpp @@ -130,7 +130,7 @@ namespace svn close(); TQFile fi(m_outFileName); if (!fi.open(IO_ReadOnly|IO_Raw)) { - throw ClientException(TQString("%1 '%2'").arg(fi.errorString()).arg(m_outFileName)); + throw ClientException(TQString("%1 '%2'").tqarg(fi.errorString()).tqarg(m_outFileName)); } TQByteArray res = fi.readAll(); diff --git a/src/svnqt/dirent.cpp b/src/svnqt/dirent.cpp index 9015d13..7a42ae7 100644 --- a/src/svnqt/dirent.cpp +++ b/src/svnqt/dirent.cpp @@ -60,7 +60,7 @@ namespace svn hasProps (dirEntry->has_props != 0), createdRev (dirEntry->created_rev), time (dirEntry->time), m_Lock() { - lastAuthor = dirEntry->last_author == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(dirEntry->last_author); + lastAuthor = dirEntry->last_author == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(dirEntry->last_author); } DirEntry_Data (const DirEntry & src) diff --git a/src/svnqt/exception.cpp b/src/svnqt/exception.cpp index 1824572..bc25345 100644 --- a/src/svnqt/exception.cpp +++ b/src/svnqt/exception.cpp @@ -121,7 +121,7 @@ namespace svn { message += TQString::FROMUTF8("In file "); message += TQString::FROMUTF8(error->file); - message += TQString(" Line %1").arg(error->line); + message += TQString(" Line %1").tqarg(error->line); } } while (next != NULL && next->message != NULL) diff --git a/src/svnqt/log_entry.cpp b/src/svnqt/log_entry.cpp index 720642d..f641b17 100644 --- a/src/svnqt/log_entry.cpp +++ b/src/svnqt/log_entry.cpp @@ -96,8 +96,8 @@ namespace svn const char *message_; svn_compat_log_revprops_out(&author_, &date_, &message_, log_entry->revprops); - author = author_ == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(author_); - message = message_ == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(message_); + author = author_ == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(author_); + message = message_ == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(message_); setDate(date_); revision = log_entry->revision; if (log_entry->changed_paths) { @@ -125,8 +125,8 @@ namespace svn setDate(date_); revision = revision_; - author = author_ == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(author_); - message = message_ == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(message_); + author = author_ == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(author_); + message = message_ == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(message_); } void LogEntry::setDate(const char*date_) diff --git a/src/svnqt/path.cpp b/src/svnqt/path.cpp index 4e0b14d..4281de7 100644 --- a/src/svnqt/path.cpp +++ b/src/svnqt/path.cpp @@ -213,7 +213,7 @@ namespace svn if (pos == -1) { filename = basename; - ext = TQString::fromLatin1(""); + ext = TQString::tqfromLatin1(""); } else { diff --git a/src/svnqt/revision.hpp b/src/svnqt/revision.hpp index 178397e..5acaab2 100644 --- a/src/svnqt/revision.hpp +++ b/src/svnqt/revision.hpp @@ -38,7 +38,7 @@ // qt #include #include -#include +#include // subversion api #include "svn_types.h" diff --git a/src/svnqt/status.cpp b/src/svnqt/status.cpp index c5e47a3..a7913f6 100644 --- a/src/svnqt/status.cpp +++ b/src/svnqt/status.cpp @@ -175,7 +175,7 @@ namespace svn m_hasReal=true; } - Status::Status (const Status & src) + tqStatus::tqStatus (const tqStatus & src) : m_Data(new Status_private()) { if( &src != this ) @@ -188,37 +188,37 @@ namespace svn } } - Status::Status (const TQString&path, svn_wc_status2_t * status) + tqStatus::tqStatus (const TQString&path, svn_wc_status2_t * status) : m_Data(new Status_private()) { m_Data->init(path, status); } - Status::Status (const char*path, svn_wc_status2_t * status) + tqStatus::tqStatus (const char*path, svn_wc_status2_t * status) : m_Data(new Status_private()) { m_Data->init(TQString::FROMUTF8(path),status); } - Status::Status(const TQString&url,const DirEntryPtr&src) + tqStatus::tqStatus(const TQString&url,const DirEntryPtr&src) : m_Data(new Status_private()) { m_Data->init(url,src); } - Status::Status(const TQString&url,const InfoEntry&src) + tqStatus::tqStatus(const TQString&url,const InfoEntry&src) : m_Data(new Status_private()) { m_Data->init(url,src); } - Status::~Status () + tqStatus::~tqStatus () { delete m_Data; } - Status & - Status::operator=(const Status & status) + tqStatus & + tqStatus::operator=(const tqStatus & status) { if (this == &status) return *this; @@ -231,89 +231,89 @@ namespace svn } const LockEntry& - Status::lockEntry () const + tqStatus::lockEntry () const { return m_Data->m_Lock; } svn_wc_status_kind - Status::reposPropStatus () const + tqStatus::reposProptqStatus () const { return m_Data->_repos_prop_status; } svn_wc_status_kind - Status::reposTextStatus () const + tqStatus::reposTexttqStatus () const { return m_Data->_repos_text_status; } bool - Status::isSwitched () const + tqStatus::isSwitched () const { return m_Data->_switched != 0; } bool - Status::isCopied () const + tqStatus::isCopied () const { return m_Data->_copied; } bool - Status::isLocked () const + tqStatus::isLocked () const { return m_Data->m_Lock.Locked(); } bool - Status::isModified()const + tqStatus::isModified()const { - return textStatus()==svn_wc_status_modified||propStatus()==svn_wc_status_modified - ||textStatus ()==svn_wc_status_replaced; + return texttqStatus()==svn_wc_status_modified||proptqStatus()==svn_wc_status_modified + ||texttqStatus ()==svn_wc_status_replaced; } bool - Status::isRealVersioned()const + tqStatus::isRealVersioned()const { return m_Data->m_hasReal; } bool - Status::isVersioned () const + tqStatus::isVersioned () const { return m_Data->m_isVersioned; } svn_wc_status_kind - Status::propStatus () const + tqStatus::proptqStatus () const { return m_Data->_prop_status; } svn_wc_status_kind - Status::textStatus () const + tqStatus::texttqStatus () const { return m_Data->_text_status; } const Entry& - Status::entry () const + tqStatus::entry () const { return m_Data->m_entry; } const TQString& - Status::path () const + tqStatus::path () const { return m_Data->m_Path; } bool - Status::validReposStatus()const + tqStatus::validRepostqStatus()const { - return reposTextStatus()!=svn_wc_status_none||reposPropStatus()!=svn_wc_status_none; + return reposTexttqStatus()!=svn_wc_status_none||reposProptqStatus()!=svn_wc_status_none; } bool - Status::validLocalStatus()const + tqStatus::validLocaltqStatus()const { - return textStatus()!=svn_wc_status_none||propStatus()!=svn_wc_status_none; + return texttqStatus()!=svn_wc_status_none||proptqStatus()!=svn_wc_status_none; } } diff --git a/src/svnqt/status.hpp b/src/svnqt/status.hpp index 281f905..3b6e03e 100644 --- a/src/svnqt/status.hpp +++ b/src/svnqt/status.hpp @@ -53,13 +53,13 @@ namespace svn */ class Status_private; - class SVNTQT_EXPORT Status + class SVNTQT_EXPORT tqStatus { public: /** * copy constructor */ - Status (const Status & src); + tqStatus (const tqStatus & src); /** * default constructor @@ -67,27 +67,27 @@ namespace svn * @param path path for this status entry * @param status status entry */ - Status (const TQString&path=TQString(), svn_wc_status2_t * status = NULL); + tqStatus (const TQString&path=TQString(), svn_wc_status2_t * status = NULL); /** * default constructor * * @param path path for this status entry * @param status status entry */ - Status (const char*path, svn_wc_status2_t * status = NULL); + tqStatus (const char*path, svn_wc_status2_t * status = NULL); /** * converting constructor */ - Status(const TQString&path,const DirEntryPtr&src); + tqStatus(const TQString&path,const DirEntryPtr&src); /** * converting constructor */ - Status(const TQString&path,const InfoEntry&src); + tqStatus(const TQString&path,const InfoEntry&src); /** * destructor */ - virtual ~Status (); + virtual ~tqStatus (); /** * @return path of status entry @@ -105,13 +105,13 @@ namespace svn * @return file status property enum of the "textual" component. */ svn_wc_status_kind - textStatus () const; + texttqStatus () const; /** * @return file status property enum of the "property" component. */ svn_wc_status_kind - propStatus () const; + proptqStatus () const; /** * @retval TRUE if under version control @@ -152,28 +152,28 @@ namespace svn * @return the entry's text status in the repository */ svn_wc_status_kind - reposTextStatus () const; + reposTexttqStatus () const; /** * @return the entry's prop status in the repository */ svn_wc_status_kind - reposPropStatus () const; + reposProptqStatus () const; const LockEntry& lockEntry () const; bool - validReposStatus()const; + validRepostqStatus()const; bool - validLocalStatus()const; + validLocaltqStatus()const; /** * assignment operator */ - Status & - operator = (const Status &); + tqStatus & + operator = (const tqStatus &); private: Status_private*m_Data; }; diff --git a/src/svnqt/svnqttypes.hpp b/src/svnqt/svnqttypes.hpp index 5d16658..5b470f2 100644 --- a/src/svnqt/svnqttypes.hpp +++ b/src/svnqt/svnqttypes.hpp @@ -41,7 +41,7 @@ namespace svn class InfoEntry; class LogEntry; class Revision; - class Status; + class tqStatus; class Targets; class Path; class StringArray; @@ -61,7 +61,7 @@ namespace svn /// shared_pointer for LogEntriesMap typedef SharedPointer LogEntriesMapPtr; - typedef SharedPointer StatusPtr; + typedef SharedPointer StatusPtr; typedef TQLIST StatusEntries; typedef TQLIST Revisions; diff --git a/src/svnqt/tests/lsdir.cpp b/src/svnqt/tests/lsdir.cpp index f3a2f6f..1ac0140 100644 --- a/src/svnqt/tests/lsdir.cpp +++ b/src/svnqt/tests/lsdir.cpp @@ -15,8 +15,8 @@ int main(int,char**) m_Svnclient->setContext(m_CurrentContext); svn::DirEntries dlist; - TQString p = TQString("file://%1").arg(TESTREPOPATH); - TQString l = TQString("%1").arg(TESTCOPATH); + TQString p = TQString("file://%1").tqarg(TESTREPOPATH); + TQString l = TQString("%1").tqarg(TESTCOPATH); try { dlist = m_Svnclient->list(svn::Path(p),svn::Revision::HEAD,svn::Revision::HEAD,svn::DepthInfinity,true); diff --git a/src/svnqt/url.cpp b/src/svnqt/url.cpp index 6f55356..2478997 100644 --- a/src/svnqt/url.cpp +++ b/src/svnqt/url.cpp @@ -64,10 +64,10 @@ namespace svn { bool cs = false; if ( - url.startsWith("file://",cs) || - url.startsWith("/") || - url.startsWith("svn+file://",cs) || - url.startsWith("ksvn+file://",cs) ) + url.tqstartsWith("file://",cs) || + url.tqstartsWith("/") || + url.tqstartsWith("svn+file://",cs) || + url.tqstartsWith("ksvn+file://",cs) ) { return true; } diff --git a/src/svnqt/version_check.cpp b/src/svnqt/version_check.cpp index ceb8e49..44c79d3 100644 --- a/src/svnqt/version_check.cpp +++ b/src/svnqt/version_check.cpp @@ -52,8 +52,8 @@ namespace svn { { if (curr_version_string.length()==0) { curr_version_string = - TQString("%1.%2.%3.%4").arg(svn_client_version()->major).arg(svn_client_version()->minor) - .arg(svn_client_version()->patch).arg(svn_client_version()->tag); + TQString("%1.%2.%3.%4").tqarg(svn_client_version()->major).tqarg(svn_client_version()->minor) + .tqarg(svn_client_version()->patch).tqarg(svn_client_version()->tag); } return curr_version_string; } diff --git a/src/svnqt/wc.cpp b/src/svnqt/wc.cpp index bf3b5dd..4729696 100644 --- a/src/svnqt/wc.cpp +++ b/src/svnqt/wc.cpp @@ -116,7 +116,7 @@ namespace svn TQString result = ""; const svn_wc_entry_t *entry; entry = getEntry( path ); - result = entry ? TQString::FROMUTF8(entry->repos) : TQString::fromLatin1(""); + result = entry ? TQString::FROMUTF8(entry->repos) : TQString::tqfromLatin1(""); return result; } diff --git a/src/tdesvn.cpp b/src/tdesvn.cpp index 8002350..05ed762 100644 --- a/src/tdesvn.cpp +++ b/src/tdesvn.cpp @@ -81,11 +81,11 @@ tdesvn::tdesvn() // and a status bar statusBar()->show(); - m_bookmarkFile = locateLocal("appdata",TQString::fromLatin1("bookmarks.xml"),true); + m_bookmarkFile = locateLocal("appdata",TQString::tqfromLatin1("bookmarks.xml"),true); m_BookmarkManager = KBookmarkManager::managerForFile(m_bookmarkFile,false); m_BookmarkManager->setShowNSBookmarks(false); - m_BookmarkManager->setEditorOptions(TQString::fromLatin1("KDE Svn"),false); + m_BookmarkManager->setEditorOptions(TQString::tqfromLatin1("KDE Svn"),false); m_BookmarksActionmenu = new KActionMenu(i18n("&Bookmarks"),"bookmark",actionCollection(),"bookmarks"); m_BookmarksActionmenu->setDelayed(false); @@ -201,7 +201,7 @@ void tdesvn::load(const KURL& url,bool addRescent) } } if (!ret) { - changeStatusbar(i18n("Could not open url %1").arg(url.prettyURL())); + changeStatusbar(i18n("Could not open url %1").tqarg(url.prettyURL())); if (rac) { rac->removeURL(url); } diff --git a/src/tdesvn_part.cpp b/src/tdesvn_part.cpp index dd33ddf..1aa3be2 100644 --- a/src/tdesvn_part.cpp +++ b/src/tdesvn_part.cpp @@ -156,8 +156,8 @@ void tdesvnPart::slotDispPopup(const TQString&name,TQWidget**target) KAboutData* tdesvnPart::createAboutData() { - m_Extratext = TQString(I18N_NOOP("Built with Subversion library: %1\n")).arg(svn::Version::linked_version()); - m_Extratext+=TQString(I18N_NOOP("Running Subversion library: %1")).arg(svn::Version::running_version()); + m_Extratext = TQString(I18N_NOOP("Built with Subversion library: %1\n")).tqarg(svn::Version::linked_version()); + m_Extratext+=TQString(I18N_NOOP("Running Subversion library: %1")).tqarg(svn::Version::running_version()); KAboutData*about = new KAboutData("tdesvnpart", I18N_NOOP("tdesvn Part"), version, description, KAboutData::License_GPL, "(C) 2005-2007 Rajko Albrecht",0, @@ -208,7 +208,7 @@ void tdesvnPart::setupActions() kdDebug()<<"Appname = " << (TQString)kapp->instanceName() << endl; KAction * t = KStdAction::preferences(this, TQT_SLOT(slotShowSettings()), actionCollection(),"tdesvnpart_pref"); - t->setText(i18n("&Configure %1...").arg("Kdesvn")); + t->setText(i18n("&Configure %1...").tqarg("Kdesvn")); if (TQString(kapp->instanceName())!=TQString("tdesvn")) { (void)new KAction(i18n("&About tdesvn part"), "tdesvn", 0, this, TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdesvnpart"); (void)new KAction(i18n("Kdesvn &Handbook"), "help", 0, this, TQT_SLOT(appHelpActivated()), actionCollection(), "help_tdesvn"); diff --git a/src/tdesvnd/tdesvnd_dcop.cpp b/src/tdesvnd/tdesvnd_dcop.cpp index fde8fd0..9575f78 100644 --- a/src/tdesvnd/tdesvnd_dcop.cpp +++ b/src/tdesvnd/tdesvnd_dcop.cpp @@ -238,7 +238,7 @@ TQStringList tdesvnd_dcop::get_sslclientcertpw(TQString realm) TQStringList resList; TQCString npass; int keep = 1; - int res = KPasswordDialog::getPassword(npass,i18n("Enter password for realm %1").arg(realm),&keep); + int res = KPasswordDialog::getPassword(npass,i18n("Enter password for realm %1").tqarg(realm),&keep); if (res!=KPasswordDialog::Accepted) { return resList; } diff --git a/src/tdesvnview.cpp b/src/tdesvnview.cpp index 48a9e2f..f354e0a 100644 --- a/src/tdesvnview.cpp +++ b/src/tdesvnview.cpp @@ -34,13 +34,13 @@ #include "svnqttypes.hpp" #include -#include +#include #include #include #include #include #include -#include +#include #include #include @@ -75,7 +75,7 @@ tdesvnView::tdesvnView(KActionCollection*aCollection,TQWidget *parent,const char m_infoSplitter = new TQSplitter(m_Splitter); m_infoSplitter->setOrientation( Qt::Horizontal ); - m_infoSplitter->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 1, m_infoSplitter->sizePolicy().hasHeightForWidth() ) ); + m_infoSplitter->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 1, m_infoSplitter->sizePolicy().hasHeightForWidth() ) ); m_LogWindow=new KTextBrowser(m_infoSplitter); Propertylist*pl = new Propertylist(m_infoSplitter); pl->setCommitchanges(true); @@ -83,7 +83,7 @@ tdesvnView::tdesvnView(KActionCollection*aCollection,TQWidget *parent,const char connect(m_flist,TQT_SIGNAL(sigProplist(const svn::PathPropertiesMapListPtr&,bool,const TQString&)), pl,TQT_SLOT(displayList(const svn::PathPropertiesMapListPtr&,bool,const TQString&))); - m_flist->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 1, m_flist->sizePolicy().hasHeightForWidth() ) ); + m_flist->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 1, m_flist->sizePolicy().hasHeightForWidth() ) ); m_topLayout->addWidget(m_Splitter); connect(m_flist,TQT_SIGNAL(sigLogMessage(const TQString&)),this,TQT_SLOT(slotAppendLog(const TQString&))); @@ -92,9 +92,9 @@ tdesvnView::tdesvnView(KActionCollection*aCollection,TQWidget *parent,const char connect(m_flist,TQT_SIGNAL(sigUrlOpend(bool)),parent,TQT_SLOT(slotUrlOpened(bool))); connect(m_flist,TQT_SIGNAL(sigSwitchUrl(const KURL&)),this,TQT_SIGNAL(sigSwitchUrl(const KURL&))); connect(m_flist,TQT_SIGNAL(sigUrlChanged( const TQString& )),this,TQT_SLOT(slotUrlChanged(const TQString&))); - connect(m_flist,TQT_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG)),this,TQT_SLOT(fillCacheStatus(TQ_LONG,TQ_LONG))); + connect(m_flist,TQT_SIGNAL(sigCachetqStatus(TQ_LONG,TQ_LONG)),this,TQT_SLOT(fillCachetqStatus(TQ_LONG,TQ_LONG))); connect(this,TQT_SIGNAL(sigMakeBaseDirs()),m_flist,TQT_SLOT(slotMkBaseDirs())); - KConfigGroup cs(Kdesvnsettings::self()->config(),"tdesvn-mainlayout"); + KConfigGroup cs(Kdesvnsettings::self()->config(),"tdesvn-maintqlayout"); TQString t1 = cs.readEntry("split1",TQString()); if (!t1.isEmpty()) { TQTextStream st1(&t1,IO_ReadOnly); @@ -116,7 +116,7 @@ void tdesvnView::slotAppendLog(const TQString& text) tdesvnView::~tdesvnView() { - KConfigGroup cs(Kdesvnsettings::self()->config(),"tdesvn-mainlayout"); + KConfigGroup cs(Kdesvnsettings::self()->config(),"tdesvn-maintqlayout"); TQString t1,t2; TQTextStream st1(&t1,IO_WriteOnly); st1 << *m_Splitter; @@ -462,7 +462,7 @@ void tdesvnView::setCanceled(bool how) m_ReposCancel = how; } -void tdesvnView::fillCacheStatus(TQ_LONG current,TQ_LONG max) +void tdesvnView::fillCachetqStatus(TQ_LONG current,TQ_LONG max) { if (current>-1 && max>-1) { kdDebug()<<"Fillcache "< #include -#include +#include #include #include #include @@ -55,10 +55,10 @@ void UrlDlg::init_dlg() KHistoryCombo * combo = new KHistoryCombo(0,"history_combo"); combo->setDuplicatesEnabled(false); KConfig *kc = KGlobal::config(); - KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-repository settings") ); - int max = kc->readNumEntry( TQString::fromLatin1("Maximum history"), 15 ); + KConfigGroupSaver ks( kc, TQString::tqfromLatin1("Open-repository settings") ); + int max = kc->readNumEntry( TQString::tqfromLatin1("Maximum history"), 15 ); combo->setMaxCount( max ); - TQStringList list = kc->readListEntry( TQString::fromLatin1("History") ); + TQStringList list = kc->readListEntry( TQString::tqfromLatin1("History") ); combo->setHistoryItems(list); combo->setMinimumWidth(100); combo->adjustSize(); @@ -76,7 +76,7 @@ void UrlDlg::init_dlg() enableButton( KDialogBase::User1, false ); connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotClear())); urlRequester_->adjustSize(); - resize(TQSize(400,sizeHint().height())); + resize(TQSize(400,tqsizeHint().height())); } /*! @@ -88,8 +88,8 @@ void UrlDlg::accept() if (combo) { combo->addToHistory(urlRequester_->url()); KConfig *kc = KGlobal::config(); - KConfigGroupSaver ks(kc, TQString::fromLatin1("Open-repository settings")); - kc->writeEntry(TQString::fromLatin1("History"), combo->historyItems()); + KConfigGroupSaver ks(kc, TQString::tqfromLatin1("Open-repository settings")); + kc->writeEntry(TQString::tqfromLatin1("History"), combo->historyItems()); kc->sync(); } KDialogBase::accept();