Remove additional unneeded tq method conversions

(cherry picked from commit 75112ed8e2)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent 0669339d48
commit 19e67aed27

@ -526,7 +526,7 @@ void AtlanticDesigner::openFile(const TQString &filename)
if (i < 8) if (i < 8)
{ {
KMessageBox::detailedSorry(this, i18n("This board file is invalid; cannot open."), i18n("There are only %1 estates specified in this file.").tqarg(i)); KMessageBox::detailedSorry(this, i18n("This board file is invalid; cannot open."), i18n("There are only %1 estates specified in this file.").arg(i));
if (this->filename.isNull()) if (this->filename.isNull())
close(); close();
return; return;
@ -553,7 +553,7 @@ void AtlanticDesigner::updateJumpMenu()
{ {
TQStringList estates; TQStringList estates;
for (int i = 1; i <= max; i++) for (int i = 1; i <= max; i++)
estates.append(i18n("Jump to Estate %1").tqarg(TQString::number(i))); estates.append(i18n("Jump to Estate %1").arg(TQString::number(i)));
estateAct->setItems(estates); estateAct->setItems(estates);
} }
@ -679,7 +679,7 @@ void AtlanticDesigner::save()
writtenGroups.append((*it).name()); writtenGroups.append((*it).name());
t << endl << TQString("[%1]").tqarg((*it).name()) << endl; t << endl << TQString("[%1]").arg((*it).name()) << endl;
if ((*it).globalPrice() > 0) if ((*it).globalPrice() > 0)
t << "price=" << (*it).globalPrice() << endl; t << "price=" << (*it).globalPrice() << endl;
@ -748,7 +748,7 @@ void AtlanticDesigner::save()
for (estate = estates.first(); estate; estate = estates.next()) for (estate = estates.first(); estate; estate = estates.next())
{ {
t << endl << TQString("[%1]").tqarg(estate->name()) << endl; t << endl << TQString("[%1]").arg(estate->name()) << endl;
switch (estate->type()) switch (estate->type())
{ {

@ -80,7 +80,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const
TQFile file( fileName ); TQFile file( fileName );
if ( !file.open( IO_ReadOnly ) ) { if ( !file.open( IO_ReadOnly ) ) {
TQString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" ); TQString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" );
KMessageBox::error( parentWidget(), msg.tqarg( fileName ) ); KMessageBox::error( parentWidget(), msg.arg( fileName ) );
return addrList; return addrList;
} }
@ -91,7 +91,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const
line = gmxStream.readLine(); line = gmxStream.readLine();
line2 = gmxStream.readLine(); line2 = gmxStream.readLine();
if (!line.startsWith("AB_ADDRESSES:") || !line2.startsWith("Address_id")) { if (!line.startsWith("AB_ADDRESSES:") || !line2.startsWith("Address_id")) {
KMessageBox::error( parentWidget(), i18n("%1 is not a GMX address book file.").tqarg(fileName) ); KMessageBox::error( parentWidget(), i18n("%1 is not a GMX address book file.").arg(fileName) );
return addrList; return addrList;
} }
@ -214,8 +214,8 @@ bool GMXXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
KTempFile tmpFile; KTempFile tmpFile;
if ( tmpFile.status() != 0 ) { if ( tmpFile.status() != 0 ) {
TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" ); TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" );
KMessageBox::error( parentWidget(), txt.tqarg( url.url() ) KMessageBox::error( parentWidget(), txt.arg( url.url() )
.tqarg( strerror( tmpFile.status() ) ) ); .arg( strerror( tmpFile.status() ) ) );
return false; return false;
} }
@ -229,7 +229,7 @@ bool GMXXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
if ( !file.open( IO_WriteOnly ) ) { if ( !file.open( IO_WriteOnly ) ) {
TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ); TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" );
KMessageBox::error( parentWidget(), txt.tqarg( filename ) ); KMessageBox::error( parentWidget(), txt.arg( filename ) );
return false; return false;
} }

@ -58,9 +58,9 @@ bool GeoXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
if ( flags != 0 ) { if ( flags != 0 ) {
for ( int i = 0; i < flags; ++i ) { for ( int i = 0; i < flags; ++i ) {
FlagInfo info; FlagInfo info;
info.latitude = config.readDoubleNumEntry( TQString( "Flag_%1_Latitude" ).tqarg( i ) ); info.latitude = config.readDoubleNumEntry( TQString( "Flag_%1_Latitude" ).arg( i ) );
info.longitude = config.readDoubleNumEntry( TQString( "Flag_%1_Longitude" ).tqarg( i ) ); info.longitude = config.readDoubleNumEntry( TQString( "Flag_%1_Longitude" ).arg( i ) );
info.color = config.readColorEntry( TQString( "Flag_%1_Color" ).tqarg( i ) ); info.color = config.readColorEntry( TQString( "Flag_%1_Color" ).arg( i ) );
availableFlags.append( info ); availableFlags.append( info );
} }
@ -102,9 +102,9 @@ bool GeoXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
int startVal = 0; int startVal = 0;
TQValueList<FlagInfo>::Iterator it; TQValueList<FlagInfo>::Iterator it;
for ( it = flagList.begin(); it != flagList.end(); ++it, ++startVal ) { for ( it = flagList.begin(); it != flagList.end(); ++it, ++startVal ) {
config.writeEntry( TQString( "Flag_%1_Color" ).tqarg( startVal ), (*it).color ); config.writeEntry( TQString( "Flag_%1_Color" ).arg( startVal ), (*it).color );
config.writeEntry( TQString( "Flag_%1_Latitude" ).tqarg( startVal ), (*it).latitude ); config.writeEntry( TQString( "Flag_%1_Latitude" ).arg( startVal ), (*it).latitude );
config.writeEntry( TQString( "Flag_%1_Longitude" ).tqarg( startVal ), (*it).longitude ); config.writeEntry( TQString( "Flag_%1_Longitude" ).arg( startVal ), (*it).longitude );
} }
config.writeEntry( "Flags", startVal ); config.writeEntry( "Flags", startVal );

@ -190,7 +190,7 @@ void PluginKateFileListLoader::slotSaveList()
{ {
/* if (m_oldInitURL!=application()->initPluginManager()->initScript()) /* if (m_oldInitURL!=application()->initPluginManager()->initScript())
{ {
switch (KMessageBox::questionYesNoCancel(0,i18n("<qt>Since the last time you saved the file list, Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").tqarg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard())) switch (KMessageBox::questionYesNoCancel(0,i18n("<qt>Since the last time you saved the file list, Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").arg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard()))
{ {
case KMessageBox::Yes: save(); break; case KMessageBox::Yes: save(); break;
case KMessageBox::No: slotSaveListAs(); break; case KMessageBox::No: slotSaveListAs(); break;
@ -203,7 +203,7 @@ void PluginKateFileListLoader::slotSaveList()
{ {
/*if (m_saveURL!=application()->initPluginManager()->initScript()) /*if (m_saveURL!=application()->initPluginManager()->initScript())
{ {
switch (KMessageBox::questionYesNoCancel(0,i18n("<qt>Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").tqarg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard())) switch (KMessageBox::questionYesNoCancel(0,i18n("<qt>Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").arg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard()))
{ {
case KMessageBox::Yes: save(); break; case KMessageBox::Yes: save(); break;
case KMessageBox::No: slotSaveListAs(); break; case KMessageBox::No: slotSaveListAs(); break;

@ -381,7 +381,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url )
if ( ! file.open( IO_ReadOnly ) ) if ( ! file.open( IO_ReadOnly ) )
{ {
KMessageBox::sorry( application()->activeMainWindow()->viewManager()->activeView(), KMessageBox::sorry( application()->activeMainWindow()->viewManager()->activeView(),
i18n("<qt>Error opening the file<br><strong>%1</strong><br>for reading. The document will not be created.</qt>").tqarg(filename), i18n("<qt>Error opening the file<br><strong>%1</strong><br>for reading. The document will not be created.</qt>").arg(filename),
i18n("Template Plugin"), 0 ); i18n("Template Plugin"), 0 );
KIO::NetAccess::removeTempFile( tmpfile ); KIO::NetAccess::removeTempFile( tmpfile );
return; return;
@ -479,7 +479,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url )
count++; count++;
if ( docname.contains( "%1" ) ) if ( docname.contains( "%1" ) )
docname = docname.tqarg( count ); docname = docname.arg( count );
doc->setDocName( docname ); doc->setDocName( docname );
@ -795,12 +795,12 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft
"edit the data in the KDE email information."), page ) ); "edit the data in the KDE email information."), page ) );
cbRRealname = new TQCheckBox( i18n("Replace full name '%1' with the " cbRRealname = new TQCheckBox( i18n("Replace full name '%1' with the "
"'%{fullname}' macro").tqarg( sFullname ), page ); "'%{fullname}' macro").arg( sFullname ), page );
cbRRealname->setEnabled( ! sFullname.isEmpty() ); cbRRealname->setEnabled( ! sFullname.isEmpty() );
lo->addWidget( cbRRealname ); lo->addWidget( cbRRealname );
cbREmail = new TQCheckBox( i18n("Replace email address '%1' with the " cbREmail = new TQCheckBox( i18n("Replace email address '%1' with the "
"'%email' macro").tqarg( sEmail ), page); "'%email' macro").arg( sEmail ), page);
cbREmail->setEnabled( ! sEmail.isEmpty() ); cbREmail->setEnabled( ! sEmail.isEmpty() );
lo->addWidget( cbREmail ); lo->addWidget( cbREmail );
@ -922,7 +922,7 @@ void KateTemplateWizard::accept()
if ( KMessageBox::warningContinueCancel( this, i18n( if ( KMessageBox::warningContinueCancel( this, i18n(
"<p>The file <br><strong>'%1'</strong><br> already exists; if you " "<p>The file <br><strong>'%1'</strong><br> already exists; if you "
"do not want to overwrite it, change the template file name to " "do not want to overwrite it, change the template file name to "
"something else.").tqarg( templateUrl.prettyURL() ), "something else.").arg( templateUrl.prettyURL() ),
i18n("File Exists"), i18n("Overwrite") ) i18n("File Exists"), i18n("Overwrite") )
== KMessageBox::Cancel ) == KMessageBox::Cancel )
return; return;
@ -976,7 +976,7 @@ void KateTemplateWizard::accept()
{ {
KMessageBox::sorry( this, i18n( KMessageBox::sorry( this, i18n(
"<qt>Error opening the file<br><strong>%1</strong><br>for reading. " "<qt>Error opening the file<br><strong>%1</strong><br>for reading. "
"The document will not be created</qt>").tqarg(u.prettyURL()), "The document will not be created</qt>").arg(u.prettyURL()),
i18n("Template Plugin"), 0 ); i18n("Template Plugin"), 0 );
KIO::NetAccess::removeTempFile( tmpfile ); KIO::NetAccess::removeTempFile( tmpfile );
@ -1055,7 +1055,7 @@ void KateTemplateWizard::accept()
{ {
KMessageBox::sorry( this, i18n( KMessageBox::sorry( this, i18n(
"Unable to save the template to '%1'.\n\nThe template will be opened, " "Unable to save the template to '%1'.\n\nThe template will be opened, "
"so you can save it from the editor.").tqarg( templateUrl.prettyURL() ), "so you can save it from the editor.").arg( templateUrl.prettyURL() ),
i18n("Save Failed") ); i18n("Save Failed") );
kft->application()->activeMainWindow()->viewManager()->openURL( KURL() ); kft->application()->activeMainWindow()->viewManager()->openURL( KURL() );

@ -208,7 +208,7 @@ void PluginKateInsertCommand::slotShowWaitDlg()
{ {
if ( sh->isRunning() ) { if ( sh->isRunning() ) {
wdlg = new WaitDlg( (TQWidget*)kv, i18n( wdlg = new WaitDlg( (TQWidget*)kv, i18n(
"Executing command:\n%1\n\nPress 'Cancel' to abort.").tqarg(cmd) ); "Executing command:\n%1\n\nPress 'Cancel' to abort.").arg(cmd) );
connect(wdlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotAbort()) ); connect(wdlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotAbort()) );
} }
if ( sh->isRunning() ) // we may have finished while creating the dialog. if ( sh->isRunning() ) // we may have finished while creating the dialog.

@ -178,7 +178,7 @@ KJS::Value DocumentManager::call( KJS::ExecState *exec, KJS::Object &self, const
kdDebug()<<"calling illegal method of DocumentManager"<<endl; kdDebug()<<"calling illegal method of DocumentManager"<<endl;
return KJS::Null(); return KJS::Null();
} }
TQString msg = i18n("Method %1 called with wrong signature").tqarg(mdesc); TQString msg = i18n("Method %1 called with wrong signature").arg(mdesc);
KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() ); KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() );
exec->setException( err ); exec->setException( err );
return KJS::Undefined(); return KJS::Undefined();
@ -310,7 +310,7 @@ KJS::Value Kate::JS::Application::call( KJS::ExecState *exec, KJS::Object &self,
} }
TQString msg = i18n("Method %1 called with wrong signature").tqarg(mdesc); TQString msg = i18n("Method %1 called with wrong signature").arg(mdesc);
KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() ); KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() );
exec->setException( err ); exec->setException( err );
return KJS::Undefined(); return KJS::Undefined();
@ -458,7 +458,7 @@ KJS::Value Kate::JS::MainWindow::call( KJS::ExecState *exec, KJS::Object &self,
default: default:
return KJS::Undefined(); return KJS::Undefined();
} }
TQString msg = i18n("Method %1 called with wrong signature").tqarg(mdesc); TQString msg = i18n("Method %1 called with wrong signature").arg(mdesc);
KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() ); KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() );
exec->setException( err ); exec->setException( err );
return KJS::Undefined(); return KJS::Undefined();

@ -86,7 +86,7 @@ PluginKateKJSWrapper::PluginKateKJSWrapper( TQObject* parent, const char* name,
w->show(); w->show();
//w->show();*/ //w->show();*/
kdDebug()<<"m_scriptname="<<m_scriptname<<endl; kdDebug()<<"m_scriptname="<<m_scriptname<<endl;
m_part->runFile(locate("appdata",TQString("plugins/%1/%2.js").tqarg(m_scriptname).tqarg(m_scriptname))); m_part->runFile(locate("appdata",TQString("plugins/%1/%2.js").arg(m_scriptname).arg(m_scriptname)));
//"/home/jowenn/development/kde/cvs/kdeaddons/kate/kjswrapper/samples/test1.js"); //"/home/jowenn/development/kde/cvs/kdeaddons/kate/kjswrapper/samples/test1.js");
} }
@ -343,7 +343,7 @@ void PluginKateKJSWrapper::addView(Kate::MainWindow *win)
if (exec->hadException()) kdDebug()<<"void PluginKateKJSWrapper::addView(Kate::MainWindow *win): exec had an exception - 2"<<endl; if (exec->hadException()) kdDebug()<<"void PluginKateKJSWrapper::addView(Kate::MainWindow *win): exec had an exception - 2"<<endl;
view->setInstance (new KInstance("kate")); view->setInstance (new KInstance("kate"));
view->setXMLFile(TQString("plugins/%1/%2.rc").tqarg(m_scriptname).tqarg(m_scriptname)); view->setXMLFile(TQString("plugins/%1/%2.rc").arg(m_scriptname).arg(m_scriptname));
win->guiFactory()->addClient (view); win->guiFactory()->addClient (view);
} }

@ -286,7 +286,7 @@ KPyBrowser::parseText (TQString & pytext)
line = &(*iter); line = &(*iter);
if (class_rx.search(*line) >= 0) if (class_rx.search(*line) >= 0)
{ {
//KMessageBox::information(this, *line, TQString("Found class on line %1").tqarg(line_no)); //KMessageBox::information(this, *line, TQString("Found class on line %1").arg(line_no));
//strip out the beginning class and ending colon //strip out the beginning class and ending colon
class_sig = line->stripWhiteSpace ().mid (6); class_sig = line->stripWhiteSpace ().mid (6);
class_sig = class_sig.left (class_sig.length () - 1); class_sig = class_sig.left (class_sig.length () - 1);
@ -318,7 +318,7 @@ KPyBrowser::parseText (TQString & pytext)
} }
if ((function_rx.search(*line) >= 0)) if ((function_rx.search(*line) >= 0))
{ {
//KMessageBox::information(this, *line, TQString("Found function on line %1").tqarg(line_no)); //KMessageBox::information(this, *line, TQString("Found function on line %1").arg(line_no));
function_sig = line->stripWhiteSpace ().mid (4); function_sig = line->stripWhiteSpace ().mid (4);
function_sig = function_sig.left (function_sig.find (":")); function_sig = function_sig.left (function_sig.find (":"));
paren_i = function_sig.find ("("); paren_i = function_sig.find ("(");

@ -104,7 +104,7 @@ void PluginViewPyBrowse::slotSelected(TQString name, int line)
if (apiline == -1) if (apiline == -1)
{ {
KMessageBox::information(0, KMessageBox::information(0,
i18n("Could not find method/class %1.").tqarg(name), i18n("Selection")); i18n("Could not find method/class %1.").arg(name), i18n("Selection"));
} }
else else
{ {

@ -192,7 +192,7 @@ protected:
TQString ErrorMessage::caption() const TQString ErrorMessage::caption() const
{ {
return TQString::fromLatin1("%1:%2").tqarg(text(COL_FILE)).tqarg(line()); return TQString::fromLatin1("%1:%2").arg(text(COL_FILE)).arg(line());
} }
TQString ErrorMessage::fancyMessage() const TQString ErrorMessage::fancyMessage() const
@ -557,7 +557,7 @@ void PluginKateMakeView::slotClicked(TQListViewItem *item)
<< globalPos.x() << "," << globalPos.y() << endl; << globalPos.x() << "," << globalPos.y() << endl;
#if 0 #if 0
KPassivePopup::message( KPassivePopup::message(
TQString::fromLatin1("%1:%2").tqarg(filename).tqarg(lineno), TQString::fromLatin1("%1:%2").arg(filename).arg(lineno),
msg, msg,
this); this);
#else #else
@ -644,7 +644,7 @@ bool PluginKateMakeView::slotValidate()
KMessageBox::sorry(0, KMessageBox::sorry(0,
i18n("The file <i>%1</i> is not a local file. " i18n("The file <i>%1</i> is not a local file. "
"Non-local files cannot be compiled.") "Non-local files cannot be compiled.")
.tqarg(url.path())); .arg(url.path()));
return false; return false;
} }
@ -662,7 +662,7 @@ bool PluginKateMakeView::slotValidate()
make = KStandardDirs::findExe("make"); make = KStandardDirs::findExe("make");
*m_proc << make; *m_proc << make;
if( make.isEmpty() || ! m_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) ) { if( make.isEmpty() || ! m_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) ) {
KMessageBox::error(0, i18n("<b>Error:</b> Failed to run %1.").tqarg(make.isEmpty() ? KMessageBox::error(0, i18n("<b>Error:</b> Failed to run %1.").arg(make.isEmpty() ?
"make" : make)); "make" : make));
return false; return false;
} }

@ -120,7 +120,7 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow
setResizeMode(TQListView::LastColumn); setResizeMode(TQListView::LastColumn);
connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotClicked(TQListViewItem *))); connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotClicked(TQListViewItem *)));
/* TODO?: tqinvalidate the listview when document has changed /* TODO?: invalidate the listview when document has changed
Kate::View *kv = application()->activeMainWindow()->viewManager()->activeView(); Kate::View *kv = application()->activeMainWindow()->viewManager()->activeView();
if( ! kv ) { if( ! kv ) {
kdDebug() << "Warning: no Kate::View" << endl; kdDebug() << "Warning: no Kate::View" << endl;
@ -280,7 +280,7 @@ bool PluginKateXMLCheckView::slotValidate()
if( m_tmp_file->status() != 0 ) { if( m_tmp_file->status() != 0 ) {
kdDebug() << "Error (slotValidate()): could not create '" << m_tmp_file->name() << "': " << m_tmp_file->status() << endl; kdDebug() << "Error (slotValidate()): could not create '" << m_tmp_file->name() << "': " << m_tmp_file->status() << endl;
KMessageBox::error(0, i18n("<b>Error:</b> Could not create " KMessageBox::error(0, i18n("<b>Error:</b> Could not create "
"temporary file '%1'.").tqarg(m_tmp_file->name())); "temporary file '%1'.").arg(m_tmp_file->name()));
delete m_tmp_file; delete m_tmp_file;
m_tmp_file=0L; m_tmp_file=0L;
return false; return false;

@ -689,11 +689,11 @@
type="param" type="param"
> >
<text-expanded>align (left|center|right|justify|char) #IMPLIED <text-expanded>align (left|center|right|justify|char) #IMPLIED
char CDATA #IMPLIED -- tqalignment char, e.g. char=':' -- char CDATA #IMPLIED -- alignment char, e.g. char=':' --
charoff CDATA #IMPLIED -- offset for tqalignment char --</text-expanded> charoff CDATA #IMPLIED -- offset for alignment char --</text-expanded>
<text>align (left|center|right|justify|char) #IMPLIED <text>align (left|center|right|justify|char) #IMPLIED
char %Character; #IMPLIED -- tqalignment char, e.g. char=':' -- char %Character; #IMPLIED -- alignment char, e.g. char=':' --
charoff %Length; #IMPLIED -- offset for tqalignment char --</text> charoff %Length; #IMPLIED -- offset for alignment char --</text>
</entity> </entity>
<entity name="pre.exclusion" <entity name="pre.exclusion"
@ -3621,8 +3621,8 @@
%attrs; -- %coreattrs, %i18n, %events -- %attrs; -- %coreattrs, %i18n, %events --
span NUMBER 1 -- default number of columns in group -- span NUMBER 1 -- default number of columns in group --
width %MultiLength; #IMPLIED -- default width for enclosed COLs -- width %MultiLength; #IMPLIED -- default width for enclosed COLs --
%cellhalign; -- horizontal tqalignment in cells -- %cellhalign; -- horizontal alignment in cells --
%cellvalign; -- vertical tqalignment in cells -- %cellvalign; -- vertical alignment in cells --
</attdecl> </attdecl>
<attribute name="onmouseout" <attribute name="onmouseout"
type="#IMPLIED" type="#IMPLIED"
@ -4909,8 +4909,8 @@
<attlist name="TBODY"> <attlist name="TBODY">
<attdecl> -- table section -- <attdecl> -- table section --
%attrs; -- %coreattrs, %i18n, %events -- %attrs; -- %coreattrs, %i18n, %events --
%cellhalign; -- horizontal tqalignment in cells -- %cellhalign; -- horizontal alignment in cells --
%cellvalign; -- vertical tqalignment in cells -- %cellvalign; -- vertical alignment in cells --
</attdecl> </attdecl>
<attribute name="onmouseout" <attribute name="onmouseout"
type="#IMPLIED" type="#IMPLIED"
@ -5086,7 +5086,7 @@
name CDATA #IMPLIED -- allows applets to find each other -- name CDATA #IMPLIED -- allows applets to find each other --
width %Length; #REQUIRED -- initial width -- width %Length; #REQUIRED -- initial width --
height %Length; #REQUIRED -- initial height -- height %Length; #REQUIRED -- initial height --
align %IAlign; #IMPLIED -- vertical or horizontal tqalignment -- align %IAlign; #IMPLIED -- vertical or horizontal alignment --
hspace %Pixels; #IMPLIED -- horizontal gutter -- hspace %Pixels; #IMPLIED -- horizontal gutter --
vspace %Pixels; #IMPLIED -- vertical gutter -- vspace %Pixels; #IMPLIED -- vertical gutter --
</attdecl> </attdecl>
@ -5170,8 +5170,8 @@
<attlist name="TFOOT"> <attlist name="TFOOT">
<attdecl> -- table section -- <attdecl> -- table section --
%attrs; -- %coreattrs, %i18n, %events -- %attrs; -- %coreattrs, %i18n, %events --
%cellhalign; -- horizontal tqalignment in cells -- %cellhalign; -- horizontal alignment in cells --
%cellvalign; -- vertical tqalignment in cells -- %cellvalign; -- vertical alignment in cells --
</attdecl> </attdecl>
<attribute name="onmouseout" <attribute name="onmouseout"
type="#IMPLIED" type="#IMPLIED"
@ -5683,8 +5683,8 @@
%attrs; -- %coreattrs, %i18n, %events -- %attrs; -- %coreattrs, %i18n, %events --
span NUMBER 1 -- COL attributes affect N columns -- span NUMBER 1 -- COL attributes affect N columns --
width %MultiLength; #IMPLIED -- column width specification -- width %MultiLength; #IMPLIED -- column width specification --
%cellhalign; -- horizontal tqalignment in cells -- %cellhalign; -- horizontal alignment in cells --
%cellvalign; -- vertical tqalignment in cells -- %cellvalign; -- vertical alignment in cells --
</attdecl> </attdecl>
<attribute name="onmouseout" <attribute name="onmouseout"
type="#IMPLIED" type="#IMPLIED"
@ -6457,7 +6457,7 @@
width %Length; #IMPLIED -- override width -- width %Length; #IMPLIED -- override width --
usemap %URI; #IMPLIED -- use client-side image map -- usemap %URI; #IMPLIED -- use client-side image map --
ismap (ismap) #IMPLIED -- use server-side image map -- ismap (ismap) #IMPLIED -- use server-side image map --
align %IAlign; #IMPLIED -- vertical or horizontal tqalignment -- align %IAlign; #IMPLIED -- vertical or horizontal alignment --
border %Pixels; #IMPLIED -- link border width -- border %Pixels; #IMPLIED -- link border width --
hspace %Pixels; #IMPLIED -- horizontal gutter -- hspace %Pixels; #IMPLIED -- horizontal gutter --
vspace %Pixels; #IMPLIED -- vertical gutter -- vspace %Pixels; #IMPLIED -- vertical gutter --
@ -6648,7 +6648,7 @@
rel %LinkTypes; #IMPLIED -- forward link types -- rel %LinkTypes; #IMPLIED -- forward link types --
rev %LinkTypes; #IMPLIED -- reverse link types -- rev %LinkTypes; #IMPLIED -- reverse link types --
accesskey %Character; #IMPLIED -- accessibility key character -- accesskey %Character; #IMPLIED -- accessibility key character --
tqshape %Shape; rect -- for use with client-side image maps -- shape %Shape; rect -- for use with client-side image maps --
coords %Coords; #IMPLIED -- for use with client-side image maps -- coords %Coords; #IMPLIED -- for use with client-side image maps --
tabindex NUMBER #IMPLIED -- position in tabbing order -- tabindex NUMBER #IMPLIED -- position in tabbing order --
onfocus %Script; #IMPLIED -- the element got the focus -- onfocus %Script; #IMPLIED -- the element got the focus --
@ -6742,7 +6742,7 @@
type="#IMPLIED" type="#IMPLIED"
value="CDATA" value="CDATA"
default=""/> default=""/>
<attribute name="tqshape" <attribute name="shape"
type="" type=""
enumeration="yes" enumeration="yes"
value="rect circle poly default" value="rect circle poly default"
@ -6956,7 +6956,7 @@
<attlist name="H1"> <attlist name="H1">
<attdecl> <attdecl>
%attrs; -- %coreattrs, %i18n, %events -- %attrs; -- %coreattrs, %i18n, %events --
%align; -- align, text tqalignment -- %align; -- align, text alignment --
</attdecl> </attdecl>
<attribute name="title" <attribute name="title"
type="#IMPLIED" type="#IMPLIED"
@ -7085,7 +7085,7 @@
<attlist name="H2"> <attlist name="H2">
<attdecl> <attdecl>
%attrs; -- %coreattrs, %i18n, %events -- %attrs; -- %coreattrs, %i18n, %events --
%align; -- align, text tqalignment -- %align; -- align, text alignment --
</attdecl> </attdecl>
<attribute name="title" <attribute name="title"
type="#IMPLIED" type="#IMPLIED"
@ -7214,7 +7214,7 @@
<attlist name="H3"> <attlist name="H3">
<attdecl> <attdecl>
%attrs; -- %coreattrs, %i18n, %events -- %attrs; -- %coreattrs, %i18n, %events --
%align; -- align, text tqalignment -- %align; -- align, text alignment --
</attdecl> </attdecl>
<attribute name="title" <attribute name="title"
type="#IMPLIED" type="#IMPLIED"
@ -7439,7 +7439,7 @@
<attlist name="H4"> <attlist name="H4">
<attdecl> <attdecl>
%attrs; -- %coreattrs, %i18n, %events -- %attrs; -- %coreattrs, %i18n, %events --
%align; -- align, text tqalignment -- %align; -- align, text alignment --
</attdecl> </attdecl>
<attribute name="title" <attribute name="title"
type="#IMPLIED" type="#IMPLIED"
@ -7716,7 +7716,7 @@
<attlist name="H5"> <attlist name="H5">
<attdecl> <attdecl>
%attrs; -- %coreattrs, %i18n, %events -- %attrs; -- %coreattrs, %i18n, %events --
%align; -- align, text tqalignment -- %align; -- align, text alignment --
</attdecl> </attdecl>
<attribute name="title" <attribute name="title"
type="#IMPLIED" type="#IMPLIED"
@ -8002,7 +8002,7 @@
<attlist name="H6"> <attlist name="H6">
<attdecl> <attdecl>
%attrs; -- %coreattrs, %i18n, %events -- %attrs; -- %coreattrs, %i18n, %events --
%align; -- align, text tqalignment -- %align; -- align, text alignment --
</attdecl> </attdecl>
<attribute name="title" <attribute name="title"
type="#IMPLIED" type="#IMPLIED"
@ -8645,7 +8645,7 @@
<attlist name="P"> <attlist name="P">
<attdecl> <attdecl>
%attrs; -- %coreattrs, %i18n, %events -- %attrs; -- %coreattrs, %i18n, %events --
%align; -- align, text tqalignment -- %align; -- align, text alignment --
</attdecl> </attdecl>
<attribute name="title" <attribute name="title"
type="#IMPLIED" type="#IMPLIED"
@ -9871,7 +9871,7 @@
<attlist name="DIV"> <attlist name="DIV">
<attdecl> <attdecl>
%attrs; -- %coreattrs, %i18n, %events -- %attrs; -- %coreattrs, %i18n, %events --
%align; -- align, text tqalignment -- %align; -- align, text alignment --
%reserved; -- reserved for possible future use -- %reserved; -- reserved for possible future use --
</attdecl> </attdecl>
<attribute name="title" <attribute name="title"
@ -10579,7 +10579,7 @@
usemap %URI; #IMPLIED -- use client-side image map -- usemap %URI; #IMPLIED -- use client-side image map --
name CDATA #IMPLIED -- submit as part of form -- name CDATA #IMPLIED -- submit as part of form --
tabindex NUMBER #IMPLIED -- position in tabbing order -- tabindex NUMBER #IMPLIED -- position in tabbing order --
align %IAlign; #IMPLIED -- vertical or horizontal tqalignment -- align %IAlign; #IMPLIED -- vertical or horizontal alignment --
border %Pixels; #IMPLIED -- link border width -- border %Pixels; #IMPLIED -- link border width --
hspace %Pixels; #IMPLIED -- horizontal gutter -- hspace %Pixels; #IMPLIED -- horizontal gutter --
vspace %Pixels; #IMPLIED -- vertical gutter -- vspace %Pixels; #IMPLIED -- vertical gutter --
@ -10824,8 +10824,8 @@
<attlist name="THEAD"> <attlist name="THEAD">
<attdecl> -- table section -- <attdecl> -- table section --
%attrs; -- %coreattrs, %i18n, %events -- %attrs; -- %coreattrs, %i18n, %events --
%cellhalign; -- horizontal tqalignment in cells -- %cellhalign; -- horizontal alignment in cells --
%cellvalign; -- vertical tqalignment in cells -- %cellvalign; -- vertical alignment in cells --
</attdecl> </attdecl>
<attribute name="onmouseout" <attribute name="onmouseout"
type="#IMPLIED" type="#IMPLIED"
@ -11505,7 +11505,7 @@
marginwidth %Pixels; #IMPLIED -- margin widths in pixels -- marginwidth %Pixels; #IMPLIED -- margin widths in pixels --
marginheight %Pixels; #IMPLIED -- margin height in pixels -- marginheight %Pixels; #IMPLIED -- margin height in pixels --
scrolling (yes|no|auto) auto -- scrollbar or none -- scrolling (yes|no|auto) auto -- scrollbar or none --
align %IAlign; #IMPLIED -- vertical or horizontal tqalignment -- align %IAlign; #IMPLIED -- vertical or horizontal alignment --
height %Length; #IMPLIED -- frame height -- height %Length; #IMPLIED -- frame height --
width %Length; #IMPLIED -- frame width -- width %Length; #IMPLIED -- frame width --
</attdecl> </attdecl>
@ -11742,7 +11742,7 @@
<attlist name="AREA"> <attlist name="AREA">
<attdecl> <attdecl>
%attrs; -- %coreattrs, %i18n, %events -- %attrs; -- %coreattrs, %i18n, %events --
tqshape %Shape; rect -- controls interpretation of coords -- shape %Shape; rect -- controls interpretation of coords --
coords %Coords; #IMPLIED -- comma-separated list of lengths -- coords %Coords; #IMPLIED -- comma-separated list of lengths --
href %URI; #IMPLIED -- URI for linked resource -- href %URI; #IMPLIED -- URI for linked resource --
target %FrameTarget; #IMPLIED -- render in this frame -- target %FrameTarget; #IMPLIED -- render in this frame --
@ -11817,7 +11817,7 @@
type="#IMPLIED" type="#IMPLIED"
value="CDATA" value="CDATA"
default=""/> default=""/>
<attribute name="tqshape" <attribute name="shape"
type="" type=""
enumeration="yes" enumeration="yes"
value="rect circle poly default" value="rect circle poly default"
@ -12054,8 +12054,8 @@
scope %Scope; #IMPLIED -- scope covered by header cells -- scope %Scope; #IMPLIED -- scope covered by header cells --
rowspan NUMBER 1 -- number of rows spanned by cell -- rowspan NUMBER 1 -- number of rows spanned by cell --
colspan NUMBER 1 -- number of cols spanned by cell -- colspan NUMBER 1 -- number of cols spanned by cell --
%cellhalign; -- horizontal tqalignment in cells -- %cellhalign; -- horizontal alignment in cells --
%cellvalign; -- vertical tqalignment in cells -- %cellvalign; -- vertical alignment in cells --
nowrap (nowrap) #IMPLIED -- suppress word wrap -- nowrap (nowrap) #IMPLIED -- suppress word wrap --
bgcolor %Color; #IMPLIED -- cell background color -- bgcolor %Color; #IMPLIED -- cell background color --
width %Length; #IMPLIED -- width for cell -- width %Length; #IMPLIED -- width for cell --
@ -12476,8 +12476,8 @@
scope %Scope; #IMPLIED -- scope covered by header cells -- scope %Scope; #IMPLIED -- scope covered by header cells --
rowspan NUMBER 1 -- number of rows spanned by cell -- rowspan NUMBER 1 -- number of rows spanned by cell --
colspan NUMBER 1 -- number of cols spanned by cell -- colspan NUMBER 1 -- number of cols spanned by cell --
%cellhalign; -- horizontal tqalignment in cells -- %cellhalign; -- horizontal alignment in cells --
%cellvalign; -- vertical tqalignment in cells -- %cellvalign; -- vertical alignment in cells --
nowrap (nowrap) #IMPLIED -- suppress word wrap -- nowrap (nowrap) #IMPLIED -- suppress word wrap --
bgcolor %Color; #IMPLIED -- cell background color -- bgcolor %Color; #IMPLIED -- cell background color --
width %Length; #IMPLIED -- width for cell -- width %Length; #IMPLIED -- width for cell --
@ -13024,8 +13024,8 @@
<attlist name="TR"> <attlist name="TR">
<attdecl> -- table row -- <attdecl> -- table row --
%attrs; -- %coreattrs, %i18n, %events -- %attrs; -- %coreattrs, %i18n, %events --
%cellhalign; -- horizontal tqalignment in cells -- %cellhalign; -- horizontal alignment in cells --
%cellvalign; -- vertical tqalignment in cells -- %cellvalign; -- vertical alignment in cells --
bgcolor %Color; #IMPLIED -- background color for row -- bgcolor %Color; #IMPLIED -- background color for row --
</attdecl> </attdecl>
<attribute name="onmouseout" <attribute name="onmouseout"
@ -13339,7 +13339,7 @@
onselect %Script; #IMPLIED -- some text was selected -- onselect %Script; #IMPLIED -- some text was selected --
onchange %Script; #IMPLIED -- the element value was changed -- onchange %Script; #IMPLIED -- the element value was changed --
accept %ContentTypes; #IMPLIED -- list of MIME types for file upload -- accept %ContentTypes; #IMPLIED -- list of MIME types for file upload --
align %IAlign; #IMPLIED -- vertical or horizontal tqalignment -- align %IAlign; #IMPLIED -- vertical or horizontal alignment --
%reserved; -- reserved for possible future use -- %reserved; -- reserved for possible future use --
</attdecl> </attdecl>
<attribute name="accesskey" <attribute name="accesskey"

@ -594,11 +594,11 @@
type="param" type="param"
> >
<text-expanded>align (left|center|right|justify|char) #IMPLIED <text-expanded>align (left|center|right|justify|char) #IMPLIED
char CDATA #IMPLIED -- tqalignment char, e.g. char=':' -- char CDATA #IMPLIED -- alignment char, e.g. char=':' --
charoff CDATA #IMPLIED -- offset for tqalignment char --</text-expanded> charoff CDATA #IMPLIED -- offset for alignment char --</text-expanded>
<text>align (left|center|right|justify|char) #IMPLIED <text>align (left|center|right|justify|char) #IMPLIED
char %Character; #IMPLIED -- tqalignment char, e.g. char=':' -- char %Character; #IMPLIED -- alignment char, e.g. char=':' --
charoff %Length; #IMPLIED -- offset for tqalignment char --</text> charoff %Length; #IMPLIED -- offset for alignment char --</text>
</entity> </entity>
<entity name="pre.exclusion" <entity name="pre.exclusion"
@ -3127,8 +3127,8 @@
%attrs; -- %coreattrs, %i18n, %events -- %attrs; -- %coreattrs, %i18n, %events --
span NUMBER 1 -- default number of columns in group -- span NUMBER 1 -- default number of columns in group --
width %MultiLength; #IMPLIED -- default width for enclosed COLs -- width %MultiLength; #IMPLIED -- default width for enclosed COLs --
%cellhalign; -- horizontal tqalignment in cells -- %cellhalign; -- horizontal alignment in cells --
%cellvalign; -- vertical tqalignment in cells -- %cellvalign; -- vertical alignment in cells --
</attdecl> </attdecl>
<attribute name="onmouseout" <attribute name="onmouseout"
type="#IMPLIED" type="#IMPLIED"
@ -4148,8 +4148,8 @@
<attlist name="TBODY"> <attlist name="TBODY">
<attdecl> -- table section -- <attdecl> -- table section --
%attrs; -- %coreattrs, %i18n, %events -- %attrs; -- %coreattrs, %i18n, %events --
%cellhalign; -- horizontal tqalignment in cells -- %cellhalign; -- horizontal alignment in cells --
%cellvalign; -- vertical tqalignment in cells -- %cellvalign; -- vertical alignment in cells --
</attdecl> </attdecl>
<attribute name="onmouseout" <attribute name="onmouseout"
type="#IMPLIED" type="#IMPLIED"
@ -4253,8 +4253,8 @@
<attlist name="TFOOT"> <attlist name="TFOOT">
<attdecl> -- table section -- <attdecl> -- table section --
%attrs; -- %coreattrs, %i18n, %events -- %attrs; -- %coreattrs, %i18n, %events --
%cellhalign; -- horizontal tqalignment in cells -- %cellhalign; -- horizontal alignment in cells --
%cellvalign; -- vertical tqalignment in cells -- %cellvalign; -- vertical alignment in cells --
</attdecl> </attdecl>
<attribute name="onmouseout" <attribute name="onmouseout"
type="#IMPLIED" type="#IMPLIED"
@ -4734,8 +4734,8 @@
%attrs; -- %coreattrs, %i18n, %events -- %attrs; -- %coreattrs, %i18n, %events --
span NUMBER 1 -- COL attributes affect N columns -- span NUMBER 1 -- COL attributes affect N columns --
width %MultiLength; #IMPLIED -- column width specification -- width %MultiLength; #IMPLIED -- column width specification --
%cellhalign; -- horizontal tqalignment in cells -- %cellhalign; -- horizontal alignment in cells --
%cellvalign; -- vertical tqalignment in cells -- %cellvalign; -- vertical alignment in cells --
</attdecl> </attdecl>
<attribute name="onmouseout" <attribute name="onmouseout"
type="#IMPLIED" type="#IMPLIED"
@ -5636,7 +5636,7 @@
rel %LinkTypes; #IMPLIED -- forward link types -- rel %LinkTypes; #IMPLIED -- forward link types --
rev %LinkTypes; #IMPLIED -- reverse link types -- rev %LinkTypes; #IMPLIED -- reverse link types --
accesskey %Character; #IMPLIED -- accessibility key character -- accesskey %Character; #IMPLIED -- accessibility key character --
tqshape %Shape; rect -- for use with client-side image maps -- shape %Shape; rect -- for use with client-side image maps --
coords %Coords; #IMPLIED -- for use with client-side image maps -- coords %Coords; #IMPLIED -- for use with client-side image maps --
tabindex NUMBER #IMPLIED -- position in tabbing order -- tabindex NUMBER #IMPLIED -- position in tabbing order --
onfocus %Script; #IMPLIED -- the element got the focus -- onfocus %Script; #IMPLIED -- the element got the focus --
@ -5726,7 +5726,7 @@
type="#IMPLIED" type="#IMPLIED"
value="CDATA" value="CDATA"
default=""/> default=""/>
<attribute name="tqshape" <attribute name="shape"
type="" type=""
enumeration="yes" enumeration="yes"
value="rect circle poly default" value="rect circle poly default"
@ -8923,8 +8923,8 @@
<attlist name="THEAD"> <attlist name="THEAD">
<attdecl> -- table section -- <attdecl> -- table section --
%attrs; -- %coreattrs, %i18n, %events -- %attrs; -- %coreattrs, %i18n, %events --
%cellhalign; -- horizontal tqalignment in cells -- %cellhalign; -- horizontal alignment in cells --
%cellvalign; -- vertical tqalignment in cells -- %cellvalign; -- vertical alignment in cells --
</attdecl> </attdecl>
<attribute name="onmouseout" <attribute name="onmouseout"
type="#IMPLIED" type="#IMPLIED"
@ -9624,7 +9624,7 @@
<attlist name="AREA"> <attlist name="AREA">
<attdecl> <attdecl>
%attrs; -- %coreattrs, %i18n, %events -- %attrs; -- %coreattrs, %i18n, %events --
tqshape %Shape; rect -- controls interpretation of coords -- shape %Shape; rect -- controls interpretation of coords --
coords %Coords; #IMPLIED -- comma-separated list of lengths -- coords %Coords; #IMPLIED -- comma-separated list of lengths --
href %URI; #IMPLIED -- URI for linked resource -- href %URI; #IMPLIED -- URI for linked resource --
nohref (nohref) #IMPLIED -- this region has no action -- nohref (nohref) #IMPLIED -- this region has no action --
@ -9694,7 +9694,7 @@
type="#IMPLIED" type="#IMPLIED"
value="CDATA" value="CDATA"
default=""/> default=""/>
<attribute name="tqshape" <attribute name="shape"
type="" type=""
enumeration="yes" enumeration="yes"
value="rect circle poly default" value="rect circle poly default"
@ -9919,8 +9919,8 @@
scope %Scope; #IMPLIED -- scope covered by header cells -- scope %Scope; #IMPLIED -- scope covered by header cells --
rowspan NUMBER 1 -- number of rows spanned by cell -- rowspan NUMBER 1 -- number of rows spanned by cell --
colspan NUMBER 1 -- number of cols spanned by cell -- colspan NUMBER 1 -- number of cols spanned by cell --
%cellhalign; -- horizontal tqalignment in cells -- %cellhalign; -- horizontal alignment in cells --
%cellvalign; -- vertical tqalignment in cells -- %cellvalign; -- vertical alignment in cells --
</attdecl> </attdecl>
<attribute name="onmouseout" <attribute name="onmouseout"
type="#IMPLIED" type="#IMPLIED"
@ -10250,8 +10250,8 @@
scope %Scope; #IMPLIED -- scope covered by header cells -- scope %Scope; #IMPLIED -- scope covered by header cells --
rowspan NUMBER 1 -- number of rows spanned by cell -- rowspan NUMBER 1 -- number of rows spanned by cell --
colspan NUMBER 1 -- number of cols spanned by cell -- colspan NUMBER 1 -- number of cols spanned by cell --
%cellhalign; -- horizontal tqalignment in cells -- %cellhalign; -- horizontal alignment in cells --
%cellvalign; -- vertical tqalignment in cells -- %cellvalign; -- vertical alignment in cells --
</attdecl> </attdecl>
<attribute name="onmouseout" <attribute name="onmouseout"
type="#IMPLIED" type="#IMPLIED"
@ -10751,8 +10751,8 @@
<attlist name="TR"> <attlist name="TR">
<attdecl> -- table row -- <attdecl> -- table row --
%attrs; -- %coreattrs, %i18n, %events -- %attrs; -- %coreattrs, %i18n, %events --
%cellhalign; -- horizontal tqalignment in cells -- %cellhalign; -- horizontal alignment in cells --
%cellvalign; -- vertical tqalignment in cells -- %cellvalign; -- vertical alignment in cells --
</attdecl> </attdecl>
<attribute name="onmouseout" <attribute name="onmouseout"
type="#IMPLIED" type="#IMPLIED"

@ -466,7 +466,7 @@ void PluginKateXMLTools::getDTD()
url.setFileName( defaultDir + filename ); url.setFileName( defaultDir + filename );
KMessageBox::information(0, i18n("The current file has been identified " KMessageBox::information(0, i18n("The current file has been identified "
"as a document of type \"%1\". The meta DTD for this document type " "as a document of type \"%1\". The meta DTD for this document type "
"will now be loaded.").tqarg( doctype ), "will now be loaded.").arg( doctype ),
i18n( "Loading XML Meta DTD" ), i18n( "Loading XML Meta DTD" ),
TQString::fromLatin1( "DTDAssigned") ); TQString::fromLatin1( "DTDAssigned") );
} }
@ -503,7 +503,7 @@ void PluginKateXMLTools::slotFinished( KIO::Job *job )
{ {
// catch failed loading loading via http: // catch failed loading loading via http:
KMessageBox::error(0, i18n("The file '%1' could not be opened. " KMessageBox::error(0, i18n("The file '%1' could not be opened. "
"The server returned an error.").tqarg( m_urlString ), "The server returned an error.").arg( m_urlString ),
i18n( "XML Plugin Error") ); i18n( "XML Plugin Error") );
} }
else else
@ -937,7 +937,7 @@ TQString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingle
--col; --col;
} }
ushort ch = str.tqat( col).tqunicode(); ushort ch = str.at( col).tqunicode();
switch( parseState ) switch( parseState )
{ {
@ -981,7 +981,7 @@ TQString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingle
TQString tag = str.mid( col + 1 ); TQString tag = str.mid( col + 1 );
for( uint pos = 0, len = tag.length(); pos < len; ++pos ) { for( uint pos = 0, len = tag.length(); pos < len; ++pos ) {
ch = tag.tqat( pos).tqunicode(); ch = tag.at( pos).tqunicode();
if( ch == ' ' || ch == '\t' || ch == '>' ) { if( ch == ' ' || ch == '\t' || ch == '>' ) {
tag.truncate( pos ); tag.truncate( pos );
break; break;

@ -46,7 +46,7 @@ void PseudoDTD::analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd )
if ( ! doc.setContent( metaDtd) ) if ( ! doc.setContent( metaDtd) )
{ {
KMessageBox::error(0, i18n("The file '%1' could not be parsed. " KMessageBox::error(0, i18n("The file '%1' could not be parsed. "
"Please check that the file is well-formed XML.").tqarg( metaDtdUrl ), "Please check that the file is well-formed XML.").arg( metaDtdUrl ),
i18n( "XML Plugin Error") ); i18n( "XML Plugin Error") );
return; return;
} }
@ -57,7 +57,7 @@ void PseudoDTD::analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd )
"Please check that the file is of this type:\n" "Please check that the file is of this type:\n"
"-//Norman Walsh//DTD DTDParse V2.0//EN\n" "-//Norman Walsh//DTD DTDParse V2.0//EN\n"
"You can produce such files with dtdparse. " "You can produce such files with dtdparse. "
"See the Kate Plugin documentation for more information.").tqarg( metaDtdUrl ), "See the Kate Plugin documentation for more information.").arg( metaDtdUrl ),
i18n("XML Plugin Error") ); i18n("XML Plugin Error") );
return; return;
} }

@ -40,7 +40,7 @@ the current cursor position, replacing the old value:
<td align=""> center, char, justify, left, right <td align=""> center, char, justify, left, right
<td valign=""> baseline, bottom, middle, top <td valign=""> baseline, bottom, middle, top
<td valign="foobar"> -- "foobar" should be replaced <td valign="foobar"> -- "foobar" should be replaced
<area tqshape=""> circle, default, poly, rect <area shape=""> circle, default, poly, rect
<area foobar=""> (no predefined values) <area foobar=""> (no predefined values)
6. Type "&". A list with named entities should appear. Select one and 6. Type "&". A list with named entities should appear. Select one and

@ -7533,7 +7533,7 @@
<attdecl> <attdecl>
%attrs; %attrs;
%focus; %focus;
tqshape %Shape; "rect" shape %Shape; "rect"
coords %Coords; #IMPLIED coords %Coords; #IMPLIED
href %URI; #IMPLIED href %URI; #IMPLIED
nohref (nohref) #IMPLIED nohref (nohref) #IMPLIED
@ -7608,7 +7608,7 @@
type="#IMPLIED" type="#IMPLIED"
value="CDATA" value="CDATA"
default=""/> default=""/>
<attribute name="tqshape" <attribute name="shape"
type="" type=""
enumeration="yes" enumeration="yes"
value="rect circle poly default" value="rect circle poly default"
@ -12001,7 +12001,7 @@
hreflang %LanguageCode; #IMPLIED hreflang %LanguageCode; #IMPLIED
rel %LinkTypes; #IMPLIED rel %LinkTypes; #IMPLIED
rev %LinkTypes; #IMPLIED rev %LinkTypes; #IMPLIED
tqshape %Shape; "rect" shape %Shape; "rect"
coords %Coords; #IMPLIED coords %Coords; #IMPLIED
target %FrameTarget; #IMPLIED target %FrameTarget; #IMPLIED
</attdecl> </attdecl>
@ -12097,7 +12097,7 @@
type="#IMPLIED" type="#IMPLIED"
value="CDATA" value="CDATA"
default=""/> default=""/>
<attribute name="tqshape" <attribute name="shape"
type="" type=""
enumeration="yes" enumeration="yes"
value="rect circle poly default" value="rect circle poly default"

@ -6190,7 +6190,7 @@
<attdecl> <attdecl>
%attrs; %attrs;
%focus; %focus;
tqshape %Shape; "rect" shape %Shape; "rect"
coords %Coords; #IMPLIED coords %Coords; #IMPLIED
href %URI; #IMPLIED href %URI; #IMPLIED
nohref (nohref) #IMPLIED nohref (nohref) #IMPLIED
@ -6260,7 +6260,7 @@
type="#IMPLIED" type="#IMPLIED"
value="CDATA" value="CDATA"
default=""/> default=""/>
<attribute name="tqshape" <attribute name="shape"
type="" type=""
enumeration="yes" enumeration="yes"
value="rect circle poly default" value="rect circle poly default"
@ -9838,7 +9838,7 @@
hreflang %LanguageCode; #IMPLIED hreflang %LanguageCode; #IMPLIED
rel %LinkTypes; #IMPLIED rel %LinkTypes; #IMPLIED
rev %LinkTypes; #IMPLIED rev %LinkTypes; #IMPLIED
tqshape %Shape; "rect" shape %Shape; "rect"
coords %Coords; #IMPLIED coords %Coords; #IMPLIED
</attdecl> </attdecl>
<attribute name="rev" <attribute name="rev"
@ -9929,7 +9929,7 @@
type="#IMPLIED" type="#IMPLIED"
value="CDATA" value="CDATA"
default=""/> default=""/>
<attribute name="tqshape" <attribute name="shape"
type="" type=""
enumeration="yes" enumeration="yes"
value="rect circle poly default" value="rect circle poly default"

@ -7600,7 +7600,7 @@
<attdecl> <attdecl>
%attrs; %attrs;
%focus; %focus;
tqshape %Shape; "rect" shape %Shape; "rect"
coords %Coords; #IMPLIED coords %Coords; #IMPLIED
href %URI; #IMPLIED href %URI; #IMPLIED
nohref (nohref) #IMPLIED nohref (nohref) #IMPLIED
@ -7675,7 +7675,7 @@
type="#IMPLIED" type="#IMPLIED"
value="CDATA" value="CDATA"
default=""/> default=""/>
<attribute name="tqshape" <attribute name="shape"
type="" type=""
enumeration="yes" enumeration="yes"
value="rect circle poly default" value="rect circle poly default"
@ -11940,7 +11940,7 @@
hreflang %LanguageCode; #IMPLIED hreflang %LanguageCode; #IMPLIED
rel %LinkTypes; #IMPLIED rel %LinkTypes; #IMPLIED
rev %LinkTypes; #IMPLIED rev %LinkTypes; #IMPLIED
tqshape %Shape; "rect" shape %Shape; "rect"
coords %Coords; #IMPLIED coords %Coords; #IMPLIED
target %FrameTarget; #IMPLIED target %FrameTarget; #IMPLIED
</attdecl> </attdecl>
@ -12036,7 +12036,7 @@
type="#IMPLIED" type="#IMPLIED"
value="CDATA" value="CDATA"
default=""/> default=""/>
<attribute name="tqshape" <attribute name="shape"
type="" type=""
enumeration="yes" enumeration="yes"
value="rect circle poly default" value="rect circle poly default"

@ -75,8 +75,8 @@ bool lnkPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
if ( ! lnkInfo.isNetworkPath ) if ( ! lnkInfo.isNetworkPath )
{ {
appendItem(group, "Where", i18n("on Windows disk: %1").tqarg(lnkInfo.volumeName)); // volume label appendItem(group, "Where", i18n("on Windows disk: %1").arg(lnkInfo.volumeName)); // volume label
appendItem(group, "PointsTo", TQString("%1%2").tqarg(lnkInfo.driveName).tqarg(lnkInfo.path)); appendItem(group, "PointsTo", TQString("%1%2").arg(lnkInfo.driveName).arg(lnkInfo.path));
} }
else else
{ {

@ -182,8 +182,8 @@ bool readLNK(const KURL &url, LNKInfo &info)
else // network path else // network path
{ {
info.path = TQString("%1\\%2") info.path = TQString("%1\\%2")
.tqarg(start + loc.netVolume + 0x14) // network share name .arg(start + loc.netVolume + 0x14) // network share name
.tqarg(start + loc.pathname); .arg(start + loc.pathname);
} }
delete [] data; delete [] data;

@ -68,7 +68,7 @@ SettingsImp::SettingsImp(TQWidget* parent, const char* name, WFlags fl): Setting
* Update the preview * Update the preview
*/ */
void SettingsImp::updatePreview(){ void SettingsImp::updatePreview(){
int tqshape = Shape_Circular->isChecked() ? Prefs::EnumShape::Circular : Prefs::EnumShape::Rectangular; int shape = Shape_Circular->isChecked() ? Prefs::EnumShape::Circular : Prefs::EnumShape::Rectangular;
int look = KLed::Raised; int look = KLed::Raised;
look = Look_Flat->isChecked() ? Prefs::EnumLook::Flat : look; look = Look_Flat->isChecked() ? Prefs::EnumLook::Flat : look;
look = Look_Sunken->isChecked() ? Prefs::EnumLook::Sunken : look; look = Look_Sunken->isChecked() ? Prefs::EnumLook::Sunken : look;
@ -84,12 +84,12 @@ void SettingsImp::updatePreview(){
kLed5->setBackgroundColor(backgroundColor); kLed5->setBackgroundColor(backgroundColor);
kLed6->setBackgroundColor(backgroundColor); kLed6->setBackgroundColor(backgroundColor);
kLed1->setShape((KLed::Shape)tqshape); kLed1->setShape((KLed::Shape)shape);
kLed2->setShape((KLed::Shape)tqshape); kLed2->setShape((KLed::Shape)shape);
kLed3->setShape((KLed::Shape)tqshape); kLed3->setShape((KLed::Shape)shape);
kLed4->setShape((KLed::Shape)tqshape); kLed4->setShape((KLed::Shape)shape);
kLed5->setShape((KLed::Shape)tqshape); kLed5->setShape((KLed::Shape)shape);
kLed6->setShape((KLed::Shape)tqshape); kLed6->setShape((KLed::Shape)shape);
kLed1->setColor(color); kLed1->setColor(color);
kLed2->setColor(color); kLed2->setColor(color);
@ -173,7 +173,7 @@ void KBinaryClock::resizeEvent( TQResizeEvent *e ) {
* Load the settings for the clock. * Load the settings for the clock.
*/ */
void KBinaryClock::loadSettings(){ void KBinaryClock::loadSettings(){
int tqshape = prefs->shape(); int shape = prefs->shape();
int look = prefs->look(); int look = prefs->look();
TQColor color = prefs->color(); TQColor color = prefs->color();
@ -197,7 +197,7 @@ void KBinaryClock::loadSettings(){
} }
for(int i=0; i < 4; i++){ for(int i=0; i < 4; i++){
for(int j=0; j < ledWidth;j++){ for(int j=0; j < ledWidth;j++){
ledMatrix[j][i]->setShape((KLed::Shape)tqshape); ledMatrix[j][i]->setShape((KLed::Shape)shape);
ledMatrix[j][i]->setColor(color); ledMatrix[j][i]->setColor(color);
ledMatrix[j][i]->setLook((KLed::Look)look); ledMatrix[j][i]->setLook((KLed::Look)look);
ledMatrix[j][i]->setDarkFactor(darkFactor); ledMatrix[j][i]->setDarkFactor(darkFactor);
@ -329,8 +329,8 @@ void KBinaryClock::openContextMenu() {
proc << locate("exe", "kdesu"); proc << locate("exe", "kdesu");
proc << "--nonewdcop"; proc << "--nonewdcop";
proc << TQString("%1 clock --lang %2") proc << TQString("%1 clock --lang %2")
.tqarg(locate("exe", "kcmshell")) .arg(locate("exe", "kcmshell"))
.tqarg(KGlobal::locale()->language()); .arg(KGlobal::locale()->language());
proc.start(KProcess::DontCare); proc.start(KProcess::DontCare);
break; break;
case 104: case 104:
@ -405,7 +405,7 @@ ClockAppletToolTip::ClockAppletToolTip( KBinaryClock *clock ) : TQToolTip( clock
void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ ) void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ )
{ {
tip(m_clock->tqgeometry(), KGlobal::locale()->formatDate(TQDateTime::currentDateTime().date(), false)); tip(m_clock->geometry(), KGlobal::locale()->formatDate(TQDateTime::currentDateTime().date(), false));
} }
#include "kbinaryclock.moc" #include "kbinaryclock.moc"

@ -110,7 +110,7 @@
<property name="text"> <property name="text">
<string>Dark</string> <string>Dark</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>

@ -140,7 +140,7 @@ void KolourPicker::slotHistory()
TQPopupMenu *sub = copyPopup(*it, false); TQPopupMenu *sub = copyPopup(*it, false);
subMenus.append(sub); subMenus.append(sub);
popup.insertItem(colorPixmap(*it), popup.insertItem(colorPixmap(*it),
TQString("%1, %2, %3").tqarg((*it).red()).tqarg((*it).green()).tqarg((*it).blue()), TQString("%1, %2, %3").arg((*it).red()).arg((*it).green()).arg((*it).blue()),
sub); sub);
} }
popup.insertSeparator(); popup.insertSeparator();

@ -174,7 +174,7 @@ void SimpleButton::enterEvent( TQEvent *e )
{ {
m_highlight = true; m_highlight = true;
tqrepaint( false ); repaint( false );
TQButton::enterEvent( e ); TQButton::enterEvent( e );
} }
@ -182,7 +182,7 @@ void SimpleButton::leaveEvent( TQEvent *e )
{ {
m_highlight = false; m_highlight = false;
tqrepaint( false ); repaint( false );
TQButton::enterEvent( e ); TQButton::enterEvent( e );
} }

@ -102,7 +102,7 @@ KSample::KSample(KTimeMon *t, bool a, unsigned p, unsigned s, unsigned c) :
KMessageBox::error(timemon, KMessageBox::error(timemon,
i18n("Unable to open the file '%1'. The diagnostics are:\n%2.\n" i18n("Unable to open the file '%1'. The diagnostics are:\n%2.\n"
"This file is required to determine current memory usage.\n" "This file is required to determine current memory usage.\n"
"Maybe your proc filesystem is non-Linux standard?").tqarg(MEMINFO_NAME).tqarg(strerror(errno))); "Maybe your proc filesystem is non-Linux standard?").arg(MEMINFO_NAME).arg(strerror(errno)));
exit(1); exit(1);
} }
@ -112,7 +112,7 @@ KSample::KSample(KTimeMon *t, bool a, unsigned p, unsigned s, unsigned c) :
KMessageBox::error(timemon, KMessageBox::error(timemon,
i18n("Unable to open the file '%1'. The diagnostics are:\n%2.\n" i18n("Unable to open the file '%1'. The diagnostics are:\n%2.\n"
"This file is required to determine current system info. " "This file is required to determine current system info. "
"Maybe your proc filesystem is non-Linux standard?").tqarg(MEMINFO_NAME).tqarg(strerror(errno))); "Maybe your proc filesystem is non-Linux standard?").arg(MEMINFO_NAME).arg(strerror(errno)));
exit(1); exit(1);
} }
@ -125,7 +125,7 @@ KSample::KSample(KTimeMon *t, bool a, unsigned p, unsigned s, unsigned c) :
"The diagnostics are:\n%1.\n" "The diagnostics are:\n%1.\n"
"Are you really running Solaris? " "Are you really running Solaris? "
"Please contact the maintainer at mueller@kde.org " "Please contact the maintainer at mueller@kde.org "
"who will try to figure out what went wrong.").tqarg(strerror(errno))); "who will try to figure out what went wrong.").arg(strerror(errno)));
exit(1); exit(1);
} }
#endif #endif
@ -210,7 +210,7 @@ void KSample::readSample()
if ((l = read(memFD, buffer, sizeof(buffer) - 1)) < 0) if ((l = read(memFD, buffer, sizeof(buffer) - 1)) < 0)
{ {
fatal(i18n("Unable to read the memory usage file '%1'.\n" fatal(i18n("Unable to read the memory usage file '%1'.\n"
"The diagnostics are: %2").tqarg(MEMINFO_NAME).tqarg(strerror(errno))); "The diagnostics are: %2").arg(MEMINFO_NAME).arg(strerror(errno)));
} }
buffer[l] = '\0'; buffer[l] = '\0';
l = 0; l = 0;
@ -223,7 +223,7 @@ void KSample::readSample()
"different file format than expected.\n" "different file format than expected.\n"
"Maybe your version of the proc filesystem is " "Maybe your version of the proc filesystem is "
"incompatible with supported versions. " "incompatible with supported versions. "
"Please contact the developer at http://bugs.kde.org/ who will try to sort this out.").tqarg(MEMINFO_NAME)); "Please contact the developer at http://bugs.kde.org/ who will try to sort this out.").arg(MEMINFO_NAME));
l++; l++;
} }
@ -237,7 +237,7 @@ void KSample::readSample()
lseek(statFD, 0, 0); lseek(statFD, 0, 0);
if ((l = read(statFD, buffer, sizeof(buffer)-1)) < 0) if ((l = read(statFD, buffer, sizeof(buffer)-1)) < 0)
fatal(i18n("Unable to read the system usage file '%1'.\n" fatal(i18n("Unable to read the system usage file '%1'.\n"
"The diagnostics are: %2").tqarg(STAT_NAME).tqarg(strerror(errno))); "The diagnostics are: %2").arg(STAT_NAME).arg(strerror(errno)));
buffer[l] = '\0'; buffer[l] = '\0';
@ -271,7 +271,7 @@ void KSample::readSample()
struct tbl_sysinfo sysinfo; struct tbl_sysinfo sysinfo;
if (table(TBL_SYSINFO, 0, &sysinfo, 1, sizeof(sysinfo)) != 1) if (table(TBL_SYSINFO, 0, &sysinfo, 1, sizeof(sysinfo)) != 1)
fatal(msg.tqarg("TBL_SYSINFO")); fatal(msg.arg("TBL_SYSINFO"));
sample.user = sysinfo.si_user; sample.user = sysinfo.si_user;
sample.nice = sysinfo.si_nice; sample.nice = sysinfo.si_nice;
@ -281,7 +281,7 @@ void KSample::readSample()
struct tbl_vmstats vmstats; struct tbl_vmstats vmstats;
if (table(TBL_VMSTATS, 0, &vmstats, 1, sizeof(vmstats)) != 1) if (table(TBL_VMSTATS, 0, &vmstats, 1, sizeof(vmstats)) != 1)
fatal(msg.tqarg("TBL_VMSTATS")); fatal(msg.arg("TBL_VMSTATS"));
sample.mtotal = vmstats.free_count + vmstats.active_count + sample.mtotal = vmstats.free_count + vmstats.active_count +
vmstats.inactive_count + vmstats.wire_count; vmstats.inactive_count + vmstats.wire_count;
@ -291,7 +291,7 @@ void KSample::readSample()
struct tbl_swapinfo swapinfo; struct tbl_swapinfo swapinfo;
if (table(TBL_SWAPINFO, -1, &swapinfo, 1, sizeof(swapinfo)) != 1) if (table(TBL_SWAPINFO, -1, &swapinfo, 1, sizeof(swapinfo)) != 1)
fatal(msg.tqarg("TBL_SWAPINFO")); fatal(msg.arg("TBL_SWAPINFO"));
sample.stotal = swapinfo.size; sample.stotal = swapinfo.size;
sample.sfree = swapinfo.free; sample.sfree = swapinfo.free;
@ -324,7 +324,7 @@ void KSample::readSample()
kstat_read(kc, ksp, &cstat) == -1) // and read into buffer kstat_read(kc, ksp, &cstat) == -1) // and read into buffer
fatal(i18n("Unable to read the CPU statistics entry " fatal(i18n("Unable to read the CPU statistics entry "
"from the 'kstat' library. The diagnostics are '%1'.\n" "from the 'kstat' library. The diagnostics are '%1'.\n"
"Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno))); "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno)));
// fields are: idle user kernel iowait (no nice info?) // fields are: idle user kernel iowait (no nice info?)
sample.user += cstat.cpu_sysinfo.cpu[1] / sample.cpus; sample.user += cstat.cpu_sysinfo.cpu[1] / sample.cpus;
@ -338,7 +338,7 @@ void KSample::readSample()
fatal(i18n("The number of CPUs appears to have changed at " fatal(i18n("The number of CPUs appears to have changed at "
"very short notice, or the 'kstat' library returns " "very short notice, or the 'kstat' library returns "
"inconsistent results (%1 vs. %2 CPUs).\n" "inconsistent results (%1 vs. %2 CPUs).\n"
"Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").tqarg(sample.cpus).tqarg(cpus)); "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").arg(sample.cpus).arg(cpus));
// availrmem = pages of core for user-proc ( == physmem - kernelmem) // availrmem = pages of core for user-proc ( == physmem - kernelmem)
// freemem = no of free pages // freemem = no of free pages
@ -350,7 +350,7 @@ void KSample::readSample()
fatal(i18n("Unable to read the memory statistics entry " fatal(i18n("Unable to read the memory statistics entry "
"from the 'kstat' library. The diagnostics are '%1'\n" "from the 'kstat' library. The diagnostics are '%1'\n"
"You might want to contact the maintainer at " "You might want to contact the maintainer at "
"http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno))); "http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno)));
int i; int i;
unsigned long physmem = 0, freemem = 0, availrmem = 0; unsigned long physmem = 0, freemem = 0, availrmem = 0;
@ -367,7 +367,7 @@ void KSample::readSample()
fatal(i18n("There seems to be a problem with KTimeMon's handling " fatal(i18n("There seems to be a problem with KTimeMon's handling "
"of the 'kstat' library: 0 bytes of physical memory determined!\n" "of the 'kstat' library: 0 bytes of physical memory determined!\n"
"Free memory is %1, available memory is %2.\n" "Free memory is %1, available memory is %2.\n"
"Please contact the maintainer at mueller@kde.org who will try to sort this out.").tqarg(freemem).tqarg(availrmem)); "Please contact the maintainer at mueller@kde.org who will try to sort this out.").arg(freemem).arg(availrmem));
sample.mtotal = physmem; sample.mtotal = physmem;
sample.free = freemem; sample.free = freemem;
@ -378,7 +378,7 @@ void KSample::readSample()
if ((swapentries = swapctl(SC_GETNSWP, 0)) == -1) if ((swapentries = swapctl(SC_GETNSWP, 0)) == -1)
fatal(i18n("Unable to determine the number of " fatal(i18n("Unable to determine the number of "
"swap spaces. The diagnostics are '%1'.\n" "swap spaces. The diagnostics are '%1'.\n"
"Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno))); "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno)));
if (swapentries != 0) { if (swapentries != 0) {
// 2* to get some space for padding?? // 2* to get some space for padding??
@ -389,8 +389,8 @@ void KSample::readSample()
"trying to determine the swap usage.\n" "trying to determine the swap usage.\n"
"Attempted to allocate %1 bytes of memory (2 * %2 + %3 * %4).\n" "Attempted to allocate %1 bytes of memory (2 * %2 + %3 * %4).\n"
"Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.") "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.")
.tqarg(2 * sizeof(int) + swapentries * sizeof(struct swapent)) .arg(2 * sizeof(int) + swapentries * sizeof(struct swapent))
.tqarg(sizeof(int)).tqarg(swapentries).tqarg(sizeof(struct swapent))); .arg(sizeof(int)).arg(swapentries).arg(sizeof(struct swapent)));
char path[1024]; char path[1024];
stbl->swt_n = swapentries; stbl->swt_n = swapentries;
@ -399,7 +399,7 @@ void KSample::readSample()
if ((swapentries = swapctl(SC_LIST, stbl)) == -1) if ((swapentries = swapctl(SC_LIST, stbl)) == -1)
fatal(i18n("Unable to determine the swap usage.\n" fatal(i18n("Unable to determine the swap usage.\n"
"The diagnostics are '%1'.\n" "The diagnostics are '%1'.\n"
"Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno))); "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno)));
if (!warned && swapentries != stbl->swt_n) { if (!warned && swapentries != stbl->swt_n) {
@ -407,7 +407,7 @@ void KSample::readSample()
nonfatal(i18n("Information was requested for " nonfatal(i18n("Information was requested for "
"%1 swap spaces, but only %2 swap entries were returned.\n" "%1 swap spaces, but only %2 swap entries were returned.\n"
"KTimeMon will attempt to continue.\n" "KTimeMon will attempt to continue.\n"
"Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").tqarg(stbl->swt_n).tqarg(swapentries)); "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").arg(stbl->swt_n).arg(swapentries));
} }
for (i = 0; i < swapentries; i++) { for (i = 0; i < swapentries; i++) {

@ -171,11 +171,11 @@ void KTimeMon::maybeTip(const TQPoint& p)
if ( idle < 0 ) if ( idle < 0 )
idle = 0; idle = 0;
TQString str = i18n("cpu: %1% idle\nmem: %2 MB %3% free\nswap: %4 MB %5% free") TQString str = i18n("cpu: %1% idle\nmem: %2 MB %3% free\nswap: %4 MB %5% free")
.tqarg(idle) .arg(idle)
.tqarg(KGlobal::locale()->formatNumber(s.used/100.*s.mtotal, 0)) .arg(KGlobal::locale()->formatNumber(s.used/100.*s.mtotal, 0))
.tqarg(100-s.used) .arg(100-s.used)
.tqarg(KGlobal::locale()->formatNumber(s.stotal, 0)) .arg(KGlobal::locale()->formatNumber(s.stotal, 0))
.tqarg(100-s.sused); .arg(100-s.sused);
tip(rect(), str); tip(rect(), str);
} }
@ -337,7 +337,7 @@ void KTimeMon::writeConfiguration()
conf->sync(); conf->sync();
} }
// Make the KSample object update its internal sample and tqrepaint the // Make the KSample object update its internal sample and repaint the
// object. // object.
void KTimeMon::timeout() void KTimeMon::timeout()
{ {

@ -656,41 +656,41 @@ int Parser::getfix(TQString name)
int Parser::errmsg() int Parser::errmsg()
{ switch(err) { switch(err)
{ case 1: KMessageBox::error(0, i18n("Parser error at position %1:\n" { case 1: KMessageBox::error(0, i18n("Parser error at position %1:\n"
"Syntax error").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); "Syntax error").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
break; break;
case 2: KMessageBox::error(0, i18n("Parser error at position %1:\n" case 2: KMessageBox::error(0, i18n("Parser error at position %1:\n"
"Missing parenthesis").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); "Missing parenthesis").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
break; break;
case 3: KMessageBox::error(0, i18n("Parser error at position %1:\n" case 3: KMessageBox::error(0, i18n("Parser error at position %1:\n"
"Function name unknown").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); "Function name unknown").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
break; break;
case 4: KMessageBox::error(0, i18n("Parser error at position %1:\n" case 4: KMessageBox::error(0, i18n("Parser error at position %1:\n"
"Void function variable").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); "Void function variable").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
break; break;
case 5: KMessageBox::error(0, i18n("Parser error at position %1:\n" case 5: KMessageBox::error(0, i18n("Parser error at position %1:\n"
"Too many functions").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); "Too many functions").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
break; break;
case 6: KMessageBox::error(0, i18n("Parser error at position %1:\n" case 6: KMessageBox::error(0, i18n("Parser error at position %1:\n"
"Token-memory overflow").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); "Token-memory overflow").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
break; break;
case 7: KMessageBox::error(0, i18n("Parser error at position %1:\n" case 7: KMessageBox::error(0, i18n("Parser error at position %1:\n"
"Stack overflow").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); "Stack overflow").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
break; break;
case 8: KMessageBox::error(0, i18n("Parser error at position %1:\n" case 8: KMessageBox::error(0, i18n("Parser error at position %1:\n"
"Name of function not free").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); "Name of function not free").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
break; break;
case 9: KMessageBox::error(0, i18n("Parser error at position %1:\n" case 9: KMessageBox::error(0, i18n("Parser error at position %1:\n"
"recursive function not allowed").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); "recursive function not allowed").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
break; break;
case 10: KMessageBox::error(0, i18n("Could not find a defined constant at position %1" ).tqarg(TQString::number(errpos)), case 10: KMessageBox::error(0, i18n("Could not find a defined constant at position %1" ).arg(TQString::number(errpos)),
i18n("Math Expression Evaluator")); i18n("Math Expression Evaluator"));
break; break;
case 11: KMessageBox::error(0, i18n("Empty function"), i18n("Math Expression Evaluator")); case 11: KMessageBox::error(0, i18n("Empty function"), i18n("Math Expression Evaluator"));

@ -256,7 +256,7 @@ const TQString KsCDInterface::getTrackTitle() const
} }
else else
{ {
result = i18n("artist - trackname", "%1 - %2").tqarg(artist, title); result = i18n("artist - trackname", "%1 - %2").arg(artist, title);
} }
} }
} }
@ -270,18 +270,18 @@ const TQString KsCDInterface::getTrackTitle() const
} }
else else
{ {
result = i18n("(album) - trackname", "(%1) - %2").tqarg(artist, title); result = i18n("(album) - trackname", "(%1) - %2").arg(artist, title);
} }
} }
else // artist is non-empty else // artist is non-empty
{ {
if(title.isEmpty()) if(title.isEmpty())
{ {
result = i18n("artistname (albumname)", "%1 (%2)").tqarg(artist, album); result = i18n("artistname (albumname)", "%1 (%2)").arg(artist, album);
} }
else else
{ {
result = i18n("artistname (albumname) - trackname", "%1 (%2) - %3").tqarg(artist, album, title); result = i18n("artistname (albumname) - trackname", "%1 (%2) - %3").arg(artist, album, title);
} }
} }
} }

@ -424,7 +424,7 @@ void MediaControl::reparseConfig()
{ {
KNotifyClient::event(winId(), KNotifyClient::warning, KNotifyClient::event(winId(), KNotifyClient::warning,
i18n("There was trouble loading theme %1. Please choose" \ i18n("There was trouble loading theme %1. Please choose" \
" a different theme.").tqarg(skindir)); " a different theme.").arg(skindir));
// default to kde-icons, they have to be installed :) // default to kde-icons, they have to be installed :)
slotIconChanged(); slotIconChanged();

@ -137,10 +137,10 @@ void MpdInterface::connectionError(int e)
switch (e) switch (e)
{ {
case TQSocket::ErrConnectionRefused: case TQSocket::ErrConnectionRefused:
message=i18n("Connection refused to %1:%2.\nIs mpd running?").tqarg(hostname).tqarg(port); message=i18n("Connection refused to %1:%2.\nIs mpd running?").arg(hostname).arg(port);
break; break;
case TQSocket::ErrHostNotFound: case TQSocket::ErrHostNotFound:
message=i18n("Host '%1' not found.").tqarg(hostname); message=i18n("Host '%1' not found.").arg(hostname);
break; break;
case TQSocket::ErrSocketRead: case TQSocket::ErrSocketRead:
message=i18n("Error reading socket."); message=i18n("Error reading socket.");
@ -306,7 +306,7 @@ void MpdInterface::jumpToTime(int sec)
if (songid>-1) if (songid>-1)
{ {
if (dispatch(TQString("seekid %1 %2\n").tqarg(songid).tqarg(sec).latin1())) if (dispatch(TQString("seekid %1 %2\n").arg(songid).arg(sec).latin1()))
{ {
fetchOk(); // unlocks fetchOk(); // unlocks
} }
@ -366,7 +366,7 @@ void MpdInterface::changeVolume(int delta)
volume+=delta; volume+=delta;
if (volume<0) volume=0; if (volume<0) volume=0;
if (volume>100) volume=100; if (volume>100) volume=100;
if (dispatch(TQString("setvol %1\n").tqarg(volume).latin1())) if (dispatch(TQString("setvol %1\n").arg(volume).latin1()))
{ {
fetchOk(); fetchOk();
} }
@ -433,7 +433,7 @@ void MpdInterface::dropEvent(TQDropEvent* event)
// found song, so lets play it // found song, so lets play it
if (songid>-1) if (songid>-1)
{ {
if (dispatch((TQString("playid %1\n").tqarg(songid)).latin1())) if (dispatch((TQString("playid %1\n").arg(songid)).latin1()))
{ {
if (fetchOk()) list.pop_front(); if (fetchOk()) list.pop_front();
return; return;
@ -491,7 +491,7 @@ const TQString MpdInterface::getTrackTitle() const
if (!(songid>-1)) return result; if (!(songid>-1)) return result;
if (!dispatch(TQString("playlistid %1\n").tqarg(songid).latin1())) if (!dispatch(TQString("playlistid %1\n").arg(songid).latin1()))
return result; return result;
TQString artist; TQString artist;
@ -559,7 +559,7 @@ const TQString MpdInterface::getTrackTitle() const
else else
return album; return album;
} }
return i18n("No tags: %1").tqarg(file); return i18n("No tags: %1").arg(file);
} }
int MpdInterface::playingStatus() int MpdInterface::playingStatus()

@ -174,7 +174,7 @@ void SimpleButton::enterEvent( TQEvent *e )
{ {
m_highlight = true; m_highlight = true;
tqrepaint( false ); repaint( false );
TQButton::enterEvent( e ); TQButton::enterEvent( e );
} }
@ -182,7 +182,7 @@ void SimpleButton::leaveEvent( TQEvent *e )
{ {
m_highlight = false; m_highlight = false;
tqrepaint( false ); repaint( false );
TQButton::enterEvent( e ); TQButton::enterEvent( e );
} }

@ -98,7 +98,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
{ {
item = itemList.first(); item = itemList.first();
m_name = itemList.first()->name(); m_name = itemList.first()->name();
action = new KAction( i18n( "Compress as %1" ).tqarg( m_name + m_ext ), 0, this, action = new KAction( i18n( "Compress as %1" ).arg( m_name + m_ext ), 0, this,
TQT_SLOT( slotCompressAsDefault() ), actionCollection() ); TQT_SLOT( slotCompressAsDefault() ), actionCollection() );
} }
else else
@ -143,7 +143,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
{ {
TQString targetName = itemList.first()->name(); TQString targetName = itemList.first()->name();
stripExtension( targetName ); stripExtension( targetName );
action = new KAction( i18n( "Extract to %1" ).tqarg( targetName ), 0, this, action = new KAction( i18n( "Extract to %1" ).arg( targetName ), 0, this,
TQT_SLOT( slotExtractToSubfolders() ), actionCollection() ); TQT_SLOT( slotExtractToSubfolders() ), actionCollection() );
} }
else else
@ -473,7 +473,7 @@ void ArkMenu::slotCompressAs( int pos )
int i=1; int i=1;
while ( KIO::NetAccess::exists(target, true, 0 ) ) while ( KIO::NetAccess::exists(target, true, 0 ) )
{ {
target = m_dir + i18n("Archive %1").tqarg(i) + m_extensionList[ pos ]; target = m_dir + i18n("Archive %1").arg(i) + m_extensionList[ pos ];
i++; i++;
} }
} }
@ -517,7 +517,7 @@ void ArkMenu::slotCompressAsDefault()
int i=1; int i=1;
while ( KIO::NetAccess::exists(name, true, 0 ) ) while ( KIO::NetAccess::exists(name, true, 0 ) )
{ {
name = m_dir + i18n("Archive %1").tqarg(i) + m_ext; name = m_dir + i18n("Archive %1").arg(i) + m_ext;
i++; i++;
} }
} }

@ -59,14 +59,14 @@ void DOMListViewItem::init()
clos = false; clos = false;
} }
void DOMListViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ) void DOMListViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment )
{ {
TQColorGroup _cg( cg ); TQColorGroup _cg( cg );
TQColor c = _cg.text(); TQColor c = _cg.text();
p->setFont(m_font); p->setFont(m_font);
_cg.setColor( TQColorGroup::Text, m_color ); _cg.setColor( TQColorGroup::Text, m_color );
TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); TQListViewItem::paintCell( p, _cg, column, width, alignment );
_cg.setColor( TQColorGroup::Text, c ); _cg.setColor( TQColorGroup::Text, c );
} }

