TDE
/
tdesdk
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdesdk
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove additional unneeded tq method conversions

Browse Source 
(cherry picked from commit f78838f2f7)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent 5fcaf38922
commit 611a40e79a
201 changed files with 1073 additions and 1073 deletions
Show Stats Download Patch File Download Diff File

2
cervisia/annotatectl.cpp
Unescape View File

@ -79,7 +79,7 @@ void AnnotateController::showDialog(const TQString& fileName, const TQString& re
// hide progress dialog
delete d->progress; d->progress = 0;
d->dialog->setCaption(i18n("CVS Annotate: %1").tqarg(fileName));
d->dialog->setCaption(i18n("CVS Annotate: %1").arg(fileName));
d->dialog->show();
}

8
cervisia/cervisia.1.in
Unescape View File

@ -144,7 +144,7 @@ Cervisia \- Graphical CVS frontend
[\ \fB\-\-nocrashhandler\fR\ ]
[\ \fB\-\-waitforwm\fR\ ]
[\ \fB\-\-style\fR\ \fIstyle\fR\ ]
[\ \fB\-\-tqgeometry\fR\ \fItqgeometry\fR\ ]
[\ \fB\-\-geometry\fR\ \fIgeometry\fR\ ]
[\ \fB\-\-resolve\fR\ \fIfilename\fR\ ]
[\ \fB\-\-log\fR\ \fIfilename\fR\ ]
[\ \fB\-\-annotate\fR\ \fIfilename\fR\ ]
@ -193,9 +193,9 @@ Waits for a \s-1WM_NET\s0 compatible windowmanager
.IP "\fB\-\-style\fR \fIstyle\fR" 4
.IX Item "--style style"
Sets the application \s-1GUI\s0 style
.IP "\fB\-\-tqgeometry\fR \fItqgeometry\fR" 4
.IX Item "--tqgeometry tqgeometry"
Sets the tqgeometry of the main window
.IP "\fB\-\-geometry\fR \fIgeometry\fR" 4
.IX Item "--geometry geometry"
Sets the geometry of the main window
.SH "FILES"
.IX Header "FILES"
\&\fI_KDECONFDIR_/cervisiarc\fR \- global configuration file

6
cervisia/cervisia.pod
Unescape View File

@ -14,7 +14,7 @@ B<cervisia>
S<[ B<--nocrashhandler> ]>
S<[ B<--waitforwm> ]>
S<[ B<--style> I<style> ]>
S<[ B<--tqgeometry> I<tqgeometry> ]>
S<[ B<--geometry> I<geometry> ]>
S<[ B<--resolve> I<filename> ]>
S<[ B<--log> I<filename> ]>
S<[ B<--annotate> I<filename> ]>
@ -80,9 +80,9 @@ Waits for a WM_NET compatible windowmanager
Sets the application GUI style
=item B<--tqgeometry> I<tqgeometry>
=item B<--geometry> I<geometry>
Sets the tqgeometry of the main window
Sets the geometry of the main window
=head1 FILES

4
cervisia/cervisiapart.cpp
Unescape View File

@ -726,7 +726,7 @@ void CervisiaPart::aboutCervisia()
"GNU General Public License for more details.\n"
"See the ChangeLog file for a list of contributors."));
TQMessageBox::about(0, i18n("About Cervisia"),
aboutstr.tqarg(CERVISIA_VERSION).tqarg(KDE_VERSION_STRING));
aboutstr.arg(CERVISIA_VERSION).arg(KDE_VERSION_STRING));
}
@ -1694,7 +1694,7 @@ void CervisiaPart::slotJobFinished()
{
KNotifyClient::event(widget()->parentWidget()->winId(), "cvs_commit_done",
i18n("A CVS commit to repository %1 is done")
.tqarg(repository));
.arg(repository));
m_jobType = Unknown;
}
}

24
cervisia/diffdlg.cpp
Unescape View File

@ -91,7 +91,7 @@ DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool mo
nofnlabel = new TQLabel(mainWidget);
// avoids auto resize when the text is changed
nofnlabel->setMinimumWidth(fontMetrics().width(i18n("%1 differences").tqarg(10000)));
nofnlabel->setMinimumWidth(fontMetrics().width(i18n("%1 differences").arg(10000)));
backbutton = new TQPushButton(TQString::fromLatin1("&<<"), mainWidget);
connect( backbutton, TQT_SIGNAL(clicked()), TQT_SLOT(backClicked()) );
@ -189,18 +189,18 @@ static TQString regionAsString(int linenoA, int linecountA, int linenoB, int lin
int lineendB = linenoB+linecountB-1;
TQString res;
if (linecountB == 0)
res = TQString("%1,%2d%3").tqarg(linenoA).tqarg(lineendA).tqarg(linenoB-1);
res = TQString("%1,%2d%3").arg(linenoA).arg(lineendA).arg(linenoB-1);
else if (linecountA == 0)
res = TQString("%1a%2,%3").tqarg(linenoA-1).tqarg(linenoB).tqarg(lineendB);
res = TQString("%1a%2,%3").arg(linenoA-1).arg(linenoB).arg(lineendB);
else if (linenoA == lineendA)
if (linenoB == lineendB)
res = TQString("%1c%2").tqarg(linenoA).tqarg(linenoB);
res = TQString("%1c%2").arg(linenoA).arg(linenoB);
else
res = TQString("%1c%2,%3").tqarg(linenoA).tqarg(linenoB).tqarg(lineendB);
res = TQString("%1c%2,%3").arg(linenoA).arg(linenoB).arg(lineendB);
else if (linenoB == lineendB)
res = TQString("%1,%2c%3").tqarg(linenoA).tqarg(lineendA).tqarg(linenoB);
res = TQString("%1,%2c%3").arg(linenoA).arg(lineendA).arg(linenoB);
else
res = TQString("%1,%2c%3,%4").tqarg(linenoA).tqarg(lineendA).tqarg(linenoB).tqarg(lineendB);
res = TQString("%1,%2c%3,%4").arg(linenoA).arg(lineendA).arg(linenoB).arg(lineendB);
return res;
@ -222,7 +222,7 @@ bool DiffDialog::parseCvsDiff(CvsService_stub* service, const TQString& fileName
TQStringList linesA, linesB;
int linenoA, linenoB;
setCaption(i18n("CVS Diff: %1").tqarg(fileName));
setCaption(i18n("CVS Diff: %1").arg(fileName));
revlabel1->setText( revA.isEmpty()?
i18n("Repository:")
: i18n("Revision ")+revA+":" );
@ -408,9 +408,9 @@ void DiffDialog::updateNofN()
{
TQString str;
if (markeditem >= 0)
str = i18n("%1 of %2").tqarg(markeditem+1).tqarg(items.count());
str = i18n("%1 of %2").arg(markeditem+1).arg(items.count());
else
str = i18n("%1 differences").tqarg(items.count());
str = i18n("%1 differences").arg(items.count());
nofnlabel->setText(str);
itemscombo->setCurrentItem(markeditem==-2? 0 : markeditem+1);
@ -443,8 +443,8 @@ void DiffDialog::updateHighlight(int newitem)
diff1->setCenterLine(item->linenoA);
diff2->setCenterLine(item->linenoB);
}
diff1->tqrepaint();
diff2->tqrepaint();
diff1->repaint();
diff2->repaint();
updateNofN();
}

2
cervisia/diffview.cpp
Unescape View File

@ -426,7 +426,7 @@ bool DiffZoomWidget::eventFilter(TQObject *o, TQEvent *e)
if (e->type() == TQEvent::Show
|| e->type() == TQEvent::Hide
|| e->type() == TQEvent::Resize)
tqrepaint();
repaint();
return TQFrame::eventFilter(o, e);
}

2
cervisia/logdlg.cpp
Unescape View File

@ -233,7 +233,7 @@ bool LogDialog::parseCvsLog(CvsService_stub* service, const TQString& fileName)
cvsService = service;
filename = fileName;
setCaption(i18n("CVS Log: %1").tqarg(filename));
setCaption(i18n("CVS Log: %1").arg(filename));
DCOPRef job = cvsService->log(filename);
if( !cvsService->ok() )

6
cervisia/logplainview.cpp
Unescape View File

@ -53,7 +53,7 @@ void LogPlainView::addRevision(const LogInfo& logInfo)
// assemble revision information lines
TQString logEntry;
logEntry += "<b>" + i18n("revision %1").tqarg(TQStyleSheet::escape(logInfo.m_revision)) +
logEntry += "<b>" + i18n("revision %1").arg(TQStyleSheet::escape(logInfo.m_revision)) +
"</b>";
logEntry += " &nbsp;[<a href=\"revA#" + TQStyleSheet::escape(logInfo.m_revision) + "\">" +
i18n("Select for revision A") +
@ -62,8 +62,8 @@ void LogPlainView::addRevision(const LogInfo& logInfo)
i18n("Select for revision B") +
"</a>]<br>";
logEntry += "<i>" +
i18n("date: %1; author: %2").tqarg(TQStyleSheet::escape(logInfo.dateTimeToString()))
.tqarg(TQStyleSheet::escape(logInfo.m_author)) +
i18n("date: %1; author: %2").arg(TQStyleSheet::escape(logInfo.dateTimeToString()))
.arg(TQStyleSheet::escape(logInfo.m_author)) +
"</i>";
append(logEntry);

2
cervisia/logtree.cpp
Unescape View File

@ -243,7 +243,7 @@ void LogTreeView::setSelectedPair(TQString selectionA, TQString selectionB)
if (oldstate != newstate)
{
it.current()->selected = newstate;
tqrepaint(false);
repaint(false);
}
}
}

2
cervisia/misc.cpp
Unescape View File

@ -215,7 +215,7 @@ bool Cervisia::CheckOverwrite(const TQString& fileName, TQWidget* parent)
if( fi.exists() )
{
result = (KMessageBox::warningContinueCancel(parent,
i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").tqarg(fileName),
i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(fileName),
i18n("Overwrite File?"),
KGuiItem(i18n("&Overwrite"), "filesave", i18n("Overwrite the file"))) == KMessageBox::Continue);
}

6
cervisia/protocolview.cpp
Unescape View File

@ -124,7 +124,7 @@ void ProtocolView::slotJobExited(bool normalExit, int exitStatus)
if( normalExit )
{
if( exitStatus )
msg = i18n("[Exited with status %1]\n").tqarg(exitStatus);
msg = i18n("[Exited with status %1]\n").arg(exitStatus);
else
msg = i18n("[Finished]\n");
}
@ -180,8 +180,8 @@ void ProtocolView::appendLine(const TQString &line)
color = remoteChangeColor;
append(color.isValid()
? TQString("<font color=\"%1\"><b>%2</b></font>").tqarg(color.name())
.tqarg(escapedLine)
? TQString("<font color=\"%1\"><b>%2</b></font>").arg(color.name())
.arg(escapedLine)
: escapedLine);
}

56
cervisia/qttableview.cpp
Unescape View File

@ -87,7 +87,7 @@ void TQCornerSquare::paintEvent( TQPaintEvent * )
used by functions such as setXOffset() or maxYOffset().
\i The \e widget coordinates. (0,0) is the top-left corner of the widget,
\e including the frame. They are used by functions such as tqrepaint().
\e including the frame. They are used by functions such as repaint().
\i The \e view coordinates. (0,0) is the top-left corner of the view, \e
excluding the frame. This is the least-used coordinate system; it is used by
@ -134,7 +134,7 @@ void TQCornerSquare::paintEvent( TQPaintEvent * )
The \link setCellHeight() cell height\endlink and \link setCellWidth()
cell width\endlink are set to 0.
Frame line tqshapes (TQFrame::HLink and TQFrame::VLine) are disallowed;
Frame line shapes (TQFrame::HLink and TQFrame::VLine) are disallowed;
see TQFrame::setFrameStyle().
Note that the \a f argument is \e not \link setTableFlags() table
@ -206,7 +206,7 @@ void QtTableView::show()
/*!
\overload void QtTableView::tqrepaint( bool erase )
\overload void QtTableView::repaint( bool erase )
Repaints the entire view.
*/
@ -220,16 +220,16 @@ void QtTableView::show()
If \a w is negative, it is replaced with <code>width() - x</code>.
If \a h is negative, it is replaced with <code>height() - y</code>.
Doing a tqrepaint() usually is faster than doing an update(), but
Doing a repaint() usually is faster than doing an update(), but
calling update() many times in a row will generate a single paint
event.
At present, QtTableView is the only widget that reimplements \link
TQWidget::tqrepaint() tqrepaint()\endlink. It does this because by
TQWidget::repaint() repaint()\endlink. It does this because by
clearing and then repainting one cell at at time, it can make the
screen flicker less than it would otherwise. */
void QtTableView::tqrepaint( int x, int y, int w, int h, bool erase )
void QtTableView::repaint( int x, int y, int w, int h, bool erase )
{
if ( !isVisible() || testWState(WState_BlockUpdates) )
return;
@ -248,7 +248,7 @@ void QtTableView::tqrepaint( int x, int y, int w, int h, bool erase )
}
/*!
\overload void QtTableView::tqrepaint( const TQRect &r, bool erase )
\overload void QtTableView::repaint( const TQRect &r, bool erase )
Replaints rectangle \a r. If \a erase is TRUE draws the background
using the palette's background.
*/
@ -287,7 +287,7 @@ void QtTableView::setNumRows( int rows )
nRows = rows;
if ( autoUpdate() && isVisible() &&
( oldLastVisible != lastRowVisible() || oldTopCell != topCell() ) )
tqrepaint( oldTopCell != topCell() );
repaint( oldTopCell != topCell() );
} else {
// Be more careful - if destructing, bad things might happen.
nRows = rows;
@ -327,7 +327,7 @@ void QtTableView::setNumCols( int cols )
if ( autoUpdate() && isVisible() ) {
int maxCol = lastColVisible();
if ( maxCol >= oldCols || maxCol >= nCols )
tqrepaint();
repaint();
}
updateScrollBars( horRange );
updateFrameSize();
@ -590,7 +590,7 @@ void QtTableView::setCellWidth( int cellWidth )
updateScrollBars( horSteps | horRange );
if ( autoUpdate() && isVisible() )
tqrepaint();
repaint();
}
@ -642,7 +642,7 @@ void QtTableView::setCellHeight( int cellHeight )
#endif
cellH = (short)cellHeight;
if ( autoUpdate() && isVisible() )
tqrepaint();
repaint();
updateScrollBars( verSteps | verRange );
}
@ -816,7 +816,7 @@ void QtTableView::setTableFlags( uint f )
(f & Tbl_snapToVGrid) != 0 && yCellDelta != 0 ) {
snapToGrid( (f & Tbl_snapToHGrid) != 0, // do snapping
(f & Tbl_snapToVGrid) != 0 );
repaintMask |= Tbl_snapToGrid; // tqrepaint table
repaintMask |= Tbl_snapToGrid; // repaint table
}
}
@ -824,7 +824,7 @@ void QtTableView::setTableFlags( uint f )
setAutoUpdate( TRUE );
updateScrollBars();
if ( isVisible() && (f & repaintMask) )
tqrepaint();
repaint();
}
}
@ -880,7 +880,7 @@ void QtTableView::clearTableFlags( uint f )
(f & Tbl_smoothVScrolling) != 0 && yCellDelta != 0 ) {
snapToGrid( (f & Tbl_smoothHScrolling) != 0, // do snapping
(f & Tbl_smoothVScrolling) != 0 );
repaintMask |= Tbl_smoothScrolling; // tqrepaint table
repaintMask |= Tbl_smoothScrolling; // repaint table
}
}
if ( f & Tbl_snapToHGrid ) {
@ -893,7 +893,7 @@ void QtTableView::clearTableFlags( uint f )
setAutoUpdate( TRUE );
updateScrollBars(); // returns immediately if nothing to do
if ( isVisible() && (f & repaintMask) )
tqrepaint();
repaint();
}
}
@ -915,20 +915,20 @@ void QtTableView::clearTableFlags( uint f )
automatically whenever it has changed in some way (for example, when a
\link setTableFlags() flag\endlink is changed).
If \a enable is FALSE, the view does NOT tqrepaint itself or update
If \a enable is FALSE, the view does NOT repaint itself or update
its internal state variables when it is changed. This can be
useful to avoid flicker during large changes and is singularly
useless otherwise. Disable auto-update, do the changes, re-enable
auto-update and call tqrepaint().
auto-update and call repaint().
\warning Do not leave the view in this state for a long time
(i.e., between events). If, for example, the user interacts with the
view when auto-update is off, strange things can happen.
Setting auto-update to TRUE does not tqrepaint the view; you must call
tqrepaint() to do this.
Setting auto-update to TRUE does not repaint the view; you must call
repaint() to do this.
\sa autoUpdate(), tqrepaint()
\sa autoUpdate(), repaint()
*/
void QtTableView::setAutoUpdate( bool enable )
@ -962,7 +962,7 @@ void QtTableView::updateCell( int row, int col, bool erase )
TQRect uR = TQRect( xPos, yPos,
cellW ? cellW : cellWidth(col),
cellH ? cellH : cellHeight(row) );
tqrepaint( uR.intersect(viewRect()), erase );
repaint( uR.intersect(viewRect()), erase );
}
@ -1378,7 +1378,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
// Note that this needs to be done regardless whether we do
// eraseInPaint or not. Reason: a subclass may implement
// flicker-freeness and encourage the use of tqrepaint(FALSE).
// flicker-freeness and encourage the use of repaint(FALSE).
// The subclass, however, cannot draw all pixels, just those
// inside the cells. So QtTableView is reponsible for all pixels
// outside the cells.
@ -1430,7 +1430,7 @@ void QtTableView::wheelEvent( TQWheelEvent * e )
void QtTableView::updateView()
{
tqrepaint( viewRect() );
repaint( viewRect() );
}
/*!
@ -1526,7 +1526,7 @@ void QtTableView::setHorScrollBar( bool on, bool update )
else
sbDirty = sbDirty | verMask;
if ( hideScrollBar && isVisible() )
tqrepaint( hScrollBar->x(), hScrollBar->y(),
repaint( hScrollBar->x(), hScrollBar->y(),
width() - hScrollBar->x(), hScrollBar->height() );
}
if ( update )
@ -1565,7 +1565,7 @@ void QtTableView::setVerScrollBar( bool on, bool update )
else
sbDirty = sbDirty | horMask;
if ( hideScrollBar && isVisible() )
tqrepaint( vScrollBar->x(), vScrollBar->y(),
repaint( vScrollBar->x(), vScrollBar->y(),
vScrollBar->width(), height() - vScrollBar->y() );
}
if ( update )
@ -2010,7 +2010,7 @@ void QtTableView::updateScrollBars( uint f )
if ( sbDirty & horValue )
hScrollBar->setValue( xOffs );
// show scrollbar only when it has a sane tqgeometry
// show scrollbar only when it has a sane geometry
if ( !hScrollBar->isVisible() )
hScrollBar->show();
}
@ -2034,7 +2034,7 @@ void QtTableView::updateScrollBars( uint f )
if ( sbDirty & verValue )
vScrollBar->setValue( yOffs );
// show scrollbar only when it has a sane tqgeometry
// show scrollbar only when it has a sane geometry
if ( !vScrollBar->isVisible() )
vScrollBar->show();
}
@ -2257,7 +2257,7 @@ void QtTableView::showOrHideScrollBars()
Call this function when the table view's total size is changed;
typically because the result of cellHeight() or cellWidth() have changed.
This function does not tqrepaint the widget.
This function does not repaint the widget.
*/
void QtTableView::updateTableSize()

14
cervisia/qttableview.h
Unescape View File

@ -32,9 +32,9 @@ public:
virtual void setPalette( const TQPalette & );
void show();
void tqrepaint( bool erase=TRUE );
void tqrepaint( int x, int y, int w, int h, bool erase=TRUE );
void tqrepaint( const TQRect &, bool erase=TRUE );
void repaint( bool erase=TRUE );
void repaint( int x, int y, int w, int h, bool erase=TRUE );
void repaint( const TQRect &, bool erase=TRUE );
protected:
QtTableView( TQWidget *parent=0, const char *name=0, WFlags f=0 );
@ -236,11 +236,11 @@ inline TQRect QtTableView::cellUpdateRect() const
inline bool QtTableView::autoUpdate() const
{ return isUpdatesEnabled(); }
inline void QtTableView::tqrepaint( bool erase )
{ tqrepaint( 0, 0, width(), height(), erase ); }
inline void QtTableView::repaint( bool erase )
{ repaint( 0, 0, width(), height(), erase ); }
inline void QtTableView::tqrepaint( const TQRect &r, bool erase )
{ tqrepaint( r.x(), r.y(), r.width(), r.height(), erase ); }
inline void QtTableView::repaint( const TQRect &r, bool erase )
{ repaint( r.x(), r.y(), r.width(), r.height(), erase ); }
inline void QtTableView::updateScrollBars()
{ updateScrollBars( 0 ); }

20
cervisia/resolvedlg.cpp
Unescape View File

@ -222,7 +222,7 @@ bool ResolveDialog::parseFile(const TQString &name)
int advanced1, advanced2;
enum { Normal, VersionA, VersionB } state;
setCaption(i18n("CVS Resolve: %1").tqarg(name));
setCaption(i18n("CVS Resolve: %1").arg(name));
fname = name;
@ -383,9 +383,9 @@ void ResolveDialog::updateNofN()
{
TQString str;
if (markeditem >= 0)
str = i18n("%1 of %2").tqarg(markeditem+1).tqarg(items.count());
str = i18n("%1 of %2").arg(markeditem+1).arg(items.count());
else
str = i18n("%1 conflicts").tqarg(items.count());
str = i18n("%1 conflicts").arg(items.count());
nofnlabel->setText(str);
backbutton->setEnabled(markeditem != -1);
@ -424,9 +424,9 @@ void ResolveDialog::updateHighlight(int newitem)
diff2->setCenterLine(item->linenoB);
merge->setCenterOffset(item->offsetM);
}
diff1->tqrepaint();
diff2->tqrepaint();
merge->tqrepaint();
diff1->repaint();
diff2->repaint();
merge->repaint();
updateNofN();
}
@ -456,7 +456,7 @@ void ResolveDialog::updateMergedVersion(ResolveItem* item,
while ( (item = items.next()) != 0 )
item->offsetM += difference;
merge->tqrepaint();
merge->repaint();
}
@ -562,9 +562,9 @@ void ResolveDialog::editClicked()
}
delete dlg;
diff1->tqrepaint();
diff2->tqrepaint();
merge->tqrepaint();
diff1->repaint();
diff2->repaint();
merge->repaint();
}

2
cervisia/settingsdlg.cpp
Unescape View File

@ -73,7 +73,7 @@ void FontButton::chooseFont()
return;
setFont(newFont);
tqrepaint(false);
repaint(false);
}

4
cervisia/updateview_items.cpp
Unescape View File

@ -508,7 +508,7 @@ void UpdateFileItem::setStatus(EntryStatus status)
m_entry.m_status = status;
const bool visible(applyFilter(updateView()->filter()));
if (visible)
tqrepaint();
repaint();
}
m_undefined = false;
}
@ -584,7 +584,7 @@ void UpdateFileItem::setRevTag(const TQString& rev, const TQString& tag)
if (isVisible())
{
widthChanged();
tqrepaint();
repaint();
}
}

2
cervisia/updateview_items.h
Unescape View File

@ -50,7 +50,7 @@ public:
const Cervisia::Entry& entry() const { return m_entry; }
// Returns the path (relative to the repository).
// TQString() for the root item and its (direct) tqchildren.
// TQString() for the root item and its (direct) children.
// If it's not TQString() it ends with '/'.
TQString dirPath() const;

2
cervisia/updateview_visitors.cpp
Unescape View File

@ -47,7 +47,7 @@ void ApplyFilterVisitor::preVisit(UpdateDirItem* item)
void ApplyFilterVisitor::postVisit(UpdateDirItem* item)
{
// a UpdateDirItem is visible if
// - it has visible tqchildren
// - it has visible children
// - it is not opened
// - empty directories are not hidden
// - it has no parent (top level item)

6
kbabel/catalogmanager/catalogmanager.cpp
Unescape View File

@ -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));
}
}

76
kbabel/catalogmanager/catalogmanagerview.cpp
Unescape View File

@ -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 );

2
kbabel/catalogmanager/catalogmanagerview.h
Unescape View File

@ -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();
/**

20
kbabel/catalogmanager/catmanlistitem.cpp
Unescape View File

@ -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;
}

8
kbabel/catalogmanager/catmanlistitem.h
Unescape View File

@ -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
*/

18
kbabel/catalogmanager/libcvs/cvsdialog.cpp
Unescape View File

@ -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 );
}

2
kbabel/catalogmanager/libcvs/cvshandler.cpp
Unescape View File

@ -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 );

8
kbabel/catalogmanager/libsvn/svndialog.cpp
Unescape View File

@ -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();
}

18
kbabel/catalogmanager/multiroughtransdlg.cpp
Unescape View File

@ -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"));

2
kbabel/catalogmanager/validateprogress.cpp
Unescape View File

@ -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;

2
kbabel/catalogmanager/validateprogresswidget.ui.h
Unescape View File

@ -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();
}

4
kbabel/common/catalog.cpp
Unescape View File

@ -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

6
kbabel/common/kbmailer.cpp
Unescape View File

@ -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);

10
kbabel/commonui/projectprefwidgets.cpp
Unescape View File

@ -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())

2
kbabel/commonui/projectwizard.cpp
Unescape View File

@ -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;
}

14
kbabel/commonui/roughtransdlg.cpp
Unescape View File

@ -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"));

2
kbabel/datatools/regexp/main.cc
Unescape View File

@ -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 )

2
kbabel/filters/gettext/gettextexport.cpp
Unescape View File

@ -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;
}

10
kbabel/filters/gettext/gettextimport.cpp
Unescape View File

@ -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"))

2
kbabel/kbabel/contextview.cpp
Unescape View File

@ -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);

2
kbabel/kbabel/headereditor.cpp
Unescape View File

@ -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);

4
kbabel/kbabel/hidingmsgedit.cpp
Unescape View File

@ -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);
}

22
kbabel/kbabel/kbabel.cpp
Unescape View File

@ -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);

2
kbabel/kbabel/kbabelsplash.cpp
Unescape View File

@ -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();

70
kbabel/kbabel/kbabelview.cpp
Unescape View File

@ -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)

16
kbabel/kbabel/kbabelview2.cpp
Unescape View File

@ -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") );
}

2
kbabel/kbabel/kbbookmarkhandler.cpp
Unescape View File

@ -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());
}

6
kbabel/kbabel/kbcataloglistviewitem.cpp
Unescape View File

@ -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{

10
kbabel/kbabel/mymultilineedit.cpp
Unescape View File

@ -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()

2
kbabel/kbabel/mymultilineedit.h
Unescape View File

@ -229,7 +229,7 @@ public slots:
/**
* reimplemented to call highlight()
*/
void tqrepaint();
void repaint();
void forceUpdate();
void emittedTextChanged();

4
kbabel/kbabeldict/dictionarymenu.cpp
Unescape View File

@ -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);

10
kbabel/kbabeldict/kbabeldictbox.cpp
Unescape View File

@ -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;
}
}

2
kbabel/kbabeldict/kbabelsplash.cpp
Unescape View File

@ -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();

12
kbabel/kbabeldict/modules/dbsearchengine/database.cpp
Unescape View File

@ -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;
}

4
kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
Unescape View File

@ -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 = ????
{

2
kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui
Unescape View File

@ -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">

4
kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
Unescape View File

@ -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));
}

2
kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
Unescape View File

@ -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)
{

2
kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui
Unescape View File

@ -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">

4
kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
Unescape View File

@ -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);
}
}

2
kbabel/kbabeldict/modules/poauxiliary/pwidget.ui
Unescape View File

@ -7,7 +7,7 @@
<cstring>PWidget</cstring>
</property>
<property stdset="1">
<name>tqgeometry</name>
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>

2
kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
Unescape View File

@ -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();

2
kbabel/kbabeldict/modules/pocompendium/pwidget.ui
Unescape View File

@ -8,7 +8,7 @@
<cstring>PWidget</cstring>
</property>
<property stdset="1">
<name>tqgeometry</name>
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>

2
kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
Unescape View File

@ -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;

2
kbugbuster/backend/bugdetails.cpp
Unescape View File

@ -241,7 +241,7 @@ TQValueList<BugDetails::Attachment> BugDetails::extractAttachments( const TQStri
KCodecs::base64Decode( contents.local8Bit(), a.contents /*out*/ );
else
//KCodecs::uudecode( contents.local8Bit(), a.contents /*out*/ );
KMessageBox::information( 0, i18n("Attachment %1 could not be decoded.\nEncoding: %2").tqarg(filename).tqarg(encoding) );
KMessageBox::information( 0, i18n("Attachment %1 could not be decoded.\nEncoding: %2").arg(filename).arg(encoding) );
#ifdef DEBUG_EXTRACT
kdDebug() << "Result: ***\n" << TQCString( a.contents.data(), a.contents.size()+1 ) << "\n*+*" << endl;
#endif

4
kbugbuster/backend/bugdetailsjob.cpp
Unescape View File

@ -36,8 +36,8 @@ void BugDetailsJob::process( const TQByteArray &data )
KBB::Error err = server()->processor()->parseBugDetails( data, bugDetails );
if ( err ) {
emit error( i18n("Bug %1: %2").tqarg( m_bug.number() )
.tqarg( err.message() ) );
emit error( i18n("Bug %1: %2").arg( m_bug.number() )
.arg( err.message() ) );
} else {
emit bugDetailsAvailable( m_bug, bugDetails );
}

4
kbugbuster/backend/buglistjob.cpp
Unescape View File

@ -60,8 +60,8 @@ void BugListJob::process( const TQByteArray &data )
KBB::Error err = server()->processor()->parseBugList( data, bugs );
if ( err ) {
emit error( i18n("Package %1: %2").tqarg( m_package.name() )
.tqarg( err.message() ) );
emit error( i18n("Package %1: %2").arg( m_package.name() )
.arg( err.message() ) );
} else {
emit bugListAvailable( m_package, m_component, bugs );
}

2
kbugbuster/backend/bugmybugsjob.cpp
Unescape View File

@ -67,7 +67,7 @@ void BugMyBugsJob::process( const TQByteArray &data )
delete processor;
if ( err )
emit error( i18n( "My Bugs: %2" ).tqarg( err.message() ) );
emit error( i18n( "My Bugs: %2" ).arg( err.message() ) );
else
emit bugListAvailable( i18n( "My Bugs" ), bugs );
}

4
kbugbuster/backend/bugserver.cpp
Unescape View File

@ -318,9 +318,9 @@ TQStringList BugServer::listCommands() const
for ( ; cmdIt.current() ; ++cmdIt ) {
BugCommand* cmd = cmdIt.current();
if (!cmd->controlString().isNull())
result.append( i18n("Control command: %1").tqarg(cmd->controlString()) );
result.append( i18n("Control command: %1").arg(cmd->controlString()) );
else
result.append( i18n("Mail to %1").tqarg(cmd->mailAddress()) );
result.append( i18n("Mail to %1").arg(cmd->mailAddress()) );
}
}
return result;

4
kbugbuster/backend/mailsender.cpp
Unescape View File

