summaryrefslogtreecommitdiffstats
path: root/kbabel/catalogmanager
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commit22253cd8fbc0bd2e70f32aaf1f95ea3a3e819a60 (patch)
treebabc4a761925023e16fa94633959f35d1c251887 /kbabel/catalogmanager
parent0813b39aed2cf4c84157a22c4c9594336d93d412 (diff)
downloadtdesdk-22253cd8fbc0bd2e70f32aaf1f95ea3a3e819a60.tar.gz
tdesdk-22253cd8fbc0bd2e70f32aaf1f95ea3a3e819a60.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kbabel/catalogmanager')
-rw-r--r--kbabel/catalogmanager/catalogmanagerview.cpp26
-rw-r--r--kbabel/catalogmanager/catalogmanagerview.h6
-rw-r--r--kbabel/catalogmanager/catmanlistitem.cpp30
-rw-r--r--kbabel/catalogmanager/catmanlistitem.h8
-rw-r--r--kbabel/catalogmanager/findinfilesdialog.cpp4
-rw-r--r--kbabel/catalogmanager/findinfilesdialog.h2
-rw-r--r--kbabel/catalogmanager/libcvs/cvsdialog.cpp4
-rw-r--r--kbabel/catalogmanager/libcvs/cvsdialog.h2
-rw-r--r--kbabel/catalogmanager/libcvs/cvshandler.cpp20
-rw-r--r--kbabel/catalogmanager/libcvs/cvshandler.h6
-rw-r--r--kbabel/catalogmanager/libsvn/svndialog.cpp4
-rw-r--r--kbabel/catalogmanager/libsvn/svndialog.h2
-rw-r--r--kbabel/catalogmanager/libsvn/svnhandler.cpp16
-rw-r--r--kbabel/catalogmanager/libsvn/svnhandler.h6
-rw-r--r--kbabel/catalogmanager/markpatterndialog.cpp4
-rw-r--r--kbabel/catalogmanager/markpatterndialog.h2
-rw-r--r--kbabel/catalogmanager/multiroughtransdlg.cpp6
-rw-r--r--kbabel/catalogmanager/multiroughtransdlg.h2
-rw-r--r--kbabel/catalogmanager/validateprogress.cpp4
-rw-r--r--kbabel/catalogmanager/validateprogress.h2
20 files changed, 78 insertions, 78 deletions
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index 63f2a077..3501f17b 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -98,8 +98,8 @@ const char* columnNames[] = {
#define COLTEXT(a) (i18n(columnNames[a]))
-CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* tqparent,const char* name)
- : TQListView(tqparent,name)
+CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* parent,const char* name)
+ : TQListView(parent,name)
, _dirWatch(0)
, _readInfoCount(0)
, _active(false)
@@ -1638,14 +1638,14 @@ void CatalogManagerView::slotFileCommand(int index)
if(index>=0 && item && item->isFile())
{
- CatManListItem* tqparent = (CatManListItem*)item->tqparent();
+ CatManListItem* parent = (CatManListItem*)item->parent();
TQString cmd=*(_settings.fileCommands).at(index);
cmd.replace("@PACKAGE@",item->name());
cmd.replace("@POFILE@",item->poFile());
cmd.replace("@POTFILE@",item->potFile());
- cmd.replace("@PODIR@",tqparent->poFile());
- cmd.replace("@POTDIR@",tqparent->potFile());
+ cmd.replace("@PODIR@",parent->poFile());
+ cmd.replace("@POTDIR@",parent->potFile());
cmd.replace("@POEMAIL@",item->text(COL_TRANSLATOR));
kdDebug(KBABEL_CATMAN) << cmd << endl;
@@ -1660,7 +1660,7 @@ void CatalogManagerView::slotFileCommand(int index)
connect( proc,TQT_SIGNAL( receivedStderr(KProcess*,char*,int) ), this
,TQT_SLOT( showOutput(KProcess*,char*,int) ) );
- *proc << "cd" << tqparent->poFile() << ";" << cmd;
+ *proc << "cd" << parent->poFile() << ";" << cmd;
proc->start(KProcess::NotifyOnExit,KProcess::AllOutput);
}
@@ -2206,7 +2206,7 @@ void CatalogManagerView::updateDir(TQString relDir)
deleteDirItem(relDir);
// if this directory has to be removed, check, if
- // the tqparent directory has to be removed too
+ // the parent directory has to be removed too
const int index=relDir.findRev("/",relDir.length()-2);
if(index<0)
{
@@ -2266,7 +2266,7 @@ void CatalogManagerView::directoryChanged(const TQString& dir)
CatManListItem* thisItem=_dirList[relDir];
if(!thisItem)
{
- // if this item is not in the list search for next existing tqparent item
+ // if this item is not in the list search for next existing parent item
TQString prevRelDir;
do
{
@@ -2289,7 +2289,7 @@ void CatalogManagerView::directoryChanged(const TQString& dir)
}
else
{
- // if a tqparent item dir is found, create the needed item in this dir
+ // if a parent item dir is found, create the needed item in this dir
// and build the tree from this item on
kdDebug(KBABEL_CATMAN) << "building dir: " << prevRelDir << endl;
CatManListItem* item = new CatManListItem(this, thisItem,_settings.poBaseDir+prevRelDir
@@ -2624,7 +2624,7 @@ CatManListItem *CatalogManagerView::itemBelow( CatManListItem *item )
{
while( !static_cast<CatManListItem *>( item->nextSibling() ) )
{
- item = static_cast<CatManListItem *>( item->tqparent() );
+ item = static_cast<CatManListItem *>( item->parent() );
if( !item ) return item;
}
return static_cast<CatManListItem *>( item->nextSibling() );
@@ -2634,7 +2634,7 @@ CatManListItem *CatalogManagerView::itemBelow( CatManListItem *item )
{
while( !static_cast<CatManListItem *>( item->nextSibling() ) )
{
- item = static_cast<CatManListItem *>( item->tqparent());
+ item = static_cast<CatManListItem *>( item->parent());
if( !item ) return item;
}
return static_cast<CatManListItem *>( item->nextSibling() );
@@ -2651,7 +2651,7 @@ CatManListItem *CatalogManagerView::itemAbove( CatManListItem *item )
{
while( !static_cast<CatManListItem *>( item->previousSibling() ) )
{
- item = static_cast<CatManListItem *>( item->tqparent() );
+ item = static_cast<CatManListItem *>( item->parent() );
if( !item ) return item;
}
return static_cast<CatManListItem *>( item->previousSibling() );
@@ -2661,7 +2661,7 @@ CatManListItem *CatalogManagerView::itemAbove( CatManListItem *item )
{
while( !static_cast<CatManListItem *>( item->previousSibling() ) )
{
- item = static_cast<CatManListItem *>( item->tqparent());
+ item = static_cast<CatManListItem *>( item->parent());
if( !item ) return item;
}
return static_cast<CatManListItem *>( item->previousSibling() );
diff --git a/kbabel/catalogmanager/catalogmanagerview.h b/kbabel/catalogmanager/catalogmanagerview.h
index 8a405430..d923a3bb 100644
--- a/kbabel/catalogmanager/catalogmanagerview.h
+++ b/kbabel/catalogmanager/catalogmanagerview.h
@@ -79,7 +79,7 @@ class CatalogManagerView : public TQListView
Q_OBJECT
TQ_OBJECT
public:
- CatalogManagerView(KBabel::Project::Ptr project, TQWidget* tqparent=0, const char* name=0);
+ CatalogManagerView(KBabel::Project::Ptr project, TQWidget* parent=0, const char* name=0);
virtual ~CatalogManagerView();
KBabel::CatManSettings settings() const;
@@ -126,14 +126,14 @@ public slots:
* traverses all childs in the directory of the current item
* (including all subdirectories) and displays some statistics
* about the translations. If the item is a file, its
- * tqparent directory is used instead.
+ * parent directory is used instead.
*/
void statistics();
/**
* traverses all marked childs in the directory of the current item
* (including all subdirectories) and displays some statistics
* about the translations. If the item is a file, its
- * tqparent directory is used instead.
+ * parent directory is used instead.
*/
void markedStatistics();
/**
diff --git a/kbabel/catalogmanager/catmanlistitem.cpp b/kbabel/catalogmanager/catmanlistitem.cpp
index aa52237f..d5997dd5 100644
--- a/kbabel/catalogmanager/catmanlistitem.cpp
+++ b/kbabel/catalogmanager/catmanlistitem.cpp
@@ -53,15 +53,15 @@
using namespace KBabel;
-CatManListItem::CatManListItem(CatalogManagerView *view, TQListViewItem* tqparent,TQString fullPath,TQString fullPotPath,TQString package)
- : TQListViewItem(tqparent)
+CatManListItem::CatManListItem(CatalogManagerView *view, TQListViewItem* parent,TQString fullPath,TQString fullPotPath,TQString package)
+ : TQListViewItem(parent)
{
_view = view;
init(fullPath,fullPotPath,package);
}
-CatManListItem::CatManListItem(CatalogManagerView *view, TQListView* tqparent,TQString fullPath,TQString fullPotPath)
- : TQListViewItem(tqparent)
+CatManListItem::CatManListItem(CatalogManagerView *view, TQListView* parent,TQString fullPath,TQString fullPotPath)
+ : TQListViewItem(parent)
{
_primary=TQFileInfo(fullPath);
_template=TQFileInfo(fullPotPath);
@@ -102,7 +102,7 @@ void CatManListItem::init(const TQString& fullPath, const TQString& fullPotPath,
_wordList.clear();
_wordListUpdated = false;
- update(tqparent()->isOpen(),false,true);
+ update(parent()->isOpen(),false,true);
if( !isDir() ) setPixmap(COL_MARKER,ICON_NOFLAG);
}
@@ -332,11 +332,11 @@ TQString CatManListItem::key(int col, bool) const
void CatManListItem::update(bool showPoInfo,bool includeChildren
, bool noParents)
{
- if( _view->isStopped() ) return; // if tqparent view is stopped, we should stop as well
+ if( _view->isStopped() ) return; // if parent view is stopped, we should stop as well
bool updateWordList = _view->settings().indexWords;
- // flag, if something has changed and tqparent has to be updated
+ // flag, if something has changed and parent has to be updated
bool updateParent=false;
// update flags for files...
@@ -596,7 +596,7 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren
// however, is can be saved template or translation!!! - only translation is handled???
void CatManListItem::updateAfterSave( PoInfo &poInfo )
{
- // flag, if something has changed and tqparent has to be updated
+ // flag, if something has changed and parent has to be updated
bool updateParent=false;
// update flags for files...
@@ -661,7 +661,7 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo )
setPixmap(COL_NAME,icon);
- // if the status changed, update the tqparent item
+ // if the status changed, update the parent item
if(needWork != neededWork)
{
updateParent=true;
@@ -677,11 +677,11 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo )
void CatManListItem::updateParents()
{
- CatManListItem *item = (CatManListItem*)tqparent();
+ CatManListItem *item = (CatManListItem*)parent();
while( item && !_view->isStopped())
{
item->update(false,false);
- item = (CatManListItem*)item->tqparent();
+ item = (CatManListItem*)item->parent();
}
}
@@ -827,9 +827,9 @@ TQPixmap CatManListItem::paintExclamation(TQPixmap* pixmap)
int diameter=TQMIN(width,height);
- TQBitmap tqmask=pixmap->createHeuristicMask();
+ TQBitmap mask=pixmap->createHeuristicMask();
- TQPainter mp(&tqmask);
+ TQPainter mp(&mask);
mp.setPen(TQPen(TQt::color1,1));
mp.drawEllipse(width-diameter,height-diameter,diameter,diameter);
@@ -840,14 +840,14 @@ TQPixmap CatManListItem::paintExclamation(TQPixmap* pixmap)
p.setPen( TQPen(red,1) );
p.drawEllipse(width-diameter,height-diameter,diameter,diameter);
- result.setMask(tqmask);
+ result.setMask(mask);
return result;
}
TQListViewItem *CatManListItem::previousSibling()
{
- TQListViewItem * i = tqparent();
+ TQListViewItem * i = parent();
if( !i ) return i;
i = i->firstChild();
if( !i ) return i;
diff --git a/kbabel/catalogmanager/catmanlistitem.h b/kbabel/catalogmanager/catmanlistitem.h
index e31a5d4d..ac22e2e8 100644
--- a/kbabel/catalogmanager/catmanlistitem.h
+++ b/kbabel/catalogmanager/catmanlistitem.h
@@ -60,11 +60,11 @@ public:
/** the type of this item */
enum Type{File,Dir};
- CatManListItem(CatalogManagerView *view, TQListViewItem* tqparent,TQString fullPath
+ CatManListItem(CatalogManagerView *view, TQListViewItem* parent,TQString fullPath
,TQString fullPotPath,TQString package);
/** creates the toplevel root item with package name "/" */
- CatManListItem(CatalogManagerView *view, TQListView* tqparent,TQString fullPath, TQString fullPotPath);
+ CatManListItem(CatalogManagerView *view, TQListView* parent,TQString fullPath, TQString fullPotPath);
/**
* returns the package names (including relative path) of the
@@ -94,7 +94,7 @@ public:
/**
* checks if the file on the disc has changed,
* reads information about the file and displays it
- * @param noParents flag, if the update has to include the tqparent
+ * @param noParents flag, if the update has to include the parent
* of the item, if the status has changed. Since at the first build of
* the tree, the status of every item changes, this is not useful then.
*/
@@ -227,7 +227,7 @@ private:
/** a list of errors found by validation tool*/
TQValueList<IgnoreItem> _errors;
- /** tqparent view for this item, used for stopping the activity */
+ /** parent view for this item, used for stopping the activity */
CatalogManagerView *_view;
/** index of words, but it does not contain any useful information as values */
diff --git a/kbabel/catalogmanager/findinfilesdialog.cpp b/kbabel/catalogmanager/findinfilesdialog.cpp
index 5f10678b..25c37594 100644
--- a/kbabel/catalogmanager/findinfilesdialog.cpp
+++ b/kbabel/catalogmanager/findinfilesdialog.cpp
@@ -44,8 +44,8 @@
using namespace KBabel;
-FindInFilesDialog::FindInFilesDialog(bool forReplace, TQWidget* tqparent)
- :FindDialog(forReplace, tqparent)
+FindInFilesDialog::FindInFilesDialog(bool forReplace, TQWidget* parent)
+ :FindDialog(forReplace, parent)
{
TQGroupBox* box = new TQGroupBox(2, Qt::Horizontal, i18n("File Options"), mainWidget());
mainWidget()->tqlayout()->add(box);
diff --git a/kbabel/catalogmanager/findinfilesdialog.h b/kbabel/catalogmanager/findinfilesdialog.h
index afabcb58..5f27795c 100644
--- a/kbabel/catalogmanager/findinfilesdialog.h
+++ b/kbabel/catalogmanager/findinfilesdialog.h
@@ -47,7 +47,7 @@ public:
* Constructor
* @param replaceDlg flag, if this is a replace dialog
*/
- FindInFilesDialog(bool replaceDlg, TQWidget* tqparent);
+ FindInFilesDialog(bool replaceDlg, TQWidget* parent);
~FindInFilesDialog();
/**
diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.cpp b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
index afc299b9..7043c8f3 100644
--- a/kbabel/catalogmanager/libcvs/cvsdialog.cpp
+++ b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
@@ -60,8 +60,8 @@
#include "cvsdialog.h"
-CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * tqparent, KSharedConfig* config )
- : KDialog( tqparent, "CVSDIALOG", true ), m_config( config )
+CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config )
+ : KDialog( parent, "CVSDIALOG", true ), m_config( config )
{
_cmd = cmd;
p=0L;
diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.h b/kbabel/catalogmanager/libcvs/cvsdialog.h
index 3c492704..dc726f59 100644
--- a/kbabel/catalogmanager/libcvs/cvsdialog.h
+++ b/kbabel/catalogmanager/libcvs/cvsdialog.h
@@ -73,7 +73,7 @@ class CVSDialog : public KDialog
* Constructor for creating the dialog.
* @param cmd The type of command to be executed.
*/
- CVSDialog( CVS::Command cmd, TQWidget * tqparent, KSharedConfig* config );
+ CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config );
~CVSDialog();
/**
* Set the list of files which will be used for the CVS command.
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp
index 6ab70423..b0764af8 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.cpp
+++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp
@@ -182,18 +182,18 @@ TQString CVSHandler::cvstqStatus( const TQString& filename ) const
return map[filename];
}
-void CVSHandler::execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config )
+void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config )
{
if ( !_isPORepository ) {
// This message box should never be visible but who knows... ;-)
- KMessageBox::sorry( tqparent, i18n( "This is not a valid CVS repository. "
+ KMessageBox::sorry( parent, i18n( "This is not a valid CVS repository. "
"The CVS commands cannot be executed." ) );
return;
}
TQFileInfo info( filename );
if ( !info.isDir( ) ) {
- execCVSCommand( tqparent, cmd, TQStringList( filename ), templates, config );
+ execCVSCommand( parent, cmd, TQStringList( filename ), templates, config );
return;
}
@@ -218,14 +218,14 @@ void CVSHandler::execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQS
break;
}
- showDialog( tqparent, cmd, TQStringList( filename ), command, config );
+ showDialog( parent, cmd, TQStringList( filename ), command, config );
}
-void CVSHandler::execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config )
+void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config )
{
if ( !_isPORepository ) {
// This message box should never be visible but who knows... ;-)
- KMessageBox::sorry( tqparent, i18n( "This is not a valid CVS repository. "
+ KMessageBox::sorry( parent, i18n( "This is not a valid CVS repository. "
"The CVS commands cannot be executed." ) );
return;
}
@@ -262,7 +262,7 @@ void CVSHandler::execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQS
command += " \'" + temp + "\'";
}
- showDialog( tqparent, cmd, files, command, config );
+ showDialog( parent, cmd, files, command, config );
}
void CVSHandler::setAutoUpdateTemplates( bool update )
@@ -270,9 +270,9 @@ void CVSHandler::setAutoUpdateTemplates( bool update )
_autoUpdateTemplates = update;
}
-void CVSHandler::showDialog( TQWidget* tqparent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config )
+void CVSHandler::showDialog( TQWidget* parent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config )
{
- CVSDialog * dia = new CVSDialog( cmd, tqparent, config );
+ CVSDialog * dia = new CVSDialog( cmd, parent, config );
dia->setFiles( files );
dia->setCommandLine( commandLine );
if ( cmd == CVS::Commit ) {
@@ -313,7 +313,7 @@ void CVSHandler::checkToAdd( const TQStringList& files )
toBeAdded << *it;
temp = TQFileInfo( *it ).dirPath( true );
}
- // check recursivlely if tqparent dirs have to be added as well
+ // check recursivlely if parent dirs have to be added as well
while ( fstatus( temp ) == NOT_IN_CVS && toBeAdded.findIndex( temp ) == -1 ) {
toBeAdded << temp;
temp = TQFileInfo( temp ).dirPath( true );
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.h b/kbabel/catalogmanager/libcvs/cvshandler.h
index 78e248da..1c08af92 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.h
+++ b/kbabel/catalogmanager/libcvs/cvshandler.h
@@ -79,8 +79,8 @@ class CVSHandler : public TQObject
TQString filetqStatus( const FiletqStatus status ) const;
TQString cvstqStatus( const TQString& filename ) const;
- void execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config );
- void execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config );
+ void execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config );
+ void execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config );
void setAutoUpdateTemplates( bool update );
@@ -95,7 +95,7 @@ class CVSHandler : public TQObject
void signalFilesCommitted( const TQStringList& );
private:
- void showDialog( TQWidget* tqparent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config );
+ void showDialog( TQWidget* parent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config );
void checkToAdd( const TQStringList& files );
void processStatusOutput( const TQString& status );
void processDiff( TQString output );
diff --git a/kbabel/catalogmanager/libsvn/svndialog.cpp b/kbabel/catalogmanager/libsvn/svndialog.cpp
index 01a4bccd..b54b25eb 100644
--- a/kbabel/catalogmanager/libsvn/svndialog.cpp
+++ b/kbabel/catalogmanager/libsvn/svndialog.cpp
@@ -57,8 +57,8 @@
#include "svndialog.h"
-SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * tqparent, KSharedConfig* config )
- : KDialog( tqparent, "SVN DIALOG", true ), m_tempFile( 0 ), m_config( config )
+SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config )
+ : KDialog( parent, "SVN DIALOG", true ), m_tempFile( 0 ), m_config( config )
{
_cmd = cmd;
p=0L;
diff --git a/kbabel/catalogmanager/libsvn/svndialog.h b/kbabel/catalogmanager/libsvn/svndialog.h
index 55c57f27..a8083216 100644
--- a/kbabel/catalogmanager/libsvn/svndialog.h
+++ b/kbabel/catalogmanager/libsvn/svndialog.h
@@ -72,7 +72,7 @@ class SVNDialog : public KDialog
* Constructor for creating the dialog.
* @param cmd The type of command to be executed.
*/
- SVNDialog( SVN::Command cmd, TQWidget * tqparent, KSharedConfig* config );
+ SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config );
~SVNDialog();
/**
* Set the list of files which will be used for the SVN command.
diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp
index 71907fb8..5f91e1e8 100644
--- a/kbabel/catalogmanager/libsvn/svnhandler.cpp
+++ b/kbabel/catalogmanager/libsvn/svnhandler.cpp
@@ -274,18 +274,18 @@ TQString SVNHandler::svntqStatus( const TQString& filename ) const
return map[filename];
}
-void SVNHandler::execSVNCommand( TQWidget* tqparent, SVN::Command cmd, const TQString& filename, bool templates, KSharedConfig* config)
+void SVNHandler::execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQString& filename, bool templates, KSharedConfig* config)
{
// Unlike cvs, svn works also from outside the repository(as long as the path is in a repository of course!)
// ### FIXME: wrong, svn commit cannot work if the current directory is not a SVN one
- execSVNCommand( tqparent, cmd, TQStringList( filename ), templates, config );
+ execSVNCommand( parent, cmd, TQStringList( filename ), templates, config );
}
-void SVNHandler::execSVNCommand( TQWidget* tqparent, SVN::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config )
+void SVNHandler::execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config )
{
if ( !_isPORepository ) {
// This message box should never be visible but who knows... ;-)
- KMessageBox::sorry( tqparent, i18n( "This is not a valid SVN repository. "
+ KMessageBox::sorry( parent, i18n( "This is not a valid SVN repository. "
"The SVN commands cannot be executed." ) );
return;
}
@@ -328,7 +328,7 @@ void SVNHandler::execSVNCommand( TQWidget* tqparent, SVN::Command cmd, const TQS
command += " \'" + temp + "\'";
}
- showDialog( tqparent, cmd, files, command, config );
+ showDialog( parent, cmd, files, command, config );
}
void SVNHandler::setAutoUpdateTemplates( bool update )
@@ -336,9 +336,9 @@ void SVNHandler::setAutoUpdateTemplates( bool update )
_autoUpdateTemplates = update;
}
-void SVNHandler::showDialog( TQWidget* tqparent, SVN::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config )
+void SVNHandler::showDialog( TQWidget* parent, SVN::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config )
{
- SVNDialog * dia = new SVNDialog( cmd, tqparent, config );
+ SVNDialog * dia = new SVNDialog( cmd, parent, config );
dia->setFiles( files );
dia->setCommandLine( commandLine );
if ( cmd == SVN::Commit ) {
@@ -415,7 +415,7 @@ void SVNHandler::checkToAdd( const TQStringList& files )
}
// ### TODO: does SVN really needs this or does it do it automatically?
- // check recursivlely if tqparent dirs have to be added as well
+ // check recursivlely if parent dirs have to be added as well
while ( ! isInSvn( temp ) && toBeAdded.findIndex( temp ) == -1 ) {
toBeAdded << temp;
temp = TQFileInfo( temp ).dirPath( true );
diff --git a/kbabel/catalogmanager/libsvn/svnhandler.h b/kbabel/catalogmanager/libsvn/svnhandler.h
index cad3e93f..57ce13b4 100644
--- a/kbabel/catalogmanager/libsvn/svnhandler.h
+++ b/kbabel/catalogmanager/libsvn/svnhandler.h
@@ -78,8 +78,8 @@ class SVNHandler : public TQObject
TQString filetqStatus( const FiletqStatus status ) const;
TQString svntqStatus( const TQString& filename ) const;
- void execSVNCommand( TQWidget* tqparent, SVN::Command cmd, const TQString& filename, bool templates, KSharedConfig* config );
- void execSVNCommand( TQWidget* tqparent, SVN::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config );
+ void execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQString& filename, bool templates, KSharedConfig* config );
+ void execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config );
void setAutoUpdateTemplates( bool update );
@@ -94,7 +94,7 @@ class SVNHandler : public TQObject
void signalFilesCommitted( const TQStringList& );
private:
- void showDialog( TQWidget* tqparent, SVN::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config );
+ void showDialog( TQWidget* parent, SVN::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config );
/// Check quickly if the file is part of a SVN repository
bool isInSvn( const TQString& path );
void checkToAdd( const TQStringList& files );
diff --git a/kbabel/catalogmanager/markpatterndialog.cpp b/kbabel/catalogmanager/markpatterndialog.cpp
index 063069e6..c53b008f 100644
--- a/kbabel/catalogmanager/markpatterndialog.cpp
+++ b/kbabel/catalogmanager/markpatterndialog.cpp
@@ -47,8 +47,8 @@
#include "markpatterndialog.h"
#include "markpatternwidget.h"
-MarkPatternDialog::MarkPatternDialog(TQWidget * tqparent, const char * name)
- : KDialogBase(tqparent, name, true, 0, Ok|Cancel, Ok)
+MarkPatternDialog::MarkPatternDialog(TQWidget * parent, const char * name)
+ : KDialogBase(parent, name, true, 0, Ok|Cancel, Ok)
{
actionButton(Ok)->setEnabled(false);
diff --git a/kbabel/catalogmanager/markpatterndialog.h b/kbabel/catalogmanager/markpatterndialog.h
index 46a39c32..3ca2d232 100644
--- a/kbabel/catalogmanager/markpatterndialog.h
+++ b/kbabel/catalogmanager/markpatterndialog.h
@@ -46,7 +46,7 @@ class MarkPatternDialog : public KDialogBase
TQ_OBJECT
public:
- MarkPatternDialog(TQWidget * tqparent, const char * name = 0);
+ MarkPatternDialog(TQWidget * parent, const char * name = 0);
TQString pattern( );
bool isCaseSensitive( );
diff --git a/kbabel/catalogmanager/multiroughtransdlg.cpp b/kbabel/catalogmanager/multiroughtransdlg.cpp
index e5b272f1..16373a0b 100644
--- a/kbabel/catalogmanager/multiroughtransdlg.cpp
+++ b/kbabel/catalogmanager/multiroughtransdlg.cpp
@@ -48,11 +48,11 @@
using namespace KBabel;
MultiRoughTransDlg::MultiRoughTransDlg(KBabelDictBox *dict, TQPtrList<CatManListItem> files
- , TQWidget *tqparent,const char *name)
- : RoughTransDlg(dict, new Catalog(), tqparent, name )
+ , TQWidget *parent,const char *name)
+ : RoughTransDlg(dict, new Catalog(), parent, name )
,_fileList(files)
{
- TQWidget* bars = TQT_TQWIDGET(progressbar->tqparent());
+ TQWidget* bars = TQT_TQWIDGET(progressbar->parent());
TQLabel* label = new TQLabel( i18n("Files:"), bars );
filesProgressbar = new KProgress(bars,"files progressbar");
filesProgressbar->setTextEnabled(true);
diff --git a/kbabel/catalogmanager/multiroughtransdlg.h b/kbabel/catalogmanager/multiroughtransdlg.h
index 560ae1d8..4c5b8fc3 100644
--- a/kbabel/catalogmanager/multiroughtransdlg.h
+++ b/kbabel/catalogmanager/multiroughtransdlg.h
@@ -43,7 +43,7 @@ class MultiRoughTransDlg : public RoughTransDlg
TQ_OBJECT
public:
- MultiRoughTransDlg(KBabelDictBox* dictBox, TQPtrList<CatManListItem> list, TQWidget *tqparent
+ MultiRoughTransDlg(KBabelDictBox* dictBox, TQPtrList<CatManListItem> list, TQWidget *parent
, const char *name=0);
protected slots:
diff --git a/kbabel/catalogmanager/validateprogress.cpp b/kbabel/catalogmanager/validateprogress.cpp
index a5440a6f..42fd3f39 100644
--- a/kbabel/catalogmanager/validateprogress.cpp
+++ b/kbabel/catalogmanager/validateprogress.cpp
@@ -52,8 +52,8 @@
// version identification for validation ignores
#define IGNOREFILE_VERSION 0x00
-ValidateProgressDialog::ValidateProgressDialog(const TQString& ignoreURL, TQWidget *tqparent,const char *name)
- : KDialogBase(tqparent,name,true,i18n("Caption of dialog","Validation")
+ValidateProgressDialog::ValidateProgressDialog(const TQString& ignoreURL, TQWidget *parent,const char *name)
+ : KDialogBase(parent,name,true,i18n("Caption of dialog","Validation")
, Close, Close)
, _ignoreURL(ignoreURL), _tool(0), _stopped(false)
, _ignoreFuzzy(false), _setAsFuzzy(false)
diff --git a/kbabel/catalogmanager/validateprogress.h b/kbabel/catalogmanager/validateprogress.h
index f0ae950f..feb0088d 100644
--- a/kbabel/catalogmanager/validateprogress.h
+++ b/kbabel/catalogmanager/validateprogress.h
@@ -62,7 +62,7 @@ class ValidateProgressDialog : public KDialogBase
TQ_OBJECT
public:
- ValidateProgressDialog(const TQString& ignoreURL, TQWidget* tqparent, const char *name=0);
+ ValidateProgressDialog(const TQString& ignoreURL, TQWidget* parent, const char *name=0);
virtual ~ValidateProgressDialog();
void setIgnoreFuzzy(bool enable) { _ignoreFuzzy = enable; }