@ -33,7 +33,7 @@ class DOMListViewItem : public TQListViewItem
virtual ~DOMListViewItem(); virtual ~DOMListViewItem();
virtual void paintCell( TQPainter *p, const TQColorGroup &cg, virtual void paintCell( TQPainter *p, const TQColorGroup &cg,
int column, int width, int tqalignment ); int column, int width, int alignment );
void setColor( const TQColor &color) { m_color = color; } void setColor( const TQColor &color) { m_color = color; }

@ -53,7 +53,7 @@ static const char * const dom_error_msgs[] = {
TQString domtreeviewer::domErrorMessage(int dom_err) TQString domtreeviewer::domErrorMessage(int dom_err)
{ {
if ((unsigned)dom_err > sizeof dom_error_msgs/sizeof dom_error_msgs[0]) if ((unsigned)dom_err > sizeof dom_error_msgs/sizeof dom_error_msgs[0])
return i18n("Unknown Exception %1").tqarg(dom_err); return i18n("Unknown Exception %1").arg(dom_err);
else else
return i18n(dom_error_msgs[dom_err]); return i18n(dom_error_msgs[dom_err]);
} }

@ -305,7 +305,7 @@ class InsertNodeCommand : public ManipulateNodeCommand
public: public:
/** /**
* Prepare insertion command, inserting \c node into \c parent, just * Prepare insertion command, inserting \c node into \c parent, just
* before \c after. If \c after is 0, append it to the list of tqchildren. * before \c after. If \c after is 0, append it to the list of children.
*/ */
InsertNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after); InsertNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after);
virtual ~InsertNodeCommand(); virtual ~InsertNodeCommand();
@ -331,7 +331,7 @@ class RemoveNodeCommand : public ManipulateNodeCommand
public: public:
/** /**
* Prepare insertion command, inserting \c node into \c parent, just * Prepare insertion command, inserting \c node into \c parent, just
* before \c after. If \c after is 0, append it to the list of tqchildren. * before \c after. If \c after is 0, append it to the list of children.
*/ */
RemoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after); RemoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after);
virtual ~RemoveNodeCommand(); virtual ~RemoveNodeCommand();