@ -39,7 +39,7 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T
{
TQString from( fromName );
if ( !fromEmail.isEmpty() )
from += TQString::fromLatin1( " <%2>" ).tqarg( fromEmail );
from += TQString::fromLatin1( " <%2>" ).arg( fromEmail );
kdDebug() << "MailSender::sendMail():\nFrom: " << from << "\nTo: " << to
<< "\nbccflag:" << bcc
<< "\nRecipient:" << recipient
@ -173,7 +173,7 @@ void MailSender::smtpError(const TQString &_command, const TQString &_response)
KMessageBox::error( TQT_TQWIDGET(tqApp->activeWindow()),
i18n( "Error during SMTP transfer.\n"
"command: %1\n"
"response: %2" ).tqarg( command ).tqarg( response ) );
"response: %2" ).arg( command ).arg( response ) );
emit finished();
TQTimer::singleShot( 0, this, TQT_SLOT( deleteLater() ) );

4
kbugbuster/backend/smtp.cpp
Unescape View File

@ -37,7 +37,7 @@ Smtp::Smtp( const TQString &from, const TQStringList &to,
state = smtpInit;
command = "";
emit status( i18n( "Connecting to %1" ).tqarg( server ) );
emit status( i18n( "Connecting to %1" ).arg( server ) );
mSocket->connectToHost( server, port );
t = new TQTextStream( mSocket );
@ -79,7 +79,7 @@ void Smtp::quit()
void Smtp::connected()
{
emit status( i18n( "Connected to %1" ).tqarg( mSocket->peerName() ) );
emit status( i18n( "Connected to %1" ).arg( mSocket->peerName() ) );
}
void Smtp::socketError(int errorCode)

2
kbugbuster/gui/buglvi.cpp
Unescape View File

@ -45,7 +45,7 @@ BugLVI::BugLVI( KListView *parent , const Bug &bug )
Person developer = bug.developerTODO();
if ( !developer.name.isEmpty() )
setText( 3, i18n( "%1 (%2)" ).tqarg( Bug::statusLabel( bug.status() ), developer.name ) );
setText( 3, i18n( "%1 (%2)" ).arg( Bug::statusLabel( bug.status() ), developer.name ) );
}
BugLVI::~BugLVI()

2
kbugbuster/gui/centralwidget.cpp
Unescape View File

@ -56,7 +56,7 @@ CentralWidget::CentralWidget( const TQCString &initialPackage,
( new TQVBoxLayout( this, 0,
KDialog::spacingHint() ) )->setAutoAdd( true );
// Create TQSplitter tqchildren
// Create TQSplitter children
m_vertSplitter = new TQSplitter( Qt::Vertical, this );
m_listPane = new CWBugListContainer( m_vertSplitter );
m_horSplitter = new TQSplitter( Qt::Horizontal,m_vertSplitter );

38
kbugbuster/gui/cwbugdetails.cpp
Unescape View File

@ -65,25 +65,25 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details )
"td.helpBod { border-bottom: 1px solid #9CF; border-top: 0px; border-left: 1px solid #9CF; border-right: 0px; text-align: center; text-indent: 10px; font-family: Verdana, sans-serif, Arial; font-weight: normal; font-size: 11px; color: #404040; background-color: #000000; }\n"
"table.sofT { text-align: center; font-family: Verdana; font-weight: normal; font-size: 11px; color: #404040; width: 100%; background-color: #fafafa; border: 1px #000000 solid; border-collapse: collapse; border-spacing: 0px; }\n"
"</style>\n" )
.tqarg( cg.highlight().name() )
.tqarg( cg.highlightedText().name() ) );
.arg( cg.highlight().name() )
.arg( cg.highlightedText().name() ) );
text.append( "<body style=\"margin: 0px\">\n" );
TQString highlightStyle = TQString( "background: %1; color: %2; " )
.tqarg( cg.highlight().name() )
.tqarg( cg.highlightedText().name() );
.arg( cg.highlight().name() )
.arg( cg.highlightedText().name() );
TQString borderBottomStyle = TQString( "border-bottom: solid %1 1px; " )
.tqarg( cg.foreground().name() );
.arg( cg.foreground().name() );
TQString borderTopStyle = TQString( "border-top: solid %1 1px; " )
.tqarg( cg.foreground().name() );
.arg( cg.foreground().name() );
TQString submitter = bug.submitter().fullName( true );
int age = details.age();
text.append( "<div style=\"" + highlightStyle + "padding: 8px; float: left\">" );
text.append( "<a href=\"" + BugSystem::self()->server()->bugLink( bug ).url()
+ "\">" + i18n("Bug Report</a> from <b>%1</b> " )
.tqarg( submitter ) );
.arg( submitter ) );
int replies = details.parts().count() - 1;
if ( replies >= 1 ) text += i18n( "(1 reply)", "(%n replies)", replies );
text += "</div>";
@ -97,8 +97,8 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details )
"border-bottom: solid %3 1px; "
"padding: 4px\">"
"<table cellspacing=\"0\" cellpadding=\"4\" width=\"100%\">" )
.tqarg( cg.background().name() )
.tqarg( cg.foreground().name() ) );
.arg( cg.background().name() )
.arg( cg.foreground().name() ) );
text.append( textBugDetailsAttribute( details.version(), i18n("Version") ) );
text.append( textBugDetailsAttribute( details.source(), i18n("Source") ) );
text.append( textBugDetailsAttribute( details.compiler(), i18n("Compiler") ) );
@ -121,11 +121,11 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details )
if ( ++it2 == bdp.end() )
text.append( "<a href=\"" + BugSystem::self()->server()->bugLink( bug ).url()
+ "\">" + i18n("Bug Report</a> from <b>%1</b>")
.tqarg( sender ) );
.arg( sender ) );
else {
text.append( "<a href=\"" + BugSystem::self()->server()->bugLink( bug ).url() + TQString("#c%1").tqarg( replies )
text.append( "<a href=\"" + BugSystem::self()->server()->bugLink( bug ).url() + TQString("#c%1").arg( replies )
+ "\">" + i18n("Reply #%1</a> from <b>%2</b>")
.tqarg( replies ).tqarg( sender ) );
.arg( replies ).arg( sender ) );
replies--;
}
text.append( "</div>\n" );
@ -148,16 +148,16 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details )
if ( atts.count() > 0 ) {
text.append( "<table summary=\"Attachment data table\" class=\"sofT\" cellspacing=\"0\">" );
text.append( TQString( "<tr> <td colspan=\"4\" class=\"helpHed\">%1</td> </tr>")
.tqarg( i18n( "Attachment List") ) );
.arg( i18n( "Attachment List") ) );
text.append( TQString("<tr> <td class=\"helpHed\">%1</td> <td class=\"helpHed\">%2</td> <td class=\"helpHed\">%3</td> <td class=\"helpHed\">%4</td> </tr>")
.tqarg( i18n("Description") )
.tqarg( i18n("Date") )
.tqarg( i18n("View") )
.tqarg( i18n("Edit") ) );
.arg( i18n("Description") )
.arg( i18n("Date") )
.arg( i18n("View") )
.arg( i18n("Edit") ) );
TQValueList<BugDetailsImpl::AttachmentDetails>::iterator it;
for ( it = atts.begin() ; it != atts.end() ; ++it ) {
text.append( TQString("<tr><td>%1</td>").tqarg( (*it).description ) ) ;
text.append( TQString("<td>%1</td>").tqarg( (*it).date ) );
text.append( TQString("<tr><td>%1</td>").arg( (*it).description ) ) ;
text.append( TQString("<td>%1</td>").arg( (*it).date ) );
text.append( "<td><a href=\"" +
BugSystem::self()->server()->attachmentViewLink( (*it).id ).url() +
"\">" + i18n("View") + "</a></td>" );

20
kbugbuster/gui/cwbugdetailscontainer.cpp
Unescape View File

@ -121,17 +121,17 @@ void CWBugDetailsContainer::setBug( const Bug &bug, const BugDetails &details )
list.truncate( list.length()-2 ); //Strip off the last ", "
labelText = i18n("bug #number [Merged with: a list of bugs] (severity): title","Bug #%1 [Merged with: %2] (%3): %4")
.tqarg( bug.number() )
.tqarg( list )
.tqarg( bug.severityAsString() )
.tqarg( bug.title() );
.arg( bug.number() )
.arg( list )
.arg( bug.severityAsString() )
.arg( bug.title() );
}
else
{
labelText = i18n("bug #number (severity): title","Bug #%1 (%2): %3")
.tqarg( bug.number() ).tqarg( bug.severityAsString() )
.tqarg( bug.title() );
.arg( bug.number() ).arg( bug.severityAsString() )
.arg( bug.title() );
}
m_bugLabel->setText( KStringHandler::tagURLs( labelText ) );
@ -158,7 +158,7 @@ void CWBugDetailsContainer::showCommands( const Bug& bug )
if (!first)
cmdText += " | "; // separator in case of multiple commands
first = false;
cmdText += TQString("<b>%1</b>").tqarg( cmd->name() );
cmdText += TQString("<b>%1</b>").arg( cmd->name() );
if (!cmdDetails.isEmpty())
cmdDetails += " | "; // separator in case of multiple commands
cmdDetails += cmd->details();
@ -212,7 +212,7 @@ void CWBugDetailsContainer::setLoading( const Bug &bug )
showCommands( bug );
m_bugLoading->setText(i18n( "Retrieving Details for Bug %1\n\n(%2)" )
.tqarg( bug.number() ).tqarg( bug.title() ) );
.arg( bug.number() ).arg( bug.title() ) );
m_bugStack->raiseWidget( 1 );
}
@ -224,11 +224,11 @@ void CWBugDetailsContainer::setCacheMiss( const Bug &bug )
TQString msg;
if( BugSystem::self()->disconnected() )
msg = i18n( "Bug #%1 (%2) is not available offline." ).
tqarg( bug.number() ).tqarg( bug.title() );
arg( bug.number() ).arg( bug.title() );
else
msg = i18n( "Retrieving details for bug #%1\n"
"(%2)" ).
tqarg( bug.number() ).tqarg( bug.title() );
arg( bug.number() ).arg( bug.title() );
m_bugLoading->setText( msg );
m_bugStack->raiseWidget( 1 );
}

16
kbugbuster/gui/cwbuglistcontainer.cpp
Unescape View File

@ -143,7 +143,7 @@ void CWBugListContainer::setBugList( const TQString &label, const Bug::List &bug
}
}
m_listLabel->setText( i18n( "%1 (%2 bugs, %3 wishes)" ).tqarg( label ).tqarg( noBugs ).tqarg( noWishes ) );
m_listLabel->setText( i18n( "%1 (%2 bugs, %3 wishes)" ).arg( label ).arg( noBugs ).arg( noWishes ) );
m_listStack->raiseWidget( 0 );
}
@ -153,13 +153,13 @@ void CWBugListContainer::setBugList( const Package &package, const TQString &com
if ( component.isEmpty() )
{
if ( package.components().count() > 1 )
listLabel = i18n( "Product '%1', all components" ).tqarg( package.name() );
listLabel = i18n( "Product '%1', all components" ).arg( package.name() );
else
listLabel = i18n( "Product '%1'" ).tqarg( package.name() );
listLabel = i18n( "Product '%1'" ).arg( package.name() );
}
else
{
listLabel = i18n( "Product '%1', component '%2'" ).tqarg( package.name(), component );
listLabel = i18n( "Product '%1', component '%2'" ).arg( package.name(), component );
}
setBugList( listLabel, bugs );
@ -208,9 +208,9 @@ void CWBugListContainer::setNoList()
void CWBugListContainer::setLoading( const Package &package, const TQString &component )
{
if ( component.isEmpty() )
setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1'..." ).tqarg( package.name() ) );
setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1'..." ).arg( package.name() ) );
else
setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1' (Component %2)..." ).tqarg( package.name(), component ) );
setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1' (Component %2)..." ).arg( package.name(), component ) );
}
void CWBugListContainer::setLoading( const TQString &label )
@ -221,12 +221,12 @@ void CWBugListContainer::setLoading( const TQString &label )
void CWBugListContainer::setCacheMiss( const Package &package )
{
setCacheMiss( i18n( "Package '%1'" ).tqarg( package.name() ) );
setCacheMiss( i18n( "Package '%1'" ).arg( package.name() ) );
}
void CWBugListContainer::setCacheMiss( const TQString &label )
{
m_listLoading->setText( i18n( "%1 is not available offline." ).tqarg( label ) );
m_listLoading->setText( i18n( "%1 is not available offline." ).arg( label ) );
m_listStack->raiseWidget( 1 );
}

2
kbugbuster/gui/cwloadingwidget.cpp
Unescape View File

@ -107,7 +107,7 @@ void CWLoadingWidget::setText( const TQString &text )
{
m_text = text;
updatePixmap();
tqrepaint();
repaint();
}
void CWLoadingWidget::updatePixmap()

4
kbugbuster/gui/loadallbugsdlg.cpp
Unescape View File

@ -26,7 +26,7 @@ LoadAllBugsDlg::LoadAllBugsDlg( const Package& pkg, const TQString &component )
m_bugLoadingProgress = new KIO::DefaultProgress( this );
connect( m_bugLoadingProgress, TQT_SIGNAL( stopped() ),
this, TQT_SLOT( slotStopped() ) );
setCaption( i18n( "Loading All Bugs for Product %1" ).tqarg( pkg.name() ) );
setCaption( i18n( "Loading All Bugs for Product %1" ).arg( pkg.name() ) );
connect( BugSystem::self(),
TQT_SIGNAL( bugDetailsAvailable( const Bug &, const BugDetails & ) ),
TQT_SLOT( slotBugDetailsAvailable( const Bug &, const BugDetails & ) ) );
@ -45,7 +45,7 @@ LoadAllBugsDlg::LoadAllBugsDlg( const Package& pkg, const TQString &component )
void LoadAllBugsDlg::slotBugDetailsAvailable( const Bug &bug, const BugDetails & )
{
kdDebug() << "LoadAllBugsDlg::slotBugDetailsAvailable " << bug.number() << endl;
m_bugLoadingProgress->slotInfoMessage( 0L, i18n( "Bug %1 loaded" ).tqarg(bug.number()) );
m_bugLoadingProgress->slotInfoMessage( 0L, i18n( "Bug %1 loaded" ).arg(bug.number()) );
loadNextBug();
}

2
kbugbuster/gui/messageeditor.cpp
Unescape View File

@ -79,7 +79,7 @@ void MessageEditor::addButton()
void MessageEditor::removeButton()
{
int result = KMessageBox::warningContinueCancel(this,
i18n("Remove the button %1?").tqarg(mSelectionCombo->currentText()),
i18n("Remove the button %1?").arg(mSelectionCombo->currentText()),
i18n("Remove"), KGuiItem( i18n("Delete"), "editdelete") );
if (result == KMessageBox::Continue) {

2
kbugbuster/gui/msginputdialog.cpp
Unescape View File

@ -29,7 +29,7 @@ MsgInputDialog::MsgInputDialog(MsgInputDialog::MessageType type, const Bug &bug,
{
switch ( mType ) {
case Close:
setCaption( i18n("Close Bug %1").tqarg( mBug.number() ) );
setCaption( i18n("Close Bug %1").arg( mBug.number() ) );
break;
case Reply:
setCaption( i18n("Reply to Bug") );

2
kbugbuster/kresources/kcalresource.cpp
Unescape View File

@ -212,7 +212,7 @@ void KCalResource::slotBugListAvailable( const Package &, const TQString &,
newTodo = new KCal::Todo;
newTodo->setUid( uid );
TQString uri = "http://bugs.kde.org/show_bug.cgi?id=%1";
newTodo->addAttachment( new KCal::Attachment( uri.tqarg( bug.number() ) ) );
newTodo->addAttachment( new KCal::Attachment( uri.arg( bug.number() ) ) );
todo = newTodo;
}

4
kcachegrind/converters/memprof2calltree
Unescape View File

@ -13,8 +13,8 @@ while(<>) {
print "\nfn=$1\n";
next;
}
if (/^ tqchildren:/) {
$next = 1; #tqchildren
if (/^ children:/) {
$next = 1; #children
next;
}
if (/^ inherited:/) {

4
kcachegrind/kcachegrind/cachegrindloader.cpp
Unescape View File

@ -735,7 +735,7 @@ bool CachegrindLoader::loadTraceInternal(TracePart* part)
return false;
}
kdDebug() << "Loading " << _filename << " ..." << endl;
TQString statusMsg = i18n("Loading %1").tqarg(_filename);
TQString statusMsg = i18n("Loading %1").arg(_filename);
int statusProgress = 0;
emit updateStatus(statusMsg,statusProgress);
@ -1310,7 +1310,7 @@ bool CachegrindLoader::loadTraceInternal(TracePart* part)
emit updateStatus(statusMsg,100);
_part->tqinvalidate();
_part->invalidate();
if (!totalsSet) {
_part->totals()->clear();
_part->totals()->addCost(_part);

90
kcachegrind/kcachegrind/callgraphview.cpp
Unescape View File

@ -303,8 +303,8 @@ GraphEdge::GraphEdge()
TQString GraphEdge::prettyName()
{
if (_c) return _c->prettyName();
if (_from) return i18n("Call(s) from %1").tqarg(_from->prettyName());
if (_to) return i18n("Call(s) to %1").tqarg(_to->prettyName());
if (_from) return i18n("Call(s) from %1").arg(_from->prettyName());
if (_to) return i18n("Call(s) to %1").arg(_to->prettyName());
return i18n("(unknown call)");
}
@ -579,7 +579,7 @@ void GraphExporter::writeDot()
break;
}
if (f)
*stream << TQString(" center=F%1;\n").tqarg((long)f, 0, 16);
*stream << TQString(" center=F%1;\n").arg((long)f, 0, 16);
*stream << TQString(" overlap=false;\n splines=true;\n");
}
@ -619,7 +619,7 @@ void GraphExporter::writeDot()
iabr = iabr.left(Configuration::maxSymbolLength()) + "...";
*stream << TQString("subgraph \"cluster%1\" { label=\"%2\";\n")
.tqarg(cluster).tqarg(iabr);
.arg(cluster).arg(iabr);
}
GraphNode* np;
@ -630,17 +630,17 @@ void GraphExporter::writeDot()
if ((int)abr.length() > Configuration::maxSymbolLength())
abr = abr.left(Configuration::maxSymbolLength()) + "...";
*stream << TQString(" F%1 [").tqarg((long)f, 0, 16);
*stream << TQString(" F%1 [").arg((long)f, 0, 16);
if (_useBox) {
// make label 3 lines for CallGraphView
*stream << TQString("tqshape=box,label=\"** %1 **\\n**\\n%2\"];\n")
.tqarg(abr)
.tqarg(SubCost(np->incl).pretty());
*stream << TQString("shape=box,label=\"** %1 **\\n**\\n%2\"];\n")
.arg(abr)
.arg(SubCost(np->incl).pretty());
}
else
*stream << TQString("label=\"%1\\n%2\"];\n")
.tqarg(abr)
.tqarg(SubCost(np->incl).pretty());
.arg(abr)
.arg(SubCost(np->incl).pretty());
}
if (_go->clusterGroups() && i)
@ -675,17 +675,17 @@ void GraphExporter::writeDot()
to.callerSet.remove(&e);
*stream << TQString(" F%1 -> F%2 [weight=%3")
.tqarg((long)e.from(), 0, 16)
.tqarg((long)e.to(), 0, 16)
.tqarg((long)log(log(e.cost)));
.arg((long)e.from(), 0, 16)
.arg((long)e.to(), 0, 16)
.arg((long)log(log(e.cost)));
if (_go->detailLevel() ==1)
*stream << TQString(",label=\"%1\"")
.tqarg(SubCost(e.cost).pretty());
.arg(SubCost(e.cost).pretty());
else if (_go->detailLevel() ==2)
*stream << TQString(",label=\"%3\\n%4 x\"")
.tqarg(SubCost(e.cost).pretty())
.tqarg(SubCost(e.count).pretty());
.arg(SubCost(e.cost).pretty())
.arg(SubCost(e.count).pretty());
*stream << TQString("];\n");
}
@ -713,14 +713,14 @@ void GraphExporter::writeDot()
e->cost = costSum;
e->count = countSum;
*stream << TQString(" R%1 [tqshape=point,label=\"\"];\n")
.tqarg((long)n.function(), 0, 16);
*stream << TQString(" R%1 [shape=point,label=\"\"];\n")
.arg((long)n.function(), 0, 16);
*stream << TQString(" R%1 -> F%2 [label=\"%3\\n%4 x\",weight=%5];\n")
.tqarg((long)n.function(), 0, 16)
.tqarg((long)n.function(), 0, 16)
.tqarg(SubCost(costSum).pretty())
.tqarg(SubCost(countSum).pretty())
.tqarg((int)log(costSum));
.arg((long)n.function(), 0, 16)
.arg((long)n.function(), 0, 16)
.arg(SubCost(costSum).pretty())
.arg(SubCost(countSum).pretty())
.arg((int)log(costSum));
}
costSum = countSum = 0.0;
@ -736,14 +736,14 @@ void GraphExporter::writeDot()
e->cost = costSum;
e->count = countSum;
*stream << TQString(" S%1 [tqshape=point,label=\"\"];\n")
.tqarg((long)n.function(), 0, 16);
*stream << TQString(" S%1 [shape=point,label=\"\"];\n")
.arg((long)n.function(), 0, 16);
*stream << TQString(" F%1 -> S%2 [label=\"%3\\n%4 x\",weight=%5];\n")
.tqarg((long)n.function(), 0, 16)
.tqarg((long)n.function(), 0, 16)
.tqarg(SubCost(costSum).pretty())
.tqarg(SubCost(countSum).pretty())
.tqarg((int)log(costSum));
.arg((long)n.function(), 0, 16)
.arg((long)n.function(), 0, 16)
.arg(SubCost(costSum).pretty())
.arg(SubCost(countSum).pretty())
.arg((int)log(costSum));
}
}
}
@ -1062,7 +1062,7 @@ CanvasNode::CanvasNode(CallGraphView* v, GraphNode* n,
double inclP = 100.0 * n->incl / total;
if (_view->topLevel()->showPercentage())
setText(1, TQString("%1 %")
.tqarg(inclP, 0, 'f', Configuration::percentPrecision()));
.arg(inclP, 0, 'f', Configuration::percentPrecision()));
else
setText(1, SubCost(n->incl).pretty());
setPixmap(1, percentagePixmap(25,10,(int)(inclP+.5), TQt::blue, true));
@ -1121,7 +1121,7 @@ CanvasEdgeLabel::CanvasEdgeLabel(CallGraphView* v, CanvasEdge* ce,
if (!e) return;
setPosition(1, DrawParams::TopCenter);
setText(1, TQString("%1 x").tqarg(SubCost(e->count).pretty()));
setText(1, TQString("%1 x").arg(SubCost(e->count).pretty()));
setPosition(0, DrawParams::BottomCenter);
@ -1142,7 +1142,7 @@ CanvasEdgeLabel::CanvasEdgeLabel(CallGraphView* v, CanvasEdge* ce,
double inclP = 100.0 * e->cost / total;
if (_view->topLevel()->showPercentage())
setText(0, TQString("%1 %")
.tqarg(inclP, 0, 'f', Configuration::percentPrecision()));
.arg(inclP, 0, 'f', Configuration::percentPrecision()));
else
setText(0, SubCost(e->cost).pretty());
setPixmap(0, percentagePixmap(25,10,(int)(inclP+.5), TQt::blue, true));
@ -1331,7 +1331,7 @@ void CallGraphTip::maybeTip( const TQPoint& pos )
if (0) qDebug("CallGraphTip: Mouse on Node '%s'",
n->function()->prettyName().ascii());
TQString tipStr = TQString("%1 (%2)").tqarg(cn->text(0)).tqarg(cn->text(1));
TQString tipStr = TQString("%1 (%2)").arg(cn->text(0)).arg(cn->text(1));
TQPoint vPosTL = cgv->contentsToViewport(i->boundingRect().topLeft());
TQPoint vPosBR = cgv->contentsToViewport(i->boundingRect().bottomRight());
tip(TQRect(vPosTL, vPosBR), tipStr);
@ -1356,7 +1356,7 @@ void CallGraphTip::maybeTip( const TQPoint& pos )
tipStr = e->prettyName();
else
tipStr = TQString("%1 (%2)")
.tqarg(ce->label()->text(0)).tqarg(ce->label()->text(1));
.arg(ce->label()->text(0)).arg(ce->label()->text(1));
tip(TQRect(pos.x()-5,pos.y()-5,pos.x()+5,pos.y()+5), tipStr);
}
}
@ -1745,7 +1745,7 @@ void CallGraphView::doUpdate(int changeType)
}
if (changeType & dataChanged) {
// tqinvalidate old selection and graph part
// invalidate old selection and graph part
_exporter.reset(_data, _activeItem, _costType, _groupType);
_selectedNode = 0;
_selectedEdge = 0;
@ -1792,8 +1792,8 @@ void CallGraphView::showRenderWarning()
s = i18n("Layouting stopped.\n");
s.append(i18n("The call graph has %1 nodes and %2 edges.\n")
.tqarg(_exporter.nodeCount())
.tqarg(_exporter.edgeCount()));
.arg(_exporter.nodeCount())
.arg(_exporter.edgeCount()));
showText(s);
}
@ -1866,7 +1866,7 @@ void CallGraphView::refresh()
if ( !_renderProcess->start() ) {
TQString e = i18n("No call graph is available because the following\n"
"command cannot be run:\n'%1'\n")
.tqarg(_renderProcess->arguments().join(" "));
.arg(_renderProcess->arguments().join(" "));
e += i18n("Please check that 'dot' is installed (package GraphViz).");
showText(e);
@ -2206,7 +2206,7 @@ void CallGraphView::dotExited()
TQString s = i18n("There is no call graph available for function\n"
"\t'%1'\n"
"because it has no cost of the selected event type.");
TQCanvasText* t = new TQCanvasText(s.tqarg(_activeItem->name()), _canvas);
TQCanvasText* t = new TQCanvasText(s.arg(_activeItem->name()), _canvas);
// t->setTextFlags(TQt::AlignHCenter | TQt::AlignVCenter);
t->move(5,5);
t->show();
@ -2394,10 +2394,10 @@ void CallGraphView::contentsContextMenuEvent(TQContextMenuEvent* e)
TQString name = f->prettyName();
popup.insertItem(i18n("Go to '%1'")
.tqarg(Configuration::shortenSymbol(name)), 93);
.arg(Configuration::shortenSymbol(name)), 93);
if (cycle && (cycle != f)) {
name = Configuration::shortenSymbol(cycle->prettyName());
popup.insertItem(i18n("Go to '%1'").tqarg(name), 94);
popup.insertItem(i18n("Go to '%1'").arg(name), 94);
}
popup.insertSeparator();
}
@ -2416,7 +2416,7 @@ void CallGraphView::contentsContextMenuEvent(TQContextMenuEvent* e)
if (c) {
TQString name = c->prettyName();
popup.insertItem(i18n("Go to '%1'")
.tqarg(Configuration::shortenSymbol(name)), 95);
.arg(Configuration::shortenSymbol(name)), 95);
popup.insertSeparator();
}
@ -2457,7 +2457,7 @@ void CallGraphView::contentsContextMenuEvent(TQContextMenuEvent* e)
case 10: gpopup1.setItemChecked(104,true); break;
case 15: gpopup1.setItemChecked(105,true); break;
default:
gpopup1.insertItem(i18n("< %1").tqarg(_maxCallerDepth), 106);
gpopup1.insertItem(i18n("< %1").arg(_maxCallerDepth), 106);
gpopup1.setItemChecked(106,true); break;
}
@ -2480,7 +2480,7 @@ void CallGraphView::contentsContextMenuEvent(TQContextMenuEvent* e)
case 10: gpopup2.setItemChecked(114,true); break;
case 15: gpopup2.setItemChecked(115,true); break;
default:
gpopup2.insertItem(i18n("< %1").tqarg(_maxCallingDepth), 116);
gpopup2.insertItem(i18n("< %1").arg(_maxCallingDepth), 116);
gpopup2.setItemChecked(116,true); break;
}

4
kcachegrind/kcachegrind/callitem.cpp
Unescape View File

@ -110,7 +110,7 @@ void CallItem::updateCost()
if (_view->topLevel()->showPercentage())
setText(0, TQString("%1")
.tqarg(sum, 0, 'f', Configuration::percentPrecision()));
.arg(sum, 0, 'f', Configuration::percentPrecision()));
else
setText(0, _call->prettySubCost(ct));
@ -134,7 +134,7 @@ void CallItem::updateCost()
if (_view->topLevel()->showPercentage())
setText(1, TQString("%1")
.tqarg(sum, 0, 'f', Configuration::percentPrecision()));
.arg(sum, 0, 'f', Configuration::percentPrecision()));
else
setText(1, _call->prettySubCost(ct2));

36
kcachegrind/kcachegrind/callmapview.cpp
Unescape View File

@ -115,12 +115,12 @@ TQString CallMapView::whatsThis() const
"choose 'Hide incorrect borders'. As this mode can be "
"<em>very</em> time consuming, you may want to limit "
"the maximum drawn nesting level before. "
"'Best' determinates the split direction for tqchildren "
"'Best' determinates the split direction for children "
"from the aspect ratio of the parent. "
"'Always Best' decides on remaining space for each "
"sibling. "
"'Ignore Proportions' takes space for function name "
"drawing <em>before</em> drawing tqchildren. Note that "
"drawing <em>before</em> drawing children. Note that "
"size proportions can get <em>heavily</em> wrong.</p>"
"<p>This is a <em>TreeMap</em> widget. "
@ -196,13 +196,13 @@ void CallMapView::context(TreeMapItem* i,const TQPoint & p)
if (i) {
l1popup.insertSeparator();
l1popup.insertItem(i18n("Depth of '%1' (%2)")
.tqarg(shortCurrentName).tqarg(i->depth()), 55);
.arg(shortCurrentName).arg(i->depth()), 55);
l1popup.setItemChecked(55, maxDepth == i->depth());
}
if (maxDepth>0) {
l1popup.insertSeparator();
l1popup.insertItem(i18n("Decrement Depth (to %1)").tqarg(maxDepth-1), 56);
l1popup.insertItem(i18n("Increment Depth (to %1)").tqarg(maxDepth+1), 57);
l1popup.insertItem(i18n("Decrement Depth (to %1)").arg(maxDepth-1), 56);
l1popup.insertItem(i18n("Increment Depth (to %1)").arg(maxDepth+1), 57);
}
l2popup.setCheckable(true);
@ -256,15 +256,15 @@ void CallMapView::context(TreeMapItem* i,const TQPoint & p)
currentArea = i->width() * i->height();
l3popup.insertSeparator();
l3popup.insertItem(i18n("Area of '%1' (%2)")
.tqarg(shortCurrentName).tqarg(currentArea), 67);
.arg(shortCurrentName).arg(currentArea), 67);
l3popup.setItemChecked(67, mArea == currentArea);
}
if (mArea>0) {
l3popup.insertSeparator();
l3popup.insertItem(i18n("Double Area Limit (to %1)")
.tqarg(mArea*2), 68);
.arg(mArea*2), 68);
l3popup.insertItem(i18n("Half Area Limit (to %1)")
.tqarg(mArea/2), 69);
.arg(mArea/2), 69);
}
popup.insertSeparator();
@ -428,7 +428,7 @@ void CallMapView::selectedSlot(TreeMapItem* item, bool kbd)
if (item->text(0).isEmpty()) return;
if (kbd) {
TQString msg = i18n("Call Map: Current is '%1'").tqarg(item->text(0));
TQString msg = i18n("Call Map: Current is '%1'").arg(item->text(0));
if (_topLevel)
_topLevel->showMessage(msg, 5000);
}
@ -618,7 +618,7 @@ TQString CallMapBaseItem::text(int textNo) const
sum = 100.0 * _f->inclusive()->subCost(ct) / total;
return TQString("%1 %")
.tqarg(sum, 0, 'f', Configuration::percentPrecision());
.arg(sum, 0, 'f', Configuration::percentPrecision());
}
return _f->inclusive()->prettySubCost(ct);
}
@ -663,7 +663,7 @@ bool CallMapBaseItem::isMarked(int) const
return ((CallMapView*)widget())->selectedItem() == _f;
}
TreeMapItemList* CallMapBaseItem::tqchildren()
TreeMapItemList* CallMapBaseItem::children()
{
if (_f && !initialized()) {
CallMapView* w = (CallMapView*)widget();
@ -706,7 +706,7 @@ TreeMapItemList* CallMapBaseItem::tqchildren()
setSorting(-2, false);
}
return _tqchildren;
return _children;
}
TQColor CallMapBaseItem::backColor() const
@ -756,7 +756,7 @@ TQString CallMapCallingItem::text(int textNo) const
TraceCost* t = ((CallMapView*)widget())->totalCost();
double p = 100.0 * _factor * _c->subCost(ct) / t->subCost(ct);
return TQString("%1 %")
.tqarg(p, 0, 'f', Configuration::percentPrecision());
.arg(p, 0, 'f', Configuration::percentPrecision());
}
return val.pretty();
}
@ -792,7 +792,7 @@ bool CallMapCallingItem::isMarked(int) const
}
TreeMapItemList* CallMapCallingItem::tqchildren()
TreeMapItemList* CallMapCallingItem::children()
{
if (!initialized()) {
if (0) qDebug("Create Calling subitems (%s)", path(0).join("/").ascii());
@ -832,7 +832,7 @@ TreeMapItemList* CallMapCallingItem::tqchildren()
setSorting(-2, false);
}
return _tqchildren;
return _children;
}
@ -872,7 +872,7 @@ TQString CallMapCallerItem::text(int textNo) const
TraceCost* t = ((CallMapView*)widget())->totalCost();
double p = 100.0 * _factor * _c->subCost(ct) / t->subCost(ct);
return TQString("%1 %")
.tqarg(p, 0, 'f', Configuration::percentPrecision());
.arg(p, 0, 'f', Configuration::percentPrecision());
}
return val.pretty();
}
@ -904,7 +904,7 @@ bool CallMapCallerItem::isMarked(int) const
}
TreeMapItemList* CallMapCallerItem::tqchildren()
TreeMapItemList* CallMapCallerItem::children()
{
if (!initialized()) {
//qDebug("Create Caller subitems (%s)", name().ascii());
@ -939,7 +939,7 @@ TreeMapItemList* CallMapCallerItem::tqchildren()
setSorting(-2, false);
}
return _tqchildren;
return _children;
}
TQColor CallMapCallerItem::backColor() const

