From 3b34e5cf56262c9f54a3bcf02ee5ad93ca0fb05b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 10:00:09 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit d6331f1b56eb6dca7a1950658b2932f208015da0. --- kbabel/catalogmanager/catmanlistitem.cpp | 54 ++++++++++++++++---------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'kbabel/catalogmanager/catmanlistitem.cpp') diff --git a/kbabel/catalogmanager/catmanlistitem.cpp b/kbabel/catalogmanager/catmanlistitem.cpp index 52f248e2..d5997dd5 100644 --- a/kbabel/catalogmanager/catmanlistitem.cpp +++ b/kbabel/catalogmanager/catmanlistitem.cpp @@ -183,7 +183,7 @@ void CatManListItem::setOpen(bool open) TQStringList CatManListItem::allChildrenList(bool onlyFiles) const { - TQStringList childrenList; + TQStringList tqchildrenList; CatManListItem * myChild = (CatManListItem*)firstChild(); while( myChild ) @@ -192,26 +192,26 @@ TQStringList CatManListItem::allChildrenList(bool onlyFiles) const if(myChild->isFile()) { - childrenList.append(name); + tqchildrenList.append(name); } else if(myChild->isDir()) { if(!onlyFiles) - childrenList.append(name); + tqchildrenList.append(name); - childrenList+=myChild->allChildrenList(onlyFiles); + tqchildrenList+=myChild->allChildrenList(onlyFiles); } myChild = (CatManListItem*)myChild->nextSibling(); } - return childrenList; + return tqchildrenList; } TQStringList CatManListItem::allChildrenFileList(bool onlyFiles, bool emptyDirs, bool onlyModified) const { - TQStringList childrenList; + TQStringList tqchildrenList; CatManListItem * myChild = (CatManListItem*)firstChild(); while( myChild ) @@ -219,22 +219,22 @@ TQStringList CatManListItem::allChildrenFileList(bool onlyFiles, bool emptyDirs, if(myChild->isFile() && myChild->hasPo() && !(!myChild->isModified() && onlyModified)) { - childrenList.append(myChild->poFile()); + tqchildrenList.append(myChild->poFile()); } else if(myChild->isDir()) { if(!onlyFiles && (emptyDirs || myChild->_primary.exists() )) { - childrenList.append(myChild->poFile()); + tqchildrenList.append(myChild->poFile()); } - childrenList+=myChild->allChildrenFileList(onlyFiles,false,onlyModified); + tqchildrenList+=myChild->allChildrenFileList(onlyFiles,false,onlyModified); } myChild = (CatManListItem*)myChild->nextSibling(); } - return childrenList; + return tqchildrenList; } @@ -417,7 +417,7 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren if(showPoInfo) { - _lastUpdated=TQDateTime::currentDateTime(); + _lastUpdated=TQDateTime::tqcurrentDateTime(); bool neededWork=needsWork(); bool needWork=false; @@ -435,17 +435,17 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren const CVSHandler* cvsHandler = _view->cvsHandler(); const SVNHandler* svnHandler = _view->svnHandler(); - const CVSHandler::FileStatus cvsFileStatus = cvsHandler->fstatus( poFile() ); - const SVNHandler::FileStatus svnFileStatus = svnHandler->fstatus( poFile() ); + const CVSHandler::FiletqStatus cvsFiletqStatus = cvsHandler->fstatus( poFile() ); + const SVNHandler::FiletqStatus svnFiletqStatus = svnHandler->fstatus( poFile() ); - _isModified = cvsHandler->isConsideredModified( cvsFileStatus ) - || svnHandler->isConsideredModified( svnFileStatus ); + _isModified = cvsHandler->isConsideredModified( cvsFiletqStatus ) + || svnHandler->isConsideredModified( svnFiletqStatus ); TQString versionControl; - if ( cvsFileStatus != CVSHandler::NO_REPOSITORY ) - versionControl = cvsHandler->fileStatus( cvsFileStatus ); - else if ( svnFileStatus != SVNHandler::NO_REPOSITORY ) - versionControl = svnHandler->fileStatus( svnFileStatus ); + if ( cvsFiletqStatus != CVSHandler::NO_REPOSITORY ) + versionControl = cvsHandler->filetqStatus( cvsFiletqStatus ); + else if ( svnFiletqStatus != SVNHandler::NO_REPOSITORY ) + versionControl = svnHandler->filetqStatus( svnFiletqStatus ); else versionControl = i18n("No version control"); @@ -532,7 +532,7 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren if(showPoInfo) { - _lastUpdated=TQDateTime::currentDateTime(); + _lastUpdated=TQDateTime::tqcurrentDateTime(); // clean previous state information setText(COL_FUZZY,TQString()); @@ -617,7 +617,7 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo ) TQString name=_primary.fileName(); setText(COL_NAME,name.left(name.length()-3)); - _lastUpdated=TQDateTime::currentDateTime(); + _lastUpdated=TQDateTime::tqcurrentDateTime(); bool neededWork=needsWork(); bool needWork=false; @@ -625,14 +625,14 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo ) TQPixmap icon; _hasErrors=false; - const CVSHandler::FileStatus cvsFileStatus = _view->cvsHandler()->fstatus(poFile()); - const SVNHandler::FileStatus svnFileStatus = _view->svnHandler()->fstatus(poFile()); + const CVSHandler::FiletqStatus cvsFiletqStatus = _view->cvsHandler()->fstatus(poFile()); + const SVNHandler::FiletqStatus svnFiletqStatus = _view->svnHandler()->fstatus(poFile()); TQString versionControl; - if ( cvsFileStatus != CVSHandler::NO_REPOSITORY ) - versionControl = _view->cvsHandler()->fileStatus( cvsFileStatus ); - else if ( svnFileStatus != SVNHandler::NO_REPOSITORY ) - versionControl = _view->svnHandler()->fileStatus( svnFileStatus ); + if ( cvsFiletqStatus != CVSHandler::NO_REPOSITORY ) + versionControl = _view->cvsHandler()->filetqStatus( cvsFiletqStatus ); + else if ( svnFiletqStatus != SVNHandler::NO_REPOSITORY ) + versionControl = _view->svnHandler()->filetqStatus( svnFiletqStatus ); else versionControl = i18n("No version control"); -- cgit v1.2.1