@ -124,7 +124,7 @@ void DOMTreeView::setHtmlPart(KHTMLPart *_part)
// nothing here yet // nothing here yet
} }
parentWidget()->setCaption( part ? i18n( "DOM Tree for %1" ).tqarg(part->url().prettyURL()) : i18n("DOM Tree") ); parentWidget()->setCaption( part ? i18n( "DOM Tree for %1" ).arg(part->url().prettyURL()) : i18n("DOM Tree") );
TQTimer::singleShot(0, this, TQT_SLOT(slotSetHtmlPartDelayed())); TQTimer::singleShot(0, this, TQT_SLOT(slotSetHtmlPartDelayed()));
} }
@ -530,7 +530,7 @@ void DOMTreeView::slotSaveClicked()
if (file.exists()) { if (file.exists()) {
const TQString title = i18n( "File Exists" ); const TQString title = i18n( "File Exists" );
const TQString text = i18n( "Do you really want to overwrite: \n%1?" ).tqarg(url.url()); const TQString text = i18n( "Do you really want to overwrite: \n%1?" ).arg(url.url());
if (KMessageBox::Continue != KMessageBox::warningContinueCancel(this, text, title, i18n("Overwrite") ) ) { if (KMessageBox::Continue != KMessageBox::warningContinueCancel(this, text, title, i18n("Overwrite") ) ) {
return; return;
} }
@ -545,12 +545,12 @@ void DOMTreeView::slotSaveClicked()
delete m_textStream; delete m_textStream;
} else { } else {
const TQString title = i18n( "Unable to Open File" ); const TQString title = i18n( "Unable to Open File" );
const TQString text = i18n( "Unable to open \n %1 \n for writing" ).tqarg(url.path()); const TQString text = i18n( "Unable to open \n %1 \n for writing" ).arg(url.path());
KMessageBox::sorry( this, text, title ); KMessageBox::sorry( this, text, title );
} }
} else { } else {
const TQString title = i18n( "Invalid URL" ); const TQString title = i18n( "Invalid URL" );
const TQString text = i18n( "This URL \n %1 \n is not valid." ).tqarg(url.url()); const TQString text = i18n( "This URL \n %1 \n is not valid." ).arg(url.url());
KMessageBox::sorry( this, text, title ); KMessageBox::sorry( this, text, title );
} }
} }
@ -973,7 +973,7 @@ public:
protected: protected:
virtual void paintCell( TQPainter *p, const TQColorGroup &cg, virtual void paintCell( TQPainter *p, const TQColorGroup &cg,
int column, int width, int tqalignment ) int column, int width, int alignment )
{ {
bool updates_enabled = listView()->isUpdatesEnabled(); bool updates_enabled = listView()->isUpdatesEnabled();
listView()->setUpdatesEnabled(false); listView()->setUpdatesEnabled(false);
@ -993,7 +993,7 @@ protected:
TQColorGroup _cg( cg ); TQColorGroup _cg( cg );
_cg.setColor( TQColorGroup::Text, c ); _cg.setColor( TQColorGroup::Text, c );
super::paintCell( p, _cg, column, width, tqalignment ); super::paintCell( p, _cg, column, width, alignment );
if (text_changed) setText(column, oldText); if (text_changed) setText(column, oldText);
listView()->setUpdatesEnabled(updates_enabled); listView()->setUpdatesEnabled(updates_enabled);

@ -169,7 +169,7 @@ class DOMTreeView : public DOMTreeViewBase
// == DOM Node Info panel ====================================== // == DOM Node Info panel ======================================
public: public:
// Keep in sync with the widget stack tqchildren // Keep in sync with the widget stack children
enum InfoPanel { ElementPanel, CDataPanel, EmptyPanel }; enum InfoPanel { ElementPanel, CDataPanel, EmptyPanel };
public slots: public slots:

@ -94,12 +94,12 @@ FSView::FSView(Inode* base, TQWidget* parent, const char* name)
double s; double s;
TQString str; TQString str;
for (i=1;i<=ccount;i++) { for (i=1;i<=ccount;i++) {
str = TQString("Dir%1").tqarg(i); str = TQString("Dir%1").arg(i);
if (!cconfig.hasKey(str)) continue; if (!cconfig.hasKey(str)) continue;
str = cconfig.readPathEntry(str); str = cconfig.readPathEntry(str);
s = cconfig.readDoubleNumEntry(TQString("Size%1").tqarg(i), 0.0); s = cconfig.readDoubleNumEntry(TQString("Size%1").arg(i), 0.0);
f = cconfig.readNumEntry(TQString("Files%1").tqarg(i), 0); f = cconfig.readNumEntry(TQString("Files%1").arg(i), 0);
d = cconfig.readNumEntry(TQString("Dirs%1").tqarg(i), 0); d = cconfig.readNumEntry(TQString("Dirs%1").arg(i), 0);
if (s==0.0 || f==0 || d==0) continue; if (s==0.0 || f==0 || d==0) continue;
setDirMetric(str, s, f, d); setDirMetric(str, s, f, d);
} }
@ -147,7 +147,7 @@ void FSView::setPath(TQString p)
b->setPeer(d); b->setPeer(d);
setCaption(TQString("%1 - FSView").tqarg(_path)); setCaption(TQString("%1 - FSView").arg(_path));
requestUpdate(b); requestUpdate(b);
} }
@ -286,7 +286,7 @@ void FSView::contextMenu(TreeMapItem* i, const TQPoint& p)
popup.insertItem(i18n("Refresh"), 5); popup.insertItem(i18n("Refresh"), 5);
popup.setItemEnabled(5, !_sm.scanRunning()); popup.setItemEnabled(5, !_sm.scanRunning());
if (i) popup.insertItem(i18n("Refresh '%1'").tqarg(i->text(0)), 4); if (i) popup.insertItem(i18n("Refresh '%1'").arg(i->text(0)), 4);
popup.insertSeparator(); popup.insertSeparator();
addDepthStopItems(dpopup, 1001, i); addDepthStopItems(dpopup, 1001, i);
popup.insertItem(i18n("Stop at Depth"), dpopup, 1000); popup.insertItem(i18n("Stop at Depth"), dpopup, 1000);
@ -331,10 +331,10 @@ void FSView::saveMetric(KConfigGroup* g)
TQMap<TQString, MetricEntry>::iterator it; TQMap<TQString, MetricEntry>::iterator it;
int c = 1; int c = 1;
for (it=_dirMetric.begin();it!=_dirMetric.end();++it) { for (it=_dirMetric.begin();it!=_dirMetric.end();++it) {
g->writePathEntry(TQString("Dir%1").tqarg(c), it.key()); g->writePathEntry(TQString("Dir%1").arg(c), it.key());
g->writeEntry(TQString("Size%1").tqarg(c), (*it).size); g->writeEntry(TQString("Size%1").arg(c), (*it).size);
g->writeEntry(TQString("Files%1").tqarg(c), (*it).fileCount); g->writeEntry(TQString("Files%1").arg(c), (*it).fileCount);
g->writeEntry(TQString("Dirs%1").tqarg(c), (*it).dirCount); g->writeEntry(TQString("Dirs%1").arg(c), (*it).dirCount);
c++; c++;
} }
g->writeEntry("Count", c-1); g->writeEntry("Count", c-1);