6
kcachegrind/kcachegrind/callmapview.h
Unescape View File

@ -78,7 +78,7 @@ public:
bool isMarked(int) const;
TQString text(int) const;
TQPixmap pixmap(int) const;
TreeMapItemList* tqchildren();
TreeMapItemList* children();
TQColor backColor() const;
private:
@ -99,7 +99,7 @@ public:
bool isMarked(int) const;
TQString text(int) const;
TQPixmap pixmap(int) const;
TreeMapItemList* tqchildren();
TreeMapItemList* children();
TQColor backColor() const;
private:
@ -118,7 +118,7 @@ public:
bool isMarked(int) const;
TQString text(int) const;
TQPixmap pixmap(int) const;
TreeMapItemList* tqchildren();
TreeMapItemList* children();
TQColor backColor() const;
private:

4
kcachegrind/kcachegrind/callview.cpp
Unescape View File

@ -121,11 +121,11 @@ void CallView::context(TQListViewItem* i, const TQPoint & p, int col)
cycle = f->cycle();
popup.insertItem(i18n("Go to '%1'")
.tqarg(Configuration::shortenSymbol(name)), 93);
.arg(Configuration::shortenSymbol(name)), 93);
if (cycle) {
name = Configuration::shortenSymbol(cycle->prettyName());
popup.insertItem(i18n("Go to '%1'").tqarg(name), 94);
popup.insertItem(i18n("Go to '%1'").arg(name), 94);
}
popup.insertSeparator();

2
kcachegrind/kcachegrind/configdlg.cpp
Unescape View File

@ -210,7 +210,7 @@ bool ConfigDlg::configure(Configuration* c, TraceData* d, TQWidget* p)
TQMessageBox::warning(p, i18n("KCachegrind Configuration"),
i18n("The Maximum Number of List Items should be below 500."
"The previous set value (%1) will still be used.")
.tqarg(TQString::number(c->_maxListCount)),
.arg(TQString::number(c->_maxListCount)),
TQMessageBox::Ok, 0);
c->_maxSymbolCount = dlg.symbolCount->text().toInt();

30
kcachegrind/kcachegrind/configuration.cpp
Unescape View File

@ -132,9 +132,9 @@ void Configuration::saveOptions(KConfig* kconfig)
int count = 1;
for( ; it.current(); ++it ) {
if ( !(*it)->automatic ) {
colorConfig.writeEntry( TQString("Name%1").tqarg(count),
colorConfig.writeEntry( TQString("Name%1").arg(count),
it.currentKey());
colorConfig.writeEntry( TQString("Color%1").tqarg(count),
colorConfig.writeEntry( TQString("Color%1").arg(count),
(*it)->color);
//qDebug("Written Color %s (%d)", it.currentKey().ascii(), count);
@ -149,9 +149,9 @@ void Configuration::saveOptions(KConfig* kconfig)
TQDictIterator<TQStringList> it2( c->_objectSourceDirs );
count = 1;
for( ; it2.current(); ++it2 ) {
sourceConfig.writeEntry( TQString("Object%1").tqarg(count),
sourceConfig.writeEntry( TQString("Object%1").arg(count),
it2.currentKey());
sourceConfig.writeEntry( TQString("Dirs%1").tqarg(count),
sourceConfig.writeEntry( TQString("Dirs%1").arg(count),
*(*it2), ':');
count++;
}
@ -176,15 +176,15 @@ void Configuration::saveOptions(KConfig* kconfig)
ctConfig.writeEntry( "Count", ctCount);
for (int i=0; i<ctCount; i++) {
TraceCostType* t = TraceCostType::knownType(i);
ctConfig.writeEntry( TQString("Name%1").tqarg(i+1), t->name());
ctConfig.writeEntry( TQString("Name%1").arg(i+1), t->name());
// Use localized key
TraceItemView::writeConfigEntry(&ctConfig,
TQString("Longname%1").tqarg(i+1).ascii(),
TQString("Longname%1").arg(i+1).ascii(),
t->longName(),
knownLongName(t->name()).utf8().data() /*, true */ );
TraceItemView::writeConfigEntry(&ctConfig,
TQString("Formula%1").tqarg(i+1).ascii(),
TQString("Formula%1").arg(i+1).ascii(),
t->formula(), knownFormula(t->name()).utf8().data());
}
}
@ -217,8 +217,8 @@ void Configuration::readOptions(KConfig* kconfig)
KConfigGroup colorConfig(kconfig, TQCString("CostColors"));
count = colorConfig.readNumEntry("Count", 0);
for (i=1;i<=count;i++) {
TQString n = colorConfig.readEntry(TQString("Name%1").tqarg(i));
TQColor color = colorConfig.readColorEntry(TQString("Color%1").tqarg(i));
TQString n = colorConfig.readEntry(TQString("Name%1").arg(i));
TQColor color = colorConfig.readColorEntry(TQString("Color%1").arg(i));
if (n.isEmpty()) continue;
@ -241,8 +241,8 @@ void Configuration::readOptions(KConfig* kconfig)
c->_objectSourceDirs.clear();
if (count>17) c->_objectSourceDirs.resize(count);
for (i=1;i<=count;i++) {
TQString n = sourceConfig.readEntry(TQString("Object%1").tqarg(i));
dirs = sourceConfig.readListEntry(TQString("Dirs%1").tqarg(i), ':');
TQString n = sourceConfig.readEntry(TQString("Object%1").arg(i));
dirs = sourceConfig.readListEntry(TQString("Dirs%1").arg(i), ':');
if (n.isEmpty() || (dirs.count()==0)) continue;
@ -271,10 +271,10 @@ void Configuration::readOptions(KConfig* kconfig)
int ctCount = ctConfig.readNumEntry("Count", 0);
if (ctCount>0) {
for (int i=1;i<=ctCount;i++) {
TQString n = ctConfig.readEntry(TQString("Name%1").tqarg(i));
TQString l = ctConfig.readEntry(TQString("Longname%1").tqarg(i));
TQString n = ctConfig.readEntry(TQString("Name%1").arg(i));
TQString l = ctConfig.readEntry(TQString("Longname%1").arg(i));
if (l.isEmpty()) l = knownLongName(n);
TQString f = ctConfig.readEntry(TQString("Formula%1").tqarg(i));
TQString f = ctConfig.readEntry(TQString("Formula%1").arg(i));
if (f.isEmpty()) f = knownFormula(n);
TraceCostType::add(new TraceCostType(n, l, f));
@ -316,7 +316,7 @@ TQColor Configuration::costTypeColor(TraceCostType* t)
if (!t)
n = TQString("CostType-default");
else
n = TQString("CostType-%1").tqarg(t->name());
n = TQString("CostType-%1").arg(t->name());
return color(n)->color;
}

6
kcachegrind/kcachegrind/costlistitem.cpp
Unescape View File

@ -71,7 +71,7 @@ void CostListItem::updateName()
if (!_costItem) return;
TQString n = _costItem->prettyName();
if (_groupSize>=0) n += TQString(" (%1)").tqarg(_groupSize);
if (_groupSize>=0) n += TQString(" (%1)").arg(_groupSize);
setText(1, n);
}
@ -98,13 +98,13 @@ void CostListItem::update()
double pure = 100.0 * _pure / total;
TQString str;
if (Configuration::showPercentage())
str = TQString("%1").tqarg(pure, 0, 'f', Configuration::percentPrecision());
str = TQString("%1").arg(pure, 0, 'f', Configuration::percentPrecision());
else
str = _costItem->prettySubCost(_costType);
if (_skipped) {
// special handling for skip entries...
setText(0, TQString("< %1").tqarg(str));
setText(0, TQString("< %1").arg(str));
return;
}

4
kcachegrind/kcachegrind/costtypeitem.cpp
Unescape View File

@ -104,7 +104,7 @@ void CostTypeItem::update()
double pure = 100.0 * _pure / selfTotal;
if (Configuration::showPercentage()) {
setText(2, TQString("%1")
.tqarg(pure, 0, 'f', Configuration::percentPrecision()));
.arg(pure, 0, 'f', Configuration::percentPrecision()));
}
else
setText(2, _costItem->prettySubCost(_costType));
@ -121,7 +121,7 @@ void CostTypeItem::update()
double sum = 100.0 * _sum / total;
if (Configuration::showPercentage()) {
setText(1, TQString("%1")
.tqarg(sum, 0, 'f', Configuration::percentPrecision()));
.arg(sum, 0, 'f', Configuration::percentPrecision()));
}
else
setText(1, _sum.pretty());

6
kcachegrind/kcachegrind/costtypeview.cpp
Unescape View File

@ -146,13 +146,13 @@ void CostTypeView::context(TQListViewItem* i, const TQPoint & p, int)
else if (r == 97) {
int i = 1;
while(1) {
if (!TraceCostType::knownVirtualType(i18n("New%1").tqarg(i)))
if (!TraceCostType::knownVirtualType(i18n("New%1").arg(i)))
break;
i++;
}
// add same new cost type to this mapping and to known types
TQString shortName = i18n("New%1").tqarg(i);
TQString longName = i18n("New Cost Type %1").tqarg(i);
TQString shortName = i18n("New%1").arg(i);
TQString longName = i18n("New Cost Type %1").arg(i);
TraceCostType::add(new TraceCostType(shortName, longName, "0"));
_data->mapping()->add(new TraceCostType(shortName, longName, "0"));
refresh();

2
kcachegrind/kcachegrind/coverage.cpp
Unescape View File

@ -81,7 +81,7 @@ int Coverage::selfMedian()
TraceFunctionList Coverage::coverage(TraceFunction* f, CoverageMode m,
TraceCostType* ct)
{
tqinvalidate(f->data(), Coverage::Rtti);
invalidate(f->data(), Coverage::Rtti);
_costType = ct;

24
kcachegrind/kcachegrind/coverageitem.cpp
Unescape View File

@ -97,12 +97,12 @@ void CallerCoverageItem::update()
_sum = SubCost(realSum * _coverage->inclusive());
TQString str;
if (Configuration::showPercentage())
str = TQString("%1").tqarg(_pSum, 0, 'f', Configuration::percentPrecision());
str = TQString("%1").arg(_pSum, 0, 'f', Configuration::percentPrecision());
else
str = _sum.pretty();
if (_skipped) {
setText(0, TQString("< %1").tqarg(str));
setText(0, TQString("< %1").arg(str));
return;
}
@ -121,9 +121,9 @@ void CallerCoverageItem::update()
distString = TQString::number(_distance);
else
distString = TQString("%1-%2 (%3)")
.tqarg(_coverage->minDistance())
.tqarg(_coverage->maxDistance())
.tqarg(_distance);
.arg(_coverage->minDistance())
.arg(_coverage->maxDistance())
.arg(_distance);
setText(1, distString);
}
@ -242,12 +242,12 @@ void CalleeCoverageItem::update()
TQString str;
if (Configuration::showPercentage())
str = TQString("%1").tqarg(_pSum, 0, 'f', Configuration::percentPrecision());
str = TQString("%1").arg(_pSum, 0, 'f', Configuration::percentPrecision());
else
str = _sum.pretty();
if (_skipped) {
str = TQString("< %1").tqarg(str);
str = TQString("< %1").arg(str);
setText(0, str);
setText(1, str);
return;
@ -259,7 +259,7 @@ void CalleeCoverageItem::update()
if (Configuration::showPercentage()) {
setText(1, TQString("%1")
.tqarg(_pSelf, 0, 'f', Configuration::percentPrecision()));
.arg(_pSelf, 0, 'f', Configuration::percentPrecision()));
}
else {
setText(1, _self.pretty());
@ -285,12 +285,12 @@ void CalleeCoverageItem::update()
if (_distance == sMed)
med = TQString::number(_distance);
else
med = TQString("%1/%2").tqarg(_distance).tqarg(sMed);
med = TQString("%1/%2").arg(_distance).arg(sMed);
distString = TQString("%1-%2 (%3)")
.tqarg(_coverage->minDistance())
.tqarg(_coverage->maxDistance())
.tqarg(med);
.arg(_coverage->minDistance())
.arg(_coverage->maxDistance())
.arg(med);
}
setText(2, distString);
}

2
kcachegrind/kcachegrind/coverageview.cpp
Unescape View File

@ -163,7 +163,7 @@ void CoverageView::context(TQListViewItem* i, const TQPoint & p, int c)
TQString name = f->name();
if ((int)name.length()>Configuration::maxSymbolLength())
name = name.left(Configuration::maxSymbolLength()) + "...";
popup.insertItem(i18n("Go to '%1'").tqarg(name), 93);
popup.insertItem(i18n("Go to '%1'").arg(name), 93);
popup.insertSeparator();
}

8
kcachegrind/kcachegrind/functionitem.cpp
Unescape View File

@ -103,7 +103,7 @@ void FunctionItem::setGroupType(TraceCost::CostType gt)
#if 0
_groupPixValid = false;
viewList()->tqrepaint();
viewList()->repaint();
#else
TQColor c = Configuration::functionColor(_groupType, _function);
setPixmap(3, colorPixmap(10, 10, c));
@ -141,7 +141,7 @@ void FunctionItem::update()
_sum = _function->inclusive()->subCost(_costType);
double incl = 100.0 * _sum / inclTotal;
if (Configuration::showPercentage())
str = TQString("%1").tqarg(incl, 0, 'f', Configuration::percentPrecision());
str = TQString("%1").arg(incl, 0, 'f', Configuration::percentPrecision());
else
str = _function->inclusive()->prettySubCost(_costType);
str = "< " + str;
@ -171,7 +171,7 @@ void FunctionItem::update()
double incl = 100.0 * _sum / inclTotal;
if (Configuration::showPercentage())
setText(0, TQString("%1")
.tqarg(incl, 0, 'f', Configuration::percentPrecision()));
.arg(incl, 0, 'f', Configuration::percentPrecision()));
else
setText(0, _function->inclusive()->prettySubCost(_costType));
@ -189,7 +189,7 @@ void FunctionItem::update()
if (Configuration::showPercentage())
setText(1, TQString("%1")
.tqarg(self, 0, 'f', Configuration::percentPrecision()));
.arg(self, 0, 'f', Configuration::percentPrecision()));
else
setText(1, _function->prettySubCost(_costType));

14
kcachegrind/kcachegrind/functionselection.cpp
Unescape View File

@ -173,7 +173,7 @@ void FunctionSelection::functionContext(TQListViewItem* i,
if (i) {
f = ((FunctionItem*) i)->function();
if (f) {
popup.insertItem(i18n("Go to %1").tqarg(f->prettyName()), 93);
popup.insertItem(i18n("Go to %1").arg(f->prettyName()), 93);
popup.insertSeparator();
}
}
@ -417,7 +417,7 @@ void FunctionSelection::refresh()
if (!_data || _data->parts().count()==0) {
functionList->clear();
groupList->setUpdatesEnabled(true);
groupList->tqrepaint();
groupList->repaint();
// this clears all other lists
functionList->setSelected(functionList->firstChild(), true);
@ -547,9 +547,9 @@ void FunctionSelection::refresh()
functionList->clearSelection();
//functionList->setUpdatesEnabled(true);
//functionList->tqrepaint();
//functionList->repaint();
groupList->setUpdatesEnabled(true);
groupList->tqrepaint();
groupList->repaint();
return;
}
}
@ -581,7 +581,7 @@ void FunctionSelection::refresh()
groupList->clearSelection();
groupList->setUpdatesEnabled(true);
groupList->tqrepaint();
groupList->repaint();
}
@ -628,7 +628,7 @@ void FunctionSelection::groupSelected(TQListViewItem* i)
#if 0
if (total == 0.0) {
functionList->setUpdatesEnabled(true);
functionList->tqrepaint();
functionList->repaint();
return;
}
#endif
@ -668,7 +668,7 @@ void FunctionSelection::groupSelected(TQListViewItem* i)
}
//functionList->setUpdatesEnabled(true);
//functionList->tqrepaint();
//functionList->repaint();
// Don't emit signal if cost item was changed programatically
if (!_inSetGroup) {

20
kcachegrind/kcachegrind/instritem.cpp
Unescape View File

@ -107,7 +107,7 @@ InstrItem::InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr,
else
templ += i18n("%n call to '%1'", "%n calls to '%1'", cc);
TQString callStr = templ.tqarg(_instrCall->call()->calledName());
TQString callStr = templ.arg(_instrCall->call()->calledName());
TraceFunction* calledF = _instrCall->call()->called();
calledF->addPrettyLocation(callStr);
@ -135,13 +135,13 @@ InstrItem::InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr,
TQString jStr;
if (_instrJump->isCondJump())
jStr = i18n("Jump %1 of %2 times to 0x%3")
.tqarg(_instrJump->followedCount().pretty())
.tqarg(_instrJump->executedCount().pretty())
.tqarg(_instrJump->instrTo()->addr().toString());
.arg(_instrJump->followedCount().pretty())
.arg(_instrJump->executedCount().pretty())
.arg(_instrJump->instrTo()->addr().toString());
else
jStr = i18n("Jump %1 times to 0x%2")
.tqarg(_instrJump->executedCount().pretty())
.tqarg(_instrJump->instrTo()->addr().toString());
.arg(_instrJump->executedCount().pretty())
.arg(_instrJump->instrTo()->addr().toString());
setText(6, jStr);
@ -209,7 +209,7 @@ void InstrItem::updateCost()
if (Configuration::showPercentage())
setText(1, TQString("%1")
.tqarg(pure, 0, 'f', Configuration::percentPrecision()));
.arg(pure, 0, 'f', Configuration::percentPrecision()));
else
setText(1, _pure.pretty());
@ -228,7 +228,7 @@ void InstrItem::updateCost()
if (Configuration::showPercentage())
setText(2, TQString("%1")
.tqarg(pure, 0, 'f', Configuration::percentPrecision()));
.arg(pure, 0, 'f', Configuration::percentPrecision()));
else
setText(2, _pure2.pretty());
@ -297,7 +297,7 @@ int InstrItem::compare(TQListViewItem * i, int col, bool ascending ) const
}
void InstrItem::paintCell( TQPainter *p, const TQColorGroup &cg,
int column, int width, int tqalignment )
int column, int width, int alignment )
{
TQColorGroup _cg( cg );
@ -309,7 +309,7 @@ void InstrItem::paintCell( TQPainter *p, const TQColorGroup &cg,
if (column == 3)
paintArrows(p, _cg, width);
else
TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
TQListViewItem::paintCell( p, _cg, column, width, alignment );
}
void InstrItem::setJumpArray(const TQMemArray<TraceInstrJump*>& a)

2
kcachegrind/kcachegrind/instritem.h
Unescape View File

@ -58,7 +58,7 @@ public:
int compare(TQListViewItem * i, int col, bool ascending ) const;
void paintCell(TQPainter *p, const TQColorGroup &cg,
int column, int width, int tqalignment );
int column, int width, int alignment );
int width( const TQFontMetrics& fm,
const TQListView* lv, int c ) const;

10
kcachegrind/kcachegrind/instrview.cpp
Unescape View File

@ -188,11 +188,11 @@ void InstrView::context(TQListViewItem* i, const TQPoint & p, int c)
TQString name = f->name();
if ((int)name.length()>Configuration::maxSymbolLength())
name = name.left(Configuration::maxSymbolLength()) + "...";
popup.insertItem(i18n("Go to '%1'").tqarg(name), 93);
popup.insertItem(i18n("Go to '%1'").arg(name), 93);
popup.insertSeparator();
}
else if (instr) {
popup.insertItem(i18n("Go to Address %1").tqarg(instr->name()), 93);
popup.insertItem(i18n("Go to Address %1").arg(instr->name()), 93);
popup.insertSeparator();
}
@ -618,8 +618,8 @@ bool InstrView::fillInstrRange(TraceFunction* function,
objfile = objfile.replace(TQRegExp("[\"']"), ""); // security...
popencmd = TQString("objdump -C -d "
"--start-address=0x%1 --stop-address=0x%2 \"%3\"")
.tqarg(dumpStartAddr.toString()).tqarg(dumpEndAddr.toString())
.tqarg(objfile);
.arg(dumpStartAddr.toString()).arg(dumpEndAddr.toString())
.arg(objfile);
if (1) qDebug("Running '%s'...", popencmd.ascii());
// and run...
@ -875,7 +875,7 @@ bool InstrView::fillInstrRange(TraceFunction* function,
"There are %n cost lines without assembler code.", noAssLines));
new InstrItem(this, this, 2,
i18n("This happens because the code of"));
new InstrItem(this, this, 3, TQString(" %1").tqarg(objfile));
new InstrItem(this, this, 3, TQString(" %1").arg(objfile));
new InstrItem(this, this, 4,
i18n("does not seem to match the profile data file."));
new InstrItem(this, this, 5, "");

6
kcachegrind/kcachegrind/multiview.cpp
Unescape View File

@ -65,7 +65,7 @@ void MultiView::appendView()
int n = _views.count()+1;
TabView* tv = new TabView(this, this,
TQString("TabView-%1").tqarg(n).ascii());
TQString("TabView-%1").arg(n).ascii());
connect(tv, TQT_SIGNAL(activated(TabView*)),
this, TQT_SLOT(tabActivated(TabView*)) );
_views.append(tv);
@ -187,7 +187,7 @@ void MultiView::readViewConfig(KConfig* c,
TabView* tv, *activeTV = 0;
for(tv=_views.first();tv;tv=_views.next()) {
if (tv->name() == active) activeTV=tv;
tv->readViewConfig(c, TQString("%1-%2").tqarg(prefix).tqarg(tv->name()),
tv->readViewConfig(c, TQString("%1-%2").arg(prefix).arg(tv->name()),
postfix, withOptions);
}
@ -216,7 +216,7 @@ void MultiView::saveViewConfig(KConfig* c,
TabView* tv;
for(tv=_views.first();tv;tv=_views.next())
tv->saveViewConfig(c, TQString("%1-%2").tqarg(prefix).tqarg(tv->name()),
tv->saveViewConfig(c, TQString("%1-%2").arg(prefix).arg(tv->name()),
postfix, withOptions);
}

30
kcachegrind/kcachegrind/partgraph.cpp
Unescape View File

@ -90,7 +90,7 @@ void PartAreaWidget::refreshParts()
{
// rebuild only subparts to keep part selection state
TreeMapItem* i;
TreeMapItemList* l = base()->tqchildren();
TreeMapItemList* l = base()->children();
if (l)
for (i=l->first();i;i=l->next())
i->refresh();
@ -115,7 +115,7 @@ void PartAreaWidget::setGroupType(TraceCost::CostType gt)
// rebuild hierarchy below parts.
// thus, selected parts stay selected
TreeMapItem* i;
TreeMapItemList* l = base()->tqchildren();
TreeMapItemList* l = base()->children();
if (l)
for (i=l->first();i;i=l->next())
i->refresh();
@ -164,7 +164,7 @@ TQString PartAreaWidget::tipString(TreeMapItem* i) const
while (i && i->rtti()==3) i = i->parent();
if (i && i->rtti()==2) {
itemTip = i18n("Profile Part %1").tqarg(i->text(0));
itemTip = i18n("Profile Part %1").arg(i->text(0));
if (!i->text(1).isEmpty())
itemTip += " (" + i->text(1) + ")";
@ -201,9 +201,9 @@ void BasePartItem::setData(TraceData* data)
refresh();
}
TreeMapItemList* BasePartItem::tqchildren()
TreeMapItemList* BasePartItem::children()
{
if (!_data) return _tqchildren;
if (!_data) return _children;
if (!initialized()) {
// qDebug("Create Parts (%s)", name().ascii());
@ -216,7 +216,7 @@ TreeMapItemList* BasePartItem::tqchildren()
addItem(new PartItem(part));
}
return _tqchildren;
return _children;
}
TQString BasePartItem::text(int textNo) const
@ -276,7 +276,7 @@ TQString PartItem::text(int textNo) const
TraceCost* t = _p->data()->totals();
double p = 100.0 * v / t->subCost(ct);
return TQString("%1 %")
.tqarg(p, 0, 'f', Configuration::percentPrecision());
.arg(p, 0, 'f', Configuration::percentPrecision());
}
return v.pretty();
}
@ -324,9 +324,9 @@ double PartItem::sum() const
return 0.0;
}
TreeMapItemList* PartItem::tqchildren()
TreeMapItemList* PartItem::children()
{
if (initialized()) return _tqchildren;
if (initialized()) return _children;
TraceCost* c;
// qDebug("Create Part subitems (%s)", name().ascii());
@ -339,7 +339,7 @@ TreeMapItemList* PartItem::tqchildren()
if (c) addItem(new SubPartItem(c));
}
return _tqchildren;
return _children;
}
@ -397,7 +397,7 @@ TreeMapItemList* PartItem::tqchildren()
break;
}
return _tqchildren;
return _children;
}
@ -443,7 +443,7 @@ TQString SubPartItem::text(int textNo) const
_partCostItem->part() : _partCostItem->part()->data()->totals();
double p = 100.0 * v / t->subCost(ct);
return TQString("%1 %")
.tqarg(p, 0, 'f', Configuration::percentPrecision());
.arg(p, 0, 'f', Configuration::percentPrecision());
}
return v.pretty();
}
@ -491,7 +491,7 @@ double SubPartItem::sum() const
return 0.0;
}
TreeMapItemList* SubPartItem::tqchildren()
TreeMapItemList* SubPartItem::children()
{
if (!initialized()) {
// qDebug("Create Part sub-subitems (%s)", name().ascii());
@ -499,7 +499,7 @@ TreeMapItemList* SubPartItem::tqchildren()
PartAreaWidget* w = (PartAreaWidget*)widget();
if (depth()-2 > w->callLevels())
return _tqchildren;
return _children;
if (w->visualisation() == PartAreaWidget::Inclusive) {
TracePartCall* call;
@ -517,7 +517,7 @@ TreeMapItemList* SubPartItem::tqchildren()
}
}
return _tqchildren;
return _children;
}

6
kcachegrind/kcachegrind/partgraph.h
Unescape View File

@ -83,7 +83,7 @@ public:
double value() const;
TQString text(int) const;
int borderWidth() const { return 0; }
TreeMapItemList* tqchildren();
TreeMapItemList* children();
TQColor backColor() const;
private:
@ -101,7 +101,7 @@ public:
int borderWidth() const { return 0; }
TQString text(int) const;
TQPixmap pixmap(int) const;
TreeMapItemList* tqchildren();
TreeMapItemList* children();
TQColor backColor() const;
private:
@ -120,7 +120,7 @@ public:
SplitMode splitMode() const { return Vertical; }
TQString text(int) const;
TQPixmap pixmap(int) const;
TreeMapItemList* tqchildren();
TreeMapItemList* children();
TQColor backColor() const;
private:

6
kcachegrind/kcachegrind/partlistitem.cpp
Unescape View File

@ -46,7 +46,7 @@ PartListItem::PartListItem(TQListView* parent, TraceCostItem* costItem,
#if 0
TQString partName = TQString::number(part->partNumber());
if (part->data()->maxThreadID() >1)
partName += i18n(" (Thread %1)").tqarg(part->threadID());
partName += i18n(" (Thread %1)").arg(part->threadID());
setText(0, partName);
#else
setText(0, _part->prettyName());
@ -107,7 +107,7 @@ void PartListItem::update()
double pure = 100.0 * _pure / selfTotal;
if (Configuration::showPercentage()) {
setText(2, TQString("%1")
.tqarg(pure, 0, 'f', Configuration::percentPrecision()));
.arg(pure, 0, 'f', Configuration::percentPrecision()));
}
else
setText(2, _partCostItem->prettySubCost(_costType));
@ -123,7 +123,7 @@ void PartListItem::update()
double sum = 100.0 * _sum / total;
if (Configuration::showPercentage()) {
setText(1, TQString("%1")
.tqarg(sum, 0, 'f', Configuration::percentPrecision()));
.arg(sum, 0, 'f', Configuration::percentPrecision()));
}
else
setText(1, _sum.pretty());

8
kcachegrind/kcachegrind/partselection.cpp
Unescape View File

