summaryrefslogtreecommitdiffstats
path: root/kbabel/catalogmanager
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:50:38 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:50:38 -0600
commitd6331f1b56eb6dca7a1950658b2932f208015da0 (patch)
treef99bf8d1571f93304bdb4a46fb199a1bde60e6ee /kbabel/catalogmanager
parente738fee8847c1f606df7b338a589cc8c0539a521 (diff)
downloadtdesdk-d6331f1b56eb6dca7a1950658b2932f208015da0.tar.gz
tdesdk-d6331f1b56eb6dca7a1950658b2932f208015da0.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'kbabel/catalogmanager')
-rw-r--r--kbabel/catalogmanager/catalogmanager.cpp24
-rw-r--r--kbabel/catalogmanager/catalogmanagerview.cpp92
-rw-r--r--kbabel/catalogmanager/catalogmanagerview.h4
-rw-r--r--kbabel/catalogmanager/catmanlistitem.cpp54
-rw-r--r--kbabel/catalogmanager/catmanlistitem.h8
-rw-r--r--kbabel/catalogmanager/findinfilesdialog.cpp4
-rw-r--r--kbabel/catalogmanager/libcvs/cvsdialog.cpp58
-rw-r--r--kbabel/catalogmanager/libcvs/cvshandler.cpp16
-rw-r--r--kbabel/catalogmanager/libcvs/cvshandler.h10
-rw-r--r--kbabel/catalogmanager/libcvs/cvsresources.h2
-rw-r--r--kbabel/catalogmanager/libsvn/svndialog.cpp36
-rw-r--r--kbabel/catalogmanager/libsvn/svnhandler.cpp26
-rw-r--r--kbabel/catalogmanager/libsvn/svnhandler.h10
-rw-r--r--kbabel/catalogmanager/multiroughtransdlg.cpp26
-rw-r--r--kbabel/catalogmanager/validateprogress.cpp2
-rw-r--r--kbabel/catalogmanager/validateprogresswidget.ui4
-rw-r--r--kbabel/catalogmanager/validateprogresswidget.ui.h2
-rw-r--r--kbabel/catalogmanager/validationoptions.ui2
18 files changed, 190 insertions, 190 deletions
diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index 572c593c..01aa6b41 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -79,7 +79,7 @@
#include <tqwhatsthis.h>
#include <tqheader.h>
#include <tqdragobject.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqhbox.h>
using namespace KBabel;
@@ -126,7 +126,7 @@ void CatalogManager::init()
if ( _project == NULL )
{
- KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(_configFile)
+ KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(_configFile)
, i18n("Project File Error"));
_project = KBabel::ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
@@ -136,13 +136,13 @@ void CatalogManager::init()
, TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
TQWidget *view = new TQWidget(this);
- TQVBoxLayout* tqlayout= new TQVBoxLayout(view);
- tqlayout->setMargin(0);
- tqlayout->setSpacing(KDialog::spacingHint());
+ TQVBoxLayout* layout= new TQVBoxLayout(view);
+ layout->setMargin(0);
+ layout->setSpacing(KDialog::spacingHint());
_catalogManager=new CatalogManagerView(_project, view,"catalog manager");
- tqlayout->addWidget(_catalogManager);
- tqlayout->setStretchFactor(_catalogManager,1);
+ layout->addWidget(_catalogManager);
+ layout->setStretchFactor(_catalogManager,1);
connect(this,TQT_SIGNAL(settingsChanged(KBabel::CatManSettings))
,TQT_TQOBJECT(_catalogManager),TQT_SLOT(setSettings(KBabel::CatManSettings)));
@@ -162,7 +162,7 @@ void CatalogManager::init()
KWin::setIcons(winId(),BarIcon("catalogmanager",32)
,SmallIcon("catalogmanager"));
- TQHBoxLayout* hBoxL = new TQHBoxLayout(tqlayout);
+ TQHBoxLayout* hBoxL = new TQHBoxLayout(layout);
_progressLabel = new TQLabel(view);
hBoxL->addWidget(_progressLabel);
_progressBar=new KProgress(view);
@@ -431,7 +431,7 @@ void CatalogManager::setupActions()
(void)new KAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsCommitMarked( ) ), actionCollection( ), "cvs_commit_marked" );
(void)new KAction( i18n( "Status" ), 0, TQT_TQOBJECT(_catalogManager),
- TQT_SLOT( cvstqStatus( ) ), actionCollection( ), "cvs_status" );
+ TQT_SLOT( cvsStatus( ) ), actionCollection( ), "cvs_status" );
(void)new KAction( i18n( "Status for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsStatusMarked( ) ), actionCollection( ), "cvs_status_marked" );
(void)new KAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager),
@@ -552,7 +552,7 @@ void CatalogManager::setupStatusBar()
_statusProgressBar->hide();
statusBar()->addWidget(progressBox,1);
- statusBar()->setMinimumHeight(_statusProgressBar->tqsizeHint().height());
+ statusBar()->setMinimumHeight(_statusProgressBar->sizeHint().height());
TQWhatsThis::add(statusBar(),
i18n("<qt><p><b>Statusbar</b></p>\n"
@@ -912,7 +912,7 @@ void CatalogManager::clearStatusProgressBar()
void CatalogManager::setNumberOfFound(int toBeSent, int total)
{
- _foundLabel->setText(i18n("Found: %1/%2").tqarg(toBeSent).tqarg(total));
+ _foundLabel->setText(i18n("Found: %1/%2").arg(toBeSent).arg(total));
}
void CatalogManager::decreaseNumberOfFound()
@@ -1232,7 +1232,7 @@ void CatalogManager::projectOpen()
}
else
{
- KMessageBox::error (this, i18n("Cannot open project file %1").tqarg(file));
+ KMessageBox::error (this, i18n("Cannot open project file %1").arg(file));
}
}
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index 2473af73..10630c6d 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -80,8 +80,8 @@
#include <tqwhatsthis.h>
#include <tqheader.h>
#include <tqdragobject.h>
-#include <tqlayout.h>
-#include <tqtextedit.h>
+#include <layout.h>
+#include <textedit.h>
using namespace KBabel;
@@ -445,7 +445,7 @@ void CatalogManagerView::loadMarks()
#endif
{
KMessageBox::error(this,i18n(
- "Error while trying to open file:\n %1").tqarg(url.prettyURL()));
+ "Error while trying to open file:\n %1").arg(url.prettyURL()));
return;
}
@@ -471,7 +471,7 @@ void CatalogManagerView::loadMarks()
{
KMessageBox::error(this
,i18n("Error while trying to read file:\n %1\n"
- "Maybe it is not a valid file with list of markings.").tqarg(url.prettyURL()));
+ "Maybe it is not a valid file with list of markings.").arg(url.prettyURL()));
f.close();
return;
}
@@ -480,7 +480,7 @@ void CatalogManagerView::loadMarks()
else
{
KMessageBox::error(this,i18n(
- "Error while trying to open file:\n %1").tqarg(url.prettyURL()));
+ "Error while trying to open file:\n %1").arg(url.prettyURL()));
}
KIO::NetAccess::removeTempFile( filename );
@@ -516,8 +516,8 @@ void CatalogManagerView::saveMarks()
// ### FIXME: why is the file dialog not doing this?
if ( KIO::NetAccess::exists( url2, false, this ) )
{
- if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").tqarg(i18n("The file %1 already exists. "
- "Do you want to overwrite it?").tqarg(url2.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel)
+ if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. "
+ "Do you want to overwrite it?").arg(url2.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel)
{
return;
}
@@ -568,7 +568,7 @@ void CatalogManagerView::saveMarks()
{
// ### KDE4 FIXME: strip the final \n of the message
KMessageBox::error( this,
- i18n( "An error occurred while trying to write to file:\n%1\n" ).tqarg( url.prettyURL()) );
+ i18n( "An error occurred while trying to write to file:\n%1\n" ).arg( url.prettyURL()) );
}
else if ( !localFile )
{
@@ -577,7 +577,7 @@ void CatalogManagerView::saveMarks()
{
// ### KDE4 FIXME: strip the final \n of the message
KMessageBox::error(this,
- i18n("An error occurred while trying to upload the file:\n%1\n").tqarg(url.prettyURL()));
+ i18n("An error occurred while trying to upload the file:\n%1\n").arg(url.prettyURL()));
}
}
@@ -713,7 +713,7 @@ void CatalogManagerView::markedStatistics()
showStatistics( i, markedDoList );
}
-void CatalogManagerView::showStatistics( CatManListItem *i, TQStringList &tqchildrenList )
+void CatalogManagerView::showStatistics( CatManListItem *i, TQStringList &childrenList )
{
KLocale *locale = KGlobal::locale();
@@ -727,7 +727,7 @@ void CatalogManagerView::showStatistics( CatManListItem *i, TQStringList &tqchi
int totalUntranslated=0;
TQStringList::const_iterator it;
- for( it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it )
+ for( it = childrenList.constBegin(); it != childrenList.constEnd(); ++it )
{
CatManListItem* item = _fileList[(*it)];
@@ -768,29 +768,29 @@ void CatalogManagerView::showStatistics( CatManListItem *i, TQStringList &tqchi
if(name.isEmpty())
msg = i18n("Statistics for all:\n");
else
- msg = i18n("Statistics for %1:\n").tqarg(name);
+ msg = i18n("Statistics for %1:\n").arg(name);
- msg+=i18n("Number of packages: %1\n").tqarg(locale->formatNumber(totalPackages, 0));
+ msg+=i18n("Number of packages: %1\n").arg(locale->formatNumber(totalPackages, 0));
percent=100.0-((double)needworkPo*100.0)/totalPackages;
- msg+=i18n("Complete translated: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalPackages-needworkPo, 0));
+ msg+=i18n("Complete translated: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalPackages-needworkPo, 0));
percent=100.0-((double)totalPo*100.0)/totalPackages;
- msg+=i18n("Only template available: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalPackages-totalPo,0));
+ msg+=i18n("Only template available: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalPackages-totalPo,0));
percent=((double)totalNoPot*100.0)/totalPackages;
- msg+=i18n("Only PO file available: %1 % (%2)\n").tqarg(locale->formatNumber(percent,02)).tqarg(locale->formatNumber(totalNoPot, 0));
+ msg+=i18n("Only PO file available: %1 % (%2)\n").arg(locale->formatNumber(percent,02)).arg(locale->formatNumber(totalNoPot, 0));
- msg+=i18n("Number of messages: %1\n").tqarg(locale->formatNumber(totalMsgid, 0));
+ msg+=i18n("Number of messages: %1\n").arg(locale->formatNumber(totalMsgid, 0));
long int totalTranslated = totalMsgid - totalFuzzy - totalUntranslated;
percent=((double)totalTranslated*100.0)/totalMsgid;
- msg+=i18n("Translated: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalTranslated, 0));
+ msg+=i18n("Translated: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalTranslated, 0));
percent=((double)totalFuzzy*100.0)/totalMsgid;
- msg+=i18n("Fuzzy: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalFuzzy, 0));
+ msg+=i18n("Fuzzy: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalFuzzy, 0));
percent=((double)totalUntranslated*100.0)/totalMsgid;
- msg+=i18n("Untranslated: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalUntranslated, 0));
+ msg+=i18n("Untranslated: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalUntranslated, 0));
KMessageBox::information(this,msg,i18n("Statistics"));
}
@@ -807,7 +807,7 @@ void CatalogManagerView::checkSyntax()
if(!item->hasPo())
return;
- Msgfmt::tqStatus status;
+ Msgfmt::Status status;
TQString output;
Msgfmt msgfmt;
@@ -850,7 +850,7 @@ void CatalogManagerView::checkSyntax()
}
else
{
- Msgfmt::tqStatus status;
+ Msgfmt::Status status;
TQString output;
Msgfmt msgfmt;
@@ -866,7 +866,7 @@ void CatalogManagerView::checkSyntax()
if(!name.isEmpty())
{
msg=i18n("All files in folder %1 are syntactically correct.\n"
-"Output of \"msgfmt --statistics\":\n").tqarg(name)+output;
+"Output of \"msgfmt --statistics\":\n").arg(name)+output;
}
else
{
@@ -882,7 +882,7 @@ void CatalogManagerView::checkSyntax()
if(!name.isEmpty())
{
msg=i18n("At least one file in folder %1 has syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n").tqarg(name)+output;
+"Output of \"msgfmt --statistics\":\n").arg(name)+output;
}
else
{
@@ -898,7 +898,7 @@ void CatalogManagerView::checkSyntax()
if(!name.isEmpty())
{
msg=i18n("At least one file in folder %1 has header syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n").tqarg(name)+output;
+"Output of \"msgfmt --statistics\":\n").arg(name)+output;
}
else
{
@@ -914,7 +914,7 @@ void CatalogManagerView::checkSyntax()
if(!name.isEmpty())
{
msg=i18n("An error occurred while processing \"msgfmt --statistics *.po\" "
-"in folder %1").tqarg(name);
+"in folder %1").arg(name);
}
else
{
@@ -985,10 +985,10 @@ void CatalogManagerView::mailFiles()
CatManListItem* item = (CatManListItem*)currentItem();
if(item->isDir()) {
TQStringList filesToSend;
- TQStringList tqchildrenList = item->allChildrenList(true);
+ TQStringList childrenList = item->allChildrenList(true);
TQStringList::const_iterator it;
- for (it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it) {
+ for (it = childrenList.constBegin(); it != childrenList.constEnd(); ++it) {
CatManListItem* i = _fileList[(*it)];
if (i->hasPo()) {
filesToSend << i->poFile();
@@ -1023,10 +1023,10 @@ void CatalogManagerView::packageFiles( )
CatManListItem* item = (CatManListItem*)currentItem();
if(item->isDir()) {
TQStringList filesToPackage;
- TQStringList tqchildrenList = item->allChildrenList(true);
+ TQStringList childrenList = item->allChildrenList(true);
TQStringList::const_iterator it;
- for (it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it) {
+ for (it = childrenList.constBegin(); it != childrenList.constEnd(); ++it) {
CatManListItem* i = _fileList[(*it)];
if (i->hasPo()) {
filesToPackage << i->poFile();
@@ -1082,14 +1082,14 @@ void CatalogManagerView::cvsCommitMarked( )
doCVSCommand( CVS::Commit, true );
}
-void CatalogManagerView::cvstqStatus( )
+void CatalogManagerView::cvsStatus( )
{
- doCVSCommand( CVS::tqStatus );
+ doCVSCommand( CVS::Status );
}
void CatalogManagerView::cvsStatusMarked( )
{
- doCVSCommand( CVS::tqStatus, true );
+ doCVSCommand( CVS::Status, true );
}
void CatalogManagerView::cvsUpdateTemplate( )
@@ -1137,7 +1137,7 @@ void CatalogManagerView::doCVSCommand( CVS::Command cmd, bool marked, bool templ
TQString cvsItem;
CatManListItem * item = (CatManListItem*)currentItem( );
if ( ( cmd == CVS::Commit || cmd == CVS::Diff ) && item->isDir( ) ) {
- // all tqchildren including directories
+ // all children including directories
TQStringList cvsItems = item->allChildrenFileList (true, false, true);
if ( !cvsItems.isEmpty( ) )
cvshandler->execCVSCommand( this, cmd, cvsItems, templates, config );
@@ -1249,7 +1249,7 @@ void CatalogManagerView::doSVNCommand( SVN::Command cmd, bool marked, bool templ
TQString svnItem;
CatManListItem * item = (CatManListItem*)currentItem( );
if ( ( cmd == SVN::Commit || cmd == SVN::Diff ) && item->isDir( ) ) {
- // all tqchildren including directories
+ // all children including directories
TQStringList svnItems = item->allChildrenFileList (true, false, true);
if ( !svnItems.isEmpty( ) )
svnhandler->execSVNCommand( this, cmd, svnItems, templates, config );
@@ -1283,14 +1283,14 @@ TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest )
const TQString search = options.findStr.lower().simplifyWhiteSpace();
TQStringList searchWords = TQStringList::split(' ', search);
- TQStringList tqchildrenList;
- if( i->isFile() ) tqchildrenList.append(i->name());
- else tqchildrenList =i->allChildrenList(true);
+ TQStringList childrenList;
+ if( i->isFile() ) childrenList.append(i->name());
+ else childrenList =i->allChildrenList(true);
- emit prepareFindProgressBar(tqchildrenList.size());
+ emit prepareFindProgressBar(childrenList.size());
TQStringList::const_iterator it;
- for( it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it )
+ for( it = childrenList.constBegin(); it != childrenList.constEnd(); ++it )
{
CatManListItem* item = _fileList[(*it)];
@@ -1341,7 +1341,7 @@ TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest )
const TQString foundItemFile = itemFile;
it++;
- while( it != tqchildrenList.constEnd() )
+ while( it != childrenList.constEnd() )
{
CatManListItem *item = _fileList[(*it)];
@@ -1499,12 +1499,12 @@ void CatalogManagerView::slotDeleteFile()
if(item && item->isFile() && item->hasPo() && !item->hasPot())
{
- const TQString msg=i18n("Do you really want to delete the file %1?").tqarg(item->poFile());
+ const TQString msg=i18n("Do you really want to delete the file %1?").arg(item->poFile());
if(KMessageBox::warningContinueCancel(this,msg,i18n("Warning"),KGuiItem( i18n("Delete"), "editdelete"))== KMessageBox::Continue)
{
if(!TQFile::remove(item->poFile()))
{
- KMessageBox::sorry(this,i18n("Was not able to delete the file %1!").tqarg(item->poFile()));
+ KMessageBox::sorry(this,i18n("Was not able to delete the file %1!").arg(item->poFile()));
}
}
}
@@ -1765,7 +1765,7 @@ void CatalogManagerView::buildTree()
{
KMessageBox::error(this,i18n("You have not specified a valid folder "
"for the base folder of the PO files:\n%1\n"
-"Please check your settings in the project settings dialog.").tqarg(_settings.poBaseDir));
+"Please check your settings in the project settings dialog.").arg(_settings.poBaseDir));
_active=false;
_updateNesting--;
@@ -1782,7 +1782,7 @@ void CatalogManagerView::buildTree()
{
KMessageBox::error(this,i18n("You have not specified a valid folder "
"for the base folder of the PO template files:\n%1\n"
-"Please check your settings in the project settings dialog.").tqarg(_settings.potBaseDir));
+"Please check your settings in the project settings dialog.").arg(_settings.potBaseDir));
}
cvshandler->setPOTBaseDir( _settings.potBaseDir );
@@ -3008,7 +3008,7 @@ void CatalogManagerView::validate_internal( const TQStringList& files, const KDa
true, i18n("Validation Options"), KDialogBase::Ok|KDialogBase::Cancel);
_validateOptions = new ValidationOptions(_validateOptionsDlg);
_validateOptionsDlg->setMainWidget( _validateOptions );
- _validateOptions->resize( _validateOptions->tqsizeHint() );
+ _validateOptions->resize( _validateOptions->sizeHint() );
// setup stored values
_validateOptions->markAsFuzzy->setChecked( _markAsFuzzy );
diff --git a/kbabel/catalogmanager/catalogmanagerview.h b/kbabel/catalogmanager/catalogmanagerview.h
index d923a3bb..fe4b7d35 100644
--- a/kbabel/catalogmanager/catalogmanagerview.h
+++ b/kbabel/catalogmanager/catalogmanagerview.h
@@ -161,7 +161,7 @@ public slots:
void cvsUpdateMarked( );
void cvsCommit( );
void cvsCommitMarked( );
- void cvstqStatus( );
+ void cvsStatus( );
void cvsStatusMarked( );
void cvsUpdateTemplate( );
void cvsUpdateMarkedTemplate( );
@@ -235,7 +235,7 @@ public slots:
/**
* Returns the list of all currently selected files. If current selection is dir,
- * it returns list of all its tqchildren.
+ * it returns list of all its children.
*/
TQStringList current();
/**
diff --git a/kbabel/catalogmanager/catmanlistitem.cpp b/kbabel/catalogmanager/catmanlistitem.cpp
index d5997dd5..52f248e2 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 tqchildrenList;
+ TQStringList childrenList;
CatManListItem * myChild = (CatManListItem*)firstChild();
while( myChild )
@@ -192,26 +192,26 @@ TQStringList CatManListItem::allChildrenList(bool onlyFiles) const
if(myChild->isFile())
{
- tqchildrenList.append(name);
+ childrenList.append(name);
}
else if(myChild->isDir())
{
if(!onlyFiles)
- tqchildrenList.append(name);
+ childrenList.append(name);
- tqchildrenList+=myChild->allChildrenList(onlyFiles);
+ childrenList+=myChild->allChildrenList(onlyFiles);
}
myChild = (CatManListItem*)myChild->nextSibling();
}
- return tqchildrenList;
+ return childrenList;
}
TQStringList CatManListItem::allChildrenFileList(bool onlyFiles, bool emptyDirs, bool onlyModified) const
{
- TQStringList tqchildrenList;
+ TQStringList childrenList;
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))
{
- tqchildrenList.append(myChild->poFile());
+ childrenList.append(myChild->poFile());
}
else if(myChild->isDir())
{
if(!onlyFiles && (emptyDirs || myChild->_primary.exists() ))
{
- tqchildrenList.append(myChild->poFile());
+ childrenList.append(myChild->poFile());
}
- tqchildrenList+=myChild->allChildrenFileList(onlyFiles,false,onlyModified);
+ childrenList+=myChild->allChildrenFileList(onlyFiles,false,onlyModified);
}
myChild = (CatManListItem*)myChild->nextSibling();
}
- return tqchildrenList;
+ return childrenList;
}
@@ -417,7 +417,7 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren
if(showPoInfo)
{
- _lastUpdated=TQDateTime::tqcurrentDateTime();
+ _lastUpdated=TQDateTime::currentDateTime();
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::FiletqStatus cvsFiletqStatus = cvsHandler->fstatus( poFile() );
- const SVNHandler::FiletqStatus svnFiletqStatus = svnHandler->fstatus( poFile() );
+ const CVSHandler::FileStatus cvsFileStatus = cvsHandler->fstatus( poFile() );
+ const SVNHandler::FileStatus svnFileStatus = svnHandler->fstatus( poFile() );
- _isModified = cvsHandler->isConsideredModified( cvsFiletqStatus )
- || svnHandler->isConsideredModified( svnFiletqStatus );
+ _isModified = cvsHandler->isConsideredModified( cvsFileStatus )
+ || svnHandler->isConsideredModified( svnFileStatus );
TQString versionControl;
- if ( cvsFiletqStatus != CVSHandler::NO_REPOSITORY )
- versionControl = cvsHandler->filetqStatus( cvsFiletqStatus );
- else if ( svnFiletqStatus != SVNHandler::NO_REPOSITORY )
- versionControl = svnHandler->filetqStatus( svnFiletqStatus );
+ if ( cvsFileStatus != CVSHandler::NO_REPOSITORY )
+ versionControl = cvsHandler->fileStatus( cvsFileStatus );
+ else if ( svnFileStatus != SVNHandler::NO_REPOSITORY )
+ versionControl = svnHandler->fileStatus( svnFileStatus );
else
versionControl = i18n("No version control");
@@ -532,7 +532,7 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren
if(showPoInfo)
{
- _lastUpdated=TQDateTime::tqcurrentDateTime();
+ _lastUpdated=TQDateTime::currentDateTime();
// 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::tqcurrentDateTime();
+ _lastUpdated=TQDateTime::currentDateTime();
bool neededWork=needsWork();
bool needWork=false;
@@ -625,14 +625,14 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo )
TQPixmap icon;
_hasErrors=false;
- const CVSHandler::FiletqStatus cvsFiletqStatus = _view->cvsHandler()->fstatus(poFile());
- const SVNHandler::FiletqStatus svnFiletqStatus = _view->svnHandler()->fstatus(poFile());
+ const CVSHandler::FileStatus cvsFileStatus = _view->cvsHandler()->fstatus(poFile());
+ const SVNHandler::FileStatus svnFileStatus = _view->svnHandler()->fstatus(poFile());
TQString versionControl;
- if ( cvsFiletqStatus != CVSHandler::NO_REPOSITORY )
- versionControl = _view->cvsHandler()->filetqStatus( cvsFiletqStatus );
- else if ( svnFiletqStatus != SVNHandler::NO_REPOSITORY )
- versionControl = _view->svnHandler()->filetqStatus( svnFiletqStatus );
+ if ( cvsFileStatus != CVSHandler::NO_REPOSITORY )
+ versionControl = _view->cvsHandler()->fileStatus( cvsFileStatus );
+ else if ( svnFileStatus != SVNHandler::NO_REPOSITORY )
+ versionControl = _view->svnHandler()->fileStatus( svnFileStatus );
else
versionControl = i18n("No version control");
diff --git a/kbabel/catalogmanager/catmanlistitem.h b/kbabel/catalogmanager/catmanlistitem.h
index ac22e2e8..b94a0618 100644
--- a/kbabel/catalogmanager/catmanlistitem.h
+++ b/kbabel/catalogmanager/catmanlistitem.h
@@ -68,11 +68,11 @@ public:
/**
* returns the package names (including relative path) of the
- * tqchildren of this item
+ * children of this item
*/
TQStringList contentsList(bool onlyFiles=false) const;
/**
- * returns the package names of all tqchildren of this item
+ * returns the package names of all children of this item
* (including all subdirectries)
* @param onlyFiles flag, if only the names of files should be returned
* @see CatManListItem::contentsList
@@ -80,7 +80,7 @@ public:
TQStringList allChildrenList(bool onlyFiles=false) const;
/**
- * returns the relative file names of all tqchildren of this item
+ * returns the relative file names of all children of this item
* (including all subdirectries)
* @param onlyFiles flag, if only the names of files should be returned
* @param emptyDirs flag, if the empty dirs (dirs without PO files in them) should be returned
@@ -183,7 +183,7 @@ private:
* @param showPoInfo if true, reads information about the
* file using @ref Catalog::info
* ( slow for big files )
- * @param includeChildren flag, if possible tqchildren should be updated,too
+ * @param includeChildren flag, if possible children should be updated,too
* @param noParents flag, if parents should be updated, when state
* of the item has changed
*/
diff --git a/kbabel/catalogmanager/findinfilesdialog.cpp b/kbabel/catalogmanager/findinfilesdialog.cpp
index 25c37594..6fa274d4 100644
--- a/kbabel/catalogmanager/findinfilesdialog.cpp
+++ b/kbabel/catalogmanager/findinfilesdialog.cpp
@@ -34,7 +34,7 @@
#include <tqcheckbox.h>
#include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqwhatsthis.h>
#include <kconfig.h>
@@ -48,7 +48,7 @@ FindInFilesDialog::FindInFilesDialog(bool forReplace, TQWidget* parent)
:FindDialog(forReplace, parent)
{
TQGroupBox* box = new TQGroupBox(2, Qt::Horizontal, i18n("File Options"), mainWidget());
- mainWidget()->tqlayout()->add(box);
+ mainWidget()->layout()->add(box);
_inAllFiles = new TQCheckBox(i18n("&In all files"),box);
_inMarked = new TQCheckBox(i18n("&Marked files"),box);
diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.cpp b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
index 1cfd6ab7..04ecd906 100644
--- a/kbabel/catalogmanager/libcvs/cvsdialog.cpp
+++ b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
@@ -38,13 +38,13 @@
#include <tqfileinfo.h>
#include <tqframe.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlistbox.h>
#include <tqpushbutton.h>
#include <tqstring.h>
#include <tqstringlist.h>
-#include <tqtextedit.h>
-#include <tqtextcodec.h>
+#include <textedit.h>
+#include <textcodec.h>
// KDE include files
#include <kconfig.h>
#include <kdebug.h>
@@ -69,7 +69,7 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
TQString temp;
- TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" );
+ TQVBoxLayout * layout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" );
// Set the label's text depending on the CVS command.
switch ( cmd ) {
@@ -79,18 +79,18 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
case CVS::Commit:
temp = i18n( "Commit the following files:" );
break;
- case CVS::tqStatus:
+ case CVS::Status:
temp = i18n( "Get status for the following files:" );
break;
case CVS::Diff:
temp = i18n( "Get diff for the following files:" );
break;
}
- tqlayout->addWidget( new TQLabel( temp, this ) );
+ layout->addWidget( new TQLabel( temp, this ) );
// Widget for showing the list of files.
filebox = new TQListBox( this );
- tqlayout->addWidget( filebox );
+ layout->addWidget( filebox );
// Add special widgets for 'cvs commit'.
if ( cmd == CVS::Commit ) {
@@ -101,25 +101,25 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
oldMessages = new TQComboBox( this );
oldMessages->setDuplicatesEnabled( false );
label->setBuddy( oldMessages );
- tqlayout->addWidget( label );
- tqlayout->addWidget( oldMessages );
+ layout->addWidget( label );
+ layout->addWidget( oldMessages );
// Textfield for entering a log message.
label = new TQLabel( i18n( "&Log message:" ), this );
logedit = new TQTextEdit( this );
label->setBuddy( logedit );
- tqlayout->addWidget( label );
- tqlayout->addWidget( logedit );
+ layout->addWidget( label );
+ layout->addWidget( logedit );
label = new TQLabel( i18n( "E&ncoding:" ), this );
m_encodingComboBox = new KComboBox( this );
label->setBuddy( m_encodingComboBox );
- tqlayout->addWidget( label );
- tqlayout->addWidget( m_encodingComboBox );
+ layout->addWidget( label );
+ layout->addWidget( m_encodingComboBox );
TQStringList encodingList;
// The last encoding will be added at the top of the list, when the seetings will be read.
- encodingList << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
- encodingList << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->mimeName() );
+ encodingList << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
+ encodingList << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->mimeName() );
encodingList += KGlobal::charsets()->descriptiveEncodingNames();
m_encodingComboBox->insertStringList( encodingList );
@@ -143,7 +143,7 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
case CVS::Commit:
temp = i18n( "&Commit" );
break;
- case CVS::tqStatus:
+ case CVS::Status:
temp = i18n( "&Get Status" );
break;
case CVS::Diff:
@@ -156,19 +156,19 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
cancelBtn = new TQPushButton( i18n( "C&ancel" ), this );
buttons->addWidget( cancelBtn );
- tqlayout->addLayout( buttons );
+ layout->addLayout( buttons );
TQFrame * line = new TQFrame( this );
line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
- tqlayout->addWidget( line );
+ layout->addWidget( line );
- tqlayout->addWidget( new TQLabel( i18n( "Command output:" ), this ) );
+ layout->addWidget( new TQLabel( i18n( "Command output:" ), this ) );
output = new TQTextEdit( this );
output->setReadOnly( true );
- tqlayout->addWidget( output );
+ layout->addWidget( output );
- resize( TQSize( 600, 450 ).expandedTo( tqminimumSizeHint( ) ) );
+ resize( TQSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) );
if ( cmd == CVS::Commit )
logedit->setFocus( );
@@ -244,14 +244,14 @@ void CVSDialog::slotExecuteCommand( )
if ( !codec )
{
- KMessageBox::error( this, i18n( "Cannot find encoding: %1" ).tqarg( m_encoding ) );
+ KMessageBox::error( this, i18n( "Cannot find encoding: %1" ).arg( m_encoding ) );
return;
}
else if ( !codec->canEncode( msg ) )
{
const int res = KMessageBox::warningContinueCancel( this,
i18n( "The commit log message cannot be encoded in the selected encoding: %1.\n"
- "Do you want to continue?" ).tqarg( m_encoding ) );
+ "Do you want to continue?" ).arg( m_encoding ) );
if ( res != KMessageBox::Continue )
return;
}
@@ -330,7 +330,7 @@ void CVSDialog::slotProcessStdout( KProcess*, char * buffer, int len )
output->setCursorPosition( output->lines( ), 0 );
// If the command is 'cvs status' or 'cvs diff' collect the output of stdout.
- if ( (_cmd == CVS::tqStatus) || (_cmd == CVS::Diff) )
+ if ( (_cmd == CVS::Status) || (_cmd == CVS::Diff) )
_statusOutput += TQString::fromLocal8Bit( buffer, len );
}
@@ -348,7 +348,7 @@ void CVSDialog::slotProcessStderr( KProcess*, char * buffer, int len )
void CVSDialog::slotProcessExited( KProcess * p )
{
if ( p->exitStatus( ) )
- output->append( i18n( "[ Exited with status %1 ]" ).tqarg( p->exitStatus( ) ) );
+ output->append( i18n( "[ Exited with status %1 ]" ).arg( p->exitStatus( ) ) );
else
output->append( i18n( "[ Finished ]" ) );
@@ -383,9 +383,9 @@ void CVSDialog::readSettings( )
m_logMessages.clear();
m_squeezedLogMessages.clear();
for ( int cnt = 0; cnt < 10; cnt++ )
- if ( config->hasKey( TQString( "CommitLogMessage%1" ).tqarg( cnt ) ) )
+ if ( config->hasKey( TQString( "CommitLogMessage%1" ).arg( cnt ) ) )
{
- const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ) );
+ const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).arg( cnt ) );
if ( !logMessage.isEmpty() )
{
// If the message is too long, cut it to 80 characters (or the combo box becomes too wide)
@@ -398,7 +398,7 @@ void CVSDialog::readSettings( )
}
m_encoding = config->readEntry( "CVSEncoding", "UTF-8" );
- m_encodingComboBox->insertItem( i18n( "Descriptive encoding name", "Last choice ( %1 )" ).tqarg( m_encoding ), 0);
+ m_encodingComboBox->insertItem( i18n( "Descriptive encoding name", "Last choice ( %1 )" ).arg( m_encoding ), 0);
}
}
@@ -413,7 +413,7 @@ void CVSDialog::saveSettings( )
int cnt = 0;
TQStringList::const_iterator it;
for ( it = m_logMessages.constBegin( ); it != m_logMessages.constEnd( ) && cnt < 10 ; ++it, ++cnt )
- config->writeEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ), *it );
+ config->writeEntry( TQString( "CommitLogMessage%1" ).arg( cnt ), *it );
config->writeEntry( "CVSEncoding", m_encoding );
}
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp
index b0764af8..b0be0345 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.cpp
+++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp
@@ -81,7 +81,7 @@ void CVSHandler::setPOTBaseDir( const TQString& dir )
emit signalIsPOTRepository( _isPOTRepository );
}
-TQString CVSHandler::filetqStatus( const FiletqStatus status ) const
+TQString CVSHandler::fileStatus( const FileStatus status ) const
{
switch ( status ) {
case NO_REPOSITORY:
@@ -111,7 +111,7 @@ TQString CVSHandler::filetqStatus( const FiletqStatus status ) const
}
}
-CVSHandler::FiletqStatus CVSHandler::fstatus( const TQString& filename ) const
+CVSHandler::FileStatus CVSHandler::fstatus( const TQString& filename ) const
{
// no valid repository
if ( !_isPORepository )
@@ -130,7 +130,7 @@ CVSHandler::FiletqStatus CVSHandler::fstatus( const TQString& filename ) const
// ### FIXME: it does not take care of CVS/Entries.Log
// a line in CVS/Entries has the following format:
// [D]/NAME/REVISION/[CONFLICT+]TIMESTAMP/OPTIONS/TAGDATE
- TQRegExp rx( TQString( "^D?/%1/" ).tqarg( info.fileName( ) ) );
+ TQRegExp rx( TQString( "^D?/%1/" ).arg( info.fileName( ) ) );
TQString temp;
TQTextStream stream( &entries );
@@ -177,7 +177,7 @@ CVSHandler::FiletqStatus CVSHandler::fstatus( const TQString& filename ) const
return UP_TO_DATE;
}
-TQString CVSHandler::cvstqStatus( const TQString& filename ) const
+TQString CVSHandler::cvsStatus( const TQString& filename ) const
{
return map[filename];
}
@@ -210,7 +210,7 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr
command += "commit -F @LOG@FILE@";
checkToAdd( TQStringList( filename ) );
break;
- case CVS::tqStatus:
+ case CVS::Status:
command += "status";
break;
case CVS::Diff:
@@ -241,7 +241,7 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr
command += "commit -F @LOG@FILE@";
checkToAdd( files );
break;
- case CVS::tqStatus:
+ case CVS::Status:
command += "status";
break;
case CVS::Diff:
@@ -280,7 +280,7 @@ void CVSHandler::showDialog( TQWidget* parent, CVS::Command cmd, const TQStringL
}
if ( dia->exec( ) == KDialog::Accepted ) {
- if ( cmd == CVS::tqStatus )
+ if ( cmd == CVS::Status )
processStatusOutput( dia->statusOutput( ) );
if ( cmd == CVS::Diff )
processDiff( dia->statusOutput( ) );
@@ -383,7 +383,7 @@ void CVSHandler::processDiff( TQString output )
KMessageBox::error( 0, error );
}
-bool CVSHandler::isConsideredModified( const FiletqStatus status ) const
+bool CVSHandler::isConsideredModified( const FileStatus status ) const
{
/*
* A file is modified if it is either:
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.h b/kbabel/catalogmanager/libcvs/cvshandler.h
index 1c08af92..5aeba57b 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.h
+++ b/kbabel/catalogmanager/libcvs/cvshandler.h
@@ -60,7 +60,7 @@ class CVSHandler : public TQObject
TQ_OBJECT
public:
- enum FiletqStatus {
+ enum FileStatus {
NO_REPOSITORY,
NOT_IN_CVS,
LOCALLY_ADDED,
@@ -75,9 +75,9 @@ class CVSHandler : public TQObject
void setPOBaseDir( const TQString& dir );
void setPOTBaseDir( const TQString& dir );
- FiletqStatus fstatus( const TQString& filename ) const;
- TQString filetqStatus( const FiletqStatus status ) const;
- TQString cvstqStatus( const TQString& filename ) const;
+ FileStatus fstatus( const TQString& filename ) const;
+ TQString fileStatus( const FileStatus status ) const;
+ TQString cvsStatus( const TQString& filename ) const;
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 );
@@ -87,7 +87,7 @@ class CVSHandler : public TQObject
/**
* True if the file was modified or has another status considered as a modification
*/
- bool isConsideredModified( const FiletqStatus status ) const;
+ bool isConsideredModified( const FileStatus status ) const;
signals:
void signalIsPORepository( bool );
diff --git a/kbabel/catalogmanager/libcvs/cvsresources.h b/kbabel/catalogmanager/libcvs/cvsresources.h
index 4c2bc144..9cac64db 100644
--- a/kbabel/catalogmanager/libcvs/cvsresources.h
+++ b/kbabel/catalogmanager/libcvs/cvsresources.h
@@ -35,7 +35,7 @@
#define CVSRESOURCES_H
namespace CVS {
- enum Command { Update, Commit, tqStatus, Diff };
+ enum Command { Update, Commit, Status, Diff };
}
#endif // CVSRESOURCES_H
diff --git a/kbabel/catalogmanager/libsvn/svndialog.cpp b/kbabel/catalogmanager/libsvn/svndialog.cpp
index 756ace69..075a8235 100644
--- a/kbabel/catalogmanager/libsvn/svndialog.cpp
+++ b/kbabel/catalogmanager/libsvn/svndialog.cpp
@@ -38,12 +38,12 @@
#include <tqfileinfo.h>
#include <tqframe.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlistbox.h>
#include <tqpushbutton.h>
#include <tqstring.h>
#include <tqstringlist.h>
-#include <tqtextedit.h>
+#include <textedit.h>
// KDE include files
#include <kconfig.h>
#include <kdebug.h>
@@ -66,7 +66,7 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
TQString temp;
- TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" );
+ TQVBoxLayout * layout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" );
// Set the label's text depending on the SVN command.
switch ( cmd ) {
@@ -89,11 +89,11 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
temp = i18n( "Get information for the following files:" );
break;
}
- tqlayout->addWidget( new TQLabel( temp, this ) );
+ layout->addWidget( new TQLabel( temp, this ) );
// Widget for showing the list of files.
filebox = new TQListBox( this );
- tqlayout->addWidget( filebox );
+ layout->addWidget( filebox );
// Add special widgets for 'svn commit'.
if ( cmd == SVN::Commit ) {
@@ -104,15 +104,15 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
oldMessages = new TQComboBox( this );
oldMessages->setDuplicatesEnabled( false );
label->setBuddy( oldMessages );
- tqlayout->addWidget( label );
- tqlayout->addWidget( oldMessages );
+ layout->addWidget( label );
+ layout->addWidget( oldMessages );
// Textfield for entering a log message.
label = new TQLabel( i18n( "&Log message:" ), this );
logedit = new TQTextEdit( this );
label->setBuddy( logedit );
- tqlayout->addWidget( label );
- tqlayout->addWidget( logedit );
+ layout->addWidget( label );
+ layout->addWidget( logedit );
connect( oldMessages, TQT_SIGNAL( activated( int ) ),
this, TQT_SLOT( slotComboActivated( int ) ) );
@@ -151,19 +151,19 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
cancelBtn = new TQPushButton( i18n( "C&ancel" ), this );
buttons->addWidget( cancelBtn );
- tqlayout->addLayout( buttons );
+ layout->addLayout( buttons );
TQFrame * line = new TQFrame( this );
line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
- tqlayout->addWidget( line );
+ layout->addWidget( line );
- tqlayout->addWidget( new TQLabel( i18n( "Command output:" ), this ) );
+ layout->addWidget( new TQLabel( i18n( "Command output:" ), this ) );
output = new TQTextEdit( this );
output->setReadOnly( true );
- tqlayout->addWidget( output );
+ layout->addWidget( output );
- resize( TQSize( 600, 450 ).expandedTo( tqminimumSizeHint( ) ) );
+ resize( TQSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) );
if ( cmd == SVN::Commit )
logedit->setFocus( );
@@ -327,7 +327,7 @@ void SVNDialog::slotProcessStderr( KProcess*, char * buffer, int len )
void SVNDialog::slotProcessExited( KProcess * p )
{
if ( p->exitStatus( ) )
- output->append( i18n( "[ Exited with status %1 ]" ).tqarg( p->exitStatus( ) ) );
+ output->append( i18n( "[ Exited with status %1 ]" ).arg( p->exitStatus( ) ) );
else
output->append( i18n( "[ Finished ]" ) );
@@ -362,9 +362,9 @@ void SVNDialog::readSettings( )
m_logMessages.clear();
m_squeezedLogMessages.clear();
for ( int cnt = 0; cnt < 10; cnt++ )
- if ( config->hasKey( TQString( "CommitLogMessage%1" ).tqarg( cnt ) ) )
+ if ( config->hasKey( TQString( "CommitLogMessage%1" ).arg( cnt ) ) )
{
- const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ) );
+ const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).arg( cnt ) );
if ( !logMessage.isEmpty() )
{
// If the message is too long, cut it to 80 characters (or the combo box becomes too wide)
@@ -390,7 +390,7 @@ void SVNDialog::saveSettings( )
int cnt = 0;
TQStringList::const_iterator it;
for ( it = m_logMessages.constBegin( ); it != m_logMessages.constEnd( ) && cnt < 10 ; ++it, ++cnt )
- config->writeEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ), *it );
+ config->writeEntry( TQString( "CommitLogMessage%1" ).arg( cnt ), *it );
}
m_config->sync();
}
diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp
index 5f91e1e8..d00c0858 100644
--- a/kbabel/catalogmanager/libsvn/svnhandler.cpp
+++ b/kbabel/catalogmanager/libsvn/svnhandler.cpp
@@ -83,7 +83,7 @@ void SVNHandler::setPOTBaseDir( const TQString& dir )
emit signalIsPOTRepository( _isPOTRepository );
}
-TQString SVNHandler::filetqStatus( const FiletqStatus status ) const
+TQString SVNHandler::fileStatus( const FileStatus status ) const
{
switch ( status ) {
case NO_REPOSITORY:
@@ -115,7 +115,7 @@ TQString SVNHandler::filetqStatus( const FiletqStatus status ) const
}
}
-SVNHandler::FiletqStatus SVNHandler::fstatus( const TQString& filename ) const
+SVNHandler::FileStatus SVNHandler::fstatus( const TQString& filename ) const
{
// no valid repository
if ( !_isPORepository )
@@ -145,7 +145,7 @@ SVNHandler::FiletqStatus SVNHandler::fstatus( const TQString& filename ) const
int errorLine, errorCol;
TQDomNodeList nodelist;
TQDomNode node;
- TQDomElement entry, wctqStatus;
+ TQDomElement entry, wcStatus;
// Parse the output.
if ( !doc.setContent( out.getOutput(), &errorMsg, &errorLine, &errorCol ) ) {
@@ -177,22 +177,22 @@ SVNHandler::FiletqStatus SVNHandler::fstatus( const TQString& filename ) const
if ( node.isNull() )
return ERROR_IN_WC;
- wctqStatus = node.toElement();
+ wcStatus = node.toElement();
- if ( wctqStatus.attributeNode("item").value() == "normal" )
+ if ( wcStatus.attributeNode("item").value() == "normal" )
return UP_TO_DATE;
- if ( wctqStatus.attributeNode("item").value() == "modified" )
+ if ( wcStatus.attributeNode("item").value() == "modified" )
return LOCALLY_MODIFIED;
- if ( wctqStatus.attributeNode("item").value() == "conflicted" )
+ if ( wcStatus.attributeNode("item").value() == "conflicted" )
return CONFLICT;
- if ( wctqStatus.attributeNode("item").value() == "unversioned" )
+ if ( wcStatus.attributeNode("item").value() == "unversioned" )
return NOT_IN_SVN;
// TODO Ignored entry should have separate return value probably.
- if ( wctqStatus.attributeNode("item").value() == "ignored" )
+ if ( wcStatus.attributeNode("item").value() == "ignored" )
return NOT_IN_SVN;
- if ( wctqStatus.attributeNode("item").value() == "added" )
+ if ( wcStatus.attributeNode("item").value() == "added" )
return LOCALLY_ADDED;
- if ( wctqStatus.attributeNode("item").value() == "deleted" )
+ if ( wcStatus.attributeNode("item").value() == "deleted" )
return LOCALLY_REMOVED;
// TODO What to do with "missing", "incomplete", "replaced", "merged",
// "obstructed", "external"? Can these appear at all in our case?
@@ -269,7 +269,7 @@ no_status_xml:
}
-TQString SVNHandler::svntqStatus( const TQString& filename ) const
+TQString SVNHandler::svnStatus( const TQString& filename ) const
{
return map[filename];
}
@@ -491,7 +491,7 @@ void SVNHandler::processDiff( TQString output )
KMessageBox::error( 0, error );
}
-bool SVNHandler::isConsideredModified( const FiletqStatus status ) const
+bool SVNHandler::isConsideredModified( const FileStatus status ) const
{
/*
* A file is modified if it is either:
diff --git a/kbabel/catalogmanager/libsvn/svnhandler.h b/kbabel/catalogmanager/libsvn/svnhandler.h
index 57ce13b4..2506d0bd 100644
--- a/kbabel/catalogmanager/libsvn/svnhandler.h
+++ b/kbabel/catalogmanager/libsvn/svnhandler.h
@@ -58,7 +58,7 @@ class SVNHandler : public TQObject
TQ_OBJECT
public:
- enum FiletqStatus {
+ enum FileStatus {
NO_REPOSITORY,
NOT_IN_SVN,
LOCALLY_ADDED,
@@ -74,9 +74,9 @@ class SVNHandler : public TQObject
void setPOBaseDir( const TQString& dir );
void setPOTBaseDir( const TQString& dir );
- FiletqStatus fstatus( const TQString& filename ) const;
- TQString filetqStatus( const FiletqStatus status ) const;
- TQString svntqStatus( const TQString& filename ) const;
+ FileStatus fstatus( const TQString& filename ) const;
+ TQString fileStatus( const FileStatus status ) const;
+ TQString svnStatus( const TQString& filename ) const;
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 );
@@ -86,7 +86,7 @@ class SVNHandler : public TQObject
/**
* True if the file was modified or has another status considered as a modification
*/
- bool isConsideredModified( const FiletqStatus status ) const;
+ bool isConsideredModified( const FileStatus status ) const;
signals:
void signalIsPORepository( bool );
diff --git a/kbabel/catalogmanager/multiroughtransdlg.cpp b/kbabel/catalogmanager/multiroughtransdlg.cpp
index 16373a0b..56074c66 100644
--- a/kbabel/catalogmanager/multiroughtransdlg.cpp
+++ b/kbabel/catalogmanager/multiroughtransdlg.cpp
@@ -36,7 +36,7 @@
#include "multiroughtransdlg.h"
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kdebug.h>
#include <kglobal.h>
@@ -58,9 +58,9 @@ MultiRoughTransDlg::MultiRoughTransDlg(KBabelDictBox *dict, TQPtrList<CatManList
filesProgressbar->setTextEnabled(true);
filesProgressbar->setFormat("%v/%m (%p%)");
filesProgressbar->setTotalSteps(files.count());
- TQHBoxLayout* mytqlayout= new TQHBoxLayout(bars->tqlayout());
- mytqlayout->add(label);
- mytqlayout->add(filesProgressbar);
+ TQHBoxLayout* mylayout= new TQHBoxLayout(bars->layout());
+ mylayout->add(label);
+ mylayout->add(filesProgressbar);
msgButtonClicked(0);
}
@@ -82,7 +82,7 @@ void MultiRoughTransDlg::translate()
if( catalog->openURL( url ) != OK )
{
KMessageBox::error(this, i18n("Error while trying to read file:\n %1\n"
- "Maybe it is not a valid PO file.").tqarg(url.prettyURL()));
+ "Maybe it is not a valid PO file.").arg(url.prettyURL()));
filesProgressbar->advance(1);
continue;
}
@@ -94,7 +94,7 @@ void MultiRoughTransDlg::translate()
if( catalog->openURL( poturl, url ) != OK )
{
KMessageBox::error(this, i18n("Error while trying to read file:\n %1\n"
- "Maybe it is not a valid PO file.").tqarg(poturl.prettyURL()));
+ "Maybe it is not a valid PO file.").arg(poturl.prettyURL()));
filesProgressbar->advance(1);
continue;
}
@@ -131,13 +131,13 @@ void MultiRoughTransDlg::showAllStatistics()
"Exact translations: %2 (%3%)\n"
"Approximate translations: %4 (%5%)\n"
"Nothing found: %6 (%7%)")
- .tqarg( locale->formatNumber(tt,0) )
- .tqarg( locale->formatNumber(etc,0) )
- .tqarg( locale->formatNumber( ((double)(10000*etc/tt))/100) )
- .tqarg( locale->formatNumber(ptc,0) )
- .tqarg( locale->formatNumber(((double)(10000*ptc/tt))/100) )
- .tqarg( locale->formatNumber(nothing,0) )
- .tqarg( locale->formatNumber(((double)(10000*nothing/tt)/100) ) );
+ .arg( locale->formatNumber(tt,0) )
+ .arg( locale->formatNumber(etc,0) )
+ .arg( locale->formatNumber( ((double)(10000*etc/tt))/100) )
+ .arg( locale->formatNumber(ptc,0) )
+ .arg( locale->formatNumber(((double)(10000*ptc/tt))/100) )
+ .arg( locale->formatNumber(nothing,0) )
+ .arg( locale->formatNumber(((double)(10000*nothing/tt)/100) ) );
KMessageBox::information(this, statMsg
, i18n("Rough Translation Statistics"));
diff --git a/kbabel/catalogmanager/validateprogress.cpp b/kbabel/catalogmanager/validateprogress.cpp
index 42fd3f39..8ac02c0d 100644
--- a/kbabel/catalogmanager/validateprogress.cpp
+++ b/kbabel/catalogmanager/validateprogress.cpp
@@ -187,7 +187,7 @@ void ValidateProgressDialog::validate_internal()
"\n"
"Checked files: %1\n"
"Number of errors: %2\n"
- "Number of ignored errors: %3").tqarg(checked).tqarg(errors).tqarg(ignorederrors),i18n("Validation Done"));
+ "Number of ignored errors: %3").arg(checked).arg(errors).arg(ignorederrors),i18n("Validation Done"));
}
delete _tool;
diff --git a/kbabel/catalogmanager/validateprogresswidget.ui b/kbabel/catalogmanager/validateprogresswidget.ui
index 01cb4c5f..a1573341 100644
--- a/kbabel/catalogmanager/validateprogresswidget.ui
+++ b/kbabel/catalogmanager/validateprogresswidget.ui
@@ -18,7 +18,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<grid>
<property name="name">
@@ -28,7 +28,7 @@
<property name="name">
<cstring>_currentAction</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>92</width>
<height>0</height>
diff --git a/kbabel/catalogmanager/validateprogresswidget.ui.h b/kbabel/catalogmanager/validateprogresswidget.ui.h
index 70655c72..e6fddef2 100644
--- a/kbabel/catalogmanager/validateprogresswidget.ui.h
+++ b/kbabel/catalogmanager/validateprogresswidget.ui.h
@@ -44,5 +44,5 @@ void ValidateProgressWidget::setupFileProgressBar( TQString text, int maxvalue )
TQString t = text[0].upper()+text.mid(1)+":";
_currentAction->setText(t);
- _currentAction->tqrepaint();
+ _currentAction->repaint();
}
diff --git a/kbabel/catalogmanager/validationoptions.ui b/kbabel/catalogmanager/validationoptions.ui
index 23c3cb71..88169f7a 100644
--- a/kbabel/catalogmanager/validationoptions.ui
+++ b/kbabel/catalogmanager/validationoptions.ui
@@ -18,7 +18,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<vbox>
<property name="name">