@ -74,7 +74,7 @@ void FSJob::progressSlot(int percent, int dirs, const TQString& cDir)
emitPercent(percent, 100); emitPercent(percent, 100);
slotInfoMessage(this, i18n("Read 1 folder, in %1", slotInfoMessage(this, i18n("Read 1 folder, in %1",
"Read %n folders, in %1", "Read %n folders, in %1",
dirs ).tqarg(cDir)); dirs ).arg(cDir));
} }
else else
slotInfoMessage(this, i18n("1 folder", "%n folders", dirs)); slotInfoMessage(this, i18n("1 folder", "%n folders", dirs));

@ -168,7 +168,7 @@ void Inode::destroyed(ScanDir* d)
{ {
if (_dirPeer == d) _dirPeer = 0; if (_dirPeer == d) _dirPeer = 0;
// remove tqchildren // remove children
clear(); clear();
} }
@ -179,15 +179,15 @@ void Inode::destroyed(ScanFile* f)
TreeMapItemList* Inode::tqchildren() TreeMapItemList* Inode::children()
{ {
if (!_dirPeer) return 0; if (!_dirPeer) return 0;
if (!_tqchildren) { if (!_children) {
if (!_dirPeer->scanStarted()) return 0; if (!_dirPeer->scanStarted()) return 0;
_tqchildren = new TreeMapItemList; _children = new TreeMapItemList;
_tqchildren->setAutoDelete(true); _children->setAutoDelete(true);
setSorting(-1); setSorting(-1);
@ -215,7 +215,7 @@ TreeMapItemList* Inode::tqchildren()
_resortNeeded = false; _resortNeeded = false;
} }
return _tqchildren; return _children;
} }
@ -325,21 +325,21 @@ TQString Inode::text(int i) const
double s = size(); double s = size();
if (s < 1000) if (s < 1000)
text = TQString("%1 B").tqarg((int)(s+.5)); text = TQString("%1 B").arg((int)(s+.5));
else if (s < 10 * 1024) else if (s < 10 * 1024)
text = TQString("%1 kB").tqarg(KGlobal::locale()->formatNumber(s/1024+.005,2)); text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.005,2));
else if (s < 100 * 1024) else if (s < 100 * 1024)
text = TQString("%1 kB").tqarg(KGlobal::locale()->formatNumber(s/1024+.05,1)); text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.05,1));
else if (s < 1000 * 1024) else if (s < 1000 * 1024)
text = TQString("%1 kB").tqarg((int)(s/1024+.5)); text = TQString("%1 kB").arg((int)(s/1024+.5));
else if (s < 10 * 1024 * 1024) else if (s < 10 * 1024 * 1024)
text = TQString("%1 MB").tqarg(KGlobal::locale()->formatNumber(s/1024/1024+.005,2)); text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.005,2));
else if (s < 100 * 1024 * 1024) else if (s < 100 * 1024 * 1024)
text = TQString("%1 MB").tqarg(KGlobal::locale()->formatNumber(s/1024/1024+.05,1)); text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.05,1));
else if (s < 1000 * 1024 * 1024) else if (s < 1000 * 1024 * 1024)
text = TQString("%1 MB").tqarg((int)(s/1024/1024+.5)); text = TQString("%1 MB").arg((int)(s/1024/1024+.5));
else else
text = TQString("%1 GB").tqarg(KGlobal::locale()->formatNumber(s/1024/1024/1024+.005,2)); text = TQString("%1 GB").arg(KGlobal::locale()->formatNumber(s/1024/1024/1024+.005,2));
if (_sizeEstimation>0) text += "+"; if (_sizeEstimation>0) text += "+";
return text; return text;
@ -354,10 +354,10 @@ TQString Inode::text(int i) const
if (f>0) { if (f>0) {
while (f>1000) { while (f>1000) {
text = TQString("%1 %2").tqarg(TQString::number(f).right(3)).tqarg(text); text = TQString("%1 %2").arg(TQString::number(f).right(3)).arg(text);
f /= 1000; f /= 1000;
} }
text = TQString("%1 %2").tqarg(TQString::number(f)).tqarg(text); text = TQString("%1 %2").arg(TQString::number(f)).arg(text);
if (_fileCountEstimation>0) text += "+"; if (_fileCountEstimation>0) text += "+";
} }
return text; return text;