@ -148,7 +148,7 @@ void PartSelection::currentChangedSlot(TreeMapItem* i, bool kbd)
TQString str = i->text(0);
if (!i->text(1).isEmpty())
str += " (" + i->text(1) + ")";
TQString msg = i18n("Profile Part Overview: Current is '%1'").tqarg(str);
TQString msg = i18n("Profile Part Overview: Current is '%1'").arg(str);
emit showMessage(msg, 5000);
if (_showInfo) fillInfo();
@ -203,7 +203,7 @@ void PartSelection::selectionChanged()
TracePart* part;
// if nothing is selected, activate all parts
TreeMapItemList* list = partAreaWidget->base()->tqchildren();
TreeMapItemList* list = partAreaWidget->base()->children();
if (!list) return;
for (i=list->first();i;i=list->next())
@ -235,7 +235,7 @@ void PartSelection::activePartsChangedSlot(const TracePartList& list)
kdDebug() << "Entering PartSelection::activePartsChangedSlot" << endl;
TreeMapItem* i;
TreeMapItemList l = *partAreaWidget->base()->tqchildren();
TreeMapItemList l = *partAreaWidget->base()->children();
// first deselect inactive, then select active (makes current active)
for (i=l.first();i;i=l.next()) {
TracePart* part = ((PartItem*)i)->part();
@ -381,7 +381,7 @@ void PartSelection::contextMenuRequested(TreeMapItem* i,
case 2:
// select all parts
{
TreeMapItemList list = *partAreaWidget->base()->tqchildren();
TreeMapItemList list = *partAreaWidget->base()->children();
partAreaWidget->setRangeSelection(list.first(), list.last(), true);
}
break;

4
kcachegrind/kcachegrind/partview.cpp
Unescape View File

@ -103,8 +103,8 @@ void PartView::context(TQListViewItem* i, const TQPoint & pos, int)
TracePart* p = i ? ((PartListItem*) i)->part() : 0;
if (p) {
popup.insertItem(i18n("Select '%1'").tqarg(p->name()), 93);
popup.insertItem(i18n("Hide '%1'").tqarg(p->name()), 94);
popup.insertItem(i18n("Select '%1'").arg(p->name()), 93);
popup.insertItem(i18n("Hide '%1'").arg(p->name()), 94);
popup.insertSeparator();
}

20
kcachegrind/kcachegrind/sourceitem.cpp
Unescape View File

@ -87,7 +87,7 @@ SourceItem::SourceItem(SourceView* sv, TQListViewItem* parent,
else
templ += i18n("%n call to '%1'", "%n calls to '%1'", cc);
TQString callStr = templ.tqarg(_lineCall->call()->calledName());
TQString callStr = templ.arg(_lineCall->call()->calledName());
TraceFunction* calledF = _lineCall->call()->called();
calledF->addPrettyLocation(callStr);
@ -123,13 +123,13 @@ SourceItem::SourceItem(SourceView* sv, TQListViewItem* parent,
TQString jStr;
if (_lineJump->isCondJump())
jStr = i18n("Jump %1 of %2 times to %3")
.tqarg(_lineJump->followedCount().pretty())
.tqarg(_lineJump->executedCount().pretty())
.tqarg(to);
.arg(_lineJump->followedCount().pretty())
.arg(_lineJump->executedCount().pretty())
.arg(to);
else
jStr = i18n("Jump %1 times to %2")
.tqarg(_lineJump->executedCount().pretty())
.tqarg(to);
.arg(_lineJump->executedCount().pretty())
.arg(to);
setText(4, jStr);
}
@ -193,7 +193,7 @@ void SourceItem::updateCost()
if (Configuration::showPercentage())
setText(1, TQString("%1")
.tqarg(pure, 0, 'f', Configuration::percentPrecision()));
.arg(pure, 0, 'f', Configuration::percentPrecision()));
else
setText(1, _pure.pretty());
@ -212,7 +212,7 @@ void SourceItem::updateCost()
if (Configuration::showPercentage())
setText(2, TQString("%1")
.tqarg(pure2, 0, 'f', Configuration::percentPrecision()));
.arg(pure2, 0, 'f', Configuration::percentPrecision()));
else
setText(2, _pure2.pretty());
@ -285,7 +285,7 @@ int SourceItem::compare(TQListViewItem * i, int col, bool ascending ) const
}
void SourceItem::paintCell( TQPainter *p, const TQColorGroup &cg,
int column, int width, int tqalignment )
int column, int width, int alignment )
{
TQColorGroup _cg( cg );
@ -297,7 +297,7 @@ void SourceItem::paintCell( TQPainter *p, const TQColorGroup &cg,
if (column == 3)
paintArrows(p, _cg, width);
else
TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
TQListViewItem::paintCell( p, _cg, column, width, alignment );
}
void SourceItem::setJumpArray(const TQMemArray<TraceLineJump*>& a)

2
kcachegrind/kcachegrind/sourceitem.h
Unescape View File

@ -57,7 +57,7 @@ public:
int compare(TQListViewItem * i, int col, bool ascending ) const;
void paintCell( TQPainter *p, const TQColorGroup &cg,
int column, int width, int tqalignment );
int column, int width, int alignment );
int width( const TQFontMetrics& fm,
const TQListView* lv, int c ) const;
void updateGroup();

16
kcachegrind/kcachegrind/sourceview.cpp
Unescape View File

@ -113,11 +113,11 @@ void SourceView::context(TQListViewItem* i, const TQPoint & p, int c)
TQString name = f->name();
if ((int)name.length()>Configuration::maxSymbolLength())
name = name.left(Configuration::maxSymbolLength()) + "...";
popup.insertItem(i18n("Go to '%1'").tqarg(name), 93);
popup.insertItem(i18n("Go to '%1'").arg(name), 93);
popup.insertSeparator();
}
else if (line) {
popup.insertItem(i18n("Go to Line %1").tqarg(line->name()), 93);
popup.insertItem(i18n("Go to Line %1").arg(line->name()), 93);
popup.insertSeparator();
}
@ -513,7 +513,7 @@ void SourceView::fillSourceFile(TraceFunctionSource* sf, int fileno)
new SourceItem(this, this, fileno, 1, false,
i18n("with any source line of this function in file"));
new SourceItem(this, this, fileno, 2, false,
TQString(" '%1'").tqarg(sf->function()->prettyName()));
TQString(" '%1'").arg(sf->function()->prettyName()));
new SourceItem(this, this, fileno, 3, false,
i18n("Thus, no annotated source can be shown."));
return;
@ -550,13 +550,13 @@ void SourceView::fillSourceFile(TraceFunctionSource* sf, int fileno)
// do it here, because the source directory could have been set before
if (childCount()==0) {
setColumnText(4, validSourceFile ?
i18n("Source ('%1')").tqarg(filename) :
i18n("Source ('%1')").arg(filename) :
i18n("Source (unknown)"));
}
else {
new SourceItem(this, this, fileno, 0, true,
validSourceFile ?
i18n("--- Inlined from '%1' ---").tqarg(filename) :
i18n("--- Inlined from '%1' ---").arg(filename) :
i18n("--- Inlined from unknown source ---"));
}
@ -564,7 +564,7 @@ void SourceView::fillSourceFile(TraceFunctionSource* sf, int fileno)
new SourceItem(this, this, fileno, 0, false,
i18n("There is no source available for the following function:"));
new SourceItem(this, this, fileno, 1, false,
TQString(" '%1'").tqarg(sf->function()->prettyName()));
TQString(" '%1'").arg(sf->function()->prettyName()));
if (sf->file()->name().isEmpty()) {
new SourceItem(this, this, fileno, 2, false,
i18n("This is because no debug information is present."));
@ -575,14 +575,14 @@ void SourceView::fillSourceFile(TraceFunctionSource* sf, int fileno)
i18n("The function is located in this ELF object:"));
new SourceItem(this, this, fileno, 5, false,
TQString(" '%1'")
.tqarg(sf->function()->object()->prettyName()));
.arg(sf->function()->object()->prettyName()));
}
}
else {
new SourceItem(this, this, fileno, 2, false,
i18n("This is because its source file cannot be found:"));
new SourceItem(this, this, fileno, 3, false,
TQString(" '%1'").tqarg(sf->file()->name()));
TQString(" '%1'").arg(sf->file()->name()));
new SourceItem(this, this, fileno, 4, false,
i18n("Add the folder of this file to the source folder list."));
new SourceItem(this, this, fileno, 5, false,

4
kcachegrind/kcachegrind/stackitem.cpp
Unescape View File

@ -85,7 +85,7 @@ void StackItem::updateCost()
if (Configuration::showPercentage())
setText(0, TQString("%1")
.tqarg(sum, 0, 'f', Configuration::percentPrecision()));
.arg(sum, 0, 'f', Configuration::percentPrecision()));
else
setText(0, _call->prettySubCost(ct));
@ -107,7 +107,7 @@ void StackItem::updateCost()
if (Configuration::showPercentage())
setText(1, TQString("%1")
.tqarg(sum, 0, 'f', Configuration::percentPrecision()));
.arg(sum, 0, 'f', Configuration::percentPrecision()));
else
setText(1, _call->prettySubCost(ct2));

14
kcachegrind/kcachegrind/tabview.cpp
Unescape View File

