summaryrefslogtreecommitdiffstats
path: root/kbabel
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:59:34 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-06-20 05:10:18 +0200
commit611a40e79abddb288f87ac74632a34e4f9566726 (patch)
treec3adf37b7dd277eb4f7c8d462aed3f17670c8264 /kbabel
parent5fcaf38922885bbb138ba17ff7d2e9ec9ad0c0c2 (diff)
downloadtdesdk-611a40e79abddb288f87ac74632a34e4f9566726.tar.gz
tdesdk-611a40e79abddb288f87ac74632a34e4f9566726.zip
Remove additional unneeded tq method conversions
(cherry picked from commit f78838f2f736acc2b235d8b680f3379a07a6d372)
Diffstat (limited to 'kbabel')
-rw-r--r--kbabel/catalogmanager/catalogmanager.cpp6
-rw-r--r--kbabel/catalogmanager/catalogmanagerview.cpp76
-rw-r--r--kbabel/catalogmanager/catalogmanagerview.h2
-rw-r--r--kbabel/catalogmanager/catmanlistitem.cpp20
-rw-r--r--kbabel/catalogmanager/catmanlistitem.h8
-rw-r--r--kbabel/catalogmanager/libcvs/cvsdialog.cpp18
-rw-r--r--kbabel/catalogmanager/libcvs/cvshandler.cpp2
-rw-r--r--kbabel/catalogmanager/libsvn/svndialog.cpp8
-rw-r--r--kbabel/catalogmanager/multiroughtransdlg.cpp18
-rw-r--r--kbabel/catalogmanager/validateprogress.cpp2
-rw-r--r--kbabel/catalogmanager/validateprogresswidget.ui.h2
-rw-r--r--kbabel/common/catalog.cpp4
-rw-r--r--kbabel/common/kbmailer.cpp6
-rw-r--r--kbabel/commonui/projectprefwidgets.cpp10
-rw-r--r--kbabel/commonui/projectwizard.cpp2
-rw-r--r--kbabel/commonui/roughtransdlg.cpp14
-rw-r--r--kbabel/datatools/regexp/main.cc2
-rw-r--r--kbabel/filters/gettext/gettextexport.cpp2
-rw-r--r--kbabel/filters/gettext/gettextimport.cpp10
-rw-r--r--kbabel/kbabel/contextview.cpp2
-rw-r--r--kbabel/kbabel/headereditor.cpp2
-rw-r--r--kbabel/kbabel/hidingmsgedit.cpp4
-rw-r--r--kbabel/kbabel/kbabel.cpp22
-rw-r--r--kbabel/kbabel/kbabelsplash.cpp2
-rw-r--r--kbabel/kbabel/kbabelview.cpp70
-rw-r--r--kbabel/kbabel/kbabelview2.cpp16
-rw-r--r--kbabel/kbabel/kbbookmarkhandler.cpp2
-rw-r--r--kbabel/kbabel/kbcataloglistviewitem.cpp6
-rw-r--r--kbabel/kbabel/mymultilineedit.cpp10
-rw-r--r--kbabel/kbabel/mymultilineedit.h2
-rw-r--r--kbabel/kbabeldict/dictionarymenu.cpp4
-rw-r--r--kbabel/kbabeldict/kbabeldictbox.cpp10
-rw-r--r--kbabel/kbabeldict/kbabelsplash.cpp2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/database.cpp12
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp4
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp4
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui2
-rw-r--r--kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp4
-rw-r--r--kbabel/kbabeldict/modules/poauxiliary/pwidget.ui2
-rw-r--r--kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp2
-rw-r--r--kbabel/kbabeldict/modules/pocompendium/pwidget.ui2
-rw-r--r--kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp2
44 files changed, 202 insertions, 202 deletions
diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index f8e147b4..1e6d3c50 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -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());
@@ -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 d4d492a4..24b182d1 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -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"));
}
@@ -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();
@@ -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 );
diff --git a/kbabel/catalogmanager/catalogmanagerview.h b/kbabel/catalogmanager/catalogmanagerview.h
index 398a796a..fe4b7d35 100644
--- a/kbabel/catalogmanager/catalogmanagerview.h
+++ b/kbabel/catalogmanager/catalogmanagerview.h
@@ -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 c836a956..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;
}
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/libcvs/cvsdialog.cpp b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
index 798bb51f..ef964568 100644
--- a/kbabel/catalogmanager/libcvs/cvsdialog.cpp
+++ b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
@@ -118,8 +118,8 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
tqlayout->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 );
@@ -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;
}
@@ -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 cf067f9c..b0be0345 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.cpp
+++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp
@@ -130,7 +130,7 @@ CVSHandler::FileStatus 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 );
diff --git a/kbabel/catalogmanager/libsvn/svndialog.cpp b/kbabel/catalogmanager/libsvn/svndialog.cpp
index b1b6d4de..a418832a 100644
--- a/kbabel/catalogmanager/libsvn/svndialog.cpp
+++ b/kbabel/catalogmanager/libsvn/svndialog.cpp
@@ -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/multiroughtransdlg.cpp b/kbabel/catalogmanager/multiroughtransdlg.cpp
index 16373a0b..745e797f 100644
--- a/kbabel/catalogmanager/multiroughtransdlg.cpp
+++ b/kbabel/catalogmanager/multiroughtransdlg.cpp
@@ -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.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/common/catalog.cpp b/kbabel/common/catalog.cpp
index 49d5969b..a3399cf9 100644
--- a/kbabel/common/catalog.cpp
+++ b/kbabel/common/catalog.cpp
@@ -497,7 +497,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
}
temp="X-Generator: KBabel %1\\n";
- temp=temp.tqarg(VERSION);
+ temp=temp.arg(VERSION);
found=false;
for( it = headerList.begin(); it != headerList.end(); ++it )
@@ -533,7 +533,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
temp="Plural-Forms: %1\\n";
- temp=temp.tqarg(identityOptions.gnuPluralFormHeader);
+ temp=temp.arg(identityOptions.gnuPluralFormHeader);
found=false;
// update plural form header
diff --git a/kbabel/common/kbmailer.cpp b/kbabel/common/kbmailer.cpp
index 90f61256..18c679b1 100644
--- a/kbabel/common/kbmailer.cpp
+++ b/kbabel/common/kbmailer.cpp
@@ -103,7 +103,7 @@ void KBabelMailer::sendOneFile( const KURL& url)
kapp->invokeMailer("", "", "", "", "", "", fileName);
else
{
- KMessageBox::error( m_parent, i18n("Error while trying to download file %1.").tqarg( url.prettyURL() ) );
+ KMessageBox::error( m_parent, i18n("Error while trying to download file %1.").arg( url.prettyURL() ) );
}
}
else
@@ -190,7 +190,7 @@ TQString KBabelMailer::buildArchive(TQStringList fileList, TQString archiveName,
#endif
TQString poTempName;
if ( !KIO::NetAccess::download( url, poTempName, m_parent ) ) {
- KMessageBox::error( m_parent, i18n("Error while trying to read file %1.").tqarg( url.prettyURL() ) );
+ KMessageBox::error( m_parent, i18n("Error while trying to read file %1.").arg( url.prettyURL() ) );
continue;
}
@@ -205,7 +205,7 @@ TQString KBabelMailer::buildArchive(TQStringList fileList, TQString archiveName,
poArchFileName.remove( TQRegExp( "^" + TQRegExp::escape( _poBaseDir ) + "/?" ) );
if ( !archive.addLocalFile( poTempName, poArchFileName ) )
{
- KMessageBox::error( m_parent, i18n("Error while trying to copy file %1 into archive.").tqarg( url.prettyURL() ) );
+ KMessageBox::error( m_parent, i18n("Error while trying to copy file %1 into archive.").arg( url.prettyURL() ) );
}
KIO::NetAccess::removeTempFile(poTempName);
diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp
index d22ff970..1da52591 100644
--- a/kbabel/commonui/projectprefwidgets.cpp
+++ b/kbabel/commonui/projectprefwidgets.cpp
@@ -80,7 +80,7 @@ static TQSize sizeHintForWidget(const TQWidget* widget)
{
//
// The size is computed by adding the sizeHint().height() of all
- // widget tqchildren and taking the width of the widest child and adding
+ // widget children and taking the width of the widest child and adding
// tqlayout()->margin() and tqlayout()->spacing()
//
@@ -289,7 +289,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
"<ul><li><b>%1</b>: this is the encoding that fits the character "
"set of your system language.</li>"
"<li><b>%2</b>: uses Unicode (UTF-8) encoding.</li>"
-"</ul></qt>").tqarg(defaultName).tqarg(utf8Name) );
+"</ul></qt>").arg(defaultName).arg(utf8Name) );
TQWhatsThis::add(_oldEncodingButton
@@ -409,7 +409,7 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje
if( !project.isEmpty() )
{
// show the project name in the widget at the top
- tqlayout->addWidget(new TQLabel(i18n("<font size=\"+1\">Project: %1</font>").tqarg(project),page));
+ tqlayout->addWidget(new TQLabel(i18n("<font size=\"+1\">Project: %1</font>").arg(project),page));
}
TQGroupBox* group = new TQGroupBox(2,Qt::Horizontal,page);
@@ -619,12 +619,12 @@ void IdentityPreferences::testPluralForm()
"of singular/plural forms automatically for the "
"language code \"%1\".\n"
"Do you have kdelibs.po installed for this language?\n"
- "Please set the correct number manually.").tqarg(lang);
+ "Please set the correct number manually.").arg(lang);
}
else
{
msg = i18n("The number of singular/plural forms found for "
- "the language code \"%1\" is %2.").tqarg(lang).tqarg(number);
+ "the language code \"%1\" is %2.").arg(lang).arg(number);
}
if(!msg.isEmpty())
diff --git a/kbabel/commonui/projectwizard.cpp b/kbabel/commonui/projectwizard.cpp
index 00a88631..31b4ab86 100644
--- a/kbabel/commonui/projectwizard.cpp
+++ b/kbabel/commonui/projectwizard.cpp
@@ -138,7 +138,7 @@ void ProjectWizard::next()
if( file.exists() )
{
if (KMessageBox::warningContinueCancel(0, i18n("The file '%1' already exists.\n"
- "Do you want to replace it?").tqarg(url()), i18n("File Exists"), i18n("Replace") ) == KMessageBox::Cancel)
+ "Do you want to replace it?").arg(url()), i18n("File Exists"), i18n("Replace") ) == KMessageBox::Cancel)
return;
}
diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp
index a5415529..2818f6eb 100644
--- a/kbabel/commonui/roughtransdlg.cpp
+++ b/kbabel/commonui/roughtransdlg.cpp
@@ -673,13 +673,13 @@ void RoughTransDlg::showStatistics()
"Exact translations: %2 (%3%)\n"
"Approximate translations: %4 (%5%)\n"
"Nothing found: %6 (%7%)")
- .tqarg( locale->formatNumber(totalTried,0) )
- .tqarg( locale->formatNumber(exactTransCounter,0) )
- .tqarg( locale->formatNumber( ((double)(10000*exactTransCounter/TQMAX(totalTried,1)))/100) )
- .tqarg( locale->formatNumber(partTransCounter,0) )
- .tqarg( locale->formatNumber(((double)(10000*partTransCounter/TQMAX(totalTried,1)))/100) )
- .tqarg( locale->formatNumber(nothing,0) )
- .tqarg( locale->formatNumber(((double)(10000*nothing/TQMAX(totalTried,1)))/100) );
+ .arg( locale->formatNumber(totalTried,0) )
+ .arg( locale->formatNumber(exactTransCounter,0) )
+ .arg( locale->formatNumber( ((double)(10000*exactTransCounter/TQMAX(totalTried,1)))/100) )
+ .arg( locale->formatNumber(partTransCounter,0) )
+ .arg( locale->formatNumber(((double)(10000*partTransCounter/TQMAX(totalTried,1)))/100) )
+ .arg( locale->formatNumber(nothing,0) )
+ .arg( locale->formatNumber(((double)(10000*nothing/TQMAX(totalTried,1)))/100) );
KMessageBox::information(this, statMsg
, i18n("Rough Translation Statistics"));
diff --git a/kbabel/datatools/regexp/main.cc b/kbabel/datatools/regexp/main.cc
index 3a40eac1..eca0be81 100644
--- a/kbabel/datatools/regexp/main.cc
+++ b/kbabel/datatools/regexp/main.cc
@@ -55,7 +55,7 @@ RegExpTool::RegExpTool( TQObject* parent, const char* name, const TQStringList &
i18n("which check found errors","translation has inconsistent length");
loadExpressions();
if ( ! _error.isNull() )
- KMessageBox::error( (TQWidget*)parent, i18n( "Error loading data (%1)" ).tqarg( _error ) );
+ KMessageBox::error( (TQWidget*)parent, i18n( "Error loading data (%1)" ).arg( _error ) );
}
bool RegExpTool::run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype )
diff --git a/kbabel/filters/gettext/gettextexport.cpp b/kbabel/filters/gettext/gettextexport.cpp
index ea098013..7e352502 100644
--- a/kbabel/filters/gettext/gettextexport.cpp
+++ b/kbabel/filters/gettext/gettextexport.cpp
@@ -196,7 +196,7 @@ ConversionStatus GettextExportPlugin::save(const TQString& localFile , const TQS
}
else
{
- //emit signalError(i18n("Wasn't able to open file %1").tqarg(filename.ascii()));
+ //emit signalError(i18n("Wasn't able to open file %1").arg(filename.ascii()));
return OS_ERROR;
}
diff --git a/kbabel/filters/gettext/gettextimport.cpp b/kbabel/filters/gettext/gettextimport.cpp
index a9bae51a..8c361763 100644
--- a/kbabel/filters/gettext/gettextimport.cpp
+++ b/kbabel/filters/gettext/gettextimport.cpp
@@ -106,7 +106,7 @@ ConversionStatus GettextImportPlugin::load(const TQString& filename, const TQStr
//recoveredErrorInHeader = true;
}
- TQIODevice *dev = stream.tqdevice();
+ TQIODevice *dev = stream.device();
int fileSize = dev->size();
// if somethings goes wrong with the parsing, we don't have deleted the old contents
@@ -363,7 +363,7 @@ TQTextCodec* GettextImportPlugin::codecForArray(TQByteArray& array, bool* hadCod
ConversionStatus GettextImportPlugin::readHeader(TQTextStream& stream)
{
CatalogItem temp;
- int filePos=stream.tqdevice()->at();
+ int filePos=stream.device()->at();
ConversionStatus status=readEntry(stream);
if(status==OK || status==RECOVERED_PARSE_ERROR)
@@ -371,7 +371,7 @@ ConversionStatus GettextImportPlugin::readHeader(TQTextStream& stream)
// test if this is the header
if(!_msgid.first().isEmpty())
{
- stream.tqdevice()->at(filePos);
+ stream.device()->at(filePos);
}
return status;
@@ -402,7 +402,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream)
while( !stream.eof() )
{
- const int pos=stream.tqdevice()->at();
+ const int pos=stream.device()->at();
line=stream.readLine();
@@ -761,7 +761,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream)
else if((line.find(TQRegExp("^\\s*msgid")) != -1) || (line.find(TQRegExp("^\\s*#")) != -1))
{
// We have read successfully one entry, so end loop.
- stream.tqdevice()->at(pos);// reset position in stream to beginning of this line
+ stream.device()->at(pos);// reset position in stream to beginning of this line
break;
}
else if(line.startsWith("msgstr"))
diff --git a/kbabel/kbabel/contextview.cpp b/kbabel/kbabel/contextview.cpp
index 11d8434a..5775c3b1 100644
--- a/kbabel/kbabel/contextview.cpp
+++ b/kbabel/kbabel/contextview.cpp
@@ -137,7 +137,7 @@ void ContextView::updateView()
temp = "";
for( TQStringList::Iterator i=tempList.begin() ; i != tempList.end() ; ++i)
{
- temp += i18n("Plural %1: %2\n").tqarg(counter++).tqarg(*i);
+ temp += i18n("Plural %1: %2\n").arg(counter++).arg(*i);
}
}
temp = TQStyleSheet::convertFromPlainText(temp);
diff --git a/kbabel/kbabel/headereditor.cpp b/kbabel/kbabel/headereditor.cpp
index 553724bc..62275cdd 100644
--- a/kbabel/kbabel/headereditor.cpp
+++ b/kbabel/kbabel/headereditor.cpp
@@ -108,7 +108,7 @@ bool HeaderEditor::isModified()
void HeaderEditor::readHeader(bool readOnly)
{
- setCaption(i18n("Header Editor for %1").tqarg(_catalog->currentURL().prettyURL()));
+ setCaption(i18n("Header Editor for %1").arg(_catalog->currentURL().prettyURL()));
_editor->headerEdit->setReadOnly(readOnly);
_editor->commentEdit->setReadOnly(readOnly);
diff --git a/kbabel/kbabel/hidingmsgedit.cpp b/kbabel/kbabel/hidingmsgedit.cpp
index 3d0b128a..a3dcb3c3 100644
--- a/kbabel/kbabel/hidingmsgedit.cpp
+++ b/kbabel/kbabel/hidingmsgedit.cpp
@@ -177,9 +177,9 @@ void HidingMsgEdit::setNumberOfPlurals( uint numberOfPlurals )
MsgMultiLineEdit* pl;
for(uint i=0 ; i< _numberOfPlurals ; i++)
{
- pl = new MsgMultiLineEdit( i, _spell, _multipleEdit, TQString("multipleEdit %1").tqarg(i).local8Bit());
+ pl = new MsgMultiLineEdit( i, _spell, _multipleEdit, TQString("multipleEdit %1").arg(i).local8Bit());
_allEdits.append(pl);
- _multipleEdit->addTab( pl, i18n("Plural %1").tqarg(i+1));
+ _multipleEdit->addTab( pl, i18n("Plural %1").arg(i+1));
if( _eventFilter )
pl->installEventFilter(_eventFilter);
}
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index 93026377..05b34706 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -129,7 +129,7 @@ KBabelMW::KBabelMW(TQString projectFile)
if ( _project == NULL ) // FIXME should not happen anymore
{
- KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(projectFile)
+ KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(projectFile)
, i18n("Project File Error"));
_project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
}
@@ -147,7 +147,7 @@ KBabelMW::KBabelMW(KBCatalog* catalog, TQString projectFile)
if ( _project == NULL )
{
- KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(projectFile)
+ KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(projectFile)
, i18n("Project File Error"));
_project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
}
@@ -333,7 +333,7 @@ void KBabelMW::init(KBCatalog* catalog)
"The minimum requirement is to fill out the Identity page.\n"
"Also check the encoding on the Save page, which is currently "
"set to %1. You may want to change this setting "
- "according to the settings of your language team.").tqarg(encodingStr));
+ "according to the settings of your language team.").arg(encodingStr));
TQTimer::singleShot(1,TQT_TQOBJECT(this),TQT_SLOT(projectConfigure()));
}
@@ -732,7 +732,7 @@ void KBabelMW::setupStatusBar()
statusBar()->insertItem(i18n("RW"),ID_STATUS_READONLY);
- statusBar()->insertItem(i18n("Line: %1 Col: %2").tqarg(1).tqarg(1)
+ statusBar()->insertItem(i18n("Line: %1 Col: %2").arg(1).arg(1)
,ID_STATUS_CURSOR);
TQHBox* progressBox = new TQHBox(statusBar(),"progressBox");
@@ -1361,23 +1361,23 @@ void KBabelMW::faultyDisplayed(bool flag)
void KBabelMW::displayedEntryChanged(const KBabel::DocPosition& pos)
{
- statusBar()->changeItem(i18n("Current: %1").tqarg(pos.item+1),ID_STATUS_CURRENT);
+ statusBar()->changeItem(i18n("Current: %1").arg(pos.item+1),ID_STATUS_CURRENT);
_currentIndex = pos.item;
}
void KBabelMW::setNumberOfTotal(uint number)
{
- statusBar()->changeItem(i18n("Total: %1").tqarg(number),ID_STATUS_TOTAL);
+ statusBar()->changeItem(i18n("Total: %1").arg(number),ID_STATUS_TOTAL);
}
void KBabelMW::setNumberOfFuzzies(uint number)
{
- statusBar()->changeItem(i18n("Fuzzy: %1").tqarg(number),ID_STATUS_FUZZY);
+ statusBar()->changeItem(i18n("Fuzzy: %1").arg(number),ID_STATUS_FUZZY);
}
void KBabelMW::setNumberOfUntranslated(uint number)
{
- statusBar()->changeItem(i18n("Untranslated: %1").tqarg(number),ID_STATUS_UNTRANS);
+ statusBar()->changeItem(i18n("Untranslated: %1").arg(number),ID_STATUS_UNTRANS);
}
void KBabelMW::hasFuzzyAfterwards(bool flag)
@@ -1566,7 +1566,7 @@ void KBabelMW::gettextHelp()
if(!error.isEmpty())
{
KMessageBox::sorry(this,i18n("An error occurred while "
- "trying to open the gettext info page:\n%1").tqarg(error));
+ "trying to open the gettext info page:\n%1").arg(error));
}
}
@@ -1602,7 +1602,7 @@ void KBabelMW::buildDictMenus()
void KBabelMW::updateCursorPosition(int line, int col)
{
- statusBar()->changeItem(i18n("Line: %1 Col: %2").tqarg(line+1).tqarg(col+1)
+ statusBar()->changeItem(i18n("Line: %1 Col: %2").arg(line+1).arg(col+1)
,ID_STATUS_CURSOR);
}
@@ -1751,7 +1751,7 @@ void KBabelMW::projectOpen(const TQString& file)
}
else
{
- KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(file)
+ KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(file)
, i18n("Project File Error"));
_project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
m_view->useProject(_project);
diff --git a/kbabel/kbabel/kbabelsplash.cpp b/kbabel/kbabel/kbabelsplash.cpp
index 143aff02..848d506f 100644
--- a/kbabel/kbabel/kbabelsplash.cpp
+++ b/kbabel/kbabel/kbabelsplash.cpp
@@ -53,7 +53,7 @@ KBabelSplash::KBabelSplash( TQWidget* parent, const char* name )
picLabel->setFrameStyle(TQFrame::WinPanel | TQFrame::Raised);
- // Set tqgeometry, with support for Xinerama systems
+ // Set geometry, with support for Xinerama systems
TQRect r;
r.setSize(sizeHint());
int ps = TQApplication::desktop()->primaryScreen();
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index 538d5d10..9060908a 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -328,7 +328,7 @@ void KBabelView::initDockWidgets()
"and the behavior of KBabel and to Stephan Kulow, who always\n"
"lends me a helping hand.\n\n"
"Many good ideas, especially for the Catalog Manager, are taken\n"
-"from KTranslator by Andrea Rizzi.").tqarg(VERSION).tqarg(2006));
+"from KTranslator by Andrea Rizzi.").arg(VERSION).arg(2006));
TQLabel *label=new TQLabel(msgidLabel,i18n("O&riginal string (msgid):"),tempWidget);
@@ -788,7 +788,7 @@ void KBabelView::readProject(Project::Ptr project)
{
// turn off spellchecker
msgstrEdit->setSpellChecker(0);
- // tqinvalidate the current settings, to make sure they are updated when needed
+ // invalidate the current settings, to make sure they are updated when needed
_spellcheckSettings.valid = false;
}
@@ -1180,14 +1180,14 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
{
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()));
break;
}
case NO_ENTRY_ERROR:
{
KMessageBox::error(this
,i18n("Error while reading the file:\n %1\n"
- "No entry found.").tqarg(url.prettyURL()));
+ "No entry found.").arg(url.prettyURL()));
break;
}
case RECOVERED_PARSE_ERROR:
@@ -1204,25 +1204,25 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
case NO_PERMISSIONS:
{
KMessageBox::error(this,i18n(
- "You do not have permissions to read file:\n %1").tqarg(url.prettyURL()));
+ "You do not have permissions to read file:\n %1").arg(url.prettyURL()));
break;
}
case NO_FILE:
{
KMessageBox::error(this,i18n(
- "You have not specified a valid file:\n %1").tqarg(url.prettyURL()));
+ "You have not specified a valid file:\n %1").arg(url.prettyURL()));
break;
}
case NO_PLUGIN:
{
KMessageBox::error(this,i18n(
- "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL()));
+ "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL()));
break;
}
case UNSUPPORTED_TYPE:
{
KMessageBox::error(this,i18n(
- "The import plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL()));
+ "The import plugin cannot handle this type of the file:\n %1").arg(url.prettyURL()));
break;
}
case STOPPED:
@@ -1230,7 +1230,7 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
default:
{
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()));
break;
}
@@ -1295,21 +1295,21 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL)
// For a template, recoverable errors are disqualifying
KMessageBox::sorry(this,
i18n("There was an error while reading the file header of file:\n %1")
- .tqarg(openURL.prettyURL()));
+ .arg(openURL.prettyURL()));
break;
}
case PARSE_ERROR:
{
KMessageBox::error(this
,i18n("Error while trying to read file:\n %1\n"
- "Maybe it is not a valid PO file.").tqarg(openURL.prettyURL()));
+ "Maybe it is not a valid PO file.").arg(openURL.prettyURL()));
break;
}
case NO_ENTRY_ERROR:
{
KMessageBox::error(this
,i18n("Error while reading the file:\n %1\n"
- "No entry found.").tqarg(openURL.prettyURL()));
+ "No entry found.").arg(openURL.prettyURL()));
break;
}
case RECOVERED_PARSE_ERROR:
@@ -1317,36 +1317,36 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL)
// For a template, recoverable errors are disqualifying
KMessageBox::sorry(this,
i18n("Minor syntax errors were found while reading file:\n %1")
- .tqarg(openURL.prettyURL()));
+ .arg(openURL.prettyURL()));
break;
}
case NO_PERMISSIONS:
{
- KMessageBox::error(this,i18n("You do not have permissions to read file:\n %1").tqarg(openURL.prettyURL()));
+ KMessageBox::error(this,i18n("You do not have permissions to read file:\n %1").arg(openURL.prettyURL()));
break;
}
case NO_FILE:
{
- KMessageBox::error(this,i18n("You have not specified a valid file:\n %1").tqarg(openURL.prettyURL()));
+ KMessageBox::error(this,i18n("You have not specified a valid file:\n %1").arg(openURL.prettyURL()));
break;
}
case NO_PLUGIN:
{
KMessageBox::error(this,i18n(
- "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(openURL.prettyURL()));
+ "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(openURL.prettyURL()));
break;
}
case UNSUPPORTED_TYPE:
{
KMessageBox::error(this,i18n(
- "The import plugin cannot handle this type of the file:\n %1").tqarg(openURL.prettyURL()));
+ "The import plugin cannot handle this type of the file:\n %1").arg(openURL.prettyURL()));
break;
}
case STOPPED:
break;
default:
{
- KMessageBox::error(this,i18n("Error while trying to open file:\n %1").tqarg(openURL.prettyURL()));
+ KMessageBox::error(this,i18n("Error while trying to open file:\n %1").arg(openURL.prettyURL()));
break;
}
@@ -1386,20 +1386,20 @@ bool KBabelView::saveFile(bool syntaxCheck)
{
whatToDo=KMessageBox::warningContinueCancel(this,
i18n("You do not have permission to write to file:\n%1\n"
- "Do you want to save to another file or cancel?").tqarg(_catalog->currentURL().prettyURL()),
+ "Do you want to save to another file or cancel?").arg(_catalog->currentURL().prettyURL()),
i18n("Error"),KStdGuiItem::save());
break;
}
case NO_PLUGIN:
{
KMessageBox::error(this,i18n(
- "KBabel cannot find a corresponding plugin for the MIME type of file:\n %1").tqarg(_catalog->currentURL().prettyURL()));
+ "KBabel cannot find a corresponding plugin for the MIME type of file:\n %1").arg(_catalog->currentURL().prettyURL()));
break;
}
case UNSUPPORTED_TYPE:
{
KMessageBox::error(this,i18n(
- "The export plugin cannot handle this type of file:\n %1").tqarg(_catalog->currentURL().prettyURL()));
+ "The export plugin cannot handle this type of file:\n %1").arg(_catalog->currentURL().prettyURL()));
break;
}
case BUSY:
@@ -1415,7 +1415,7 @@ bool KBabelView::saveFile(bool syntaxCheck)
{
whatToDo=KMessageBox::warningContinueCancel(this,
i18n("An error occurred while trying to write to file:\n%1\n"
- "Do you want to save to another file or cancel?").tqarg(_catalog->currentURL().prettyURL()),
+ "Do you want to save to another file or cancel?").arg(_catalog->currentURL().prettyURL()),
i18n("Error"),KStdGuiItem::save());
break;
}
@@ -1448,8 +1448,8 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck)
if (KIO::NetAccess::exists(url, false, this))
{
- if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").tqarg(i18n("The file %1 already exists. "
- "Do you want to overwrite it?").tqarg(url.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(url.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel)
{
return false;
}
@@ -1474,30 +1474,30 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck)
case NO_PERMISSIONS:
{
message=i18n("You do not have permission to write to file:\n%1\n"
- "Do you want to save to another file or cancel?").tqarg(url.prettyURL());
+ "Do you want to save to another file or cancel?").arg(url.prettyURL());
break;
}
case NO_FILE:
{
message=i18n("You have specified a folder:\n%1\n"
- "Do you want to save to another file or cancel?").tqarg(url.prettyURL());
+ "Do you want to save to another file or cancel?").arg(url.prettyURL());
break;
}
case NO_PLUGIN:
{
- message=i18n("KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL());
+ message=i18n("KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL());
break;
}
case UNSUPPORTED_TYPE:
{
message=i18n(
- "The export plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL());
+ "The export plugin cannot handle this type of the file:\n %1").arg(url.prettyURL());
break;
}
default:
{
message=i18n("An error occurred while trying to write to file:\n%1\n"
- "Do you want to save to another file or cancel?").tqarg(url.prettyURL());
+ "Do you want to save to another file or cancel?").arg(url.prettyURL());
break;
}
}
@@ -1518,7 +1518,7 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck)
if (KIO::NetAccess::exists(url, false, this))
{
if(KMessageBox::warningContinueCancel(this,i18n("The file %1 already exists.\n"
- "Do you want to overwrite it?").tqarg(url.prettyURL()),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Continue)
+ "Do you want to overwrite it?").arg(url.prettyURL()),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Continue)
{
stat=_catalog->saveFileAs(url);
if(stat!=OK)
@@ -1835,11 +1835,11 @@ void KBabelView::updateEditor(int form, bool delay)
}
msgidLabel->setText(_catalog->msgid(_currentIndex), _catalog->msgctxt(_currentIndex));
- msgidLabel->tqrepaint();
+ msgidLabel->repaint();
msgstrEdit->setText(_catalog->msgstr(_currentIndex));
msgstrEdit->showForm( form );
- msgstrEdit->tqrepaint();
+ msgstrEdit->repaint();
m_cataloglistview->setSelectedItem(_currentIndex);
if(KBabelSettings::autoUnsetFuzzy() && _catalog->isFuzzy(_currentIndex))
@@ -3599,7 +3599,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
}
//i18n: translators: Status bar text that automatic checks have found some errors
- emit signalChangeStatusbar(i18n("1 error: %1", "%n errors: %1", status.size ()).tqarg(msg));
+ emit signalChangeStatusbar(i18n("1 error: %1", "%n errors: %1", status.size ()).arg(msg));
emit signalFaultyDisplayed(true);
if(KBabelSettings::autoCheckColorError())
@@ -4004,7 +4004,7 @@ void KBabelView::spellStart(KSpell *)
KMessageBox::sorry(this,
i18n("Error opening the file that contains words "
"to ignore during spell checking:\n"
- "%1").tqarg(file.name()));
+ "%1").arg(file.name()));
}
}
else
@@ -4012,7 +4012,7 @@ void KBabelView::spellStart(KSpell *)
KMessageBox::sorry(this,
i18n("Only local files are allowed for saving "
"ignored words to during spell checking:\n"
- "%1").tqarg(urlString));
+ "%1").arg(urlString));
}
if(spell.ignoreList.count() > 0)
diff --git a/kbabel/kbabel/kbabelview2.cpp b/kbabel/kbabel/kbabelview2.cpp
index a5ba1df4..34b9dc5b 100644
--- a/kbabel/kbabel/kbabelview2.cpp
+++ b/kbabel/kbabel/kbabelview2.cpp
@@ -537,7 +537,7 @@ void KBabelView::diffInternal(bool autoDf)
KMessageBox::sorry(this
,i18n("An error occurred while trying to get the list "
"of messages for this file from the database:\n"
- "%1").tqarg(error));
+ "%1").arg(error));
_diffing=false;
_diffEnabled=false;
@@ -722,40 +722,40 @@ bool KBabelView::openDiffFile(bool autoDiff)
{
KMessageBox::sorry(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()));
break;
}
case NO_PERMISSIONS:
{
KMessageBox::sorry(this,i18n(
"You do not have permissions to read file:\n %1")
- .tqarg(url.prettyURL()));
+ .arg(url.prettyURL()));
break;
}
case NO_FILE:
{
KMessageBox::sorry(this,i18n(
"You have not specified a valid file:\n %1")
- .tqarg(url.prettyURL()));
+ .arg(url.prettyURL()));
break;
}
case NO_PLUGIN:
{
KMessageBox::error(this,i18n(
- "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL()));
+ "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL()));
break;
}
case UNSUPPORTED_TYPE:
{
KMessageBox::error(this,i18n(
- "The import plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL()));
+ "The import plugin cannot handle this type of the file:\n %1").arg(url.prettyURL()));
break;
}
default:
{
KMessageBox::sorry(this,i18n(
"Error while trying to open file:\n %1")
- .tqarg(url.prettyURL()));
+ .arg(url.prettyURL()));
break;
}
@@ -1020,6 +1020,6 @@ void KBabelView::wordCount()
KMessageBox::information( this
, i18n("Total words: %1\n\n"
"Words in untranslated messages: %2\n\n"
-"Words in fuzzy messages: %3").tqarg(total).tqarg(untranslated).tqarg(fuzzy)
+"Words in fuzzy messages: %3").arg(total).arg(untranslated).arg(fuzzy)
, i18n("Word Count") );
}
diff --git a/kbabel/kbabel/kbbookmarkhandler.cpp b/kbabel/kbabel/kbbookmarkhandler.cpp
index d9f080cb..488a4281 100644
--- a/kbabel/kbabel/kbbookmarkhandler.cpp
+++ b/kbabel/kbabel/kbbookmarkhandler.cpp
@@ -94,7 +94,7 @@ void KBabelBookmarkHandler::addBookmark(KBabelBookmark* b)
// if it's okay then add the bookmark
_list.append(b);
- _menu->insertItem(TQString("#%1 - %2").tqarg(b->msgindex()).tqarg(b->msgtext()),
+ _menu->insertItem(TQString("#%1 - %2").arg(b->msgindex()).arg(b->msgtext()),
this, TQT_SIGNAL(signalBookmarkSelected(int)), 0, b->msgindex());
}
diff --git a/kbabel/kbabel/kbcataloglistviewitem.cpp b/kbabel/kbabel/kbcataloglistviewitem.cpp
index dd14221c..4bbc3049 100644
--- a/kbabel/kbabel/kbcataloglistviewitem.cpp
+++ b/kbabel/kbabel/kbcataloglistviewitem.cpp
@@ -38,14 +38,14 @@ void KBCatalogListViewItem::setMsgId(const TQString& st)
{
m_msgid = st;
setup();
- tqrepaint();
+ repaint();
}
void KBCatalogListViewItem::setMsgStr(const TQString& st)
{
m_msgstr = st;
setup();
- tqrepaint();
+ repaint();
}
uint KBCatalogListViewItem::getId()
@@ -57,7 +57,7 @@ void KBCatalogListViewItem::setId(const uint id)
{
m_id = id;
setup();
- tqrepaint();
+ repaint();
}
TQString KBCatalogListViewItem::key ( int column, bool ascending ) const{
diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp
index 7b2155eb..1a6721a6 100644
--- a/kbabel/kbabel/mymultilineedit.cpp
+++ b/kbabel/kbabel/mymultilineedit.cpp
@@ -885,7 +885,7 @@ void MsgMultiLineEdit::setFont(const TQFont& font)
_wsOffsetX = TQMAX(fm.width(' ')/2-2,1);
_wsOffsetY = TQMAX(fm.height()/2-1,0);
- tqrepaint();
+ repaint();
}
void MsgMultiLineEdit::setDiffDisplayMode(bool addUnderline, bool delStrikeOut)
@@ -992,7 +992,7 @@ void MsgMultiLineEdit::paintSpacePoints()
int i = s.find( " " );
while( (i >= 0) && (i < (int)s.length()-1) ) // -1 because text will end by EOLN
{
- TQPixmap* pm = ( s.tqat(i).tqunicode() == 0x00A0U ) ? wsnb : ws;
+ TQPixmap* pm = ( s.at(i).tqunicode() == 0x00A0U ) ? wsnb : ws;
TQRect r = mapToView( curpara, i );
r.moveBy( r.width()/2, (r.height() - fm.descent())/2 );
r.moveBy( -pm->rect().width()/2, -pm->rect().height()/2-1 );
@@ -1141,10 +1141,10 @@ void MsgMultiLineEdit::paintSpacePoints()
}
}
-void MsgMultiLineEdit::tqrepaint()
+void MsgMultiLineEdit::repaint()
{
highlight();
- MyMultiLineEdit::tqrepaint();
+ MyMultiLineEdit::repaint();
}
void MsgMultiLineEdit::forceUpdate()
@@ -1152,7 +1152,7 @@ void MsgMultiLineEdit::forceUpdate()
_firstChangedLine=0;
_lastChangedLine=paragraphs()-1;
highlighter->highlight();
- MyMultiLineEdit::tqrepaint();
+ MyMultiLineEdit::repaint();
}
void MsgMultiLineEdit::ensureCursorVisible()
diff --git a/kbabel/kbabel/mymultilineedit.h b/kbabel/kbabel/mymultilineedit.h
index 272878da..ba6a96e6 100644
--- a/kbabel/kbabel/mymultilineedit.h
+++ b/kbabel/kbabel/mymultilineedit.h
@@ -229,7 +229,7 @@ public slots:
/**
* reimplemented to call highlight()
*/
- void tqrepaint();
+ void repaint();
void forceUpdate();
void emittedTextChanged();
diff --git a/kbabel/kbabeldict/dictionarymenu.cpp b/kbabel/kbabeldict/dictionarymenu.cpp
index d850f9a6..759468c9 100644
--- a/kbabel/kbabeldict/dictionarymenu.cpp
+++ b/kbabel/kbabeldict/dictionarymenu.cpp
@@ -112,11 +112,11 @@ void DictionaryMenu::add(const TQString& n, const TQString& moduleId
TQString keyString=key;
if(keyString.contains("%1"))
{
- keyString=key.tqarg(accel2id.count()+1);
+ keyString=key.arg(accel2id.count()+1);
}
KShortcut k(keyString);
- KAction* dictionaryAction = new KAction( name, k, dictionaryMapper, TQT_SLOT(map()), actionCollection, key.tqarg(moduleId).utf8() );
+ KAction* dictionaryAction = new KAction( name, k, dictionaryMapper, TQT_SLOT(map()), actionCollection, key.arg(moduleId).utf8() );
uint id = maxId++;
dictionaryAction->plug(popup,id);
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index b957a143..0497581a 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -1007,7 +1007,7 @@ void KBabelDictBox::showResult(TQListViewItem *item)
if(!info->filePath.isEmpty())
{
rmbPopup->changeItem(editFileIndex
- ,i18n("Edit File %1").tqarg(info->location));
+ ,i18n("Edit File %1").arg(info->location));
rmbPopup->setItemEnabled(editFileIndex,true);
}
else
@@ -1182,7 +1182,7 @@ void KBabelDictBox::nextInfo()
if(!info->filePath.isEmpty())
{
rmbPopup->changeItem(editFileIndex
- ,i18n("Edit File %1").tqarg(info->location));
+ ,i18n("Edit File %1").arg(info->location));
rmbPopup->setItemEnabled(editFileIndex,true);
}
else
@@ -1255,7 +1255,7 @@ void KBabelDictBox::about()
if(aboutData->bugAddress() != "submit@bugs.kde.org")
{
text += "\n" + i18n("Send bugs to %1")
- .tqarg(aboutData->bugAddress()) +"\n";
+ .arg(aboutData->bugAddress()) +"\n";
}
TQLabel *label = new TQLabel(text,0);
@@ -1502,7 +1502,7 @@ void KBabelDictBox::configure(const TQString& id, bool modal)
{
if(e->id() == id)
{
- TQString caption = i18n("Configure Dictionary %1").tqarg(e->name());
+ TQString caption = i18n("Configure Dictionary %1").arg(e->name());
KDialogBase *dialog = new KDialogBase(this,"prefDialog"
, modal, caption
, KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel|
@@ -1696,7 +1696,7 @@ void KBabelDictBox::editFile()
{
KMessageBox::sorry(this
,i18n("There was an error starting KBabel:\n%1")
- .tqarg(error));
+ .arg(error));
return;
}
}
diff --git a/kbabel/kbabeldict/kbabelsplash.cpp b/kbabel/kbabeldict/kbabelsplash.cpp
index 85ec22d4..56c5e3a8 100644
--- a/kbabel/kbabeldict/kbabelsplash.cpp
+++ b/kbabel/kbabeldict/kbabelsplash.cpp
@@ -53,7 +53,7 @@ KBabelSplash::KBabelSplash( TQWidget* parent, const char* name )
picLabel->setFrameStyle(TQFrame::WinPanel | TQFrame::Raised);
- // Set tqgeometry, with support for Xinerama systems
+ // Set geometry, with support for Xinerama systems
TQRect r;
r.setSize(sizeHint());
int ps = TQApplication::desktop()->primaryScreen();
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
index 95ec19dd..699e3530 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
@@ -703,7 +703,7 @@ DataBaseManager::cursorGet (uint32 flags)
else
{
kdDebug (KBABEL_SEARCH) << TQString ("...cursor getting...%1").
- tqarg (ret) << endl;
+ arg (ret) << endl;
return DataBaseItem ();
}
@@ -782,7 +782,7 @@ DataBaseManager::createDataBase (TQString directory,
rename (filename.local8Bit (), filename.local8Bit () + ",old");
-//kdDebug(0) << TQString("Creating %1").tqarg(filename) << endl;
+//kdDebug(0) << TQString("Creating %1").arg(filename) << endl;
iAmOk = true;
@@ -861,7 +861,7 @@ DataBaseManager::createDataBase (TQString directory,
loadInfo ();
else
kdDebug (KBABEL_SEARCH) << TQString ("I am NOT ok : %1").
- tqarg (ret) << endl;
+ arg (ret) << endl;
//THIS IS WRONG, rewrite the error handling.
return iAmOk;
@@ -889,7 +889,7 @@ DataBaseManager::getCatalogInfo (int n)
return InfoItem ();
}
-// kdDebug(0) << TQString("Trad %1").tqarg(ret) << endl;
+// kdDebug(0) << TQString("Trad %1").arg(ret) << endl;
InfoItem it ((char *) data.data, language);
//free(data.data); // Read docu for this!!!!
@@ -1324,7 +1324,7 @@ DataBaseManager::appendKey (TQString _key)
else
ret = *(uint32 *) key.data;
-//kdDebug(0) << TQString("Append result %1,err = %1").tqarg(ret).tqarg(err) << endl;
+//kdDebug(0) << TQString("Append result %1,err = %1").arg(ret).arg(err) << endl;
free (data.data);
@@ -1353,7 +1353,7 @@ DataBaseManager::getKey (uint32 n)
return TQString::fromUtf8 ((char *) data.data);
-// kdDebug(0) << TQString("Trad %1").tqarg(ret) << endl;
+// kdDebug(0) << TQString("Trad %1").arg(ret) << endl;
}
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
index 10a3a796..47bc8fa9 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
@@ -57,7 +57,7 @@ if (!called)
{ pb=true; count=0;}
called=true;
-kdDebug(0) << TQString("cat: %1, %2").tqarg(pathName).tqarg(pattern) << endl;
+kdDebug(0) << TQString("cat: %1, %2").arg(pathName).arg(pattern) << endl;
if(pb)
{emit patternStarted();
@@ -149,7 +149,7 @@ tot=catalog->numberOfEntries();
bool fuzzy;
bool untra;
-//kdDebug(0) << TQString("Tot: %1").tqarg(tot) << endl;
+//kdDebug(0) << TQString("Tot: %1").arg(tot) << endl;
for (i=0;i<tot;i++) //Skip header = ????
{
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui
index 6c3fa8a9..7833bef3 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui
+++ b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui
@@ -487,7 +487,7 @@ If you search for &lt;em&gt;My name is Andrea&lt;/em&gt; and you have activated
<property name="text">
<string>[A-Za-z0-9_%</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
index a3481a07..4effd2cc 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
@@ -99,12 +99,12 @@ TQString defaultDir;
void PreferencesWidget::setName(TQString n)
{
-dbpw->filenameLB->setText(i18n("Scanning file: %1").tqarg(n));
+dbpw->filenameLB->setText(i18n("Scanning file: %1").arg(n));
}
void PreferencesWidget::setEntries(int i)
{
-dbpw->entriesLB->setText(i18n("Entries added: %1").tqarg(i));
+dbpw->entriesLB->setText(i18n("Entries added: %1").arg(i));
}
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
index c4f5e397..923d9897 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
@@ -138,7 +138,7 @@ if (!called)
{ pb=true; count=0;}
called=true;
-kdDebug(0) << TQString("Scanning: %1, %2").tqarg(pathName).tqarg(pattern) << endl;
+kdDebug(0) << TQString("Scanning: %1, %2").arg(pathName).arg(pattern) << endl;
if(pb)
{
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui
index 0834f06c..e3ef3776 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui
@@ -490,7 +490,7 @@ If you search for &lt;em&gt;My name is Andrea&lt;/em&gt; and you have activated
<property name="text">
<string>[A-Za-z0-9_%</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
index 589b3d25..110dd874 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
@@ -393,7 +393,7 @@ void PoAuxiliary::loadAuxiliary()
{
TQString dir=directory(editedFile,number);
TQString s("@DIR%1@");
- path.replace(s.tqarg(number),dir);
+ path.replace(s.arg(number),dir);
pos+=dir.length();
}
@@ -436,7 +436,7 @@ void PoAuxiliary::loadAuxiliary()
{
error = true;
errorMsg = i18n("Error while trying to open file for PO Auxiliary module:\n%1")
- .tqarg(u.prettyURL());
+ .arg(u.prettyURL());
emit hasError(errorMsg);
}
}
diff --git a/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui b/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui
index 27179462..f345eebb 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui
+++ b/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui
@@ -7,7 +7,7 @@
<cstring>PWidget</cstring>
</property>
<property stdset="1">
- <name>tqgeometry</name>
+ <name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
index b90479e1..d346bcf5 100644
--- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
@@ -91,7 +91,7 @@ bool CompendiumData::load(KURL url)
_error = true;
_errorMsg = i18n("Error while trying to read file for PO Compendium module:\n%1")
- .tqarg(url.prettyURL());
+ .arg(url.prettyURL());
emit progressEnds();
diff --git a/kbabel/kbabeldict/modules/pocompendium/pwidget.ui b/kbabel/kbabeldict/modules/pocompendium/pwidget.ui
index 05bafd89..db8de91e 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pwidget.ui
+++ b/kbabel/kbabeldict/modules/pocompendium/pwidget.ui
@@ -8,7 +8,7 @@
<cstring>PWidget</cstring>
</property>
<property stdset="1">
- <name>tqgeometry</name>
+ <name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
index 3c12be11..0c186b57 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
@@ -117,7 +117,7 @@ bool TmxCompendiumData::load(const KURL& url, const TQString& language)
_errorMsg = i18n("Error while trying to read file for TMX Compendium module:\n"
"%1\n"
"Reason: %2")
- .tqarg(url.prettyURL()).tqarg(_errorMsg);
+ .arg(url.prettyURL()).arg(_errorMsg);
kdDebug(KBABEL_SEARCH) << "Error: " << _errorMsg << endl;