@ -53,7 +53,7 @@ public:
void setPeer(ScanDir*); void setPeer(ScanDir*);
TreeMapItemList* tqchildren(); TreeMapItemList* children();
double value() const; double value() const;
double size() const; double size() const;

@ -756,7 +756,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value)
_parent = parent; _parent = parent;
_sum = 0; _sum = 0;
_tqchildren = 0; _children = 0;
_widget = 0; _widget = 0;
_index = -1; _index = -1;
_depth = -1; // not set _depth = -1; // not set
@ -789,7 +789,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value,
setText(0, text1); setText(0, text1);
_sum = 0; _sum = 0;
_tqchildren = 0; _children = 0;
_widget = 0; _widget = 0;
_index = -1; _index = -1;
_depth = -1; // not set _depth = -1; // not set
@ -801,7 +801,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value,
TreeMapItem::~TreeMapItem() TreeMapItem::~TreeMapItem()
{ {
if (_tqchildren) delete _tqchildren; if (_children) delete _children;
if (_freeRects) delete _freeRects; if (_freeRects) delete _freeRects;
// finally, notify widget about deletion // finally, notify widget about deletion
@ -842,18 +842,18 @@ void TreeMapItem::redraw()
void TreeMapItem::clear() void TreeMapItem::clear()
{ {
if (_tqchildren) { if (_children) {
// delete selected items below this item from selection // delete selected items below this item from selection
if (_widget) _widget->clearSelection(this); if (_widget) _widget->clearSelection(this);
delete _tqchildren; delete _children;
_tqchildren = 0; _children = 0;
} }
} }
// invalidates current tqchildren and forces redraw // invalidates current children and forces redraw
// this is only usefull when tqchildren are created on demand in items() // this is only usefull when children are created on demand in items()
void TreeMapItem::refresh() void TreeMapItem::refresh()
{ {
clear(); clear();
@ -887,9 +887,9 @@ int TreeMapItem::depth() const
bool TreeMapItem::initialized() bool TreeMapItem::initialized()
{ {
if (!_tqchildren) { if (!_children) {
_tqchildren = new TreeMapItemList; _children = new TreeMapItemList;
_tqchildren->setAutoDelete(true); _children->setAutoDelete(true);
return false; return false;
} }
return true; return true;
@ -899,16 +899,16 @@ void TreeMapItem::addItem(TreeMapItem* i)
{ {
if (!i) return; if (!i) return;
if (!_tqchildren) { if (!_children) {
_tqchildren = new TreeMapItemList; _children = new TreeMapItemList;
_tqchildren->setAutoDelete(true); _children->setAutoDelete(true);
} }
i->setParent(this); i->setParent(this);
if (sorting(0) == -1) if (sorting(0) == -1)
_tqchildren->append(i); // preserve insertion order _children->append(i); // preserve insertion order
else else
_tqchildren->inSort(i); _children->inSort(i);
} }
@ -974,17 +974,17 @@ void TreeMapItem::setSorting(int textNo, bool ascending)
_sortAscending = ascending; _sortAscending = ascending;
_sortTextNo = textNo; _sortTextNo = textNo;
if (_tqchildren && _sortTextNo != -1) _tqchildren->sort(); if (_children && _sortTextNo != -1) _children->sort();
} }
void TreeMapItem::resort(bool recursive) void TreeMapItem::resort(bool recursive)
{ {
if (!_tqchildren) return; if (!_children) return;
if (_sortTextNo != -1) _tqchildren->sort(); if (_sortTextNo != -1) _children->sort();
if (recursive) if (recursive)
for (TreeMapItem* i=_tqchildren->first(); i; i=_tqchildren->next()) for (TreeMapItem* i=_children->first(); i; i=_children->next())
i->resort(recursive); i->resort(recursive);
} }
@ -1002,13 +1002,13 @@ int TreeMapItem::rtti() const
return 0; return 0;
} }
TreeMapItemList* TreeMapItem::tqchildren() TreeMapItemList* TreeMapItem::children()
{ {
if (!_tqchildren) { if (!_children) {
_tqchildren = new TreeMapItemList; _children = new TreeMapItemList;
_tqchildren->setAutoDelete(true); _children->setAutoDelete(true);
} }
return _tqchildren; return _children;
} }
void TreeMapItem::clearItemRect() void TreeMapItem::clearItemRect()
@ -1252,7 +1252,7 @@ void TreeMapWidget::setMaxDrawingDepth(int d)
TQString TreeMapWidget::defaultFieldType(int f) const 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 TQString TreeMapWidget::defaultFieldStop(int) const
@ -1482,7 +1482,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const
if (DEBUG_DRAWING) kdDebug(90100) << "item(" << x << "," << y << "):" << endl; if (DEBUG_DRAWING) kdDebug(90100) << "item(" << x << "," << y << "):" << endl;
while (1) { while (1) {
TreeMapItemList* list = p->tqchildren(); TreeMapItemList* list = p->children();
if (!list) if (!list)
i = 0; i = 0;
else { else {
@ -1546,12 +1546,12 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const
(i->itemRect().height() <1))) { (i->itemRect().height() <1))) {
TreeMapItem* p = i->parent(); TreeMapItem* p = i->parent();
if (!p) break; if (!p) break;
int idx = p->tqchildren()->findRef(i); int idx = p->children()->findRef(i);
idx--; idx--;
if (idx<0) if (idx<0)
i = p; i = p;
else else
i = p->tqchildren()->at(idx); i = p->children()->at(idx);
} }
} }
return i; return i;
@ -1745,7 +1745,7 @@ TreeMapItem* TreeMapWidget::setTmpRangeSelection(TreeMapItem* i1,
i2 = i2->parent(); i2 = i2->parent();
if (!i2) return changed; if (!i2) return changed;
TreeMapItemList* list = commonParent->tqchildren(); TreeMapItemList* list = commonParent->children();
if (!list) return changed; if (!list) return changed;
TreeMapItem* i = list->first(); TreeMapItem* i = list->first();
@ -1768,7 +1768,7 @@ void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e )
{ {
//kdDebug(90100) << "TreeMapWidget::contextMenuEvent" << endl; //kdDebug(90100) << "TreeMapWidget::contextMenuEvent" << endl;
if ( tqreceivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) ) if ( receivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) )
e->accept(); e->accept();
if ( e->reason() == TQContextMenuEvent::Keyboard ) { if ( e->reason() == TQContextMenuEvent::Keyboard ) {
@ -1938,12 +1938,12 @@ int nextVisible(TreeMapItem* i)
TreeMapItem* p = i->parent(); TreeMapItem* p = i->parent();
if (!p || p->itemRect().isEmpty()) return -1; if (!p || p->itemRect().isEmpty()) return -1;
int idx = p->tqchildren()->findRef(i); int idx = p->children()->findRef(i);
if (idx<0) return -1; if (idx<0) return -1;
while (idx < (int)p->tqchildren()->count()-1) { while (idx < (int)p->children()->count()-1) {
idx++; idx++;
TQRect r = p->tqchildren()->at(idx)->itemRect(); TQRect r = p->children()->at(idx)->itemRect();
if (r.width()>1 && r.height()>1) if (r.width()>1 && r.height()>1)
return idx; return idx;
} }
@ -1956,12 +1956,12 @@ int prevVisible(TreeMapItem* i)
TreeMapItem* p = i->parent(); TreeMapItem* p = i->parent();
if (!p || p->itemRect().isEmpty()) return -1; if (!p || p->itemRect().isEmpty()) return -1;
int idx = p->tqchildren()->findRef(i); int idx = p->children()->findRef(i);
if (idx<0) return -1; if (idx<0) return -1;
while (idx > 0) { while (idx > 0) {
idx--; idx--;
TQRect r = p->tqchildren()->at(idx)->itemRect(); TQRect r = p->children()->at(idx)->itemRect();
if (r.width()>1 && r.height()>1) if (r.width()>1 && r.height()>1)
return idx; return idx;
} }
@ -2042,24 +2042,24 @@ void TreeMapWidget::keyPressEvent( TQKeyEvent* e )
int newIdx = goBack ? nextVisible(_current) : prevVisible(_current); int newIdx = goBack ? nextVisible(_current) : prevVisible(_current);
if (p && newIdx>=0) { if (p && newIdx>=0) {
p->setIndex(newIdx); p->setIndex(newIdx);
setCurrent(p->tqchildren()->at(newIdx), true); setCurrent(p->children()->at(newIdx), true);
} }
} }
else if (e->key() == Key_Right) { else if (e->key() == Key_Right) {
int newIdx = goBack ? prevVisible(_current) : nextVisible(_current); int newIdx = goBack ? prevVisible(_current) : nextVisible(_current);
if (p && newIdx>=0) { if (p && newIdx>=0) {
p->setIndex(newIdx); p->setIndex(newIdx);
setCurrent(p->tqchildren()->at(newIdx), true); setCurrent(p->children()->at(newIdx), true);
} }
} }
else if (e->key() == Key_Down) { else if (e->key() == Key_Down) {
if (_current->tqchildren() && _current->tqchildren()->count()>0) { if (_current->children() && _current->children()->count()>0) {
int newIdx = _current->index(); int newIdx = _current->index();
if (newIdx<0) if (newIdx<0)
newIdx = goBack ? (_current->tqchildren()->count()-1) : 0; newIdx = goBack ? (_current->children()->count()-1) : 0;
if (newIdx>=(int)_current->tqchildren()->count()) if (newIdx>=(int)_current->children()->count())
newIdx = _current->tqchildren()->count()-1; newIdx = _current->children()->count()-1;
newItem = visibleItem(_current->tqchildren()->at(newIdx)); newItem = visibleItem(_current->children()->at(newIdx));
setCurrent(newItem, true); setCurrent(newItem, true);
} }
} }
@ -2245,12 +2245,12 @@ void TreeMapWidget::drawItems(TQPainter* p,
TQRect r = TQRect(origRect.x()+bw, origRect.y()+bw, TQRect r = TQRect(origRect.x()+bw, origRect.y()+bw,
origRect.width()-2*bw, origRect.height()-2*bw); origRect.width()-2*bw, origRect.height()-2*bw);
TreeMapItemList* list = item->tqchildren(); TreeMapItemList* list = item->children();
TreeMapItem* i; TreeMapItem* i;
bool stopDrawing = false; bool stopDrawing = false;
// only subdivide if there are tqchildren // only subdivide if there are children
if (!list || list->count()==0) if (!list || list->count()==0)
stopDrawing = true; stopDrawing = true;
@ -2283,7 +2283,7 @@ void TreeMapWidget::drawItems(TQPainter* p,
if (stopDrawing) { if (stopDrawing) {
if (list) { if (list) {
// tqinvalidate rects // invalidate rects
for (i=list->first();i;i=list->next()) for (i=list->first();i;i=list->next())
i->clearItemRect(); i->clearItemRect();
} }
@ -2399,7 +2399,7 @@ void TreeMapWidget::drawItems(TQPainter* p,
r.setRect(r.x(), r.y()+sr.height(), r.width(), r.height()-sr.height()); 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); item->addFreeRect(sr);
if (0) kdDebug(90100) << "Item " << item->path(0).join("/") << ": SelfR " if (0) kdDebug(90100) << "Item " << item->path(0).join("/") << ": SelfR "
@ -2537,7 +2537,7 @@ void TreeMapWidget::drawItems(TQPainter* p,
kdDebug(90100) << "-drawItems(" << item->path(0).join("/") << ")" << endl; 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) void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r)
{ {
p->setBrush(TQt::Dense4Pattern); p->setBrush(TQt::Dense4Pattern);
@ -2546,7 +2546,7 @@ void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r)
i->addFreeRect(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, void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r,
TreeMapItemListIterator it, int len, bool goBack) TreeMapItemListIterator it, int len, bool goBack)
{ {
@ -2845,10 +2845,10 @@ void TreeMapWidget::addVisualizationItems(TQPopupMenu* popup, int id)
popup->insertItem(i18n("Border"), bpopup, id+1); popup->insertItem(i18n("Border"), bpopup, id+1);
bpopup->insertItem(i18n("Correct Borders Only"), id+2); bpopup->insertItem(i18n("Correct Borders Only"), id+2);
bpopup->insertSeparator(); bpopup->insertSeparator();
bpopup->insertItem(i18n("Width %1").tqarg(0), id+3); bpopup->insertItem(i18n("Width %1").arg(0), id+3);
bpopup->insertItem(i18n("Width %1").tqarg(1), id+4); bpopup->insertItem(i18n("Width %1").arg(1), id+4);
bpopup->insertItem(i18n("Width %1").tqarg(2), id+5); bpopup->insertItem(i18n("Width %1").arg(2), id+5);
bpopup->insertItem(i18n("Width %1").tqarg(3), id+6); bpopup->insertItem(i18n("Width %1").arg(3), id+6);
bpopup->setItemChecked(id+2, skipIncorrectBorder()); bpopup->setItemChecked(id+2, skipIncorrectBorder());
bpopup->setItemChecked(id+3, borderWidth()==0); bpopup->setItemChecked(id+3, borderWidth()==0);
bpopup->setItemChecked(id+4, borderWidth()==1); bpopup->setItemChecked(id+4, borderWidth()==1);
@ -2955,7 +2955,7 @@ void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup,
connect(popup, TQT_SIGNAL(activated(int)), connect(popup, TQT_SIGNAL(activated(int)),
this, TQT_SLOT(fieldStopActivated(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()); popup->setItemChecked(id, fieldStop(0).isEmpty());
_menuItem = i; _menuItem = i;
bool foundFieldStop = false; bool foundFieldStop = false;
@ -3014,7 +3014,7 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup,
int area = i->width() * i->height(); int area = i->width() * i->height();
popup->insertSeparator(); popup->insertSeparator();
popup->insertItem(i18n("Area of '%1' (%2)") 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()) { if (area == minimalArea()) {
popup->setItemChecked(id+1, true); popup->setItemChecked(id+1, true);
foundArea = true; foundArea = true;
@ -3040,9 +3040,9 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup,
} }
popup->insertItem(i18n("Double Area Limit (to %1)") 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)") popup->insertItem(i18n("Halve Area Limit (to %1)")
.tqarg(minimalArea()/2), id+6); .arg(minimalArea()/2), id+6);
} }
} }
@ -3079,7 +3079,7 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup,
int d = i->depth(); int d = i->depth();
popup->insertSeparator(); popup->insertSeparator();
popup->insertItem(i18n("Depth of '%1' (%2)") 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()) { if (d == maxDrawingDepth()) {
popup->setItemChecked(id+1, true); popup->setItemChecked(id+1, true);
foundDepth = true; foundDepth = true;
@ -3089,7 +3089,7 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup,
popup->insertSeparator(); popup->insertSeparator();
int depth = 2, count; int depth = 2, count;
for (count=0;count<3;count++) { for (count=0;count<3;count++) {
popup->insertItem(i18n("Depth %1").tqarg(depth), id+4+count); popup->insertItem(i18n("Depth %1").arg(depth), id+4+count);
if (depth == maxDrawingDepth()) { if (depth == maxDrawingDepth()) {
popup->setItemChecked(id+4+count, true); popup->setItemChecked(id+4+count, true);
foundDepth = true; foundDepth = true;
@ -3100,14 +3100,14 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup,
if (maxDrawingDepth()>1) { if (maxDrawingDepth()>1) {
popup->insertSeparator(); popup->insertSeparator();
if (!foundDepth) { 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->setItemChecked(id+10, true);
} }
popup->insertItem(i18n("Decrement (to %1)") popup->insertItem(i18n("Decrement (to %1)")
.tqarg(maxDrawingDepth()-1), id+2); .arg(maxDrawingDepth()-1), id+2);
popup->insertItem(i18n("Increment (to %1)") popup->insertItem(i18n("Increment (to %1)")
.tqarg(maxDrawingDepth()+1), id+3); .arg(maxDrawingDepth()+1), id+3);
} }
} }
@ -3130,13 +3130,13 @@ void TreeMapWidget::saveOptions(KConfigGroup* config, TQString prefix)
int f, fCount = _attr.size(); int f, fCount = _attr.size();
config->writeEntry(prefix+"FieldCount", fCount); config->writeEntry(prefix+"FieldCount", fCount);
for (f=0;f<fCount;f++) { 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); _attr[f].visible);
config->writeEntry(TQString(prefix+"FieldForced%1").tqarg(f), config->writeEntry(TQString(prefix+"FieldForced%1").arg(f),
_attr[f].forced); _attr[f].forced);
config->writeEntry(TQString(prefix+"FieldStop%1").tqarg(f), config->writeEntry(TQString(prefix+"FieldStop%1").arg(f),
_attr[f].stop); _attr[f].stop);
config->writeEntry(TQString(prefix+"FieldPosition%1").tqarg(f), config->writeEntry(TQString(prefix+"FieldPosition%1").arg(f),
fieldPositionString(f)); fieldPositionString(f));
} }
} }
@ -3180,18 +3180,18 @@ void TreeMapWidget::restoreOptions(KConfigGroup* config, TQString prefix)
int f; int f;
for (f=0;f<num;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)) if (config->hasKey(str))
setFieldVisible(f, config->readBoolEntry(str)); setFieldVisible(f, config->readBoolEntry(str));
str = TQString(prefix+"FieldForced%1").tqarg(f); str = TQString(prefix+"FieldForced%1").arg(f);
if (config->hasKey(str)) if (config->hasKey(str))
setFieldForced(f, config->readBoolEntry(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); 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); if (!str.isEmpty()) setFieldPosition(f, str);
} }
} }

