summaryrefslogtreecommitdiffstats
path: root/kioslave/svn
diff options
context:
space:
mode:
Diffstat (limited to 'kioslave/svn')
-rw-r--r--kioslave/svn/ksvnd/commitdlg.ui6
-rw-r--r--kioslave/svn/ksvnd/ksvnd.cpp32
-rw-r--r--kioslave/svn/ksvnd/ksvnd.h6
-rw-r--r--kioslave/svn/svn.cpp58
-rw-r--r--kioslave/svn/svnhelper/kio_svn_helper.cpp8
-rw-r--r--kioslave/svn/svnhelper/subversioncheckout.ui8
-rw-r--r--kioslave/svn/svnhelper/subversiondiff.ui2
-rw-r--r--kioslave/svn/svnhelper/subversionlog.ui2
-rw-r--r--kioslave/svn/svnhelper/subversionswitch.ui8
9 files changed, 65 insertions, 65 deletions
diff --git a/kioslave/svn/ksvnd/commitdlg.ui b/kioslave/svn/ksvnd/commitdlg.ui
index 35b9a97e..fb45eda1 100644
--- a/kioslave/svn/ksvnd/commitdlg.ui
+++ b/kioslave/svn/ksvnd/commitdlg.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<vbox>
<property name="name">
@@ -42,7 +42,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -58,7 +58,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>220</width>
<height>20</height>
diff --git a/kioslave/svn/ksvnd/ksvnd.cpp b/kioslave/svn/ksvnd/ksvnd.cpp
index fb96c9af..ddc7fb3e 100644
--- a/kioslave/svn/ksvnd/ksvnd.cpp
+++ b/kioslave/svn/ksvnd/ksvnd.cpp
@@ -196,7 +196,7 @@ bool KSvnd::anyValidWorkingCopy( const KURL::List& wclist ) {
return false;
}
-int KSvnd::gettqStatus( const KURL::List& list ) {
+int KSvnd::getStatus( const KURL::List& list ) {
int result = 0;
uint files = 0, folders = 0, parentsentries = 0, parentshavesvn = 0, subdirhavesvn = 0, external = 0;
for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) {
@@ -214,7 +214,7 @@ int KSvnd::gettqStatus( const KURL::List& list ) {
external++;
}
}
- if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //tqparent has a .svn ?
+ if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //parent has a .svn ?
parentshavesvn++;
}
if ( files > 0 )
@@ -256,18 +256,18 @@ bool KSvnd::isFolder( const KURL& url ) {
TQStringList KSvnd::getActionMenu ( const KURL::List &list ) {
TQStringList result;
- int listtqStatus = gettqStatus( list );
+ int listStatus = getStatus( list );
- if ( !(listtqStatus & SomeAreInParentsEntries) &&
- !(listtqStatus & SomeAreExternalToParent) &&
- !(listtqStatus & SomeHaveSvn)) {
- if( list.size() == 1 && listtqStatus & SomeAreFolders) {
+ if ( !(listStatus & SomeAreInParentsEntries) &&
+ !(listStatus & SomeAreExternalToParent) &&
+ !(listStatus & SomeHaveSvn)) {
+ if( list.size() == 1 && listStatus & SomeAreFolders) {
result << "Checkout";
result << "Export";
// result << "CreateRepository";
result << "Import";
}
- } else if ( (listtqStatus & AllAreInParentsEntries) ) {
+ } else if ( (listStatus & AllAreInParentsEntries) ) {
result << "Diff";
//In SVN
// result << "ShowLog";
@@ -277,7 +277,7 @@ TQStringList KSvnd::getActionMenu ( const KURL::List &list ) {
// result << "Update to revision..."
result << "Rename";
result << "Delete";
- if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) {
+ if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) {
result << "Revert";
// result << "Cleanup";
}
@@ -285,19 +285,19 @@ TQStringList KSvnd::getActionMenu ( const KURL::List &list ) {
// result << "BranchTag";
result << "Switch";
result << "Merge";
- if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) {
+ if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) {
// result << "Export";
// result << "Relocate";
result << "_SEPARATOR_";
result << "Add";
}
result << "_SEPARATOR_";
- if( listtqStatus & SomeAreFiles && !(listtqStatus & SomeAreFolders)) {
+ if( listStatus & SomeAreFiles && !(listStatus & SomeAreFolders)) {
result << "Blame";
}
result << "CreatePatch";
- if( list.size() == 1 && listtqStatus & SomeAreFolders) {
+ if( list.size() == 1 && listStatus & SomeAreFolders) {
// result << "ApplyPatchToFolder";
}
}
@@ -306,12 +306,12 @@ TQStringList KSvnd::getActionMenu ( const KURL::List &list ) {
TQStringList KSvnd::getTopLevelActionMenu ( const KURL::List &list ) {
TQStringList result;
- int listtqStatus = gettqStatus( list );
+ int listStatus = getStatus( list );
- if ( ( listtqStatus & AllParentsHaveSvn &&
- ( ( listtqStatus & SomeAreExternalToParent ) || ( listtqStatus & SomeAreInParentsEntries ) )
- || ( listtqStatus & SomeHaveSvn ) )
+ if ( ( listStatus & AllParentsHaveSvn &&
+ ( ( listStatus & SomeAreExternalToParent ) || ( listStatus & SomeAreInParentsEntries ) )
+ || ( listStatus & SomeHaveSvn ) )
) {
result << "Update";
result << "Commit";
diff --git a/kioslave/svn/ksvnd/ksvnd.h b/kioslave/svn/ksvnd/ksvnd.h
index 78583e02..bf10429c 100644
--- a/kioslave/svn/ksvnd/ksvnd.h
+++ b/kioslave/svn/ksvnd/ksvnd.h
@@ -32,7 +32,7 @@ class KSvnd : public KDEDModule
// TQ_OBJECT
K_DCOP
- //note: InSVN means tqparent is added. InRepos means itself is added
+ //note: InSVN means parent is added. InRepos means itself is added
enum { SomeAreFiles = 1, SomeAreFolders = 2, SomeAreInParentsEntries = 4, SomeParentsHaveSvn = 8, SomeHaveSvn = 16, SomeAreExternalToParent = 32, AllAreInParentsEntries = 64, AllParentsHaveSvn = 128, AllHaveSvn = 256, AllAreExternalToParent = 512, AllAreFolders = 1024 };
public:
KSvnd(const TQCString &);
@@ -56,7 +56,7 @@ k_dcop:
k_dcop_signals:
//emitted whenever something happens using subversion ;)
// void subversionNotify(const TQString&, int ,int, const TQString& , int , int, long int, const TQString&);
-// void subversiontqStatus(const TQString&,int,int,int,int,long int);
+// void subversionStatus(const TQString&,int,int,int,int,long int);
public slots:
@@ -64,7 +64,7 @@ protected:
bool isFileInSvnEntries ( const TQString filename, const TQString entfile );
bool isFileInExternals ( const TQString filename, const TQString propfile );
bool isFolder( const KURL& url );
- int gettqStatus( const KURL::List& list );
+ int getStatus( const KURL::List& list );
};
#endif
diff --git a/kioslave/svn/svn.cpp b/kioslave/svn/svn.cpp
index 362852d3..9d06c516 100644
--- a/kioslave/svn/svn.cpp
+++ b/kioslave/svn/svn.cpp
@@ -232,7 +232,7 @@ void kio_svnProtocol::get(const KURL& url ){
kdDebug(7128) << "kio_svn::get(const KURL& url)" << endl ;
TQString remoteServer = url.host();
- infoMessage(i18n("Looking for %1...").tqarg( remoteServer ) );
+ infoMessage(i18n("Looking for %1...").arg( remoteServer ) );
apr_pool_t *subpool = svn_pool_create (pool);
kbaton *bt = (kbaton*)apr_pcalloc(subpool, sizeof(*bt));
@@ -1087,7 +1087,7 @@ void kio_svnProtocol::commit(const KURL::List& wc) {
TQString userstring = i18n ( "Nothing to commit." );
if ( SVN_IS_VALID_REVNUM( commit_info->revision ) )
- userstring = i18n( "Committed revision %1." ).tqarg(commit_info->revision);
+ userstring = i18n( "Committed revision %1." ).arg(commit_info->revision);
setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "path", nurl.path() );
setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "action", "0" );
setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "kind", "0" );
@@ -1349,41 +1349,41 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
switch ( action ) {
case svn_wc_notify_add : //add
if (mime_type && (svn_mime_type_is_binary (mime_type)))
- userstring = i18n( "A (bin) %1" ).tqarg( path );
+ userstring = i18n( "A (bin) %1" ).arg( path );
else
- userstring = i18n( "A %1" ).tqarg( path );
+ userstring = i18n( "A %1" ).arg( path );
break;
case svn_wc_notify_copy: //copy
break;
case svn_wc_notify_delete: //delete
nb->received_some_change = TRUE;
- userstring = i18n( "D %1" ).tqarg( path );
+ userstring = i18n( "D %1" ).arg( path );
break;
case svn_wc_notify_restore : //restore
- userstring=i18n( "Restored %1." ).tqarg( path );
+ userstring=i18n( "Restored %1." ).arg( path );
break;
case svn_wc_notify_revert : //revert
- userstring=i18n( "Reverted %1." ).tqarg( path );
+ userstring=i18n( "Reverted %1." ).arg( path );
break;
case svn_wc_notify_failed_revert: //failed revert
- userstring=i18n( "Failed to revert %1.\nTry updating instead." ).tqarg( path );
+ userstring=i18n( "Failed to revert %1.\nTry updating instead." ).arg( path );
break;
case svn_wc_notify_resolved: //resolved
- userstring=i18n( "Resolved conflicted state of %1." ).tqarg( path );
+ userstring=i18n( "Resolved conflicted state of %1." ).arg( path );
break;
case svn_wc_notify_skip: //skip
if ( content_state == svn_wc_notify_state_missing )
- userstring=i18n("Skipped missing target %1.").tqarg( path );
+ userstring=i18n("Skipped missing target %1.").arg( path );
else
- userstring=i18n("Skipped %1.").tqarg( path );
+ userstring=i18n("Skipped %1.").arg( path );
break;
case svn_wc_notify_update_delete: //update_delete
nb->received_some_change = TRUE;
- userstring=i18n( "D %1" ).tqarg( path );
+ userstring=i18n( "D %1" ).arg( path );
break;
case svn_wc_notify_update_add: //update_add
nb->received_some_change = TRUE;
- userstring=i18n( "A %1" ).tqarg( path );
+ userstring=i18n( "A %1" ).arg( path );
break;
case svn_wc_notify_update_update: //update_update
{
@@ -1428,25 +1428,25 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
if (SVN_IS_VALID_REVNUM (revision)) {
if (nb->is_export) {
if ( nb->in_external )
- userstring = i18n("Exported external at revision %1.").tqarg( revision );
+ userstring = i18n("Exported external at revision %1.").arg( revision );
else
- userstring = i18n("Exported revision %1.").tqarg( revision );
+ userstring = i18n("Exported revision %1.").arg( revision );
} else if (nb->is_checkout) {
if ( nb->in_external )
- userstring = i18n("Checked out external at revision %1.").tqarg( revision );
+ userstring = i18n("Checked out external at revision %1.").arg( revision );
else
- userstring = i18n("Checked out revision %1.").tqarg( revision);
+ userstring = i18n("Checked out revision %1.").arg( revision);
} else {
if (nb->received_some_change) {
if ( nb->in_external )
- userstring=i18n("Updated external to revision %1.").tqarg( revision );
+ userstring=i18n("Updated external to revision %1.").arg( revision );
else
- userstring = i18n("Updated to revision %1.").tqarg( revision);
+ userstring = i18n("Updated to revision %1.").arg( revision);
} else {
if ( nb->in_external )
- userstring = i18n("External at revision %1.").tqarg( revision );
+ userstring = i18n("External at revision %1.").arg( revision );
else
- userstring = i18n("At revision %1.").tqarg( revision);
+ userstring = i18n("At revision %1.").arg( revision);
}
}
} else /* no revision */ {
@@ -1474,30 +1474,30 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
break;
case svn_wc_notify_update_external: //update_external
nb->in_external = TRUE;
- userstring = i18n("Fetching external item into %1." ).tqarg( path );
+ userstring = i18n("Fetching external item into %1." ).arg( path );
break;
case svn_wc_notify_status_completed: //status_completed
if (SVN_IS_VALID_REVNUM (revision))
- userstring = i18n( "Status against revision: %1.").tqarg( revision );
+ userstring = i18n( "Status against revision: %1.").arg( revision );
break;
case svn_wc_notify_status_external: //status_external
- userstring = i18n("Performing status on external item at %1.").tqarg( path );
+ userstring = i18n("Performing status on external item at %1.").arg( path );
break;
case svn_wc_notify_commit_modified: //commit_modified
- userstring = i18n( "Sending %1").tqarg( path );
+ userstring = i18n( "Sending %1").arg( 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.").tqarg( path );
+ userstring = i18n( "Adding (bin) %1.").arg( path );
} else {
- userstring = i18n( "Adding %1.").tqarg( path );
+ userstring = i18n( "Adding %1.").arg( path );
}
break;
case svn_wc_notify_commit_deleted: //commit_deleted
- userstring = i18n( "Deleting %1.").tqarg( path );
+ userstring = i18n( "Deleting %1.").arg( path );
break;
case svn_wc_notify_commit_replaced: //commit_replaced
- userstring = i18n( "Replacing %1.").tqarg( path );
+ userstring = i18n( "Replacing %1.").arg( path );
break;
case svn_wc_notify_commit_postfix_txdelta: //commit_postfix_txdelta
if (! nb->sent_first_txdelta) {
diff --git a/kioslave/svn/svnhelper/kio_svn_helper.cpp b/kioslave/svn/svnhelper/kio_svn_helper.cpp
index 3456b3fd..19f08621 100644
--- a/kioslave/svn/svnhelper/kio_svn_helper.cpp
+++ b/kioslave/svn/svnhelper/kio_svn_helper.cpp
@@ -40,11 +40,11 @@
#include <tqspinbox.h>
#include <kprocess.h>
#include <ktempfile.h>
-#include <tqtextstream.h>
-#include <tqtextedit.h>
+#include <textstream.h>
+#include <textedit.h>
#include <kstandarddirs.h>
-#include <tqtextbrowser.h>
-#include <tqtextcodec.h>
+#include <textbrowser.h>
+#include <textcodec.h>
SvnHelper::SvnHelper():KApplication() {
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
diff --git a/kioslave/svn/svnhelper/subversioncheckout.ui b/kioslave/svn/svnhelper/subversioncheckout.ui
index 3ed752e7..8f583932 100644
--- a/kioslave/svn/svnhelper/subversioncheckout.ui
+++ b/kioslave/svn/svnhelper/subversioncheckout.ui
@@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<grid>
<property name="name">
@@ -76,7 +76,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -131,7 +131,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -155,7 +155,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>121</width>
<height>20</height>
diff --git a/kioslave/svn/svnhelper/subversiondiff.ui b/kioslave/svn/svnhelper/subversiondiff.ui
index e647f6b6..a624e6bb 100644
--- a/kioslave/svn/svnhelper/subversiondiff.ui
+++ b/kioslave/svn/svnhelper/subversiondiff.ui
@@ -60,7 +60,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kioslave/svn/svnhelper/subversionlog.ui b/kioslave/svn/svnhelper/subversionlog.ui
index 20060f73..e6135a8e 100644
--- a/kioslave/svn/svnhelper/subversionlog.ui
+++ b/kioslave/svn/svnhelper/subversionlog.ui
@@ -60,7 +60,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kioslave/svn/svnhelper/subversionswitch.ui b/kioslave/svn/svnhelper/subversionswitch.ui
index c0642bc4..1e48b29e 100644
--- a/kioslave/svn/svnhelper/subversionswitch.ui
+++ b/kioslave/svn/svnhelper/subversionswitch.ui
@@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<grid>
<property name="name">
@@ -76,7 +76,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -131,7 +131,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -155,7 +155,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>121</width>
<height>20</height>
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-23 16:10:48 +0000