diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:50:38 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:50:38 -0600 |
commit | d6331f1b56eb6dca7a1950658b2932f208015da0 (patch) | |
tree | f99bf8d1571f93304bdb4a46fb199a1bde60e6ee /kioslave/svn/ksvnd | |
parent | e738fee8847c1f606df7b338a589cc8c0539a521 (diff) | |
download | tdesdk-d6331f1b56eb6dca7a1950658b2932f208015da0.tar.gz tdesdk-d6331f1b56eb6dca7a1950658b2932f208015da0.zip |
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'kioslave/svn/ksvnd')
-rw-r--r-- | kioslave/svn/ksvnd/commitdlg.ui | 6 | ||||
-rw-r--r-- | kioslave/svn/ksvnd/ksvnd.cpp | 32 | ||||
-rw-r--r-- | kioslave/svn/ksvnd/ksvnd.h | 6 |
3 files changed, 22 insertions, 22 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 |