@ -215,7 +215,7 @@ typedef TQPtrListIterator<TreeMapItem> TreeMapItemListIterator;
* *
* If you want more flexibility, reimplement TreeMapItem and * If you want more flexibility, reimplement TreeMapItem and
* override the corresponding methods. For dynamic creation of child * override the corresponding methods. For dynamic creation of child
* items on demand, reimplement tqchildren(). * items on demand, reimplement children().
*/ */
class TreeMapItem: public StoredDrawParams class TreeMapItem: public StoredDrawParams
{ {
@ -250,7 +250,7 @@ public:
// force a redraw of this item // force a redraw of this item
void redraw(); void redraw();
// delete all tqchildren // delete all children
void clear(); void clear();
// force new child generation & refresh // force new child generation & refresh
@ -343,7 +343,7 @@ public:
* For value() sorting, use <textNo> = -2 * For value() sorting, use <textNo> = -2
* *
* For fast sorting, set this to -1 before child insertions and call * 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); void setSorting(int textNo, bool ascending = true);
@ -351,18 +351,18 @@ public:
* Resort according to the already set sorting. * Resort according to the already set sorting.
* *
* This has to be done if the sorting base changes (e.g. text or values * 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. * set the recursive parameter to false.
*/ */
void resort(bool recursive = true); void resort(bool recursive = true);
virtual SplitMode splitMode() const; virtual SplitMode splitMode() const;
virtual int rtti() const; virtual int rtti() const;
// not const as this can create tqchildren on demand // not const as this can create children on demand
virtual TreeMapItemList* tqchildren(); virtual TreeMapItemList* children();
protected: protected:
TreeMapItemList* _tqchildren; TreeMapItemList* _children;
double _sum, _value; double _sum, _value;
private: private:
@ -436,7 +436,7 @@ public:
/** /**
* Selects or unselects an item. * Selects or unselects an item.
* In multiselection mode, the constrain that a selected 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); void setSelected(TreeMapItem*, bool selected = true);
@ -452,7 +452,7 @@ public:
void setMarked(int markNo = 1, bool redraw = true); 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 * parent. When parent == 0, clears whole selection
* Returns true if selection changed. * Returns true if selection changed.
*/ */
@ -464,7 +464,7 @@ public:
* Range means for a hierarchical widget: * Range means for a hierarchical widget:
* - select/unselect i1 and i2 according selected * - select/unselect i1 and i2 according selected
* - search common parent of i1 and i2, and select/unselect the * - 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. * leading to i1 and the child leading to i2.
*/ */
void setRangeSelection(TreeMapItem* i1, void setRangeSelection(TreeMapItem* i1,
@ -517,7 +517,7 @@ public:
void setVisibleWidth(int width, bool reuseSpace = false); 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 * it can happen that the border to be drawn for visibilty of
* nesting relations takes to much space, and the * nesting relations takes to much space, and the
* parent/child size relation can not be mapped to a correct * parent/child size relation can not be mapped to a correct
@ -629,7 +629,7 @@ public:
virtual TQString tipString(TreeMapItem* i) const; 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. * This takes changed values(), sums(), colors() and text() into account.
*/ */
void redraw(TreeMapItem*); void redraw(TreeMapItem*);

@ -60,7 +60,7 @@ KIGPDialog::KIGPDialog(TQWidget *parent, const TQString& path, const char *name
void KIGPDialog::slotDefault() void KIGPDialog::slotDefault()
{ {
m_title->setText(i18n("Image Gallery for %1").tqarg(m_path)); m_title->setText(i18n("Image Gallery for %1").arg(m_path));
m_imagesPerRow->setValue(4); m_imagesPerRow->setValue(4);
m_imageName->setChecked(true); m_imageName->setChecked(true);
m_imageSize->setChecked(false); m_imageSize->setChecked(false);
@ -96,7 +96,7 @@ void KIGPDialog::setupLookPage(const TQString& path) {
label = new TQLabel( i18n("&Page title:"), page); label = new TQLabel( i18n("&Page title:"), page);
vlay->addWidget(label); vlay->addWidget(label);
m_title = new TQLineEdit(i18n("Image Gallery for %1").tqarg(path), page); m_title = new TQLineEdit(i18n("Image Gallery for %1").arg(path), page);
vlay->addWidget( m_title ); vlay->addWidget( m_title );
label->setBuddy(m_title); label->setBuddy(m_title);

@ -105,7 +105,7 @@ bool KImGalleryPlugin::createDirectory(TQDir thumb_dir, TQString imgGalleryDir,
if (!thumb_dir.exists()) { if (!thumb_dir.exists()) {
thumb_dir.setPath( imgGalleryDir); thumb_dir.setPath( imgGalleryDir);
if (!(thumb_dir.mkdir(dirName, false))) { if (!(thumb_dir.mkdir(dirName, false))) {
KMessageBox::sorry(m_part->widget(), i18n("Couldn't create folder: %1").tqarg(thumb_dir.path())); KMessageBox::sorry(m_part->widget(), i18n("Couldn't create folder: %1").arg(thumb_dir.path()));
return false; return false;
} else { } else {
thumb_dir.setPath( imgGalleryDir + "/" + dirName + "/" ); thumb_dir.setPath( imgGalleryDir + "/" + dirName + "/" );
@ -166,8 +166,8 @@ void KImGalleryPlugin::createBody(TQTextStream& stream, const TQString& sourceDi
const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate())); const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate()));
stream << "<body>\n<h1>" << TQStyleSheet::escape(m_configDlg->getTitle()) << "</h1><p>" << endl; stream << "<body>\n<h1>" << TQStyleSheet::escape(m_configDlg->getTitle()) << "</h1><p>" << endl;
stream << i18n("<i>Number of images</i>: %1").tqarg(numOfImages) << "<br/>" << endl; stream << i18n("<i>Number of images</i>: %1").arg(numOfImages) << "<br/>" << endl;
stream << i18n("<i>Created on</i>: %1").tqarg(today) << "</p>" << endl; stream << i18n("<i>Created on</i>: %1").arg(today) << "</p>" << endl;
stream << "<hr/>" << endl; stream << "<hr/>" << endl;
@ -205,10 +205,10 @@ void KImGalleryPlugin::createBody(TQTextStream& stream, const TQString& sourceDi
const TQString imgPath("thumbs/" + imgName + extension(imageFormat)); const TQString imgPath("thumbs/" + imgName + extension(imageFormat));
stream << "<img src=\"" << imgPath << "\" width=\"" << m_imgWidth << "\" "; stream << "<img src=\"" << imgPath << "\" width=\"" << m_imgWidth << "\" ";
stream << "height=\"" << m_imgHeight << "\" alt=\"" << imgPath << "\"/>"; stream << "height=\"" << m_imgHeight << "\" alt=\"" << imgPath << "\"/>";
m_progressDlg->setLabelText( i18n("Created thumbnail for: \n%1").tqarg(imgName) ); m_progressDlg->setLabelText( i18n("Created thumbnail for: \n%1").arg(imgName) );
} else { } else {
kdDebug(90170) << "Creating thumbnail for " << imgName << " failed" << endl; kdDebug(90170) << "Creating thumbnail for " << imgName << " failed" << endl;
m_progressDlg->setLabelText( i18n("Creating thumbnail for: \n%1\n failed").tqarg(imgName) ); m_progressDlg->setLabelText( i18n("Creating thumbnail for: \n%1\n failed").arg(imgName) );
} }
stream << "</a>" << endl; stream << "</a>" << endl;
@ -266,7 +266,7 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const TQString& sourceDirName
if (!subDir.exists()) { if (!subDir.exists()) {
subDir.setPath( url.directory() ); subDir.setPath( url.directory() );
if (!(subDir.mkdir(currentDir, false))) { if (!(subDir.mkdir(currentDir, false))) {
KMessageBox::sorry(part->widget(), i18n("Couldn't create folder: %1").tqarg(subDir.path())); KMessageBox::sorry(part->widget(), i18n("Couldn't create folder: %1").arg(subDir.path()));
continue; continue;
} else { } else {
subDir.setPath( url.directory() + "/" + currentDir ); subDir.setPath( url.directory() + "/" + currentDir );
@ -320,7 +320,7 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const TQString& sourceDirName
return !m_cancelled; return !m_cancelled;
} else { } else {
KMessageBox::sorry(m_part->widget(),i18n("Couldn't open file: %1").tqarg(url.path(+1))); KMessageBox::sorry(m_part->widget(),i18n("Couldn't open file: %1").arg(url.path(+1)));
return false; return false;
} }
} }
@ -415,7 +415,7 @@ void KImGalleryPlugin::loadCommentFile()
kdDebug(90170) << "File closed." << endl; kdDebug(90170) << "File closed." << endl;
delete m_textStream; delete m_textStream;
} else { } else {
KMessageBox::sorry(m_part->widget(), i18n("Couldn't open file: %1").tqarg(m_configDlg->getCommentFile())); KMessageBox::sorry(m_part->widget(), i18n("Couldn't open file: %1").arg(m_configDlg->getCommentFile()));
m_useCommentFile = false; m_useCommentFile = false;
} }
} }

@ -42,11 +42,11 @@ KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src,
src( _src ), src( _src ),
action( 0 ) action( 0 )
{ {
tqchildren.setAutoDelete( true ); children.setAutoDelete( true );
initIconMap( ); initIconMap( );
connect( this, TQT_SIGNAL( aboutToShow( ) ), this, TQT_SLOT( slotAboutToShow( ) ) ); connect( this, TQT_SIGNAL( aboutToShow( ) ), this, TQT_SLOT( slotAboutToShow( ) ) );
connect( this, TQT_SIGNAL( aboutToHide( ) ), this, TQT_SLOT( slotAboutToHide( ) ) ); connect( this, TQT_SIGNAL( aboutToHide( ) ), this, TQT_SLOT( slotAboutToHide( ) ) );
tqchildren.clear(); // just in case children.clear(); // just in case
TQFileInfo fileInfo(path); TQFileInfo fileInfo(path);
if (( src.path() != path || !src.isLocalFile()) && fileInfo.isWritable()) if (( src.path() != path || !src.isLocalFile()) && fileInfo.isWritable())
@ -55,7 +55,7 @@ KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src,
KDirMenu::~KDirMenu( ) { KDirMenu::~KDirMenu( ) {
delete action; delete action;
clear( ); clear( );
tqchildren.clear( ); children.clear( );
} }
void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) { void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) {
static const TQIconSet folder = SmallIconSet("folder"); static const TQIconSet folder = SmallIconSet("folder");
@ -80,7 +80,7 @@ void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) {
} }
else else
insertItem( folder, escapedPath.replace( "&", "&&" ), submenu ); insertItem( folder, escapedPath.replace( "&", "&&" ), submenu );
tqchildren.append( submenu ); children.append( submenu );
connect(submenu, TQT_SIGNAL(fileChosen(const TQString &)), connect(submenu, TQT_SIGNAL(fileChosen(const TQString &)),
this, TQT_SLOT(slotFileSelected(const TQString &))); this, TQT_SLOT(slotFileSelected(const TQString &)));
} }

@ -48,7 +48,7 @@ private:
TQString name; TQString name;
KURL src; KURL src;
KAction *action; KAction *action;
TQPtrList<KDirMenu> tqchildren; TQPtrList<KDirMenu> children;
void initIconMap( ); void initIconMap( );
public slots: public slots:
void slotAboutToShow( ); void slotAboutToShow( );

@ -394,7 +394,7 @@ void RelLinksPlugin::guessRelations()
TQString href=rx.cap(1)+ nval_str + rx.cap(3); TQString href=rx.cap(1)+ nval_str + rx.cap(3);
KURL ref( m_part->url(), href ); KURL ref( m_part->url(), href );
TQString title = i18n("[Autodetected] %1").tqarg(ref.prettyURL()); TQString title = i18n("[Autodetected] %1").arg(ref.prettyURL());
DOM::Element e= m_part->document().createElement("link"); DOM::Element e= m_part->document().createElement("link");
e.setAttribute("href",href); e.setAttribute("href",href);
element_map["next"][0] = e; element_map["next"][0] = e;
@ -408,7 +408,7 @@ void RelLinksPlugin::guessRelations()
nval_str.prepend(zeros.left(lenval-nval_str.length())); nval_str.prepend(zeros.left(lenval-nval_str.length()));
TQString href=rx.cap(1)+ nval_str + rx.cap(3); TQString href=rx.cap(1)+ nval_str + rx.cap(3);
KURL ref( m_part->url(), href ); KURL ref( m_part->url(), href );
TQString title = i18n("[Autodetected] %1").tqarg(ref.prettyURL()); TQString title = i18n("[Autodetected] %1").arg(ref.prettyURL());
e= m_part->document().createElement("link"); e= m_part->document().createElement("link");
e.setAttribute("href",href); e.setAttribute("href",href);
element_map["prev"][0] = e; element_map["prev"][0] = e;

@ -273,7 +273,7 @@ void SearchBarPlugin::startSearch(const TQString &_search)
TQStringList list; TQStringList list;
list << "kurisearchfilter" << "kuriikwsfilter"; list << "kurisearchfilter" << "kuriikwsfilter";
service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").tqarg(m_currentEngine)); service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(m_currentEngine));
if (service) { if (service) {
const TQString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter(); const TQString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter();
data.setData( searchProviderPrefix + search ); data.setData( searchProviderPrefix + search );
@ -329,7 +329,7 @@ void SearchBarPlugin::setIcon()
TQStringList list; TQStringList list;
list << "kurisearchfilter" << "kuriikwsfilter"; list << "kurisearchfilter" << "kuriikwsfilter";
service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").tqarg(m_currentEngine)); service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(m_currentEngine));
if (service) { if (service) {
const TQString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter(); const TQString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter();
data.setData( searchProviderPrefix + "some keyword" ); data.setData( searchProviderPrefix + "some keyword" );
@ -353,7 +353,7 @@ void SearchBarPlugin::setIcon()
m_searchIcon = SmallIcon("google"); m_searchIcon = SmallIcon("google");
providername = "Google"; providername = "Google";
} }
hinttext = i18n("%1 Search").tqarg(providername);; hinttext = i18n("%1 Search").arg(providername);;
} }
static_cast<KLineEdit*>(m_searchCombo->lineEdit())->setClickMessage(hinttext); static_cast<KLineEdit*>(m_searchCombo->lineEdit())->setClickMessage(hinttext);
@ -389,7 +389,7 @@ void SearchBarPlugin::showSelectionMenu()
for (TQStringList::ConstIterator it = m_searchEngines.begin(); it != m_searchEngines.end(); ++it ) for (TQStringList::ConstIterator it = m_searchEngines.begin(); it != m_searchEngines.end(); ++it )
{ {
i++; i++;
service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").tqarg(*it)); service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(*it));
if(!service) if(!service)
{ {
continue; continue;

@ -302,7 +302,7 @@ void MainWidget::slotRenameTag()
if ( tag ) if ( tag )
{ {
TQString oldName = tag->name(); TQString oldName = tag->name();
TQString newName = KInputDialog::getText( i18n( "Rename Tag" ), i18n( "Provide a new name for tag '%1':" ).tqarg( oldName ) ); TQString newName = KInputDialog::getText( i18n( "Rename Tag" ), i18n( "Provide a new name for tag '%1':" ).arg( oldName ) );
if ( !newName.isEmpty() ) if ( !newName.isEmpty() )
{ {
KURL url( "http://del.icio.us/api/tags/rename" ); KURL url( "http://del.icio.us/api/tags/rename" );
@ -334,7 +334,7 @@ void MainWidget::slotDeleteBookmark()
BookmarkListItem * bookmark = static_cast<BookmarkListItem *>( lvBookmarks->currentItem() ); BookmarkListItem * bookmark = static_cast<BookmarkListItem *>( lvBookmarks->currentItem() );
if ( bookmark ) if ( bookmark )
{ {
int result = KMessageBox::warningContinueCancel( this, i18n( "Do you really want to remove the bookmark\n%1?" ).tqarg( bookmark->desc() ), int result = KMessageBox::warningContinueCancel( this, i18n( "Do you really want to remove the bookmark\n%1?" ).arg( bookmark->desc() ),
i18n( "Delete Bookmark" ), KStdGuiItem::del() ); i18n( "Delete Bookmark" ), KStdGuiItem::del() );
if ( result == KMessageBox::Continue ) if ( result == KMessageBox::Continue )

@ -156,7 +156,7 @@ void DefaultPlugin::loadApplications(DOM::HTMLElement node)
KDesktopFile desktop(url.path(), TRUE); KDesktopFile desktop(url.path(), TRUE);
if(desktop.hasApplicationType ()){ if(desktop.hasApplicationType ()){
MetabarWidget::addEntry(innerHTML, i18n("Run %1").tqarg(desktop.readName()), "desktop://" + url.path(), desktop.readIcon()); MetabarWidget::addEntry(innerHTML, i18n("Run %1").arg(desktop.readName()), "desktop://" + url.path(), desktop.readIcon());
m_functions->show("open"); m_functions->show("open");
} }
@ -364,12 +364,12 @@ void DefaultPlugin::slotSetPreview(const KFileItem *item, const TQPixmap &pix)
buffer.open(IO_WriteOnly); buffer.open(IO_WriteOnly);
pix.save(&buffer, "PNG"); pix.save(&buffer, "PNG");
TQString src = TQString::fromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data()); TQString src = TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data).data());
bool media = item->mimetype().startsWith("video/"); bool media = item->mimetype().startsWith("video/");
DOM::DOMString innerHTML; DOM::DOMString innerHTML;
innerHTML += TQString("<ul style=\"height: %1px\"><a class=\"preview\"").tqarg(pix.height() + 15); innerHTML += TQString("<ul style=\"height: %1px\"><a class=\"preview\"").arg(pix.height() + 15);
if(media){ if(media){
innerHTML += " href=\"preview:///\""; innerHTML += " href=\"preview:///\"";

@ -81,7 +81,7 @@ void MetabarFunctions::toggle(DOM::DOMString item)
DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item)); DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item));
if(!node.isNull()){ if(!node.isNull()){
DOM::NodeList tqchildren = node.childNodes(); DOM::NodeList children = node.childNodes();
DOM::CSSStyleDeclaration style = node.style(); DOM::CSSStyleDeclaration style = node.style();
DOM::DOMString expanded = node.getAttribute("expanded"); DOM::DOMString expanded = node.getAttribute("expanded");
@ -106,7 +106,7 @@ void MetabarFunctions::toggle(DOM::DOMString item)
} }
} }
else{ else{
style.setProperty("height", TQString("%1px").tqarg(height), CSS_PRIORITY); style.setProperty("height", TQString("%1px").arg(height), CSS_PRIORITY);
} }
} }
} }
@ -117,7 +117,7 @@ void MetabarFunctions::adjustSize(DOM::DOMString item)
DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item)); DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item));
if(!node.isNull()){ if(!node.isNull()){
DOM::NodeList tqchildren = node.childNodes(); DOM::NodeList children = node.childNodes();
DOM::CSSStyleDeclaration style = node.style(); DOM::CSSStyleDeclaration style = node.style();
DOM::DOMString expanded = node.getAttribute("expanded"); DOM::DOMString expanded = node.getAttribute("expanded");
@ -137,7 +137,7 @@ void MetabarFunctions::adjustSize(DOM::DOMString item)
} }
} }
else{ else{
style.setProperty("height", TQString("%1px").tqarg(height), CSS_PRIORITY); style.setProperty("height", TQString("%1px").arg(height), CSS_PRIORITY);
} }
} }
} }
@ -176,7 +176,7 @@ void MetabarFunctions::animate()
} }
int change = currentHeight < height ? changeValue : -changeValue; int change = currentHeight < height ? changeValue : -changeValue;
style.setProperty("height", TQString("%1px").tqarg(currentHeight + change), CSS_PRIORITY); style.setProperty("height", TQString("%1px").arg(currentHeight + change), CSS_PRIORITY);
doc.updateRendering(); doc.updateRendering();
} }
} }
@ -209,9 +209,9 @@ void MetabarFunctions::hide(DOM::DOMString item)
int MetabarFunctions::getHeight(DOM::HTMLElement &element) int MetabarFunctions::getHeight(DOM::HTMLElement &element)
{ {
int height = 0; int height = 0;
DOM::NodeList tqchildren = element.childNodes(); DOM::NodeList children = element.childNodes();
for(uint i = 0; i < tqchildren.length(); i++){ for(uint i = 0; i < children.length(); i++){
DOM::HTMLElement node = static_cast<DOM::HTMLElement>(tqchildren.item(i)); DOM::HTMLElement node = static_cast<DOM::HTMLElement>(children.item(i));
DOM::CSSStyleDeclaration style = node.style(); DOM::CSSStyleDeclaration style = node.style();
DOM::DOMString css_height = style.getPropertyValue("height"); DOM::DOMString css_height = style.getPropertyValue("height");

@ -118,7 +118,7 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
tqlayout->addWidget(html->view()); tqlayout->addWidget(html->view());
popup = new KPopupMenu(0); popup = new KPopupMenu(0);
KAction *configAction = new KAction(i18n("Configure %1...").tqarg("Metabar"), "configure", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure"); KAction *configAction = new KAction(i18n("Configure %1...").arg("Metabar"), "configure", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure");
configAction->plug(popup); configAction->plug(popup);
KAction *reloadAction = new KAction(i18n("Reload Theme"), "reload", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(setTheme()), html->actionCollection(), "reload"); KAction *reloadAction = new KAction(i18n("Reload Theme"), "reload", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(setTheme()), html->actionCollection(), "reload");
@ -289,7 +289,7 @@ void MetabarWidget::loadCompleted()
if(node.hasAttribute("image")){ if(node.hasAttribute("image")){
TQString icon = node.getAttribute("image").string(); TQString icon = node.getAttribute("image").string();
TQString url = getIconPath(icon); TQString url = getIconPath(icon);
TQString style = TQString("background-image: url(%1);").tqarg(url); TQString style = TQString("background-image: url(%1);").arg(url);
node.setAttribute("style", style); node.setAttribute("style", style);
} }
@ -308,7 +308,7 @@ void MetabarWidget::loadCompleted()
} }
config->setGroup("General"); config->setGroup("General");
TQString file = locate("data", TQString("metabar/themes/%1/default.css").tqarg(config->readEntry("Theme", "default"))); TQString file = locate("data", TQString("metabar/themes/%1/default.css").arg(config->readEntry("Theme", "default")));
if(file.isNull()){ if(file.isNull()){
file = locate("data", TQString("metabar/themes/default/default.css")); file = locate("data", TQString("metabar/themes/default/default.css"));
} }
@ -393,7 +393,7 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg
skip = true; //needed to prevent some weired reload skip = true; //needed to prevent some weired reload
DOM::DOMString innerHTML; DOM::DOMString innerHTML;
innerHTML += TQString("<ul style=\"width: %1px; height: %1px\">").tqarg(image.width(), image.height()); innerHTML += TQString("<ul style=\"width: %1px; height: %1px\">").arg(image.width(), image.height());
innerHTML += "<object class=\"preview\" type=\""; innerHTML += "<object class=\"preview\" type=\"";
innerHTML += item->mimetype(); innerHTML += item->mimetype();
innerHTML += "\" data=\""; innerHTML += "\" data=\"";
@ -431,7 +431,7 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg
} }
if(element.id().string().startsWith("hidden")){ if(element.id().string().startsWith("hidden")){
TQString style = TQString("background-image: url(%1);").tqarg(getIconPath(showMore ? "1downarrow" : "1uparrow")); TQString style = TQString("background-image: url(%1);").arg(getIconPath(showMore ? "1downarrow" : "1uparrow"));
element.setInnerText( showMore ? i18n("More") : i18n("Less") ); element.setInnerText( showMore ? i18n("More") : i18n("Less") );
element.setAttribute("style", style); element.setAttribute("style", style);
} }
@ -475,7 +475,7 @@ TQString MetabarWidget::getIconPath(const TQString &name)
buffer.open(IO_WriteOnly); buffer.open(IO_WriteOnly);
icon.save(&buffer, "PNG"); icon.save(&buffer, "PNG");
return TQString::fromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data()); return TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data).data());
} }
void MetabarWidget::slotShowSharingDialog() void MetabarWidget::slotShowSharingDialog()
@ -584,7 +584,7 @@ void MetabarWidget::setTheme()
loadComplete = false; loadComplete = false;
config->setGroup("General"); config->setGroup("General");
TQString file = locate("data", TQString("metabar/themes/%1/tqlayout.html").tqarg(config->readEntry("Theme", "default"))); TQString file = locate("data", TQString("metabar/themes/%1/tqlayout.html").arg(config->readEntry("Theme", "default")));
html->openURL(KURL(file)); html->openURL(KURL(file));
} }