@ -419,7 +419,7 @@ void TabView::updateVisibility()
s.append(100);
// tqchildren of mainSplitter
// children of mainSplitter
if (_rightTW->isHidden() != (r == 0)) {
if (r == 0) {
_rightTW->hide();
@ -441,7 +441,7 @@ void TabView::updateVisibility()
_leftSplitter->show();
}
// tqchildren of leftSplitter
// children of leftSplitter
if (_topTW->isHidden() != (t == 0)) {
if (t == 0) {
_topTW->hide();
@ -463,7 +463,7 @@ void TabView::updateVisibility()
_bottomSplitter->show();
}
// tqchildren of bottomSplitter
// children of bottomSplitter
if (_bottomTW->isHidden() != (b == 0)) {
if (b == 0) {
_bottomTW->hide();
@ -700,7 +700,7 @@ void TabView::resizeEvent(TQResizeEvent* e)
void TabView::selected(TraceItemView*, TraceItem* s)
{
// we set selected item for our own tqchildren
// we set selected item for our own children
select(s);
updateView();
@ -771,7 +771,7 @@ void TabView::readViewConfig(KConfig* c,
if (withOptions)
v->readViewConfig(c, TQString("%1-%2")
.tqarg(prefix).tqarg(v->widget()->name()),
.arg(prefix).arg(v->widget()->name()),
postfix, true);
}
if (activeTop) _topTW->showPage(activeTop->widget());
@ -883,8 +883,8 @@ void TabView::saveViewConfig(KConfig* c,
if (withOptions)
for (v=_tabs.first();v;v=_tabs.next())
v->saveViewConfig(c, TQString("%1-%2").tqarg(prefix)
.tqarg(v->widget()->name()), postfix, true);
v->saveViewConfig(c, TQString("%1-%2").arg(prefix)
.arg(v->widget()->name()), postfix, true);
}
#include "tabview.moc"

2
kcachegrind/kcachegrind/tabview.h
Unescape View File

@ -55,7 +55,7 @@ class TabBar : public TQTabBar
/**
* Own Splitter:
* Call checkVisiblity for all TabWidget tqchildren of the splitter
* Call checkVisiblity for all TabWidget children of the splitter
* on a MoveEvent. This typically is produced when collapsing the widget
* inside of another splitter.
*/

72
kcachegrind/kcachegrind/toplevel.cpp
Unescape View File

@ -226,21 +226,21 @@ void TopLevel::saveTraceSettings()
TQString key = traceKey();
KConfigGroup pConfig(KGlobal::config(), TQCString("TracePositions"));
pConfig.writeEntry(TQString("CostType%1").tqarg(key),
pConfig.writeEntry(TQString("CostType%1").arg(key),
_costType ? _costType->name() : TQString("?"));
pConfig.writeEntry(TQString("CostType2%1").tqarg(key),
pConfig.writeEntry(TQString("CostType2%1").arg(key),
_costType2 ? _costType2->name() : TQString("?"));
pConfig.writeEntry(TQString("GroupType%1").tqarg(key),
pConfig.writeEntry(TQString("GroupType%1").arg(key),
TraceItem::typeName(_groupType));
if (!_data) return;
KConfigGroup aConfig(KGlobal::config(), TQCString("Layouts"));
aConfig.writeEntry(TQString("Count%1").tqarg(key), _layoutCount);
aConfig.writeEntry(TQString("Current%1").tqarg(key), _layoutCurrent);
aConfig.writeEntry(TQString("Count%1").arg(key), _layoutCount);
aConfig.writeEntry(TQString("Current%1").arg(key), _layoutCurrent);
saveCurrentState(key);
pConfig.writeEntry(TQString("Group%1").tqarg(key),
pConfig.writeEntry(TQString("Group%1").arg(key),
_group ? _group->name() : TQString());
}
@ -1137,7 +1137,7 @@ void TopLevel::exportGraph()
ge.writeDot();
TQString cmd = TQString("(dot %1 -Tps > %2.ps; kghostview %3.ps)&")
.tqarg(n).tqarg(n).tqarg(n);
.arg(n).arg(n).arg(n);
system(TQFile::encodeName( cmd ));
}
@ -1725,9 +1725,9 @@ void TopLevel::restoreTraceTypes()
KConfigGroup pConfig(KGlobal::config(), TQCString("TracePositions"));
TQString groupType, costType, costType2;
groupType = pConfig.readEntry(TQString("GroupType%1").tqarg(key));
costType = pConfig.readEntry(TQString("CostType%1").tqarg(key));
costType2 = pConfig.readEntry(TQString("CostType2%1").tqarg(key));
groupType = pConfig.readEntry(TQString("GroupType%1").arg(key));
costType = pConfig.readEntry(TQString("CostType%1").arg(key));
costType2 = pConfig.readEntry(TQString("CostType2%1").arg(key));
if (groupType.isEmpty()) groupType = cConfig.readEntry("GroupType");
if (costType.isEmpty()) costType = cConfig.readEntry("CostType");
@ -1742,8 +1742,8 @@ void TopLevel::restoreTraceTypes()
costTypeSelected(_saCost->items().first());
KConfigGroup aConfig(KGlobal::config(), TQCString("Layouts"));
_layoutCount = aConfig.readNumEntry(TQString("Count%1").tqarg(key), 0);
_layoutCurrent = aConfig.readNumEntry(TQString("Current%1").tqarg(key), 0);
_layoutCount = aConfig.readNumEntry(TQString("Count%1").arg(key), 0);
_layoutCurrent = aConfig.readNumEntry(TQString("Current%1").arg(key), 0);
if (_layoutCount == 0) layoutRestore();
updateLayoutActions();
}
@ -1761,7 +1761,7 @@ void TopLevel::restoreTraceSettings()
TQString key = traceKey();
KConfigGroup pConfig(KGlobal::config(), TQCString("TracePositions"));
TQString group = pConfig.readEntry(TQString("Group%1").tqarg(key));
TQString group = pConfig.readEntry(TQString("Group%1").arg(key));
if (!group.isEmpty()) setGroup(group);
restoreCurrentState(key);
@ -1782,7 +1782,7 @@ void TopLevel::layoutDuplicate()
{
// save current and allocate a new slot
_multiView->saveViewConfig(KGlobal::config(),
TQString("Layout%1-MainView").tqarg(_layoutCurrent),
TQString("Layout%1-MainView").arg(_layoutCurrent),
traceKey(), false);
_layoutCurrent = _layoutCount;
_layoutCount++;
@ -1800,7 +1800,7 @@ void TopLevel::layoutRemove()
if (_layoutCurrent == from) { _layoutCurrent--; from--; }
// restore from last and decrement count
_multiView->readViewConfig(KGlobal::config(),
TQString("Layout%1-MainView").tqarg(from),
TQString("Layout%1-MainView").arg(from),
traceKey(), false);
_layoutCount--;
@ -1815,13 +1815,13 @@ void TopLevel::layoutNext()
TQString key = traceKey();
_multiView->saveViewConfig(config,
TQString("Layout%1-MainView").tqarg(_layoutCurrent),
TQString("Layout%1-MainView").arg(_layoutCurrent),
key, false);
_layoutCurrent++;
if (_layoutCurrent == _layoutCount) _layoutCurrent = 0;
_multiView->readViewConfig(config,
TQString("Layout%1-MainView").tqarg(_layoutCurrent),
TQString("Layout%1-MainView").arg(_layoutCurrent),
key, false);
if (0) kdDebug() << "TopLevel::layoutNext: current "
@ -1836,13 +1836,13 @@ void TopLevel::layoutPrevious()
TQString key = traceKey();
_multiView->saveViewConfig(config,
TQString("Layout%1-MainView").tqarg(_layoutCurrent),
TQString("Layout%1-MainView").arg(_layoutCurrent),
key, false);
_layoutCurrent--;
if (_layoutCurrent <0) _layoutCurrent = _layoutCount-1;
_multiView->readViewConfig(config,
TQString("Layout%1-MainView").tqarg(_layoutCurrent),
TQString("Layout%1-MainView").arg(_layoutCurrent),
key, false);
if (0) kdDebug() << "TopLevel::layoutPrevious: current "
@ -1855,20 +1855,20 @@ void TopLevel::layoutSave()
TQString key = traceKey();
_multiView->saveViewConfig(config,
TQString("Layout%1-MainView").tqarg(_layoutCurrent),
TQString("Layout%1-MainView").arg(_layoutCurrent),
key, false);
for(int i=0;i<_layoutCount;i++) {
_multiView->readViewConfig(config,
TQString("Layout%1-MainView").tqarg(i),
TQString("Layout%1-MainView").arg(i),
key, false);
_multiView->saveViewConfig(config,
TQString("Layout%1-MainView").tqarg(i),
TQString("Layout%1-MainView").arg(i),
TQString(), false);
}
_multiView->readViewConfig(config,
TQString("Layout%1-MainView").tqarg(_layoutCurrent),
TQString("Layout%1-MainView").arg(_layoutCurrent),
key, false);
KConfigGroup aConfig(config, TQCString("Layouts"));
@ -1890,15 +1890,15 @@ void TopLevel::layoutRestore()
TQString key = traceKey();
for(int i=0;i<_layoutCount;i++) {
_multiView->readViewConfig(config,
TQString("Layout%1-MainView").tqarg(i),
TQString("Layout%1-MainView").arg(i),
TQString(), false);
_multiView->saveViewConfig(config,
TQString("Layout%1-MainView").tqarg(i),
TQString("Layout%1-MainView").arg(i),
key, false);
}
_multiView->readViewConfig(config,
TQString("Layout%1-MainView").tqarg(_layoutCurrent),
TQString("Layout%1-MainView").arg(_layoutCurrent),
key, false);
updateLayoutActions();
@ -1918,7 +1918,7 @@ void TopLevel::updateLayoutActions()
ka = actionCollection()->action("layout_remove");
if (ka) ka->setEnabled(_layoutCount>1);
_statusbar->message(i18n("Layout Count: %1").tqarg(_layoutCount), 1000);
_statusbar->message(i18n("Layout Count: %1").arg(_layoutCount), 1000);
}
@ -1930,19 +1930,19 @@ void TopLevel::updateStatusBar()
}
TQString status = TQString("%1 [%2] - ")
.tqarg(_data->shortTraceName())
.tqarg(_data->activePartRange());
.arg(_data->shortTraceName())
.arg(_data->activePartRange());
if (_costType) {
status += i18n("Total %1 Cost: %2")
.tqarg(_costType->longName())
.tqarg(_data->prettySubCost(_costType));
.arg(_costType->longName())
.arg(_data->prettySubCost(_costType));
/* this gets too long...
if (_costType2 && (_costType2 != _costType))
status += i18n(", %1 Cost: %2")
.tqarg(_costType2->longName())
.tqarg(_data->prettySubCost(_costType2));
.arg(_costType2->longName())
.arg(_data->prettySubCost(_costType2));
*/
}
else
@ -1952,8 +1952,8 @@ void TopLevel::updateStatusBar()
if (_groupType != TraceItem::Function) {
status += TQString(" - %1 '%2'")
.tqarg(TraceItem::i18nTypeName(_groupType))
.tqarg(_group ? _group->prettyName() : i18n("(None)"));
.arg(TraceItem::i18nTypeName(_groupType))
.arg(_group ? _group->prettyName() : i18n("(None)"));
}
*/
@ -2048,7 +2048,7 @@ void TopLevel::configChanged()
//qDebug("TopLevel::configChanged");
//_showPercentage->setChecked(Configuration::showPercentage());
// tqinvalidate found/cached dirs of source files
// invalidate found/cached dirs of source files
_data->resetSourceDirs();
_partSelection->refresh();

216
kcachegrind/kcachegrind/tracedata.cpp
Unescape View File

@ -226,7 +226,7 @@ TraceItem::CostType TraceItem::i18nCostType(TQString s)
void TraceItem::clear()
{
tqinvalidate();
invalidate();
}
@ -239,8 +239,8 @@ TQString TraceItem::name() const
{
if (part()) {
return i18n("%1 from %2")
.tqarg(_dep->name())
.tqarg(part()->name());
.arg(_dep->name())
.arg(part()->name());
}
if (_dep)
@ -259,21 +259,21 @@ TQString TraceItem::prettyName() const
TQString TraceItem::fullName() const
{
return TQString("%1 %2")
.tqarg(typeName(type())).tqarg(prettyName());
.arg(typeName(type())).arg(prettyName());
}
TQString TraceItem::toString()
{
return TQString("%1\n [%3]").tqarg(fullName()).tqarg(costString(0));
return TQString("%1\n [%3]").arg(fullName()).arg(costString(0));
}
void TraceItem::tqinvalidate()
void TraceItem::invalidate()
{
if (_dirty) return;
_dirty = true;
if (_dep)
_dep->tqinvalidate();
_dep->invalidate();
}
void TraceItem::update()
@ -360,7 +360,7 @@ void TraceCost::set(TraceSubMapping* sm, const char* s)
_count = maxIndex;
}
// a cost change has to be propagated (esp. in subclasses)
tqinvalidate();
invalidate();
}
void TraceCost::set(TraceSubMapping* sm, FixString & s)
@ -391,7 +391,7 @@ void TraceCost::set(TraceSubMapping* sm, FixString & s)
_cost[i] = 0;
_count = maxIndex+1;
}
tqinvalidate();
invalidate();
}
@ -436,13 +436,13 @@ void TraceCost::addCost(TraceSubMapping* sm, const char* s)
}
// a cost change has to be propagated (esp. in subclasses)
tqinvalidate();
invalidate();
#if TRACE_DEBUG
_dirty = false; // don't recurse !
qDebug("%s\n now %s", fullName().ascii(),
TraceCost::costString(0).ascii());
_dirty = true; // because of tqinvalidate()
_dirty = true; // because of invalidate()
#endif
}
@ -488,13 +488,13 @@ void TraceCost::addCost(TraceSubMapping* sm, FixString & s)
}
}
tqinvalidate();
invalidate();
#if TRACE_DEBUG
_dirty = false; // don't recurse !
qDebug("%s\n now %s", fullName().ascii(),
TraceCost::costString(0).ascii());
_dirty = true; // because of tqinvalidate()
_dirty = true; // because of invalidate()
#endif
}
@ -544,13 +544,13 @@ void TraceCost::maxCost(TraceSubMapping* sm, FixString & s)
}
}
tqinvalidate();
invalidate();
#if TRACE_DEBUG
_dirty = false; // don't recurse !
qDebug("%s\n now %s", fullName().ascii(),
TraceCost::costString(0).ascii());
_dirty = true; // because of tqinvalidate()
_dirty = true; // because of invalidate()
#endif
}
@ -578,14 +578,14 @@ void TraceCost::addCost(TraceCost* item)
}
// a cost change has to be propagated (esp. in subclasses)
tqinvalidate();
invalidate();
#if TRACE_DEBUG
_dirty = false; // don't recurse !
qDebug("%s added cost item\n %s\n now %s",
fullName().ascii(), item->fullName().ascii(),
TraceCost::costString(0).ascii());
_dirty = true; // because of tqinvalidate()
_dirty = true; // because of invalidate()
#endif
}
@ -612,14 +612,14 @@ void TraceCost::maxCost(TraceCost* item)
}
// a cost change has to be propagated (esp. in subclasses)
tqinvalidate();
invalidate();
#if TRACE_DEBUG
_dirty = false; // don't recurse !
qDebug("%s added cost item\n %s\n now %s",
fullName().ascii(), item->fullName().ascii(),
TraceCost::costString(0).ascii());
_dirty = true; // because of tqinvalidate()
_dirty = true; // because of invalidate()
#endif
}
@ -636,7 +636,7 @@ void TraceCost::addCost(int type, SubCost value)
}
// a cost change has to be propagated (esp. in subclasses)
tqinvalidate();
invalidate();
}
void TraceCost::maxCost(int type, SubCost value)
@ -653,7 +653,7 @@ void TraceCost::maxCost(int type, SubCost value)
}
// a cost change has to be propagated (esp. in subclasses)
tqinvalidate();
invalidate();
}
@ -691,14 +691,14 @@ TQString TraceCost::costString(TraceCostMapping* m)
}
void TraceCost::tqinvalidate()
void TraceCost::invalidate()
{
if (_dirty) return;
_dirty = true;
_cachedType = 0; // cached value is invalid, too
if (_dep)
_dep->tqinvalidate();
_dep->invalidate();
}
void TraceCost::update()
@ -767,8 +767,8 @@ TQString TraceJumpCost::costString(TraceCostMapping*)
if (_dirty) update();
return TQString("%1/%2")
.tqarg(_followedCount.pretty())
.tqarg(_executedCount.pretty());
.arg(_followedCount.pretty())
.arg(_executedCount.pretty());
}
void TraceJumpCost::clear()
@ -913,7 +913,7 @@ TQString TraceCostType::parsedFormula()
if (!t) continue;
if (!t->name().isEmpty())
res += TQString(" * %1").tqarg(t->name());
res += TQString(" * %1").arg(t->name());
}
return res;
@ -1362,8 +1362,8 @@ TraceCallCost::~TraceCallCost()
TQString TraceCallCost::costString(TraceCostMapping* m)
{
return TQString("%1, Calls %2")
.tqarg(TraceCost::costString(m))
.tqarg(_callCount.pretty());
.arg(TraceCost::costString(m))
.arg(_callCount.pretty());
}
TQString TraceCallCost::prettyCallCount()
@ -1388,7 +1388,7 @@ void TraceCallCost::addCallCount(SubCost c)
{
_callCount += c;
tqinvalidate();
invalidate();
}
@ -1404,8 +1404,8 @@ TraceInclusiveCost::~TraceInclusiveCost()
TQString TraceInclusiveCost::costString(TraceCostMapping* m)
{
return TQString("%1, Inclusive %2")
.tqarg(TraceCost::costString(m))
.tqarg(_inclusive.costString(m));
.arg(TraceCost::costString(m))
.arg(_inclusive.costString(m));
}
void TraceInclusiveCost::clear()
@ -1425,7 +1425,7 @@ void TraceInclusiveCost::addInclusive(TraceCost* c)
{
_inclusive.addCost(c);
tqinvalidate();
invalidate();
}
@ -1452,7 +1452,7 @@ void TraceListCost::addDep(TraceCost* dep)
_deps.append(dep);
_lastDep = dep;
tqinvalidate();
invalidate();
#if TRACE_DEBUG
qDebug("%s added\n %s (now %d)",
@ -1526,7 +1526,7 @@ void TraceJumpListCost::addDep(TraceJumpCost* dep)
_deps.append(dep);
_lastDep = dep;
tqinvalidate();
invalidate();
#if TRACE_DEBUG
qDebug("%s added\n %s (now %d)",
@ -1600,7 +1600,7 @@ void TraceCallListCost::addDep(TraceCallCost* dep)
_deps.append(dep);
_lastDep = dep;
tqinvalidate();
invalidate();
#if TRACE_DEBUG
qDebug("%s added\n %s (now %d)",
@ -1679,7 +1679,7 @@ void TraceInclusiveListCost::addDep(TraceInclusiveCost* dep)
_deps.append(dep);
_lastDep = dep;
tqinvalidate();
invalidate();
#if TRACE_DEBUG
qDebug("%s added\n %s (now %d)",
@ -1897,9 +1897,9 @@ TQString TracePartFunction::costString(TraceCostMapping* m)
TQString res = TraceInclusiveCost::costString(m);
res += TQString(", called from %1: %2")
.tqarg(_calledContexts).tqarg(prettyCalledCount());
.arg(_calledContexts).arg(prettyCalledCount());
res += TQString(", calling from %1: %2")
.tqarg(_callingContexts).tqarg(prettyCallingCount());
.arg(_callingContexts).arg(prettyCallingCount());
return res;
}
@ -1916,7 +1916,7 @@ void TracePartFunction::addPartInstr(TracePartInstr* ref)
#endif
_partInstr.append(ref);
tqinvalidate();
invalidate();
#if TRACE_DEBUG
qDebug("%s added\n %s (now %d)",
@ -1937,7 +1937,7 @@ void TracePartFunction::addPartLine(TracePartLine* ref)
#endif
_partLines.append(ref);
tqinvalidate();
invalidate();
#if TRACE_DEBUG
qDebug("%s added\n %s (now %d)",
@ -1958,7 +1958,7 @@ void TracePartFunction::addPartCaller(TracePartCall* ref)
#endif
_partCallers.append(ref);
tqinvalidate();
invalidate();
#if TRACE_DEBUG
qDebug("%s added Caller\n %s (now %d)",
@ -1979,7 +1979,7 @@ void TracePartFunction::addPartCalling(TracePartCall* ref)
#endif
_partCallings.append(ref);
tqinvalidate();
invalidate();
#if TRACE_DEBUG
qDebug("%s added Calling\n %s (now %d)",
@ -2136,8 +2136,8 @@ TracePartClass::~TracePartClass()
TQString TracePartClass::prettyName() const
{
return TQString("%1 from %2")
.tqarg( _dep->name().isEmpty() ? TQString("(global)") : _dep->name())
.tqarg(part()->name());
.arg( _dep->name().isEmpty() ? TQString("(global)") : _dep->name())
.arg(part()->name());
}
//---------------------------------------------------
@ -2233,8 +2233,8 @@ void TraceInstrJump::update()
TQString TraceInstrJump::name() const
{
return TQString("jump at 0x%1 to 0x%2")
.tqarg(_instrFrom->addr().toString())
.tqarg(_instrTo->addr().toString());
.arg(_instrFrom->addr().toString())
.arg(_instrTo->addr().toString());
}
@ -2316,8 +2316,8 @@ TracePartLineJump* TraceLineJump::partLineJump(TracePart* part)
TQString TraceLineJump::name() const
{
return TQString("jump at %1 to %2")
.tqarg(_lineFrom->prettyName())
.tqarg(_lineTo->prettyName());
.arg(_lineFrom->prettyName())
.arg(_lineTo->prettyName());
}
@ -2395,7 +2395,7 @@ TracePartInstrCall* TraceInstrCall::partInstrCall(TracePart* part,
TQString TraceInstrCall::name() const
{
return TQString("%1 at %2").tqarg(_call->name()).tqarg(_instr->name());
return TQString("%1 at %2").arg(_call->name()).arg(_instr->name());
}
@ -2431,7 +2431,7 @@ TracePartLineCall* TraceLineCall::partLineCall(TracePart* part,
TQString TraceLineCall::name() const
{
return TQString("%1 at %2").tqarg(_call->name()).tqarg(_line->name());
return TQString("%1 at %2").arg(_call->name()).arg(_line->name());
}
@ -2478,7 +2478,7 @@ TraceInstrCall* TraceCall::instrCall(TraceInstr* i)
icall = new TraceInstrCall(this, i);
_instrCalls.append(icall);
tqinvalidate();
invalidate();
#if TRACE_DEBUG
qDebug("Created %s [TraceCall::instrCall]", icall->fullName().ascii());
@ -2500,7 +2500,7 @@ TraceLineCall* TraceCall::lineCall(TraceLine* l)
lcall = new TraceLineCall(this, l);
_lineCalls.append(lcall);
tqinvalidate();
invalidate();
#if TRACE_DEBUG
qDebug("Created %s [TraceCall::lineCall]", lcall->fullName().ascii());
@ -2515,21 +2515,21 @@ void TraceCall::invalidateDynamicCost()
{
TraceLineCall* lc;
for (lc=_lineCalls.first();lc;lc=_lineCalls.next())
lc->tqinvalidate();
lc->invalidate();
TraceInstrCall* ic;
for (ic=_instrCalls.first();ic;ic=_instrCalls.next())
ic->tqinvalidate();
ic->invalidate();
tqinvalidate();
invalidate();
}
TQString TraceCall::name() const
{
return TQString("%1 => %2")
.tqarg(_caller->name())
.tqarg(_called->name());
.arg(_caller->name())
.arg(_called->name());
}
int TraceCall::inCycle()
@ -2587,7 +2587,7 @@ TQString TraceCall::callerName(bool skipCycle) const
TraceFunctionCycle* c = _called->cycle();
if (c && _caller && (_caller->cycle() != c)) {
TQString via = _called->prettyName();
return i18n("%1 via %2").tqarg(_caller->prettyName()).tqarg(via);
return i18n("%1 via %2").arg(_caller->prettyName()).arg(via);
}
}
@ -2606,7 +2606,7 @@ TQString TraceCall::calledName(bool skipCycle) const
_called->setCycle(0);
TQString via = _called->prettyName();
_called->setCycle(c);
return i18n("%1 via %2").tqarg(c->name()).tqarg(via);
return i18n("%1 via %2").arg(c->name()).arg(via);
}
}
return _called->prettyName();
@ -2692,7 +2692,7 @@ void TraceInstr::addInstrCall(TraceInstrCall* instrCall)
#endif
_instrCalls.append(instrCall);
tqinvalidate();
invalidate();
#if TRACE_DEBUG
qDebug("%s added\n %s (now %d)",
@ -2704,12 +2704,12 @@ void TraceInstr::addInstrCall(TraceInstrCall* instrCall)
TQString TraceInstr::name() const
{
return TQString("0x%1").tqarg(_addr.toString());
return TQString("0x%1").arg(_addr.toString());
}
TQString TraceInstr::prettyName() const
{
return TQString("0x%1").tqarg(_addr.toString());
return TQString("0x%1").arg(_addr.toString());
}
@ -2807,7 +2807,7 @@ void TraceLine::addLineCall(TraceLineCall* lineCall)
}
_lineCalls.append(lineCall);
tqinvalidate();
invalidate();
#if TRACE_DEBUG
qDebug("%s added\n %s (now %d)",
@ -2824,13 +2824,13 @@ TQString TraceLine::name() const
return i18n("(unknown)");
return TQString("%1:%2")
.tqarg(fileShortName).tqarg(_lineno);
.arg(fileShortName).arg(_lineno);
}
TQString TraceLine::prettyName() const
{
return TQString("%1 [%2]")
.tqarg(name()).tqarg(_sourceFile->function()->prettyName());
.arg(name()).arg(_sourceFile->function()->prettyName());
}
//---------------------------------------------------
@ -2869,7 +2869,7 @@ TraceFunctionSource::~TraceFunctionSource()
TQString TraceFunctionSource::name() const
{
return TQString("%1 for %2").tqarg(_file->name()).tqarg(_function->name());
return TQString("%1 for %2").arg(_file->name()).arg(_function->name());
}
uint TraceFunctionSource::firstLineno()
@ -2952,10 +2952,10 @@ void TraceFunctionSource::invalidateDynamicCost()
TraceLineMap::Iterator lit;
for ( lit = _lineMap->begin();
lit != _lineMap->end(); ++lit )
(*lit).tqinvalidate();
(*lit).invalidate();
}
tqinvalidate();
invalidate();
}
TraceLineMap* TraceFunctionSource::lineMap()
@ -3125,7 +3125,7 @@ void TraceAssoziation::clear(TraceData* d, int rtti)
(*it).removeAssoziation(rtti);
}
void TraceAssoziation::tqinvalidate(TraceData* d, int rtti)
void TraceAssoziation::invalidate(TraceData* d, int rtti)
{
TraceFunctionMap::Iterator it;
for ( it = d->functionMap().begin();
@ -3203,7 +3203,7 @@ void TraceFunction::invalidateAssoziation(int rtti)
TraceAssoziation* a;
for (a=_assoziations.first();a;a=_assoziations.next())
if ((rtti==0) || (a->rtti() == rtti))
a->tqinvalidate();
a->invalidate();
}
TraceAssoziation* TraceFunction::assoziation(int rtti)
@ -3254,9 +3254,9 @@ TQString TraceFunction::prettyName() const
// cycle members
if (_cycle) {
if (_cycle != this)
res = TQString("%1 <cycle %2>").tqarg(res).tqarg(_cycle->cycleNo());
res = TQString("%1 <cycle %2>").arg(res).arg(_cycle->cycleNo());
else
res = TQString("<cycle %2>").tqarg(_cycle->cycleNo());
res = TQString("<cycle %2>").arg(_cycle->cycleNo());
}
@ -3279,9 +3279,9 @@ TQString TraceFunction::location(int maxFiles) const
uint to = lastAddress();
if (from != 0 && to != 0) {
if (from == to)
loc += TQString(" (0x%1)").tqarg(to, 0, 16);
loc += TQString(" (0x%1)").arg(to, 0, 16);
else
loc += TQString(" (0x%1-0x%2)").tqarg(from, 0, 16).tqarg(to, 0, 16);
loc += TQString(" (0x%1-0x%2)").arg(from, 0, 16).arg(to, 0, 16);
}
#endif
}
@ -3310,9 +3310,9 @@ TQString TraceFunction::location(int maxFiles) const
to = sourceFile->lastLineno();
if (from != 0 && to != 0) {
if (from == to)
loc += TQString(" (%1)").tqarg(to);
loc += TQString(" (%1)").arg(to);
else
loc += TQString(" (%1-%2)").tqarg(from).tqarg(to);
loc += TQString(" (%1-%2)").arg(from).arg(to);
}
#endif
}
@ -3334,7 +3334,7 @@ void TraceFunction::addPrettyLocation(TQString& s, int maxFiles) const
TQString l = location(maxFiles);
if (l.isEmpty()) return;
s += TQString(" (%1)").tqarg(l);
s += TQString(" (%1)").arg(l);
}
TQString TraceFunction::prettyNameWithLocation(int maxFiles) const
@ -3342,17 +3342,17 @@ TQString TraceFunction::prettyNameWithLocation(int maxFiles) const
TQString l = location(maxFiles);
if (l.isEmpty()) return prettyName();
return TQString("%1 (%2)").tqarg(prettyName()).tqarg(l);
return TQString("%1 (%2)").arg(prettyName()).arg(l);
}
TQString TraceFunction::info() const
{
TQString l = location();
if (l.isEmpty())
return TQString("Function %1").tqarg(name());
return TQString("Function %1").arg(name());
return TQString("Function %1 (location %2)")
.tqarg(name()).tqarg(l);
.arg(name()).arg(l);
}
@ -3414,7 +3414,7 @@ void TraceFunction::addCaller(TraceCall* caller)
#endif
_callers.append(caller);
tqinvalidate();
invalidate();
#if TRACE_DEBUG
qDebug("%s added Caller\n %s (now %d)",
@ -3435,8 +3435,8 @@ TraceCall* TraceFunction::calling(TraceFunction* called)
_callingMap.insert(called, calling);
_callings.append(calling);
// we have to tqinvalidate ourself so invalidations from item propagate up
tqinvalidate();
// we have to invalidate ourself so invalidations from item propagate up
invalidate();
#if TRACE_DEBUG
qDebug("Created %s [TraceFunction::calling]", calling->fullName().ascii());
@ -3460,8 +3460,8 @@ TraceFunctionSource* TraceFunction::sourceFile(TraceFile* file,
_sourceFiles.append(sourceFile);
// we have to tqinvalidate ourself so invalidations from item propagate up
tqinvalidate();
// we have to invalidate ourself so invalidations from item propagate up
invalidate();
#if TRACE_DEBUG
qDebug("Created SourceFile %s [TraceFunction::line]",
@ -3601,10 +3601,10 @@ void TraceFunction::invalidateDynamicCost()
TraceInstrMap::Iterator iit;
for ( iit = _instrMap->begin();
iit != _instrMap->end(); ++iit )
(*iit).tqinvalidate();
(*iit).invalidate();
}
tqinvalidate();
invalidate();
}
void TraceFunction::update()
@ -3951,7 +3951,7 @@ TraceFunctionCycle::TraceFunctionCycle(TraceFunction* f, int n)
_cycle = this;
setPosition(f->data());
setName(TQString("<cycle %1>").tqarg(n));
setName(TQString("<cycle %1>").arg(n));
// reset to attributes of base function
setFile(_base->file());
@ -3967,7 +3967,7 @@ void TraceFunctionCycle::init()
// this deletes all TraceCall's to members
_callings.clear();
tqinvalidate();
invalidate();
}
void TraceFunctionCycle::add(TraceFunction* f)
@ -3993,13 +3993,13 @@ void TraceFunctionCycle::setup()
// the cycle has a call to each member
call = new TraceCall(this, f);
call->tqinvalidate();
call->invalidate();
_callings.append(call);
// now do some faking...
f->setCycle(this);
}
tqinvalidate();
invalidate();
}
@ -4046,7 +4046,7 @@ void TraceClass::addFunction(TraceFunction* function)
_functions.append(function);
tqinvalidate();
invalidate();
#if TRACE_DEBUG
qDebug("%s added\n %s (now %d)",
@ -4093,7 +4093,7 @@ void TraceFile::addFunction(TraceFunction* function)
_functions.append(function);
tqinvalidate();
invalidate();
#if TRACE_DEBUG
qDebug("%s added\n %s (now %d)",
@ -4114,7 +4114,7 @@ void TraceFile::addSourceFile(TraceFunctionSource* sourceFile)
_sourceFiles.append(sourceFile);
// not truely needed, as we don't use the sourceFiles for cost update
tqinvalidate();
invalidate();
#if TRACE_DEBUG
qDebug("%s \n added SourceFile %s (now %d)",
@ -4211,7 +4211,7 @@ void TraceObject::addFunction(TraceFunction* function)
_functions.append(function);
tqinvalidate();
invalidate();
#if TRACE_DEBUG
qDebug("%s added\n %s (now %d)",
@ -4298,9 +4298,9 @@ TQString TracePart::shortName() const
TQString TracePart::prettyName() const
{
TQString name = TQString("%1.%2").tqarg(_pid).tqarg(_number);
TQString name = TQString("%1.%2").arg(_pid).arg(_number);
if (data()->maxThreadID()>1)
name += TQString("-%3").tqarg(_tid);
name += TQString("-%3").arg(_tid);
return name;
}
@ -4498,7 +4498,7 @@ void TraceData::load(const TQString& base)
if ((str.length() > pos) && (str[pos] == '.')) {
pos++;
while(str.length()>pos) {
if ((int)str.tqat(pos) < '0' || (int)str.tqat(pos) > '9') break;
if ((int)str.at(pos) < '0' || (int)str.at(pos) > '9') break;
n = 10*n + (str[pos++] - '0');
}
}
@ -4508,7 +4508,7 @@ void TraceData::load(const TQString& base)
if ((str.length() > pos) && (str[pos] == '-')) {
pos++;
while(str.length()>pos) {
if ((int)str.tqat(pos) < '0' || (int)str.tqat(pos) > '9') break;
if ((int)str.at(pos) < '0' || (int)str.at(pos) > '9') break;
t = 10*t + (str[pos++] - '0');
}
}
@ -4536,7 +4536,7 @@ void TraceData::load(const TQString& base)
TracePart* TraceData::addPart(const TQString& dir, const TQString& name)
{
TQString filename = TQString("%1/%2").tqarg(dir).tqarg(name);
TQString filename = TQString("%1/%2").arg(dir).arg(name);
#if TRACE_DEBUG
qDebug("TraceData::addPart('%s')", filename.ascii());
#endif
@ -4632,14 +4632,14 @@ TQString TraceData::activePartRange()
else {
if (!res.isEmpty()) res += ";";
if (r1==r2) res += TQString::number(r1);
else res += TQString("%1-%2").tqarg(r1).tqarg(r2);
else res += TQString("%1-%2").arg(r1).arg(r2);
r1 = r2 = count;
}
}
if (r1>=0) {
if (!res.isEmpty()) res += ";";
if (r1==r2) res += TQString::number(r1);
else res += TQString("%1-%2").tqarg(r1).tqarg(r2);
else res += TQString("%1-%2").arg(r1).arg(r2);
}
return res;
@ -4647,22 +4647,22 @@ TQString TraceData::activePartRange()
void TraceData::invalidateDynamicCost()
{
// tqinvalidate all dynamic costs
// invalidate all dynamic costs
TraceObjectMap::Iterator oit;
for ( oit = _objectMap.begin();
oit != _objectMap.end(); ++oit )
(*oit).tqinvalidate();
(*oit).invalidate();
TraceClassMap::Iterator cit;
for ( cit = _classMap.begin();
cit != _classMap.end(); ++cit )
(*cit).tqinvalidate();
(*cit).invalidate();
TraceFileMap::Iterator fit;
for ( fit = _fileMap.begin();
fit != _fileMap.end(); ++fit )
(*fit).tqinvalidate();
(*fit).invalidate();
TraceFunctionMap::Iterator it;
for ( it = _functionMap.begin();
@ -4670,7 +4670,7 @@ void TraceData::invalidateDynamicCost()
(*it).invalidateDynamicCost();
}
tqinvalidate();
invalidate();
}
@ -5043,7 +5043,7 @@ void TraceData::updateFunctionCycles()
cycle->setup();
_inFunctionCycleUpdate = false;
// we have to tqinvalidate costs because cycles are now taken into account
// we have to invalidate costs because cycles are now taken into account
invalidateDynamicCost();
#if 0

12
kcachegrind/kcachegrind/tracedata.h
Unescape View File

@ -307,7 +307,7 @@ public:
* other cost items. If only one item depends on the cost of this item,
* it can by set with setDependant() without a need for overwriting.
*/
virtual void tqinvalidate();
virtual void invalidate();
/**
* Sets a dependant to be invalidated when this cost is invalidated.
@ -388,7 +388,7 @@ public:
void maxCost(int index, SubCost value);
TraceCost diff(TraceCost* item);
virtual void tqinvalidate();
virtual void invalidate();
/** Returns a sub cost. This automatically triggers
* a call to update() if needed.
@ -1549,7 +1549,7 @@ class TraceAssoziation
bool setFunction(TraceFunction*);
TraceFunction* function() { return _function; }
void tqinvalidate() { _valid = false; }
void invalidate() { _valid = false; }
bool isValid() { return _valid; }
/**
@ -1562,7 +1562,7 @@ class TraceAssoziation
* Invalidate all assoziations in TraceFunctions of data with
* rtti runtime info. rtti = 0: Invalidate ALL assoziations.
*/
static void tqinvalidate(TraceData* data, int rtti);
static void invalidate(TraceData* data, int rtti);
protected:
TraceFunction* _function;
@ -1590,7 +1590,7 @@ class TraceFunction: public TraceCostItem
virtual CostType type() const { return Function; }
virtual void update();
// this tqinvalidate all subcosts of function depending on
// this invalidate all subcosts of function depending on
// active status of parts
void invalidateDynamicCost();
@ -1841,7 +1841,7 @@ class TraceData: public TraceCost
void load(const TQString&);
/** returns true if something changed. These do NOT
* tqinvalidate the dynamic costs on a activation change,
* invalidate the dynamic costs on a activation change,
* i.e. all cost items dependend on active parts.
* This has to be done by the caller when true is returned by
* calling invalidateDynamicCost().

2
kcachegrind/kcachegrind/traceitemview.cpp
Unescape View File

@ -178,7 +178,7 @@ void TraceItemView::setData(TraceData* d)
{
_newData = d;
// tqinvalidate all pointers to old data
// invalidate all pointers to old data
_activeItem = _newActiveItem = 0;
_selectedItem = _newSelectedItem = 0;
_costType = _newCostType = 0;

138
kcachegrind/kcachegrind/treemap.cpp
Unescape View File

@ -759,7 +759,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value)
_parent = parent;
_sum = 0;
_tqchildren = 0;
_children = 0;
_widget = 0;
_index = -1;
_depth = -1; // not set
@ -792,7 +792,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value,
setText(0, text1);
_sum = 0;
_tqchildren = 0;
_children = 0;
_widget = 0;
_index = -1;
_depth = -1; // not set
@ -804,7 +804,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value,
TreeMapItem::~TreeMapItem()
{
if (_tqchildren) delete _tqchildren;
if (_children) delete _children;
if (_freeRects) delete _freeRects;
// finally, notify widget about deletion
@ -845,18 +845,18 @@ void TreeMapItem::redraw()
void TreeMapItem::clear()
{
if (_tqchildren) {
if (_children) {
// delete selected items below this item from selection
if (_widget) _widget->clearSelection(this);
delete _tqchildren;
_tqchildren = 0;
delete _children;
_children = 0;
}
}
// invalidates current tqchildren and forces redraw
// this is only usefull when tqchildren are created on demand in items()
// invalidates current children and forces redraw
// this is only usefull when children are created on demand in items()
void TreeMapItem::refresh()
{
clear();
@ -890,9 +890,9 @@ int TreeMapItem::depth() const
bool TreeMapItem::initialized()
{
if (!_tqchildren) {
_tqchildren = new TreeMapItemList;
_tqchildren->setAutoDelete(true);
if (!_children) {
_children = new TreeMapItemList;
_children->setAutoDelete(true);
return false;
}
return true;
@ -902,16 +902,16 @@ void TreeMapItem::addItem(TreeMapItem* i)
{
if (!i) return;
if (!_tqchildren) {
_tqchildren = new TreeMapItemList;
_tqchildren->setAutoDelete(true);
if (!_children) {
_children = new TreeMapItemList;
_children->setAutoDelete(true);
}
i->setParent(this);
if (sorting(0) == -1)
_tqchildren->append(i); // preserve insertion order
_children->append(i); // preserve insertion order
else
_tqchildren->inSort(i);
_children->inSort(i);
}
@ -977,17 +977,17 @@ void TreeMapItem::setSorting(int textNo, bool ascending)
_sortAscending = ascending;
_sortTextNo = textNo;
if (_tqchildren && _sortTextNo != -1) _tqchildren->sort();
if (_children && _sortTextNo != -1) _children->sort();
}
void TreeMapItem::resort(bool recursive)
{
if (!_tqchildren) return;
if (!_children) return;
if (_sortTextNo != -1) _tqchildren->sort();
if (_sortTextNo != -1) _children->sort();
if (recursive)
for (TreeMapItem* i=_tqchildren->first(); i; i=_tqchildren->next())
for (TreeMapItem* i=_children->first(); i; i=_children->next())
i->resort(recursive);
}
@ -1005,13 +1005,13 @@ int TreeMapItem::rtti() const
return 0;
}
TreeMapItemList* TreeMapItem::tqchildren()
TreeMapItemList* TreeMapItem::children()
{
if (!_tqchildren) {
_tqchildren = new TreeMapItemList;
_tqchildren->setAutoDelete(true);
if (!_children) {
_children = new TreeMapItemList;
_children->setAutoDelete(true);
}
return _tqchildren;
return _children;
}
void TreeMapItem::clearItemRect()
@ -1278,7 +1278,7 @@ void TreeMapWidget::setMaxDrawingDepth(int d)
TQString TreeMapWidget::defaultFieldType(int f) const
{
return i18n("Text %1").tqarg(f+1);
return i18n("Text %1").arg(f+1);
}
TQString TreeMapWidget::defaultFieldStop(int) const
@ -1508,7 +1508,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const
if (DEBUG_DRAWING) kdDebug(90100) << "item(" << x << "," << y << "):" << endl;
while (1) {
TreeMapItemList* list = p->tqchildren();
TreeMapItemList* list = p->children();
if (!list)
i = 0;
else {
@ -1572,12 +1572,12 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const
(i->itemRect().height() <1))) {
TreeMapItem* p = i->parent();
if (!p) break;
int idx = p->tqchildren()->findRef(i);
int idx = p->children()->findRef(i);
idx--;
if (idx<0)
i = p;
else
i = p->tqchildren()->at(idx);
i = p->children()->at(idx);
}
}
return i;
@ -1771,7 +1771,7 @@ TreeMapItem* TreeMapWidget::setTmpRangeSelection(TreeMapItem* i1,
i2 = i2->parent();
if (!i2) return changed;
TreeMapItemList* list = commonParent->tqchildren();
TreeMapItemList* list = commonParent->children();
if (!list) return changed;
TreeMapItem* i = list->first();
@ -1794,7 +1794,7 @@ void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e )
{
//kdDebug(90100) << "TreeMapWidget::contextMenuEvent" << endl;
if ( tqreceivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) )
if ( receivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) )
e->accept();
if ( e->reason() == TQContextMenuEvent::Keyboard ) {
@ -1964,12 +1964,12 @@ int nextVisible(TreeMapItem* i)
TreeMapItem* p = i->parent();
if (!p || p->itemRect().isEmpty()) return -1;
int idx = p->tqchildren()->findRef(i);
int idx = p->children()->findRef(i);
if (idx<0) return -1;
while (idx < (int)p->tqchildren()->count()-1) {
while (idx < (int)p->children()->count()-1) {
idx++;
TQRect r = p->tqchildren()->at(idx)->itemRect();
TQRect r = p->children()->at(idx)->itemRect();
if (r.width()>1 && r.height()>1)
return idx;
}
@ -1982,12 +1982,12 @@ int prevVisible(TreeMapItem* i)
TreeMapItem* p = i->parent();
if (!p || p->itemRect().isEmpty()) return -1;
int idx = p->tqchildren()->findRef(i);
int idx = p->children()->findRef(i);
if (idx<0) return -1;
while (idx > 0) {
idx--;
TQRect r = p->tqchildren()->at(idx)->itemRect();
TQRect r = p->children()->at(idx)->itemRect();
if (r.width()>1 && r.height()>1)
return idx;
}
@ -2068,24 +2068,24 @@ void TreeMapWidget::keyPressEvent( TQKeyEvent* e )
int newIdx = goBack ? nextVisible(_current) : prevVisible(_current);
if (p && newIdx>=0) {
p->setIndex(newIdx);
setCurrent(p->tqchildren()->at(newIdx), true);
setCurrent(p->children()->at(newIdx), true);
}
}
else if (e->key() == Key_Right) {
int newIdx = goBack ? prevVisible(_current) : nextVisible(_current);
if (p && newIdx>=0) {
p->setIndex(newIdx);
setCurrent(p->tqchildren()->at(newIdx), true);
setCurrent(p->children()->at(newIdx), true);
}
}
else if (e->key() == Key_Down) {
if (_current->tqchildren() && _current->tqchildren()->count()>0) {
if (_current->children() && _current->children()->count()>0) {
int newIdx = _current->index();
if (newIdx<0)
newIdx = goBack ? (_current->tqchildren()->count()-1) : 0;
if (newIdx>=(int)_current->tqchildren()->count())
newIdx = _current->tqchildren()->count()-1;
newItem = visibleItem(_current->tqchildren()->at(newIdx));
newIdx = goBack ? (_current->children()->count()-1) : 0;
if (newIdx>=(int)_current->children()->count())
newIdx = _current->children()->count()-1;
newItem = visibleItem(_current->children()->at(newIdx));
setCurrent(newItem, true);
}
}
@ -2274,12 +2274,12 @@ void TreeMapWidget::drawItems(TQPainter* p,
TQRect r = TQRect(origRect.x()+bw, origRect.y()+bw,
origRect.width()-2*bw, origRect.height()-2*bw);
TreeMapItemList* list = item->tqchildren();
TreeMapItemList* list = item->children();
TreeMapItem* i;
bool stopDrawing = false;
// only subdivide if there are tqchildren
// only subdivide if there are children
if (!list || list->count()==0)
stopDrawing = true;
@ -2312,7 +2312,7 @@ void TreeMapWidget::drawItems(TQPainter* p,
if (stopDrawing) {
if (list) {
// tqinvalidate rects
// invalidate rects
for (i=list->first();i;i=list->next())
i->clearItemRect();
}
@ -2428,7 +2428,7 @@ void TreeMapWidget::drawItems(TQPainter* p,
r.setRect(r.x(), r.y()+sr.height(), r.width(), r.height()-sr.height());
}
// set selfRect (not occupied by tqchildren) for tooltip
// set selfRect (not occupied by children) for tooltip
item->addFreeRect(sr);
if (0) kdDebug(90100) << "Item " << item->path(0).join("/") << ": SelfR "
@ -2566,7 +2566,7 @@ void TreeMapWidget::drawItems(TQPainter* p,
kdDebug(90100) << "-drawItems(" << item->path(0).join("/") << ")" << endl;
}
// fills area with a pattern if to small to draw tqchildren
// fills area with a pattern if to small to draw children
void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r)
{
p->setBrush(TQt::Dense4Pattern);
@ -2575,7 +2575,7 @@ void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r)
i->addFreeRect(r);
}
// fills area with a pattern if to small to draw tqchildren
// fills area with a pattern if to small to draw children
void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r,
TreeMapItemListIterator it, int len, bool goBack)
{
@ -2874,10 +2874,10 @@ void TreeMapWidget::addVisualizationItems(TQPopupMenu* popup, int id)
popup->insertItem(i18n("Border"), bpopup, id+1);
bpopup->insertItem(i18n("Correct Borders Only"), id+2);
bpopup->insertSeparator();
bpopup->insertItem(i18n("Width %1").tqarg(0), id+3);
bpopup->insertItem(i18n("Width %1").tqarg(1), id+4);
bpopup->insertItem(i18n("Width %1").tqarg(2), id+5);
bpopup->insertItem(i18n("Width %1").tqarg(3), id+6);
bpopup->insertItem(i18n("Width %1").arg(0), id+3);
bpopup->insertItem(i18n("Width %1").arg(1), id+4);
bpopup->insertItem(i18n("Width %1").arg(2), id+5);
bpopup->insertItem(i18n("Width %1").arg(3), id+6);
bpopup->setItemChecked(id+2, skipIncorrectBorder());
bpopup->setItemChecked(id+3, borderWidth()==0);
bpopup->setItemChecked(id+4, borderWidth()==1);
@ -2984,7 +2984,7 @@ void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup,
connect(popup, TQT_SIGNAL(activated(int)),
this, TQT_SLOT(fieldStopActivated(int)));
popup->insertItem(i18n("No %1 Limit").tqarg(fieldType(0)), id);
popup->insertItem(i18n("No %1 Limit").arg(fieldType(0)), id);
popup->setItemChecked(id, fieldStop(0).isEmpty());
_menuItem = i;
bool foundFieldStop = false;
@ -3043,7 +3043,7 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup,
int area = i->width() * i->height();
popup->insertSeparator();
popup->insertItem(i18n("Area of '%1' (%2)")
.tqarg(i->text(0)).tqarg(area), id+1);
.arg(i->text(0)).arg(area), id+1);
if (area == minimalArea()) {
popup->setItemChecked(id+1, true);
foundArea = true;
@ -3069,9 +3069,9 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup,
}
popup->insertItem(i18n("Double Area Limit (to %1)")
.tqarg(minimalArea()*2), id+5);
.arg(minimalArea()*2), id+5);
popup->insertItem(i18n("Halve Area Limit (to %1)")
.tqarg(minimalArea()/2), id+6);
.arg(minimalArea()/2), id+6);
}
}
@ -3105,7 +3105,7 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup,
int d = i->depth();
popup->insertSeparator();
popup->insertItem(i18n("Depth of '%1' (%2)")
.tqarg(i->text(0)).tqarg(d), id+1);
.arg(i->text(0)).arg(d), id+1);
if (d == maxDrawingDepth()) {
popup->setItemChecked(id+1, true);
foundDepth = true;
@ -3115,14 +3115,14 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup,
if (maxDrawingDepth()>1) {
popup->insertSeparator();
if (!foundDepth) {
popup->insertItem(i18n("Depth %1").tqarg(maxDrawingDepth()), id+10);
popup->insertItem(i18n("Depth %1").arg(maxDrawingDepth()), id+10);
popup->setItemChecked(id+10, true);
}
popup->insertItem(i18n("Decrement (to %1)")
.tqarg(maxDrawingDepth()-1), id+2);
.arg(maxDrawingDepth()-1), id+2);
popup->insertItem(i18n("Increment (to %1)")
.tqarg(maxDrawingDepth()+1), id+3);
.arg(maxDrawingDepth()+1), id+3);
}
}
@ -3145,13 +3145,13 @@ void TreeMapWidget::saveOptions(KConfigGroup* config, TQString prefix)
int f, fCount = _attr.size();
config->writeEntry(prefix+"FieldCount", fCount);
for (f=0;f<fCount;f++) {
config->writeEntry(TQString(prefix+"FieldVisible%1").tqarg(f),
config->writeEntry(TQString(prefix+"FieldVisible%1").arg(f),
_attr[f].visible);
config->writeEntry(TQString(prefix+"FieldForced%1").tqarg(f),
config->writeEntry(TQString(prefix+"FieldForced%1").arg(f),
_attr[f].forced);
config->writeEntry(TQString(prefix+"FieldStop%1").tqarg(f),
config->writeEntry(TQString(prefix+"FieldStop%1").arg(f),
_attr[f].stop);
config->writeEntry(TQString(prefix+"FieldPosition%1").tqarg(f),
config->writeEntry(TQString(prefix+"FieldPosition%1").arg(f),
fieldPositionString(f));
}
}
@ -3195,18 +3195,18 @@ void TreeMapWidget::restoreOptions(KConfigGroup* config, TQString prefix)
int f;
for (f=0;f<num;f++) {
str = TQString(prefix+"FieldVisible%1").tqarg(f);
str = TQString(prefix+"FieldVisible%1").arg(f);
if (config->hasKey(str))
setFieldVisible(f, config->readBoolEntry(str));
str = TQString(prefix+"FieldForced%1").tqarg(f);
str = TQString(prefix+"FieldForced%1").arg(f);
if (config->hasKey(str))
setFieldForced(f, config->readBoolEntry(str));
str = config->readEntry(TQString(prefix+"FieldStop%1").tqarg(f));
str = config->readEntry(TQString(prefix+"FieldStop%1").arg(f));
setFieldStop(f, str);
str = config->readEntry(TQString(prefix+"FieldPosition%1").tqarg(f));
str = config->readEntry(TQString(prefix+"FieldPosition%1").arg(f));
if (!str.isEmpty()) setFieldPosition(f, str);
}
}

24
kcachegrind/kcachegrind/treemap.h
Unescape View File

@ -222,7 +222,7 @@ typedef TQPtrListIterator<TreeMapItem> TreeMapItemListIterator;
*
* If you want more flexibility, reimplement TreeMapItem and
* override the corresponding methods. For dynamic creation of child
* items on demand, reimplement tqchildren().
* items on demand, reimplement children().
*/
class TreeMapItem: public StoredDrawParams
{
@ -257,7 +257,7 @@ public:
// force a redraw of this item
void redraw();
// delete all tqchildren
// delete all children
void clear();
// force new child generation & refresh
@ -350,7 +350,7 @@ public:
* For value() sorting, use <textNo> = -2
*
* For fast sorting, set this to -1 before child insertions and call
* again after inserting all tqchildren.
* again after inserting all children.
*/
void setSorting(int textNo, bool ascending = true);
@ -358,18 +358,18 @@ public:
* Resort according to the already set sorting.
*
* This has to be done if the sorting base changes (e.g. text or values
* change). If this is only true for the tqchildren of this item, you can
* change). If this is only true for the children of this item, you can
* set the recursive parameter to false.
*/
void resort(bool recursive = true);
virtual SplitMode splitMode() const;
virtual int rtti() const;
// not const as this can create tqchildren on demand
virtual TreeMapItemList* tqchildren();
// not const as this can create children on demand
virtual TreeMapItemList* children();
protected:
TreeMapItemList* _tqchildren;
TreeMapItemList* _children;
double _sum, _value;
private:
@ -444,7 +444,7 @@ public:
/**
* Selects or unselects an item.
* In multiselection mode, the constrain that a selected item
* has no selected tqchildren or parents stays true.
* has no selected children or parents stays true.
*/
void setSelected(TreeMapItem*, bool selected = true);
@ -460,7 +460,7 @@ public:
void setMarked(int markNo = 1, bool redraw = true);
/**
* Clear selection of all selected items which are tqchildren of
* Clear selection of all selected items which are children of
* parent. When parent == 0, clears whole selection
* Returns true if selection changed.
*/
@ -472,7 +472,7 @@ public:
* Range means for a hierarchical widget:
* - select/unselect i1 and i2 according selected
* - search common parent of i1 and i2, and select/unselect the
* range of direct tqchildren between but excluding the child
* range of direct children between but excluding the child
* leading to i1 and the child leading to i2.
*/
void setRangeSelection(TreeMapItem* i1,
@ -532,7 +532,7 @@ public:
void setVisibleWidth(int width, bool reuseSpace = false);
/**
* If a tqchildren value() is almost the parents sum(),
* If a children value() is almost the parents sum(),
* it can happen that the border to be drawn for visibilty of
* nesting relations takes to much space, and the
* parent/child size relation can not be mapped to a correct
@ -644,7 +644,7 @@ public:
virtual TQString tipString(TreeMapItem* i) const;
/**
* Redraws an item with all tqchildren.
* Redraws an item with all children.
* This takes changed values(), sums(), colors() and text() into account.
*/
void redraw(TreeMapItem*);

2
kioslave/svn/ksvnd/ksvnd.cpp
Unescape View File

@ -214,7 +214,7 @@ int KSvnd::getStatus( const KURL::List& list ) {
external++;
}
}
if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //tqparent has a .svn ?
if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //parent has a .svn ?
parentshavesvn++;
}
if ( files > 0 )

2
kioslave/svn/ksvnd/ksvnd.h
Unescape View File

@ -32,7 +32,7 @@ class KSvnd : public KDEDModule
// TQ_OBJECT
K_DCOP
//note: InSVN means tqparent is added. InRepos means itself is added
//note: InSVN means parent is added. InRepos means itself is added
enum { SomeAreFiles = 1, SomeAreFolders = 2, SomeAreInParentsEntries = 4, SomeParentsHaveSvn = 8, SomeHaveSvn = 16, SomeAreExternalToParent = 32, AllAreInParentsEntries = 64, AllParentsHaveSvn = 128, AllHaveSvn = 256, AllAreExternalToParent = 512, AllAreFolders = 1024 };
public:
KSvnd(const TQCString &);

58
kioslave/svn/svn.cpp
Unescape View File

@ -232,7 +232,7 @@ void kio_svnProtocol::get(const KURL& url ){
kdDebug(7128) << "kio_svn::get(const KURL& url)" << endl ;
TQString remoteServer = url.host();
infoMessage(i18n("Looking for %1...").tqarg( remoteServer ) );
infoMessage(i18n("Looking for %1...").arg( remoteServer ) );
apr_pool_t *subpool = svn_pool_create (pool);
kbaton *bt = (kbaton*)apr_pcalloc(subpool, sizeof(*bt));
@ -1087,7 +1087,7 @@ void kio_svnProtocol::commit(const KURL::List& wc) {
TQString userstring = i18n ( "Nothing to commit." );
if ( SVN_IS_VALID_REVNUM( commit_info->revision ) )
userstring = i18n( "Committed revision %1." ).tqarg(commit_info->revision);
userstring = i18n( "Committed revision %1." ).arg(commit_info->revision);
setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "path", nurl.path() );
setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "action", "0" );
setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "kind", "0" );
@ -1349,41 +1349,41 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
switch ( action ) {
case svn_wc_notify_add : //add
if (mime_type && (svn_mime_type_is_binary (mime_type)))
userstring = i18n( "A (bin) %1" ).tqarg( path );
userstring = i18n( "A (bin) %1" ).arg( path );
else
userstring = i18n( "A %1" ).tqarg( path );
userstring = i18n( "A %1" ).arg( path );
break;
case svn_wc_notify_copy: //copy
break;
case svn_wc_notify_delete: //delete
nb->received_some_change = TRUE;
userstring = i18n( "D %1" ).tqarg( path );
userstring = i18n( "D %1" ).arg( path );
break;
case svn_wc_notify_restore : //restore
userstring=i18n( "Restored %1." ).tqarg( path );
userstring=i18n( "Restored %1." ).arg( path );
break;
case svn_wc_notify_revert : //revert
userstring=i18n( "Reverted %1." ).tqarg( path );
userstring=i18n( "Reverted %1." ).arg( path );
break;
case svn_wc_notify_failed_revert: //failed revert
userstring=i18n( "Failed to revert %1.\nTry updating instead." ).tqarg( path );
userstring=i18n( "Failed to revert %1.\nTry updating instead." ).arg( path );
break;
case svn_wc_notify_resolved: //resolved
userstring=i18n( "Resolved conflicted state of %1." ).tqarg( path );
userstring=i18n( "Resolved conflicted state of %1." ).arg( path );
break;
case svn_wc_notify_skip: //skip
if ( content_state == svn_wc_notify_state_missing )
userstring=i18n("Skipped missing target %1.").tqarg( path );
userstring=i18n("Skipped missing target %1.").arg( path );
else
userstring=i18n("Skipped %1.").tqarg( path );
userstring=i18n("Skipped %1.").arg( path );
break;
case svn_wc_notify_update_delete: //update_delete
nb->received_some_change = TRUE;
userstring=i18n( "D %1" ).tqarg( path );
userstring=i18n( "D %1" ).arg( path );
break;
case svn_wc_notify_update_add: //update_add
nb->received_some_change = TRUE;
userstring=i18n( "A %1" ).tqarg( path );
userstring=i18n( "A %1" ).arg( path );
break;
case svn_wc_notify_update_update: //update_update
{
@ -1428,25 +1428,25 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
if (SVN_IS_VALID_REVNUM (revision)) {
if (nb->is_export) {
if ( nb->in_external )
userstring = i18n("Exported external at revision %1.").tqarg( revision );
userstring = i18n("Exported external at revision %1.").arg( revision );
else
userstring = i18n("Exported revision %1.").tqarg( revision );
userstring = i18n("Exported revision %1.").arg( revision );
} else if (nb->is_checkout) {
if ( nb->in_external )
userstring = i18n("Checked out external at revision %1.").tqarg( revision );
userstring = i18n("Checked out external at revision %1.").arg( revision );
else
userstring = i18n("Checked out revision %1.").tqarg( revision);
userstring = i18n("Checked out revision %1.").arg( revision);
} else {
if (nb->received_some_change) {
if ( nb->in_external )
userstring=i18n("Updated external to revision %1.").tqarg( revision );
userstring=i18n("Updated external to revision %1.").arg( revision );
else
userstring = i18n("Updated to revision %1.").tqarg( revision);
userstring = i18n("Updated to revision %1.").arg( revision);
} else {
if ( nb->in_external )
userstring = i18n("External at revision %1.").tqarg( revision );
userstring = i18n("External at revision %1.").arg( revision );
else
userstring = i18n("At revision %1.").tqarg( revision);
userstring = i18n("At revision %1.").arg( revision);
}
}
} else /* no revision */ {
@ -1474,30 +1474,30 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
break;
case svn_wc_notify_update_external: //update_external
nb->in_external = TRUE;
userstring = i18n("Fetching external item into %1." ).tqarg( path );
userstring = i18n("Fetching external item into %1." ).arg( path );
break;
case svn_wc_notify_status_completed: //status_completed
if (SVN_IS_VALID_REVNUM (revision))
userstring = i18n( "Status against revision: %1.").tqarg( revision );
userstring = i18n( "Status against revision: %1.").arg( revision );
break;
case svn_wc_notify_status_external: //status_external
userstring = i18n("Performing status on external item at %1.").tqarg( path );
userstring = i18n("Performing status on external item at %1.").arg( path );
break;
case svn_wc_notify_commit_modified: //commit_modified
userstring = i18n( "Sending %1").tqarg( path );
userstring = i18n( "Sending %1").arg( path );
break;
case svn_wc_notify_commit_added: //commit_added
if (mime_type && svn_mime_type_is_binary (mime_type)) {
userstring = i18n( "Adding (bin) %1.").tqarg( path );
userstring = i18n( "Adding (bin) %1.").arg( path );
} else {
userstring = i18n( "Adding %1.").tqarg( path );
userstring = i18n( "Adding %1.").arg( path );
}
break;
case svn_wc_notify_commit_deleted: //commit_deleted
userstring = i18n( "Deleting %1.").tqarg( path );
userstring = i18n( "Deleting %1.").arg( path );
break;
case svn_wc_notify_commit_replaced: //commit_replaced
userstring = i18n( "Replacing %1.").tqarg( path );
userstring = i18n( "Replacing %1.").arg( path );
break;
case svn_wc_notify_commit_postfix_txdelta: //commit_postfix_txdelta
if (! nb->sent_first_txdelta) {

4
kompare/kompare_shell.cpp
Unescape View File

@ -269,13 +269,13 @@ void KompareShell::slotUpdateStatusBar( int modelIndex, int differenceIndex, int
TQString diffStr;
if ( modelIndex >= 0 )
fileStr = i18n( " %1 of %n file ", " %1 of %n files ", modelCount ).tqarg( modelIndex + 1 );
fileStr = i18n( " %1 of %n file ", " %1 of %n files ", modelCount ).arg( modelIndex + 1 );
else
fileStr = i18n( " %n file ", " %n files ", modelCount );
if ( differenceIndex >= 0 )
diffStr = i18n( " %1 of %n difference, %2 applied ", " %1 of %n differences, %2 applied ", differenceCount )
.tqarg( differenceIndex + 1 ).tqarg( appliedCount );
.arg( differenceIndex + 1 ).arg( appliedCount );
else
diffStr = i18n( " %n difference ", " %n differences ", differenceCount );

2
kompare/komparenavtreepart/komparenavtreepart.cpp
Unescape View File

@ -582,7 +582,7 @@ KDirLVI* KDirLVI::findChild( TQString dir )
// kdDebug(8105) << "KDirLVI::findChild called with dir = " << dir << endl;
KDirLVI* child;
if ( ( child = static_cast<KDirLVI*>(this->firstChild()) ) != 0L )
{ // has tqchildren, check if dir already exists, if so addModel
{ // has children, check if dir already exists, if so addModel
do {
if ( dir == child->dirName() )
return child;

30
kompare/komparepart/kompare_part.cpp
Unescape View File

@ -266,7 +266,7 @@ const TQString KomparePart::fetchURL( const KURL& url )
{
if ( ! KIO::NetAccess::download( url, tempFileName, widget() ) )
{
slotShowError( i18n( "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" ).tqarg( url.prettyURL() ) );
slotShowError( i18n( "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" ).arg( url.prettyURL() ) );
tempFileName = "";
}
return tempFileName;
@ -278,7 +278,7 @@ const TQString KomparePart::fetchURL( const KURL& url )
return url.path();
else
{
slotShowError( i18n( "<qt>The URL <b>%1</b> does not exist on your system.</qt>" ).tqarg( url.prettyURL() ) );
slotShowError( i18n( "<qt>The URL <b>%1</b> does not exist on your system.</qt>" ).arg( url.prettyURL() ) );
return tempFileName;
}
}
@ -543,26 +543,26 @@ void KomparePart::updateStatus()
{
case Kompare::ComparingFiles :
text = i18n( "Comparing file %1 with file %2" )
.tqarg( source )
.tqarg( destination );
.arg( source )
.arg( destination );
break;
case Kompare::ComparingDirs :
text = i18n( "Comparing files in %1 with files in %2" )
.tqarg( source )
.tqarg( destination );
.arg( source )
.arg( destination );
break;
case Kompare::ShowingDiff :
text = i18n( "Viewing diff output from %1" ).tqarg( source );
text = i18n( "Viewing diff output from %1" ).arg( source );
break;
case Kompare::BlendingFile :
text = i18n( "Blending diff output from %1 into file %2" )
.tqarg( source )
.tqarg( destination );
.arg( source )
.arg( destination );
break;
case Kompare::BlendingDir :
text = i18n( "Blending diff output from %1 into folder %2" )
.tqarg( m_info.source.prettyURL() )
.tqarg( m_info.destination.prettyURL() );
.arg( m_info.source.prettyURL() )
.arg( m_info.destination.prettyURL() );
break;
default:
break;
@ -678,8 +678,8 @@ void KomparePart::slotShowDiffstats( void )
"Format: %3\n"
"Number of hunks: %4\n"
"Number of differences: %5")
.tqarg(oldFile).tqarg(newFile).tqarg(diffFormat)
.tqarg(noOfHunks).tqarg(noOfDiffs),
.arg(oldFile).arg(newFile).arg(diffFormat)
.arg(noOfHunks).arg(noOfDiffs),
i18n("Diff Statistics"), TQString(), false );
} else { // more than 1 file in diff, or 2 directories compared
KMessageBox::information( 0L, i18n(
@ -693,8 +693,8 @@ void KomparePart::slotShowDiffstats( void )
"\n"
"Number of hunks: %5\n"
"Number of differences: %6")
.tqarg(filesInDiff).tqarg(diffFormat).tqarg(oldFile)
.tqarg(newFile).tqarg(noOfHunks).tqarg(noOfDiffs),
.arg(filesInDiff).arg(diffFormat).arg(oldFile)
.arg(newFile).arg(noOfHunks).arg(noOfDiffs),
i18n("Diff Statistics"), TQString(), false );
}
}

2
kompare/komparepart/kompareconnectwidget.cpp
Unescape View File

@ -139,7 +139,7 @@ void KompareConnectWidget::slotSetSelection( const DiffModel* model, const Diffe
void KompareConnectWidget::slotDelayedRepaint()
{
TQTimer::singleShot( 0, this, TQT_SLOT( tqrepaint() ) );
TQTimer::singleShot( 0, this, TQT_SLOT( repaint() ) );
}
void KompareConnectWidget::slotSetSelection( const Difference* diff )

6
kompare/komparepart/komparelistview.cpp
Unescape View File

@ -390,7 +390,7 @@ void KompareListView::slotApplyAllDifferences( bool apply )
TQPtrDictIterator<KompareListViewDiffItem> it ( m_itemDict );
for( ; it.current(); ++it )
it.current()->applyDifference( apply );
tqrepaint();
repaint();
}
void KompareListView::slotApplyDifference( const Difference* diff, bool apply )
@ -500,7 +500,7 @@ void KompareListViewDiffItem::applyDifference( bool apply )
kdDebug(8104) << "KompareListViewDiffItem::applyDifference( " << apply << " )" << endl;
setVisibility();
setup();
tqrepaint();
repaint();
}
int KompareListViewDiffItem::maxHeight()
@ -520,7 +520,7 @@ void KompareListViewDiffItem::setSelected( bool b )
m_sourceItem->firstChild() :
m_destItem->firstChild();
while( item && item->isVisible() ) {
item->tqrepaint();
item->repaint();
item = item->nextSibling();
}
}

2
kompare/komparepart/komparesaveoptionsbase.ui
Unescape View File

@ -83,7 +83,7 @@
<property name="title">
<string>Command Line</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="hAlign" stdset="0">

4
kompare/komparepart/komparesplitter.cpp
Unescape View File

@ -212,7 +212,7 @@ static TQPoint bottomRight( TQWidget *w )
if ( isCollapsed(w) ) {
return toggle( w, w->pos() ) - TQPoint( 1, 1 );
} else {
return w->tqgeometry().bottomRight();
return w->geometry().bottomRight();
}
}
@ -396,7 +396,7 @@ void KompareSplitter::repaintHandles()
TQSplitterLayoutStruct *curr;
for ( curr = d->list.first(); curr; curr = d->list.next() )
if ( curr->isHandle )
((KompareConnectWidgetFrame*)curr->wid)->wid()->tqrepaint();
((KompareConnectWidgetFrame*)curr->wid)->wid()->repaint();
}
// Scrolling stuff

2
kompare/libdialogpages/pagebase.cpp
Unescape View File

@ -37,7 +37,7 @@ TQSize PageBase::sizeHintForWidget( 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()
//

8
kompare/libdiff2/diffhunk.cpp
Unescape View File

@ -98,10 +98,10 @@ TQString DiffHunk::recreateHunk() const
// recreate header
hunk += TQString::fromLatin1( "@@ -%1,%3 +%2,%4 @@" )
.tqarg( m_sourceLine )
.tqarg( m_destinationLine )
.tqarg( slc )
.tqarg( dlc );
.arg( m_sourceLine )
.arg( m_destinationLine )
.arg( slc )
.arg( dlc );
if ( !m_function.isEmpty() )
hunk += " " + m_function;

4
kompare/libdiff2/diffmodel.cpp
Unescape View File

@ -154,11 +154,11 @@ TQString DiffModel::recreateDiff() const
// recreate header
TQString tab = TQString::fromLatin1( "\t" );
TQString nl = TQString::fromLatin1( "\n" );
diff += TQString::fromLatin1( "--- %1\t%2" ).tqarg( m_source ).tqarg( m_sourceTimestamp );
diff += TQString::fromLatin1( "--- %1\t%2" ).arg( m_source ).arg( m_sourceTimestamp );
if ( !m_sourceRevision.isEmpty() )
diff += tab + m_sourceRevision;
diff += nl;
diff += TQString::fromLatin1( "+++ %1\t%2" ).tqarg( m_destination ).tqarg( m_destinationTimestamp );
diff += TQString::fromLatin1( "+++ %1\t%2" ).arg( m_destination ).arg( m_destinationTimestamp );
if ( !m_destinationRevision.isEmpty() )
diff += tab + m_destinationRevision;
diff += nl;

12
kompare/libdiff2/komparemodellist.cpp
Unescape View File

@ -235,7 +235,7 @@ bool KompareModelList::openFileAndDiff( const TQString& file, const TQString& di
if ( parseDiffOutput( readFile( diff ) ) != 0 )
{
emit error( i18n( "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff file.</qt>" ).tqarg( diff ) );
emit error( i18n( "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff file.</qt>" ).arg( diff ) );
return false;
}
@ -243,7 +243,7 @@ bool KompareModelList::openFileAndDiff( const TQString& file, const TQString& di
if ( !blendOriginalIntoModelList( file ) )
{
kdDebug(8101) << "Oops cant blend original file into modellist : " << file << endl;
emit( i18n( "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>" ).tqarg( diff ).tqarg( file ) );
emit( i18n( "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>" ).arg( diff ).arg( file ) );
return false;
}
@ -259,7 +259,7 @@ bool KompareModelList::openDirAndDiff( const TQString& dir, const TQString& diff
if ( parseDiffOutput( readFile( diff ) ) != 0 )
{
emit error( i18n( "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff file.</qt>" ).tqarg( diff ) );
emit error( i18n( "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff file.</qt>" ).arg( diff ) );
return false;
}
@ -268,7 +268,7 @@ bool KompareModelList::openDirAndDiff( const TQString& dir, const TQString& diff
{
// Trouble blending the original into the model
kdDebug(8101) << "Oops cant blend original dir into modellist : " << dir << endl;
emit error( i18n( "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>.</qt>" ).tqarg( diff ).tqarg( dir ) );
emit error( i18n( "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>.</qt>" ).arg( diff ).arg( dir ) );
return false;
}
@ -347,7 +347,7 @@ bool KompareModelList::saveDestination( DiffModel* model )
temp->close();
if( temp->status() != 0 ) {
emit error( i18n( "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" ).tqarg( temp->name() ) );
emit error( i18n( "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" ).arg( temp->name() ) );
temp->unlink();
delete temp;
return false;
@ -380,7 +380,7 @@ bool KompareModelList::saveDestination( DiffModel* model )
if ( !result )
{
emit error( i18n( "<qt>Could not upload the temporary file to the destination location <b>%1</b>. The temporary file is still available under: <b>%2</b>. You can manually copy it to the right place.</qt>" ).tqarg( m_destination ).tqarg( temp->name() ) );
emit error( i18n( "<qt>Could not upload the temporary file to the destination location <b>%1</b>. The temporary file is still available under: <b>%2</b>. You can manually copy it to the right place.</qt>" ).arg( m_destination ).arg( temp->name() ) );
}
else
{

40
kspy/propsview.cpp
Unescape View File

@ -35,15 +35,15 @@ public:
}
protected:
void paintCell( TQPainter * p, const TQColorGroup & cg,
int column, int width, int tqalignment )
int column, int width, int alignment )
{
if (column == 1 && text(2) == "TQColor") {
TQColorGroup color_cg( cg.foreground(), cg.background(),
cg.light(), cg.dark(), cg.mid(),
TQColor(text(1)), TQColor(text(1)) );
TQListViewItem::paintCell(p, color_cg, column, width, tqalignment);
TQListViewItem::paintCell(p, color_cg, column, width, alignment);
} else {
KListViewItem::paintCell(p, cg, column, width, tqalignment);
KListViewItem::paintCell(p, cg, column, width, alignment);
}
}
};
@ -95,20 +95,20 @@ void PropsView::buildList( TQObject *o )
case TQVariant::Cursor:
{
TQCursor c = v.toCursor();
val = TQString("tqshape=%1").tqarg(c.tqshape());
val = TQString("shape=%1").arg(c.shape());
break;
}
case TQVariant::Font:
{
TQFont f = v.toFont();
val = TQString("family=%1, pointSize=%2, weight=%3, italic=%4, bold=%5, underline=%6, strikeOut=%7")
.tqarg(f.family())
.tqarg(f.pointSize())
.tqarg(f.weight())
.tqarg(f.italic())
.tqarg(f.bold())
.tqarg(f.underline())
.tqarg(f.strikeOut());
.arg(f.family())
.arg(f.pointSize())
.arg(f.weight())
.arg(f.italic())
.arg(f.bold())
.arg(f.underline())
.arg(f.strikeOut());
break;
}
case TQVariant::Int:
@ -116,39 +116,39 @@ void PropsView::buildList( TQObject *o )
if (mp->isEnumType()) {
#ifdef USE_QT4
// TQMetaObject * metaObject = *(mp->meta); // FIXME
val = TQString("%1::%2").tqarg("QT4_CANNOT_FIND_TQMETAOBJECT_FOR_TQMETAPROPERTY").tqarg(mp->valueToKey(val.toInt())); // FIXME
val = TQString("%1::%2").arg("QT4_CANNOT_FIND_TQMETAOBJECT_FOR_TQMETAPROPERTY").arg(mp->valueToKey(val.toInt())); // FIXME
#else // USE_QT4
TQMetaObject * metaObject = *(mp->meta);
val = TQString("%1::%2").tqarg(metaObject->className()).tqarg(mp->valueToKey(val.toInt()));
val = TQString("%1::%2").arg(metaObject->className()).arg(mp->valueToKey(val.toInt()));
#endif // USE_QT4
}
break;
case TQVariant::Point:
{
TQPoint p = v.toPoint();
val = TQString("x=%1, y=%2").tqarg(p.x()).tqarg(p.y());
val = TQString("x=%1, y=%2").arg(p.x()).arg(p.y());
break;
}
case TQVariant::Rect:
{
TQRect r = v.toRect();
val = TQString("left=%1, right=%2, top=%3, bottom=%4")
.tqarg(r.left())
.tqarg(r.right())
.tqarg(r.top())
.tqarg(r.bottom());
.arg(r.left())
.arg(r.right())
.arg(r.top())
.arg(r.bottom());
break;
}
case TQVariant::Size:
{
TQSize s = v.toSize();
val = TQString("width=%1, height=%2").tqarg(s.width()).tqarg(s.height());
val = TQString("width=%1, height=%2").arg(s.width()).arg(s.height());
break;
}
case TQVariant::SizePolicy:
{
TQSizePolicy s = v.toSizePolicy();
val = TQString("horData=%1, verData=%2").tqarg(s.horData()).tqarg(s.verData());
val = TQString("horData=%1, verData=%2").arg(s.horData()).arg(s.verData());
break;
}
case TQVariant::Double:

6
kspy/receiversview.cpp
Unescape View File

@ -1,5 +1,5 @@
/***************************************************************************
tqreceiversview.cpp - description
receiversview.cpp - description
-------------------
begin : Tue Jan 11 2005
copyright : (C) 2005 by Richard Dale
@ -28,7 +28,7 @@
class UnencapsulatedTQObject : public TQObject {
public:
TQConnectionList *public_tqreceivers(int signal) const { return tqreceivers(signal); }
TQConnectionList *public_receivers(int signal) const { return receivers(signal); }
};
ReceiversView::ReceiversView(TQWidget *parent, const char *name ) : KListView(parent,name)
@ -54,7 +54,7 @@ void ReceiversView::buildList( TQObject *o )
TQStrList signalNames = mo->signalNames(true);
for (int sig = 0; sig < mo->numSignals(true); sig++) {
TQConnectionList * clist = qobject->public_tqreceivers(sig);
TQConnectionList * clist = qobject->public_receivers(sig);
if (clist != 0) {
KListViewItem *conn = new KListViewItem( this, signalNames.at(sig) );

2
kspy/receiversview.h
Unescape View File

@ -1,5 +1,5 @@
/***************************************************************************
tqreceiversview.h - description
receiversview.h - description
-------------------
begin : Tue Jan 11 2005
copyright : (C) 2005 by Richard Dale

2
kspy/spy.cpp
Unescape View File

@ -66,7 +66,7 @@ Spy::Spy( TQWidget *parent, const char *name )
mSigSlotView = new SigSlotView( tabs, "signals and slots view" );
tabs->addTab( mSigSlotView, i18n( "Signals && Slots" ) );
mReceiversView = new ReceiversView( tabs, "tqreceivers view" );
mReceiversView = new ReceiversView( tabs, "receivers view" );
tabs->addTab( mReceiversView, i18n( "Receivers" ) );
mClassInfoView = new ClassInfoView( tabs, "class info view" );

2
kuiviewer/kuiviewer.cpp
Unescape View File

@ -153,7 +153,7 @@ void KUIViewer::takeScreenshot(const TQCString &filename, int w, int h){
// resize widget to the desired size
m_part->widget()->setMinimumSize(w, h);
m_part->widget()->setMaximumSize(w, h);
m_part->widget()->tqrepaint();
m_part->widget()->repaint();
// resize app to be as large as desired size
adjustSize();
// Disable the saving of the size

12
kunittest/runnergui.cpp
Unescape View File

@ -162,13 +162,13 @@ namespace KUnitTest
if ( Runner::self()->numberOfTests() > 0 )
m_testerWidget->resultsLabel()->setText(
TQString("Test cases: %1 | Tests performed: %5, Skipped: <font color=\"#f7a300\">%4</font> | Passed: <font color=\"#009900\">%2</font>, Failed: <font color=\"#990000\">%3</font>")
.tqarg(Runner::self()->numberOfTestCases())
.tqarg(Runner::self()->numberOfPassedTests())
.tqarg(Runner::self()->numberOfFailedTests())
.tqarg(Runner::self()->numberOfSkippedTests())
.tqarg(Runner::self()->numberOfTests()) );
.arg(Runner::self()->numberOfTestCases())
.arg(Runner::self()->numberOfPassedTests())
.arg(Runner::self()->numberOfFailedTests())
.arg(Runner::self()->numberOfSkippedTests())
.arg(Runner::self()->numberOfTests()) );
else
m_testerWidget->resultsLabel()->setText(TQString("Test cases: %1").tqarg(Runner::self()->numberOfTestCases()));
m_testerWidget->resultsLabel()->setText(TQString("Test cases: %1").arg(Runner::self()->numberOfTestCases()));
}
void RunnerGUI::addTestResult(const char *name, Tester *test)

2
poxml/antlr/antlr/AST.hpp
Unescape View File

@ -59,7 +59,7 @@ public:
virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAll(RefAST t)=0;
virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAllPartial(RefAST t)=0;
/** Get the first child of this node; null if no tqchildren */
/** Get the first child of this node; null if no children */
virtual RefAST getFirstChild() const=0;
/** Get the next sibling in line after this one */
virtual RefAST getNextSibling() const=0;

2
poxml/antlr/antlr/ASTFactory.hpp
Unescape View File

@ -90,7 +90,7 @@ public:
RefAST dupTree(RefAST t);
/** Make a tree from a list of nodes. The first element in the
* array is the root. If the root is null, then the tree is
* a simple list not a tree. Handles null tqchildren nodes correctly.
* a simple list not a tree. Handles null children nodes correctly.
* For example, build(a, b, null, c) yields tree (a b c). build(null,a,b)
* yields tree (nil a b).
*/

4
poxml/antlr/antlr/BaseAST.hpp
Unescape View File

@ -70,7 +70,7 @@ public:
virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAll(RefAST t);
virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAllPartial(RefAST t);
/** Get the first child of this node; null if no tqchildren */
/** Get the first child of this node; null if no children */
virtual RefAST getFirstChild() const;
/** Get the next sibling in line after this one */
virtual RefAST getNextSibling() const;
@ -80,7 +80,7 @@ public:
/** Get the token type for this node */
virtual int getType() const;
/** Remove all tqchildren */
/** Remove all children */
virtual void removeChildren();
/** Set the first child of a node. */

6
poxml/antlr/src/ASTFactory.cpp
Unescape View File

@ -144,7 +144,7 @@ RefAST ASTFactory::dupList(RefAST t)
RefAST ASTFactory::dupTree(RefAST t)
{
RefAST result = dup(t); // make copy of root
// copy all tqchildren of root.
// copy all children of root.
if (t) {
result->setFirstChild( dupList(t->getFirstChild()) );
}
@ -152,7 +152,7 @@ RefAST ASTFactory::dupTree(RefAST t)
}
/** Make a tree from a list of nodes. The first element in the
* array is the root. If the root is null, then the tree is
* a simple list not a tree. Handles null tqchildren nodes correctly.
* a simple list not a tree. Handles null children nodes correctly.
* For example, build(a, b, null, c) yields tree (a b c). build(null,a,b)
* yields tree (nil a b).
*/
@ -165,7 +165,7 @@ RefAST ASTFactory::make(ANTLR_USE_NAMESPACE(std)vector<RefAST> nodes)
if (root) {
root->setFirstChild(RefAST(nullASTptr)); // don't leave any old pointers set
}
// link in tqchildren;
// link in children;
for (unsigned int i=1; i<nodes.size(); i++) {
if ( !nodes[i] ) continue; // ignore null nodes
if ( !root ) {

10
poxml/antlr/src/BaseAST.cpp
Unescape View File

@ -64,7 +64,7 @@ void BaseAST::doWorkForFindAll(
(!partialMatch && sibling->equalsTree(target)) ) {
v.push_back(sibling);
}
// regardless of match or not, check any tqchildren for matches
// regardless of match or not, check any children for matches
if ( sibling->getFirstChild() ) {
RefBaseAST(sibling->getFirstChild())->doWorkForFindAll(v, target, partialMatch);
}
@ -96,7 +96,7 @@ bool BaseAST::equalsList(RefAST t) const
// as a quick optimization, check roots first.
if (!sibling->equals(t))
return false;
// if roots match, do full list match test on tqchildren.
// if roots match, do full list match test on children.
if (sibling->getFirstChild()) {
if (!sibling->getFirstChild()->equalsList(t->getFirstChild()))
return false;
@ -129,7 +129,7 @@ bool BaseAST::equalsListPartial(RefAST sub) const
// as a quick optimization, check roots first.
if (!sibling->equals(sub))
return false;
// if roots match, do partial list match test on tqchildren.
// if roots match, do partial list match test on children.
if (sibling->getFirstChild())
if (!sibling->getFirstChild()->equalsListPartial(sub->getFirstChild()))
return false;
@ -151,7 +151,7 @@ bool BaseAST::equalsTree(RefAST t) const
// check roots first
if (!equals(t))
return false;
// if roots match, do full list match test on tqchildren.
// if roots match, do full list match test on children.
if (getFirstChild()) {
if (!getFirstChild()->equalsList(t->getFirstChild()))
return false;
@ -175,7 +175,7 @@ bool BaseAST::equalsTreePartial(RefAST sub) const
// check roots first
if (!equals(sub))
return false;
// if roots match, do full list partial match test on tqchildren.
// if roots match, do full list partial match test on children.
if (getFirstChild())
if (!getFirstChild()->equalsListPartial(sub->getFirstChild()))
return false;

52
poxml/parser.cpp
Unescape View File

@ -99,7 +99,7 @@ bool StructureParser::isLiteralTag(const TQString &qName)
bool StructureParser::skippedEntity ( const TQString & name )
{
if (inside)
message += TQString("&%1;").tqarg(name);
message += TQString("&%1;").arg(name);
return true;
}
@ -126,10 +126,10 @@ bool StructureParser::startElement( const TQString& , const TQString& ,
{
TQString tmp = "<" + tname;
for (int i = 0; i < attr.length(); i++) {
tmp += TQString(" %1=\"%2\"").tqarg(attr.qName(i)).tqarg(attr.value(i));
tmp += TQString(" %1=\"%2\"").arg(attr.qName(i)).arg(attr.value(i));
}
tmp += TQString(" poxml_line=\"%1\"").tqarg(locator->lineNumber());
tmp += TQString(" poxml_col=\"%1\"").tqarg(locator->columnNumber());
tmp += TQString(" poxml_line=\"%1\"").arg(locator->lineNumber());
tmp += TQString(" poxml_col=\"%1\"").arg(locator->columnNumber());
if (isSingleTag(qName))
tmp += "/>";
@ -180,8 +180,8 @@ bool StructureParser::closureTag(const TQString& message, const TQString &tag)
uint index = 0;
while (true)
{
int nextclose = message.find(TQRegExp(TQString::fromLatin1("</%1[\\s>]").tqarg(tag)), index);
int nextstart = message.find(TQRegExp(TQString::fromLatin1("<%1[>\\s]").tqarg(tag)), index);
int nextclose = message.find(TQRegExp(TQString::fromLatin1("</%1[\\s>]").arg(tag)), index);
int nextstart = message.find(TQRegExp(TQString::fromLatin1("<%1[>\\s]").arg(tag)), index);
// qDebug("finding %d %d %d %d", nextstart, nextclose, index, inside);
if (nextclose == -1) {
#ifdef POXML_DEBUG
@ -223,7 +223,7 @@ void StructureParser::descape(TQString &message)
bool lastws = false;
while (index < message.length()) {
switch (message.tqat(index).latin1()) {
switch (message.at(index).latin1()) {
case '\n':
case '\t':
case '\r':
@ -278,7 +278,7 @@ bool StructureParser::formatMessage(MsgBlock &msg) const
{
int slen = strlen(singletags[index]);
if (msg.msgid.left(slen + 1) == TQString::fromLatin1("<%1").tqarg(singletags[index]) &&
if (msg.msgid.left(slen + 1) == TQString::fromLatin1("<%1").arg(singletags[index]) &&
!msg.msgid.at( slen + 1 ).isLetterOrNumber() )
{
#ifdef POXML_DEBUG
@ -418,9 +418,9 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb)
#endif
// the exception for poxml_* attributes is made in the closing tag
int closing_index = message.find(TQRegExp(TQString::fromLatin1("</%1[\\s>]").tqarg(tag)),
int closing_index = message.find(TQRegExp(TQString::fromLatin1("</%1[\\s>]").arg(tag)),
strindex);
int starting_index = message.find(TQRegExp(TQString::fromLatin1("<%1[\\s>]").tqarg(tag)),
int starting_index = message.find(TQRegExp(TQString::fromLatin1("<%1[\\s>]").arg(tag)),
strindex);
#ifdef POXML_DEBUG
@ -529,9 +529,9 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb)
qDebug("inside %s %d", message.mid(strindex, 35).latin1(), inside);
#endif
int closing_index = message.findRev(TQRegExp(TQString::fromLatin1("</%1[\\s>]").tqarg(tag)),
int closing_index = message.findRev(TQRegExp(TQString::fromLatin1("</%1[\\s>]").arg(tag)),
strindex - 1);
int starting_index = message.findRev(TQRegExp(TQString::fromLatin1("<%1[\\s>]").tqarg(tag)),
int starting_index = message.findRev(TQRegExp(TQString::fromLatin1("<%1[\\s>]").arg(tag)),
strindex - 1);
#ifdef POXML_DEBUG
@ -601,9 +601,9 @@ bool StructureParser::endElement( const TQString& , const TQString&, const TQStr
if (inside) {
if (!isSingleTag(qName)) {
message += TQString("</%1").tqarg(tname);
message += TQString(" poxml_line=\"%1\"").tqarg(locator->lineNumber());
message += TQString(" poxml_col=\"%1\"").tqarg(locator->columnNumber());
message += TQString("</%1").arg(tname);
message += TQString(" poxml_line=\"%1\"").arg(locator->lineNumber());
message += TQString(" poxml_col=\"%1\"").arg(locator->columnNumber());
message += ">";
}
}
@ -713,8 +713,8 @@ void StructureParser::cleanupTags( TQString &contents )
contents.replace(TQRegExp("&"), "!POXML_AMP!");
for (int index = 0; literaltags[index]; index++) {
TQRegExp start(TQString("<%1[\\s>]").tqarg(literaltags[index]));
TQRegExp end(TQString("</%1[\\s>]").tqarg(literaltags[index]));
TQRegExp start(TQString("<%1[\\s>]").arg(literaltags[index]));
TQRegExp end(TQString("</%1[\\s>]").arg(literaltags[index]));
int strindex = 0;
while (true) {
strindex = contents.find(start, strindex);
@ -739,7 +739,7 @@ void StructureParser::cleanupTags( TQString &contents )
if (index < 0)
break;
TQString tag = unclosed.cap(1);
contents.replace(index, unclosed.matchedLength(), TQString("</%1>").tqarg(tag));
contents.replace(index, unclosed.matchedLength(), TQString("</%1>").arg(tag));
}
TQRegExp start("<((\\s*[^<>\\s])*)\\s\\s*(/*)>");
@ -753,7 +753,7 @@ void StructureParser::cleanupTags( TQString &contents )
TQString tag = start.cap(1);
TQString cut = start.capturedTexts().last();
// qDebug("UNCLO %s %d -%s- -%s-", start.cap(0).latin1(), index, tag.latin1(), cut.latin1());
contents.replace(index, start.matchedLength(), TQString("<%1%2>").tqarg(tag).tqarg(cut));
contents.replace(index, start.matchedLength(), TQString("<%1%2>").arg(tag).arg(cut));
}
TQRegExp singletag("<(\\w*)\\s([^><]*)/>");
@ -764,7 +764,7 @@ void StructureParser::cleanupTags( TQString &contents )
break;
TQString tag = singletag.cap(1);
if (!StructureParser::isSingleTag(tag)) {
contents.replace(index, singletag.matchedLength(), TQString("<%1 %2></%3>").tqarg(tag).tqarg(singletag.cap(2)).tqarg(tag));
contents.replace(index, singletag.matchedLength(), TQString("<%1 %2></%3>").arg(tag).arg(singletag.cap(2)).arg(tag));
}
}
@ -775,7 +775,7 @@ void StructureParser::cleanupTags( TQString &contents )
if (index < 0)
break;
TQString msgid = trans_comment.cap(1);
contents.replace(index, trans_comment.matchedLength(), TQString("<trans_comment>%1</trans_comment>").tqarg(msgid));
contents.replace(index, trans_comment.matchedLength(), TQString("<trans_comment>%1</trans_comment>").arg(msgid));
}
#ifdef POXML_DEBUG
@ -788,7 +788,7 @@ static bool removeEmptyTag( TQString &contents, const TQString & tag)
{
// qDebug("cont %s %s", contents.latin1(), tag.latin1());
TQRegExp empty(TQString("<%1[^>]*>[\\s\n][\\s\n]*</%2\\s*>").tqarg(tag).tqarg(tag));
TQRegExp empty(TQString("<%1[^>]*>[\\s\n][\\s\n]*</%2\\s*>").arg(tag).arg(tag));
int strindex = 0;
while (true) {
strindex = contents.find(empty, strindex);
@ -938,7 +938,7 @@ MsgList parseXML(const char *filename)
TQString replacement = "";
while (contents.at(endindex) != '>' || inside)
{
switch (contents.tqat(endindex).latin1()) {
switch (contents.at(endindex).latin1()) {
case '<':
inside++; break;
case '>':
@ -977,8 +977,8 @@ MsgList parseXML(const char *filename)
{
TQMap<TQString,TQString>::Iterator found = msgids.find((*it).msgid);
if ((*it).msgid.length() < 4) {
(*it).msgid = TQString("<%1>").tqarg((*it).tag) + (*it).msgid +
TQString("</%1>").tqarg((*it).tag);
(*it).msgid = TQString("<%1>").arg((*it).tag) + (*it).msgid +
TQString("</%1>").arg((*it).tag);
changed = true;
break;
}
@ -993,7 +993,7 @@ MsgList parseXML(const char *filename)
it2 != english.end(); it2++)
{
if ((*it2).msgid == msgid)
(*it2).msgid = TQString("<%1>").tqarg((*it2).tag) + msgid + TQString("</%1>").tqarg((*it2).tag);
(*it2).msgid = TQString("<%1>").arg((*it2).tag) + msgid + TQString("</%1>").arg((*it2).tag);
}
break;
}

2
poxml/split.cpp
Unescape View File

@ -112,7 +112,7 @@ int main( int argc, char **argv )
while (tit != translated.end())
{
MsgBlock mb;
mb.msgid = TQString::fromLatin1("appended paragraph %1").tqarg(counter++);
mb.msgid = TQString::fromLatin1("appended paragraph %1").arg(counter++);
mb.msgstr = (*tit).msgid;
mb.lines += (*tit).lines;
english.append(mb);

44
scheck/scheck.cpp
Unescape View File

@ -900,10 +900,10 @@ void StyleCheckStyle::accelManageRecursive(TQWidget* widget)
return;
}
const TQObjectList tqchildren = widget->childrenListObject();
if (tqchildren.isEmpty())
const TQObjectList children = widget->childrenListObject();
if (children.isEmpty())
return;
TQObjectListIterator iter(tqchildren);
TQObjectListIterator iter(children);
TQObject* walk;
while ((walk = iter.current()))
@ -1846,13 +1846,13 @@ void StyleCheckStyle::drawControl( ControlElement element,
{
const TQCheckBox* checkbox = static_cast<const TQCheckBox*>(widget);
int tqalignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
TQValueVector<StyleGuideViolation> violations = checkSentenceStyle(checkbox->text());
renderViolations(violations, p, r, tqalignment | AlignVCenter | ShowPrefix, checkbox->text());
renderViolations(violations, p, r, alignment | AlignVCenter | ShowPrefix, checkbox->text());
drawItem(p, r, tqalignment | AlignVCenter | ShowPrefix, cg,
drawItem(p, r, alignment | AlignVCenter | ShowPrefix, cg,
flags & Style_Enabled, checkbox->pixmap(), removedXX(stripAccelViolations(checkbox->text())));
if (flags & Style_HasFocus)
@ -1867,13 +1867,13 @@ void StyleCheckStyle::drawControl( ControlElement element,
{
const TQRadioButton* rb = static_cast<const TQRadioButton*>(widget);
int tqalignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
TQValueVector<StyleGuideViolation> violations = checkSentenceStyle(rb->text());
renderViolations(violations, p, r,tqalignment | AlignVCenter | ShowPrefix, rb->text());
renderViolations(violations, p, r,alignment | AlignVCenter | ShowPrefix, rb->text());
drawItem(p, r, tqalignment | AlignVCenter | ShowPrefix, cg,
drawItem(p, r, alignment | AlignVCenter | ShowPrefix, cg,
flags & Style_Enabled, rb->pixmap(), removedXX(stripAccelViolations(rb->text())));
if (flags & Style_HasFocus)
@ -2571,7 +2571,7 @@ TQSize StyleCheckStyle::sizeFromContents( ContentsType contents,
}
// Fix TQt's wacky image tqalignment
// Fix TQt's wacky image alignment
TQPixmap StyleCheckStyle::stylePixmap(StylePixmap stylepixmap,
const TQWidget* widget,
const TQStyleOption& opt) const
@ -2602,12 +2602,12 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event )
if ( (event->type() == TQEvent::Enter) &&
(button->isEnabled()) ) {
hoverWidget = button;
button->tqrepaint( false );
button->repaint( false );
}
else if ( (event->type() == TQEvent::Leave) &&
(TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(hoverWidget)) ) {
hoverWidget = 0L;
button->tqrepaint( false );
button->repaint( false );
}
}
@ -2629,14 +2629,14 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event )
m = lb->fontMetrics().width('x') / 2 - lb->margin();
if ( m > 0 )
{
int hAlign = TQApplication::horizontalAlignment( lb->tqalignment() );
int hAlign = TQApplication::horizontalAlignment( lb->alignment() );
if ( hAlign & AlignLeft )
cr.setLeft( cr.left() + m );
if ( hAlign & AlignRight )
cr.setRight( cr.right() - m );
if ( lb->tqalignment() & AlignTop )
if ( lb->alignment() & AlignTop )
cr.setTop( cr.top() + m );
if ( lb->tqalignment() & AlignBottom )
if ( lb->alignment() & AlignBottom )
cr.setBottom( cr.bottom() - m );
}
@ -2656,17 +2656,17 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event )
if (lb->buddy())
{
renderViolations(violations, &p, cr,lb->tqalignment() | ShowPrefix, lb->text() );
renderViolations(violations, &p, cr,lb->alignment() | ShowPrefix, lb->text() );
// ordinary text or pixmap label
drawItem( &p, cr, lb->tqalignment(), lb->colorGroup(), lb->isEnabled(),
drawItem( &p, cr, lb->alignment(), lb->colorGroup(), lb->isEnabled(),
0, removedXX(stripAccelViolations(lb->text())) );
}
else
{
renderViolations(violations, &p, cr,lb->tqalignment(), lb->text() );
renderViolations(violations, &p, cr,lb->alignment(), lb->text() );
// ordinary text or pixmap label
drawItem( &p, cr, lb->tqalignment(), lb->colorGroup(), lb->isEnabled(),
drawItem( &p, cr, lb->alignment(), lb->colorGroup(), lb->isEnabled(),
0, removedXX(stripAccelViolations(lb->text())) );
}
@ -2704,11 +2704,11 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event )
int h = fm.height();
int tw = fm.width( stripped_title, stripped_title.length() ) + 2*fm.width(TQChar(' '));
int x;
if ( gb->tqalignment() & AlignHCenter ) // center tqalignment
if ( gb->alignment() & AlignHCenter ) // center alignment
x = gb->frameRect().width()/2 - tw/2;
else if ( gb->tqalignment() & AlignRight ) // right tqalignment
else if ( gb->alignment() & AlignRight ) // right alignment
x = gb->frameRect().width() - tw - 8;
else if ( gb->tqalignment() & AlignLeft ) // left tqalignment
else if ( gb->alignment() & AlignLeft ) // left alignment
x = 8;
else
{ // auto align

2
scripts/kde-emacs/kde-emacs-core.el
Unescape View File

@ -199,7 +199,7 @@ This function does not do any hidden buffer changes."
;; throw it away due to the narrowing that might be done
;; by the function above. That means we must not do any
;; changes during the execution of this function, since
;; `c-tqinvalidate-state-cache' then would change this local
;; `c-invalidate-state-cache' then would change this local
;; variable and leave a bogus value in the global one.
(c-state-cache (if inclass-p
(c-whack-state-before (point-min) paren-state)

4
scripts/kde-spellcheck.pl
Unescape View File

@ -373,7 +373,7 @@ Afganistan Afghanistan
agressive aggressive
Agressive Aggressive
agressively aggressively
alignement tqalignment
alignement alignment
alligned aligned
Allignment Alignment
allmost almost
@ -514,7 +514,7 @@ charakters characters
charater character
Chatacter Character
chatwindow chat window
childs tqchildren
childs children
choosed chose
choosen chosen
Choosen Chosen

2
scripts/kdesvn-build
Unescape View File

@ -3432,7 +3432,7 @@ sub update_module_environment
my $path = join(':', "$qtdir/bin", "$kdedir/bin", get_option ($module, 'binpath'));
my $libdir = join(':', "$qtdir/lib", "$kdedir/lib", get_option ($module, 'libpath'));
# Set up the tqchildren's environment. We use setenv since it
# Set up the children's environment. We use setenv since it
# won't set an environment variable to nothing. (e.g, setting
# QTDIR to a blank string might confuse Qt or KDE.

4
umbrello/umbrello/aligntoolbar.cpp
Unescape View File

@ -335,7 +335,7 @@ void AlignToolBar::slotButtonChanged(int btn) {
// at least 2 widgets must be selected
if (widgetList.count() > 1) {
// now perform tqalignment according to the clicked button
// now perform alignment according to the clicked button
switch (btn) {
case alac_align_left:
alignLeft(widgetList);
@ -380,7 +380,7 @@ void AlignToolBar::slotButtonChanged(int btn) {
UMLApp::app()->getDocument()->setModified();
} else {
KMessageBox::messageBox(0, KMessageBox::Information,
i18n("For tqalignment you have to select at least 2 objects like classes or actors. You can not align associations."),
i18n("For alignment you have to select at least 2 objects like classes or actors. You can not align associations."),
i18n("Information"), i18n("&OK"), TQString(""),
"showAlignInformation");
} // if (widgetList.count() > 1)

8
umbrello/umbrello/aligntoolbar.h
Unescape View File

@ -21,10 +21,10 @@ class TQMainWindow;
class UMLWidget;
/**
* This toolbar provides tools for tqalignment. Widgets can only be aligned, when
* This toolbar provides tools for alignment. Widgets can only be aligned, when
* there are at least 2 widgets (not associations) are selected
*
* @short Toolbar providing tqalignment tools.
* @short Toolbar providing alignment tools.
* @author Sebastian Stein <seb.kde@hpfsc.de>
* Bugs and comments to uml-devel@lists.sf.net or http://bugs.kde.org
*/
@ -34,7 +34,7 @@ class AlignToolBar : public KToolBar {
public:
/**
* Creates a bar with tools for tqalignment.
* Creates a bar with tools for alignment.
*
* @param parentWindow The parent of the toolbar.
* @param name The name of the toolbar.
@ -215,7 +215,7 @@ private:
private slots:
/**
* Performs the tqalignment when a button was clicked.
* Performs the alignment when a button was clicked.
*
* @param btn The clicked button.
*/

2
umbrello/umbrello/associationwidget.cpp
Unescape View File

@ -797,7 +797,7 @@ void AssociationWidget::setUMLAssociation (UMLAssociation * assoc)
// BTW, IMHO the concept of a widget being the parent of a UML object
// is fundamentally flawed. Widgets are pure presentation - they can
// come and go at a whim. If at all, the widgets could be considered
// tqchildren of the corresponding UML object.
// children of the corresponding UML object.
//
// ANSWER: This is the wrong treatment of cut and paste. Associations that
// are being cut/n pasted should be serialized to XMI, then reconstituted

2
umbrello/umbrello/associationwidget.h
Unescape View File

@ -1012,7 +1012,7 @@ public slots:
/**
* This slot is entered when an event has occurred on the views display,
* most likely a mouse event. Before it sends out that mouse event all
* tqchildren should make sure that they don't have a menu active or there
* children should make sure that they don't have a menu active or there
* could be more than one popup menu displayed.
*/
void slotRemovePopupMenu();

8
umbrello/umbrello/autolayout/autolayoutdlg.cpp
Unescape View File

@ -84,7 +84,7 @@ void AutolayoutDlg::slotSetClusterizeHierarchies(bool b)
void AutolayoutDlg::slotSetShapeSeparation(int i)
{
tqshapeSeparation=i;
shapeSeparation=i;
}
void AutolayoutDlg::slotReloadSettings()
@ -115,7 +115,7 @@ void AutolayoutDlg::slotDoAutotqlayout()
a->setGeneralizationWeight( generalizationWeight);
a->setNoteConnectionWeight( 1);
a->setNoteConnectionsAsEdges(true);
a->setShapeSeparation( tqshapeSeparation);
a->setShapeSeparation( shapeSeparation);
a->autotqlayout( view);
delete a;
a=0;
@ -134,7 +134,7 @@ void AutolayoutDlg::readConfig( KConfig * conf)
generalizationCB->setChecked((bool)(conf->readBoolEntry( "genralizationAsEdges",true)));
generalizationEdgessSL->setValue((int)(conf->readNumEntry( "generalizationWeight",1)));
associationEdgesSL->setValue((int)(conf->readNumEntry( "associationWeight",0)));
tqshapeSeparationSB->setValue((int)(conf->readNumEntry( "tqshapeSeparation",0)));
shapeSeparationSB->setValue((int)(conf->readNumEntry( "shapeSeparation",0)));
algorithmCOB->setCurrentItem((int)(conf->readNumEntry( "algorithm",0)));
}
@ -151,7 +151,7 @@ void AutolayoutDlg::writeConfig( KConfig * conf)
conf->writeEntry("generalizationWeight",generalizationEdgessSL->value());
conf->writeEntry("associationWeight",associationEdgesSL->value());
conf->writeEntry("tqshapeSeparation",tqshapeSeparationSB->value());
conf->writeEntry("shapeSeparation",shapeSeparationSB->value());
//conf->writeEntry("al

2
umbrello/umbrello/autolayout/autolayoutdlg.h
Unescape View File

@ -54,7 +54,7 @@ class AutolayoutDlg : public MyDialog1
bool compressShapes;
bool centerDiagram;
bool clusterizeHierarchies;
int tqshapeSeparation;
int shapeSeparation;
KConfig* config;
TQString algname;
Autotqlayout::Autolayouter* getAutolayouter();

2
umbrello/umbrello/autolayout/autolayouteradapter.cpp
Unescape View File

@ -118,7 +118,7 @@ void Autotqlayout::AutolayouterAdapter::setClusterizeHierarchies( bool b )
void Autotqlayout::AutolayouterAdapter::setShapeSeparation( int i )
{
tqshapeSeparation=i;
shapeSeparation=i;
}
Autotqlayout::Graph * Autotqlayout::AutolayouterAdapter::setGraph( UMLView * view )

2
umbrello/umbrello/autolayout/autolayouteradapter.h
Unescape View File

@ -70,7 +70,7 @@ protected:
bool compressShapes;
bool centerDiagram;
bool clusterizeHierarchies;
int tqshapeSeparation;
int shapeSeparation;
int noteConnectionWeight;
bool noteConnectionAsEdges;
bool anchorsAsEdges;

2
umbrello/umbrello/autolayout/graphvizgraph.cpp
Unescape View File

@ -42,7 +42,7 @@ GraphvizGraph::GraphvizGraph()
a_weight= agedgeattr(_agraph,"weight","");
agnodeattr(_agraph, "fixedsize", "true");
agnodeattr(_agraph, "margin", "0.01,0.01");
agnodeattr(_agraph, "tqshape", "box");
agnodeattr(_agraph, "shape", "box");
agraphattr(_agraph, "dpi", "DPI/0");

6
umbrello/umbrello/autolayout/newautolayoutdialog.ui
Unescape View File

@ -88,12 +88,12 @@
<string>Shape separation</string>
</property>
<property name="buddy" stdset="0">
<cstring>tqshapeSeparationSB</cstring>
<cstring>shapeSeparationSB</cstring>
</property>
</widget>
<widget class="TQSpinBox">
<property name="name">
<cstring>tqshapeSeparationSB</cstring>
<cstring>shapeSeparationSB</cstring>
</property>
<property name="prefix">
<string></string>
@ -450,7 +450,7 @@
<slot>setEnabled(bool)</slot>
</connection>
<connection>
<sender>tqshapeSeparationSB</sender>
<sender>shapeSeparationSB</sender>
<signal>valueChanged(int)</signal>
<receiver>MyDialog1</receiver>
<slot>slotSetShapeSeparation(int)</slot>

6
umbrello/umbrello/clipboard/umlclipboard.cpp
Unescape View File

@ -267,7 +267,7 @@ void UMLClipboard::checkItemForCopyType(UMLListViewItem* Item, bool & WithDiagra
}
}
/** Adds the tqchildren of a UMLListViewItem to m_ItemList */
/** Adds the children of a UMLListViewItem to m_ItemList */
bool UMLClipboard::insertItemChildren(UMLListViewItem * Item, UMLListViewItemList& SelectedItems) {
if(Item->childCount()) {
UMLListViewItem * child = (UMLListViewItem*)Item->firstChild();
@ -347,7 +347,7 @@ bool UMLClipboard::pasteClip1(TQMimeSource* data) {
return true;
lv->setStartedCopy(false);
/* If we get here we are pasting after a Copy and need to
// paste possible tqchildren.
// paste possible children.
UMLListViewItem* itemdata = 0;
UMLListViewItemListIt it(itemdatalist);
while ( (itemdata=it.current()) != 0 ) {
@ -630,7 +630,7 @@ bool UMLClipboard::pasteClip5(TQMimeSource* data) {
break;
}
default :
kWarning() << "pasting unknown tqchildren type in clip type 5" << endl;
kWarning() << "pasting unknown children type in clip type 5" << endl;
return false;
}
}

6
umbrello/umbrello/clipboard/umlclipboard.h
Unescape View File

@ -167,13 +167,13 @@ private:
bool& OnlyAttsOps);
/**
* Adds the tqchildren of a UMLListViewItem to m_ItemList.
* Adds the children of a UMLListViewItem to m_ItemList.
*/
bool insertItemChildren(UMLListViewItem* Item,
UMLListViewItemList& SelectedItems);
/**
* Inserts the data of the tqchildren of the given item
* Inserts the data of the children of the given item
* into the item data list. Used for clip type 4. Used
* to make * sure classes have all the attributes and
* operations saved.
@ -181,7 +181,7 @@ private:
bool insertItemChildren(UMLListViewItem* item);
/**
* Pastes the tqchildren of a UMLListViewItem (The Parent)
* Pastes the children of a UMLListViewItem (The Parent)
*/
bool pasteChildren(UMLListViewItem* parent, IDChangeLog *chgLog);

2
umbrello/umbrello/codegenerator.cpp
Unescape View File

@ -470,7 +470,7 @@ bool CodeGenerator::openFile (TQFile & file, const TQString &fileName ) {
TQDir outputDirectory = UMLApp::app()->getCommonPolicy()->getOutputDirectory();
file.setName(outputDirectory.absFilePath(fileName));
if(!file.open(IO_WriteOnly)) {
KMessageBox::sorry(0,i18n("Cannot open file %1 for writing. Please make sure the folder exists and you have permissions to write to it.").tqarg(file.name()),i18n("Cannot Open File"));
KMessageBox::sorry(0,i18n("Cannot open file %1 for writing. Please make sure the folder exists and you have permissions to write to it.").arg(file.name()),i18n("Cannot Open File"));
return false;
}
return true;

2
umbrello/umbrello/codegenerators/cppwriter.cpp
Unescape View File

@ -627,7 +627,7 @@ void CppWriter::writeAttributeMethods(UMLAttributeList *attribs,
// from what I can tell, this IS the default behavior for
// cleanName. I dunno why its not working -b.t.
methodBaseName = methodBaseName.stripWhiteSpace();
methodBaseName.replace(0,1,methodBaseName.tqat(0).upper());
methodBaseName.replace(0,1,methodBaseName.at(0).upper());
writeSingleAttributeAccessorMethods(at->getTypeName(), varName,
methodBaseName, at->getDoc(), Uml::chg_Changeable, isHeaderMethod,

2
umbrello/umbrello/codegenerators/csharpwriter.cpp
Unescape View File

@ -629,7 +629,7 @@ void CSharpWriter::writeAssociatedAttributes(UMLAssociationList &associated, UML
TQString roleName = cleanName(a->getRoleName(Uml::B));
TQString typeName = cleanName(o->getName());
if (roleName.isEmpty()) {
roleName = TQString("UnnamedRoleB_%1").tqarg(m_unnamedRoles++);
roleName = TQString("UnnamedRoleB_%1").arg(m_unnamedRoles++);
}
TQString roleDoc = a->getRoleDoc(Uml::B);

2
umbrello/umbrello/codegenerators/javawriter.cpp
Unescape View File

@ -408,7 +408,7 @@ void JavaWriter::writeAttributeMethods(UMLAttributeList &atpub, Uml::Visibility
// from what I can tell, this IS the default behavior for
// cleanName. I dunno why its not working -b.t.
fieldName.stripWhiteSpace();
fieldName.replace(0,1,fieldName.tqat(0).upper());
fieldName.replace(0,1,fieldName.at(0).upper());
writeSingleAttributeAccessorMethods(at->getTypeName(),
cleanName(at->getName()),

30
umbrello/umbrello/codegenerators/php5writer.cpp
Unescape View File

@ -173,7 +173,7 @@ static const char *php5words[] =
"checkout",
"chgrp",
"child_nodes",
"tqchildren",
"children",
"chmod",
"chop",
"chown",
@ -760,8 +760,8 @@ static const char *php5words[] =
"getrusage",
"getservbyname",
"getservbyport",
"gettqshape1",
"gettqshape2",
"getshape1",
"getshape2",
"gettext",
"gettimeofday",
"gettype",
@ -2704,7 +2704,7 @@ static const char *php5words[] =
"SWFDisplayItem",
"swf_endbutton",
"swf_enddoaction",
"swf_endtqshape",
"swf_endshape",
"swf_endsymbol",
"SWFFill",
"SWFFont",
@ -2738,21 +2738,21 @@ static const char *php5words[] =
"swf_setfont",
"swf_setframe",
"SWFShape",
"swf_tqshapearc",
"swf_tqshapecurveto",
"swf_tqshapecurveto3",
"swf_tqshapefillbitmapclip",
"swf_tqshapefillbitmaptile",
"swf_tqshapefilloff",
"swf_tqshapefillsolid",
"swf_tqshapelinesolid",
"swf_tqshapelineto",
"swf_tqshapemoveto",
"swf_shapearc",
"swf_shapecurveto",
"swf_shapecurveto3",
"swf_shapefillbitmapclip",
"swf_shapefillbitmaptile",
"swf_shapefilloff",
"swf_shapefillsolid",
"swf_shapelinesolid",
"swf_shapelineto",
"swf_shapemoveto",
"swf_showframe",
"SWFSprite",
"swf_startbutton",
"swf_startdoaction",
"swf_starttqshape",
"swf_startshape",
"swf_startsymbol",
"SWFText",
"SWFTextField",

30
umbrello/umbrello/codegenerators/phpwriter.cpp
Unescape View File

@ -171,7 +171,7 @@ static const char *words[] =
"checkout",
"chgrp",
"child_nodes",
"tqchildren",
"children",
"chmod",
"chop",
"chown",
@ -758,8 +758,8 @@ static const char *words[] =
"getrusage",
"getservbyname",
"getservbyport",
"gettqshape1",
"gettqshape2",
"getshape1",
"getshape2",
"gettext",
"gettimeofday",
"gettype",
@ -2700,7 +2700,7 @@ static const char *words[] =
"SWFDisplayItem",
"swf_endbutton",
"swf_enddoaction",
"swf_endtqshape",
"swf_endshape",
"swf_endsymbol",
"SWFFill",
"SWFFont",
@ -2734,21 +2734,21 @@ static const char *words[] =
"swf_setfont",
"swf_setframe",
"SWFShape",
"swf_tqshapearc",
"swf_tqshapecurveto",
"swf_tqshapecurveto3",
"swf_tqshapefillbitmapclip",
"swf_tqshapefillbitmaptile",
"swf_tqshapefilloff",
"swf_tqshapefillsolid",
"swf_tqshapelinesolid",
"swf_tqshapelineto",
"swf_tqshapemoveto",
"swf_shapearc",
"swf_shapecurveto",
"swf_shapecurveto3",
"swf_shapefillbitmapclip",
"swf_shapefillbitmaptile",
"swf_shapefilloff",
"swf_shapefillsolid",
"swf_shapelinesolid",
"swf_shapelineto",
"swf_shapemoveto",
"swf_showframe",
"SWFSprite",
"swf_startbutton",
"swf_startdoaction",
"swf_starttqshape",
"swf_startshape",
"swf_startsymbol",
"SWFText",
"SWFTextField",

2
umbrello/umbrello/codegenerators/xmlschemawriter.cpp
Unescape View File

@ -543,7 +543,7 @@ void XMLSchemaWriter::writeComment( const TQString &comment, TQTextStream &XMLsc
}
}
// all that matters here is roleA, the role served by the tqchildren of this class
// all that matters here is roleA, the role served by the children of this class
// in any composition or aggregation association. In full associations, I have only
// considered the case of "self" association, so it shouldn't matter if we use role A or
// B to find the child class as long as we don't use BOTH roles. I bet this will fail

2
umbrello/umbrello/codegenerators/xmlschemawriter.h
Unescape View File

@ -88,7 +88,7 @@ private:
/**
* write a <group> declaration for this classifier. Used for interfaces to classes with
* inheriting tqchildren.
* inheriting children.
*/
void writeGroupClassifierDecl(UMLClassifier *c,
UMLClassifierList superclassifiers,

4
umbrello/umbrello/codegenobjectwithtextblocks.cpp
Unescape View File

@ -170,7 +170,7 @@ CodeGenObjectWithTextBlocks * CodeGenObjectWithTextBlocks::findParentObjectForTa
return this;
// shouldn't happen unless the textblock doesn't exist in this object
// or its tqchildren at all
// or its children at all
return (CodeGenObjectWithTextBlocks*) NULL;
}
@ -378,7 +378,7 @@ void CodeGenObjectWithTextBlocks::setAttributesFromNode ( TQDomElement & root)
// in this vanilla version, we only load comments and codeblocks
// as they are the only instanciatable (vanilla) things
// this method should be overridden if this class is inherited
// by some other class that is concrete and takes tqchildren
// by some other class that is concrete and takes children
// derived from codeblock/codecomment
void CodeGenObjectWithTextBlocks::loadChildTextBlocksFromNode ( TQDomElement & root)
{

2
umbrello/umbrello/codegenobjectwithtextblocks.h
Unescape View File

@ -165,7 +165,7 @@ protected:
* in this vanilla version, we only load comments and codeblocks
* as they are the only instanciatable (vanilla) things
* this method should be overridden if this class is inherited
* by some other class that is concrete and takes tqchildren
* by some other class that is concrete and takes children
* derived from codeblock/codecomment/hierarchicalcb/ownedhiercodeblock
*/
virtual void loadChildTextBlocksFromNode ( TQDomElement & root);

2
umbrello/umbrello/codeimport/classimport.cpp
Unescape View File

@ -32,7 +32,7 @@ void ClassImport::importFiles(const TQStringList &fileList) {
fileIT != fileList.end(); ++fileIT) {
TQString fileName = (*fileIT);
umldoc->writeToStatusBar(i18n("Importing file: %1 Progress: %2/%3").
tqarg(fileName).tqarg(processedFilesCount).tqarg(fileList.size()));
arg(fileName).arg(processedFilesCount).arg(fileList.size()));
parseFile(fileName);
processedFilesCount++;
}

2
umbrello/umbrello/codeimport/import_utils.cpp
Unescape View File

@ -178,7 +178,7 @@ UMLObject *createUMLObject(Uml::Object_Type type,
/* We know std and TQt are namespaces */
if (scopeName != "std" && scopeName != "TQt") {
wantNamespace = KMessageBox::questionYesNo(NULL,
i18n("Is the scope %1 a namespace or a class?").tqarg(scopeName),
i18n("Is the scope %1 a namespace or a class?").arg(scopeName),
i18n("C++ Import Requests Your Help"),
i18n("Namespace"), i18n("Class"));
}

6
umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
Unescape View File

@ -128,7 +128,7 @@ AST::AST()
m_endLine( 0 ), m_endColumn( 0 )
{
#ifndef CPPPARSER_NO_CHILDREN
m_tqchildren.setAutoDelete( false );
m_children.setAutoDelete( false );
#endif
}
@ -188,12 +188,12 @@ void AST::setParent( AST* parent )
#ifndef CPPPARSER_NO_CHILDREN
void AST::appendChild( AST* child )
{
m_tqchildren.append( child );
m_children.append( child );
}
void AST::removeChild( AST* child )
{
m_tqchildren.remove( child );
m_children.remove( child );
}
#endif

4
umbrello/umbrello/codeimport/kdevcppparser/ast.h
Unescape View File

@ -232,7 +232,7 @@ public:
void getEndPosition( int* line, int* col ) const;
#ifndef CPPPARSER_NO_CHILDREN
TQPtrList<AST> tqchildren() { return m_tqchildren; }
TQPtrList<AST> children() { return m_children; }
void appendChild( AST* child );
void removeChild( AST* child );
#endif
@ -266,7 +266,7 @@ private:
int m_endLine, m_endColumn;
Slice m_slice;
#ifndef CPPPARSER_NO_CHILDREN
TQPtrList<AST> m_tqchildren;
TQPtrList<AST> m_children;
#endif
TQString m_comment;

4
umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
Unescape View File

@ -35,8 +35,8 @@ AST* findNodeAt( AST* node, int line, int column )
if( (line > startLine || (line == startLine && column >= startColumn)) &&
(line < endLine || (line == endLine && column < endColumn)) ){
TQPtrList<AST> tqchildren = node->tqchildren();
TQPtrListIterator<AST> it( tqchildren );
TQPtrList<AST> children = node->children();
TQPtrListIterator<AST> it( children );
while( it.current() ){
AST* a = it.current();
++it;

2
umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
Unescape View File

@ -374,7 +374,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline )
TQString tokText = tok.text();
TQString str = (tok == Token_identifier && d->hasBind(tokText)) ? d->apply( tokText ) : tokText;
if( str == ide ){
//Problem p( i18n("unsafe use of macro '%1'").tqarg(ide), m_currentLine, m_currentColumn );
//Problem p( i18n("unsafe use of macro '%1'").arg(ide), m_currentLine, m_currentColumn );
//m_driver->addProblem( m_driver->currentFileName(), p );
m_driver->removeMacro( ide );
// str = TQString();

6
umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
Unescape View File

@ -37,7 +37,7 @@ using namespace std;
{ \
const Token& token = lex->lookAhead( 0 ); \
if( token != tk ){ \
reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \
reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \
return false; \
} \
lex->nextToken(); \
@ -47,7 +47,7 @@ using namespace std;
{ \
const Token& token = lex->lookAhead( 0 ); \
if( token != tk ){ \
reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \
reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \
} \
else \
lex->nextToken(); \
@ -137,7 +137,7 @@ bool Parser::reportError( const Error& err )
if( s.isEmpty() )
s = i18n( "<eof>" );
m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.tqarg(s), line, col) );
m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.arg(s), line, col) );
}
return true;

2
umbrello/umbrello/dialogs/classoptionspage.h
Unescape View File

@ -23,7 +23,7 @@ class ClassifierWidget;
/**
* A dialog page to display options for a @ref UMLWidget and its
* tqchildren. This is not normally called by you. It is used by
* children. This is not normally called by you. It is used by
* the @ref ClassPropDlg.
*
* @short A dialog page to display the options for a UMLWidget.

4
umbrello/umbrello/dialogs/codegenerationwizard.cpp
Unescape View File

@ -159,7 +159,7 @@ void CodeGenerationWizard::showPage(TQWidget *page) {
if(!info.exists())
{
if (KMessageBox::questionYesNo(this,
i18n("The folder %1 does not exist. Do you want to create it now?").tqarg(info.filePath()),
i18n("The folder %1 does not exist. Do you want to create it now?").arg(info.filePath()),
i18n("Output Folder Does Not Exist"), i18n("Create Folder"), i18n("Do Not Create")) == KMessageBox::Yes)
{
TQDir dir;
@ -188,7 +188,7 @@ void CodeGenerationWizard::showPage(TQWidget *page) {
// it exits and we can write... make sure it is a directory
if(!info.isDir())
{
KMessageBox::sorry(this,i18n("%1 does not seem to be a folder. Please choose a valid folder.").tqarg(info.filePath()),
KMessageBox::sorry(this,i18n("%1 does not seem to be a folder. Please choose a valid folder.").arg(info.filePath()),
i18n("Please Choose Valid Folder"));
return;
}

6
umbrello/umbrello/dialogs/diagramprintpage.cpp
Unescape View File

@ -112,13 +112,13 @@ void DiagramPrintPage::getOptions( TQMap<TQString,TQString>& opts, bool /*inclde
for(int i=0;i<listCount;i++) {
if(m_pSelectLB -> isSelected(i)) {
UMLView *view = (UMLView *)m_pDoc -> findView(m_nIdList[i]);
TQString sCount = TQString("%1").tqarg(count);
TQString sID = TQString("%1").tqarg(ID2STR(view -> getID()));
TQString sCount = TQString("%1").arg(count);
TQString sID = TQString("%1").arg(ID2STR(view -> getID()));
opts.insert(diagram + sCount, sID);
count++;
}
}
opts.insert("kde-uml-count", TQString("%1").tqarg(count));
opts.insert("kde-uml-count", TQString("%1").arg(count));
}
void DiagramPrintPage::setOptions( const TQMap<TQString,TQString>& /*opts*/ ) {}

2
umbrello/umbrello/dialogs/overwritedialogue.cpp
Unescape View File

@ -28,7 +28,7 @@ KDialogBase(Plain, i18n("Destination File Already Exists"), Ok|Apply|Cancel, Yes
TQVBoxLayout* tqlayout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
TQLabel* dialogueLabel = new TQLabel(i18n("The file %1 already exists in %2.\n\nUmbrello can overwrite the file, generate a similar\nfile name or not generate this file.").tqarg(fileName).tqarg(outputDirectory), plainPage() );
TQLabel* dialogueLabel = new TQLabel(i18n("The file %1 already exists in %2.\n\nUmbrello can overwrite the file, generate a similar\nfile name or not generate this file.").arg(fileName).arg(outputDirectory), plainPage() );
tqlayout->addWidget(dialogueLabel);
m_applyToAllRemaining = new TQCheckBox( i18n("&Apply to all remaining files"), plainPage() );

2
umbrello/umbrello/dialogs/umloperationdialog.cpp
Unescape View File

@ -463,7 +463,7 @@ bool UMLOperationDialog::apply()
if( classifier != 0L &&
classifier->checkOperationSignature(name, m_pOperation->getParmList(), m_pOperation) )
{
TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).tqarg(classifier->getName())
TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).arg(classifier->getName())
+
TQString(i18n("Choose a different name or parameter list." ));
KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false);

2
umbrello/umbrello/docgenerators/docbookgenerator.cpp
Unescape View File

@ -96,7 +96,7 @@ KIO::Job* DocbookGenerator::generateDocbookForProjectInto(const KURL& destDir)
// lets open the file for writing
if( !file.open( IO_WriteOnly ) ) {
KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(tmpfile.name()), i18n("Save Error"));
KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(tmpfile.name()), i18n("Save Error"));
return false;
}
umlDoc->saveToXMI(*TQT_TQIODEVICE(&file)); // save the xmi stuff to it

4
umbrello/umbrello/folder.cpp
Unescape View File

@ -286,11 +286,11 @@ bool UMLFolder::loadDiagramsFromXMI(TQDomNode& diagrams) {
bool UMLFolder::loadFolderFile(const TQString& path) {
TQFile file(path);
if (!file.exists()) {
KMessageBox::error(0, i18n("The folderfile %1 does not exist.").tqarg(path), i18n("Load Error"));
KMessageBox::error(0, i18n("The folderfile %1 does not exist.").arg(path), i18n("Load Error"));
return false;
}
if (!file.open(IO_ReadOnly)) {
KMessageBox::error(0, i18n("The folderfile %1 cannot be opened.").tqarg(path), i18n("Load Error"));
KMessageBox::error(0, i18n("The folderfile %1 cannot be opened.").arg(path), i18n("Load Error"));
return false;
}
TQTextStream stream(&file);

2
umbrello/umbrello/messagewidget.h
Unescape View File

@ -209,7 +209,7 @@ public:
UMLClassifier * getSeqNumAndOp(TQString& seqNum, TQString& op);
/**
* Calculate the tqgeometry of the widget.
* Calculate the geometry of the widget.
*/
void calculateWidget();

2
umbrello/umbrello/notewidget.cpp
Unescape View File

@ -201,7 +201,7 @@ void NoteWidget::drawText(TQPainter * p /*=NULL*/, int offsetX /*=0*/, int offse
#if defined (NOTEWIDGET_EMBED_EDITOR)
m_pEditor->setText( getDoc() );
m_pEditor->setShown(true);
m_pEditor->tqrepaint();
m_pEditor->repaint();
#else
if (p == NULL)
return;

2
umbrello/umbrello/notewidgetcontroller.h
Unescape View File

@ -44,7 +44,7 @@ public:
/**
* Overriden from UMLWidgetController.
* Handles a mouse move event.
* Executes base code and then sets the tqgeometry of the editor.
* Executes base code and then sets the geometry of the editor.
*
* @param me The TQMouseEvent event.
*/

4
umbrello/umbrello/refactoring/refactoringassistant.cpp
Unescape View File

@ -650,7 +650,7 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListV
UMLOperation *op = static_cast<UMLOperation*>(movingObject);
if(newClassifier->checkOperationSignature(op->getName(), op->getParmList()))
{
TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).tqarg(newClassifier->getName())
TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).arg(newClassifier->getName())
+
TQString(i18n("Choose a different name or parameter list." ));
KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false);
@ -666,7 +666,7 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListV
// UMLAttribute *att = static_cast<UMLAttribute*>(movingObject);
// if(!newClassifier->checkAttributeSignature(att))
// {
// TQString msg = TQString(i18n("An attribute with that signature already exists in %1.\n")).tqarg(newClassifier->getName())
// TQString msg = TQString(i18n("An attribute with that signature already exists in %1.\n")).arg(newClassifier->getName())
// +
// TQString(i18n("Choose a different name or parameter list." ));
// KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false);

6
umbrello/umbrello/uml.cpp
Unescape View File

@ -737,7 +737,7 @@ bool UMLApp::slotFileSaveAs()
TQDir d = url.path(-1);
if(TQFile::exists(d.path())) {
int want_save = KMessageBox::warningContinueCancel(this, i18n("The file %1 exists.\nDo you wish to overwrite it?").tqarg(url.path()), i18n("Warning"), i18n("Overwrite"));
int want_save = KMessageBox::warningContinueCancel(this, i18n("The file %1 exists.\nDo you wish to overwrite it?").arg(url.path()), i18n("Warning"), i18n("Overwrite"));
if(want_save == KMessageBox::Continue)
cont = false;
} else
@ -776,7 +776,7 @@ void UMLApp::slotFilePrint()
DiagramPrintPage * selectPage = new DiagramPrintPage(0, m_doc);
printer.addDialogPage(selectPage);
TQString msg;
if (printer.setup(this, i18n("Print %1").tqarg(m_doc->URL().prettyURL()))) {
if (printer.setup(this, i18n("Print %1").arg(m_doc->URL().prettyURL()))) {
m_doc -> print(&printer);
}
@ -895,7 +895,7 @@ void UMLApp::slotStatusMsg(const TQString &text) {
statusBar()->clear();
m_statusLabel->setText( text );
m_statusLabel->tqrepaint();
m_statusLabel->repaint();
}
void UMLApp::slotClassDiagram() {

2
umbrello/umbrello/uml.h
Unescape View File

@ -340,7 +340,7 @@ protected:
/**
* Save general Options like all bar positions and status
* as well as the tqgeometry and the recent file list to
* as well as the geometry and the recent file list to
* the configuration file.
*/
void saveOptions();

34
umbrello/umbrello/umldoc.cpp
Unescape View File

@ -352,7 +352,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
KIO::NetAccess::download( url, tmpfile, UMLApp::app() );
TQFile file( tmpfile );
if ( !file.exists() ) {
KMessageBox::error(0, i18n("The file %1 does not exist.").tqarg(d.path()), i18n("Load Error"));
KMessageBox::error(0, i18n("The file %1 does not exist.").arg(d.path()), i18n("Load Error"));
m_doc_url.setFileName(i18n("Untitled"));
m_bLoading = false;
newDocument();
@ -377,7 +377,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
KTar archive(tmpfile, mimetype);
if (archive.open(IO_ReadOnly) == false)
{
KMessageBox::error(0, i18n("The file %1 seems to be corrupted.").tqarg(d.path()), i18n("Load Error"));
KMessageBox::error(0, i18n("The file %1 seems to be corrupted.").arg(d.path()), i18n("Load Error"));
m_doc_url.setFileName(i18n("Untitled"));
m_bLoading = false;
newDocument();
@ -419,7 +419,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
entry = const_cast<KArchiveEntry*>(rootDir->entry(*it));
if (entry == 0)
{
KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(d.path()), i18n("Load Error"));
KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").arg(d.path()), i18n("Load Error"));
m_doc_url.setFileName(i18n("Untitled"));
m_bLoading = false;
newDocument();
@ -431,7 +431,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
fileEntry = dynamic_cast<KArchiveFile*>(entry);
if (fileEntry == 0)
{
KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(d.path()), i18n("Load Error"));
KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").arg(d.path()), i18n("Load Error"));
m_doc_url.setFileName(i18n("Untitled"));
m_bLoading = false;
newDocument();
@ -445,7 +445,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
TQFile xmi_file(tmp_dir.name() + *it);
if( !xmi_file.open( IO_ReadOnly ) )
{
KMessageBox::error(0, i18n("There was a problem loading the extracted file: %1").tqarg(d.path()), i18n("Load Error"));
KMessageBox::error(0, i18n("There was a problem loading the extracted file: %1").arg(d.path()), i18n("Load Error"));
m_doc_url.setFileName(i18n("Untitled"));
m_bLoading = false;
newDocument();
@ -458,7 +458,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
tmp_dir.unlink();
} else {
KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(d.path()), i18n("Load Error"));
KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").arg(d.path()), i18n("Load Error"));
m_doc_url.setFileName(i18n("Untitled"));
m_bLoading = false;
newDocument();
@ -469,7 +469,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
} else {
// no, it seems to be an ordinary file
if( !file.open( IO_ReadOnly ) ) {
KMessageBox::error(0, i18n("There was a problem loading file: %1").tqarg(d.path()), i18n("Load Error"));
KMessageBox::error(0, i18n("There was a problem loading file: %1").arg(d.path()), i18n("Load Error"));
m_doc_url.setFileName(i18n("Untitled"));
m_bLoading = false;
newDocument();
@ -485,7 +485,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
KIO::NetAccess::removeTempFile( tmpfile );
if( !status )
{
KMessageBox::error(0, i18n("There was a problem loading file: %1").tqarg(d.path()), i18n("Load Error"));
KMessageBox::error(0, i18n("There was a problem loading file: %1").arg(d.path()), i18n("Load Error"));
m_bLoading = false;
newDocument();
return false;
@ -553,7 +553,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
// now check if we can write to the file
if (archive->open(IO_WriteOnly) == false)
{
KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error"));
KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
return false;
}
@ -562,7 +562,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
KTempFile tmp_xmi_file;
file.setName(tmp_xmi_file.name());
if( !file.open( IO_WriteOnly ) ) {
KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error"));
KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
return false;
}
saveToXMI(*TQT_TQIODEVICE(&file)); // save XMI to this file...
@ -582,7 +582,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
#if KDE_IS_VERSION(3,4,89)
if (!archive->closeSucceeded())
{
KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error"));
KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
return false;
}
#endif
@ -617,7 +617,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
// lets open the file for writing
if( !file.open( IO_WriteOnly ) ) {
KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error"));
KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
return false;
}
saveToXMI(*TQT_TQIODEVICE(&file)); // save the xmi stuff to it
@ -630,7 +630,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
} else {
// now remove the original file
if ( KIO::NetAccess::file_move( tmpfile.name(), d.path(), -1, true ) == false ) {
KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error"));
KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
m_doc_url.setFileName(i18n("Untitled"));
return false;
}
@ -638,7 +638,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
}
if( !uploaded )
{
KMessageBox::error(0, i18n("There was a problem uploading file: %1").tqarg(d.path()), i18n("Save Error"));
KMessageBox::error(0, i18n("There was a problem uploading file: %1").arg(d.path()), i18n("Save Error"));
m_doc_url.setFileName(i18n("Untitled"));
}
setModified(false);
@ -1096,7 +1096,7 @@ void UMLDoc::removeDiagram(Uml::IDType id) {
kError()<<"Request to remove diagram " << ID2STR(id) << ": Diagram not found!"<<endl;
return;
}
if (KMessageBox::warningContinueCancel(0, i18n("Are you sure you want to delete diagram %1?").tqarg(umlview->getName()), i18n("Delete Diagram"),KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Continue) {
if (KMessageBox::warningContinueCancel(0, i18n("Are you sure you want to delete diagram %1?").arg(umlview->getName()), i18n("Delete Diagram"),KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Continue) {
removeView(umlview);
emit sigDiagramRemoved(id);
setModified(true);
@ -1915,7 +1915,7 @@ void UMLDoc::print(KPrinter * pPrinter) {
for(int i = 0;i < count;i++) {
if(i>0)
pPrinter -> newPage();
TQString diagram = i18n("kde-uml-Diagram") + TQString("%1").tqarg(i);
TQString diagram = i18n("kde-uml-Diagram") + TQString("%1").arg(i);
TQString sID = pPrinter -> option(diagram);
Uml::IDType id = STR2ID(sID);
printView = findView(id);
@ -2101,7 +2101,7 @@ void UMLDoc::slotAutoSave() {
}
KURL tempURL = m_doc_url;
if( tempURL.fileName() == i18n("Untitled") ) {
tempURL.setPath( TQDir::homeDirPath() + i18n("/autosave%1").tqarg(".xmi") );
tempURL.setPath( TQDir::homeDirPath() + i18n("/autosave%1").arg(".xmi") );
saveDocument( tempURL );
m_doc_url.setFileName( i18n("Untitled") );
m_modified = true;

6
umbrello/umbrello/umllistview.cpp
Unescape View File

@ -381,7 +381,7 @@ void UMLListView::popupMenuSel(int sel) {
file.close();
} else {
KMessageBox::error(0,
i18n("There was a problem saving file: %1").tqarg(fileName),
i18n("There was a problem saving file: %1").arg(fileName),
i18n("Save Error"));
return;
}
@ -1719,7 +1719,7 @@ void UMLListView::focusOutEvent ( TQFocusEvent * fe) {
clearSelection();
triggerUpdate();
}
//tqrepaint();
//repaint();
TQListView::focusOutEvent(fe);
}
@ -2378,7 +2378,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement &
UMLListViewItem * item = 0;
if (nID != Uml::id_None) {
// The following is an ad hoc hack for the copy/paste code.
// The clip still contains the old tqchildren although new
// The clip still contains the old children although new
// UMLCLassifierListItems have already been created.
// If the IDChangeLog finds new IDs this means we are in
// copy/paste and need to adjust the child listitems to the

2
umbrello/umbrello/umllistview.h
Unescape View File

@ -88,7 +88,7 @@ public:
int getSelectedItems(UMLListViewItemList &ItemList);
/**
* Get selected items, but only root elements selected (without tqchildren).
* Get selected items, but only root elements selected (without children).
*
* @param ItemList List of UMLListViewItems returned.
* @return The number of selected items.

2
umbrello/umbrello/umllistviewitem.cpp
Unescape View File

@ -465,7 +465,7 @@ void UMLListViewItem::okRename( int col ) {
}
default:
KMessageBox::error( kapp->mainWidget() ,
i18n("Renaming an item of listview type %1 is not yet implemented.").tqarg(m_Type),
i18n("Renaming an item of listview type %1 is not yet implemented.").arg(m_Type),
i18n("Function Not Implemented") );
TQListViewItem::setText(0, m_Label);
break;

4
umbrello/umbrello/umllistviewitem.h
Unescape View File

@ -190,7 +190,7 @@ public:
virtual int compare(TQListViewItem *other, int col, bool ascending) const;
/**
* Returns the number of tqchildren of the UMLListViewItem
* Returns the number of children of the UMLListViewItem
* containing this object
*/
int childCount() const {
@ -213,7 +213,7 @@ public:
/**
* Find the UMLListViewItem that represents the given UMLClassifierListItem
* in the tqchildren of the current UMLListViewItem. (Only makes sense if
* in the children of the current UMLListViewItem. (Only makes sense if
* the current UMLListViewItem represents a UMLClassifier.)
* Return a pointer to the item or NULL if not found.
*/

2
umbrello/umbrello/umlobject.h
Unescape View File

@ -379,7 +379,7 @@ public slots:
signals:
/** Emitted when the UMLObject has changed. Note that some objects emit
* this signal when one of its tqchildren changes, for example, a UMLClass
* this signal when one of its children changes, for example, a UMLClass
* emits a modified() signal when one of its operation changes while the Operation
* itself emits the corresponding signal as well.
*/

10
umbrello/umbrello/umlview.cpp
Unescape View File

@ -294,7 +294,7 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) {
pPainter.translate(offsetX,offsetY);
//draw foot note
TQString string = i18n("Diagram: %2 Page %1").tqarg(page + 1).tqarg(getName());
TQString string = i18n("Diagram: %2 Page %1").arg(page + 1).arg(getName());
TQColor textColor(50, 50, 50);
pPainter.setPen(textColor);
pPainter.drawLine(0, height + 2, width, height + 2);
@ -354,7 +354,7 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) {
getDiagram(TQRect(rect.x(), rect.y(), windowWidth, diagramHeight), pPainter);
//draw foot note
TQString string = i18n("Diagram: %2 Page %1").tqarg( 1).tqarg(getName());
TQString string = i18n("Diagram: %2 Page %1").arg( 1).arg(getName());
TQColor textColor(50, 50, 50);
pPainter.setPen(textColor);
pPainter.drawLine(rect.x(), footTop , windowWidth, footTop);
@ -3014,10 +3014,10 @@ bool UMLView::loadFromXMI( TQDomElement & qElement ) {
TQString zoom = qElement.attribute( "zoom", "100" );
m_nZoom = zoom.toInt();
TQString height = qElement.attribute( "canvasheight", TQString("%1").tqarg(UMLView::defaultCanvasSize) );
TQString height = qElement.attribute( "canvasheight", TQString("%1").arg(UMLView::defaultCanvasSize) );
m_nCanvasHeight = height.toInt();
TQString width = qElement.attribute( "canvaswidth", TQString("%1").tqarg(UMLView::defaultCanvasSize) );
TQString width = qElement.attribute( "canvaswidth", TQString("%1").arg(UMLView::defaultCanvasSize) );
m_nCanvasWidth = width.toInt();
int nType = type.toInt();
@ -3226,7 +3226,7 @@ bool UMLView::loadUisDiagramPresentation(TQDomElement & qElement) {
while (!e.isNull()) {
tag = e.tagName();
kDebug() << "Presentation: tag = " << tag << endl;
if (Uml::tagEq(tag, "Presentation.tqgeometry")) {
if (Uml::tagEq(tag, "Presentation.geometry")) {
TQDomNode gnode = e.firstChild();
TQDomElement gelem = gnode.toElement();
TQString csv = gelem.text();

4
umbrello/umbrello/umlview.h
Unescape View File

@ -706,7 +706,7 @@ public:
void resetPastePoint();
/**
* Called by the view or any of its tqchildren when they start a cut
* Called by the view or any of its children when they start a cut
* operation.
*/
void setStartedCut() {
@ -1120,7 +1120,7 @@ protected:
UMLWidgetList m_SelectedList;
/**
* Flag if view/tqchildren started cut operation.
* Flag if view/children started cut operation.
*/
bool m_bStartedCut;

2
umbrello/umbrello/umlviewimageexporter.cpp
Unescape View File

@ -63,7 +63,7 @@ bool UMLViewImageExporter::prepareExportView() {
// check if the file exists
if (KIO::NetAccess::exists(m_imageURL, true, UMLApp::app())) {
int wantSave = KMessageBox::warningContinueCancel(0,
i18n("The selected file %1 exists.\nDo you want to overwrite it?").tqarg(m_imageURL.prettyURL()),
i18n("The selected file %1 exists.\nDo you want to overwrite it?").arg(m_imageURL.prettyURL()),
i18n("File Already Exists"), i18n("&Overwrite"));
if (wantSave == KMessageBox::Continue) {
exportPrepared = true;

10
umbrello/umbrello/umlviewimageexportermodel.cpp
Unescape View File

@ -123,7 +123,7 @@ TQStringList UMLViewImageExporterModel::exportAllViews(const TQString &imageType
TQString UMLViewImageExporterModel::exportView(UMLView* view, const TQString &imageType, const KURL &url) const {
// create the needed directories
if (!prepareDirectory(url)) {
return i18n("Can not create directory: %1").tqarg(url.directory());
return i18n("Can not create directory: %1").arg(url.directory());
}
// The fileName will be used when exporting the image. If the url isn't local,
@ -148,14 +148,14 @@ TQString UMLViewImageExporterModel::exportView(UMLView* view, const TQString &im
// exporting the view to the file
if (!exportViewTo(view, imageType, fileName)) {
tmpFile.unlink();
return i18n("A problem occured while saving diagram in %1").tqarg(fileName);
return i18n("A problem occured while saving diagram in %1").arg(fileName);
}
// if the file wasn't local, upload the temp file to the target
if (!url.isLocalFile()) {
if (!KIO::NetAccess::upload(tmpFile.name(), url, UMLApp::app())) {
tmpFile.unlink();
return i18n("There was a problem saving file: %1").tqarg(url.path());
return i18n("There was a problem saving file: %1").arg(url.path());
}
} //!isLocalFile
@ -177,7 +177,7 @@ TQString UMLViewImageExporterModel::getDiagramFileName(UMLView *view, const TQSt
listViewItem = static_cast<UMLListViewItem*>(listViewItem->parent());
// Relies on the tree structure of the UMLListView. There are a base "Views" folder
// and five tqchildren, one for each view type (Logical, use case, components, deployment
// and five children, one for each view type (Logical, use case, components, deployment
// and entity relationship)
while (listView->rootView(listViewItem->getType()) == NULL) {
name.insert(0, listViewItem->getText() + '/');
@ -320,7 +320,7 @@ bool UMLViewImageExporterModel::fixEPS(const TQString &fileName, const TQRect& r
// modify content
fileContent.replace(pos,rx.cap(0).length(),
TQString("%%BoundingBox: %1 %2 %3 %4").tqarg(left).tqarg(bottom).tqarg(right).tqarg(top));
TQString("%%BoundingBox: %1 %2 %3 %4").arg(left).arg(bottom).arg(right).arg(top));
ts << fileContent;
epsfile.close();

2
umbrello/umbrello/umlwidget.h
Unescape View File

@ -667,7 +667,7 @@ public slots:
/**
* This slot is entered when an event has occurred on the views display,
* most likely a mouse event. Before it sends out that mouse event all
* tqchildren should make sure that they don't have a menu active or there
* children should make sure that they don't have a menu active or there
* could be more than one popup menu displayed.
*/
virtual void slotRemovePopupMenu();

Write Preview
Loading…
Cancel
Save