@ -71,7 +71,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
TQBuffer buffer(data); TQBuffer buffer(data);
buffer.open(IO_WriteOnly); buffer.open(IO_WriteOnly);
pix.save(&buffer, "PNG"); pix.save(&buffer, "PNG");
TQString icondata = TQString::fromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data()); TQString icondata = TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data).data());
icon.setSrc(icondata); icon.setSrc(icondata);
} }
@ -81,7 +81,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
name.setInnerText(m_items.getFirst()->name()); name.setInnerText(m_items.getFirst()->name());
} }
else{ else{
name.setInnerText(i18n("%1 Elements").tqarg(m_items.count())); name.setInnerText(i18n("%1 Elements").arg(m_items.count()));
} }
} }
@ -105,7 +105,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
} }
} }
type.setInnerText(i18n("%1 Folders, %2 Files").tqarg(dirs).tqarg(files)); type.setInnerText(i18n("%1 Folders, %2 Files").arg(dirs).arg(files));
} }

@ -135,21 +135,21 @@ void UAChangerPlugin::parseDescFiles()
continue; // Ignore dups! continue; // Ignore dups!
m_lstIdentity << tmp; m_lstIdentity << tmp;
tmp = TQString("%1 %2").tqarg(UA_PTOS("X-KDE-UA-SYSNAME")).tqarg(UA_PTOS("X-KDE-UA-SYSRELEASE")); tmp = TQString("%1 %2").arg(UA_PTOS("X-KDE-UA-SYSNAME")).arg(UA_PTOS("X-KDE-UA-SYSRELEASE"));
if ( tmp.stripWhiteSpace().isEmpty() ) if ( tmp.stripWhiteSpace().isEmpty() )
{ {
if(tag == "NN" || tag == "IE" || tag == "MOZ") if(tag == "NN" || tag == "IE" || tag == "MOZ")
tmp = i18n("Version %1").tqarg(UA_PTOS("X-KDE-UA-VERSION")); tmp = i18n("Version %1").arg(UA_PTOS("X-KDE-UA-VERSION"));
else else
tmp = TQString("%1 %2").tqarg(UA_PTOS("X-KDE-UA-NAME")).tqarg(UA_PTOS("X-KDE-UA-VERSION")); tmp = TQString("%1 %2").arg(UA_PTOS("X-KDE-UA-NAME")).arg(UA_PTOS("X-KDE-UA-VERSION"));
} }
else else
{ {
if(tag == "NN" || tag == "IE" || tag == "MOZ") if(tag == "NN" || tag == "IE" || tag == "MOZ")
tmp = i18n("Version %1 on %2").tqarg(UA_PTOS("X-KDE-UA-VERSION")).tqarg(tmp); tmp = i18n("Version %1 on %2").arg(UA_PTOS("X-KDE-UA-VERSION")).arg(tmp);
else else
tmp = i18n("%1 %2 on %3").tqarg(UA_PTOS("X-KDE-UA-NAME")).tqarg(UA_PTOS("X-KDE-UA-VERSION")).tqarg(tmp); tmp = i18n("%1 %2 on %3").arg(UA_PTOS("X-KDE-UA-NAME")).arg(UA_PTOS("X-KDE-UA-VERSION")).arg(tmp);
} }
m_lstAlias << tmp; m_lstAlias << tmp;

@ -184,7 +184,7 @@ void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl)
i18n("<qt>The selected URL cannot be verified because it contains " i18n("<qt>The selected URL cannot be verified because it contains "
"a password. Sending this URL to <b>%1</b> would put the security " "a password. Sending this URL to <b>%1</b> would put the security "
"of <b>%2</b> at risk.</qt>") "of <b>%2</b> at risk.</qt>")
.tqarg(validatorUrl.host()).tqarg(partUrl.host())); .arg(validatorUrl.host()).arg(partUrl.host()));
return; return;
} }
// Set entered URL as a parameter // Set entered URL as a parameter

@ -88,7 +88,7 @@ void ArchiveDialog::archive()
} else { } else {
const TQString title = i18n( "Unable to Open Web-Archive" ); const TQString title = i18n( "Unable to Open Web-Archive" );
const TQString text = i18n( "Unable to open \n %1 \n for writing." ).tqarg(m_tarBall->fileName()); const TQString text = i18n( "Unable to open \n %1 \n for writing." ).arg(m_tarBall->fileName());
KMessageBox::sorry( 0L, text, title ); KMessageBox::sorry( 0L, text, title );
} }
} }
@ -207,7 +207,7 @@ static bool hasChildNode(const DOM::Node &pNode, const TQString &nodeName)
} }
catch (...) catch (...)
{ {
// No tqchildren, stop recursion here // No children, stop recursion here
child = DOM::Node(); child = DOM::Node();
} }
@ -346,7 +346,7 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas
} }
catch (...) catch (...)
{ {
// No tqchildren, stop recursion here // No children, stop recursion here
child = DOM::Node(); child = DOM::Node();
} }

@ -94,7 +94,7 @@ void PluginWebArchiver::slotSaveToArchive()
if (!(url.isValid())) { if (!(url.isValid())) {
const TQString title = i18n( "Invalid URL" ); const TQString title = i18n( "Invalid URL" );
const TQString text = i18n( "The URL\n%1\nis not valid." ).tqarg(url.prettyURL()); const TQString text = i18n( "The URL\n%1\nis not valid." ).arg(url.prettyURL());
KMessageBox::sorry(part->widget(), text, title ); KMessageBox::sorry(part->widget(), text, title );
return; return;
} }
@ -102,7 +102,7 @@ void PluginWebArchiver::slotSaveToArchive()
const TQFile file(url.path()); const TQFile file(url.path());
if (file.exists()) { if (file.exists()) {
const TQString title = i18n( "File Exists" ); const TQString title = i18n( "File Exists" );
const TQString text = i18n( "Do you really want to overwrite:\n%1?" ).tqarg(url.prettyURL()); const TQString text = i18n( "Do you really want to overwrite:\n%1?" ).arg(url.prettyURL());
if (KMessageBox::Continue != KMessageBox::warningContinueCancel( part->widget(), text, title, i18n("Overwrite") ) ) { if (KMessageBox::Continue != KMessageBox::warningContinueCancel( part->widget(), text, title, i18n("Overwrite") ) ) {
return; return;
} }

@ -91,8 +91,8 @@ void KSig::setupLayout()
sigEdit->setEnabled(false); sigEdit->setEnabled(false);
sigEdit->setCheckSpellingEnabled(true); sigEdit->setCheckSpellingEnabled(true);
statusBar()->insertItem(i18n(" Line: %1 ").tqarg(0), LineNumber, 0, true); statusBar()->insertItem(i18n(" Line: %1 ").arg(0), LineNumber, 0, true);
statusBar()->insertItem(i18n(" Col: %1 ").tqarg(0), ColumnNumber, 0, true); statusBar()->insertItem(i18n(" Col: %1 ").arg(0), ColumnNumber, 0, true);
statusBar()->show(); statusBar()->show();
updateListLock = false; updateListLock = false;
@ -261,8 +261,8 @@ void KSig::updateEdit()
void KSig::updateStatus(int line, int column) void KSig::updateStatus(int line, int column)
{ {
statusBar()->changeItem(i18n(" Line: %1 ").tqarg(line + 1), LineNumber); statusBar()->changeItem(i18n(" Line: %1 ").arg(line + 1), LineNumber);
statusBar()->changeItem(i18n(" Col: %1 ").tqarg(column + 1), ColumnNumber); statusBar()->changeItem(i18n(" Col: %1 ").arg(column + 1), ColumnNumber);
} }
void KSig::quit() void KSig::quit()

@ -56,14 +56,14 @@ void SigListViewItem::refreshText()
void SigListViewItem::nodeToText(const TQDomNode &n, TQString &s) void SigListViewItem::nodeToText(const TQDomNode &n, TQString &s)
{ {
TQDomNodeList tqchildren = n.childNodes(); TQDomNodeList children = n.childNodes();
for(uint i = 0; i < tqchildren.count(); i++) { for(uint i = 0; i < children.count(); i++) {
if(tqchildren.item(i).isText()) if(children.item(i).isText())
s.append(tqchildren.item(i).toText().data()); s.append(children.item(i).toText().data());
else { else {
nodeToText(tqchildren.item(i), s); nodeToText(children.item(i), s);
if(tqchildren.item(i).isElement() && tqchildren.item(i).toElement().tagName() == "p") { if(children.item(i).isElement() && children.item(i).toElement().tagName() == "p") {
s.append("\n"); s.append("\n");
} }
} }
@ -90,12 +90,12 @@ SigListViewItem::SigListViewItem(TQListView *parent, TQDomDocument document, TQD
void SigListViewItem::render() void SigListViewItem::render()
{ {
if(dirty) { if(dirty) {
TQDomNodeList tqchildren = element.childNodes(); TQDomNodeList children = element.childNodes();
while(!element.firstChild().isNull()) while(!element.firstChild().isNull())
element.removeChild(element.firstChild()); element.removeChild(element.firstChild());
// create new tqchildren // create new children
TQStringList lines = TQStringList::split("\n", elementText, true); TQStringList lines = TQStringList::split("\n", elementText, true);
for(TQStringList::Iterator it = lines.begin(); it != lines.end(); it++) { for(TQStringList::Iterator it = lines.begin(); it != lines.end(); it++) {

@ -33,7 +33,7 @@ KMinuteSpinBox::KMinuteSpinBox(int _step, TQWidget *_parent, const char *_name)
TQString KMinuteSpinBox::mapValueToText(int v) TQString KMinuteSpinBox::mapValueToText(int v)
{ {
if(v < 10) if(v < 10)
return TQString("0%1").tqarg(v); return TQString("0%1").arg(v);
else else
return TQString::number(v); return TQString::number(v);
} }

@ -574,7 +574,7 @@
<property name="text"> <property name="text">
<string>Speed:</string> <string>Speed:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="hAlign" stdset="0"> <property name="hAlign" stdset="0">
@ -1924,7 +1924,7 @@
<property name="text"> <property name="text">
<string>Volume:</string> <string>Volume:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="hAlign" stdset="0"> <property name="hAlign" stdset="0">

@ -273,7 +273,7 @@ void AlsaPlayer::slotConfigChanged()
void AlsaPlayer::slotVolumeChanged(int i) void AlsaPlayer::slotVolumeChanged(int i)
{ {
TQString text("%1%"); TQString text("%1%");
volumeLabel->setText(text.tqarg(i)); volumeLabel->setText(text.arg(i));
volumeSlider->setValue(i); volumeSlider->setValue(i);
} }
@ -312,7 +312,7 @@ void AlsaPlayer::slotSetSpeed(int newSpeed)
speed_ = newSpeed; speed_ = newSpeed;
pauseButton->setEnabled(0 != speed_); pauseButton->setEnabled(0 != speed_);
speedLabel->setText(TQString("%1%").tqarg(speed_)); speedLabel->setText(TQString("%1%").arg(speed_));
Arts::PlayObject playobject(napp->player()->engine()->playObject()); Arts::PlayObject playobject(napp->player()->engine()->playObject());
Arts::PitchablePlayObject pitchable = Arts::DynamicCast(playobject); Arts::PitchablePlayObject pitchable = Arts::DynamicCast(playobject);

@ -130,7 +130,7 @@ SDLView::SDLView(int in) : mFd(in), outputBmp(0), fullscreen(false)
d++; d++;
x++; x++;
} }
tqrepaint(); repaint();
} }
} }
@ -233,7 +233,7 @@ void SDLView::checkInput()
#define output2 ((unsigned char*)outputBmp.data) #define output2 ((unsigned char*)outputBmp.data)
void SDLView::tqrepaint() void SDLView::repaint()
{ {
SDL_LockSurface(surface); SDL_LockSurface(surface);
TEST(); TEST();

@ -94,7 +94,7 @@ protected:
void checkInput(); void checkInput();
void setupPalette(double dummy=0.0); void setupPalette(double dummy=0.0);
void tqrepaint(); void repaint();
private: private:
int mFd; int mFd;

@ -366,7 +366,7 @@ void Charlatan::slotConfigChanged()
void Charlatan::slotVolumeChanged(int i) void Charlatan::slotVolumeChanged(int i)
{ {
TQString message(i18n("Volume: %1").tqarg(i)); TQString message(i18n("Volume: %1").arg(i));
showingVolumeTimer_->start(2000, true); showingVolumeTimer_->start(2000, true);
titleLabel_->setText(message); titleLabel_->setText(message);

@ -245,7 +245,7 @@ KFileItem* Dub::Linear_OneDir::first()
if (first) if (first)
set_file(&first_file, first); set_file(&first_file, first);
else { else {
if (first_file) { // tqinvalidate first if (first_file) { // invalidate first
delete first_file; delete first_file;
first_file = 0; first_file = 0;
} }
@ -451,7 +451,7 @@ void Dub::Recursive_Seq::prev_preorder()
} }
else { else {
TQString subdir = *top->current_subdir; TQString subdir = *top->current_subdir;
kdDebug(90010) << "we have tqchildren, pushing now " << subdir << endl; kdDebug(90010) << "we have children, pushing now " << subdir << endl;
push_dir(subdir, false); // push directory w/ backward iterators push_dir(subdir, false); // push directory w/ backward iterators
} }
} }

@ -122,7 +122,7 @@ void Lyrics::loadedURL()
if ( !napp->player()->current() ) if ( !napp->player()->current() )
return; return;
statusBar()->changeItem(i18n("Loaded"), 0); statusBar()->changeItem(i18n("Loaded"), 0);
setCaption(i18n("Lyrics: %1").tqarg(napp->player()->current().property("title"))); setCaption(i18n("Lyrics: %1").arg(napp->player()->current().property("title")));
if (!htmlpart->url().url().isEmpty() && napp->player()->current() && !napp->player()->current().property("Lyrics::URL").isEmpty()) { if (!htmlpart->url().url().isEmpty() && napp->player()->current() && !napp->player()->current().property("Lyrics::URL").isEmpty()) {
kdDebug(90020) << "Setting URL for (loaded)" << napp->player()->current().title() << endl; kdDebug(90020) << "Setting URL for (loaded)" << napp->player()->current().title() << endl;
napp->player()->current().setProperty("Lyrics::URL", htmlpart->url().url()); napp->player()->current().setProperty("Lyrics::URL", htmlpart->url().url());
@ -196,7 +196,7 @@ void Lyrics::viewLyrics(int index)
pos = props_regexp.search(url); pos = props_regexp.search(url);
} }
TQString title(napp->player()->current().property("title")); TQString title(napp->player()->current().property("title"));
setCaption(i18n("Loading Lyrics for %1").tqarg(title)); setCaption(i18n("Loading Lyrics for %1").arg(title));
// Check if we have a music playing // Check if we have a music playing
if (napp->player()->current()) { if (napp->player()->current()) {
htmlpart->begin(); htmlpart->begin();
@ -207,7 +207,7 @@ void Lyrics::viewLyrics(int index)
"<TR><TD BGCOLOR=\"#707671\"><strong>Title</strong></TD><TD>%1</TD></TR>" "<TR><TD BGCOLOR=\"#707671\"><strong>Title</strong></TD><TD>%1</TD></TR>"
"<TR><TD BGCOLOR=\"#707671\"><strong>Author</strong></TD><TD>%2</TD></TR>" "<TR><TD BGCOLOR=\"#707671\"><strong>Author</strong></TD><TD>%2</TD></TR>"
"<TR><TD BGCOLOR=\"#707671\"><strong>Album</strong></TD><TD>%3</TD></TR>" "<TR><TD BGCOLOR=\"#707671\"><strong>Album</strong></TD><TD>%3</TD></TR>"
"</TABLE>").tqarg( napp->player()->current().property( "title" ) ).tqarg( napp->player()->current().property( "author" ) ).tqarg( napp->player()->current().property( "album" ) ) ); "</TABLE>").arg( napp->player()->current().property( "title" ) ).arg( napp->player()->current().property( "author" ) ).arg( napp->player()->current().property( "album" ) ) );
KURL _url; KURL _url;
/* Check if we should use the store url or the query one */ /* Check if we should use the store url or the query one */
if (napp->player()->current().property("Lyrics::URL").isEmpty()) { if (napp->player()->current().property("Lyrics::URL").isEmpty()) {
@ -218,7 +218,7 @@ void Lyrics::viewLyrics(int index)
attach_act->setChecked(false); attach_act->setChecked(false);
site_act->setEnabled(true); site_act->setEnabled(true);
actionCollection()->action("search_label")->setEnabled(true); actionCollection()->action("search_label")->setEnabled(true);
htmlpart->write( i18n( "<hr><p><strong>Searching at %1</strong><br><small>(<a href=\"%3\">%2</a></small>)</p>" ).tqarg( name ).tqarg( _url.prettyURL() ).tqarg( _url.url() ) ); htmlpart->write( i18n( "<hr><p><strong>Searching at %1</strong><br><small>(<a href=\"%3\">%2</a></small>)</p>" ).arg( name ).arg( _url.prettyURL() ).arg( _url.url() ) );
} else { } else {
_url = napp->player()->current().property("Lyrics::URL"); _url = napp->player()->current().property("Lyrics::URL");
_url.setQuery(_url.query().replace(TQRegExp("%20"), "+")); _url.setQuery(_url.query().replace(TQRegExp("%20"), "+"));
@ -226,7 +226,7 @@ void Lyrics::viewLyrics(int index)
attach_act->setChecked(true); attach_act->setChecked(true);
site_act->setEnabled(false); site_act->setEnabled(false);
actionCollection()->action("search_label")->setEnabled(false); actionCollection()->action("search_label")->setEnabled(false);
htmlpart->write( i18n( "<hr><p><strong>Using the stored URL</strong><br><small>(<a href=\"%2\">%1</a></small>)</p>" ).tqarg( _url.prettyURL() ).tqarg( _url.url() ) ); htmlpart->write( i18n( "<hr><p><strong>Using the stored URL</strong><br><small>(<a href=\"%2\">%1</a></small>)</p>" ).arg( _url.prettyURL() ).arg( _url.url() ) );
} }
htmlpart->write( "</BODY></HTML>" ); htmlpart->write( "</BODY></HTML>" );
htmlpart->end(); htmlpart->end();

@ -20,8 +20,8 @@ typedef uint8_t Byte;
#define COLOR(r,g,b) ((r<<16) | (g<<8) | (b)) #define COLOR(r,g,b) ((r<<16) | (g<<8) | (b))
#define COLORSTR(pixel) \ #define COLORSTR(pixel) \
TQString("#%1%2%3").tqarg(TQString::number((pixel>>16) & 8, 16)) \ TQString("#%1%2%3").arg(TQString::number((pixel>>16) & 8, 16)) \
.tqarg(TQString::number((pixel>>8) & 8, 16)).tqarg(TQString::number(pixel& 8, 16)) .arg(TQString::number((pixel>>8) & 8, 16)).arg(TQString::number(pixel& 8, 16))
#define STRCOLOR(pixel) \ #define STRCOLOR(pixel) \
Pixel(((pixel.mid(1,2).toInt(0, 16)) <<16) \ Pixel(((pixel.mid(1,2).toInt(0, 16)) <<16) \

@ -159,7 +159,7 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique)
connect(mOptionPlayable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent())); connect(mOptionPlayable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent()));
mOptionChildrenVisible = new TQCheckBox(i18n("&Children visible"), groupbox); mOptionChildrenVisible = new TQCheckBox(i18n("&Children visible"), groupbox);
TQWhatsThis::add(mOptionChildrenVisible, i18n("Don't create this node, this nodes tqchildren become direct tqchildren of this node's parent")); TQWhatsThis::add(mOptionChildrenVisible, i18n("Don't create this node, this nodes children become direct children of this node's parent"));
connect(mOptionChildrenVisible, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent())); connect(mOptionChildrenVisible, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent()));
mOptionAutoOpen = new TQCheckBox(i18n("Auto &open"), groupbox); mOptionAutoOpen = new TQCheckBox(i18n("Auto &open"), groupbox);

@ -487,7 +487,7 @@ void Query::loadGroup(TQDomElement element, QueryGroup *parent)
group->setOption(QueryGroup::Playable, true); group->setOption(QueryGroup::Playable, true);
else if (e.tagName().lower() == "playable") else if (e.tagName().lower() == "playable")
group->setOption(QueryGroup::Playable, true); group->setOption(QueryGroup::Playable, true);
else if (e.tagName().lower() == "tqchildrenvisible") else if (e.tagName().lower() == "childrenvisible")
group->setOption(QueryGroup::ChildrenVisible, true); group->setOption(QueryGroup::ChildrenVisible, true);
else if (e.tagName().lower() == "autoopen") else if (e.tagName().lower() == "autoopen")
group->setOption(QueryGroup::AutoOpen, true); group->setOption(QueryGroup::AutoOpen, true);
@ -534,7 +534,7 @@ void Query::saveGroup(TQDomElement &parent, QueryGroup *group)
if (group->option(QueryGroup::Playable)) if (group->option(QueryGroup::Playable))
childe.appendChild(doc.createElement("playable")); childe.appendChild(doc.createElement("playable"));
if (group->option(QueryGroup::ChildrenVisible)) if (group->option(QueryGroup::ChildrenVisible))
childe.appendChild(doc.createElement("tqchildrenvisible")); childe.appendChild(doc.createElement("childrenvisible"));
if (group->option(QueryGroup::AutoOpen)) if (group->option(QueryGroup::AutoOpen))
childe.appendChild(doc.createElement("autoopen")); childe.appendChild(doc.createElement("autoopen"));
} }

@ -180,7 +180,7 @@ TreeItem::~TreeItem()
tree()->mPlayableItemCount--; tree()->mPlayableItemCount--;
} }
// I have to remove my tqchildren, because they need their parent // I have to remove my children, because they need their parent
// in tact for the below code // in tact for the below code
while (TreeItem *c = firstChild()) while (TreeItem *c = firstChild())
delete c; delete c;
@ -750,36 +750,36 @@ TreeItem *Tree::collate(TreeItem *fix, QueryGroup *group, const File &file, Tree
TreeItem *Tree::node(TreeItem *fix, QueryGroup *group, const File &file, TreeItem *childOf) TreeItem *Tree::node(TreeItem *fix, QueryGroup *group, const File &file, TreeItem *childOf)
{ {
// search childOf's immediate tqchildren // search childOf's immediate children
TreeItem *tqchildren; TreeItem *children;
if (childOf) if (childOf)
tqchildren = childOf->firstChild(); children = childOf->firstChild();
else else
tqchildren = firstChild(); children = firstChild();
TQString presentation = group->presentation(file); TQString presentation = group->presentation(file);
while (tqchildren) while (children)
{ {
// merging would be done here // merging would be done here
bool matches=false; bool matches=false;
if (group->fuzzyness(QueryGroup::Case)) if (group->fuzzyness(QueryGroup::Case))
{ {
matches = (tqchildren->text(0).lower() == presentation.lower()); matches = (children->text(0).lower() == presentation.lower());
} }
else else
{ {
matches = (tqchildren->text(0) == presentation); matches = (children->text(0) == presentation);
} }
matches = matches && !tqchildren->group()->option(QueryGroup::Playable); matches = matches && !children->group()->option(QueryGroup::Playable);
if (matches) if (matches)
{ {
tqchildren->setFile(File()); children->setFile(File());
return tqchildren; return children;
} }
tqchildren = tqchildren->nextSibling(); children = children->nextSibling();
} }
TreeItem *item; TreeItem *item;

@ -182,7 +182,7 @@ private:
TreeItem *node(TreeItem *fix, QueryGroup *group, const File &file, TreeItem *childOf); TreeItem *node(TreeItem *fix, QueryGroup *group, const File &file, TreeItem *childOf);
/** /**
* remove the siblings and tqchildren of the treeitem * remove the siblings and children of the treeitem
**/ **/
void remove(TreeItem *, const File &file); void remove(TreeItem *, const File &file);

@ -138,7 +138,7 @@ View::~View()
int slice = tree->slice()->id(); int slice = tree->slice()->id();
TQString query = tree->fileOfQuery(); TQString query = tree->fileOfQuery();
TQString t = TQString("%1:%2").tqarg(slice).tqarg(query); TQString t = TQString("%1:%2").arg(slice).arg(query);
tabids.append(t); tabids.append(t);
} }

@ -68,7 +68,7 @@
<property name="frame"> <property name="frame">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignHCenter</set> <set>AlignHCenter</set>
</property> </property>
<property name="hAlign" stdset="0"> <property name="hAlign" stdset="0">

@ -73,11 +73,11 @@ bool AudioPlugin::initialize( KIO::RenameDlg_Mode mode, const TQString &_src, co
TQString sentence1; TQString sentence1;
TQString dest = KURL::fromPathOrURL(_dest).pathOrURL(); TQString dest = KURL::fromPathOrURL(_dest).pathOrURL();
if (mtimeDest < mtimeSrc) if (mtimeDest < mtimeSrc)
sentence1 = i18n("An older file named '%1' already exists.\n").tqarg(dest); sentence1 = i18n("An older file named '%1' already exists.\n").arg(dest);
else if (mtimeDest == mtimeSrc) else if (mtimeDest == mtimeSrc)
sentence1 = i18n("A similar file named '%1' already exists.\n").tqarg(dest); sentence1 = i18n("A similar file named '%1' already exists.\n").arg(dest);
else else
sentence1 = i18n("A newer file named '%1' already exists.\n").tqarg(dest); sentence1 = i18n("A newer file named '%1' already exists.\n").arg(dest);
label_head->setText(sentence1); label_head->setText(sentence1);
label_src->setText(i18n("Source File")); label_src->setText(i18n("Source File"));
label_dst->setText(i18n("Existing File")); label_dst->setText(i18n("Existing File"));

@ -89,27 +89,27 @@ void AudioPreview::initView( const TQString& mimeType )
KSqueezedTextLabel *sl; KSqueezedTextLabel *sl;
sl = new KSqueezedTextLabel(this); sl = new KSqueezedTextLabel(this);
sl->setText(i18n("Artist: %1\n").tqarg(info.item("Artist").value().toString())); sl->setText(i18n("Artist: %1\n").arg(info.item("Artist").value().toString()));
sl = new KSqueezedTextLabel(this); sl = new KSqueezedTextLabel(this);
sl->setText(i18n("Title: %1\n").tqarg(info.item("Title").value().toString())); sl->setText(i18n("Title: %1\n").arg(info.item("Title").value().toString()));
sl = new KSqueezedTextLabel(this); sl = new KSqueezedTextLabel(this);
sl->setText(i18n("Comment: %1\n").tqarg(info.item("Comment").value().toString())); sl->setText(i18n("Comment: %1\n").arg(info.item("Comment").value().toString()));
desc.append(i18n("Biterate: 160 kbits/s", "Bitrate: %1 %2\n").tqarg( info.item("Bitrate").value().toString() ).tqarg( info.item("Bitrate").suffix() )); desc.append(i18n("Biterate: 160 kbits/s", "Bitrate: %1 %2\n").arg( info.item("Bitrate").value().toString() ).arg( info.item("Bitrate").suffix() ));
} }
desc.append(i18n("Sample rate: %1 %2\n").tqarg( info.item("Sample Rate").value().toString() ).tqarg( info.item("Sample Rate").suffix() )); desc.append(i18n("Sample rate: %1 %2\n").arg( info.item("Sample Rate").value().toString() ).arg( info.item("Sample Rate").suffix() ));
desc.append(i18n("Length: ")); desc.append(i18n("Length: "));
/* Calculate length in mm:ss format */ /* Calculate length in mm:ss format */
int length = info.item("Length").value().toInt(); int length = info.item("Length").value().toInt();
if (length/60 < 10) if (length/60 < 10)
desc.append("0"); desc.append("0");
desc.append(TQString("%1:").tqarg(length/60, 0, 10)); desc.append(TQString("%1:").arg(length/60, 0, 10));
if (length%60 < 10) if (length%60 < 10)
desc.append("0"); desc.append("0");
desc.append(TQString("%1\n").tqarg(length%60, 0, 10)); desc.append(TQString("%1\n").arg(length%60, 0, 10));
} }
description = new TQLabel(this); description = new TQLabel(this);

@ -64,8 +64,8 @@ void ImageVisualizer::loadImage( const TQString& path )
pic->adjustSize(); pic->adjustSize();
TQString desc; TQString desc;
desc.append(i18n("The color depth of an image", "Depth: %1\n").tqarg( img.depth() )); desc.append(i18n("The color depth of an image", "Depth: %1\n").arg( img.depth() ));
desc.append(i18n("The dimensions of an image", "Dimensions: %1x%1").tqarg(img.width()).tqarg(img.height() )); desc.append(i18n("The dimensions of an image", "Dimensions: %1x%1").arg(img.width()).arg(img.height() ));
description->setText(desc ); description->setText(desc );
description->adjustSize(); description->adjustSize();
} }

Loading…
Cancel
Save