Remove additional unneeded tq method conversions

pull/1/head
Timothy Pearson 13 years ago
parent c3b301575a
commit 7e66d7c361

@ -420,7 +420,7 @@ KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name)
if (!factory) { if (!factory) {
TQString errorMessage = KLibLoader::self()->lastErrorMessage(); TQString errorMessage = KLibLoader::self()->lastErrorMessage();
KMessageBox::error(0, i18n("There was an error loading the module %1.\n" KMessageBox::error(0, i18n("There was an error loading the module %1.\n"
"The diagnostics are:\n%2").tqarg(service->name()).tqarg(errorMessage)); "The diagnostics are:\n%2").arg(service->name()).arg(errorMessage));
exit(1); exit(1);
} }

@ -99,7 +99,7 @@
<property name="text"> <property name="text">
<string>&amp;Properties:</string> <string>&amp;Properties:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignTop</set> <set>AlignTop</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">

@ -458,7 +458,7 @@ void AntProjectPart::ant(const TQString &target)
if (!m_classPath.count() == 0) if (!m_classPath.count() == 0)
cp = "CLASSPATH="+m_classPath.join(":"); cp = "CLASSPATH="+m_classPath.join(":");
makeFrontend()->queueCommand(m_projectDirectory, cmd.tqarg(cp).tqarg(m_projectDirectory).tqarg(target).tqarg(m_antOptions.m_buildXML).tqarg(verb).tqarg(options)); makeFrontend()->queueCommand(m_projectDirectory, cmd.arg(cp).arg(m_projectDirectory).arg(target).arg(m_antOptions.m_buildXML).arg(verb).arg(options));
} }
@ -562,13 +562,13 @@ void AntProjectPart::contextMenu(TQPopupMenu *popup, const Context *context)
popup->insertSeparator(); popup->insertSeparator();
if (inProject) if (inProject)
{ {
int id = popup->insertItem( i18n("Remove %1 From Project").tqarg(popupstr), int id = popup->insertItem( i18n("Remove %1 From Project").arg(popupstr),
this, TQT_SLOT(slotRemoveFromProject()) ); this, TQT_SLOT(slotRemoveFromProject()) );
popup->setWhatsThis(id, i18n("<b>Remove from project</b><p>Removes current file from the project.")); popup->setWhatsThis(id, i18n("<b>Remove from project</b><p>Removes current file from the project."));
} }
else else
{ {
int id = popup->insertItem( i18n("Add %1 to Project").tqarg(popupstr), int id = popup->insertItem( i18n("Add %1 to Project").arg(popupstr),
this, TQT_SLOT(slotAddToProject()) ); this, TQT_SLOT(slotAddToProject()) );
popup->setWhatsThis(id, i18n("<b>Add to project</b><p>Adds current file from the project.")); popup->setWhatsThis(id, i18n("<b>Add to project</b><p>Adds current file from the project."));
} }

@ -192,7 +192,7 @@
<property name="text"> <property name="text">
<string>E&amp;xecutable:</string> <string>E&amp;xecutable:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -210,7 +210,7 @@
<property name="text"> <property name="text">
<string>&amp;Icon:</string> <string>&amp;Icon:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -228,7 +228,7 @@
<property name="text"> <property name="text">
<string>&amp;Section:</string> <string>&amp;Section:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -246,7 +246,7 @@
<property name="text"> <property name="text">
<string>&amp;File name:</string> <string>&amp;File name:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -264,7 +264,7 @@
<property name="text"> <property name="text">
<string>&amp;Name:</string> <string>&amp;Name:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -282,7 +282,7 @@
<property name="text"> <property name="text">
<string>Co&amp;mment:</string> <string>Co&amp;mment:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">

@ -229,7 +229,7 @@ void AddExistingDirectoriesDialog::slotOk()
m_widget->getSubprojectView()->parse( newitem ); m_widget->getSubprojectView()->parse( newitem );
} else { } else {
if (!f.open(IO_WriteOnly)) { if (!f.open(IO_WriteOnly)) {
// KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").tqarg(name)); // KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").arg(name));
continue; continue;
} }
TQTextStream stream(&f); TQTextStream stream(&f);

@ -34,7 +34,7 @@
<property name="text"> <property name="text">
<string>&amp;Type:</string> <string>&amp;Type:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -52,7 +52,7 @@
<property name="text"> <property name="text">
<string>&amp;Size:</string> <string>&amp;Size:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -75,7 +75,7 @@
<property name="text"> <property name="text">
<string>File name:</string> <string>File name:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -93,7 +93,7 @@
<property name="text"> <property name="text">
<string>&amp;Name:</string> <string>&amp;Name:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">

@ -136,7 +136,7 @@ void AddServiceDialog::propertyExecuted(TQListViewItem *item)
TQString prop = item->text(0); TQString prop = item->text(0);
TQString value = item->text(1); TQString value = item->text(1);
bool ok; bool ok;
value = KInputDialog::getText(i18n("Enter Value"), i18n("Property %1:").tqarg(prop), value, &ok, this); value = KInputDialog::getText(i18n("Enter Value"), i18n("Property %1:").arg(prop), value, &ok, this);
if (!ok) if (!ok)
return; return;

@ -54,7 +54,7 @@
<property name="text"> <property name="text">
<string>&amp;Icon:</string> <string>&amp;Icon:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -138,7 +138,7 @@
<property name="text"> <property name="text">
<string>&amp;Library:</string> <string>&amp;Library:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -156,7 +156,7 @@
<property name="text"> <property name="text">
<string>&amp;File name:</string> <string>&amp;File name:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -174,7 +174,7 @@
<property name="text"> <property name="text">
<string>&amp;Name:</string> <string>&amp;Name:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -192,7 +192,7 @@
<property name="text"> <property name="text">
<string>Co&amp;mment:</string> <string>Co&amp;mment:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -405,7 +405,7 @@
<property name="text"> <property name="text">
<string>&amp;Properties:</string> <string>&amp;Properties:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignTop|AlignRight</set> <set>AlignTop|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">

@ -82,25 +82,25 @@ void AddSubprojectDialog::accept()
TQFileInfo file( dir, name ); TQFileInfo file( dir, name );
if( file.exists() && !file.isDir() ) { if( file.exists() && !file.isDir() ) {
KMessageBox::sorry(this, i18n("A file named %1 already exists.").tqarg(name)); KMessageBox::sorry(this, i18n("A file named %1 already exists.").arg(name));
TQDialog::accept(); TQDialog::accept();
return; return;
} else if( file.isDir() ) { } else if( file.isDir() ) {
if( KMessageBox::warningContinueCancel(this, if( KMessageBox::warningContinueCancel(this,
i18n("A subdirectory %1 already exists. " i18n("A subdirectory %1 already exists. "
"Do you wish to add it as a subproject?").tqarg(name)) "Do you wish to add it as a subproject?").arg(name))
== KMessageBox::Cancel ){ == KMessageBox::Cancel ){
TQDialog::accept(); TQDialog::accept();
return; return;
} }
} else if (!dir.mkdir(name)) { } else if (!dir.mkdir(name)) {
KMessageBox::sorry(this, i18n("Could not create subdirectory %1.").tqarg(name)); KMessageBox::sorry(this, i18n("Could not create subdirectory %1.").arg(name));
TQDialog::accept(); TQDialog::accept();
return; return;
} }
if(!dir.cd(name)) { if(!dir.cd(name)) {
KMessageBox::sorry(this, i18n("Could not access the subdirectory %1.").tqarg(name)); KMessageBox::sorry(this, i18n("Could not access the subdirectory %1.").arg(name));
TQDialog::accept(); TQDialog::accept();
return; return;
} }
@ -148,7 +148,7 @@ void AddSubprojectDialog::accept()
m_subprojectView->parse( newitem ); m_subprojectView->parse( newitem );
} else { } else {
if (!f.open(IO_WriteOnly)) { if (!f.open(IO_WriteOnly)) {
KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").tqarg(name)); KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").arg(name));
return; return;
} }
TQTextStream stream(&f); TQTextStream stream(&f);

@ -44,7 +44,7 @@
<property name="text"> <property name="text">
<string>&amp;Primary:</string> <string>&amp;Primary:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -67,7 +67,7 @@
<property name="text"> <property name="text">
<string>Pre&amp;fix:</string> <string>Pre&amp;fix:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -90,7 +90,7 @@
<property name="text"> <property name="text">
<string>File &amp;name:</string> <string>File &amp;name:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">

@ -499,7 +499,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
else else
caption = titem->name; caption = titem->name;
KPopupMenu popup( i18n( "Target: %1" ).tqarg( caption ), this ); KPopupMenu popup( i18n( "Target: %1" ).arg( caption ), this );
if ( titem->primary == "PROGRAMS" || titem->primary == "LIBRARIES" if ( titem->primary == "PROGRAMS" || titem->primary == "LIBRARIES"
|| titem->primary == "LTLIBRARIES" || titem->primary == "JAVA" ) || titem->primary == "LTLIBRARIES" || titem->primary == "JAVA" )
@ -554,7 +554,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
return; return;
} }
KPopupMenu popup( i18n( "File: %1" ).tqarg( fitem->name ), this ); KPopupMenu popup( i18n( "File: %1" ).arg( fitem->name ), this );
removeDetailAction->plug( &popup ); removeDetailAction->plug( &popup );
KURL::List urls; KURL::List urls;

@ -42,7 +42,7 @@ ProjectItem::ProjectItem( Type type, ProjectItem *parent, const TQString &text )
void ProjectItem::paintCell( TQPainter *p, const TQColorGroup &cg, void ProjectItem::paintCell( TQPainter *p, const TQColorGroup &cg,
int column, int width, int tqalignment ) int column, int width, int alignment )
{ {
if ( isBold() ) if ( isBold() )
{ {
@ -50,7 +50,7 @@ void ProjectItem::paintCell( TQPainter *p, const TQColorGroup &cg,
font.setBold( true ); font.setBold( true );
p->setFont( font ); p->setFont( font );
} }
TQListViewItem::paintCell( p, cg, column, width, tqalignment ); TQListViewItem::paintCell( p, cg, column, width, alignment );
} }

@ -35,7 +35,7 @@ public:
ProjectItem( Type type, ProjectItem *parent, const TQString &text ); ProjectItem( Type type, ProjectItem *parent, const TQString &text );
void paintCell( TQPainter *p, const TQColorGroup &cg, void paintCell( TQPainter *p, const TQColorGroup &cg,
int column, int width, int tqalignment ); int column, int width, int alignment );
void setBold( bool b ) void setBold( bool b )
{ {
bld = b; bld = b;

@ -414,7 +414,7 @@ TQString AutoProjectPart::mainProgram() const
KMessageBox::error( m_widget, i18n("Active target \"%1\" is not binary ( %2 ).\n" KMessageBox::error( m_widget, i18n("Active target \"%1\" is not binary ( %2 ).\n"
"Unable to determine the main program. If you want this\n" "Unable to determine the main program. If you want this\n"
"to be the active target, set a main program under\n" "to be the active target, set a main program under\n"
"Project -> Project Options -> Run Options").tqarg(titem->name).tqarg(titem->primary), i18n("Active target is not a library") ); "Project -> Project Options -> Run Options").arg(titem->name).arg(titem->primary), i18n("Active target is not a library") );
kdDebug ( 9020 ) << k_funcinfo << "Error! : Active target isn't binary (" << titem->primary << ") ! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl; kdDebug ( 9020 ) << k_funcinfo << "Error! : Active target isn't binary (" << titem->primary << ") ! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl;
return TQString(); return TQString();
} }
@ -643,7 +643,7 @@ TQString AutoProjectPart::constructMakeCommandLine(const TQString &dir, const TQ
{ {
int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory\n" int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory\n"
"and no configure script for this project.\n" "and no configure script for this project.\n"
"Run automake & friends and configure first?").tqarg(buildDirectory()), TQString(), i18n("Run Them"), i18n("Do Not Run")); "Run automake & friends and configure first?").arg(buildDirectory()), TQString(), i18n("Run Them"), i18n("Do Not Run"));
if (r == KMessageBox::No) if (r == KMessageBox::No)
return TQString(); return TQString();
preCommand = makefileCvsCommand(); preCommand = makefileCvsCommand();
@ -654,7 +654,7 @@ TQString AutoProjectPart::constructMakeCommandLine(const TQString &dir, const TQ
} }
else else
{ {
int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory. Run 'configure' first?").tqarg(dir), TQString(), i18n("Run configure"), i18n("Do Not Run")); int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory. Run 'configure' first?").arg(dir), TQString(), i18n("Run configure"), i18n("Do Not Run"));
if (r == KMessageBox::No) if (r == KMessageBox::No)
return TQString(); return TQString();
preCommand = configureCommand() + " && "; preCommand = configureCommand() + " && ";
@ -668,7 +668,7 @@ TQString AutoProjectPart::constructMakeCommandLine(const TQString &dir, const TQ
kdDebug(9020) << k_funcinfo << "nice = " << prio<< endl; kdDebug(9020) << k_funcinfo << "nice = " << prio<< endl;
if (prio != 0) if (prio != 0)
{ {
nice = TQString("nice -n%1 ").tqarg(prio); nice = TQString("nice -n%1 ").arg(prio);
} }
if (cmdline.isEmpty()) if (cmdline.isEmpty())
@ -792,7 +792,7 @@ bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, TQStr
tdir += dependency.left(pos+1); tdir += dependency.left(pos+1);
tname = dependency.mid(pos+1); tname = dependency.mid(pos+1);
} }
KMessageBox::error( 0, i18n("Found a circular dependency in the project, between this target and %1.\nCannot build this project until this is resolved.").tqarg(tname), i18n("Circular Dependency found") ); KMessageBox::error( 0, i18n("Found a circular dependency in the project, between this target and %1.\nCannot build this project until this is resolved.").arg(tname), i18n("Circular Dependency found") );
return false; return false;
} }
} }
@ -912,28 +912,28 @@ TQString AutoProjectPart::configureCommand() const
cmdline += "/configure\""; cmdline += "/configure\"";
TQString cc = DomUtil::readEntry(dom, prefix + "ccompilerbinary"); TQString cc = DomUtil::readEntry(dom, prefix + "ccompilerbinary");
if (!cc.isEmpty()) if (!cc.isEmpty())
cmdline.prepend(TQString("CC=%1 ").tqarg(cc)); cmdline.prepend(TQString("CC=%1 ").arg(cc));
TQString cflags = DomUtil::readEntry(dom, prefix + "cflags"); TQString cflags = DomUtil::readEntry(dom, prefix + "cflags");
if (!cflags.isEmpty()) if (!cflags.isEmpty())
cmdline.prepend(TQString("CFLAGS=\"%1\" ").tqarg(cflags)); cmdline.prepend(TQString("CFLAGS=\"%1\" ").arg(cflags));
TQString cxx = DomUtil::readEntry(dom, prefix + "cxxcompilerbinary"); TQString cxx = DomUtil::readEntry(dom, prefix + "cxxcompilerbinary");
if (!cxx.isEmpty()) if (!cxx.isEmpty())
cmdline.prepend(TQString("CXX=%1 ").tqarg(cxx)); cmdline.prepend(TQString("CXX=%1 ").arg(cxx));
TQString cxxflags = DomUtil::readEntry(dom, prefix + "cxxflags"); TQString cxxflags = DomUtil::readEntry(dom, prefix + "cxxflags");
if (!cxxflags.isEmpty()) if (!cxxflags.isEmpty())
cmdline.prepend(TQString("CXXFLAGS=\"%1\" ").tqarg(cxxflags)); cmdline.prepend(TQString("CXXFLAGS=\"%1\" ").arg(cxxflags));
TQString f77 = DomUtil::readEntry(dom, prefix + "f77compilerbinary"); TQString f77 = DomUtil::readEntry(dom, prefix + "f77compilerbinary");
if (!f77.isEmpty()) if (!f77.isEmpty())
cmdline.prepend(TQString("F77=%1 ").tqarg(f77)); cmdline.prepend(TQString("F77=%1 ").arg(f77));
TQString fflags = DomUtil::readEntry(dom, prefix + "f77flags"); TQString fflags = DomUtil::readEntry(dom, prefix + "f77flags");
if (!fflags.isEmpty()) if (!fflags.isEmpty())
cmdline.prepend(TQString("FFLAGS=\"%1\" ").tqarg(fflags)); cmdline.prepend(TQString("FFLAGS=\"%1\" ").arg(fflags));
TQString cppflags = DomUtil::readEntry(dom, prefix + "cppflags"); TQString cppflags = DomUtil::readEntry(dom, prefix + "cppflags");
if (!cppflags.isEmpty()) if (!cppflags.isEmpty())
cmdline.prepend(TQString("CPPFLAGS=\"%1\" ").tqarg(cppflags)); cmdline.prepend(TQString("CPPFLAGS=\"%1\" ").arg(cppflags));
TQString ldflags = DomUtil::readEntry(dom, prefix + "ldflags"); TQString ldflags = DomUtil::readEntry(dom, prefix + "ldflags");
if (!ldflags.isEmpty()) if (!ldflags.isEmpty())
cmdline.prepend(TQString("LDFLAGS=\"%1\" ").tqarg(ldflags)); cmdline.prepend(TQString("LDFLAGS=\"%1\" ").arg(ldflags));
TQString configargs = DomUtil::readEntry(dom, prefix + "configargs"); TQString configargs = DomUtil::readEntry(dom, prefix + "configargs");
if (!configargs.isEmpty()) { if (!configargs.isEmpty()) {
@ -997,7 +997,7 @@ TQString AutoProjectPart::makefileCvsCommand() const
TQString nice; TQString nice;
kdDebug(9020) << "makefileCvsCommand() nice = " << prio<< endl; kdDebug(9020) << "makefileCvsCommand() nice = " << prio<< endl;
if (prio != 0) { if (prio != 0) {
nice = TQString("nice -n%1 ").tqarg(prio); nice = TQString("nice -n%1 ").arg(prio);
} }
if (TQFile::exists(topsourceDirectory() + "/Makefile.cvs")) if (TQFile::exists(topsourceDirectory() + "/Makefile.cvs"))
@ -1171,7 +1171,7 @@ void AutoProjectPart::executeTarget(const TQDir& dir, const TargetItem* titem)
KMessageBox::error( m_widget, i18n("Active target \"%1\" is not binary ( %2 ).\n" KMessageBox::error( m_widget, i18n("Active target \"%1\" is not binary ( %2 ).\n"
"Unable to determine the main program. If you want this\n" "Unable to determine the main program. If you want this\n"
"to be the active target, set a main program under\n" "to be the active target, set a main program under\n"
"Project -> Project Options -> Run Options").tqarg(titem->name).tqarg(titem->primary), i18n("Active target is not a library") ); "Project -> Project Options -> Run Options").arg(titem->name).arg(titem->primary), i18n("Active target is not a library") );
kdDebug ( 9020 ) << k_funcinfo << "Error! : Active target isn't binary (" << titem->primary << ") ! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl; kdDebug ( 9020 ) << k_funcinfo << "Error! : Active target isn't binary (" << titem->primary << ") ! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl;
program += titem->name; program += titem->name;
}else }else

@ -557,7 +557,7 @@ void AutoProjectWidget::slotOverviewSelectionChanged( TQListViewItem *item )
// Delete the items from the details view first. // Delete the items from the details view first.
if ( m_shownSubproject ) if ( m_shownSubproject )
{ {
// Remove all TargetItems and all of their tqchildren from the view // Remove all TargetItems and all of their children from the view
kdDebug ( 9020 ) << "m_shownSubproject (before takeItem()): " << m_shownSubproject->subdir << endl; kdDebug ( 9020 ) << "m_shownSubproject (before takeItem()): " << m_shownSubproject->subdir << endl;
TQListViewItem* i = m_detailView->listView()->firstChild(); TQListViewItem* i = m_detailView->listView()->firstChild();
@ -575,7 +575,7 @@ void AutoProjectWidget::slotOverviewSelectionChanged( TQListViewItem *item )
if ( !m_shownSubproject) return; if ( !m_shownSubproject) return;
kdDebug ( 9020 ) << "m_shownSubproject (after takeItem()): " << selectedSubproject()->subdir << endl; kdDebug ( 9020 ) << "m_shownSubproject (after takeItem()): " << selectedSubproject()->subdir << endl;
// Insert all TargetItems and all of their tqchildren into the view // Insert all TargetItems and all of their children into the view
TQPtrListIterator<TargetItem> it2( selectedSubproject()->targets ); TQPtrListIterator<TargetItem> it2( selectedSubproject()->targets );
for ( ; it2.current(); ++it2 ) for ( ; it2.current(); ++it2 )
{ {
@ -632,9 +632,9 @@ TargetItem *AutoProjectWidget::createTargetItem( const TQString &name,
if ( docgroup ) if ( docgroup )
text = i18n( "Documentation data" ); text = i18n( "Documentation data" );
else if ( icongroup ) else if ( icongroup )
text = i18n( "KDE Icon data" ).tqarg( prefix ); text = i18n( "KDE Icon data" ).arg( prefix );
else else
text = i18n( "%1 (%2 in %3)" ).tqarg( name ).tqarg( nicePrimary( primary ) ).tqarg( prefix ); text = i18n( "%1 (%2 in %3)" ).arg( name ).arg( nicePrimary( primary ) ).arg( prefix );
// Workaround because of TQListView not being able to create // Workaround because of TQListView not being able to create
// items without actually inserting them // items without actually inserting them

@ -280,7 +280,7 @@ void AutoSubprojectView::slotContextMenu( KListView *, TQListViewItem *item, con
if ( !item ) if ( !item )
return ; return ;
KPopupMenu popup( i18n( "Subproject: %1" ).tqarg( item->text( 0 ) ), this ); KPopupMenu popup( i18n( "Subproject: %1" ).arg( item->text( 0 ) ), this );
subProjectOptionsAction->plug( &popup ); subProjectOptionsAction->plug( &popup );
popup.insertSeparator(); popup.insertSeparator();
@ -448,13 +448,13 @@ void AutoSubprojectView::slotRemoveSubproject()
{ {
topsubdirs = false; topsubdirs = false;
if( it == list.end() ){ if( it == list.end() ){
KMessageBox::sorry(this, i18n("There is no subproject %1 in SUBDIRS").tqarg(spitem->subdir)); KMessageBox::sorry(this, i18n("There is no subproject %1 in SUBDIRS").arg(spitem->subdir));
return; return;
} }
} }
RemoveSubprojectDialog dlg(i18n("Remove Subproject %1").tqarg(spitem->text(0)), RemoveSubprojectDialog dlg(i18n("Remove Subproject %1").arg(spitem->text(0)),
i18n("Do you really want to remove subproject %1 with all targets and files?").tqarg(spitem->text(0))); i18n("Do you really want to remove subproject %1 with all targets and files?").arg(spitem->text(0)));
if( dlg.exec() ){ if( dlg.exec() ){
bool removeSources = dlg.removeFromDisk(); bool removeSources = dlg.removeFromDisk();
@ -1045,7 +1045,7 @@ void AutoSubprojectView::slotManageBuildCommands( )
{ {
config->writeEntry(widget->commandsTable->text(i, 0), config->writeEntry(widget->commandsTable->text(i, 0),
widget->commandsTable->text(i, 1)+":::"+ widget->commandsTable->text(i, 1)+":::"+
TQString("%1").tqarg(static_cast<TQComboTableItem*>(widget-> TQString("%1").arg(static_cast<TQComboTableItem*>(widget->
commandsTable->item(i, 2))->currentItem())); commandsTable->item(i, 2))->currentItem()));
} }
config->sync(); config->sync();

@ -158,7 +158,7 @@
<property name="text"> <property name="text">
<string>&lt;qt&gt;&lt;b&gt;Note:&lt;/b&gt; If you cancel, your files will be created but will &lt;b&gt;not&lt;/b&gt; be added to the project.&lt;/qt&gt;</string> <string>&lt;qt&gt;&lt;b&gt;Note:&lt;/b&gt; If you cancel, your files will be created but will &lt;b&gt;not&lt;/b&gt; be added to the project.&lt;/qt&gt;</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
</widget> </widget>

@ -236,7 +236,7 @@ void ConfigureOptionsWidget::saveSettings(const TQString &config)
DomUtil::writeEntry(dom, prefix + "cxxflags", cxxflags_edit->text()); DomUtil::writeEntry(dom, prefix + "cxxflags", cxxflags_edit->text());
DomUtil::writeEntry(dom, prefix + "f77flags", f77flags_edit->text()); DomUtil::writeEntry(dom, prefix + "f77flags", f77flags_edit->text());
if (KMessageBox::questionYesNo(this, i18n("Re-run configure for %1 now?").tqarg(config), TQString(), i18n("Rerun"), i18n("Do Not Run")) == KMessageBox::Yes) if (KMessageBox::questionYesNo(this, i18n("Re-run configure for %1 now?").arg(config), TQString(), i18n("Rerun"), i18n("Do Not Run")) == KMessageBox::Yes)
TQTimer::singleShot(0, m_part, TQT_SLOT(slotConfigure())); TQTimer::singleShot(0, m_part, TQT_SLOT(slotConfigure()));
} }
@ -396,7 +396,7 @@ KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQStrin
if (!factory) { if (!factory) {
TQString errorMessage = KLibLoader::self()->lastErrorMessage(); TQString errorMessage = KLibLoader::self()->lastErrorMessage();
KMessageBox::error(0, i18n("There was an error loading the module %1.\n" KMessageBox::error(0, i18n("There was an error loading the module %1.\n"
"The diagnostics is:\n%2").tqarg(service->name()).tqarg(errorMessage)); "The diagnostics is:\n%2").arg(service->name()).arg(errorMessage));
exit(1); exit(1);
} }

@ -81,7 +81,7 @@ void MakefileHandler::parse( const TQString& folder, bool recursive )
if ( recursive && ast && ast->hasChildren() ) if ( recursive && ast && ast->hasChildren() )
{ {
TQValueList<AutoTools::AST*> astChildList = ast->tqchildren(); TQValueList<AutoTools::AST*> astChildList = ast->children();
TQValueList<AutoTools::AST*>::iterator it(astChildList.begin()), clEnd(astChildList.end()); TQValueList<AutoTools::AST*>::iterator it(astChildList.begin()), clEnd(astChildList.end());
for ( ; it != clEnd; ++it ) for ( ; it != clEnd; ++it )
{ {
@ -145,7 +145,7 @@ TQString MakefileHandler::resolveVariable( const TQString& variable, AutoTools::
return variable; return variable;
kdDebug(9020) << k_funcinfo << "attempting to resolve '" << variable << "'"<< endl; kdDebug(9020) << k_funcinfo << "attempting to resolve '" << variable << "'"<< endl;
ASTList childList = ast->tqchildren(); ASTList childList = ast->children();
ASTList::iterator it( childList.begin() ), clEnd( childList.end() ); ASTList::iterator it( childList.begin() ), clEnd( childList.end() );
for ( ; it != clEnd; ++it ) for ( ; it != clEnd; ++it )
{ {

@ -63,7 +63,7 @@ RemoveFileDialog::RemoveFileDialog(AutoProjectWidget *widget, AutoProjectPart* p
TQString joinedtargets = " *" + targets.join("\n *"); TQString joinedtargets = " *" + targets.join("\n *");
removeFromTargetsCheckBox->setText ( i18n ( "The file %1 is still used by the following targets:\n%2\n" removeFromTargetsCheckBox->setText ( i18n ( "The file %1 is still used by the following targets:\n%2\n"
"Remove it from all of them?").tqarg(filename).tqarg(joinedtargets) ); "Remove it from all of them?").arg(filename).arg(joinedtargets) );
setMinimumSize(TQSize(size().width(), size().height() + removeFromTargetsCheckBox->size().height()*2) ); setMinimumSize(TQSize(size().width(), size().height() + removeFromTargetsCheckBox->size().height()*2) );
} }

@ -45,7 +45,7 @@ SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProj
SubprojectItem *item, TQWidget *parent, const char *name) SubprojectItem *item, TQWidget *parent, const char *name)
: SubprojectOptionsDialogBase(parent, name, true) : SubprojectOptionsDialogBase(parent, name, true)
{ {
setCaption(i18n("Subproject Options for '%1'").tqarg(item->subdir)); setCaption(i18n("Subproject Options for '%1'").arg(item->subdir));
subProject = item; subProject = item;
m_part = part; m_part = part;

@ -37,7 +37,7 @@ TargetOptionsDialog::TargetOptionsDialog(AutoProjectWidget *widget, TargetItem *
TQWidget *parent, const char *name) TQWidget *parent, const char *name)
: TargetOptionsDialogBase(parent, name, true) : TargetOptionsDialogBase(parent, name, true)
{ {
setCaption( i18n("Target Options for '%1'").tqarg(item->name) ); setCaption( i18n("Target Options for '%1'").arg(item->name) );
setIcon( SmallIcon("configure") ); setIcon( SmallIcon("configure") );
target = item; target = item;

@ -944,7 +944,7 @@ void CustomProjectPart::startMakeCommand( const TQString &dir, const TQString &t
TQString nice; TQString nice;
if ( prio != 0 ) if ( prio != 0 )
{ {
nice = TQString( "nice -n%1 " ).tqarg( prio ); nice = TQString( "nice -n%1 " ).arg( prio );
} }
cmdline.prepend( nice ); cmdline.prepend( nice );

@ -28,7 +28,7 @@ namespace AutoTools {
AST::~AST() AST::~AST()
{ {
for (TQValueList<AST*>::iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) for (TQValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it)
{ {
AST *node = *it; AST *node = *it;
delete node; delete node;
@ -37,13 +37,13 @@ AST::~AST()
void AST::addChildAST(AST *node) void AST::addChildAST(AST *node)
{ {
m_tqchildren.append(node); m_children.append(node);
} }
void AST::writeBack(TQString &buffer) void AST::writeBack(TQString &buffer)
{ {
for (TQValueList<AST*>::const_iterator it = m_tqchildren.constBegin(); for (TQValueList<AST*>::const_iterator it = m_children.constBegin();
it != m_tqchildren.constEnd(); ++it) it != m_children.constEnd(); ++it)
{ {
if (*it) if (*it)
(*it)->writeBack(buffer); (*it)->writeBack(buffer);
@ -60,12 +60,12 @@ TQString AST::indentation()
bool AST::hasChildren() const bool AST::hasChildren() const
{ {
return !m_tqchildren.isEmpty(); return !m_children.isEmpty();
} }
TQValueList<AST*> AST::tqchildren() const TQValueList<AST*> AST::children() const
{ {
return m_tqchildren; return m_children;
} }
//ProjectAST //ProjectAST

@ -37,7 +37,7 @@ namespace AutoTools
* AST node. * AST node.
* This is the base class. Objects of this type are not created by the parser. * This is the base class. Objects of this type are not created by the parser.
* *
* Each AST node holds the list of its tqchildren which are always deleted in the * Each AST node holds the list of its children which are always deleted in the
* destructor. This way, it's possible call delete for only root AST node and * destructor. This way, it's possible call delete for only root AST node and
* others will be deleted automatically. * others will be deleted automatically.
* *
@ -85,20 +85,20 @@ public:
/** @return The indentation string based on node depth.*/ /** @return The indentation string based on node depth.*/
virtual TQString indentation(); virtual TQString indentation();
//! \return true if this AST has tqchildren //! \return true if this AST has children
bool hasChildren() const; bool hasChildren() const;
/** /**
* Get the tqchildren of this ast * Get the children of this ast
* \return the list of this ast's childre * \return the list of this ast's childre
*/ */
TQValueList<AST*> tqchildren() const; TQValueList<AST*> children() const;
protected: protected:
NodeType m_nodeType; NodeType m_nodeType;
TQValueList<AST*> m_tqchildren; TQValueList<AST*> m_children;
private: private:
int m_depth; int m_depth;

@ -27,28 +27,28 @@ namespace TQMake {
AST::~AST() AST::~AST()
{ {
for (TQValueList<AST*>::iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) for (TQValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it)
{ {
AST *node = *it; AST *node = *it;
delete node; delete node;
} }
m_tqchildren.clear(); m_children.clear();
} }
void AST::addChildAST(AST *node) void AST::addChildAST(AST *node)
{ {
m_tqchildren.append(node); m_children.append(node);
} }
void AST::removeChildAST(AST *node) void AST::removeChildAST(AST *node)
{ {
m_tqchildren.remove(node); m_children.remove(node);
} }
void AST::writeBack(TQString &buffer) void AST::writeBack(TQString &buffer)
{ {
for (TQValueList<AST*>::const_iterator it = m_tqchildren.constBegin(); for (TQValueList<AST*>::const_iterator it = m_children.constBegin();
it != m_tqchildren.constEnd(); ++it) it != m_children.constEnd(); ++it)
{ {
if (*it) if (*it)
{ {
@ -70,7 +70,7 @@ TQString AST::indentation()
void ProjectAST::writeBack(TQString &buffer) void ProjectAST::writeBack(TQString &buffer)
{ {
bool hasActualStatements = false; bool hasActualStatements = false;
for (TQValueList<TQMake::AST*>::const_iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) for (TQValueList<TQMake::AST*>::const_iterator it = m_children.begin(); it != m_children.end(); ++it)
{ {
if ((*it)->nodeType() != AST::IncludeAST) if ((*it)->nodeType() != AST::IncludeAST)
{ {
@ -84,7 +84,7 @@ void ProjectAST::writeBack(TQString &buffer)
if( !buffer.endsWith(": ") ) if( !buffer.endsWith(": ") )
buffer += indentation(); buffer += indentation();
buffer += scopedID; buffer += scopedID;
if( m_tqchildren.count() == 1 ) if( m_children.count() == 1 )
buffer += " : "; buffer += " : ";
else else
buffer += " {"; buffer += " {";
@ -94,9 +94,9 @@ void ProjectAST::writeBack(TQString &buffer)
if( !buffer.endsWith(": ") ) if( !buffer.endsWith(": ") )
buffer += indentation(); buffer += indentation();
buffer += scopedID + "(" + args + ")"; buffer += scopedID + "(" + args + ")";
if( m_tqchildren.count() == 1 && hasActualStatements ) if( m_children.count() == 1 && hasActualStatements )
buffer += ": "; buffer += ": ";
else if( (m_tqchildren.count() > 0 && hasActualStatements) ) else if( (m_children.count() > 0 && hasActualStatements) )
buffer += "{"; buffer += "{";
else else
buffer += ""; buffer += "";
@ -104,10 +104,10 @@ void ProjectAST::writeBack(TQString &buffer)
else if( !buffer.endsWith(": ") ) else if( !buffer.endsWith(": ") )
buffer += indentation(); buffer += indentation();
AST::writeBack(buffer); AST::writeBack(buffer);
if (isScope() && m_tqchildren.count() > 1 ) if (isScope() && m_children.count() > 1 )
buffer += indentation() + "}"; buffer += indentation() + "}";
if (isFunctionScope() && (hasActualStatements) && m_tqchildren.count() > 1) if (isFunctionScope() && (hasActualStatements) && m_children.count() > 1)
buffer += indentation() + "}"; buffer += indentation() + "}";
} }

@ -33,7 +33,7 @@ namespace TQMake {
AST node. AST node.
This is the base class. Objects of this type are not created by the parser. This is the base class. Objects of this type are not created by the parser.
Each AST node holds the list of its tqchildren which are always deleted in the Each AST node holds the list of its children which are always deleted in the
destructor. This way, it's possible call delete for only root AST node and destructor. This way, it's possible call delete for only root AST node and
others will be deleted automatically. others will be deleted automatically.
@ -79,7 +79,7 @@ public:
virtual TQString indentation(); virtual TQString indentation();
/**The list of child AST nodes.*/ /**The list of child AST nodes.*/
TQValueList<AST*> m_tqchildren; TQValueList<AST*> m_children;
protected: protected:
NodeType m_nodeType; NodeType m_nodeType;

@ -29,8 +29,8 @@ void ASTVisitor::processProject(ProjectAST *project)
enterScope(project); enterScope(project);
else if (project->isFunctionScope()) else if (project->isFunctionScope())
enterFunctionScope(project); enterFunctionScope(project);
for (TQValueList<TQMake::AST*>::const_iterator it = project->m_tqchildren.constBegin(); for (TQValueList<TQMake::AST*>::const_iterator it = project->m_children.constBegin();
it != project->m_tqchildren.constEnd(); ++it) it != project->m_children.constEnd(); ++it)
{ {
AST *ast = *it; AST *ast = *it;
if (ast == 0) if (ast == 0)

@ -51,7 +51,7 @@
<property name="text"> <property name="text">
<string>Note: These options override target specific settings.</string> <string>Note: These options override target specific settings.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
<property name="whatsThis" stdset="0"> <property name="whatsThis" stdset="0">

@ -95,7 +95,7 @@
<property name="text"> <property name="text">
<string>Related subclass &amp;location:</string> <string>Related subclass &amp;location:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">

@ -448,7 +448,7 @@ KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &na
if (!factory) { if (!factory) {
TQString errorMessage = KLibLoader::self()->lastErrorMessage(); TQString errorMessage = KLibLoader::self()->lastErrorMessage();
KMessageBox::error(0, i18n("There was an error loading the module %1.\n" KMessageBox::error(0, i18n("There was an error loading the module %1.\n"
"The diagnostics is:\n%2").tqarg(service->name()).tqarg(errorMessage)); "The diagnostics is:\n%2").arg(service->name()).arg(errorMessage));
exit(1); exit(1);
} }

@ -2162,7 +2162,7 @@
<property name="text"> <property name="text">
<string>Value:</string> <string>Value:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignTop</set> <set>AlignTop</set>
</property> </property>
</widget> </widget>

@ -80,7 +80,7 @@ Leave this empty to automatically search for a .pro file in the project director
<property name="text"> <property name="text">
<string>The following settings determine what the project configuration dialog should do when another subproject is selected while the dialog is still open.</string> <string>The following settings determine what the project configuration dialog should do when another subproject is selected while the dialog is still open.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>

@ -158,7 +158,7 @@ bool Scope::loadFromFile( const TQString& filename )
if( DomUtil::readBoolEntry( *m_part->projectDom(), if( DomUtil::readBoolEntry( *m_part->projectDom(),
"/kdevtrollproject/qmake/showParseErrors", true ) ) "/kdevtrollproject/qmake/showParseErrors", true ) )
{ {
KMessageBox::error( 0, i18n( "Could not parse project file: %1" ).tqarg( filename ), KMessageBox::error( 0, i18n( "Could not parse project file: %1" ).arg( filename ),
i18n( "Could not parse project file" ) ); i18n( "Could not parse project file" ) );
} }
m_root = 0; m_root = 0;
@ -198,7 +198,7 @@ void Scope::saveToFile() const
file.close(); file.close();
}else }else
{ {
KMessageBox::error( 0, i18n( "Could not write project file: %1" ).tqarg( filename ), KMessageBox::error( 0, i18n( "Could not write project file: %1" ).arg( filename ),
i18n( "Could not write project file" ) ); i18n( "Could not write project file" ) );
} }
#ifdef DEBUG #ifdef DEBUG
@ -292,7 +292,7 @@ TQStringList Scope::variableValuesForOp( const TQString& variable , const TQStri
return result; return result;
TQValueList<TQMake::AST*>::const_iterator it; TQValueList<TQMake::AST*>::const_iterator it;
for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it ) for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it )
{ {
TQMake::AST* ast = *it; TQMake::AST* ast = *it;
if ( ast->nodeType() == TQMake::AST::AssignmentAST ) if ( ast->nodeType() == TQMake::AST::AssignmentAST )
@ -352,7 +352,7 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re
} }
TQValueList<TQMake::AST*>::const_iterator it; TQValueList<TQMake::AST*>::const_iterator it;
for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it ) for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it )
{ {
if ( stopHere && *it == stopHere ) if ( stopHere && *it == stopHere )
return ; return ;
@ -628,7 +628,7 @@ bool Scope::deleteFunctionScope( unsigned int num )
Scope* funcScope = m_scopes[ num ]; Scope* funcScope = m_scopes[ num ];
if ( funcScope ) if ( funcScope )
{ {
TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.findIndex( funcScope->m_root ) ]; TQMake::AST* ast = m_root->m_children[ m_root->m_children.findIndex( funcScope->m_root ) ];
if( !ast ) if( !ast )
return false; return false;
m_scopes.remove( num ); m_scopes.remove( num );
@ -648,7 +648,7 @@ bool Scope::deleteSimpleScope( unsigned int num )
Scope* simpleScope = m_scopes[ num ]; Scope* simpleScope = m_scopes[ num ];
if ( simpleScope ) if ( simpleScope )
{ {
TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.findIndex( simpleScope->m_root ) ]; TQMake::AST* ast = m_root->m_children[ m_root->m_children.findIndex( simpleScope->m_root ) ];
if( !ast ) if( !ast )
return false; return false;
m_scopes.remove( num ); m_scopes.remove( num );
@ -686,10 +686,10 @@ bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir )
return false; return false;
TQValueList<TQMake::AST*>::iterator it = findExistingVariable( "TEMPLATE" ); TQValueList<TQMake::AST*>::iterator it = findExistingVariable( "TEMPLATE" );
if ( it != m_root->m_tqchildren.end() ) if ( it != m_root->m_children.end() )
{ {
TQMake::AssignmentAST * tempast = static_cast<TQMake::AssignmentAST*>( *it ); TQMake::AssignmentAST * tempast = static_cast<TQMake::AssignmentAST*>( *it );
if ( tempast->values.findIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_tqchildren.end() ) if ( tempast->values.findIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_children.end() )
{ {
Scope* project = m_scopes[ num ]; Scope* project = m_scopes[ num ];
if( !project ) if( !project )
@ -723,7 +723,7 @@ bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir )
} }
} }
TQValueList<TQMake::AST*>::iterator foundit = findExistingVariable( "SUBDIRS" ); TQValueList<TQMake::AST*>::iterator foundit = findExistingVariable( "SUBDIRS" );
if ( foundit != m_root->m_tqchildren.end() ) if ( foundit != m_root->m_children.end() )
{ {
TQMake::AssignmentAST * ast = static_cast<TQMake::AssignmentAST*>( *foundit ); TQMake::AssignmentAST * ast = static_cast<TQMake::AssignmentAST*>( *foundit );
updateValues( ast->values, TQStringList( projdir ), true, ast->indent ); updateValues( ast->values, TQStringList( projdir ), true, ast->indent );
@ -804,11 +804,11 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const
if( m_varCache.contains( variable ) ) if( m_varCache.contains( variable ) )
m_varCache.erase( variable ); m_varCache.erase( variable );
for ( int i = m_root->m_tqchildren.count() - 1; i >= 0; --i ) for ( int i = m_root->m_children.count() - 1; i >= 0; --i )
{ {
if ( m_root->m_tqchildren[ i ] ->nodeType() == TQMake::AST::AssignmentAST ) if ( m_root->m_children[ i ] ->nodeType() == TQMake::AST::AssignmentAST )
{ {
TQMake::AssignmentAST * assignment = static_cast<TQMake::AssignmentAST*>( m_root->m_tqchildren[ i ] ); TQMake::AssignmentAST * assignment = static_cast<TQMake::AssignmentAST*>( m_root->m_children[ i ] );
if ( assignment->scopedID == variable && Scope::isCompatible( assignment->op, op ) ) if ( assignment->scopedID == variable && Scope::isCompatible( assignment->op, op ) )
{ {
updateValues( assignment->values, values, removeFromOp, assignment->indent ); updateValues( assignment->values, values, removeFromOp, assignment->indent );
@ -898,7 +898,7 @@ TQValueList<TQMake::AST*>::iterator Scope::findExistingVariable( const TQString&
TQStringList ops; TQStringList ops;
ops << "=" << "+="; ops << "=" << "+=";
for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end() ; ++it ) for ( it = m_root->m_children.begin(); it != m_root->m_children.end() ; ++it )
{ {
if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST ) if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST )
{ {
@ -909,7 +909,7 @@ TQValueList<TQMake::AST*>::iterator Scope::findExistingVariable( const TQString&
} }
} }
} }
return m_root->m_tqchildren.end(); return m_root->m_children.end();
} }
void Scope::init() void Scope::init()
@ -921,7 +921,7 @@ void Scope::init()
m_maxCustomVarNum = 1; m_maxCustomVarNum = 1;
TQValueList<TQMake::AST*>::const_iterator it; TQValueList<TQMake::AST*>::const_iterator it;
for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it ) for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it )
{ {
if ( ( *it ) ->nodeType() == TQMake::AST::ProjectAST ) if ( ( *it ) ->nodeType() == TQMake::AST::ProjectAST )
{ {
@ -1088,7 +1088,7 @@ void Scope::removeCustomVariable( unsigned int id )
{ {
TQMake::AssignmentAST* m = m_customVariables[id]; TQMake::AssignmentAST* m = m_customVariables[id];
m_customVariables.remove(id); m_customVariables.remove(id);
m_root->m_tqchildren.remove( m ); m_root->m_children.remove( m );
} }
} }
@ -1097,8 +1097,8 @@ bool Scope::isVariableReset( const TQString& var )
bool result = false; bool result = false;
if( !m_root ) if( !m_root )
return result; return result;
TQValueList<TQMake::AST*>::const_iterator it = m_root->m_tqchildren.begin(); TQValueList<TQMake::AST*>::const_iterator it = m_root->m_children.begin();
for ( ; it != m_root->m_tqchildren.end(); ++it ) for ( ; it != m_root->m_children.end(); ++it )
{ {
if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST ) if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST )
{ {
@ -1120,16 +1120,16 @@ void Scope::removeVariable( const TQString& var, const TQString& op )
TQMake::AssignmentAST* ast = 0; TQMake::AssignmentAST* ast = 0;
TQValueList<TQMake::AST*>::iterator it = m_root->m_tqchildren.begin(); TQValueList<TQMake::AST*>::iterator it = m_root->m_children.begin();
for ( ; it != m_root->m_tqchildren.end(); ++it ) for ( ; it != m_root->m_children.end(); ++it )
{ {
if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST ) if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST )
{ {
ast = static_cast<TQMake::AssignmentAST*>( *it ); ast = static_cast<TQMake::AssignmentAST*>( *it );
if ( ast->scopedID == var && ast->op == op ) if ( ast->scopedID == var && ast->op == op )
{ {
m_root->m_tqchildren.remove( ast ); m_root->m_children.remove( ast );
it = m_root->m_tqchildren.begin(); it = m_root->m_children.begin();
} }
} }
} }

@ -852,9 +852,9 @@ TQString TrollProjectPart::findTQtDir()
TQStringList qtdirs; TQStringList qtdirs;
if( !isTQt4Project() ) if( !isTQt4Project() )
qtdirs.push_back( ::getenv("QTDIR") ); qtdirs.push_back( ::getenv("QTDIR") );
qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").tqarg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
qtdirs.push_back( TQDir::rootDirPath()+"usr" ); qtdirs.push_back( TQDir::rootDirPath()+"usr" );
qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt" ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt" );

@ -529,7 +529,7 @@ TQString TrollProjectWidget::getCurrentOutputFilename()
void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item ) void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item )
{ {
// If no tqchildren in detailview // If no children in detailview
// it is a subdir template // it is a subdir template
if ( item && details->childCount() ) if ( item && details->childCount() )
{ {
@ -556,7 +556,7 @@ void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item )
void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, KListView *listviewControl ) void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, KListView *listviewControl )
{ {
// Insert all GroupItems and all of their tqchildren into the view // Insert all GroupItems and all of their children into the view
if ( !listviewControl || item->scope->variableValues( "TEMPLATE" ).findIndex("subdirs") != -1 ) if ( !listviewControl || item->scope->variableValues( "TEMPLATE" ).findIndex("subdirs") != -1 )
return ; return ;
@ -974,7 +974,7 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i
QMakeScopeItem *spitem = static_cast<QMakeScopeItem*>( item ); QMakeScopeItem *spitem = static_cast<QMakeScopeItem*>( item );
KPopupMenu popup( this ); KPopupMenu popup( this );
popup.insertTitle( i18n( "Subproject %1" ).tqarg( item->text( 0 ) ) ); popup.insertTitle( i18n( "Subproject %1" ).arg( item->text( 0 ) ) );
int idBuild = -2; int idBuild = -2;
int idRebuild = -2; int idRebuild = -2;
@ -1757,9 +1757,9 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
KPopupMenu popup( this ); KPopupMenu popup( this );
if ( !( gitem->groupType == GroupItem::InstallObject ) ) if ( !( gitem->groupType == GroupItem::InstallObject ) )
popup.insertTitle( i18n( "File: %1" ).tqarg( fitem->text( 0 ) ) ); popup.insertTitle( i18n( "File: %1" ).arg( fitem->text( 0 ) ) );
else else
popup.insertTitle( i18n( "Pattern: %1" ).tqarg( fitem->text( 0 ) ) ); popup.insertTitle( i18n( "Pattern: %1" ).arg( fitem->text( 0 ) ) );
int idRemoveFile = -2; int idRemoveFile = -2;
int idSubclassWidget = -2; int idSubclassWidget = -2;
@ -1932,7 +1932,7 @@ void TrollProjectWidget::removeFile( QMakeScopeItem *spitem, FileItem *fitem )
if ( KMessageBox::warningYesNo( this, if ( KMessageBox::warningYesNo( this,
"<qt>" + "<qt>" +
i18n( "Do you want to delete the file <strong>%1</strong> from the project and your disk?" ) i18n( "Do you want to delete the file <strong>%1</strong> from the project and your disk?" )
.tqarg( fitem->text( 0 ) ) + .arg( fitem->text( 0 ) ) +
"</qt>", "</qt>",
i18n( "Remove File" ), i18n( "Remove File" ),
KStdGuiItem::remove(), KStdGuiItem::remove(),
@ -2459,7 +2459,7 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem )
void TrollProjectWidget::slotProjectDirty(const TQString& path) void TrollProjectWidget::slotProjectDirty(const TQString& path)
{ {
kdDebug(9024) << "File is dirty:" << path << " using method " << endl; kdDebug(9024) << "File is dirty:" << path << " using method " << endl;
if( KMessageBox::warningYesNo(this, i18n("The project file \"%1\" has changed on disk\n(Or you have \"%2\" opened in the editor, which also triggers a reload when you change something in the TQMake Manager).\n\nDo you want to reload it?").tqarg(path).tqarg(path), i18n("Project File Changed"), i18n("Reload"), i18n("Do Not Reload"), "trollproject_reload_project_file" ) != KMessageBox::No ) if( KMessageBox::warningYesNo(this, i18n("The project file \"%1\" has changed on disk\n(Or you have \"%2\" opened in the editor, which also triggers a reload when you change something in the TQMake Manager).\n\nDo you want to reload it?").arg(path).arg(path), i18n("Project File Changed"), i18n("Reload"), i18n("Do Not Reload"), "trollproject_reload_project_file" ) != KMessageBox::No )
{ {
m_part->dirWatch()->stopScan(); m_part->dirWatch()->stopScan();
TQListViewItemIterator it(m_rootSubproject); TQListViewItemIterator it(m_rootSubproject);

@ -66,7 +66,7 @@
<property name="scaledContents"> <property name="scaledContents">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignCenter</set> <set>AlignCenter</set>
</property> </property>
<property name="hAlign" stdset="0"> <property name="hAlign" stdset="0">
@ -79,7 +79,7 @@
<property name="text"> <property name="text">
<string>Version 3.2</string> <string>Version 3.2</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignCenter</set> <set>AlignCenter</set>
</property> </property>
<property name="hAlign" stdset="0"> <property name="hAlign" stdset="0">
@ -92,7 +92,7 @@
<property name="text"> <property name="text">
<string>Copyright (C) 2000-2003 Trolltech AS. All Rights Reserved.</string> <string>Copyright (C) 2000-2003 Trolltech AS. All Rights Reserved.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignCenter</set> <set>AlignCenter</set>
</property> </property>
<property name="hAlign" stdset="0"> <property name="hAlign" stdset="0">
@ -113,7 +113,7 @@
<property name="text"> <property name="text">
<string>&lt;p&gt;Qt Commercial Edition license holders: This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.&lt;/p&gt;&lt;p&gt;&lt;/p&gt;&lt;p&gt;Qt Free Edition users: This program is licensed to you under the terms of the GNU General Public License Version 2. For details, see the file LICENSE.GPL that came with this software distribution.&lt;/p&gt;&lt;p&gt;The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.&lt;/p&gt;</string> <string>&lt;p&gt;Qt Commercial Edition license holders: This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.&lt;/p&gt;&lt;p&gt;&lt;/p&gt;&lt;p&gt;Qt Free Edition users: This program is licensed to you under the terms of the GNU General Public License Version 2. For details, see the file LICENSE.GPL that came with this software distribution.&lt;/p&gt;&lt;p&gt;The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.&lt;/p&gt;</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set> <set>WordBreak|AlignVCenter|AlignLeft</set>
</property> </property>
<property name="wordwrap" stdset="0"> <property name="wordwrap" stdset="0">

@ -349,7 +349,7 @@ void QDesignerToolBar::contextMenuEvent( TQContextMenuEvent *e )
menu.insertItem( i18n( "Delete Toolbar" ), 1 ); menu.insertItem( i18n( "Delete Toolbar" ), 1 );
int res = menu.exec( e->globalPos() ); int res = menu.exec( e->globalPos() );
if ( res != -1 ) { if ( res != -1 ) {
RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n( "Delete Toolbar '%1'" ).tqarg( name() ), RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n( "Delete Toolbar '%1'" ).arg( name() ),
formWindow, 0, this ); formWindow, 0, this );
formWindow->commandHistory()->addCommand( cmd ); formWindow->commandHistory()->addCommand( cmd );
cmd->execute(); cmd->execute();
@ -409,7 +409,7 @@ void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject *
int index = actionList.find( a ); int index = actionList.find( a );
RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand(
i18n( "Delete Action '%1' From Toolbar '%2'" ). i18n( "Delete Action '%1' From Toolbar '%2'" ).
tqarg( a->name() ).tqarg( caption() ), arg( a->name() ).arg( caption() ),
formWindow, a, this, index ); formWindow, a, this, index );
formWindow->commandHistory()->addCommand( cmd ); formWindow->commandHistory()->addCommand( cmd );
cmd->execute(); cmd->execute();
@ -429,7 +429,7 @@ void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject *
formWindow->commandHistory()->addCommand( cmd ); formWindow->commandHistory()->addCommand( cmd );
cmd->execute(); cmd->execute();
} else if ( res == ID_DELTOOLBAR ) { } else if ( res == ID_DELTOOLBAR ) {
RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n( "Delete Toolbar '%1'" ).tqarg( name() ), RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n( "Delete Toolbar '%1'" ).arg( name() ),
formWindow, 0, this ); formWindow, 0, this );
formWindow->commandHistory()->addCommand( cmd ); formWindow->commandHistory()->addCommand( cmd );
cmd->execute(); cmd->execute();
@ -464,7 +464,7 @@ void QDesignerToolBar::removeWidget( TQWidget *w )
int index = actionList.find( a ); int index = actionList.find( a );
RemoveActionFromToolBarCommand *cmd = RemoveActionFromToolBarCommand *cmd =
new RemoveActionFromToolBarCommand( i18n( "Delete Action '%1' From Toolbar '%2'" ). new RemoveActionFromToolBarCommand( i18n( "Delete Action '%1' From Toolbar '%2'" ).
tqarg( a->name() ).tqarg( caption() ), arg( a->name() ).arg( caption() ),
formWindow, a, this, index ); formWindow, a, this, index );
formWindow->commandHistory()->addCommand( cmd ); formWindow->commandHistory()->addCommand( cmd );
cmd->execute(); cmd->execute();
@ -487,7 +487,7 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o )
int index = actionList.find( a ); int index = actionList.find( a );
RemoveActionFromToolBarCommand *cmd = RemoveActionFromToolBarCommand *cmd =
new RemoveActionFromToolBarCommand( i18n( "Delete Action '%1' From Toolbar '%2'" ). new RemoveActionFromToolBarCommand( i18n( "Delete Action '%1' From Toolbar '%2'" ).
tqarg( a->name() ).tqarg( caption() ), arg( a->name() ).arg( caption() ),
formWindow, a, this, index ); formWindow, a, this, index );
formWindow->commandHistory()->addCommand( cmd ); formWindow->commandHistory()->addCommand( cmd );
cmd->execute(); cmd->execute();
@ -504,7 +504,7 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o )
} }
if ( !drag->drag() ) { if ( !drag->drag() ) {
AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n( "Add Action '%1' to Toolbar '%2'" ). AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n( "Add Action '%1' to Toolbar '%2'" ).
tqarg( a->name() ).tqarg( caption() ), arg( a->name() ).arg( caption() ),
formWindow, a, this, index ); formWindow, a, this, index );
formWindow->commandHistory()->addCommand( cmd ); formWindow->commandHistory()->addCommand( cmd );
cmd->execute(); cmd->execute();
@ -571,7 +571,7 @@ void QDesignerToolBar::dropEvent( TQDropEvent *e )
} }
AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n( "Add Action '%1' to Toolbar '%2'" ). AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n( "Add Action '%1' to Toolbar '%2'" ).
tqarg( a->name() ).tqarg( caption() ), arg( a->name() ).arg( caption() ),
formWindow, a, this, index ); formWindow, a, this, index );
formWindow->commandHistory()->addCommand( cmd ); formWindow->commandHistory()->addCommand( cmd );
cmd->execute(); cmd->execute();
@ -699,7 +699,7 @@ void QDesignerToolBar::doInsertWidget( const TQPoint &p )
if ( !insertAnchor ) if ( !insertAnchor )
index = 0; index = 0;
AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n( "Add Widget '%1' to Toolbar '%2'" ). AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n( "Add Widget '%1' to Toolbar '%2'" ).
tqarg( w->name() ).tqarg( caption() ), arg( w->name() ).arg( caption() ),
formWindow, a, this, index ); formWindow, a, this, index );
formWindow->commandHistory()->addCommand( cmd ); formWindow->commandHistory()->addCommand( cmd );
cmd->execute(); cmd->execute();

@ -261,19 +261,19 @@ void ResizeCommand::unexecute()
InsertCommand::InsertCommand( const TQString &n, FormWindow *fw, InsertCommand::InsertCommand( const TQString &n, FormWindow *fw,
TQWidget *w, const TQRect &g ) TQWidget *w, const TQRect &g )
: Command( n, fw ), widget( w ), tqgeometry( g ) : Command( n, fw ), widget( w ), geometry( g )
{ {
} }
void InsertCommand::execute() void InsertCommand::execute()
{ {
if ( tqgeometry.size() == TQSize( 0, 0 ) ) { if ( geometry.size() == TQSize( 0, 0 ) ) {
widget->move( tqgeometry.topLeft() ); widget->move( geometry.topLeft() );
widget->adjustSize(); widget->adjustSize();
} else { } else {
TQSize s = tqgeometry.size().expandedTo( widget->minimumSize() ); TQSize s = geometry.size().expandedTo( widget->minimumSize() );
s = s.expandedTo( widget->minimumSizeHint() ); s = s.expandedTo( widget->minimumSizeHint() );
TQRect r( tqgeometry.topLeft(), s ); TQRect r( geometry.topLeft(), s );
widget->setGeometry( r ); widget->setGeometry( r );
} }
widget->show(); widget->show();
@ -369,17 +369,17 @@ DeleteCommand::DeleteCommand( const TQString &n, FormWindow *fw,
TQWidgetList copyOfWidgets = widgets; TQWidgetList copyOfWidgets = widgets;
copyOfWidgets.setAutoDelete(FALSE); copyOfWidgets.setAutoDelete(FALSE);
// Include the tqchildren of the selected items when deleting // Include the children of the selected items when deleting
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
TQObjectList *tqchildren = w->queryList( TQWIDGET_OBJECT_NAME_STRING ); TQObjectList *children = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
for ( TQWidget *c = (TQWidget *)tqchildren->first(); c; c = (TQWidget *)tqchildren->next() ) { for ( TQWidget *c = (TQWidget *)children->first(); c; c = (TQWidget *)children->next() ) {
if ( copyOfWidgets.find( c ) == -1 && formWindow()->widgets()->find( c ) ) { if ( copyOfWidgets.find( c ) == -1 && formWindow()->widgets()->find( c ) ) {
widgets.insert(widgets.at() + 1, c); widgets.insert(widgets.at() + 1, c);
widgets.prev(); widgets.prev();
copyOfWidgets.append(c); copyOfWidgets.append(c);
} }
} }
delete tqchildren; delete children;
} }
} }
@ -566,23 +566,23 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
widget->metaObject()->property( widget->metaObject()->findProperty( propName, TRUE ), TRUE ); widget->metaObject()->property( widget->metaObject()->findProperty( propName, TRUE ), TRUE );
if ( !p ) { if ( !p ) {
if ( propName == "hAlign" ) { if ( propName == "hAlign" ) {
p = widget->metaObject()->property( widget->metaObject()->findProperty( "tqalignment", TRUE ), TRUE ); p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", TRUE ), TRUE );
int align = widget->property( "tqalignment" ).toInt(); int align = widget->property( "alignment" ).toInt();
align &= ~( AlignHorizontal_Mask ); align &= ~( AlignHorizontal_Mask );
align |= p->keyToValue( currentItemText ); align |= p->keyToValue( currentItemText );
widget->setProperty( "tqalignment", TQVariant( align ) ); widget->setProperty( "alignment", TQVariant( align ) );
} else if ( propName == "vAlign" ) { } else if ( propName == "vAlign" ) {
p = widget->metaObject()->property( widget->metaObject()->findProperty( "tqalignment", TRUE ), TRUE ); p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", TRUE ), TRUE );
int align = widget->property( "tqalignment" ).toInt(); int align = widget->property( "alignment" ).toInt();
align &= ~( AlignVertical_Mask ); align &= ~( AlignVertical_Mask );
align |= p->keyToValue( currentItemText ); align |= p->keyToValue( currentItemText );
widget->setProperty( "tqalignment", TQVariant( align ) ); widget->setProperty( "alignment", TQVariant( align ) );
} else if ( propName == "wordwrap" ) { } else if ( propName == "wordwrap" ) {
int align = widget->property( "tqalignment" ).toInt(); int align = widget->property( "alignment" ).toInt();
align &= ~WordBreak; align &= ~WordBreak;
if ( v.toBool() ) if ( v.toBool() )
align |= WordBreak; align |= WordBreak;
widget->setProperty( "tqalignment", TQVariant( align ) ); widget->setProperty( "alignment", TQVariant( align ) );
} else if ( propName == "layoutSpacing" ) { } else if ( propName == "layoutSpacing" ) {
TQVariant val = v; TQVariant val = v;
if ( val.toString() == "default" ) if ( val.toString() == "default" )
@ -2390,8 +2390,8 @@ TQString RenameMenuCommand::makeLegal( const TQString &str )
// remove illegal characters // remove illegal characters
TQString d; TQString d;
char c = 0, i = 0; char c = 0, i = 0;
while ( !str.tqat(i).isNull() ) { while ( !str.at(i).isNull() ) {
c = str.tqat(i).latin1(); c = str.at(i).latin1();
if ( c == '-' || c == ' ' ) if ( c == '-' || c == ' ' )
d += '_'; d += '_';
else if ( ( c >= '0' && c <= '9') || ( c >= 'A' && c <= 'Z' ) else if ( ( c >= '0' && c <= '9') || ( c >= 'A' && c <= 'Z' )

@ -208,7 +208,7 @@ public:
private: private:
TQWidget *widget; TQWidget *widget;
TQRect tqgeometry; TQRect geometry;
}; };

@ -87,7 +87,7 @@ void ConfigToolboxDialog::addTool()
if ( (*it)->isSelected() ) { if ( (*it)->isSelected() ) {
if ( (*it)->childCount() == 0 ) { if ( (*it)->childCount() == 0 ) {
// Selected, no tqchildren // Selected, no children
TQListViewItem *i = new TQListViewItem( listViewCommon, listViewCommon->lastItem() ); TQListViewItem *i = new TQListViewItem( listViewCommon, listViewCommon->lastItem() );
i->setText( 0, (*it)->text(0) ); i->setText( 0, (*it)->text(0) );
i->setPixmap( 0, *((*it)->pixmap(0)) ); i->setPixmap( 0, *((*it)->pixmap(0)) );
@ -96,7 +96,7 @@ void ConfigToolboxDialog::addTool()
} else if ( !addKids ) { } else if ( !addKids ) {
// Children processing not set, so set it // Children processing not set, so set it
// Also find the item were we shall quit // Also find the item were we shall quit
// processing tqchildren...if any such item // processing children...if any such item
addKids = TRUE; addKids = TRUE;
nextSibling = (*it)->nextSibling(); nextSibling = (*it)->nextSibling();
nextParent = (*it)->parent(); nextParent = (*it)->parent();
@ -106,7 +106,7 @@ void ConfigToolboxDialog::addTool()
} }
} }
} else if ( ((*it)->childCount() == 0) && addKids ) { } else if ( ((*it)->childCount() == 0) && addKids ) {
// Leaf node, and we _do_ process tqchildren // Leaf node, and we _do_ process children
TQListViewItem *i = new TQListViewItem( listViewCommon, listViewCommon->lastItem() ); TQListViewItem *i = new TQListViewItem( listViewCommon, listViewCommon->lastItem() );
i->setText( 0, (*it)->text(0) ); i->setText( 0, (*it)->text(0) );
i->setPixmap( 0, *((*it)->pixmap(0)) ); i->setPixmap( 0, *((*it)->pixmap(0)) );

@ -175,7 +175,7 @@ ConnectionContainer *ConnectionDialog::addConnection( TQObject *sender, TQObject
void ConnectionDialog::updateConnectionState( ConnectionContainer *c ) void ConnectionDialog::updateConnectionState( ConnectionContainer *c )
{ {
c->tqrepaint(); c->repaint();
if ( c->isValid() ) if ( c->isValid() )
connectionsTable->verticalHeader()->setLabel( c->row(), connectionsTable->verticalHeader()->setLabel( c->row(),
*validConnection, TQString() ); *validConnection, TQString() );

@ -49,11 +49,11 @@ static const char* const ignore_slots[] = {
"update()", "update()",
"update(int,int,int,int)", "update(int,int,int,int)",
"update(const TQRect&)", "update(const TQRect&)",
"tqrepaint()", "repaint()",
"tqrepaint(bool)", "repaint(bool)",
"tqrepaint(int,int,int,int,bool)", "repaint(int,int,int,int,bool)",
"tqrepaint(const TQRect&,bool)", "repaint(const TQRect&,bool)",
"tqrepaint(const TQRegion&,bool)", "repaint(const TQRegion&,bool)",
"show()", "show()",
"hide()", "hide()",
"iconify()", "iconify()",
@ -170,7 +170,7 @@ void ConnectionItem::paint( TQPainter *p, const TQColorGroup &cg,
p->setFont( f ); p->setFont( f );
} }
p->drawText( x + 2, 0, w - x - 4, h, tqalignment(), currentText() ); p->drawText( x + 2, 0, w - x - 4, h, alignment(), currentText() );
p->setFont( oldf ); p->setFont( oldf );
} }

@ -183,7 +183,7 @@ public:
} }
bool isModified() const { return mod; } bool isModified() const { return mod; }
void setModified( bool b ) { mod = b; tqrepaint(); } void setModified( bool b ) { mod = b; repaint(); }
bool isValid() const { bool isValid() const {
return se->currentText()[0] != '<' && return se->currentText()[0] != '<' &&
si->currentText()[0] != '<' && si->currentText()[0] != '<' &&
@ -191,7 +191,7 @@ public:
sl->currentText()[0] != '<'; sl->currentText()[0] != '<';
} }
void tqrepaint() { void repaint() {
se->table()->updateCell( se->row(), se->col() ); se->table()->updateCell( se->row(), se->col() );
si->table()->updateCell( si->row(), si->col() ); si->table()->updateCell( si->row(), si->col() );
re->table()->updateCell( re->row(), re->col() ); re->table()->updateCell( re->row(), re->col() );

@ -546,7 +546,7 @@
</property> </property>
<property name="whatsThis" stdset="0"> <property name="whatsThis" stdset="0">
<string>&lt;p&gt;&lt;b&gt;Container Widget&lt;/b&gt;&lt;/p&gt; <string>&lt;p&gt;&lt;b&gt;Container Widget&lt;/b&gt;&lt;/p&gt;
&lt;p&gt;If this custom widget is able to contain other widgets (tqchildren), check this checkbox.&lt;/p&gt;</string> &lt;p&gt;If this custom widget is able to contain other widgets (children), check this checkbox.&lt;/p&gt;</string>
</property> </property>
</widget> </widget>
</grid> </grid>

@ -222,7 +222,7 @@ void CustomWidgetEditor::addWidgetClicked()
TQMessageBox::information( this, i18n( "Adding Custom Widget" ), TQMessageBox::information( this, i18n( "Adding Custom Widget" ),
i18n( "Custom widget names must be unique.\n" i18n( "Custom widget names must be unique.\n"
"A custom widget called '%1' already exists, so it is not possible " "A custom widget called '%1' already exists, so it is not possible "
"to add another widget with this name." ).tqarg( s ) ); "to add another widget with this name." ).arg( s ) );
return; return;
} }
@ -397,7 +397,7 @@ void CustomWidgetEditor::checkWidgetName()
TQMessageBox::information( this, i18n( "Renaming Custom Widget" ), TQMessageBox::information( this, i18n( "Renaming Custom Widget" ),
i18n( "Custom widget names must be unique.\n" i18n( "Custom widget names must be unique.\n"
"A custom widget called '%1' already exists, so it is not possible " "A custom widget called '%1' already exists, so it is not possible "
"to rename this widget with this name." ).tqarg( s ) ); "to rename this widget with this name." ).arg( s ) );
if ( i != boxWidgets->item( boxWidgets->currentItem() ) ) { if ( i != boxWidgets->item( boxWidgets->currentItem() ) ) {
boxWidgets->setCurrentItem( i ); boxWidgets->setCurrentItem( i );
tqApp->processEvents(); tqApp->processEvents();

@ -283,7 +283,7 @@
<property name="text"> <property name="text">
<string>&amp;Function:</string> <string>&amp;Function:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -316,7 +316,7 @@
<property name="text"> <property name="text">
<string>&amp;Return type:</string> <string>&amp;Return type:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -379,7 +379,7 @@
<property name="text"> <property name="text">
<string>S&amp;pecifier:</string> <string>S&amp;pecifier:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -432,7 +432,7 @@
<property name="text"> <property name="text">
<string>&amp;Access:</string> <string>&amp;Access:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter|AlignRight</set> <set>WordBreak|AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -480,7 +480,7 @@
<property name="text"> <property name="text">
<string>&amp;Type:</string> <string>&amp;Type:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">

@ -132,7 +132,7 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots )
void EditFunctions::okClicked() void EditFunctions::okClicked()
{ {
TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(formWindow) ); TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(formWindow) );
TQString n = i18n( "Add/Remove functions of '%1'" ).tqarg( formWindow->name() ); TQString n = i18n( "Add/Remove functions of '%1'" ).arg( formWindow->name() );
TQPtrList<Command> commands; TQPtrList<Command> commands;
TQValueList<MetaDataBase::Function>::Iterator fit; TQValueList<MetaDataBase::Function>::Iterator fit;
if ( !functionList.isEmpty() ) { if ( !functionList.isEmpty() ) {

@ -192,7 +192,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified )
f2.writeBlock( data ); f2.writeBlock( data );
} else { } else {
TQMessageBox::warning( MainWindow::self, i18n( "Save" ), TQMessageBox::warning( MainWindow::self, i18n( "Save" ),
i18n( "The file %1 could not be saved" ).tqarg( codeFile() ) ); i18n( "The file %1 could not be saved" ).arg( codeFile() ) );
} }
} }
} }
@ -215,7 +215,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified )
f2.writeBlock( data ); f2.writeBlock( data );
} else if ( tqApp->type() != TQApplication::Tty ) { } else if ( tqApp->type() != TQApplication::Tty ) {
TQMessageBox::warning( MainWindow::self, i18n( "Save" ), TQMessageBox::warning( MainWindow::self, i18n( "Save" ),
i18n( "The file %1 could not be saved" ).tqarg( codeFile() ) ); i18n( "The file %1 could not be saved" ).arg( codeFile() ) );
} }
} }
} }
@ -227,7 +227,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified )
bool formCodeOnly = isModified( WFormCode ) && !isModified( WFormWindow ); bool formCodeOnly = isModified( WFormCode ) && !isModified( WFormWindow );
if ( !resource.save( pro->makeAbsolute( filename ), formCodeOnly ) ) { if ( !resource.save( pro->makeAbsolute( filename ), formCodeOnly ) ) {
if ( MainWindow::self ) if ( MainWindow::self )
MainWindow::self->statusMessage( i18n( "Failed to save file '%1'.").tqarg( formCodeOnly ? codeFile(): filename ) ); MainWindow::self->statusMessage( i18n( "Failed to save file '%1'.").arg( formCodeOnly ? codeFile(): filename ) );
if ( formCodeOnly ) if ( formCodeOnly )
return FALSE; return FALSE;
return saveAs(); return saveAs();
@ -263,7 +263,7 @@ bool FormFile::saveAs( bool ignoreModified )
fn = KFileDialog::getSaveFileName( f, fn = KFileDialog::getSaveFileName( f,
i18n( "*.ui|TQt User-Interface Files" ) + "\n" + i18n( "*.ui|TQt User-Interface Files" ) + "\n" +
i18n( "*|All Files" ), MainWindow::self, /*0,*/ i18n( "*|All Files" ), MainWindow::self, /*0,*/
i18n( "Save Form '%1' As").tqarg( formName() )/*, i18n( "Save Form '%1' As").arg( formName() )/*,
MainWindow::self ? &MainWindow::self->lastSaveFilter : 0*/ ); MainWindow::self ? &MainWindow::self->lastSaveFilter : 0*/ );
if ( fn.isEmpty() ) if ( fn.isEmpty() )
return FALSE; return FALSE;
@ -294,7 +294,7 @@ bool FormFile::saveAs( bool ignoreModified )
pro->setModified( TRUE ); pro->setModified( TRUE );
timeStamp.setFileName( pro->makeAbsolute( codeFile() ) ); timeStamp.setFileName( pro->makeAbsolute( codeFile() ) );
if ( ed && TQT_TQOBJECT(formWindow()) ) if ( ed && TQT_TQOBJECT(formWindow()) )
ed->setCaption( i18n( "Edit %1" ).tqarg( formWindow()->name() ) ); ed->setCaption( i18n( "Edit %1" ).arg( formWindow()->name() ) );
setModified( TRUE ); setModified( TRUE );
if ( pro->isDummy() ) if ( pro->isDummy() )
fw->mainWindow()->addRecentlyOpenedFile( fn ); fw->mainWindow()->addRecentlyOpenedFile( fn );
@ -326,7 +326,7 @@ bool FormFile::closeEvent()
editor()->save(); editor()->save();
switch ( TQMessageBox::warning( MainWindow::self, i18n( "Save Form" ), switch ( TQMessageBox::warning( MainWindow::self, i18n( "Save Form" ),
i18n( "Save changes to form '%1'?" ).tqarg( filename ), i18n( "Save changes to form '%1'?" ).arg( filename ),
i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) { i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) {
case 0: // save case 0: // save
if ( !save() ) if ( !save() )
@ -653,7 +653,7 @@ void FormFile::checkTimeStamp()
if ( codeEdited ) { if ( codeEdited ) {
if ( TQMessageBox::information( MainWindow::self, i18n( "TQt Designer" ), if ( TQMessageBox::information( MainWindow::self, i18n( "TQt Designer" ),
i18n( "File '%1' has been changed outside TQt Designer.\n" i18n( "File '%1' has been changed outside TQt Designer.\n"
"Do you want to reload it?" ).tqarg( timeStamp.fileName() ), "Do you want to reload it?" ).arg( timeStamp.fileName() ),
i18n( "&Yes" ), i18n( "&No" ) ) == 0 ) { i18n( "&Yes" ), i18n( "&No" ) ) == 0 ) {
TQFile f( timeStamp.fileName() ); TQFile f( timeStamp.fileName() );
if ( f.open( IO_ReadOnly ) ) { if ( f.open( IO_ReadOnly ) ) {
@ -854,7 +854,7 @@ bool FormFile::checkFileName( bool allowBreak )
if ( ff ) if ( ff )
TQMessageBox::warning( MainWindow::self, i18n( "Invalid Filename" ), TQMessageBox::warning( MainWindow::self, i18n( "Invalid Filename" ),
i18n( "The project already contains a form with a\n" i18n( "The project already contains a form with a\n"
"filename of '%1'. Please choose a new filename." ).tqarg( filename ) ); "filename of '%1'. Please choose a new filename." ).arg( filename ) );
while ( ff ) { while ( ff ) {
TQString fn; TQString fn;
while ( fn.isEmpty() ) { while ( fn.isEmpty() ) {

@ -108,7 +108,7 @@ static void restoreCursors( TQWidget *start, FormWindow *fw )
} }
} }
#if defined(TQ_WS_WIN32) // #### needed for the workaround for tqrepaint problem on windows #if defined(TQ_WS_WIN32) // #### needed for the workaround for repaint problem on windows
#include <tqt_windows.h> #include <tqt_windows.h>
static void flickerfree_update( TQWidget *w ) static void flickerfree_update( TQWidget *w )
{ {
@ -383,13 +383,13 @@ void FormWindow::insertWidget()
"properties as well as signals and slots to integrate custom widgets into " "properties as well as signals and slots to integrate custom widgets into "
"<i>TQt Designer</i>, and provide a pixmap which will be used to represent " "<i>TQt Designer</i>, and provide a pixmap which will be used to represent "
"the widget on the form.</p>") "the widget on the form.</p>")
.tqarg(WidgetDatabase::toolTip( id )) ); .arg(WidgetDatabase::toolTip( id )) );
TQToolTip::add( w, i18n("A %1 (custom widget)").tqarg(WidgetDatabase::toolTip( id )) ); TQToolTip::add( w, i18n("A %1 (custom widget)").arg(WidgetDatabase::toolTip( id )) );
} else { } else {
TQString tt = WidgetDatabase::toolTip( id ); TQString tt = WidgetDatabase::toolTip( id );
TQString wt = WidgetDatabase::whatsThis( id ); TQString wt = WidgetDatabase::whatsThis( id );
if ( !wt.isEmpty() && !tt.isEmpty() ) if ( !wt.isEmpty() && !tt.isEmpty() )
TQWhatsThis::add( w, TQString("<b>A %1</b><p>%2</p>").tqarg( tt ).tqarg( wt ) ); TQWhatsThis::add( w, TQString("<b>A %1</b><p>%2</p>").arg( tt ).arg( wt ) );
} }
TQString s = w->name(); TQString s = w->name();
@ -463,13 +463,13 @@ void FormWindow::insertWidget()
else else
setCursorToAll( CrossCursor, w ); setCursorToAll( CrossCursor, w );
InsertCommand *cmd = new InsertCommand( i18n( "Insert %1" ).tqarg( w->name() ), this, w, r ); InsertCommand *cmd = new InsertCommand( i18n( "Insert %1" ).arg( w->name() ), this, w, r );
TQPtrList<Command> commands; TQPtrList<Command> commands;
commands.append( mv ); commands.append( mv );
commands.append( cmd ); commands.append( cmd );
MacroCommand *mc = new MacroCommand( i18n( "Insert %1" ).tqarg( w->name() ), this, commands ); MacroCommand *mc = new MacroCommand( i18n( "Insert %1" ).arg( w->name() ), this, commands );
commandHistory()->addCommand( mc ); commandHistory()->addCommand( mc );
mc->execute(); mc->execute();
} }
@ -479,7 +479,7 @@ void FormWindow::insertWidget()
else else
setCursorToAll( CrossCursor, w ); setCursorToAll( CrossCursor, w );
InsertCommand *cmd = new InsertCommand( i18n( "Insert %1" ).tqarg( w->name() ), this, w, r ); InsertCommand *cmd = new InsertCommand( i18n( "Insert %1" ).arg( w->name() ), this, w, r );
commandHistory()->addCommand( cmd ); commandHistory()->addCommand( cmd );
cmd->execute(); cmd->execute();
} }
@ -510,13 +510,13 @@ void FormWindow::insertWidget( TQWidget *w, bool checkName )
"properties as well as signals and slots to integrate custom widgets into " "properties as well as signals and slots to integrate custom widgets into "
"<i>TQt Designer</i>, and provide a pixmap which will be used to represent " "<i>TQt Designer</i>, and provide a pixmap which will be used to represent "
"the widget on the form.</p>") "the widget on the form.</p>")
.tqarg(WidgetDatabase::toolTip( id )) ); .arg(WidgetDatabase::toolTip( id )) );
TQToolTip::add( w, i18n("A %1 (custom widget)").tqarg(WidgetDatabase::toolTip( id )) ); TQToolTip::add( w, i18n("A %1 (custom widget)").arg(WidgetDatabase::toolTip( id )) );
} else { } else {
TQString tt = WidgetDatabase::toolTip( id ); TQString tt = WidgetDatabase::toolTip( id );
TQString wt = WidgetDatabase::whatsThis( id ); TQString wt = WidgetDatabase::whatsThis( id );
if ( !wt.isEmpty() && !tt.isEmpty() ) if ( !wt.isEmpty() && !tt.isEmpty() )
TQWhatsThis::add( w, TQString("<b>A %1</b><p>%2</p>").tqarg( tt ).tqarg( wt ) ); TQWhatsThis::add( w, TQString("<b>A %1</b><p>%2</p>").arg( tt ).arg( wt ) );
} }
restoreCursors( w, this ); restoreCursors( w, this );
@ -622,7 +622,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.find(w) ) ) ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.find(w) ) )
w = w->parentWidget(); w = w->parentWidget();
if ( e->button() == Qt::LeftButton ) { // left button: store original tqgeometry and more as the widget might start moving if ( e->button() == Qt::LeftButton ) { // left button: store original geometry and more as the widget might start moving
widgetPressed = TRUE; widgetPressed = TRUE;
widgetGeom = TQRect( w->pos(), w->size() ); widgetGeom = TQRect( w->pos(), w->size() );
oldPressPos = w->mapFromGlobal( e->globalPos() ); oldPressPos = w->mapFromGlobal( e->globalPos() );
@ -660,9 +660,9 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
break; break;
clearSelection( FALSE ); clearSelection( FALSE );
validForBuddy = TRUE; validForBuddy = TRUE;
mainWindow()->statusMessage( i18n( "Set buddy for '%1' to..." ).tqarg( w->name() ) ); mainWindow()->statusMessage( i18n( "Set buddy for '%1' to..." ).arg( w->name() ) );
} else { } else {
mainWindow()->statusMessage( i18n( "Connect '%1' with..." ).tqarg( w->name() ) ); mainWindow()->statusMessage( i18n( "Connect '%1' with..." ).arg( w->name() ) );
} }
saveBackground(); saveBackground();
startPos = mapFromGlobal( e->globalPos() ); startPos = mapFromGlobal( e->globalPos() );
@ -837,7 +837,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
// finally move the selected widgets and show/update preview label // finally move the selected widgets and show/update preview label
moveSelectedWidgets( x - p.x(), y - p.y() ); moveSelectedWidgets( x - p.x(), y - p.y() );
sizePreviewLabel->setText( i18n( "%1/%2" ).tqarg( w->pos().x() ).tqarg( w->pos().y() ) ); sizePreviewLabel->setText( i18n( "%1/%2" ).arg( w->pos().x() ).arg( w->pos().y() ) );
sizePreviewLabel->adjustSize(); sizePreviewLabel->adjustSize();
TQRect lg( mapFromGlobal( e->globalPos() ) + TQPoint( 16, 16 ), sizePreviewLabel->size() ); TQRect lg( mapFromGlobal( e->globalPos() ) + TQPoint( 16, 16 ), sizePreviewLabel->size() );
checkPreviewGeometry( lg ); checkPreviewGeometry( lg );
@ -871,7 +871,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
if ( newendWidget && if ( newendWidget &&
( isMainContainer( TQT_TQOBJECT(newendWidget) ) || insertedWidgets.find( newendWidget ) ) && !isCentralWidget( TQT_TQOBJECT(newendWidget) ) ) ( isMainContainer( TQT_TQOBJECT(newendWidget) ) || insertedWidgets.find( newendWidget ) ) && !isCentralWidget( TQT_TQOBJECT(newendWidget) ) )
endWidget = newendWidget; endWidget = newendWidget;
mainWindow()->statusMessage( i18n( "Connect '%1' to '%2'" ).tqarg( startWidget->name() ). mainWindow()->statusMessage( i18n( "Connect '%1' to '%2'" ).arg( startWidget->name() ).
arg( endWidget->name() ) ); arg( endWidget->name() ) );
currentPos = mapFromGlobal( e->globalPos() ); currentPos = mapFromGlobal( e->globalPos() );
tqApp->processEvents(); tqApp->processEvents();
@ -899,10 +899,10 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
else if ( insertedWidgets.find( newendWidget ) && !isCentralWidget( TQT_TQOBJECT(newendWidget) ) ) else if ( insertedWidgets.find( newendWidget ) && !isCentralWidget( TQT_TQOBJECT(newendWidget) ) )
endWidget = newendWidget; endWidget = newendWidget;
if ( endWidget ) if ( endWidget )
mainWindow()->statusMessage( i18n( "Set buddy '%1' to '%2'" ).tqarg( startWidget->name() ). mainWindow()->statusMessage( i18n( "Set buddy '%1' to '%2'" ).arg( startWidget->name() ).
arg( endWidget->name() ) ); arg( endWidget->name() ) );
else else
mainWindow()->statusMessage( i18n( "Set buddy '%1' to ..." ).tqarg( startWidget->name() ) ); mainWindow()->statusMessage( i18n( "Set buddy '%1' to ..." ).arg( startWidget->name() ) );
currentPos = mapFromGlobal( e->globalPos() ); currentPos = mapFromGlobal( e->globalPos() );
tqApp->processEvents(); tqApp->processEvents();
if ( drawRecRect && oldendWidget ) if ( drawRecRect && oldendWidget )
@ -1044,7 +1044,7 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
TQString oldBuddy = startWidget->property( "buddy" ).toString(); TQString oldBuddy = startWidget->property( "buddy" ).toString();
if ( oldBuddy.isNull() ) if ( oldBuddy.isNull() )
oldBuddy = ""; oldBuddy = "";
SetPropertyCommand *cmd = new SetPropertyCommand( i18n( "Set Buddy for %1" ).tqarg( startWidget->name() ), SetPropertyCommand *cmd = new SetPropertyCommand( i18n( "Set Buddy for %1" ).arg( startWidget->name() ),
this, TQT_TQOBJECT(startWidget), mainWindow()->propertyeditor(), this, TQT_TQOBJECT(startWidget), mainWindow()->propertyeditor(),
"buddy", startWidget->property( "buddy" ), "buddy", startWidget->property( "buddy" ),
endWidget->name(), endWidget->name(), endWidget->name(), endWidget->name(),
@ -1327,7 +1327,7 @@ void FormWindow::continueRectDraw( const TQPoint &p, const TQPoint &global, TQWi
if ( currRect == r ) { if ( currRect == r ) {
TQString t = i18n( "%1/%2" ); TQString t = i18n( "%1/%2" );
t = t.tqarg( r.width() - 1 ).tqarg( r.height() - 1 ); t = t.arg( r.width() - 1 ).arg( r.height() - 1 );
drawSizePreview( pos, t ); drawSizePreview( pos, t );
return; return;
} }
@ -1339,7 +1339,7 @@ void FormWindow::continueRectDraw( const TQPoint &p, const TQPoint &global, TQWi
currRect = r; currRect = r;
if ( t == Insert ) { if ( t == Insert ) {
TQString t = i18n( "%1/%2" ); TQString t = i18n( "%1/%2" );
t = t.tqarg( r.width() - 1 ).tqarg( r.height() - 1 ); t = t.arg( r.width() - 1 ).arg( r.height() - 1 );
drawSizePreview( pos, t ); drawSizePreview( pos, t );
} }
unclippedPainter->setClipRegion( TQRegion( rect() ).subtract( TQRect( sizePreviewPos, sizePreviewPixmap.size() ) ) ); unclippedPainter->setClipRegion( TQRegion( rect() ).subtract( TQRect( sizePreviewPos, sizePreviewPixmap.size() ) ) );
@ -1502,13 +1502,13 @@ void FormWindow::editAdjustSize()
TQPtrList<Command> commands; TQPtrList<Command> commands;
TQWidgetList widgets = selectedWidgets(); TQWidgetList widgets = selectedWidgets();
if ( widgets.isEmpty() ) { if ( widgets.isEmpty() ) {
TQRect oldr = tqgeometry(); TQRect oldr = geometry();
mainContainer()->adjustSize(); mainContainer()->adjustSize();
resize( mainContainer()->size() ); resize( mainContainer()->size() );
// check whether our own size constraint hit us // check whether our own size constraint hit us
if ( size() != mainContainer()->size() ) if ( size() != mainContainer()->size() )
mainContainer()->resize( size() ); mainContainer()->resize( size() );
TQRect nr = tqgeometry(); TQRect nr = geometry();
if ( oldr != nr ) { if ( oldr != nr ) {
ResizeCommand *cmd = new ResizeCommand( i18n( "Adjust Size" ), this, this, oldr, nr ); ResizeCommand *cmd = new ResizeCommand( i18n( "Adjust Size" ), this, this, oldr, nr );
commandHistory()->addCommand( cmd ); commandHistory()->addCommand( cmd );
@ -1518,9 +1518,9 @@ void FormWindow::editAdjustSize()
for ( TQWidget* w = widgets.first(); w; w = widgets.next() ) { for ( TQWidget* w = widgets.first(); w; w = widgets.next() ) {
if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout )
continue; continue;
TQRect oldr = w->tqgeometry(); TQRect oldr = w->geometry();
w->adjustSize(); w->adjustSize();
TQRect nr = w->tqgeometry(); TQRect nr = w->geometry();
if ( oldr != nr ) if ( oldr != nr )
commands.append( new ResizeCommand( i18n("Adjust Size"), this, w, oldr, nr ) ); commands.append( new ResizeCommand( i18n("Adjust Size"), this, w, oldr, nr ) );
} }
@ -1759,7 +1759,7 @@ void FormWindow::currentToolChanged()
emitShowProperties( TQT_TQOBJECT(mainContainer()) ); emitShowProperties( TQT_TQOBJECT(mainContainer()) );
break; break;
default: default:
mainWindow()->statusMessage( i18n( "Click on the form to insert a %1..." ).tqarg( WidgetDatabase::toolTip( currTool ).lower() ) ); mainWindow()->statusMessage( i18n( "Click on the form to insert a %1..." ).arg( WidgetDatabase::toolTip( currTool ).lower() ) );
setCursorToAll( CrossCursor, this ); setCursorToAll( CrossCursor, this );
if ( mainWindow()->formWindow() == this ) if ( mainWindow()->formWindow() == this )
emitShowProperties( TQT_TQOBJECT(mainContainer()) ); emitShowProperties( TQT_TQOBJECT(mainContainer()) );
@ -1832,7 +1832,7 @@ bool FormWindow::checkCustomWidgets()
if ( !missingCustomWidgets.isEmpty() ) { if ( !missingCustomWidgets.isEmpty() ) {
TQString txt = i18n( "The following custom widgets are used in '%1',\n" TQString txt = i18n( "The following custom widgets are used in '%1',\n"
"but are not known to TQt Designer:\n" ).tqarg( name() ); "but are not known to TQt Designer:\n" ).arg( name() );
for ( TQStringList::Iterator sit = missingCustomWidgets.begin(); sit != missingCustomWidgets.end(); ++sit ) for ( TQStringList::Iterator sit = missingCustomWidgets.begin(); sit != missingCustomWidgets.end(); ++sit )
txt += " " + *sit + "\n"; txt += " " + *sit + "\n";
txt += i18n( "If you save this form and generate code for it using uic, \n" txt += i18n( "If you save this form and generate code for it using uic, \n"
@ -1935,7 +1935,7 @@ void FormWindow::checkAccels()
ok = FALSE; ok = FALSE;
switch ( TQMessageBox::information( mainWindow(), i18n( "Check Accelerators" ), switch ( TQMessageBox::information( mainWindow(), i18n( "Check Accelerators" ),
i18n( "Accelerator '%1' is used once.", "Accelerator '%1' is used %n times.", (*it).count() i18n( "Accelerator '%1' is used once.", "Accelerator '%1' is used %n times.", (*it).count()
).tqarg( it.key().upper() ), ).arg( it.key().upper() ),
i18n( "&Select" ), i18n( "&Select" ),
i18n( "&Cancel" ), TQString(), 2 ) ) { i18n( "&Cancel" ), TQString(), 2 ) ) {
case 0: // select case 0: // select

@ -654,7 +654,7 @@ void HierarchyList::removeTabPage()
QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw; QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw;
DeleteTabPageCommand *cmd = DeleteTabPageCommand *cmd =
new DeleteTabPageCommand( i18n( "Delete Page %1 of %2" ). new DeleteTabPageCommand( i18n( "Delete Page %1 of %2" ).
tqarg( dtw->pageTitle() ).tqarg( tw->name() ), arg( dtw->pageTitle() ).arg( tw->name() ),
formWindow, tw, tw->currentPage() ); formWindow, tw, tw->currentPage() );
formWindow->commandHistory()->addCommand( cmd ); formWindow->commandHistory()->addCommand( cmd );
cmd->execute(); cmd->execute();
@ -665,7 +665,7 @@ void HierarchyList::removeTabPage()
QDesignerWizard *dw = (QDesignerWizard*)wiz; QDesignerWizard *dw = (QDesignerWizard*)wiz;
DeleteWizardPageCommand *cmd = DeleteWizardPageCommand *cmd =
new DeleteWizardPageCommand( i18n( "Delete Page %1 of %2" ). new DeleteWizardPageCommand( i18n( "Delete Page %1 of %2" ).
tqarg( dw->pageTitle() ).tqarg( wiz->name() ), arg( dw->pageTitle() ).arg( wiz->name() ),
formWindow, wiz, formWindow, wiz,
wiz->indexOf( wiz->currentPage() ), TRUE ); wiz->indexOf( wiz->currentPage() ), TRUE );
formWindow->commandHistory()->addCommand( cmd ); formWindow->commandHistory()->addCommand( cmd );
@ -1102,11 +1102,11 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos )
if ( i->rtti() == HierarchyItem::Definition ) if ( i->rtti() == HierarchyItem::Definition )
i = i->parent(); i = i->parent();
ListEditor dia( this, 0, TRUE ); ListEditor dia( this, 0, TRUE );
dia.setCaption( i18n( "Edit %1" ).tqarg( i->text( 0 ) ) ); dia.setCaption( i18n( "Edit %1" ).arg( i->text( 0 ) ) );
TQStringList entries = lIface->definitionEntries( i->text( 0 ), MainWindow::self->designerInterface() ); TQStringList entries = lIface->definitionEntries( i->text( 0 ), MainWindow::self->designerInterface() );
dia.setList( entries ); dia.setList( entries );
dia.exec(); dia.exec();
Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).tqarg( i->text( 0 )), formWindow, Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).arg( i->text( 0 )), formWindow,
lIface, i->text( 0 ), dia.items() ); lIface, i->text( 0 ), dia.items() );
formWindow->commandHistory()->addCommand( cmd ); formWindow->commandHistory()->addCommand( cmd );
cmd->execute(); cmd->execute();
@ -1218,7 +1218,7 @@ void FormDefinitionView::save( TQListViewItem *p, TQListViewItem *i )
lst << i->text( 0 ); lst << i->text( 0 );
i = i->nextSibling(); i = i->nextSibling();
} }
Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).tqarg( p->text( 0 ) ), formWindow, Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).arg( p->text( 0 ) ), formWindow,
lIface, p->text( 0 ), lst ); lIface, p->text( 0 ), lst );
formWindow->commandHistory()->addCommand( cmd ); formWindow->commandHistory()->addCommand( cmd );
cmd->execute(); cmd->execute();

@ -129,7 +129,7 @@ void IconViewEditor::applyClicked()
items.append( item ); items.append( item );
} }
PopulateIconViewCommand *cmd = new PopulateIconViewCommand( i18n( "Edit the Items of '%1'" ).tqarg( iconview->name() ), PopulateIconViewCommand *cmd = new PopulateIconViewCommand( i18n( "Edit the Items of '%1'" ).arg( iconview->name() ),
formwindow, iconview, items ); formwindow, iconview, items );
cmd->execute(); cmd->execute();
formwindow->commandHistory()->addCommand( cmd ); formwindow->commandHistory()->addCommand( cmd );

@ -67,7 +67,7 @@ Layout::Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *l
widgets.setAutoDelete( FALSE ); widgets.setAutoDelete( FALSE );
layoutBase = lb; layoutBase = lb;
if ( !doSetup && layoutBase ) if ( !doSetup && layoutBase )
oldGeometry = layoutBase->tqgeometry(); oldGeometry = layoutBase->geometry();
} }
/*! The widget list we got in the constructor might contain too much /*! The widget list we got in the constructor might contain too much
@ -236,7 +236,7 @@ void Layout::breakLayout()
if ( !widgets.isEmpty() ) { if ( !widgets.isEmpty() ) {
TQWidget *w; TQWidget *w;
for ( w = widgets.first(); w; w = widgets.next() ) for ( w = widgets.first(); w; w = widgets.next() )
rects.insert( w, w->tqgeometry() ); rects.insert( w, w->geometry() );
} }
WidgetFactory::deleteLayout( layoutBase ); WidgetFactory::deleteLayout( layoutBase );
bool needReparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 || bool needReparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 ||
@ -318,7 +318,7 @@ void HorizontalLayout::doLayout()
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
if ( !useSplitter ) { if ( !useSplitter ) {
if ( qstrcmp( w->className(), "Spacer" ) == 0 ) if ( qstrcmp( w->className(), "Spacer" ) == 0 )
tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() ); tqlayout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
else else
tqlayout->addWidget( w ); tqlayout->addWidget( w );
if ( ::tqqt_cast<TQLayoutWidget*>(w) ) if ( ::tqqt_cast<TQLayoutWidget*>(w) )
@ -382,7 +382,7 @@ void VerticalLayout::doLayout()
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
if ( !useSplitter ) { if ( !useSplitter ) {
if ( qstrcmp( w->className(), "Spacer" ) == 0 ) if ( qstrcmp( w->className(), "Spacer" ) == 0 )
tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() ); tqlayout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
else else
tqlayout->addWidget( w ); tqlayout->addWidget( w );
if ( ::tqqt_cast<TQLayoutWidget*>(w) ) if ( ::tqqt_cast<TQLayoutWidget*>(w) )
@ -759,9 +759,9 @@ void GridLayout::doLayout()
if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
if ( rs * cs == 1 ) { if ( rs * cs == 1 ) {
tqlayout->addWidget( w, r, c, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->tqalignment() : 0 ); tqlayout->addWidget( w, r, c, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->alignment() : 0 );
} else { } else {
tqlayout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->tqalignment() : 0 ); tqlayout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->alignment() : 0 );
} }
if ( ::tqqt_cast<TQLayoutWidget*>(w) ) if ( ::tqqt_cast<TQLayoutWidget*>(w) )
( (TQLayoutWidget*)w )->updateSizePolicy(); ( (TQLayoutWidget*)w )->updateSizePolicy();
@ -798,7 +798,7 @@ void GridLayout::buildGrid()
int index = 0; int index = 0;
TQWidget* w = 0; TQWidget* w = 0;
for ( w = widgets.first(); w; w = widgets.next() ) { for ( w = widgets.first(); w; w = widgets.next() ) {
TQRect widgetPos = w->tqgeometry(); TQRect widgetPos = w->geometry();
x[index] = widgetPos.left(); x[index] = widgetPos.left();
x[index+1] = widgetPos.right(); x[index+1] = widgetPos.right();
y[index] = widgetPos.top(); y[index] = widgetPos.top();
@ -837,7 +837,7 @@ void GridLayout::buildGrid()
// Mark the cells in the grid that contains a widget // Mark the cells in the grid that contains a widget
for ( w = widgets.first(); w; w = widgets.next() ) { for ( w = widgets.first(); w; w = widgets.next() ) {
TQRect c(0,0,0,0), widgetPos = w->tqgeometry(); TQRect c(0,0,0,0), widgetPos = w->geometry();
// From left til right (not including) // From left til right (not including)
for (uint cw=0; cw<x.size(); cw++) { for (uint cw=0; cw<x.size(); cw++) {
if ( x[cw] == widgetPos.left() ) if ( x[cw] == widgetPos.left() )
@ -947,7 +947,7 @@ Spacer::SizeType Spacer::sizeType() const
return (SizeType)sizePolicy().horData(); return (SizeType)sizePolicy().horData();
} }
int Spacer::tqalignment() const int Spacer::alignment() const
{ {
if ( orient ==Qt::Vertical ) if ( orient ==Qt::Vertical )
return AlignHCenter; return AlignHCenter;

@ -126,7 +126,7 @@ class Spacer : public TQWidget
Q_ENUMS( SizeType ) Q_ENUMS( SizeType )
TQ_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType ) TQ_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType )
TQ_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true ) TQ_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true )
TQ_OVERRIDE( TQRect tqgeometry DESIGNABLE false ) TQ_OVERRIDE( TQRect geometry DESIGNABLE false )
private: private:
enum { HSize = 6, HMask = 0x3f, VMask = HMask << HSize, enum { HSize = 6, HMask = 0x3f, VMask = HMask << HSize,
@ -146,7 +146,7 @@ public:
TQSize sizeHint() const; TQSize sizeHint() const;
void setSizeType( SizeType t ); void setSizeType( SizeType t );
SizeType sizeType() const; SizeType sizeType() const;
int tqalignment() const; int alignment() const;
Qt::Orientation orientation() const; Qt::Orientation orientation() const;
void setOrientation( Qt::Orientation o ); void setOrientation( Qt::Orientation o );
void setInteraciveMode( bool b ) { interactive = b; }; void setInteraciveMode( bool b ) { interactive = b; };

@ -161,7 +161,7 @@ void ListBoxEditor::applyClicked()
items.append( item ); items.append( item );
} }
PopulateListBoxCommand *cmd = new PopulateListBoxCommand( i18n( "Edit the Items of '%1'" ).tqarg( listbox->name() ), PopulateListBoxCommand *cmd = new PopulateListBoxCommand( i18n( "Edit the Items of '%1'" ).arg( listbox->name() ),
formwindow, listbox, items ); formwindow, listbox, items );
cmd->execute(); cmd->execute();
formwindow->commandHistory()->addCommand( cmd ); formwindow->commandHistory()->addCommand( cmd );

@ -142,12 +142,12 @@ int ListViewDnd::buildFlatList( ListViewItemList & list )
if ( (*it)->isSelected() ) { if ( (*it)->isSelected() ) {
if ( (*it)->childCount() == 0 ) { if ( (*it)->childCount() == 0 ) {
// Selected, no tqchildren // Selected, no children
list.append( *it ); list.append( *it );
} else if ( !addKids ) { } else if ( !addKids ) {
// Children processing not set, so set it // Children processing not set, so set it
// Also find the item were we shall quit // Also find the item were we shall quit
// processing tqchildren...if any such item // processing children...if any such item
addKids = TRUE; addKids = TRUE;
nextSibling = (*it)->nextSibling(); nextSibling = (*it)->nextSibling();
nextParent = (*it)->parent(); nextParent = (*it)->parent();
@ -157,7 +157,7 @@ int ListViewDnd::buildFlatList( ListViewItemList & list )
} }
} }
} else if ( ((*it)->childCount() == 0) && addKids ) { } else if ( ((*it)->childCount() == 0) && addKids ) {
// Leaf node, and we _do_ process tqchildren // Leaf node, and we _do_ process children
list.append( *it ); list.append( *it );
} }
} }

@ -127,7 +127,7 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw
void ListViewEditor::applyClicked() void ListViewEditor::applyClicked()
{ {
setupItems(); setupItems();
PopulateListViewCommand *cmd = new PopulateListViewCommand( i18n( "Edit the Items and Columns of '%1'" ).tqarg( listview->name() ), PopulateListViewCommand *cmd = new PopulateListViewCommand( i18n( "Edit the Items and Columns of '%1'" ).arg( listview->name() ),
formwindow, listview, itemsPreview ); formwindow, listview, itemsPreview );
cmd->execute(); cmd->execute();
formwindow->commandHistory()->addCommand( cmd ); formwindow->commandHistory()->addCommand( cmd );

@ -1484,11 +1484,11 @@ void MainWindow::updateUndoRedo( bool undoAvailable, bool redoAvailable,
actionEditUndo->setEnabled( undoAvailable ); actionEditUndo->setEnabled( undoAvailable );
actionEditRedo->setEnabled( redoAvailable ); actionEditRedo->setEnabled( redoAvailable );
if ( !undoCmd.isEmpty() ) if ( !undoCmd.isEmpty() )
actionEditUndo->setMenuText( i18n( "&Undo: %1" ).tqarg( undoCmd ) ); actionEditUndo->setMenuText( i18n( "&Undo: %1" ).arg( undoCmd ) );
else else
actionEditUndo->setMenuText( i18n( "&Undo: Not Available" ) ); actionEditUndo->setMenuText( i18n( "&Undo: Not Available" ) );
if ( !redoCmd.isEmpty() ) if ( !redoCmd.isEmpty() )
actionEditRedo->setMenuText( i18n( "&Redo: %1" ).tqarg( redoCmd ) ); actionEditRedo->setMenuText( i18n( "&Redo: %1" ).arg( redoCmd ) );
else else
actionEditRedo->setMenuText( i18n( "&Redo: Not Available" ) ); actionEditRedo->setMenuText( i18n( "&Redo: Not Available" ) );
@ -1721,7 +1721,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid
bool ok = FALSE; bool ok = FALSE;
bool oldDoWrap = FALSE; bool oldDoWrap = FALSE;
if ( ::tqqt_cast<TQLabel*>(w) ) { if ( ::tqqt_cast<TQLabel*>(w) ) {
int align = w->property( "tqalignment" ).toInt(); int align = w->property( "alignment" ).toInt();
if ( align & WordBreak ) if ( align & WordBreak )
oldDoWrap = TRUE; oldDoWrap = TRUE;
} }
@ -1737,7 +1737,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid
} }
if ( ok ) { if ( ok ) {
if ( oldDoWrap != doWrap ) { if ( oldDoWrap != doWrap ) {
TQString pn( i18n( "Set 'wordwrap' of '%1'" ).tqarg( w->name() ) ); TQString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) );
SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
"wordwrap", TQVariant( oldDoWrap, 0 ), "wordwrap", TQVariant( oldDoWrap, 0 ),
TQVariant( doWrap, 0 ), TQString(), TQString() ); TQVariant( doWrap, 0 ), TQString(), TQString() );
@ -1746,7 +1746,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid
MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "wordwrap", TRUE ); MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "wordwrap", TRUE );
} }
TQString pn( i18n( "Set the 'text' of '%1'" ).tqarg( w->name() ) ); TQString pn( i18n( "Set the 'text' of '%1'" ).arg( w->name() ) );
SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
"text", w->property( "text" ), "text", w->property( "text" ),
text, TQString(), TQString() ); text, TQString(), TQString() );
@ -1759,7 +1759,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid
TQString title = TQInputDialog::getText( i18n("Title"), i18n( "New title" ), TQString title = TQInputDialog::getText( i18n("Title"), i18n( "New title" ),
TQLineEdit::Normal, w->property("title").toString(), &ok, this ); TQLineEdit::Normal, w->property("title").toString(), &ok, this );
if ( ok ) { if ( ok ) {
TQString pn( i18n( "Set the 'title' of '%2'" ).tqarg( w->name() ) ); TQString pn( i18n( "Set the 'title' of '%2'" ).arg( w->name() ) );
SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
"title", w->property( "title" ), "title", w->property( "title" ),
title, TQString(), TQString() ); title, TQString(), TQString() );
@ -1772,7 +1772,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid
TQString text = TQInputDialog::getText( i18n("Page Title"), i18n( "New page title" ), TQString text = TQInputDialog::getText( i18n("Page Title"), i18n( "New page title" ),
TQLineEdit::Normal, w->property("pageTitle").toString(), &ok, this ); TQLineEdit::Normal, w->property("pageTitle").toString(), &ok, this );
if ( ok ) { if ( ok ) {
TQString pn( i18n( "Set the 'pageTitle' of '%2'" ).tqarg( w->name() ) ); TQString pn( i18n( "Set the 'pageTitle' of '%2'" ).arg( w->name() ) );
SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
"pageTitle", "pageTitle",
w->property( "pageTitle" ), w->property( "pageTitle" ),
@ -1785,7 +1785,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid
TQPixmap oldPix = TQVariant(w->property( "pixmap" )).toPixmap(); TQPixmap oldPix = TQVariant(w->property( "pixmap" )).toPixmap();
TQPixmap pix = qChoosePixmap( this, formWindow(), oldPix ); TQPixmap pix = qChoosePixmap( this, formWindow(), oldPix );
if ( !pix.isNull() ) { if ( !pix.isNull() ) {
TQString pn( i18n( "Set the 'pixmap' of '%2'" ).tqarg( w->name() ) ); TQString pn( i18n( "Set the 'pixmap' of '%2'" ).arg( w->name() ) );
SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
"pixmap", w->property( "pixmap" ), "pixmap", w->property( "pixmap" ),
pix, TQString(), TQString() ); pix, TQString(), TQString() );
@ -1802,7 +1802,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
TQTabWidget *tw = (TQTabWidget*)w; TQTabWidget *tw = (TQTabWidget*)w;
if ( id == commands[ "add" ] ) { if ( id == commands[ "add" ] ) {
AddTabPageCommand *cmd = AddTabPageCommand *cmd =
new AddTabPageCommand( i18n( "Add Page to %1" ).tqarg( tw->name() ), formWindow(), new AddTabPageCommand( i18n( "Add Page to %1" ).arg( tw->name() ), formWindow(),
tw, "Tab" ); tw, "Tab" );
formWindow()->commandHistory()->addCommand( cmd ); formWindow()->commandHistory()->addCommand( cmd );
cmd->execute(); cmd->execute();
@ -1811,7 +1811,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw; QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw;
DeleteTabPageCommand *cmd = DeleteTabPageCommand *cmd =
new DeleteTabPageCommand( i18n( "Delete Page %1 of %2" ). new DeleteTabPageCommand( i18n( "Delete Page %1 of %2" ).
tqarg( dtw->pageTitle() ).tqarg( tw->name() ), arg( dtw->pageTitle() ).arg( tw->name() ),
formWindow(), tw, tw->currentPage() ); formWindow(), tw, tw->currentPage() );
formWindow()->commandHistory()->addCommand( cmd ); formWindow()->commandHistory()->addCommand( cmd );
cmd->execute(); cmd->execute();
@ -1821,7 +1821,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
TQToolBox *tb = (TQToolBox*)w; TQToolBox *tb = (TQToolBox*)w;
if ( id == commands[ "add" ] ) { if ( id == commands[ "add" ] ) {
AddToolBoxPageCommand *cmd = AddToolBoxPageCommand *cmd =
new AddToolBoxPageCommand( i18n( "Add Page to %1" ).tqarg( tb->name() ), new AddToolBoxPageCommand( i18n( "Add Page to %1" ).arg( tb->name() ),
formWindow(), formWindow(),
tb, "Page" ); tb, "Page" );
formWindow()->commandHistory()->addCommand( cmd ); formWindow()->commandHistory()->addCommand( cmd );
@ -1841,7 +1841,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
QDesignerWidgetStack *ws = (QDesignerWidgetStack*)w; QDesignerWidgetStack *ws = (QDesignerWidgetStack*)w;
if ( id == commands[ "add" ] ) { if ( id == commands[ "add" ] ) {
AddWidgetStackPageCommand *cmd = AddWidgetStackPageCommand *cmd =
new AddWidgetStackPageCommand( i18n( "Add Page to %1" ).tqarg( ws->name() ), new AddWidgetStackPageCommand( i18n( "Add Page to %1" ).arg( ws->name() ),
formWindow(), ws ); formWindow(), ws );
formWindow()->commandHistory()->addCommand( cmd ); formWindow()->commandHistory()->addCommand( cmd );
cmd->execute(); cmd->execute();
@ -1849,14 +1849,14 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
if ( ws->visibleWidget() ) { if ( ws->visibleWidget() ) {
DeleteWidgetStackPageCommand *cmd = DeleteWidgetStackPageCommand *cmd =
new DeleteWidgetStackPageCommand( i18n( "Delete Page %1 of %2" ). new DeleteWidgetStackPageCommand( i18n( "Delete Page %1 of %2" ).
tqarg( ws->currentPage() ).tqarg( ws->name() ), arg( ws->currentPage() ).arg( ws->name() ),
formWindow(), ws, ws->visibleWidget() ); formWindow(), ws, ws->visibleWidget() );
formWindow()->commandHistory()->addCommand( cmd ); formWindow()->commandHistory()->addCommand( cmd );
cmd->execute(); cmd->execute();
} }
} else if ( id == commands[ "nextpage" ] ) { } else if ( id == commands[ "nextpage" ] ) {
int currentPage = w->property( "currentPage" ).toInt(); int currentPage = w->property( "currentPage" ).toInt();
TQString pn( i18n( "Raise next page of '%2'" ).tqarg( w->name() ) ); TQString pn( i18n( "Raise next page of '%2'" ).arg( w->name() ) );
SetPropertyCommand *cmd = SetPropertyCommand *cmd =
new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
"currentPage", currentPage, "currentPage", currentPage,
@ -1866,7 +1866,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "currentPage", TRUE ); MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "currentPage", TRUE );
} else if ( id == commands[ "prevpage" ] ) { } else if ( id == commands[ "prevpage" ] ) {
int currentPage = w->property( "currentPage" ).toInt(); int currentPage = w->property( "currentPage" ).toInt();
TQString pn( i18n( "Raise previous page of '%2'" ).tqarg( w->name() ) ); TQString pn( i18n( "Raise previous page of '%2'" ).arg( w->name() ) );
SetPropertyCommand *cmd = SetPropertyCommand *cmd =
new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
"currentPage", currentPage, "currentPage", currentPage,
@ -1881,7 +1881,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) { idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) {
if ( id == commands[ "add" ] ) { if ( id == commands[ "add" ] ) {
AddContainerPageCommand *cmd = AddContainerPageCommand *cmd =
new AddContainerPageCommand( i18n( "Add Page to %1" ).tqarg( w->name() ), new AddContainerPageCommand( i18n( "Add Page to %1" ).arg( w->name() ),
formWindow(), w, "Page" ); formWindow(), w, "Page" );
formWindow()->commandHistory()->addCommand( cmd ); formWindow()->commandHistory()->addCommand( cmd );
cmd->execute(); cmd->execute();
@ -1892,7 +1892,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
int index = iface->currentIndex( wClassName, w ); int index = iface->currentIndex( wClassName, w );
DeleteContainerPageCommand *cmd = DeleteContainerPageCommand *cmd =
new DeleteContainerPageCommand( i18n( "Delete Page %1 of %2" ). new DeleteContainerPageCommand( i18n( "Delete Page %1 of %2" ).
tqarg( iface->pageLabel( wClassName, arg( iface->pageLabel( wClassName,
w, index ) ). w, index ) ).
arg( w->name() ), arg( w->name() ),
formWindow(), w, index ); formWindow(), w, index );
@ -1942,7 +1942,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
TQWizard *wiz = (TQWizard*)fw->mainContainer(); TQWizard *wiz = (TQWizard*)fw->mainContainer();
if ( id == commands[ "add" ] ) { if ( id == commands[ "add" ] ) {
AddWizardPageCommand *cmd = AddWizardPageCommand *cmd =
new AddWizardPageCommand( i18n( "Add Page to %1" ).tqarg( wiz->name() ), new AddWizardPageCommand( i18n( "Add Page to %1" ).arg( wiz->name() ),
formWindow(), wiz, "WizardPage" ); formWindow(), wiz, "WizardPage" );
formWindow()->commandHistory()->addCommand( cmd ); formWindow()->commandHistory()->addCommand( cmd );
cmd->execute(); cmd->execute();
@ -1951,7 +1951,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
QDesignerWizard *dw = (QDesignerWizard*)wiz; QDesignerWizard *dw = (QDesignerWizard*)wiz;
DeleteWizardPageCommand *cmd = DeleteWizardPageCommand *cmd =
new DeleteWizardPageCommand( i18n( "Delete Page %1 of %2" ). new DeleteWizardPageCommand( i18n( "Delete Page %1 of %2" ).
tqarg( dw->pageTitle() ).tqarg( wiz->name() ), arg( dw->pageTitle() ).arg( wiz->name() ),
formWindow(), wiz, formWindow(), wiz,
wiz->indexOf( wiz->currentPage() ) ); wiz->indexOf( wiz->currentPage() ) );
formWindow()->commandHistory()->addCommand( cmd ); formWindow()->commandHistory()->addCommand( cmd );
@ -1968,7 +1968,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
TQString text = TQInputDialog::getText( i18n("Page Title"), i18n( "New page title" ), TQString text = TQInputDialog::getText( i18n("Page Title"), i18n( "New page title" ),
TQLineEdit::Normal, dw->pageTitle(), &ok, this ); TQLineEdit::Normal, dw->pageTitle(), &ok, this );
if ( ok ) { if ( ok ) {
TQString pn( i18n( "Rename page %1 of %2" ).tqarg( dw->pageTitle() ).tqarg( wiz->name() ) ); TQString pn( i18n( "Rename page %1 of %2" ).arg( dw->pageTitle() ).arg( wiz->name() ) );
RenameWizardPageCommand *cmd = RenameWizardPageCommand *cmd =
new RenameWizardPageCommand( pn, formWindow() new RenameWizardPageCommand( pn, formWindow()
, wiz, wiz->indexOf( wiz->currentPage() ), text ); , wiz, wiz->indexOf( wiz->currentPage() ), text );
@ -1980,13 +1980,13 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
TQMainWindow *mw = (TQMainWindow*)fw->mainContainer(); TQMainWindow *mw = (TQMainWindow*)fw->mainContainer();
if ( id == commands[ "add_toolbar" ] ) { if ( id == commands[ "add_toolbar" ] ) {
AddToolBarCommand *cmd = AddToolBarCommand *cmd =
new AddToolBarCommand( i18n( "Add Toolbar to '%1'" ).tqarg( formWindow()->name() ), new AddToolBarCommand( i18n( "Add Toolbar to '%1'" ).arg( formWindow()->name() ),
formWindow(), mw ); formWindow(), mw );
formWindow()->commandHistory()->addCommand( cmd ); formWindow()->commandHistory()->addCommand( cmd );
cmd->execute(); cmd->execute();
} else if ( id == commands[ "add_menu_item" ] ) { } else if ( id == commands[ "add_menu_item" ] ) {
AddMenuCommand *cmd = AddMenuCommand *cmd =
new AddMenuCommand( i18n( "Add Menu to '%1'" ).tqarg( formWindow()->name() ), new AddMenuCommand( i18n( "Add Menu to '%1'" ).arg( formWindow()->name() ),
formWindow(), mw ); formWindow(), mw );
formWindow()->commandHistory()->addCommand( cmd ); formWindow()->commandHistory()->addCommand( cmd );
cmd->execute(); cmd->execute();
@ -2333,7 +2333,7 @@ void MainWindow::readConfig()
r.setWidth( config.readNumEntry( keybase + "Geometries/MainwindowWidth", r.width() ) ); r.setWidth( config.readNumEntry( keybase + "Geometries/MainwindowWidth", r.width() ) );
r.setHeight( config.readNumEntry( keybase + "Geometries/MainwindowHeight", r.height() ) ); r.setHeight( config.readNumEntry( keybase + "Geometries/MainwindowHeight", r.height() ) );
TQRect desk = TQApplication::desktop()->tqgeometry(); TQRect desk = TQApplication::desktop()->geometry();
TQRect inter = desk.intersect( r ); TQRect inter = desk.intersect( r );
resize( r.size() ); resize( r.size() );
if ( inter.width() * inter.height() > ( r.width() * r.height() / 20 ) ) { if ( inter.width() * inter.height() > ( r.width() * r.height() / 20 ) ) {
@ -2513,7 +2513,7 @@ void MainWindow::closeEvent( TQCloseEvent *e )
++it; ++it;
if ( pro->isModified() ) { if ( pro->isModified() ) {
switch ( TQMessageBox::warning( this, i18n( "Save Project Settings" ), switch ( TQMessageBox::warning( this, i18n( "Save Project Settings" ),
i18n( "Save changes to '%1'?" ).tqarg( pro->fileName() ), i18n( "Save changes to '%1'?" ).arg( pro->fileName() ),
i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) { i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) {
case 0: // save case 0: // save
pro->save(); pro->save();
@ -2610,7 +2610,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f )
} }
if ( WidgetFactory::hasSpecialEditor( WidgetDatabase:: if ( WidgetFactory::hasSpecialEditor( WidgetDatabase::
idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), TQT_TQOBJECT(w) ) ) { idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), TQT_TQOBJECT(w) ) ) {
statusMessage( i18n( "Edit %1..." ).tqarg( w->className() ) ); statusMessage( i18n( "Edit %1..." ).arg( w->className() ) );
WidgetFactory::editWidget( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), WidgetFactory::editWidget( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ),
this, w, formWindow() ); this, w, formWindow() );
statusBar()->clear(); statusBar()->clear();
@ -2623,7 +2623,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f )
bool ok = FALSE; bool ok = FALSE;
bool oldDoWrap = FALSE; bool oldDoWrap = FALSE;
if ( ::tqqt_cast<TQLabel*>(w) ) { if ( ::tqqt_cast<TQLabel*>(w) ) {
int align = w->property( "tqalignment" ).toInt(); int align = w->property( "alignment" ).toInt();
if ( align & WordBreak ) if ( align & WordBreak )
oldDoWrap = TRUE; oldDoWrap = TRUE;
} }
@ -2640,7 +2640,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f )
} }
if ( ok ) { if ( ok ) {
if ( oldDoWrap != doWrap ) { if ( oldDoWrap != doWrap ) {
TQString pn( i18n( "Set 'wordwrap' of '%1'" ).tqarg( w->name() ) ); TQString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) );
SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
"wordwrap", TQVariant( oldDoWrap, 0 ), "wordwrap", TQVariant( oldDoWrap, 0 ),
TQVariant( doWrap, 0 ), TQString(), TQString() ); TQVariant( doWrap, 0 ), TQString(), TQString() );
@ -2649,7 +2649,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f )
MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "wordwrap", TRUE ); MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "wordwrap", TRUE );
} }
TQString pn( i18n( "Set the 'text' of '%1'" ).tqarg( w->name() ) ); TQString pn( i18n( "Set the 'text' of '%1'" ).arg( w->name() ) );
SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
"text", w->property( "text" ), "text", w->property( "text" ),
text, TQString(), TQString() ); text, TQString(), TQString() );
@ -2664,7 +2664,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f )
TQString text; TQString text;
text = TQInputDialog::getText( i18n("Title"), i18n( "New title" ), TQLineEdit::Normal, w->property("title").toString(), &ok, this ); text = TQInputDialog::getText( i18n("Title"), i18n( "New title" ), TQLineEdit::Normal, w->property("title").toString(), &ok, this );
if ( ok ) { if ( ok ) {
TQString pn( i18n( "Set the 'title' of '%2'" ).tqarg( w->name() ) ); TQString pn( i18n( "Set the 'title' of '%2'" ).arg( w->name() ) );
SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
"title", w->property( "title" ), "title", w->property( "title" ),
text, TQString(), TQString() ); text, TQString(), TQString() );
@ -2706,12 +2706,12 @@ void MainWindow::rebuildCustomWidgetGUI()
a->setToggleAction( TRUE ); a->setToggleAction( TRUE );
a->setText( w->className ); a->setText( w->className );
a->setIconSet( *w->pixmap ); a->setIconSet( *w->pixmap );
a->setStatusTip( i18n( "Insert a %1 (custom widget)" ).tqarg( w->className ) ); a->setStatusTip( i18n( "Insert a %1 (custom widget)" ).arg( w->className ) );
a->setWhatsThis( i18n("<b>%1 (custom widget)</b>" a->setWhatsThis( i18n("<b>%1 (custom widget)</b>"
"<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> menu to " "<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> menu to "
"add and change custom widgets. You can add properties as well as " "add and change custom widgets. You can add properties as well as "
"signals and slots to integrate them into TQt Designer, " "signals and slots to integrate them into TQt Designer, "
"and provide a pixmap which will be used to represent the widget on the form.</p>").tqarg( w->className ) ); "and provide a pixmap which will be used to represent the widget on the form.</p>").arg( w->className ) );
a->addTo( customWidgetToolBar ); a->addTo( customWidgetToolBar );
a->addTo( customWidgetToolBar2 ); a->addTo( customWidgetToolBar2 );
@ -2967,7 +2967,7 @@ void MainWindow::editFunction( const TQString &func, bool rereadSource )
if ( !MetaDataBase::hasEditor( lang ) ) { if ( !MetaDataBase::hasEditor( lang ) ) {
TQMessageBox::information( this, i18n( "Edit Source" ), TQMessageBox::information( this, i18n( "Edit Source" ),
i18n( "There is no plugin for editing %1 code installed.\n" i18n( "There is no plugin for editing %1 code installed.\n"
"Note: Plugins are not available in static TQt configurations." ).tqarg( lang ) ); "Note: Plugins are not available in static TQt configurations." ).arg( lang ) );
return; return;
} }

@ -225,7 +225,7 @@ void MainWindow::setupEditActions()
/* TQToolBar *tb = new TQToolBar( this, "Edit" ); /* TQToolBar *tb = new TQToolBar( this, "Edit" );
tb->setCloseMode( TQDockWindow::Undocked ); tb->setCloseMode( TQDockWindow::Undocked );
TQWhatsThis::add( tb, i18n( "<b>The Edit toolbar</b>%1").tqarg(i18n(toolbarHelp).tqarg("")) ); TQWhatsThis::add( tb, i18n( "<b>The Edit toolbar</b>%1").arg(i18n(toolbarHelp).arg("")) );
addToolBar( tb, i18n( "Edit" ) ); addToolBar( tb, i18n( "Edit" ) );
actionEditUndo->addTo( tb ); actionEditUndo->addTo( tb );
actionEditRedo->addTo( tb ); actionEditRedo->addTo( tb );
@ -376,23 +376,23 @@ void MainWindow::setupLayoutActions()
actionInsertSpacer = new WidgetAction( i18n( "Layout" ), actionGroupTools, TQString::number( id ).latin1() ); actionInsertSpacer = new WidgetAction( i18n( "Layout" ), actionGroupTools, TQString::number( id ).latin1() );
actionInsertSpacer->setToggleAction( TRUE ); actionInsertSpacer->setToggleAction( TRUE );
actionInsertSpacer->setText( WidgetDatabase::className( id ) ); actionInsertSpacer->setText( WidgetDatabase::className( id ) );
actionInsertSpacer->setMenuText( i18n( "Add %1").tqarg( WidgetDatabase::className( id ) ) ); actionInsertSpacer->setMenuText( i18n( "Add %1").arg( WidgetDatabase::className( id ) ) );
actionInsertSpacer->setIconSet( WidgetDatabase::iconSet( id ) ); actionInsertSpacer->setIconSet( WidgetDatabase::iconSet( id ) );
actionInsertSpacer->setToolTip( WidgetDatabase::toolTip( id ) ); actionInsertSpacer->setToolTip( WidgetDatabase::toolTip( id ) );
actionInsertSpacer->setStatusTip( i18n( "Insert a %1").tqarg(WidgetDatabase::toolTip( id )) ); actionInsertSpacer->setStatusTip( i18n( "Insert a %1").arg(WidgetDatabase::toolTip( id )) );
actionInsertSpacer->setWhatsThis( i18n("<b>A %1</b><p>%2</p>" actionInsertSpacer->setWhatsThis( i18n("<b>A %1</b><p>%2</p>"
"<p>Click to insert a single %3," "<p>Click to insert a single %3,"
"or double click to keep the tool selected.") "or double click to keep the tool selected.")
.tqarg(WidgetDatabase::toolTip( id )) .arg(WidgetDatabase::toolTip( id ))
.tqarg(WidgetDatabase::whatsThis( id )) .arg(WidgetDatabase::whatsThis( id ))
.tqarg(WidgetDatabase::toolTip( id ) )); .arg(WidgetDatabase::toolTip( id ) ));
actionInsertSpacer->addTo( commonWidgetsToolBar ); actionInsertSpacer->addTo( commonWidgetsToolBar );
commonWidgetsPage.append( actionInsertSpacer ); commonWidgetsPage.append( actionInsertSpacer );
TQWidget *w; TQWidget *w;
commonWidgetsToolBar->setStretchableWidget( ( w = new TQWidget( commonWidgetsToolBar ) ) ); commonWidgetsToolBar->setStretchableWidget( ( w = new TQWidget( commonWidgetsToolBar ) ) );
w->setBackgroundMode( commonWidgetsToolBar->backgroundMode() ); w->setBackgroundMode( commonWidgetsToolBar->backgroundMode() );
TQWhatsThis::add( layoutToolBar, i18n( "<b>The Layout toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("")) ); TQWhatsThis::add( layoutToolBar, i18n( "<b>The Layout toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("")) );
actionEditAdjustSize->addTo( layoutToolBar ); actionEditAdjustSize->addTo( layoutToolBar );
layoutToolBar->addSeparator(); layoutToolBar->addSeparator();
actionEditHLayout->addTo( layoutToolBar ); actionEditHLayout->addTo( layoutToolBar );
@ -461,7 +461,7 @@ void MainWindow::setupToolActions()
TQToolBar *tb = new TQToolBar( this, "Tools" ); TQToolBar *tb = new TQToolBar( this, "Tools" );
tb->setCloseMode( TQDockWindow::Undocked ); tb->setCloseMode( TQDockWindow::Undocked );
toolsToolBar = tb; toolsToolBar = tb;
TQWhatsThis::add( tb, i18n( "<b>The Tools toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("")) ); TQWhatsThis::add( tb, i18n( "<b>The Tools toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("")) );
addToolBar( tb, i18n( "Tools" ), TQMainWindow::DockTop, FALSE ); addToolBar( tb, i18n( "Tools" ), TQMainWindow::DockTop, FALSE );
actionPointerTool->addTo( tb ); actionPointerTool->addTo( tb );
@ -505,13 +505,13 @@ void MainWindow::setupToolActions()
widgetToolBars.append( tb ); widgetToolBars.append( tb );
bool plural = grp[(int)grp.length()-1] == 's'; bool plural = grp[(int)grp.length()-1] == 's';
if ( plural ) { if ( plural ) {
TQWhatsThis::add( tb, i18n( "<b>The %1</b>%2" ).tqarg(grp).tqarg(i18n(toolbarHelp). TQWhatsThis::add( tb, i18n( "<b>The %1</b>%2" ).arg(grp).arg(i18n(toolbarHelp).
tqarg( i18n(" Click on a button to insert a single widget, " arg( i18n(" Click on a button to insert a single widget, "
"or double click to insert multiple %1.") ).tqarg(grp)) ); "or double click to insert multiple %1.") ).arg(grp)) );
} else { } else {
TQWhatsThis::add( tb, i18n( "<b>The %1 Widgets</b>%2" ).tqarg(grp).tqarg(i18n(toolbarHelp). TQWhatsThis::add( tb, i18n( "<b>The %1 Widgets</b>%2" ).arg(grp).arg(i18n(toolbarHelp).
tqarg( i18n(" Click on a button to insert a single %1 widget, " arg( i18n(" Click on a button to insert a single %1 widget, "
"or double click to insert multiple widgets.") ).tqarg(grp)) ); "or double click to insert multiple widgets.") ).arg(grp)) );
} }
addToolBar( tb, grp ); addToolBar( tb, grp );
tb->hide(); tb->hide();
@ -552,11 +552,11 @@ void MainWindow::setupToolActions()
a->setToolTip( ttip ); a->setToolTip( ttip );
if ( !WidgetDatabase::isWhatsThisLoaded() ) if ( !WidgetDatabase::isWhatsThisLoaded() )
WidgetDatabase::loadWhatsThis( documentationPath() ); WidgetDatabase::loadWhatsThis( documentationPath() );
a->setStatusTip( i18n( "Insert a %1").tqarg(WidgetDatabase::className( i )) ); a->setStatusTip( i18n( "Insert a %1").arg(WidgetDatabase::className( i )) );
TQString whats = i18n("<b>A %1</b>").tqarg( WidgetDatabase::className( i ) ); TQString whats = i18n("<b>A %1</b>").arg( WidgetDatabase::className( i ) );
if ( !WidgetDatabase::whatsThis( i ).isEmpty() ) if ( !WidgetDatabase::whatsThis( i ).isEmpty() )
whats += TQString("<p>%1</p>").tqarg(WidgetDatabase::whatsThis( i )); whats += TQString("<p>%1</p>").arg(WidgetDatabase::whatsThis( i ));
a->setWhatsThis( whats+ i18n("<p>Double click on this tool to keep it selected.</p>") ); a->setWhatsThis( whats+ i18n("<p>Double click on this tool to keep it selected.</p>") );
if ( grp != "KDE" ) if ( grp != "KDE" )
@ -617,7 +617,7 @@ void MainWindow::setupFileActions()
tb->setCloseMode( TQDockWindow::Undocked ); tb->setCloseMode( TQDockWindow::Undocked );
projectToolBar = tb; projectToolBar = tb;
TQWhatsThis::add( tb, i18n( "<b>The File toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("")) ); TQWhatsThis::add( tb, i18n( "<b>The File toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("")) );
addToolBar( tb, i18n( "File" ) ); addToolBar( tb, i18n( "File" ) );
fileMenu = new TQPopupMenu( this, "File" ); fileMenu = new TQPopupMenu( this, "File" );
menubar->insertItem( i18n( "&File" ), fileMenu ); menubar->insertItem( i18n( "&File" ), fileMenu );
@ -883,12 +883,12 @@ void MainWindow::setupPreviewActions()
else if ( *it == "MotifPlus" ) else if ( *it == "MotifPlus" )
info = i18n( "The preview will use the advanced Motif look and feel used by the GIMP toolkit (GTK) on Linux." ); info = i18n( "The preview will use the advanced Motif look and feel used by the GIMP toolkit (GTK) on Linux." );
a = new DesignerAction( i18n( "Preview Form in %1 Style" ).tqarg( *it ), TQPixmap(), a = new DesignerAction( i18n( "Preview Form in %1 Style" ).arg( *it ), TQPixmap(),
i18n( "... in %1 Style" ).tqarg( *it ), 0, TQT_TQOBJECT(this), 0 ); i18n( "... in %1 Style" ).arg( *it ), 0, TQT_TQOBJECT(this), 0 );
a->setStatusTip( i18n("Opens a preview in %1 style").tqarg( *it ) ); a->setStatusTip( i18n("Opens a preview in %1 style").arg( *it ) );
a->setWhatsThis( i18n("<b>Open a preview in %1 style.</b>" a->setWhatsThis( i18n("<b>Open a preview in %1 style.</b>"
"<p>Use the preview to test the design and " "<p>Use the preview to test the design and "
"signal-slot connections of the current form. %2</p>").tqarg( *it ).tqarg( info ) ); "signal-slot connections of the current form. %2</p>").arg( *it ).arg( info ) );
mapper->setMapping( a, *it ); mapper->setMapping( a, *it );
connect( a, TQT_SIGNAL(activated()), mapper, TQT_SLOT(map()) ); connect( a, TQT_SIGNAL(activated()), mapper, TQT_SLOT(map()) );
connect( this, TQT_SIGNAL( hasActiveForm(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); connect( this, TQT_SIGNAL( hasActiveForm(bool) ), a, TQT_SLOT( setEnabled(bool) ) );
@ -965,7 +965,7 @@ void MainWindow::setupWindowActions()
j++; j++;
TQString itemText; TQString itemText;
if ( j < 10 ) if ( j < 10 )
itemText = TQString("&%1 ").tqarg( j ); itemText = TQString("&%1 ").arg( j );
if ( ::tqqt_cast<FormWindow*>(w) ) if ( ::tqqt_cast<FormWindow*>(w) )
itemText += w->name(); itemText += w->name();
else else
@ -1015,7 +1015,7 @@ void MainWindow::setupHelpActions()
/* TQToolBar *tb = new TQToolBar( this, "Help" ); /* TQToolBar *tb = new TQToolBar( this, "Help" );
tb->setCloseMode( TQDockWindow::Undocked ); tb->setCloseMode( TQDockWindow::Undocked );
TQWhatsThis::add( tb, i18n( "<b>The Help toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("") )); TQWhatsThis::add( tb, i18n( "<b>The Help toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("") ));
addToolBar( tb, i18n( "Help" ) ); addToolBar( tb, i18n( "Help" ) );
actionHelpWhatsThis->addTo( tb );*/ actionHelpWhatsThis->addTo( tb );*/
@ -1125,7 +1125,7 @@ void MainWindow::fileCloseProject()
if ( a ) { if ( a ) {
if ( pro->isModified() ) { if ( pro->isModified() ) {
switch ( TQMessageBox::warning( this, i18n( "Save Project Settings" ), switch ( TQMessageBox::warning( this, i18n( "Save Project Settings" ),
i18n( "Save changes to '%1'?" ).tqarg( pro->fileName() ), i18n( "Save changes to '%1'?" ).arg( pro->fileName() ),
i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) { i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) {
case 0: // save case 0: // save
pro->save(); pro->save();
@ -1166,7 +1166,7 @@ void MainWindow::fileCloseProject()
currentProject = 0; currentProject = 0;
if ( lastValid ) { if ( lastValid ) {
projectSelected( lastValid ); projectSelected( lastValid );
statusMessage( i18n( "Selected project '%1'" ).tqarg( currentProject->projectName() ) ); statusMessage( i18n( "Selected project '%1'" ).arg( currentProject->projectName() ) );
} }
if ( !windows.isEmpty() ) { if ( !windows.isEmpty() ) {
for ( TQWidget *w = windows.first(); w; w = windows.next() ) { for ( TQWidget *w = windows.first(); w; w = windows.next() ) {
@ -1276,11 +1276,11 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co
arg( filename )/*, 3000*/ ); arg( filename )/*, 3000*/ );
return; return;
} }
statusMessage( i18n( "Importing '%1' using import filter ...").tqarg( filename ) ); statusMessage( i18n( "Importing '%1' using import filter ...").arg( filename ) );
TQStringList list = iface->import( filter, filename ); TQStringList list = iface->import( filter, filename );
iface->release(); iface->release();
if ( list.isEmpty() ) { if ( list.isEmpty() ) {
statusMessage( i18n( "Nothing to load in '%1'").tqarg( filename )/*, 3000*/ ); statusMessage( i18n( "Nothing to load in '%1'").arg( filename )/*, 3000*/ );
return; return;
} }
if ( !inProject ) if ( !inProject )
@ -1319,7 +1319,7 @@ FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFile
return formWindow(); return formWindow();
} }
statusMessage( i18n( "Reading file '%1'...").tqarg( filename ) ); statusMessage( i18n( "Reading file '%1'...").arg( filename ) );
FormFile *ff2 = currentProject->findFormFile( currentProject->makeRelative(filename) ); FormFile *ff2 = currentProject->findFormFile( currentProject->makeRelative(filename) );
if ( ff2 && ff2->formWindow() ) { if ( ff2 && ff2->formWindow() ) {
ff2->formWindow()->setFocus(); ff2->formWindow()->setFocus();
@ -1338,10 +1338,10 @@ FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFile
TQApplication::restoreOverrideCursor(); TQApplication::restoreOverrideCursor();
if ( b ) { if ( b ) {
rebuildCustomWidgetGUI(); rebuildCustomWidgetGUI();
statusMessage( i18n( "Loaded file '%1'").tqarg( filename )/*, 3000 */); statusMessage( i18n( "Loaded file '%1'").arg( filename )/*, 3000 */);
} else { } else {
statusMessage( i18n( "Failed to load file '%1'").tqarg( filename )/*, 5000 */); statusMessage( i18n( "Failed to load file '%1'").arg( filename )/*, 5000 */);
TQMessageBox::information( this, i18n("Load File"), i18n("Could not load file '%1'.").tqarg( filename ) ); TQMessageBox::information( this, i18n("Load File"), i18n("Could not load file '%1'.").arg( filename ) );
delete ff; delete ff;
} }
return (FormWindow*)resource.widget(); return (FormWindow*)resource.widget();
@ -1389,7 +1389,7 @@ bool MainWindow::fileSaveForm()
bool MainWindow::fileSaveProject() bool MainWindow::fileSaveProject()
{ {
currentProject->save(); currentProject->save();
statusMessage( i18n( "Project '%1' saved.").tqarg( currentProject->projectName() )/*, 3000 */); statusMessage( i18n( "Project '%1' saved.").arg( currentProject->projectName() )/*, 3000 */);
return TRUE; return TRUE;
} }
@ -1482,7 +1482,7 @@ void MainWindow::createNewTemplate()
ts << " <cstring>" << cn << "Form</cstring>" << endl; ts << " <cstring>" << cn << "Form</cstring>" << endl;
ts << "</property>" << endl; ts << "</property>" << endl;
ts << "<property stdset=\"1\">" << endl; ts << "<property stdset=\"1\">" << endl;
ts << " <name>tqgeometry</name>" << endl; ts << " <name>geometry</name>" << endl;
ts << " <rect>" << endl; ts << " <rect>" << endl;
ts << " <width>300</width>" << endl; ts << " <width>300</width>" << endl;
ts << " <height>400</height>" << endl; ts << " <height>400</height>" << endl;
@ -1761,7 +1761,7 @@ SourceEditor *MainWindow::openSourceEditor()
if ( !MetaDataBase::hasEditor( lang ) ) { if ( !MetaDataBase::hasEditor( lang ) ) {
TQMessageBox::information( this, i18n( "Edit Source" ), TQMessageBox::information( this, i18n( "Edit Source" ),
i18n( "There is no plugin for editing %1 code installed.\n" i18n( "There is no plugin for editing %1 code installed.\n"
"Note: Plugins are not available in static TQt configurations." ).tqarg( lang ) ); "Note: Plugins are not available in static TQt configurations." ).arg( lang ) );
return 0; return 0;
} }
@ -1784,7 +1784,7 @@ SourceEditor *MainWindow::editSource( SourceFile *f )
if ( !MetaDataBase::hasEditor( lang ) ) { if ( !MetaDataBase::hasEditor( lang ) ) {
TQMessageBox::information( this, i18n( "Edit Source" ), TQMessageBox::information( this, i18n( "Edit Source" ),
i18n( "There is no plugin for editing %1 code installed.\n" i18n( "There is no plugin for editing %1 code installed.\n"
"Note: Plugins are not available in static TQt configurations." ).tqarg( lang ) ); "Note: Plugins are not available in static TQt configurations." ).arg( lang ) );
return 0; return 0;
} }

@ -167,14 +167,14 @@ void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bo
if ( doUpdate && if ( doUpdate &&
( property == "hAlign" || property == "vAlign" || property == "wordwrap" ) ) { ( property == "hAlign" || property == "vAlign" || property == "wordwrap" ) ) {
doUpdate = FALSE; doUpdate = FALSE;
setPropertyChanged( o, "tqalignment", changed || setPropertyChanged( o, "alignment", changed ||
isPropertyChanged( o, "hAlign" ) || isPropertyChanged( o, "hAlign" ) ||
isPropertyChanged( o, "vAlign" ) || isPropertyChanged( o, "vAlign" ) ||
isPropertyChanged( o, "wordwrap" ) ); isPropertyChanged( o, "wordwrap" ) );
doUpdate = TRUE; doUpdate = TRUE;
} }
if ( doUpdate && property == "tqalignment" ) { if ( doUpdate && property == "alignment" ) {
doUpdate = FALSE; doUpdate = FALSE;
setPropertyChanged( o, "hAlign", changed ); setPropertyChanged( o, "hAlign", changed );
setPropertyChanged( o, "vAlign", changed ); setPropertyChanged( o, "vAlign", changed );
@ -648,9 +648,9 @@ void MetaDataBase::doConnections( TQObject *o )
delete l; delete l;
} }
TQString s = "2""%1"; TQString s = "2""%1";
s = s.tqarg( conn.signal.data() ); s = s.arg( conn.signal.data() );
TQString s2 = "1""%1"; TQString s2 = "1""%1";
s2 = s2.tqarg( conn.slot.data() ); s2 = s2.arg( conn.slot.data() );
TQStrList signalList = sender->metaObject()->signalNames( TRUE ); TQStrList signalList = sender->metaObject()->signalNames( TRUE );
TQStrList slotList = receiver->metaObject()->slotNames( TRUE ); TQStrList slotList = receiver->metaObject()->slotNames( TRUE );

@ -241,7 +241,7 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget
if ( oldWrapString != "NoWrap" ) if ( oldWrapString != "NoWrap" )
doWrap = TRUE; doWrap = TRUE;
} }
textEdit->setAlignment( mlined->tqalignment() ); textEdit->setAlignment( mlined->alignment() );
textEdit->setWordWrap( mlined->wordWrap() ); textEdit->setWordWrap( mlined->wordWrap() );
textEdit->setWrapColumnOrWidth( mlined->wrapColumnOrWidth() ); textEdit->setWrapColumnOrWidth( mlined->wrapColumnOrWidth() );
textEdit->setWrapPolicy( mlined->wrapPolicy() ); textEdit->setWrapPolicy( mlined->wrapPolicy() );
@ -276,13 +276,13 @@ void MultiLineEditor::okClicked()
void MultiLineEditor::applyClicked() void MultiLineEditor::applyClicked()
{ {
if ( !callStatic ) { if ( !callStatic ) {
PopulateMultiLineEditCommand *cmd = new PopulateMultiLineEditCommand( i18n( "Set the Text of '%1'" ).tqarg( mlined->name() ), PopulateMultiLineEditCommand *cmd = new PopulateMultiLineEditCommand( i18n( "Set the Text of '%1'" ).arg( mlined->name() ),
formwindow, mlined, textEdit->text() ); formwindow, mlined, textEdit->text() );
cmd->execute(); cmd->execute();
formwindow->commandHistory()->addCommand( cmd ); formwindow->commandHistory()->addCommand( cmd );
if ( oldDoWrap != doWrap ) { if ( oldDoWrap != doWrap ) {
TQString pn( i18n( "Set 'wordWrap' of '%2'" ).tqarg( mlined->name() ) ); TQString pn( i18n( "Set 'wordWrap' of '%2'" ).arg( mlined->name() ) );
SetPropertyCommand *propcmd; SetPropertyCommand *propcmd;
if ( doWrap ) if ( doWrap )
propcmd = new SetPropertyCommand( pn, formwindow, propcmd = new SetPropertyCommand( pn, formwindow,
@ -325,7 +325,7 @@ void MultiLineEditor::insertTags( const TQString &tag )
if ( textEdit->hasSelectedText() ) { if ( textEdit->hasSelectedText() ) {
textEdit->getSelection( &pfrom, &ifrom, &pto, &ito ); textEdit->getSelection( &pfrom, &ifrom, &pto, &ito );
TQString buf = textEdit->selectedText(); TQString buf = textEdit->selectedText();
buf = TQString( "<%1>%3</%2>" ).tqarg( tag ).tqarg( tagend ).tqarg( buf ); buf = TQString( "<%1>%3</%2>" ).arg( tag ).arg( tagend ).arg( buf );
textEdit->removeSelectedText(); textEdit->removeSelectedText();
textEdit->insertAt( buf, pfrom, ifrom ); textEdit->insertAt( buf, pfrom, ifrom );
textEdit->setCursorPosition( pto, ito + 2 + tag.length() ); textEdit->setCursorPosition( pto, ito + 2 + tag.length() );
@ -333,7 +333,7 @@ void MultiLineEditor::insertTags( const TQString &tag )
else { else {
int para, index; int para, index;
textEdit->getCursorPosition( &para, &index ); textEdit->getCursorPosition( &para, &index );
textEdit->insert( TQString( "<%1></%2>" ).tqarg( tag ).tqarg( tagend ) ); textEdit->insert( TQString( "<%1></%2>" ).arg( tag ).arg( tagend ) );
index += 2 + tag.length(); index += 2 + tag.length();
textEdit->setCursorPosition( para, index ); textEdit->setCursorPosition( para, index );
} }
@ -363,7 +363,7 @@ void MultiLineEditor::showFontDialog()
if ( fd->getFont() != "default" ) if ( fd->getFont() != "default" )
font = "face=\"" + fd->getFont() + "\""; font = "face=\"" + fd->getFont() + "\"";
TQString tag( TQString( "font %1 %2 %3" ) TQString tag( TQString( "font %1 %2 %3" )
.tqarg( color ).tqarg( size ).tqarg( font ) ); .arg( color ).arg( size ).arg( font ) );
if ( selText ) if ( selText )
textEdit->setSelection( pfrom, ifrom, pto, ito ); textEdit->setSelection( pfrom, ifrom, pto, ito );

@ -158,7 +158,7 @@ void CustomFormItem::insert( Project *pro )
FormFile *ff = new FormFile( filename, TRUE, pro ); FormFile *ff = new FormFile( filename, TRUE, pro );
if ( !resource.load( ff ) ) { if ( !resource.load( ff ) ) {
TQMessageBox::information( MainWindow::self, i18n("Load Template"), TQMessageBox::information( MainWindow::self, i18n("Load Template"),
i18n("Could not load form description from template '%1'" ).tqarg( filename ) ); i18n("Could not load form description from template '%1'" ).arg( filename ) );
delete ff; delete ff;
return; return;
} }
@ -249,7 +249,7 @@ void NewForm::insertTemplates( TQIconView *tView,
TQStringList languages = MetaDataBase::languages(); TQStringList languages = MetaDataBase::languages();
if ( !MainWindow::self->singleProjectMode() ) { if ( !MainWindow::self->singleProjectMode() ) {
for ( it = languages.begin(); it != languages.end(); ++it ) { for ( it = languages.begin(); it != languages.end(); ++it ) {
ProjectItem *pi = new ProjectItem( tView, i18n("%1 Project" ).tqarg( *it ) ); ProjectItem *pi = new ProjectItem( tView, i18n("%1 Project" ).arg( *it ) );
allItems.append( pi ); allItems.append( pi );
pi->setLanguage( *it ); pi->setLanguage( *it );
pi->setPixmap( BarIcon( "designer_project.png" , KDevDesignerPartFactory::instance()) ); pi->setPixmap( BarIcon( "designer_project.png" , KDevDesignerPartFactory::instance()) );

@ -196,7 +196,7 @@ ErrorItem::ErrorItem( TQListView *parent, TQListViewItem *after, const TQString
} }
void ErrorItem::paintCell( TQPainter *p, const TQColorGroup & cg, void ErrorItem::paintCell( TQPainter *p, const TQColorGroup & cg,
int column, int width, int tqalignment ) int column, int width, int alignment )
{ {
TQColorGroup g( cg ); TQColorGroup g( cg );
g.setColor( TQColorGroup::Text, type == Error ? TQt::red : TQt::darkYellow ); g.setColor( TQColorGroup::Text, type == Error ? TQt::red : TQt::darkYellow );
@ -205,5 +205,5 @@ void ErrorItem::paintCell( TQPainter *p, const TQColorGroup & cg,
f.setBold( TRUE ); f.setBold( TRUE );
p->setFont( f ); p->setFont( f );
} }
TQListViewItem::paintCell( p, g, column, width, tqalignment ); TQListViewItem::paintCell( p, g, column, width, alignment );
} }

@ -45,9 +45,9 @@ public:
const TQString &locationString, TQObject *locationObject ); const TQString &locationString, TQObject *locationObject );
void paintCell( TQPainter *, const TQColorGroup & cg, void paintCell( TQPainter *, const TQColorGroup & cg,
int column, int width, int tqalignment ); int column, int width, int alignment );
void setRead( bool b ) { read = b; tqrepaint(); } void setRead( bool b ) { read = b; repaint(); }
TQObject *location() const { return object; } TQObject *location() const { return object; }
int line() const { return text( 2 ).toInt(); } int line() const { return text( 2 ).toInt(); }

@ -69,7 +69,7 @@
<property name="title"> <property name="title">
<string>Build Palette</string> <string>Build Palette</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignAuto</set> <set>AlignAuto</set>
</property> </property>
<hbox> <hbox>
@ -110,7 +110,7 @@
<property name="text"> <property name="text">
<string>&amp;3-D effects:</string> <string>&amp;3-D effects:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignAuto|AlignVCenter</set> <set>AlignAuto|AlignVCenter</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -168,7 +168,7 @@
<property name="text"> <property name="text">
<string>Back&amp;ground:</string> <string>Back&amp;ground:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignAuto|AlignVCenter</set> <set>AlignAuto|AlignVCenter</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">

@ -66,7 +66,7 @@ void PixmapView::setPixmap( const TQPixmap &pix )
{ {
pixmap = pix; pixmap = pix;
resizeContents( pixmap.size().width(), pixmap.size().height() ); resizeContents( pixmap.size().width(), pixmap.size().height() );
viewport()->tqrepaint( FALSE ); viewport()->repaint( FALSE );
} }
void PixmapView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch ) void PixmapView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch )
@ -98,7 +98,7 @@ static void buildImageFormatList( TQString &filter, TQString &all )
else else
outputExtension = "jpg;*.jpeg"; outputExtension = "jpg;*.jpeg";
filter += TQString(tqApp->translate( "qChoosePixmap", "%1-Pixmaps (%2)\n" )). filter += TQString(tqApp->translate( "qChoosePixmap", "%1-Pixmaps (%2)\n" )).
tqarg( outputFormat ).tqarg( "*." + outputExtension); arg( outputFormat ).arg( "*." + outputExtension);
all += "*." + outputExtension + ";"; all += "*." + outputExtension + ";";
} }
filter.prepend( all + tqApp->translate( "qChoosePixmap", ")\n" ) ); filter.prepend( all + tqApp->translate( "qChoosePixmap", ")\n" ) );

@ -119,7 +119,7 @@ static TQStringList getFontList()
fontDataBase = new TQFontDatabase; fontDataBase = new TQFontDatabase;
qAddPostRoutine( cleanupFontDatabase ); qAddPostRoutine( cleanupFontDatabase );
} }
return fontDataBase->tqfamilies(); return fontDataBase->families();
} }
@ -329,9 +329,9 @@ void PropertyItem::setOpen( bool b )
open = b; open = b;
if ( !open ) { if ( !open ) {
tqchildren.setAutoDelete( TRUE ); children.setAutoDelete( TRUE );
tqchildren.clear(); children.clear();
tqchildren.setAutoDelete( FALSE ); children.setAutoDelete( FALSE );
tqApp->processEvents(); tqApp->processEvents();
listview->updateEditorSize(); listview->updateEditorSize();
return; return;
@ -387,7 +387,7 @@ void PropertyItem::setChanged( bool b, bool updateDb )
if ( changed == b ) if ( changed == b )
return; return;
changed = b; changed = b;
tqrepaint(); repaint();
if ( updateDb ) { if ( updateDb ) {
MetaDataBase::setPropertyChanged( listview->propertyEditor()->widget(), name(), changed ); MetaDataBase::setPropertyChanged( listview->propertyEditor()->widget(), name(), changed );
} }
@ -491,18 +491,18 @@ void PropertyItem::childValueChanged( PropertyItem * )
void PropertyItem::addChild( PropertyItem *i ) void PropertyItem::addChild( PropertyItem *i )
{ {
tqchildren.append( i ); children.append( i );
} }
int PropertyItem::childCount() const int PropertyItem::childCount() const
{ {
return tqchildren.count(); return children.count();
} }
PropertyItem *PropertyItem::child( int i ) const PropertyItem *PropertyItem::child( int i ) const
{ {
// ARRRRRRRRG // ARRRRRRRRG
return ( (PropertyItem*)this )->tqchildren.at( i ); return ( (PropertyItem*)this )->children.at( i );
} }
/*! If the contents of the item is not displayable with a text, but /*! If the contents of the item is not displayable with a text, but
@ -1679,7 +1679,7 @@ void PropertyPixmapItem::setValue( const TQVariant &v )
else else
pixPrev->setPixmap( v.toImage() ); pixPrev->setPixmap( v.toImage() );
PropertyItem::setValue( v ); PropertyItem::setValue( v );
tqrepaint(); repaint();
} }
void PropertyPixmapItem::getPixmap() void PropertyPixmapItem::getPixmap()
@ -1726,8 +1726,8 @@ void PropertyPixmapItem::drawCustomContents( TQPainter *p, const TQRect &r )
// -------------------------------------------------------------- // --------------------------------------------------------------
PropertyColorItem::PropertyColorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, PropertyColorItem::PropertyColorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
const TQString &propName, bool tqchildren ) const TQString &propName, bool children )
: PropertyItem( l, after, prop, propName ), withChildren( tqchildren ) : PropertyItem( l, after, prop, propName ), withChildren( children )
{ {
box = new TQHBox( listview->viewport() ); box = new TQHBox( listview->viewport() );
box->hide(); box->hide();
@ -2224,7 +2224,7 @@ void PropertySizePolicyItem::setValue( const TQVariant &v )
return; return;
TQString s = i18n( "%1/%2/%3/%4" ); TQString s = i18n( "%1/%2/%3/%4" );
s = s.tqarg( size_type_to_string( v.toSizePolicy().horData() ) ). s = s.arg( size_type_to_string( v.toSizePolicy().horData() ) ).
arg( size_type_to_string( v.toSizePolicy().verData() ) ). arg( size_type_to_string( v.toSizePolicy().verData() ) ).
arg( v.toSizePolicy().horStretch() ). arg( v.toSizePolicy().horStretch() ).
arg( v.toSizePolicy().verStretch() ); arg( v.toSizePolicy().verStretch() );
@ -2298,7 +2298,7 @@ void PropertyPaletteItem::setValue( const TQVariant &v )
TQString s; TQString s;
palettePrev->setPalette( v.toPalette() ); palettePrev->setPalette( v.toPalette() );
PropertyItem::setValue( v ); PropertyItem::setValue( v );
tqrepaint(); repaint();
} }
void PropertyPaletteItem::getPalette() void PropertyPaletteItem::getPalette()
@ -2411,7 +2411,7 @@ void PropertyCursorItem::showEditor()
PropertyItem::showEditor(); PropertyItem::showEditor();
if ( !comb ) { if ( !comb ) {
combo()->blockSignals( TRUE ); combo()->blockSignals( TRUE );
combo()->setCurrentItem( (int)value().toCursor().tqshape() ); combo()->setCurrentItem( (int)value().toCursor().shape() );
combo()->blockSignals( FALSE ); combo()->blockSignals( FALSE );
} }
placeEditor( combo() ); placeEditor( combo() );
@ -2434,7 +2434,7 @@ void PropertyCursorItem::setValue( const TQVariant &v )
return; return;
combo()->blockSignals( TRUE ); combo()->blockSignals( TRUE );
combo()->setCurrentItem( (int)v.toCursor().tqshape() ); combo()->setCurrentItem( (int)v.toCursor().shape() );
combo()->blockSignals( FALSE ); combo()->blockSignals( FALSE );
setText( 1, combo()->currentText() ); setText( 1, combo()->currentText() );
PropertyItem::setValue( v ); PropertyItem::setValue( v );
@ -2730,7 +2730,7 @@ void EnumBox::popup()
popupShown = FALSE; popupShown = FALSE;
return; return;
} }
pop->move( ((TQWidget*)parent())->mapToGlobal( tqgeometry().bottomLeft() ) ); pop->move( ((TQWidget*)parent())->mapToGlobal( geometry().bottomLeft() ) );
pop->setMinimumWidth( width() ); pop->setMinimumWidth( width() );
emit aboutToShowPopup(); emit aboutToShowPopup();
pop->show(); pop->show();
@ -2750,7 +2750,7 @@ void EnumBox::mousePressEvent( TQMouseEvent *e )
if ( arrowRect.contains( e->pos() ) ) { if ( arrowRect.contains( e->pos() ) ) {
arrowDown = TRUE; arrowDown = TRUE;
tqrepaint( FALSE ); repaint( FALSE );
} }
popup(); popup();
@ -2770,13 +2770,13 @@ void EnumBox::keyPressEvent( TQKeyEvent *e )
void EnumBox::restoreArrow() void EnumBox::restoreArrow()
{ {
arrowDown = FALSE; arrowDown = FALSE;
tqrepaint( FALSE ); repaint( FALSE );
} }
void EnumBox::setText( const TQString &text ) void EnumBox::setText( const TQString &text )
{ {
str = text; str = text;
tqrepaint( FALSE ); repaint( FALSE );
} }
@ -3164,7 +3164,7 @@ void PropertyList::setupProperties()
isPropertyObject && p->designable( ( (PropertyObject*)w )->widgetList().first() ) ) && isPropertyObject && p->designable( ( (PropertyObject*)w )->widgetList().first() ) ) &&
( !isPropertyObject || qstrcmp( p->name(), "name" ) != 0 ) ) { ( !isPropertyObject || qstrcmp( p->name(), "name" ) != 0 ) ) {
if ( p->isSetType() ) { if ( p->isSetType() ) {
if ( TQString( p->name() ) == "tqalignment" ) { if ( TQString( p->name() ) == "alignment" ) {
TQStringList lst; TQStringList lst;
lst << p->valueToKey( AlignAuto ) lst << p->valueToKey( AlignAuto )
<< p->valueToKey( AlignLeft ) << p->valueToKey( AlignLeft )
@ -3486,7 +3486,7 @@ void PropertyList::valueChanged( PropertyItem *i )
{ {
if ( !editor->widget() ) if ( !editor->widget() )
return; return;
TQString pn( i18n( "Set '%1' of '%2'" ).tqarg( i->name() ).tqarg( editor->widget()->name() ) ); TQString pn( i18n( "Set '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) );
SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(), SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(),
editor->widget(), editor, editor->widget(), editor,
i->name(), WidgetFactory::property( editor->widget(), i->name() ), i->name(), WidgetFactory::property( editor->widget(), i->name() ),
@ -3500,7 +3500,7 @@ void PropertyList::layoutInitValue( PropertyItem *i, bool changed )
{ {
if ( !editor->widget() ) if ( !editor->widget() )
return; return;
TQString pn( i18n( "Set '%1' of '%2'" ).tqarg( i->name() ).tqarg( editor->widget()->name() ) ); TQString pn( i18n( "Set '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) );
SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(), SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(),
editor->widget(), editor, editor->widget(), editor,
i->name(), WidgetFactory::property( editor->widget(), i->name() ), i->name(), WidgetFactory::property( editor->widget(), i->name() ),
@ -3696,21 +3696,21 @@ void PropertyList::setPropertyValue( PropertyItem *i )
property( editor->widget()->metaObject()->findProperty( i->name(), TRUE), TRUE ); property( editor->widget()->metaObject()->findProperty( i->name(), TRUE), TRUE );
if ( !p ) { if ( !p ) {
if ( i->name() == "hAlign" ) { if ( i->name() == "hAlign" ) {
int align = editor->widget()->property( "tqalignment" ).toInt(); int align = editor->widget()->property( "alignment" ).toInt();
p = editor->widget()->metaObject()-> p = editor->widget()->metaObject()->
property( editor->widget()->metaObject()->findProperty( "tqalignment", TRUE ), TRUE ); property( editor->widget()->metaObject()->findProperty( "alignment", TRUE ), TRUE );
align &= ~AlignVertical_Mask; align &= ~AlignVertical_Mask;
TQStrList l = p->valueToKeys( align ); TQStrList l = p->valueToKeys( align );
clearAlignList( l ); clearAlignList( l );
( (PropertyListItem*)i )->setCurrentItem( l.last() ); ( (PropertyListItem*)i )->setCurrentItem( l.last() );
} else if ( i->name() == "vAlign" ) { } else if ( i->name() == "vAlign" ) {
int align = editor->widget()->property( "tqalignment" ).toInt(); int align = editor->widget()->property( "alignment" ).toInt();
p = editor->widget()->metaObject()-> p = editor->widget()->metaObject()->
property( editor->widget()->metaObject()->findProperty( "tqalignment", TRUE ), TRUE ); property( editor->widget()->metaObject()->findProperty( "alignment", TRUE ), TRUE );
align &= ~AlignHorizontal_Mask; align &= ~AlignHorizontal_Mask;
( (PropertyListItem*)i )->setCurrentItem( p->valueToKeys( align ).last() ); ( (PropertyListItem*)i )->setCurrentItem( p->valueToKeys( align ).last() );
} else if ( i->name() == "wordwrap" ) { } else if ( i->name() == "wordwrap" ) {
int align = editor->widget()->property( "tqalignment" ).toInt(); int align = editor->widget()->property( "alignment" ).toInt();
if ( align & WordBreak ) if ( align & WordBreak )
i->setValue( TQVariant( TRUE, 0 ) ); i->setValue( TQVariant( TRUE, 0 ) );
else else
@ -3769,7 +3769,7 @@ void PropertyList::resetProperty()
PropertyItem *i = (PropertyItem*)currentItem(); PropertyItem *i = (PropertyItem*)currentItem();
if ( !MetaDataBase::isPropertyChanged( editor->widget(), i->PropertyItem::name() ) ) if ( !MetaDataBase::isPropertyChanged( editor->widget(), i->PropertyItem::name() ) )
return; return;
TQString pn( i18n( "Reset '%1' of '%2'" ).tqarg( i->name() ).tqarg( editor->widget()->name() ) ); TQString pn( i18n( "Reset '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) );
SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(), SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(),
editor->widget(), editor, editor->widget(), editor,
i->name(), i->value(), i->name(), i->value(),
@ -3876,7 +3876,7 @@ TQString PropertyList::whatsThisText( TQListViewItem *i )
mo = mo->superClass(); mo = mo->superClass();
} }
return i18n( "<p><b>TQWidget::%1</b></p><p>There is no documentation available for this property.</p>" ).tqarg( prop ); return i18n( "<p><b>TQWidget::%1</b></p><p>There is no documentation available for this property.</p>" ).arg( prop );
} }
void PropertyList::readPropertyDocs() void PropertyList::readPropertyDocs()
@ -4190,7 +4190,7 @@ void PropertyEditor::setWidget( TQObject *w, FormWindow *fw )
wid = w; wid = w;
formwindow = fw; formwindow = fw;
setCaption( i18n( "Property Editor (%1)" ).tqarg( formwindow->name() ) ); setCaption( i18n( "Property Editor (%1)" ).arg( formwindow->name() ) );
listview->viewport()->setUpdatesEnabled( FALSE ); listview->viewport()->setUpdatesEnabled( FALSE );
listview->setUpdatesEnabled( FALSE ); listview->setUpdatesEnabled( FALSE );
clear(); clear();

@ -129,7 +129,7 @@ private:
bool open, changed; bool open, changed;
PropertyItem *property; PropertyItem *property;
TQString propertyName; TQString propertyName;
TQPtrList<PropertyItem> tqchildren; TQPtrList<PropertyItem> children;
TQColor backColor; TQColor backColor;
TQPushButton *resetButton; TQPushButton *resetButton;
@ -376,7 +376,7 @@ class PropertyColorItem : public TQObject,
public: public:
PropertyColorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, PropertyColorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
const TQString &propName, bool tqchildren ); const TQString &propName, bool children );
~PropertyColorItem(); ~PropertyColorItem();
virtual void createChildren(); virtual void createChildren();

@ -225,7 +225,7 @@ static TQString platformNeutralKeySequence(const TQKeySequence &ks)
// represent, but is clearly impossible to trigger... // represent, but is clearly impossible to trigger...
p = TQChar(basekey & 0xffff); p = TQChar(basekey & 0xffff);
} else if ( basekey >= TQt::Key_F1 && basekey <= TQt::Key_F35 ) { } else if ( basekey >= TQt::Key_F1 && basekey <= TQt::Key_F35 ) {
p = TQAccel::tr( "F%1" ).tqarg(basekey - TQt::Key_F1 + 1); p = TQAccel::tr( "F%1" ).arg(basekey - TQt::Key_F1 + 1);
} else if ( basekey > TQt::Key_Space && basekey <= TQt::Key_AsciiTilde ) { } else if ( basekey > TQt::Key_Space && basekey <= TQt::Key_AsciiTilde ) {
p.sprintf( "%c", basekey ); p.sprintf( "%c", basekey );
} else { } else {
@ -1344,7 +1344,7 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent )
{ {
const TQObjectList l = obj->childrenListObject(); const TQObjectList l = obj->childrenListObject();
if ( l.isEmpty() ) if ( l.isEmpty() )
return; // no tqchildren to save return; // no children to save
TQString closeTag; TQString closeTag;
// if the widget has a tqlayout we pretend that all widget's childs are childs of the tqlayout - makes the structure nicer // if the widget has a tqlayout we pretend that all widget's childs are childs of the tqlayout - makes the structure nicer
@ -1680,7 +1680,7 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant
ts << makeIndent( indent ) << "</palette>" << endl; ts << makeIndent( indent ) << "</palette>" << endl;
} break; } break;
case TQVariant::Cursor: case TQVariant::Cursor:
ts << makeIndent( indent ) << "<cursor>" << value.toCursor().tqshape() << "</cursor>" << endl; ts << makeIndent( indent ) << "<cursor>" << value.toCursor().shape() << "</cursor>" << endl;
break; break;
case TQVariant::StringList: { case TQVariant::StringList: {
TQStringList lst = value.toStringList(); TQStringList lst = value.toStringList();
@ -1787,7 +1787,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
TQMessageBox::critical( MainWindow::self, i18n( "Loading File" ), TQMessageBox::critical( MainWindow::self, i18n( "Loading File" ),
i18n( "Error loading %1.\n" i18n( "Error loading %1.\n"
"The widget %2 could not be created." ). "The widget %2 could not be created." ).
tqarg( currFileName ).tqarg( className ) ); arg( currFileName ).arg( className ) );
return 0; return 0;
} }
if ( !mainContainerSet ) { if ( !mainContainerSet ) {
@ -2130,10 +2130,10 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay
formwindow->insertWidget( spacer, pasting ); formwindow->insertWidget( spacer, pasting );
if ( tqlayout ) { if ( tqlayout ) {
if ( ::tqqt_cast<TQBoxLayout*>(tqlayout) ) if ( ::tqqt_cast<TQBoxLayout*>(tqlayout) )
( (TQBoxLayout*)tqlayout )->addWidget( spacer, 0, spacer->tqalignment() ); ( (TQBoxLayout*)tqlayout )->addWidget( spacer, 0, spacer->alignment() );
else else
( (QDesignerGridLayout*)tqlayout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1, ( (QDesignerGridLayout*)tqlayout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1,
spacer->tqalignment() ); spacer->alignment() );
} }
return spacer; return spacer;
} }
@ -2897,9 +2897,9 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
TQString s = ""; TQString s = "";
TQString m = ""; TQString m = "";
if ( !formwindow->spacingFunction().isEmpty() ) if ( !formwindow->spacingFunction().isEmpty() )
s = TQString( " spacing=\"%1\"" ).tqarg( formwindow->spacingFunction() ); s = TQString( " spacing=\"%1\"" ).arg( formwindow->spacingFunction() );
if ( !formwindow->marginFunction().isEmpty() ) if ( !formwindow->marginFunction().isEmpty() )
m = TQString( " margin=\"%1\"" ).tqarg( formwindow->marginFunction() ); m = TQString( " margin=\"%1\"" ).arg( formwindow->marginFunction() );
ts << makeIndent( indent ) << "<layoutfunctions" << s << m << "/>" << endl; ts << makeIndent( indent ) << "<layoutfunctions" << s << m << "/>" << endl;
} }
} }

@ -11,7 +11,7 @@
void RichTextFontDialog::init() void RichTextFontDialog::init()
{ {
TQFontDatabase *db = new TQFontDatabase(); TQFontDatabase *db = new TQFontDatabase();
fontCombo->insertStringList( db->tqfamilies() ); fontCombo->insertStringList( db->families() );
} }
void RichTextFontDialog::selectColor() void RichTextFontDialog::selectColor()

@ -213,7 +213,7 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e )
sel->updateGeometry(); sel->updateGeometry();
oldPressPos += ( p - pos() ); oldPressPos += ( p - pos() );
formWindow->sizePreview()->setText( i18n( "%1/%2" ).tqarg( widget->width() ).tqarg( widget->height() ) ); formWindow->sizePreview()->setText( i18n( "%1/%2" ).arg( widget->width() ).arg( widget->height() ) );
formWindow->sizePreview()->adjustSize(); formWindow->sizePreview()->adjustSize();
TQRect lg( formWindow->mapFromGlobal( e->globalPos() ) + TQPoint( 16, 16 ), TQRect lg( formWindow->mapFromGlobal( e->globalPos() ) + TQPoint( 16, 16 ),
formWindow->sizePreview()->size() ); formWindow->sizePreview()->size() );
@ -231,11 +231,11 @@ void SizeHandle::mouseReleaseEvent( TQMouseEvent *e )
return; return;
formWindow->sizePreview()->hide(); formWindow->sizePreview()->hide();
if ( geom != widget->tqgeometry() ) if ( geom != widget->geometry() )
formWindow->commandHistory()->addCommand( new ResizeCommand( i18n( "Resize" ), formWindow->commandHistory()->addCommand( new ResizeCommand( i18n( "Resize" ),
formWindow, formWindow,
widget, origGeom, widget, origGeom,
widget->tqgeometry() ) ); widget->geometry() ) );
formWindow->emitUpdateProperties( TQT_TQOBJECT(widget) ); formWindow->emitUpdateProperties( TQT_TQOBJECT(widget) );
} }

@ -138,7 +138,7 @@ bool SourceFile::saveAs( bool ignoreModified )
pro->setModified( TRUE ); pro->setModified( TRUE );
timeStamp.setFileName( pro->makeAbsolute( filename ) ); timeStamp.setFileName( pro->makeAbsolute( filename ) );
if ( ed ) if ( ed )
ed->setCaption( i18n( "Edit %1" ).tqarg( filename ) ); ed->setCaption( i18n( "Edit %1" ).arg( filename ) );
setModified( TRUE ); setModified( TRUE );
if ( pro->isDummy() ) { if ( pro->isDummy() ) {
TQObject *o = ed->parent(); TQObject *o = ed->parent();
@ -220,7 +220,7 @@ bool SourceFile::closeEvent()
ed->save(); ed->save();
switch ( TQMessageBox::warning( MainWindow::self, i18n( "Save Code" ), switch ( TQMessageBox::warning( MainWindow::self, i18n( "Save Code" ),
i18n( "Save changes to '%1'?" ).tqarg( filename ), i18n( "Save changes to '%1'?" ).arg( filename ),
i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) { i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) {
case 0: // save case 0: // save
if ( !save() ) if ( !save() )
@ -265,7 +265,7 @@ void SourceFile::checkTimeStamp()
timeStamp.update(); timeStamp.update();
if ( TQMessageBox::information( MainWindow::self, i18n( "TQt Designer" ), if ( TQMessageBox::information( MainWindow::self, i18n( "TQt Designer" ),
i18n( "File '%1' has been changed outside TQt Designer.\n" i18n( "File '%1' has been changed outside TQt Designer.\n"
"Do you want to reload it?" ).tqarg( filename ), "Do you want to reload it?" ).arg( filename ),
i18n( "&Yes" ), i18n( "&No" ) ) == 0 ) { i18n( "&Yes" ), i18n( "&No" ) ) == 0 ) {
load(); load();
if ( ed ) if ( ed )
@ -279,7 +279,7 @@ bool SourceFile::checkFileName( bool allowBreak )
if ( sf ) if ( sf )
TQMessageBox::warning( MainWindow::self, i18n( "Invalid Filename" ), TQMessageBox::warning( MainWindow::self, i18n( "Invalid Filename" ),
i18n( "The project already contains a source file with \n" i18n( "The project already contains a source file with \n"
"filename '%1'. Please choose a new filename." ).tqarg( filename ) ); "filename '%1'. Please choose a new filename." ).arg( filename ) );
while ( sf ) { while ( sf ) {
LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() ); LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() );
TQString filter; TQString filter;

@ -108,7 +108,7 @@ void StartDialog::recentItemChanged( TQIconViewItem *item )
} }
TQDateTime dt( f.lastModified() ); TQDateTime dt( f.lastModified() );
TQString date( dt.toString( "MMMM dd hh:mm" )); TQString date( dt.toString( "MMMM dd hh:mm" ));
msg = TQString( "%1 (%2 %3) %4" ).tqarg(msg).tqarg(s).tqarg(unit).tqarg(date); msg = TQString( "%1 (%2 %3) %4" ).arg(msg).arg(s).arg(unit).arg(date);
fileInfoLabel->setText( msg ); fileInfoLabel->setText( msg );
} }

@ -46,7 +46,7 @@ SyntaxHighlighter_HTML::~SyntaxHighlighter_HTML()
{ {
} }
void SyntaxHighlighter_HTML::process( TQTextDocument *doc, TQTextParagraph *string, int, bool tqinvalidate ) void SyntaxHighlighter_HTML::process( TQTextDocument *doc, TQTextParagraph *string, int, bool invalidate )
{ {
TQTextFormat *formatStandard = format( Standard ); TQTextFormat *formatStandard = format( Standard );
@ -131,7 +131,7 @@ void SyntaxHighlighter_HTML::process( TQTextDocument *doc, TQTextParagraph *stri
string->setEndState( state ); string->setEndState( state );
string->setFirstPreProcess( FALSE ); string->setFirstPreProcess( FALSE );
if ( tqinvalidate && string->next() && if ( invalidate && string->next() &&
!string->next()->firstPreProcess() && string->next()->endState() != -1 ) { !string->next()->firstPreProcess() && string->next()->endState() != -1 ) {
TQTextParagraph *p = string->next(); TQTextParagraph *p = string->next();
while ( p ) { while ( p ) {

@ -42,7 +42,7 @@ public:
SyntaxHighlighter_HTML(); SyntaxHighlighter_HTML();
virtual ~SyntaxHighlighter_HTML(); virtual ~SyntaxHighlighter_HTML();
void process( TQTextDocument *doc, TQTextParagraph *string, int start, bool tqinvalidate = TRUE ); void process( TQTextDocument *doc, TQTextParagraph *string, int start, bool invalidate = TRUE );
TQTextFormat *format( int id ); TQTextFormat *format( int id );
private: private:

@ -343,7 +343,7 @@ void TableEditor::applyClicked()
row.pix = table->verticalHeader()->iconSet( i )->pixmap(); row.pix = table->verticalHeader()->iconSet( i )->pixmap();
rows.append( row ); rows.append( row );
} }
PopulateTableCommand *cmd = new PopulateTableCommand( i18n( "Edit the Rows and Columns of '%1' " ).tqarg( editTable->name() ), PopulateTableCommand *cmd = new PopulateTableCommand( i18n( "Edit the Rows and Columns of '%1' " ).arg( editTable->name() ),
formWindow, editTable, rows, cols ); formWindow, editTable, rows, cols );
cmd->execute(); cmd->execute();
formWindow->commandHistory()->addCommand( cmd ); formWindow->commandHistory()->addCommand( cmd );

@ -1080,7 +1080,7 @@ TQWidget *WidgetFactory::layoutParent( TQLayout *tqlayout )
return 0; return 0;
} }
/*! Returns the widget into which tqchildren should be inserted when \a /*! Returns the widget into which children should be inserted when \a
w is a container known to the designer. w is a container known to the designer.
Usually that is \a w itself, sometimes it is different (e.g. a Usually that is \a w itself, sometimes it is different (e.g. a
@ -1479,7 +1479,7 @@ bool WidgetFactory::resetProperty( TQObject *w, const TQString &propName )
TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName ) TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName )
{ {
if ( propName == "wordwrap" ) { if ( propName == "wordwrap" ) {
int v = defaultValue( w, "tqalignment" ).toInt(); int v = defaultValue( w, "alignment" ).toInt();
return TQVariant( ( v & WordBreak ) == WordBreak, 0 ); return TQVariant( ( v & WordBreak ) == WordBreak, 0 );
} else if ( propName == "toolTip" || propName == "whatsThis" ) { } else if ( propName == "toolTip" || propName == "whatsThis" ) {
return TQVariant( TQString::fromLatin1( "" ) ); return TQVariant( TQString::fromLatin1( "" ) );
@ -1499,7 +1499,7 @@ TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propNam
const TQMetaProperty *p = w->metaObject()-> const TQMetaProperty *p = w->metaObject()->
property( w->metaObject()->findProperty( propName, TRUE ), TRUE ); property( w->metaObject()->findProperty( propName, TRUE ), TRUE );
if ( !p ) { if ( !p ) {
int v = defaultValue( w, "tqalignment" ).toInt(); int v = defaultValue( w, "alignment" ).toInt();
if ( propName == "hAlign" ) { if ( propName == "hAlign" ) {
if ( ( v & AlignAuto ) == AlignAuto ) if ( ( v & AlignAuto ) == AlignAuto )
return "AlignAuto"; return "AlignAuto";
@ -1721,7 +1721,7 @@ void TQLayoutWidget::updateSizePolicy()
#endif // USE_QT4 #endif // USE_QT4
vt = TQSizePolicy::Expanding; vt = TQSizePolicy::Expanding;
tqlayout()->tqinvalidate(); tqlayout()->invalidate();
} }
sp = TQSizePolicy( (TQSizePolicy::SizeType) ht, (TQSizePolicy::SizeType) vt ); sp = TQSizePolicy( (TQSizePolicy::SizeType) ht, (TQSizePolicy::SizeType) vt );

@ -130,7 +130,7 @@ void WizardEditor::addClicked()
listBox->insertItem( i18n( "Page" ), index ); listBox->insertItem( i18n( "Page" ), index );
// schedule add command // schedule add command
AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n( "Add Page to %1" ).tqarg( wizard->name() ), AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n( "Add Page to %1" ).arg( wizard->name() ),
formwindow, wizard, "Page", index, FALSE); formwindow, wizard, "Page", index, FALSE);
commands.append( cmd ); commands.append( cmd );
@ -149,7 +149,7 @@ void WizardEditor::removeClicked()
// schedule remove command // schedule remove command
DeleteWizardPageCommand *cmd = new DeleteWizardPageCommand( i18n( "Delete Page %1 of %2" ) DeleteWizardPageCommand *cmd = new DeleteWizardPageCommand( i18n( "Delete Page %1 of %2" )
.tqarg( listBox->text( index ) ).tqarg( wizard->name() ), .arg( listBox->text( index ) ).arg( wizard->name() ),
formwindow, wizard, index, FALSE ); formwindow, wizard, index, FALSE );
commands.append( cmd ); commands.append( cmd );
@ -169,8 +169,8 @@ void WizardEditor::upClicked()
listBox->setCurrentItem( index2 ); listBox->setCurrentItem( index2 );
// schedule swap command // schedule swap command
SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n( "Swap Pages %1 and %2 of %3" ).tqarg( index1 ).tqarg( index2 ) SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n( "Swap Pages %1 and %2 of %3" ).arg( index1 ).arg( index2 )
.tqarg( wizard->name() ), formwindow, wizard, index1, index2); .arg( wizard->name() ), formwindow, wizard, index1, index2);
commands.append( cmd ); commands.append( cmd );
// update buttons // update buttons
@ -189,7 +189,7 @@ void WizardEditor::downClicked()
listBox->setCurrentItem( index2 ); listBox->setCurrentItem( index2 );
// schedule swap command // schedule swap command
SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n( "Swap Pages %1 and %2 of %3" ).tqarg( index1 ).tqarg( index2 ).tqarg( wizard->name() ), formwindow, wizard, index2, index1); SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n( "Swap Pages %1 and %2 of %3" ).arg( index1 ).arg( index2 ).arg( wizard->name() ), formwindow, wizard, index2, index1);
commands.append( cmd ); commands.append( cmd );
// update buttons // update buttons
@ -217,7 +217,7 @@ void WizardEditor::itemSelected( int index )
if ( index < 0 ) return; if ( index < 0 ) return;
// Called when TQt::Key_Enter was pressed. // Called when TQt::Key_Enter was pressed.
// ListBoxRename has renamed the list item, so we only need to rename the page to the same name. // ListBoxRename has renamed the list item, so we only need to rename the page to the same name.
TQString pn( i18n( "Rename page %1 of %2" ).tqarg( wizard->title( wizard->page( index ) ) ).tqarg( wizard->name() ) ); TQString pn( i18n( "Rename page %1 of %2" ).arg( wizard->title( wizard->page( index ) ) ).arg( wizard->name() ) );
RenameWizardPageCommand *cmd = new RenameWizardPageCommand( pn, formwindow, wizard, index, listBox->text( index ) ); RenameWizardPageCommand *cmd = new RenameWizardPageCommand( pn, formwindow, wizard, index, listBox->text( index ) );
commands.append( cmd ); commands.append( cmd );
} }
@ -248,6 +248,6 @@ void WizardEditor::itemDropped( TQListBoxItem * i )
int droppedItem = listBox->index( i ); int droppedItem = listBox->index( i );
//qDebug( "Moving page %d -> %d", draggedItem, droppedItem ); //qDebug( "Moving page %d -> %d", draggedItem, droppedItem );
MoveWizardPageCommand *cmd = new MoveWizardPageCommand( i18n( "Move Page %1 to %2 in %3" ).tqarg( draggedItem ).tqarg( droppedItem ).tqarg( wizard->name() ), formwindow, wizard, draggedItem, droppedItem ); MoveWizardPageCommand *cmd = new MoveWizardPageCommand( i18n( "Move Page %1 to %2 in %3" ).arg( draggedItem ).arg( droppedItem ).arg( wizard->name() ), formwindow, wizard, draggedItem, droppedItem );
commands.append( cmd ); commands.append( cmd );
} }

@ -419,9 +419,9 @@ void Workspace::update( FormFile* ff )
{ {
TQListViewItem* i = findItem( ff ); TQListViewItem* i = findItem( ff );
if ( i ) { if ( i ) {
i->tqrepaint(); i->repaint();
if ( (i = i->firstChild()) ) if ( (i = i->firstChild()) )
i->tqrepaint(); i->repaint();
} }
} }

@ -474,7 +474,7 @@ static void outputLayoutWidgetsSubLayout( TQMap<int, TQStringList>& buddies,
cell and the correct name property, and put the Object_End cell and the correct name property, and put the Object_End
marker back. marker back.
*/ */
out.tqdevice()->at( out.tqdevice()->at() - 1 ); out.device()->at( out.device()->at() - 1 );
outputGridCell( out, elem ); outputGridCell( out, elem );
outputProperty( buddies, subLayoutNo, strings, out, nameElem ); outputProperty( buddies, subLayoutNo, strings, out, nameElem );
out << (TQ_UINT8) Object_End; out << (TQ_UINT8) Object_End;

@ -31,7 +31,7 @@ static const char commonStrings[] =
"TQComboBox\0TQDialog\0TQFrame\0TQGridLayout\0TQGroupBox\0TQHBoxLayout\0TQLabel\0" "TQComboBox\0TQDialog\0TQFrame\0TQGridLayout\0TQGroupBox\0TQHBoxLayout\0TQLabel\0"
"TQLineEdit\0TQListView\0TQPushButton\0TQRadioButton\0TQVBoxLayout\0TQWidget\0" "TQLineEdit\0TQListView\0TQPushButton\0TQRadioButton\0TQVBoxLayout\0TQWidget\0"
"TextLabel1\0XPM.GZ\0accept\0autoDefault\0buddy\0caption\0clicked\0" "TextLabel1\0XPM.GZ\0accept\0autoDefault\0buddy\0caption\0clicked\0"
"default\0destroy\0frameShadow\0frameShape\0tqgeometry\0init\0margin\0" "default\0destroy\0frameShadow\0frameShape\0geometry\0init\0margin\0"
"maximumSize\0minimumSize\0name\0reject\0sizePolicy\0spacing\0text\0title\0" "maximumSize\0minimumSize\0name\0reject\0sizePolicy\0spacing\0text\0title\0"
"toolTip\0unnamed\0whatsThis"; "toolTip\0unnamed\0whatsThis";

@ -128,7 +128,7 @@ inline TQString UibStrTable::asString( int offset ) const
{ {
if ( table[offset] == 0x7f ) { if ( table[offset] == 0x7f ) {
TQDataStream in( table, IO_ReadOnly ); TQDataStream in( table, IO_ReadOnly );
in.tqdevice()->at( offset + 1 ); in.device()->at( offset + 1 );
TQString str; TQString str;
in >> str; in >> str;
return str; return str;

@ -735,7 +735,7 @@ bool WidgetDatabase::isForm( int id )
return r->isForm; return r->isForm;
} }
/*! Returns whether the widget registered as \a id can have tqchildren. /*! Returns whether the widget registered as \a id can have children.
*/ */
bool WidgetDatabase::isContainer( int id ) bool WidgetDatabase::isContainer( int id )

@ -1175,7 +1175,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
TQObject * /* connector */ , TQWidget *parent, const char *name ) TQObject * /* connector */ , TQWidget *parent, const char *name )
{ {
#define END_OF_BLOCK() \ #define END_OF_BLOCK() \
( in.atEnd() || in.tqdevice()->at() >= nextBlock ) ( in.atEnd() || in.device()->at() >= nextBlock )
TQ_UINT8 lf; TQ_UINT8 lf;
TQ_UINT8 cr; TQ_UINT8 cr;
@ -1204,7 +1204,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
in >> blockType; in >> blockType;
while ( !in.atEnd() && blockType != Block_End ) { while ( !in.atEnd() && blockType != Block_End ) {
unpackUInt32( in, blockSize ); unpackUInt32( in, blockSize );
TQIODevice::Offset nextBlock = in.tqdevice()->at() + blockSize; TQIODevice::Offset nextBlock = in.device()->at() + blockSize;
switch ( blockType ) { switch ( blockType ) {
case Block_Actions: case Block_Actions:
@ -1258,7 +1258,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
case Block_Functions: case Block_Functions:
// ### // ###
qWarning( "Block_Functions not supported" ); qWarning( "Block_Functions not supported" );
in.tqdevice()->at( nextBlock ); in.device()->at( nextBlock );
break; break;
case Block_Images: case Block_Images:
{ {
@ -1340,7 +1340,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
case Block_Variables: case Block_Variables:
// ### // ###
qWarning( "Block_Variables not supported" ); qWarning( "Block_Variables not supported" );
in.tqdevice()->at( nextBlock ); in.device()->at( nextBlock );
break; break;
case Block_Widget: case Block_Widget:
toplevel = (TQWidget *) toplevel = (TQWidget *)
@ -2140,9 +2140,9 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto
} }
TQString s = "2""%1"; TQString s = "2""%1";
s = s.tqarg( conn.signal.data() ); s = s.arg( conn.signal.data() );
TQString s2 = "1""%1"; TQString s2 = "1""%1";
s2 = s2.tqarg( conn.slot.data() ); s2 = s2.arg( conn.slot.data() );
TQStrList signalList = sender->metaObject()->signalNames( TRUE ); TQStrList signalList = sender->metaObject()->signalNames( TRUE );
TQStrList slotList = receiver->metaObject()->slotNames( TRUE ); TQStrList slotList = receiver->metaObject()->slotNames( TRUE );

@ -194,7 +194,7 @@ void AddAttributeDialog::updateGUI()
void AddAttributeDialog::addAttribute() void AddAttributeDialog::addAttribute()
{ {
TQListViewItem * item = new TQListViewItem( attributes, "Protected", "Normal", TQListViewItem * item = new TQListViewItem( attributes, "Protected", "Normal",
"int", TQString( "attribute_%1" ).tqarg( ++m_count ) ); "int", TQString( "attribute_%1" ).arg( ++m_count ) );
attributes->setCurrentItem( item ); attributes->setCurrentItem( item );
attributes->setSelected( item, true ); attributes->setSelected( item, true );

@ -293,7 +293,7 @@ void AddMethodDialog::updateGUI()
void AddMethodDialog::addMethod() void AddMethodDialog::addMethod()
{ {
TQListViewItem * item = new TQListViewItem( methods, "False", "Public", "Normal", TQListViewItem * item = new TQListViewItem( methods, "False", "Public", "Normal",
"void", TQString( "method_%1()" ).tqarg( ++m_count ), "void", TQString( "method_%1()" ).arg( ++m_count ),
sourceFile->currentText() ); sourceFile->currentText() );
methods->setCurrentItem( item ); methods->setCurrentItem( item );
methods->setSelected( item, true ); methods->setSelected( item, true );

@ -159,7 +159,7 @@ void %{APPNAME}::load( const TQString &fileName )
e->setText( ts.read() ); e->setText( ts.read() );
e->setModified( FALSE ); e->setModified( FALSE );
setCaption( fileName ); setCaption( fileName );
statusBar()->message( tr("Loaded document %1").tqarg(fileName), 2000 ); statusBar()->message( tr("Loaded document %1").arg(fileName), 2000 );
} }
@ -173,7 +173,7 @@ void %{APPNAME}::save()
TQString text = e->text(); TQString text = e->text();
TQFile f( filename ); TQFile f( filename );
if ( !f.open( IO_WriteOnly ) ) { if ( !f.open( IO_WriteOnly ) ) {
statusBar()->message( tr("Could not write to %1").tqarg(filename), statusBar()->message( tr("Could not write to %1").arg(filename),
2000 ); 2000 );
return; return;
} }
@ -186,7 +186,7 @@ void %{APPNAME}::save()
setCaption( filename ); setCaption( filename );
statusBar()->message( tr( "File %1 saved" ).tqarg( filename ), 2000 ); statusBar()->message( tr( "File %1 saved" ).arg( filename ), 2000 );
} }

@ -33,7 +33,7 @@ void %{APPNAMELC}View::settingsChanged()
sillyLabel->setPaletteForegroundColor( Settings::col_foreground() ); sillyLabel->setPaletteForegroundColor( Settings::col_foreground() );
// i18n : internationalization // i18n : internationalization
sillyLabel->setText( i18n("This project is %1 days old").tqarg(Settings::val_time()) ); sillyLabel->setText( i18n("This project is %1 days old").arg(Settings::val_time()) );
emit signalChangeStatusbar( i18n("Settings changed") ); emit signalChangeStatusbar( i18n("Settings changed") );
} }

@ -196,7 +196,7 @@
<property name="scaledContents" > <property name="scaledContents" >
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="tqalignment" > <property name="alignment" >
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
<property name="wordWrap" > <property name="wordWrap" >

@ -48,7 +48,7 @@ void kio_%{APPNAMELC}Protocol::get(const KURL& url )
int remotePort = url.port(); int remotePort = url.port();
kdDebug() << "myURL: " << url.prettyURL() << endl; kdDebug() << "myURL: " << url.prettyURL() << endl;
infoMessage(i18n("Looking for %1...").tqarg( remoteServer ) ); infoMessage(i18n("Looking for %1...").arg( remoteServer ) );
// Send the mimeType as soon as it is known // Send the mimeType as soon as it is known
mimeType("text/plain"); mimeType("text/plain");
// Send the data // Send the data

@ -45,7 +45,7 @@
<property name="scaledContents"> <property name="scaledContents">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignCenter</set> <set>AlignCenter</set>
</property> </property>
</widget> </widget>

@ -33,7 +33,7 @@ void %{APPNAME}View::settingsChanged()
sillyLabel->setPaletteForegroundColor( Settings::col_foreground() ); sillyLabel->setPaletteForegroundColor( Settings::col_foreground() );
// i18n : internationalization // i18n : internationalization
sillyLabel->setText( i18n("This project is %1 days old").tqarg(Settings::val_time()) ); sillyLabel->setText( i18n("This project is %1 days old").arg(Settings::val_time()) );
emit signalChangeStatusbar( i18n("Settings changed") ); emit signalChangeStatusbar( i18n("Settings changed") );
} }

@ -33,7 +33,7 @@ void %{APPNAMELC}View::settingsChanged()
sillyLabel->setPaletteForegroundColor( Settings::col_foreground() ); sillyLabel->setPaletteForegroundColor( Settings::col_foreground() );
// i18n : internationalization // i18n : internationalization
sillyLabel->setText( i18n("This project is %1 days old").tqarg(Settings::val_time()) ); sillyLabel->setText( i18n("This project is %1 days old").arg(Settings::val_time()) );
emit signalChangeStatusbar( i18n("Settings changed") ); emit signalChangeStatusbar( i18n("Settings changed") );
} }

@ -124,7 +124,7 @@
connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(playlistHidden())); connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(playlistHidden()));
// Event Filter for the RMB // Event Filter for the RMB
for (TQPtrListIterator<TQObject> i(*tqchildren()); i.current(); ++i) for (TQPtrListIterator<TQObject> i(*children()); i.current(); ++i)
(*i)->installEventFilter(this); (*i)->installEventFilter(this);
setCaption("Noatun"); setCaption("Noatun");
@ -189,7 +189,7 @@ void %{APPNAME}UI::changeCaption(const TQString& text)
void %{APPNAME}UI::popup() void %{APPNAME}UI::popup()
{ {
NoatunStdAction::ContextMenu::showContextMenu( NoatunStdAction::ContextMenu::showContextMenu(
mapToGlobal(mPopup->tqgeometry().bottomLeft()) ); mapToGlobal(mPopup->geometry().bottomLeft()) );
} }
void %{APPNAME}UI::slotPlaying() void %{APPNAME}UI::slotPlaying()

@ -117,7 +117,7 @@ void Bitmap<Type>::fadeStar()
d++; d++;
x++; x++;
} }
tqrepaint(); repaint();
} }
} }
@ -220,7 +220,7 @@ void %{APPNAME}View::checkInput()
#define output2 ((unsigned char*)outputBmp.data) #define output2 ((unsigned char*)outputBmp.data)
void %{APPNAME}View::tqrepaint() void %{APPNAME}View::repaint()
{ {
SDL_LockSurface(surface); SDL_LockSurface(surface);
TEST(); TEST();

@ -58,7 +58,7 @@ protected:
void setupPalette(double dummy=0.0); void setupPalette(double dummy=0.0);
/** Draw everything. */ /** Draw everything. */
void tqrepaint(); void repaint();
private: private:
/** used for pipelining */ /** used for pipelining */

@ -7,7 +7,7 @@
<cstring>%{APPNAME}Base</cstring> <cstring>%{APPNAME}Base</cstring>
</property> </property>
<property stdset="1"> <property stdset="1">
<name>tqgeometry</name> <name>geometry</name>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>

@ -22,7 +22,7 @@ static Boolean MainFormHandleEvent (EventPtr e)
break; break;
case menuEvent: case menuEvent:
MenuEraseStatus(NULL); MenuErasetStatus(NULL);
switch(e->data.menu.itemID) { switch(e->data.menu.itemID) {
} }

@ -159,7 +159,7 @@ void %{APPNAME}::load( const TQString &fileName )
e->setText( ts.read() ); e->setText( ts.read() );
e->setModified( FALSE ); e->setModified( FALSE );
setCaption( fileName ); setCaption( fileName );
statusBar()->message( tr("Loaded document %1").tqarg(fileName), 2000 ); statusBar()->message( tr("Loaded document %1").arg(fileName), 2000 );
} }
@ -173,7 +173,7 @@ void %{APPNAME}::save()
TQString text = e->text(); TQString text = e->text();
TQFile f( filename ); TQFile f( filename );
if ( !f.open( IO_WriteOnly ) ) { if ( !f.open( IO_WriteOnly ) ) {
statusBar()->message( tr("Could not write to %1").tqarg(filename), statusBar()->message( tr("Could not write to %1").arg(filename),
2000 ); 2000 );
return; return;
} }
@ -186,7 +186,7 @@ void %{APPNAME}::save()
setCaption( filename ); setCaption( filename );
statusBar()->message( tr( "File %1 saved" ).tqarg( filename ), 2000 ); statusBar()->message( tr( "File %1 saved" ).arg( filename ), 2000 );
} }

@ -223,8 +223,8 @@ void %{APPNAME}::loadFile(const TQString &fileName)
if (!file.open(TQFile::ReadOnly | TQFile::Text)) { if (!file.open(TQFile::ReadOnly | TQFile::Text)) {
TQMessageBox::warning(this, tr("Application"), TQMessageBox::warning(this, tr("Application"),
tr("Cannot read file %1:\n%2.") tr("Cannot read file %1:\n%2.")
.tqarg(fileName) .arg(fileName)
.tqarg(file.errorString())); .arg(file.errorString()));
return; return;
} }
@ -243,8 +243,8 @@ bool %{APPNAME}::saveFile(const TQString &fileName)
if (!file.open(TQFile::WriteOnly | TQFile::Text)) { if (!file.open(TQFile::WriteOnly | TQFile::Text)) {
TQMessageBox::warning(this, tr("Application"), TQMessageBox::warning(this, tr("Application"),
tr("Cannot write file %1:\n%2.") tr("Cannot write file %1:\n%2.")
.tqarg(fileName) .arg(fileName)
.tqarg(file.errorString())); .arg(file.errorString()));
return false; return false;
} }
@ -270,7 +270,7 @@ void %{APPNAME}::setCurrentFile(const TQString &fileName)
else else
shownName = strippedName(curFile); shownName = strippedName(curFile);
setWindowTitle(tr("%1[*] - %2").tqarg(shownName).tqarg(tr("Application"))); setWindowTitle(tr("%1[*] - %2").arg(shownName).arg(tr("Application")));
} }
TQString %{APPNAME}::strippedName(const TQString &fullFileName) TQString %{APPNAME}::strippedName(const TQString &fullFileName)

@ -7,7 +7,7 @@
<cstring>%{APPNAME}Base</cstring> <cstring>%{APPNAME}Base</cstring>
</property> </property>
<property stdset="1"> <property stdset="1">
<name>tqgeometry</name> <name>geometry</name>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>

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

@ -230,7 +230,7 @@ void CCConfigWidget::slotRemovePCS()
return ; return ;
TQString db = advancedOptions->selectedItem() ->text( 0 ); TQString db = advancedOptions->selectedItem() ->text( 0 );
TQString question = i18n( "Are you sure you want to delete the \"%1\" database?" ).tqarg( db ); TQString question = i18n( "Are you sure you want to delete the \"%1\" database?" ).arg( db );
KStandardDirs *dirs = m_pPart->instance() ->dirs(); KStandardDirs *dirs = m_pPart->instance() ->dirs();
TQString dbName = dirs->saveLocation( "data", "kdevcppsupport/pcs" ) + KURL::encode_string_no_slash( db ) + ".db"; TQString dbName = dirs->saveLocation( "data", "kdevcppsupport/pcs" ) + KURL::encode_string_no_slash( db ) + ".db";

@ -949,7 +949,7 @@ This option only applies to QMake projects.</string>
<property name="text"> <property name="text">
<string>(After changing the project needs to be re-opened)</string> <string>(After changing the project needs to be re-opened)</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
</widget> </widget>

@ -438,7 +438,7 @@ Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent, const
"qualifier from the target type</qt>" ) ); "qualifier from the target type</qt>" ) );
new FlagListItem( wrestBox, new FlagListItem( wrestBox,
"-Wcast-align", i18n( "<qt>Warn whenever a pointer is cast such that the required\n" "-Wcast-align", i18n( "<qt>Warn whenever a pointer is cast such that the required\n"
"tqalignment of the target is increased</qt>" ) ); "alignment of the target is increased</qt>" ) );
new FlagListItem( wrestBox, new FlagListItem( wrestBox,
"-Wwrite-strings", i18n( "<qt>Warn when the address of a string constant is cast\n" "-Wwrite-strings", i18n( "<qt>Warn when the address of a string constant is cast\n"
"into a non-const <i>char *</i> pointer</qt>" ) ); "into a non-const <i>char *</i> pointer</qt>" ) );

@ -91,7 +91,7 @@ If disabled, the parser will typically only run when the file is saved.</string>
<property name="text"> <property name="text">
<string>msec</string> <string>msec</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignLeft</set> <set>AlignVCenter|AlignLeft</set>
</property> </property>
</widget> </widget>

@ -92,7 +92,7 @@ void ConfigureProblemReporter::bgParserCheckbox_toggled( bool b )
void ConfigureProblemReporter::setDelayLabel( int delay ) void ConfigureProblemReporter::setDelayLabel( int delay )
{ {
delayLabel->setText( i18n( "delay: %1 msec" ).tqarg( delay ) ); delayLabel->setText( i18n( "delay: %1 msec" ).arg( delay ) );
} }
// kate: indent-mode csands; tab-width 4; // kate: indent-mode csands; tab-width 4;

@ -356,7 +356,7 @@ struct PopupFillerHelpStruct {
if ( d.memberType == SimpleTypeImpl::MemberInfo::Typedef && d.type->fullName() == "const int" ) if ( d.memberType == SimpleTypeImpl::MemberInfo::Typedef && d.type->fullName() == "const int" )
memType = "enum"; memType = "enum";
TQString txt = i18n( "Jump to %1 %2" ).tqarg( memType ).tqarg( cleanForMenu( d.name ) ); TQString txt = i18n( "Jump to %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) );
int id = parent->insertItem( txt, receiver, TQT_SLOT( popupAction( int ) ) ); int id = parent->insertItem( txt, receiver, TQT_SLOT( popupAction( int ) ) );
receiver->m_popupActions.insert( id, d.decl ); receiver->m_popupActions.insert( id, d.decl );
@ -423,7 +423,7 @@ struct PopupFillerHelpStruct {
int sLine, sCol, eLine, eCol; int sLine, sCol, eLine, eCol;
i->getStartPosition( &sLine, &sCol ); i->getStartPosition( &sLine, &sCol );
i->getEndPosition( &eLine, &eCol ); i->getEndPosition( &eLine, &eCol );
insertItem( parent, (new SimpleTypeCodeModel( i ))->desc(), prefix + " " + (*it)->name() + TQString(" (%1 Lines): ").tqarg( eLine - sLine ) ); ///SimpleTypeCodeModel is used instead of SimpleTypeCachedNodeModel, so the detection at (1) does not trigger, this avoids endless recursion. insertItem( parent, (new SimpleTypeCodeModel( i ))->desc(), prefix + " " + (*it)->name() + TQString(" (%1 Lines): ").arg( eLine - sLine ) ); ///SimpleTypeCodeModel is used instead of SimpleTypeCachedNodeModel, so the detection at (1) does not trigger, this avoids endless recursion.
} }
} }
@ -434,10 +434,10 @@ struct PopupFillerHelpStruct {
if ( d.resolved() ) { if ( d.resolved() ) {
if ( d.resolved() ->asFunction() ) { if ( d.resolved() ->asFunction() ) {
txt1 = prefix + i18n( "Jump to declaration of %1(...)" ).tqarg( d.resolved() ->scope().join( "::" ) ); txt1 = prefix + i18n( "Jump to declaration of %1(...)" ).arg( d.resolved() ->scope().join( "::" ) );
txt2 = prefix + i18n( "Jump to definition of %1(...)" ).tqarg( d.resolved() ->scope().join( "::" ) ); txt2 = prefix + i18n( "Jump to definition of %1(...)" ).arg( d.resolved() ->scope().join( "::" ) );
} else { } else {
txt1 = prefix + i18n( "Jump to %1" ).tqarg( cleanForMenu( d.resolved() ->scope().join( "::" ) ) ); txt1 = prefix + i18n( "Jump to %1" ).arg( cleanForMenu( d.resolved() ->scope().join( "::" ) ) );
} }
} else { } else {
if( !BuiltinTypes::isBuiltin( d ) ) { if( !BuiltinTypes::isBuiltin( d ) ) {
@ -536,7 +536,7 @@ struct PopupClassViewFillerHelpStruct {
if ( d.memberType == SimpleTypeImpl::MemberInfo::Typedef && d.type->fullName() == "const int" ) if ( d.memberType == SimpleTypeImpl::MemberInfo::Typedef && d.type->fullName() == "const int" )
memType = "enum"; memType = "enum";
TQString txt = i18n( "Show %1 %2" ).tqarg( memType ).tqarg( cleanForMenu( d.name ) ); TQString txt = i18n( "Show %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) );
int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) );
receiver->m_popupClassViewActions.insert( id, dom ); receiver->m_popupClassViewActions.insert( id, dom );
@ -583,7 +583,7 @@ struct PopupClassViewFillerHelpStruct {
if ( d.resolved() ->asFunction() ) { if ( d.resolved() ->asFunction() ) {
n = buildSignature( d.resolved() ); n = buildSignature( d.resolved() );
} }
txt = prefix + i18n( "Show %1" ).tqarg( cleanForMenu( n ) ); txt = prefix + i18n( "Show %1" ).arg( cleanForMenu( n ) );
} else { } else {
txt = prefix + d.name() + " not in code-model"; txt = prefix + d.name() + " not in code-model";
} }
@ -644,7 +644,7 @@ class PopupFiller {
//kdDebug( 9007 ) << "found include-file \"" << includeFile << "\"" << endl; //kdDebug( 9007 ) << "found include-file \"" << includeFile << "\"" << endl;
} }
int id = parent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).tqarg ( includeFile ).tqarg( decl.name ), struk.receiver, TQT_SLOT( popupAction( int ) ) ); int id = parent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).arg ( includeFile ).arg( decl.name ), struk.receiver, TQT_SLOT( popupAction( int ) ) );
DeclarationInfo fakeDec; DeclarationInfo fakeDec;
fakeDec.name = decl.name; fakeDec.name = decl.name;
fakeDec.file = includeFile; fakeDec.file = includeFile;
@ -670,7 +670,7 @@ class PopupFiller {
f.type = d.desc(); f.type = d.desc();
f.memberType = SimpleTypeImpl::MemberInfo::Variable; f.memberType = SimpleTypeImpl::MemberInfo::Variable;
/*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").tqarg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) ); /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) );
m_popupActions.insert( id, type.sourceVariable );*/ m_popupActions.insert( id, type.sourceVariable );*/
struk.insertItem( parent, f, prefix ); struk.insertItem( parent, f, prefix );
@ -679,7 +679,7 @@ class PopupFiller {
if ( !sourceVariable.comment.isEmpty() ) { if ( !sourceVariable.comment.isEmpty() ) {
TQPopupMenu * m = PopupTracker::createPopup( parent ); TQPopupMenu * m = PopupTracker::createPopup( parent );
parent->insertItem( i18n( "Comment on %1" ).tqarg( sourceVariable.name ), m ); parent->insertItem( i18n( "Comment on %1" ).arg( sourceVariable.name ), m );
TQStringList ls = prepareTextForMenu( sourceVariable.comment, 15, 100 ); TQStringList ls = prepareTextForMenu( sourceVariable.comment, 15, 100 );
for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) {
m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) );
@ -695,7 +695,7 @@ class PopupFiller {
LocateResult r = p->locateDecType( d->name() ); LocateResult r = p->locateDecType( d->name() );
if( r ) { if( r ) {
TQPopupMenu * m = PopupTracker::createPopup( parent ); TQPopupMenu * m = PopupTracker::createPopup( parent );
parent->insertItem( i18n( "Specialized from \"%1\"" ).tqarg( cleanForMenu( r->fullNameChain() ) ), m ); parent->insertItem( i18n( "Specialized from \"%1\"" ).arg( cleanForMenu( r->fullNameChain() ) ), m );
fill( m, r ); fill( m, r );
} }
} }
@ -704,7 +704,7 @@ class PopupFiller {
for ( TypeDesc::TemplateParams::iterator it = p.begin(); it != p.end(); ++it ) { for ( TypeDesc::TemplateParams::iterator it = p.begin(); it != p.end(); ++it ) {
//if( (*it)->resolved() ) { //if( (*it)->resolved() ) {
TQPopupMenu * m = PopupTracker::createPopup( parent ); TQPopupMenu * m = PopupTracker::createPopup( parent );
parent->insertItem( i18n( "Template-param \"%1\"" ).tqarg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m ); parent->insertItem( i18n( "Template-param \"%1\"" ).arg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m );
fill( m, **it ); fill( m, **it );
/*} else { /*} else {
fill( parent, **it, prefix + depthAdd ); fill( parent, **it, prefix + depthAdd );
@ -716,7 +716,7 @@ class PopupFiller {
LocateResult rt = d->resolved() ->locateDecType( d->resolved() ->asFunction() ->getReturnType() ); LocateResult rt = d->resolved() ->locateDecType( d->resolved() ->asFunction() ->getReturnType() );
if ( rt ) { if ( rt ) {
TQPopupMenu * m = PopupTracker::createPopup( parent ); TQPopupMenu * m = PopupTracker::createPopup( parent );
parent->insertItem( i18n( "Return-type \"%1\"" ).tqarg( cleanForMenu( rt->fullNameChain() ) ), m ); parent->insertItem( i18n( "Return-type \"%1\"" ).arg( cleanForMenu( rt->fullNameChain() ) ), m );
fill( m, rt ); fill( m, rt );
} }
@ -734,7 +734,7 @@ class PopupFiller {
++it2; ++it2;
} }
TQPopupMenu * mo = PopupTracker::createPopup( m ); TQPopupMenu * mo = PopupTracker::createPopup( m );
m->insertItem( i18n( "Argument \"%1\"" ).tqarg( cleanForMenu( at->fullNameChain() + " " + name ) ), mo ); m->insertItem( i18n( "Argument \"%1\"" ).arg( cleanForMenu( at->fullNameChain() + " " + name ) ), mo );
fill( mo, at ); fill( mo, at );
} }
@ -753,7 +753,7 @@ class PopupFiller {
TQString tail = ( *it ).second.fullNameChain(); TQString tail = ( *it ).second.fullNameChain();
if ( !tail.isEmpty() ) if ( !tail.isEmpty() )
tail = "::" + tail; tail = "::" + tail;
m->insertItem( i18n( "%1 -> %2" ).tqarg( cleanForMenu( ( *it ).first.name + tail ) ).tqarg( cleanForMenu( ( *it ).first.type->fullNameChain() + tail ) ), mo ); m->insertItem( i18n( "%1 -> %2" ).arg( cleanForMenu( ( *it ).first.name + tail ) ).arg( cleanForMenu( ( *it ).first.type->fullNameChain() + tail ) ), mo );
struk.insertItem( mo, ( *it ).first, prefix ); struk.insertItem( mo, ( *it ).first, prefix );
@ -779,20 +779,20 @@ class PopupFiller {
TQValueList<LocateResult> bases = d->resolved() ->getBases(); TQValueList<LocateResult> bases = d->resolved() ->getBases();
for ( TQValueList<LocateResult>::iterator it = bases.begin(); it != bases.end(); ++it ) { for ( TQValueList<LocateResult>::iterator it = bases.begin(); it != bases.end(); ++it ) {
TQPopupMenu * m = PopupTracker::createPopup( parent ); TQPopupMenu * m = PopupTracker::createPopup( parent );
parent->insertItem( i18n( "Base-class \"%1\"" ).tqarg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m ); parent->insertItem( i18n( "Base-class \"%1\"" ).arg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m );
fill( m, *it ); fill( m, *it );
} }
if ( d->resolved() ->parent() && d->resolved() ->parent() ->desc() ) { if ( d->resolved() ->parent() && d->resolved() ->parent() ->desc() ) {
TQPopupMenu * m = PopupTracker::createPopup( parent ); TQPopupMenu * m = PopupTracker::createPopup( parent );
parent->insertItem( i18n( "Nested in \"%1\"" ).tqarg( cleanForMenu( d->resolved() ->parent() ->fullTypeResolved() ) ), m ); parent->insertItem( i18n( "Nested in \"%1\"" ).arg( cleanForMenu( d->resolved() ->parent() ->fullTypeResolved() ) ), m );
fill( m, d->resolved() ->parent() ->desc() ); fill( m, d->resolved() ->parent() ->desc() );
} }
if ( !d->resolved() ->comment().isEmpty() ) { if ( !d->resolved() ->comment().isEmpty() ) {
parent->insertSeparator(); parent->insertSeparator();
TQPopupMenu * m = PopupTracker::createPopup( parent ); TQPopupMenu * m = PopupTracker::createPopup( parent );
parent->insertItem( i18n( "Comment on %1" ).tqarg( cleanForMenu( d->name() ) ), m ); parent->insertItem( i18n( "Comment on %1" ).arg( cleanForMenu( d->name() ) ), m );
TQStringList ls = prepareTextForMenu( d->resolved() ->comment(), 15, 100 ); TQStringList ls = prepareTextForMenu( d->resolved() ->comment(), 15, 100 );
for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) {
m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) );
@ -1449,7 +1449,7 @@ void CppCodeCompletion::popupAction( int number ) {
TQString fileName = ( *it ).file == "current_file" ? m_activeFileName : ( *it ).file.operator TQString(); TQString fileName = ( *it ).file == "current_file" ? m_activeFileName : ( *it ).file.operator TQString();
if( (*it).startLine == -1 ) { if( (*it).startLine == -1 ) {
//startLine -1 indicates that the file should be added to the include-files //startLine -1 indicates that the file should be added to the include-files
m_activeEditor->insertLine( 0, TQString("#include \"%1\" /* defines %2 */").tqarg( fileName ).tqarg( (*it).name ) ); m_activeEditor->insertLine( 0, TQString("#include \"%1\" /* defines %2 */").arg( fileName ).arg( (*it).name ) );
} else { } else {
m_pSupport->partController() ->editDocument( fileName, ( *it ).startLine ); m_pSupport->partController() ->editDocument( fileName, ( *it ).startLine );
} }
@ -1532,11 +1532,11 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte
TQPopupMenu * m = PopupTracker::createPopup( popup ); TQPopupMenu * m = PopupTracker::createPopup( popup );
int gid; int gid;
if ( contextMenuEntriesAtTop ) if ( contextMenuEntriesAtTop )
gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).tqarg( cleanForMenu( type.macro.name() ) ), m, 5, cpos++ ); gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).arg( cleanForMenu( type.macro.name() ) ), m, 5, cpos++ );
else else
gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).tqarg( cleanForMenu( type.macro.name() ) ), m ); gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).arg( cleanForMenu( type.macro.name() ) ), m );
int id = m->insertItem( i18n( "Jump to %1" ).tqarg( cleanForMenu( type.macro.name() ) ), this, TQT_SLOT( popupAction( int ) ) ); int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( type.macro.name() ) ), this, TQT_SLOT( popupAction( int ) ) );
TQPopupMenu * b = PopupTracker::createPopup( m ); TQPopupMenu * b = PopupTracker::createPopup( m );
m->insertItem( i18n( "Body" ), b ); m->insertItem( i18n( "Body" ), b );
@ -1564,11 +1564,11 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte
int gid; int gid;
TQPopupMenu * m = PopupTracker::createPopup( popup ); TQPopupMenu * m = PopupTracker::createPopup( popup );
if ( contextMenuEntriesAtTop ) if ( contextMenuEntriesAtTop )
gid = popup->insertItem( i18n( "Goto Include File: %1" ).tqarg( cleanForMenu( includeFileName ) ), m, 5, cpos++ ); gid = popup->insertItem( i18n( "Goto Include File: %1" ).arg( cleanForMenu( includeFileName ) ), m, 5, cpos++ );
else else
gid = popup->insertItem( i18n( "Goto Include File: %1" ).tqarg( cleanForMenu( includeFileName ) ), m ); gid = popup->insertItem( i18n( "Goto Include File: %1" ).arg( cleanForMenu( includeFileName ) ), m );
int id = m->insertItem( i18n( "Jump to %1" ).tqarg( cleanForMenu( includeFilePath ) ), this, TQT_SLOT( popupAction( int ) ) ); int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( includeFilePath ) ), this, TQT_SLOT( popupAction( int ) ) );
DeclarationInfo i; DeclarationInfo i;
i.file = includeFilePath; i.file = includeFilePath;
@ -1585,9 +1585,9 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte
} else { } else {
///Could not find include-file ///Could not find include-file
if ( contextMenuEntriesAtTop ) if ( contextMenuEntriesAtTop )
popup->insertItem( i18n( "Not Found: \"%1\"" ).tqarg( includeFileName ), 5, cpos++ ); popup->insertItem( i18n( "Not Found: \"%1\"" ).arg( includeFileName ), 5, cpos++ );
else else
popup->insertItem( i18n( "Not Found: \"%1\"" ).tqarg( includeFileName ) ); popup->insertItem( i18n( "Not Found: \"%1\"" ).arg( includeFileName ) );
} }
} }
@ -1609,14 +1609,14 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte
TQPopupMenu * m = PopupTracker::createPopup( popup ); TQPopupMenu * m = PopupTracker::createPopup( popup );
int gid; int gid;
if ( contextMenuEntriesAtTop ) if ( contextMenuEntriesAtTop )
gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).tqarg( cleanForMenu( name ) ), m, 5, cpos++ ); gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).arg( cleanForMenu( name ) ), m, 5, cpos++ );
else else
gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).tqarg( cleanForMenu( name ) ), m ); gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).arg( cleanForMenu( name ) ), m );
popup->setWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to navigate to positions of items that are involved in this expression" ) ); popup->setWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to navigate to positions of items that are involved in this expression" ) );
/*if( type.sourceVariable && type.sourceVariable.name != "this" ) { /*if( type.sourceVariable && type.sourceVariable.name != "this" ) {
int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").tqarg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) ); int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) );
m_popupActions.insert( id, type.sourceVariable ); m_popupActions.insert( id, type.sourceVariable );
}*/ }*/
@ -1629,9 +1629,9 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte
TQPopupMenu * m = PopupTracker::createPopup( popup ); TQPopupMenu * m = PopupTracker::createPopup( popup );
int gid; int gid;
if ( contextMenuEntriesAtTop ) if ( contextMenuEntriesAtTop )
gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).tqarg( cleanForMenu( name ) ), m, 6, cpos++ ); gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).arg( cleanForMenu( name ) ), m, 6, cpos++ );
else else
gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).tqarg( cleanForMenu( name ) ), m ); gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).arg( cleanForMenu( name ) ), m );
popup->setWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to show involved items in the class-view " ) ); popup->setWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to show involved items in the class-view " ) );
@ -1703,27 +1703,27 @@ void CppCodeCompletion::slotTextHint( int line, int column, TQString &text ) {
const int timeout = 2000; const int timeout = 2000;
if ( type->resolved() ) { if ( type->resolved() ) {
addStatusText( i18n( "Type of \"%1\" is \"%2\"" ).tqarg( type.expr.expr() ).tqarg( type->fullNameChain() ), timeout ); addStatusText( i18n( "Type of \"%1\" is \"%2\"" ).arg( type.expr.expr() ).arg( type->fullNameChain() ), timeout );
if ( type.sourceVariable && !type.sourceVariable.comment.isEmpty() ) { if ( type.sourceVariable && !type.sourceVariable.comment.isEmpty() ) {
addStatusText( i18n( "Comment on variable \"%1\": \"%2\"" ).tqarg( type.sourceVariable.name ).tqarg( type.sourceVariable.comment ) , 10000 ); addStatusText( i18n( "Comment on variable \"%1\": \"%2\"" ).arg( type.sourceVariable.name ).arg( type.sourceVariable.comment ) , 10000 );
} }
if ( !type->resolved() ->comment().isEmpty() ) { if ( !type->resolved() ->comment().isEmpty() ) {
addStatusText( i18n( "Comment on \"%1\": \"%2\"" ).tqarg( type->name() ).tqarg( type->resolved() ->comment() ) , 10000 ); addStatusText( i18n( "Comment on \"%1\": \"%2\"" ).arg( type->name() ).arg( type->resolved() ->comment() ) , 10000 );
} }
if ( type->resolved() ->comment().isEmpty() ) { if ( type->resolved() ->comment().isEmpty() ) {
addStatusText( i18n( "\"%1\" has no comment" ).tqarg( type->name() ) , timeout ); addStatusText( i18n( "\"%1\" has no comment" ).arg( type->name() ) , timeout );
} }
} else { } else {
if ( type ) { if ( type ) {
if( !BuiltinTypes::isBuiltin( type.resultType ) ) { if( !BuiltinTypes::isBuiltin( type.resultType ) ) {
addStatusText( i18n( "Type of \"%1\" is unresolved, name: \"%2\"" ).tqarg( type.expr.expr() ).tqarg( type->fullNameChain() ), 2 * timeout ); addStatusText( i18n( "Type of \"%1\" is unresolved, name: \"%2\"" ).arg( type.expr.expr() ).arg( type->fullNameChain() ), 2 * timeout );
} else { } else {
addStatusText( i18n( "\"%1\" is of builtin type \"%2\", a %3" ).tqarg( type.expr.expr() ).tqarg( type->fullNameChain() ).tqarg(BuiltinTypes::comment( type.resultType )), 2 * timeout ); addStatusText( i18n( "\"%1\" is of builtin type \"%2\", a %3" ).arg( type.expr.expr() ).arg( type->fullNameChain() ).arg(BuiltinTypes::comment( type.resultType )), 2 * timeout );
} }
} else { } else {
addStatusText( i18n( "Type of \"%1\" could not be evaluated: tried to evaluate expression as \"%2\"" ).tqarg( type.expr.expr() ).tqarg( type.expr.typeAsString() ), 2 * timeout ); addStatusText( i18n( "Type of \"%1\" could not be evaluated: tried to evaluate expression as \"%2\"" ).arg( type.expr.expr() ).arg( type.expr.typeAsString() ), 2 * timeout );
} }
} }
@ -2059,14 +2059,14 @@ void CppCodeCompletion::needRecoveryPoints() {
if ( !ast ) { if ( !ast ) {
kdDebug( 9007 ) << "background-parser is missing the translation-unit. The file needs to be reparsed." << endl; kdDebug( 9007 ) << "background-parser is missing the translation-unit. The file needs to be reparsed." << endl;
m_pSupport->parseFileAndDependencies( m_activeFileName, true ); m_pSupport->parseFileAndDependencies( m_activeFileName, true );
// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Background-parser is missing the necessary translation-unit. It will be computed, but this completion will fail." ).tqarg( m_activeFileName ), 2000 ); // m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Background-parser is missing the necessary translation-unit. It will be computed, but this completion will fail." ).arg( m_activeFileName ), 2000 );
return; return;
} else { } else {
computeRecoveryPointsLocked(); computeRecoveryPointsLocked();
} }
if ( this->d->recoveryPoints.isEmpty() ) { if ( this->d->recoveryPoints.isEmpty() ) {
kdDebug( 9007 ) << "Failed to compute recovery-points for " << m_activeFileName << endl; kdDebug( 9007 ) << "Failed to compute recovery-points for " << m_activeFileName << endl;
// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Failed to compute recovery-points for %1" ).tqarg( m_activeFileName ), 1000 ); // m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Failed to compute recovery-points for %1" ).arg( m_activeFileName ), 1000 );
} else { } else {
kdDebug( 9007 ) << "successfully computed recovery-points for " << m_activeFileName << endl; kdDebug( 9007 ) << "successfully computed recovery-points for " << m_activeFileName << endl;
} }
@ -2080,7 +2080,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column
FileDom file = m_pSupport->codeModel() ->fileByName( m_activeFileName ); FileDom file = m_pSupport->codeModel() ->fileByName( m_activeFileName );
if ( !file ) { if ( !file ) {
// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "File %1 does not exist in the code-model" ).tqarg( m_activeFileName ), 1000 ); // m_pSupport->mainWindow() ->statusBar() ->message( i18n( "File %1 does not exist in the code-model" ).arg( m_activeFileName ), 1000 );
kdDebug( 9007 ) << "Error: file " << m_activeFileName << " could not be located in the code-model, code-completion stopped\n"; kdDebug( 9007 ) << "Error: file " << m_activeFileName << " could not be located in the code-model, code-completion stopped\n";
return SimpleType(); return SimpleType();
} }
@ -2113,7 +2113,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column
c = strCurLine[ --pos ]; c = strCurLine[ --pos ];
if ( !( c.isLetterOrNumber() || c == '_' || c == ')' || c == ']' || c == '>' ) ) { if ( !( c.isLetterOrNumber() || c == '_' || c == ')' || c == ']' || c == '>' ) ) {
conf.tqinvalidate(); conf.invalidate();
return SimpleType(); return SimpleType();
} }
} }
@ -2280,7 +2280,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column
CppCodeCompletionConfig * cfg = m_pSupport->codeCompletionConfig(); CppCodeCompletionConfig * cfg = m_pSupport->codeCompletionConfig();
if( cfg->usePermanentCaching() && contextItem ) { if( cfg->usePermanentCaching() && contextItem ) {
conf.tqinvalidate(); conf.invalidate();
m_cachedFromContext = contextItem; m_cachedFromContext = contextItem;
} }
@ -2323,7 +2323,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) {
FileDom file = m_pSupport->codeModel() ->fileByName( m_activeFileName ); FileDom file = m_pSupport->codeModel() ->fileByName( m_activeFileName );
if ( !file ) { if ( !file ) {
// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "File %1 does not exist in the code-model" ).tqarg( m_activeFileName ), 1000 ); // m_pSupport->mainWindow() ->statusBar() ->message( i18n( "File %1 does not exist in the code-model" ).arg( m_activeFileName ), 1000 );
kdDebug( 9007 ) << "Error: file " << m_activeFileName << " could not be located in the code-model, code-completion stopped\n"; kdDebug( 9007 ) << "Error: file " << m_activeFileName << " could not be located in the code-model, code-completion stopped\n";
return ; return ;
} }
@ -2905,7 +2905,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) {
ctx = 0; ctx = 0;
if ( cfg->usePermanentCaching() ) { if ( cfg->usePermanentCaching() ) {
conf.tqinvalidate(); conf.invalidate();
m_cachedFromContext = contextItem; m_cachedFromContext = contextItem;
} }
} }
@ -2972,7 +2972,7 @@ void CppCodeCompletion::slotCodeModelUpdated( const TQString& fileName ) {
if ( fileName != m_activeFileName || !m_pSupport || !m_activeEditor ) if ( fileName != m_activeFileName || !m_pSupport || !m_activeEditor )
return ; return ;
// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Current file updated %1" ).tqarg( m_activeFileName ), 1000 ); // m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Current file updated %1" ).arg( m_activeFileName ), 1000 );
computeRecoveryPointsLocked(); computeRecoveryPointsLocked();
} }
@ -2981,7 +2981,7 @@ void CppCodeCompletion::slotFileParsed( const TQString& fileName ) {
if ( fileName != m_activeFileName || !m_pSupport || !m_activeEditor ) if ( fileName != m_activeFileName || !m_pSupport || !m_activeEditor )
return ; return ;
// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Current file parsed %1 (cache emptied)" ).tqarg( m_activeFileName ), 1000 ); // m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Current file parsed %1 (cache emptied)" ).arg( m_activeFileName ), 1000 );
emptyCache(); ///The cache has to be emptied, because the code-model changed. @todo Better: Only refresh the code-model(tell all code-model-types to refresh themselves on demand) emptyCache(); ///The cache has to be emptied, because the code-model changed. @todo Better: Only refresh the code-model(tell all code-model-types to refresh themselves on demand)
@ -3463,7 +3463,7 @@ TQString CppCodeCompletion::commentFromItem( const SimpleType& parent, const Ite
ret += "\nKind: Class"; ret += "\nKind: Class";
} }
ret += TQString( "\nFile: %1\nLine: %2 Column: %3" ).tqarg( prepareTextForMenu( item->fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).tqarg( line ).tqarg( col ); ret += TQString( "\nFile: %1\nLine: %2 Column: %3" ).arg( prepareTextForMenu( item->fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).arg( line ).arg( col );
if ( !item->comment().isEmpty() ) if ( !item->comment().isEmpty() )
ret += "\n\n" + prepareTextForMenu( item->comment(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ); ret += "\n\n" + prepareTextForMenu( item->comment(), 3, MAXCOMMENTCOLUMNS ).join( "\n" );
return ret; return ret;
@ -3585,7 +3585,7 @@ TQString CppCodeCompletion::commentFromTag( const SimpleType& parent, Tag& tag )
ret += "\nKind: Struct"; ret += "\nKind: Struct";
} }
ret += TQString( "\nFile: %1\nLine: %2 Column: %3" ).tqarg( prepareTextForMenu( tag.fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).tqarg( line ).tqarg( col ); ret += TQString( "\nFile: %1\nLine: %2 Column: %3" ).arg( prepareTextForMenu( tag.fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).arg( line ).arg( col );
if ( !tag.comment().isEmpty() ) { if ( !tag.comment().isEmpty() ) {
ret += "\n\n" + prepareTextForMenu( tag.comment(), 20, MAXCOMMENTCOLUMNS ).join( "\n" ); ret += "\n\n" + prepareTextForMenu( tag.comment(), 20, MAXCOMMENTCOLUMNS ).join( "\n" );
} }
@ -3807,7 +3807,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList
break; break;
} }
e.userdata = TQString( "%1%2%3%4%5" ).tqarg( num ).tqarg( depth ).tqarg( className ).tqarg( sortPosition ).tqarg( subSorting ); e.userdata = TQString( "%1%2%3%4%5" ).arg( num ).arg( depth ).arg( className ).arg( sortPosition ).arg( subSorting );
if ( m_completionMode != SignalCompletion ) { if ( m_completionMode != SignalCompletion ) {
if ( !type->isNamespace() ) { if ( !type->isNamespace() ) {
@ -3981,7 +3981,7 @@ void CppCodeCompletion::computeCompletionEntryList( TQString parent, SimpleType
if ( isInstance ) if ( isInstance )
continue; continue;
entry.userdata = TQString( "%1%2%3%4%5" ).tqarg( CodeModelItem::Public ).tqarg( depth ).tqarg( parent ).tqarg( 6 ); entry.userdata = TQString( "%1%2%3%4%5" ).arg( CodeModelItem::Public ).arg( depth ).arg( parent ).arg( 6 );
entryList << entry; entryList << entry;
@ -4015,7 +4015,7 @@ void CppCodeCompletion::computeCompletionEntryList( TQString parent, SimpleType
entry.prefix = stringMult( depth, " " ) + entry.prefix.stripWhiteSpace(); entry.prefix = stringMult( depth, " " ) + entry.prefix.stripWhiteSpace();
entry.text = klass->name(); entry.text = klass->name();
entry.comment = commentFromItem( type, klass.data() ); entry.comment = commentFromItem( type, klass.data() );
entry.userdata = TQString( "%1%2%3%4%5" ).tqarg( CodeModelItem::Public ).tqarg( depth ).tqarg( parent ).tqarg( 5 ); entry.userdata = TQString( "%1%2%3%4%5" ).arg( CodeModelItem::Public ).arg( depth ).arg( parent ).arg( 5 );
entryList << entry; entryList << entry;
} }
} }
@ -4136,7 +4136,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList
if ( meth->isStatic() ) if ( meth->isStatic() )
subSorting = 5; subSorting = 5;
entry.userdata += TQString( "%1%2%3%4%5" ).tqarg( meth->access() ).tqarg( depth ).tqarg( className ).tqarg( 1 ).tqarg( subSorting ); entry.userdata += TQString( "%1%2%3%4%5" ).arg( meth->access() ).arg( depth ).arg( className ).arg( 1 ).arg( subSorting );
if ( m_completionMode == VirtualDeclCompletion ) if ( m_completionMode == VirtualDeclCompletion )
entry.text += text + ";"; entry.text += text + ";";
@ -4187,7 +4187,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList
CodeCompletionEntry entry; CodeCompletionEntry entry;
entry.text = attr->name(); entry.text = attr->name();
entry.comment = commentFromItem( type, model_cast<ItemDom>( attr ) ); entry.comment = commentFromItem( type, model_cast<ItemDom>( attr ) );
entry.userdata += TQString( "%1%2%3%4" ).tqarg( attr->access() ).tqarg( depth ).tqarg( className ).tqarg( 2 ); entry.userdata += TQString( "%1%2%3%4" ).arg( attr->access() ).arg( depth ).arg( className ).arg( 2 );
if ( !attr->isEnumeratorVariable() ) { if ( !attr->isEnumeratorVariable() ) {
@ -4261,7 +4261,7 @@ EvaluationResult CppCodeCompletion::evaluateExpression( ExpressionInfo expr, Sim
} }
} }
addStatusText( i18n( "Type of \"%1\" is \"%2\", %3" ).tqarg( expr.expr() ).tqarg( res->fullNameChain() ).tqarg( resolutionType ), 5000 ); addStatusText( i18n( "Type of \"%1\" is \"%2\", %3" ).arg( expr.expr() ).arg( res->fullNameChain() ).arg( resolutionType ), 5000 );
return res; return res;
} }

@ -102,7 +102,7 @@ OperatorIdentification UnaryOperator::identify( TQString& str ) {
EvaluationResult UnaryOperator::apply( TQValueList<EvaluationResult> params, TQValueList<EvaluationResult> innerParams ) { EvaluationResult UnaryOperator::apply( TQValueList<EvaluationResult> params, TQValueList<EvaluationResult> innerParams ) {
if( !checkParams( params ) ) { if( !checkParams( params ) ) {
log( TQString("parameter-check failed: %1 params: ").tqarg( params.size() ) + printTypeList( params ) ); log( TQString("parameter-check failed: %1 params: ").arg( params.size() ) + printTypeList( params ) );
return EvaluationResult(); return EvaluationResult();
} else { } else {
EvaluationResult t = unaryApply( params.front(), innerParams ); EvaluationResult t = unaryApply( params.front(), innerParams );

@ -461,7 +461,7 @@ void CppNewClassDialog::addBaseClass()
if ( baseclasses_view->selectedItem() ) if ( baseclasses_view->selectedItem() )
baseclasses_view->selectedItem() ->setSelected( false ); baseclasses_view->selectedItem() ->setSelected( false );
TQListViewItem* it = new TQListViewItem( baseclasses_view, baseclasses_view->lastItem(), TQListViewItem* it = new TQListViewItem( baseclasses_view, baseclasses_view->lastItem(),
TQString(), "public", TQString( "%1" ).tqarg( scope_box->currentItem() ), TQString(), "false" ); TQString(), "public", TQString( "%1" ).arg( scope_box->currentItem() ), TQString(), "false" );
setStateOfInheritanceEditors( true ); setStateOfInheritanceEditors( true );
public_button->setChecked( true ); public_button->setChecked( true );
virtual_box->setChecked( false ); virtual_box->setChecked( false );
@ -589,7 +589,7 @@ void CppNewClassDialog::scopeboxActivated( int value )
{ {
if ( baseclasses_view->selectedItem() ) if ( baseclasses_view->selectedItem() )
{ {
baseclasses_view->selectedItem() ->setText( 2, TQString( "%1" ).tqarg( value ) ); baseclasses_view->selectedItem() ->setText( 2, TQString( "%1" ).arg( value ) );
} }
} }
@ -1268,8 +1268,8 @@ void CppNewClassDialog::to_constructors_list_clicked()
cparams += ( *argIt ) ->type() + " "; cparams += ( *argIt ) ->type() + " ";
if ( ( *argIt ) ->name().isEmpty() ) if ( ( *argIt ) ->name().isEmpty() )
{ {
cparams += TQString( "arg%1" ).tqarg( unnamed ); cparams += TQString( "arg%1" ).arg( unnamed );
bparams += TQString( "arg%1" ).tqarg( unnamed++ ); bparams += TQString( "arg%1" ).arg( unnamed++ );
} }
else else
{ {
@ -1455,7 +1455,7 @@ void CppNewClassDialog::ClassGenerator::common_text()
TQString author = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/author" ); TQString author = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/author" );
TQString email = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/email" ); TQString email = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/email" );
if( !email.isEmpty() ) if( !email.isEmpty() )
author += TQString( " <%1>" ).tqarg( email ); author += TQString( " <%1>" ).arg( email );
if ( dlg.gen_config->author_box->isChecked() ) if ( dlg.gen_config->author_box->isChecked() )
doc.append( "\t@author " + author + "\n" ); doc.append( "\t@author " + author + "\n" );
@ -1618,8 +1618,8 @@ void CppNewClassDialog::ClassGenerator::genMethodDeclaration( FunctionDom method
cparams += ( *argIt ) ->type() + " "; cparams += ( *argIt ) ->type() + " ";
if ( ( *argIt ) ->name().isEmpty() ) if ( ( *argIt ) ->name().isEmpty() )
{ {
cparams += TQString( "arg%1" ).tqarg( unnamed ); cparams += TQString( "arg%1" ).arg( unnamed );
bparams += TQString( "arg%1" ).tqarg( unnamed++ ); bparams += TQString( "arg%1" ).arg( unnamed++ );
} }
else else
{ {
@ -1974,7 +1974,7 @@ void CppNewClassDialog::ClassGenerator::gen_interface()
TQString author = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/author" ); TQString author = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/author" );
TQString email = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/email" ); TQString email = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/email" );
if( !email.isEmpty() ) if( !email.isEmpty() )
author += TQString( " <%1>" ).tqarg( email ); author += TQString( " <%1>" ).arg( email );
TQString inheritance; TQString inheritance;
if ( dlg.baseclasses_view->childCount() > 0 ) if ( dlg.baseclasses_view->childCount() > 0 )

@ -1558,7 +1558,7 @@ void CppSupportPart::slotParseFiles()
{ {
if ( _jd->pcs.contains( absFilePath ) ) if ( _jd->pcs.contains( absFilePath ) )
{ {
_jd->stream.tqdevice() ->at( _jd->pcs[ absFilePath ].second ); _jd->stream.device() ->at( _jd->pcs[ absFilePath ].second );
FileDom file = codeModel() ->create<FileModel>(); FileDom file = codeModel() ->create<FileModel>();
file->read( _jd->stream ); file->read( _jd->stream );
codeModel() ->addFile( file ); codeModel() ->addFile( file );
@ -2182,22 +2182,22 @@ void CppSupportPart::saveProjectSourceInfo()
if( m_timestamp.find( dom->name() ) == m_timestamp.end() ) { if( m_timestamp.find( dom->name() ) == m_timestamp.end() ) {
kdDebug( 9007 ) << dom->name() << ": timestamp is missing " << endl; kdDebug( 9007 ) << dom->name() << ": timestamp is missing " << endl;
} }
offsets.insert( dom->name(), stream.tqdevice() ->at() ); offsets.insert( dom->name(), stream.device() ->at() );
stream << ( uint ) 0; // dummy offset stream << ( uint ) 0; // dummy offset
} }
for ( FileList::ConstIterator it = fileList.begin(); it != fileList.end(); ++it ) for ( FileList::ConstIterator it = fileList.begin(); it != fileList.end(); ++it )
{ {
const FileDom dom = ( *it ); const FileDom dom = ( *it );
int offset = stream.tqdevice() ->at(); int offset = stream.device() ->at();
dom->write( stream ); dom->write( stream );
int end = stream.tqdevice() ->at(); int end = stream.device() ->at();
stream.tqdevice() ->at( offsets[ dom->name() ] ); stream.device() ->at( offsets[ dom->name() ] );
stream << offset; stream << offset;
stream.tqdevice() ->at( end ); stream.device() ->at( end );
} }
TQFile::remove( project() ->projectDirectory() + "/" TQFile::remove( project() ->projectDirectory() + "/"
@ -2259,7 +2259,7 @@ void CppSupportPart::slotExtractInterface( )
TQString ifaceFileName = fileInfo.dirPath( true ) + "/" + m_activeClass->name().lower() + "_interface.h"; TQString ifaceFileName = fileInfo.dirPath( true ) + "/" + m_activeClass->name().lower() + "_interface.h";
if ( TQFile::exists( ifaceFileName ) ) if ( TQFile::exists( ifaceFileName ) )
{ {
KMessageBox::error( mainWindow() ->main(), i18n( "File %1 already exists" ).tqarg( ifaceFileName ), KMessageBox::error( mainWindow() ->main(), i18n( "File %1 already exists" ).arg( ifaceFileName ),
i18n( "C++ Support" ) ); i18n( "C++ Support" ) );
} }
else else
@ -3118,7 +3118,7 @@ void CppSupportPart::addToRepository( ParsedFilePointer file ) {
w.parseTranslationUnit( *file ); w.parseTranslationUnit( *file );
codeRepository()->touchCatalog( catalog ); codeRepository()->touchCatalog( catalog );
m_safeProjectFiles.insert( file->fileName() + "||" + TQString("%1").tqarg(file->usedMacros().valueHash()) + "||" + TQString("%1").tqarg(file->usedMacros().idHash()) ); m_safeProjectFiles.insert( file->fileName() + "||" + TQString("%1").arg(file->usedMacros().valueHash()) + "||" + TQString("%1").arg(file->usedMacros().idHash()) );
} }
TQString CppSupportPart::findHeaderSimple( const TQString &header ) TQString CppSupportPart::findHeaderSimple( const TQString &header )

@ -213,7 +213,7 @@ bool Breakpoint::match(const Breakpoint* breakpoint) const
TQString Breakpoint::dbgRemoveCommand() const TQString Breakpoint::dbgRemoveCommand() const
{ {
if (dbgId_>0) if (dbgId_>0)
return TQString("-break-delete %1").tqarg(dbgId_); // gdb command - not translatable return TQString("-break-delete %1").arg(dbgId_); // gdb command - not translatable
return TQString(); return TQString();
} }
@ -386,7 +386,7 @@ FilePosBreakpoint::FilePosBreakpoint(const TQString &fileName, int lineNum,
: Breakpoint(temporary, enabled) : Breakpoint(temporary, enabled)
{ {
// Sets 'subtype' // Sets 'subtype'
setLocation(TQString("%1:%2").tqarg(fileName).tqarg(lineNum)); setLocation(TQString("%1:%2").arg(fileName).arg(lineNum));
} }
FilePosBreakpoint::~FilePosBreakpoint() FilePosBreakpoint::~FilePosBreakpoint()
@ -482,7 +482,7 @@ void FilePosBreakpoint::setLocation(const TQString& location)
line_ = regExp1.cap(2).toInt(); line_ = regExp1.cap(2).toInt();
location_ = TQString("%1:%2").tqarg(fileName_).tqarg(regExp1.cap(2)); location_ = TQString("%1:%2").arg(fileName_).arg(regExp1.cap(2));
} }
else else
{ {
@ -536,7 +536,7 @@ void Watchpoint::setBreakpoint(GDBController* controller)
controller->addCommandBeforeRun( controller->addCommandBeforeRun(
new GDBCommand( new GDBCommand(
TQString("-data-evaluate-expression &%1").tqarg(varName_), TQString("-data-evaluate-expression &%1").arg(varName_),
this, this,
&Watchpoint::handleAddressComputed)); &Watchpoint::handleAddressComputed));
} }
@ -547,7 +547,7 @@ void Watchpoint::handleAddressComputed(const GDBMI::ResultRecord& r)
address_ = r["value"].literal().toULongLong(0, 16); address_ = r["value"].literal().toULongLong(0, 16);
controller()->addCommandBeforeRun( controller()->addCommandBeforeRun(
new GDBCommand( new GDBCommand(
TQString("-break-watch *%1").tqarg(r["value"].literal()), TQString("-break-watch *%1").arg(r["value"].literal()),
static_cast<Breakpoint*>(this), static_cast<Breakpoint*>(this),
&Watchpoint::handleSet)); &Watchpoint::handleSet));
} }

@ -172,7 +172,7 @@ void Dbg_PS_Dialog::slotProcessExited()
// to 'arg'. // to 'arg'.
i18n("<b>Could not parse output from the <tt>ps</tt> command.</b>" i18n("<b>Could not parse output from the <tt>ps</tt> command.</b>"
"<p>The following line could not be parsed:" "<p>The following line could not be parsed:"
"<b><tt>%1</tt>").tqarg(item), "<b><tt>%1</tt>").arg(item),
i18n("Internal error"), "gdb_error" ); i18n("Internal error"), "gdb_error" );
break; break;
} }

@ -121,7 +121,7 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e)
setFrameStyle(TQFrame::Panel|TQFrame::Sunken); setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
TQApplication::setOverrideCursor(TQCursor(sizeAllCursor)); TQApplication::setOverrideCursor(TQCursor(sizeAllCursor));
setPalette(TQPalette(colorGroup().background())); setPalette(TQPalette(colorGroup().background()));
tqrepaint(); repaint();
} }
} }
@ -135,7 +135,7 @@ void DbgMoveHandle::mouseReleaseEvent(TQMouseEvent *e)
setFrameStyle(TQFrame::Panel|TQFrame::Raised); setFrameStyle(TQFrame::Panel|TQFrame::Raised);
TQApplication::restoreOverrideCursor(); TQApplication::restoreOverrideCursor();
setPalette(TQPalette(colorGroup().background())); setPalette(TQPalette(colorGroup().background()));
tqrepaint(); repaint();
} }
// ************************************************************************** // **************************************************************************

@ -515,12 +515,12 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context)
if (!m_contextIdent.isEmpty()) if (!m_contextIdent.isEmpty())
{ {
TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30); TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30);
int id = popup->insertItem( i18n("Evaluate: %1").tqarg(squeezed), int id = popup->insertItem( i18n("Evaluate: %1").arg(squeezed),
this, TQT_SLOT(contextEvaluate()), this, TQT_SLOT(contextEvaluate()),
0, -1, index); 0, -1, index);
index += running; index += running;
popup->setWhatsThis(id, i18n("<b>Evaluate expression</b><p>Shows the value of the expression under the cursor.")); popup->setWhatsThis(id, i18n("<b>Evaluate expression</b><p>Shows the value of the expression under the cursor."));
int id2 = popup->insertItem( i18n("Watch: %1").tqarg(squeezed), int id2 = popup->insertItem( i18n("Watch: %1").arg(squeezed),
this, TQT_SLOT(contextWatch()), this, TQT_SLOT(contextWatch()),
0, -1, index); 0, -1, index);
index += running; index += running;
@ -659,7 +659,7 @@ bool DebuggerPart::startDebugger()
{ {
KMessageBox::information( KMessageBox::information(
mainWindow()->main(), mainWindow()->main(),
i18n("Could not locate the debugging shell '%1'.").tqarg( shell_without_args ), i18n("Could not locate the debugging shell '%1'.").arg( shell_without_args ),
i18n("Debugging Shell Not Found"), "gdb_error" ); i18n("Debugging Shell Not Found"), "gdb_error" );
return false; return false;
} }
@ -955,7 +955,7 @@ void DebuggerPart::slotExamineCore()
if (coreFile.isNull()) if (coreFile.isNull())
return; return;
mainWindow()->statusBar()->message(i18n("Examining core file %1").tqarg(coreFile), 1000); mainWindow()->statusBar()->message(i18n("Examining core file %1").arg(coreFile), 1000);
startDebugger(); startDebugger();
controller->slotCoreFile(coreFile); controller->slotCoreFile(coreFile);
@ -976,7 +976,7 @@ void DebuggerPart::slotAttachProcess()
bool DebuggerPart::attachProcess(int pid) bool DebuggerPart::attachProcess(int pid)
{ {
mainWindow()->statusBar()->message(i18n("Attaching to process %1").tqarg(pid), 1000); mainWindow()->statusBar()->message(i18n("Attaching to process %1").arg(pid), 1000);
bool ret = startDebugger(); bool ret = startDebugger();
controller->slotAttachTo(pid); controller->slotAttachTo(pid);

@ -111,7 +111,7 @@ void FramestackWidget::slotSelectionChanged(TQListViewItem *thisItem)
if (frame->threadNo() != -1) if (frame->threadNo() != -1)
controller_->addCommand( controller_->addCommand(
new GDBCommand(TQString("-thread-select %1") new GDBCommand(TQString("-thread-select %1")
.tqarg(frame->threadNo()).ascii())); .arg(frame->threadNo()).ascii()));
viewedThread_ = findThread(frame->threadNo()); viewedThread_ = findThread(frame->threadNo());
getBacktrace(frame->frameNo(), frame->frameNo() + frameChunk_); getBacktrace(frame->frameNo(), frame->frameNo() + frameChunk_);
@ -208,7 +208,7 @@ void FramestackWidget::getBacktrace(int min_frame, int max_frame)
maxFrame_ = max_frame; maxFrame_ = max_frame;
controller_->addCommand( controller_->addCommand(
new GDBCommand(TQString("-stack-info-depth %1").tqarg(max_frame+1), new GDBCommand(TQString("-stack-info-depth %1").arg(max_frame+1),
this, this,
&FramestackWidget::handleStackDepth)); &FramestackWidget::handleStackDepth));
} }
@ -224,7 +224,7 @@ void FramestackWidget::handleStackDepth(const GDBMI::ResultRecord& r)
//add the following command to the front, so noone switches threads in between //add the following command to the front, so noone switches threads in between
controller_->addCommandToFront( controller_->addCommandToFront(
new GDBCommand(TQString("-stack-list-frames %1 %2") new GDBCommand(TQString("-stack-list-frames %1 %2")
.tqarg(minFrame_).tqarg(maxFrame_), .arg(minFrame_).arg(maxFrame_),
this, &FramestackWidget::parseGDBBacktraceList)); this, &FramestackWidget::parseGDBBacktraceList));
} }
@ -236,7 +236,7 @@ void FramestackWidget::getBacktraceForThread(int threadNo)
// Switch to the target thread. // Switch to the target thread.
controller_->addCommand( controller_->addCommand(
new GDBCommand(TQString("-thread-select %1") new GDBCommand(TQString("-thread-select %1")
.tqarg(threadNo).ascii())); .arg(threadNo).ascii()));
viewedThread_ = findThread(threadNo); viewedThread_ = findThread(threadNo);
} }
@ -248,7 +248,7 @@ void FramestackWidget::getBacktraceForThread(int threadNo)
// Switch back to the original thread. // Switch back to the original thread.
controller_->addCommand( controller_->addCommand(
new GDBCommand(TQString("-thread-select %1") new GDBCommand(TQString("-thread-select %1")
.tqarg(currentThread).ascii())); .arg(currentThread).ascii()));
} }
} }
@ -274,13 +274,13 @@ void FramestackWidget::handleThreadList(const GDBMI::ResultRecord& r)
TQString id = ids.results[i]->value->literal(); TQString id = ids.results[i]->value->literal();
controller_->addCommand( controller_->addCommand(
new GDBCommand(TQString("-thread-select %1").tqarg(id).ascii(), new GDBCommand(TQString("-thread-select %1").arg(id).ascii(),
this, &FramestackWidget::handleThread)); this, &FramestackWidget::handleThread));
} }
controller_->addCommand( controller_->addCommand(
new GDBCommand(TQString("-thread-select %1") new GDBCommand(TQString("-thread-select %1")
.tqarg(controller_->currentThread()).ascii())); .arg(controller_->currentThread()).ascii()));
} }
// Get backtrace for the current thread. We need to do this // Get backtrace for the current thread. We need to do this
@ -558,7 +558,7 @@ ThreadStackItem::ThreadStackItem(FramestackWidget *parent, unsigned threadNo)
: TQListViewItem(parent), : TQListViewItem(parent),
threadNo_(threadNo) threadNo_(threadNo)
{ {
setText(0, i18n("Thread %1").tqarg(threadNo_)); setText(0, i18n("Thread %1").arg(threadNo_));
setExpandable(true); setExpandable(true);
} }

@ -377,10 +377,10 @@ void GDBBreakpointWidget::slotWatchpointHit(int id,
"Address: 0x%2<br>" "Address: 0x%2<br>"
"Old value: %3<br>" "Old value: %3<br>"
"New value: %4") "New value: %4")
.tqarg(b->varName()) .arg(b->varName())
.tqarg(b->address(), 0, 16) .arg(b->address(), 0, 16)
.tqarg(oldValue) .arg(oldValue)
.tqarg(newValue)); .arg(newValue));
} }
/***************************************************************************/ /***************************************************************************/

@ -105,7 +105,7 @@ ModifyBreakpointCommand::cmdToSend()
if (bp_->dbgId() > 0) if (bp_->dbgId() > 0)
{ {
TQString s(initialString()); TQString s(initialString());
s = s.tqarg(bp_->dbgId()) + "\n"; s = s.arg(bp_->dbgId()) + "\n";
return s.local8Bit(); return s.local8Bit();
} }
else else

@ -294,7 +294,7 @@ void GDBController::queueCmd(GDBCommand *cmd, enum queue_where queue_where)
KMessageBox::information( KMessageBox::information(
0, 0,
i18n("<b>Gdb command sent when debugger is not running</b><br>" i18n("<b>Gdb command sent when debugger is not running</b><br>"
"The command was:<br> %1").tqarg(cmd->initialString()), "The command was:<br> %1").arg(cmd->initialString()),
i18n("Internal error"), "gdb_error"); i18n("Internal error"), "gdb_error");
return; return;
} }
@ -500,7 +500,7 @@ void GDBController::actOnProgramPauseMI(const GDBMI::ResultRecord& r)
if (reason == "exited-signalled") if (reason == "exited-signalled")
{ {
programNoApp(i18n("Exited on signal %1") programNoApp(i18n("Exited on signal %1")
.tqarg(r["signal-name"].literal()), false); .arg(r["signal-name"].literal()), false);
// FIXME: figure out why this variable is needed. // FIXME: figure out why this variable is needed.
programHasExited_ = true; programHasExited_ = true;
state_reload_needed = false; state_reload_needed = false;
@ -554,7 +554,7 @@ void GDBController::actOnProgramPauseMI(const GDBMI::ResultRecord& r)
// that'll end the program. // that'll end the program.
KMessageBox::information(0, KMessageBox::information(0,
i18n("Program received signal %1 (%2)") i18n("Program received signal %1 (%2)")
.tqarg(name).tqarg(user_name), .arg(name).arg(user_name),
i18n("Received signal")); i18n("Received signal"));
} }
} }
@ -716,9 +716,9 @@ void GDBController::handleMiFileListExecSourceFile(const GDBMI::ResultRecord& r)
"Command was: %1\n" "Command was: %1\n"
"Response is: %2\n" "Response is: %2\n"
"Invalid response kind: \"%3\"") "Invalid response kind: \"%3\"")
.tqarg(currentCmd_->rawDbgCommand()) .arg(currentCmd_->rawDbgCommand())
.tqarg(buf) .arg(buf)
.tqarg(r.reason), .arg(r.reason),
i18n("Invalid gdb reply"), "gdb_error"); i18n("Invalid gdb reply"), "gdb_error");
#endif #endif
} }
@ -846,7 +846,7 @@ bool GDBController::start(const TQString& shell, const DomUtil::PairList& run_en
i18n("<b>Could not start debugger.</b>" i18n("<b>Could not start debugger.</b>"
"<p>Could not run '%1'. " "<p>Could not run '%1'. "
"Make sure that the path name is specified correctly." "Make sure that the path name is specified correctly."
).tqarg(dbgProcess_->args()[0].data()), ).arg(dbgProcess_->args()[0].data()),
i18n("Could not start debugger"), "gdb_error"); i18n("Could not start debugger"), "gdb_error");
return false; return false;
@ -1159,7 +1159,7 @@ void GDBController::slotRun()
" %1\n" " %1\n"
"<br>does not exist. Check that you have specified " "<br>does not exist. Check that you have specified "
"the right application in the debugger configuration." "the right application in the debugger configuration."
).tqarg(app.fileName()), ).arg(app.fileName()),
i18n("Application does not exist")); i18n("Application does not exist"));
// FIXME: after this, KDevelop will still show that debugger // FIXME: after this, KDevelop will still show that debugger
@ -1176,7 +1176,7 @@ void GDBController::slotRun()
"<p>The application does not have the executable bit set. " "<p>The application does not have the executable bit set. "
"Try rebuilding the project, or change permissions " "Try rebuilding the project, or change permissions "
"manually." "manually."
).tqarg(app.fileName()), ).arg(app.fileName()),
i18n("Could not run application")); i18n("Could not run application"));
slotStopDebugger(); slotStopDebugger();
} }
@ -1324,11 +1324,11 @@ void GDBController::selectFrame(int frameNo, int threadNo)
{ {
if (viewedThread_ != threadNo) if (viewedThread_ != threadNo)
queueCmd(new GDBCommand( queueCmd(new GDBCommand(
TQString("-thread-select %1").tqarg(threadNo).ascii())); TQString("-thread-select %1").arg(threadNo).ascii()));
} }
queueCmd(new GDBCommand( queueCmd(new GDBCommand(
TQString("-stack-select-frame %1").tqarg(frameNo).ascii())); TQString("-stack-select-frame %1").arg(frameNo).ascii()));
// Will emit the 'thread_or_frame_changed' event. // Will emit the 'thread_or_frame_changed' event.
queueCmd(new GDBCommand("-stack-info-frame", queueCmd(new GDBCommand("-stack-info-frame",
@ -1590,7 +1590,7 @@ void GDBController::slotDbgStdout(KProcess *, char *buf, int buflen)
"<p>The debugger component encountered an internal error while " "<p>The debugger component encountered an internal error while "
"processing a reply from gdb. Please submit a bug report."), "processing a reply from gdb. Please submit a bug report."),
i18n("The exception is: %1\n" i18n("The exception is: %1\n"
"The MI response is: %2").tqarg(e.what()).tqarg(reply.data()), "The MI response is: %2").arg(e.what()).arg(reply.data()),
i18n("Internal debugger error")); i18n("Internal debugger error"));
destroyCurrentCommand(); destroyCurrentCommand();
@ -1749,8 +1749,8 @@ void GDBController::explainDebuggerStatus()
"%2 commands being processed by gdb\n" "%2 commands being processed by gdb\n"
"Debugger state: %3\n"); "Debugger state: %3\n");
information = information =
information.tqarg(cmdList_.count()).tqarg(currentCmd_ ? 1 : 0) information.arg(cmdList_.count()).arg(currentCmd_ ? 1 : 0)
.tqarg(state_); .arg(state_);
if (currentCmd_) if (currentCmd_)
{ {
@ -1758,8 +1758,8 @@ void GDBController::explainDebuggerStatus()
"Current command text: '%2'\n" "Current command text: '%2'\n"
"Current command origianl text: '%3'\n"); "Current command origianl text: '%3'\n");
extra = extra.tqarg( extra = extra.arg(
typeid(*currentCmd_).name()).tqarg(currentCmd_->cmdToSend()). typeid(*currentCmd_).name()).arg(currentCmd_->cmdToSend()).
arg(currentCmd_->initialString()); arg(currentCmd_->initialString());
information += extra; information += extra;
} }

@ -263,8 +263,8 @@ namespace GDBDebugger
new new
GDBCommand( GDBCommand(
TQString("-data-read-memory %1 x 1 1 %2") TQString("-data-read-memory %1 x 1 1 %2")
.tqarg(rangeSelector_->startAddressLineEdit->text()) .arg(rangeSelector_->startAddressLineEdit->text())
.tqarg(size).ascii(), .arg(size).ascii(),
this, this,
&MemoryView::memoryRead)); &MemoryView::memoryRead));
} }
@ -280,7 +280,7 @@ namespace GDBDebugger
start_ = startAsString_.toUInt(0, 0); start_ = startAsString_.toUInt(0, 0);
setCaption(TQString("%1 (%2 bytes)") setCaption(TQString("%1 (%2 bytes)")
.tqarg(startAsString_).tqarg(amount_)); .arg(startAsString_).arg(amount_));
emit captionChanged(caption()); emit captionChanged(caption());
KHE::BytesEditInterface* bytesEditor KHE::BytesEditInterface* bytesEditor
@ -328,9 +328,9 @@ namespace GDBDebugger
controller_->addCommand( controller_->addCommand(
new GDBCommand( new GDBCommand(
TQString("set *(char*)(%1 + %2) = %3") TQString("set *(char*)(%1 + %2) = %3")
.tqarg(start_) .arg(start_)
.tqarg(i) .arg(i)
.tqarg(TQString::number(data_[i])))); .arg(TQString::number(data_[i]))));
} }
} }
@ -374,7 +374,7 @@ namespace GDBDebugger
new new
GDBCommand( GDBCommand(
TQString("-data-read-memory %1 x 1 1 %2") TQString("-data-read-memory %1 x 1 1 %2")
.tqarg(start_).tqarg(amount_).ascii(), .arg(start_).arg(amount_).ascii(),
this, this,
&MemoryView::memoryRead)); &MemoryView::memoryRead));
} }

@ -54,7 +54,7 @@
recieved after current frame in the debugger can possibly changes. recieved after current frame in the debugger can possibly changes.
The widget has a list item for each frame/thread combination, with The widget has a list item for each frame/thread combination, with
variables as tqchildren. However, at each moment only one item is shown. variables as children. However, at each moment only one item is shown.
When handling the slotCurrentFrame, we check if variables for the When handling the slotCurrentFrame, we check if variables for the
current frame are available. If yes, we simply show the corresponding item. current frame are available. If yes, we simply show the corresponding item.
Otherwise, we fetch the new data from debugger. Otherwise, we fetch the new data from debugger.
@ -338,7 +338,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item)
controller_->addCommand( controller_->addCommand(
new GDBCommand( new GDBCommand(
TQString("-data-evaluate-expression &%1") TQString("-data-evaluate-expression &%1")
.tqarg(var->gdbExpression()), .arg(var->gdbExpression()),
this, this,
&VariableTree::handleAddressComputed, &VariableTree::handleAddressComputed,
true /*handles error*/)); true /*handles error*/));
@ -505,8 +505,8 @@ void VariableTree::updateCurrentFrame()
controller_->addCommand( controller_->addCommand(
new GDBCommand(TQString("-stack-list-arguments 0 %1 %2") new GDBCommand(TQString("-stack-list-arguments 0 %1 %2")
.tqarg(controller_->currentFrame()) .arg(controller_->currentFrame())
.tqarg(controller_->currentFrame()) .arg(controller_->currentFrame())
.ascii(), .ascii(),
this, this,
&VariableTree::argumentsReady)); &VariableTree::argumentsReady));
@ -882,8 +882,8 @@ void VarItem::handleCliPrint(const TQValueVector<TQString>& lines)
{ {
controller_->addCommand( controller_->addCommand(
new GDBCommand(TQString("-var-create %1 * \"%2\"") new GDBCommand(TQString("-var-create %1 * \"%2\"")
.tqarg(varobjName_) .arg(varobjName_)
.tqarg(r.cap(1)), .arg(r.cap(1)),
this, this,
&VarItem::varobjCreated, &VarItem::varobjCreated,
// On initial create, errors get reported // On initial create, errors get reported
@ -1078,7 +1078,7 @@ VarItem::VarItem(TrimmableItem *parent,
oldSpecialRepresentationSet_(false), oldSpecialRepresentationSet_(false),
format_(natural), format_(natural),
numChildren_(0), numChildren_(0),
tqchildrenFetched_(false), childrenFetched_(false),
updateUnconditionally_(false), updateUnconditionally_(false),
frozen_(frozen), frozen_(frozen),
initialCreation_(true), initialCreation_(true),
@ -1123,7 +1123,7 @@ VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj,
oldSpecialRepresentationSet_(false), oldSpecialRepresentationSet_(false),
format_(format), format_(format),
numChildren_(0), numChildren_(0),
tqchildrenFetched_(false), childrenFetched_(false),
updateUnconditionally_(false), updateUnconditionally_(false),
frozen_(false), frozen_(false),
initialCreation_(false), initialCreation_(false),
@ -1146,7 +1146,7 @@ VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj,
controller_ = varTree()->controller(); controller_ = varTree()->controller();
// Set type and tqchildren. // Set type and children.
originalValueType_ = varobj["type"].literal(); originalValueType_ = varobj["type"].literal();
numChildren_ = varobj["numchild"].literal().toInt(); numChildren_ = varobj["numchild"].literal().toInt();
setExpandable(numChildren_ != 0); setExpandable(numChildren_ != 0);
@ -1159,7 +1159,7 @@ VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj,
void VarItem::createVarobj() void VarItem::createVarobj()
{ {
TQString old = varobjName_; TQString old = varobjName_;
varobjName_ = TQString("KDEV%1").tqarg(varobjIndex++); varobjName_ = TQString("KDEV%1").arg(varobjIndex++);
emit varobjNameChange(old, varobjName_); emit varobjNameChange(old, varobjName_);
if (frozen_) if (frozen_)
@ -1169,7 +1169,7 @@ void VarItem::createVarobj()
// variable and we create variable object from that. // variable and we create variable object from that.
controller_->addCommand( controller_->addCommand(
new CliCommand( new CliCommand(
TQString("print %1").tqarg(expression_), TQString("print %1").arg(expression_),
this, this,
&VarItem::handleCliPrint)); &VarItem::handleCliPrint));
} }
@ -1177,7 +1177,7 @@ void VarItem::createVarobj()
{ {
controller_->addCommand( controller_->addCommand(
new CliCommand( new CliCommand(
TQString("print /x &%1").tqarg(expression_), TQString("print /x &%1").arg(expression_),
this, this,
&VarItem::handleCurrentAddress, &VarItem::handleCurrentAddress,
true)); true));
@ -1186,8 +1186,8 @@ void VarItem::createVarobj()
// Need to quote expression, otherwise gdb won't like // Need to quote expression, otherwise gdb won't like
// spaces inside it. // spaces inside it.
new GDBCommand(TQString("-var-create %1 * \"%2\"") new GDBCommand(TQString("-var-create %1 * \"%2\"")
.tqarg(varobjName_) .arg(varobjName_)
.tqarg(expression_), .arg(expression_),
this, this,
&VarItem::varobjCreated, &VarItem::varobjCreated,
initialCreation_ ? false : true)); initialCreation_ ? false : true));
@ -1209,7 +1209,7 @@ void VarItem::varobjCreated(const GDBMI::ResultRecord& r)
originalValueType_ = r["type"].literal(); originalValueType_ = r["type"].literal();
if (!oldType.isEmpty() && oldType != originalValueType_) if (!oldType.isEmpty() && oldType != originalValueType_)
{ {
// Type changed, the tqchildren might be no longer valid, // Type changed, the children might be no longer valid,
// so delete them. // so delete them.
for(TQListViewItem* child = firstChild(); child; ) for(TQListViewItem* child = firstChild(); child; )
{ {
@ -1239,7 +1239,7 @@ void VarItem::setVarobjName(const TQString& name)
{ {
controller_->addCommand( controller_->addCommand(
new GDBCommand(TQString("-var-set-format \"%1\" %2") new GDBCommand(TQString("-var-set-format \"%1\" %2")
.tqarg(varobjName_).tqarg(varobjFormatName()))); .arg(varobjName_).arg(varobjFormatName())));
} }
// Get the initial value. // Get the initial value.
@ -1247,7 +1247,7 @@ void VarItem::setVarobjName(const TQString& name)
if (isOpen()) if (isOpen())
{ {
// This regets tqchildren list. // This regets children list.
setOpen(true); setOpen(true);
} }
} }
@ -1333,18 +1333,18 @@ void VarItem::valueDone(const GDBMI::ResultRecord& r)
} }
void VarItem::createChildren(const GDBMI::ResultRecord& r, void VarItem::createChildren(const GDBMI::ResultRecord& r,
bool tqchildren_of_fake) bool children_of_fake)
{ {
const GDBMI::Value& tqchildren = r["tqchildren"]; const GDBMI::Value& children = r["children"];
/* In order to figure out which variable objects correspond /* In order to figure out which variable objects correspond
to base class subobject, we first must detect if *this to base class subobject, we first must detect if *this
is a structure type. We use present of 'public'/'private'/'protected' is a structure type. We use present of 'public'/'private'/'protected'
fake child as an indicator. */ fake child as an indicator. */
bool structureType = false; bool structureType = false;
if (!tqchildren_of_fake && tqchildren.size() > 0) if (!children_of_fake && children.size() > 0)
{ {
TQString exp = tqchildren[0]["exp"].literal(); TQString exp = children[0]["exp"].literal();
bool ok = false; bool ok = false;
exp.toInt(&ok); exp.toInt(&ok);
if (!ok || exp[0] != '*') if (!ok || exp[0] != '*')
@ -1353,23 +1353,23 @@ void VarItem::createChildren(const GDBMI::ResultRecord& r,
} }
} }
for (unsigned i = 0; i < tqchildren.size(); ++i) for (unsigned i = 0; i < children.size(); ++i)
{ {
TQString exp = tqchildren[i]["exp"].literal(); TQString exp = children[i]["exp"].literal();
// For artificial accessibility nodes, // For artificial accessibility nodes,
// fetch their tqchildren. // fetch their children.
if (exp == "public" || exp == "protected" || exp == "private") if (exp == "public" || exp == "protected" || exp == "private")
{ {
TQString name = tqchildren[i]["name"].literal(); TQString name = children[i]["name"].literal();
controller_->addCommand(new GDBCommand( controller_->addCommand(new GDBCommand(
"-var-list-tqchildren \"" + "-var-list-children \"" +
name + "\"", name + "\"",
this, this,
&VarItem::tqchildrenOfFakesDone)); &VarItem::childrenOfFakesDone));
} }
else else
{ {
/* All tqchildren of structures that are not artifical /* All children of structures that are not artifical
are base subobjects. */ are base subobjects. */
bool baseObject = structureType; bool baseObject = structureType;
@ -1388,7 +1388,7 @@ void VarItem::createChildren(const GDBMI::ResultRecord& r,
} }
if (existing) if (existing)
{ {
existing->setVarobjName(tqchildren[i]["name"].literal()); existing->setVarobjName(children[i]["name"].literal());
} }
else else
{ {
@ -1396,20 +1396,20 @@ void VarItem::createChildren(const GDBMI::ResultRecord& r,
<< exp << " " << baseObject << "\n"; << exp << " " << baseObject << "\n";
// Propagate format from parent. // Propagate format from parent.
VarItem* v = 0; VarItem* v = 0;
v = new VarItem(this, tqchildren[i], format_, baseObject); v = new VarItem(this, children[i], format_, baseObject);
} }
} }
} }
} }
void VarItem::tqchildrenDone(const GDBMI::ResultRecord& r) void VarItem::childrenDone(const GDBMI::ResultRecord& r)
{ {
createChildren(r, false); createChildren(r, false);
tqchildrenFetched_ = true; childrenFetched_ = true;
} }
void VarItem::tqchildrenOfFakesDone(const GDBMI::ResultRecord& r) void VarItem::childrenOfFakesDone(const GDBMI::ResultRecord& r)
{ {
createChildren(r, true); createChildren(r, true);
} }
@ -1603,8 +1603,8 @@ void VarItem::updateValue()
void VarItem::setValue(const TQString& new_value) void VarItem::setValue(const TQString& new_value)
{ {
controller_->addCommand( controller_->addCommand(
new GDBCommand(TQString("-var-assign \"%1\" %2").tqarg(varobjName_) new GDBCommand(TQString("-var-assign \"%1\" %2").arg(varobjName_)
.tqarg(new_value))); .arg(new_value)));
// And immediately reload it from gdb, // And immediately reload it from gdb,
// so that it's display format is the one gdb uses, // so that it's display format is the one gdb uses,
@ -1661,14 +1661,14 @@ void VarItem::recreateLocallyMaybe()
{ {
controller_->addCommand( controller_->addCommand(
new CliCommand( new CliCommand(
TQString("print /x &%1").tqarg(expression_), TQString("print /x &%1").arg(expression_),
this, this,
&VarItem::handleCurrentAddress, &VarItem::handleCurrentAddress,
true)); true));
controller_->addCommand( controller_->addCommand(
new CliCommand( new CliCommand(
TQString("whatis %1").tqarg(expression_), TQString("whatis %1").arg(expression_),
this, this,
&VarItem::handleType)); &VarItem::handleType));
} }
@ -1688,12 +1688,12 @@ void VarItem::setOpen(bool open)
{ {
TQListViewItem::setOpen(open); TQListViewItem::setOpen(open);
if (open && !tqchildrenFetched_) if (open && !childrenFetched_)
{ {
controller_->addCommand(new GDBCommand( controller_->addCommand(new GDBCommand(
"-var-list-tqchildren \"" + varobjName_ + "\"", "-var-list-children \"" + varobjName_ + "\"",
this, this,
&VarItem::tqchildrenDone)); &VarItem::childrenDone));
} }
} }
@ -1712,7 +1712,7 @@ bool VarItem::handleSpecialTypes()
return false; return false;
varTree->controller()->addCommand( varTree->controller()->addCommand(
new ResultlessCommand(TQString("print $kdev_d=%1.d") new ResultlessCommand(TQString("print $kdev_d=%1.d")
.tqarg(gdbExpression()), .arg(gdbExpression()),
true /* ignore error */)); true /* ignore error */));
if (varTree->controller()->qtVersion() >= 4) if (varTree->controller()->qtVersion() >= 4)
@ -1760,7 +1760,7 @@ void VarItem::setFormat(format_t f)
if (numChildren_) if (numChildren_)
{ {
// If variable has tqchildren, change format for tqchildren. // If variable has children, change format for children.
// - for structures, that's clearly right // - for structures, that's clearly right
// - for arrays, that's clearly right // - for arrays, that's clearly right
// - for pointers, this can be confusing, but nobody ever wants to // - for pointers, this can be confusing, but nobody ever wants to
@ -1775,7 +1775,7 @@ void VarItem::setFormat(format_t f)
{ {
controller_->addCommand( controller_->addCommand(
new GDBCommand(TQString("-var-set-format \"%1\" %2") new GDBCommand(TQString("-var-set-format \"%1\" %2")
.tqarg(varobjName_).tqarg(varobjFormatName()))); .arg(varobjName_).arg(varobjFormatName())));
updateValue(); updateValue();
} }
@ -1876,7 +1876,7 @@ VariableTree* VarItem::varTree() const
void VarItem::unhookFromGdb() void VarItem::unhookFromGdb()
{ {
// Unhook tqchildren first, so that child varitems are deleted // Unhook children first, so that child varitems are deleted
// before parent. Strictly speaking, we can avoid calling // before parent. Strictly speaking, we can avoid calling
// -var-delete on child varitems, but that's a bit cheesy, // -var-delete on child varitems, but that's a bit cheesy,
for(TQListViewItem* child = firstChild(); for(TQListViewItem* child = firstChild();
@ -1886,7 +1886,7 @@ void VarItem::unhookFromGdb()
} }
alive_ = false; alive_ = false;
tqchildrenFetched_ = false; childrenFetched_ = false;
emit varobjNameChange(varobjName_, ""); emit varobjNameChange(varobjName_, "");
@ -1894,7 +1894,7 @@ void VarItem::unhookFromGdb()
{ {
controller_->addCommand( controller_->addCommand(
new GDBCommand( new GDBCommand(
TQString("-var-delete \"%1\"").tqarg(varobjName_))); TQString("-var-delete \"%1\"").arg(varobjName_)));
} }
varobjName_ = ""; varobjName_ = "";

@ -186,16 +186,16 @@ private:
/***************************************************************************/ /***************************************************************************/
/***************************************************************************/ /***************************************************************************/
/** List view item that can 'trim' outdated tqchildren. /** List view item that can 'trim' outdated children.
The instances of this class hold a number of tqchildren corresponding The instances of this class hold a number of children corresponding
to variables. When program state changes, such as after a step in source, to variables. When program state changes, such as after a step in source,
some variable values can change, and some variables can go out of scope. some variable values can change, and some variables can go out of scope.
We need We need
- highlight modified variables - highlight modified variables
- remove gone variables - remove gone variables
We could just remove all tqchildren and repopulate the list from We could just remove all children and repopulate the list from
the data from debugger, but then we'd loose information about previous the data from debugger, but then we'd loose information about previous
variable values. variable values.
@ -286,7 +286,7 @@ public:
/** Recursively clears the varobjName_ field, making /** Recursively clears the varobjName_ field, making
*this completely disconnected from gdb. *this completely disconnected from gdb.
Automatically makes *this and tqchildren disables, Automatically makes *this and children disables,
since there's no possible interaction with unhooked since there's no possible interaction with unhooked
object. object.
*/ */
@ -300,7 +300,7 @@ public:
format_t formatFromGdbModifier(char c) const; format_t formatFromGdbModifier(char c) const;
/** Clears highliting for this variable and /** Clears highliting for this variable and
all its tqchildren. */ all its children. */
void clearHighlight(); void clearHighlight();
/** Sets new top-level textual value of this variable. /** Sets new top-level textual value of this variable.
@ -333,7 +333,7 @@ private:
- sets varobjName_ to 'name' - sets varobjName_ to 'name'
- sets format, if it's not default one - sets format, if it's not default one
- gets initial value - gets initial value
- if item is open, gets tqchildren. - if item is open, gets children.
*/ */
void setVarobjName(const TQString& name); void setVarobjName(const TQString& name);
@ -348,12 +348,12 @@ private:
int column, int width, int align ); int column, int width, int align );
void varobjCreated(const GDBMI::ResultRecord& r); void varobjCreated(const GDBMI::ResultRecord& r);
void valueDone(const GDBMI::ResultRecord& r); void valueDone(const GDBMI::ResultRecord& r);
void tqchildrenDone(const GDBMI::ResultRecord& r); void childrenDone(const GDBMI::ResultRecord& r);
void tqchildrenOfFakesDone(const GDBMI::ResultRecord& r); void childrenOfFakesDone(const GDBMI::ResultRecord& r);
void handleCurrentAddress(const TQValueVector<TQString>& lines); void handleCurrentAddress(const TQValueVector<TQString>& lines);
void handleType(const TQValueVector<TQString>& lines); void handleType(const TQValueVector<TQString>& lines);
void createChildren(const GDBMI::ResultRecord& r, bool tqchildren_of_fake); void createChildren(const GDBMI::ResultRecord& r, bool children_of_fake);
/** Called to handle the output of the cli print command. /** Called to handle the output of the cli print command.
*/ */
@ -391,7 +391,7 @@ private:
static int varobjIndex; static int varobjIndex;
int numChildren_; int numChildren_;
bool tqchildrenFetched_; bool childrenFetched_;
TQString currentAddress_; TQString currentAddress_;
TQString lastObtainedAddress_; TQString lastObtainedAddress_;

@ -44,7 +44,7 @@ struct DeclarationInfo {
} }
TQString locationToText() const { TQString locationToText() const {
return TQString("line %1 col %2 - line %3 col %4\nfile: %5").tqarg(startLine).tqarg(startCol).tqarg(endLine).tqarg(endCol).tqarg(file); return TQString("line %1 col %2 - line %3 col %4\nfile: %5").arg(startLine).arg(startCol).arg(endLine).arg(endCol).arg(file);
} }
TQString toText() const { TQString toText() const {

@ -427,7 +427,7 @@
<tocsect3 name="19.7.1: The `Daemon' program" url="cplusplus19.html#l349"/> <tocsect3 name="19.7.1: The `Daemon' program" url="cplusplus19.html#l349"/>
<tocsect3 name="19.7.2: The `Pipe' class" url="cplusplus19.html#l350"/> <tocsect3 name="19.7.2: The `Pipe' class" url="cplusplus19.html#l350"/>
<tocsect3 name="19.7.3: The `ParentSlurp' class" url="cplusplus19.html#l351"/> <tocsect3 name="19.7.3: The `ParentSlurp' class" url="cplusplus19.html#l351"/>
<tocsect3 name="19.7.4: Communicating with multiple tqchildren" url="cplusplus19.html#l352"> <tocsect3 name="19.7.4: Communicating with multiple children" url="cplusplus19.html#l352">
<tocsect4 name="19.7.4.1: The `Select' class" url="cplusplus19.html#l353"/> <tocsect4 name="19.7.4.1: The `Select' class" url="cplusplus19.html#l353"/>
<tocsect4 name="19.7.4.2: The `Child' class" url="cplusplus19.html#l354"/> <tocsect4 name="19.7.4.2: The `Child' class" url="cplusplus19.html#l354"/>
<tocsect4 name="19.7.4.3: The `Monitor' class" url="cplusplus19.html#l355"/> <tocsect4 name="19.7.4.3: The `Monitor' class" url="cplusplus19.html#l355"/>

@ -135,7 +135,7 @@
<tocsect2 name="GTK+ Widgets and Objects" url="gtk/gtkobjects.html"> <tocsect2 name="GTK+ Widgets and Objects" url="gtk/gtkobjects.html">
<tocsect3 name="GtkAccelLabel" url="gtk/gtkaccellabel.html"/> <tocsect3 name="GtkAccelLabel" url="gtk/gtkaccellabel.html"/>
<tocsect3 name="GtkAdjustment" url="gtk/gtkadjustment.html"/> <tocsect3 name="GtkAdjustment" url="gtk/gtkadjustment.html"/>
<tocsect3 name="GtkAlignment" url="gtk/gtktqalignment.html"/> <tocsect3 name="GtkAlignment" url="gtk/gtkalignment.html"/>
<tocsect3 name="GtkArrow" url="gtk/gtkarrow.html"/> <tocsect3 name="GtkArrow" url="gtk/gtkarrow.html"/>
<tocsect3 name="GtkAspectFrame" url="gtk/gtkaspectframe.html"/> <tocsect3 name="GtkAspectFrame" url="gtk/gtkaspectframe.html"/>
<tocsect3 name="GtkButtonBox" url="gtk/gtkbuttonbox.html"/> <tocsect3 name="GtkButtonBox" url="gtk/gtkbuttonbox.html"/>
@ -261,7 +261,7 @@
<tocsect3 name="gnome-canvas-util" url="gnomeui/gnomeui-gnome-canvas-util.html"/> <tocsect3 name="gnome-canvas-util" url="gnomeui/gnomeui-gnome-canvas-util.html"/>
<tocsect3 name="gnome-dialog-util" url="gnomeui/gnomeui-gnome-dialog-util.html"/> <tocsect3 name="gnome-dialog-util" url="gnomeui/gnomeui-gnome-dialog-util.html"/>
<tocsect3 name="gnome-dns" url="gnomeui/gnomeui-gnome-dns.html"/> <tocsect3 name="gnome-dns" url="gnomeui/gnomeui-gnome-dns.html"/>
<tocsect3 name="gnome-tqgeometry" url="gnomeui/gnomeui-gnome-tqgeometry.html"/> <tocsect3 name="gnome-geometry" url="gnomeui/gnomeui-gnome-geometry.html"/>
<tocsect3 name="gnome-ice" url="gnomeui/gnomeui-gnome-ice.html"/> <tocsect3 name="gnome-ice" url="gnomeui/gnomeui-gnome-ice.html"/>
<tocsect3 name="gnome-icon-text" url="gnomeui/gnomeui-gnome-icon-text.html"/> <tocsect3 name="gnome-icon-text" url="gnomeui/gnomeui-gnome-icon-text.html"/>
<tocsect3 name="gnome-init" url="gnomeui/gnomeui-gnome-init.html"/> <tocsect3 name="gnome-init" url="gnomeui/gnomeui-gnome-init.html"/>

@ -413,11 +413,11 @@
<entry name="check() method" url="ch10lev1sec3.html"/> <entry name="check() method" url="ch10lev1sec3.html"/>
<entry name="checkWord() method" url="ch10lev1sec3.html"/> <entry name="checkWord() method" url="ch10lev1sec3.html"/>
<entry name="Child Classes command (Classbrowser pop-up menu)" url="ch18lev1sec4.html"/> <entry name="Child Classes command (Classbrowser pop-up menu)" url="ch18lev1sec4.html"/>
<entry name="child widgets, tqgeometry management, QBoxLayout manager" url="ch04lev1sec3.html"/> <entry name="child widgets, geometry management, QBoxLayout manager" url="ch04lev1sec3.html"/>
<entry name="child widgets, tqgeometry management, QGridLayout manager" url="ch04lev1sec3.html"/> <entry name="child widgets, geometry management, QGridLayout manager" url="ch04lev1sec3.html"/>
<entry name="child widgets, tqgeometry management" url="ch04lev1sec3.html"/> <entry name="child widgets, geometry management" url="ch04lev1sec3.html"/>
<entry name="child widgets, KChildren example, ktqchildren.cpp class definition" url="ch04lev1sec3.html"/> <entry name="child widgets, KChildren example, kchildren.cpp class definition" url="ch04lev1sec3.html"/>
<entry name="child widgets, KChildren example, ktqchildren.h class declaration" url="ch04lev1sec3.html"/> <entry name="child widgets, KChildren example, kchildren.h class declaration" url="ch04lev1sec3.html"/>
<entry name="child widgets, KChildren example, main() method" url="ch04lev1sec3.html"/> <entry name="child widgets, KChildren example, main() method" url="ch04lev1sec3.html"/>
<entry name="child widgets, KChildren example" url="ch04lev1sec3.html"/> <entry name="child widgets, KChildren example" url="ch04lev1sec3.html"/>
<entry name="child widgets" url="ch04lev1sec3.html"/> <entry name="child widgets" url="ch04lev1sec3.html"/>
@ -1080,16 +1080,16 @@
<entry name="gdb debugger, running" url="ch18lev1sec6.html"/> <entry name="gdb debugger, running" url="ch18lev1sec6.html"/>
<entry name="gdb debugger" url="ch18lev1sec6.html"/> <entry name="gdb debugger" url="ch18lev1sec6.html"/>
<entry name="gdb (GNU debugger)" url="ch02.html"/> <entry name="gdb (GNU debugger)" url="ch02.html"/>
<entry name="tqgeometry management (widgets), dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/> <entry name="geometry management (widgets), dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/>
<entry name="tqgeometry management (widgets), dialog boxes, design issues" url="ch08lev1sec2.html"/> <entry name="geometry management (widgets), dialog boxes, design issues" url="ch08lev1sec2.html"/>
<entry name="tqgeometry management (widgets), dialog boxes, hierarchies of layouts" url="ch08lev1sec2.html"/> <entry name="geometry management (widgets), dialog boxes, hierarchies of layouts" url="ch08lev1sec2.html"/>
<entry name="tqgeometry management (widgets), dialog boxes, manual placement" url="ch08lev1sec2.html"/> <entry name="geometry management (widgets), dialog boxes, manual placement" url="ch08lev1sec2.html"/>
<entry name="tqgeometry management (widgets), dialog boxes, nested layouts" url="ch08lev1sec2.html"/> <entry name="geometry management (widgets), dialog boxes, nested layouts" url="ch08lev1sec2.html"/>
<entry name="tqgeometry management (widgets), dialog boxes, QLayout classes" url="ch08lev1sec2.html"/> <entry name="geometry management (widgets), dialog boxes, QLayout classes" url="ch08lev1sec2.html"/>
<entry name="tqgeometry management (widgets), dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/> <entry name="geometry management (widgets), dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
<entry name="tqgeometry management (widgets), QBoxLayout manager" url="ch04lev1sec3.html"/> <entry name="geometry management (widgets), QBoxLayout manager" url="ch04lev1sec3.html"/>
<entry name="tqgeometry management (widgets), QGridLayout manager" url="ch04lev1sec3.html"/> <entry name="geometry management (widgets), QGridLayout manager" url="ch04lev1sec3.html"/>
<entry name="tqgeometry management (widgets)" url="ch04lev1sec3.html"/> <entry name="geometry management (widgets)" url="ch04lev1sec3.html"/>
<entry name="getColor() function" url="ch05lev1sec3.html"/> <entry name="getColor() function" url="ch05lev1sec3.html"/>
<entry name="getExistingDirectory() function" url="ch05lev1sec3.html"/> <entry name="getExistingDirectory() function" url="ch05lev1sec3.html"/>
<entry name="getFont() function" url="ch05lev1sec3.html"/> <entry name="getFont() function" url="ch05lev1sec3.html"/>
@ -1278,10 +1278,10 @@
<entry name="KApplication class" url="ch02lev1sec3.html"/> <entry name="KApplication class" url="ch02lev1sec3.html"/>
<entry name="KAudioPlayer class" url="ch14lev1sec6.html"/> <entry name="KAudioPlayer class" url="ch14lev1sec6.html"/>
<entry name="KButtonBox manager widget" url="ch08lev1sec4.html"/> <entry name="KButtonBox manager widget" url="ch08lev1sec4.html"/>
<entry name="ktqchildren.cpp class definition (KChildren widget)" url="ch04lev1sec3.html"/> <entry name="kchildren.cpp class definition (KChildren widget)" url="ch04lev1sec3.html"/>
<entry name="ktqchildren.h class declaration (KChildren widget)" url="ch04lev1sec3.html"/> <entry name="kchildren.h class declaration (KChildren widget)" url="ch04lev1sec3.html"/>
<entry name="KChildren sample widget (child widget), ktqchildren.cpp class definition" url="ch04lev1sec3.html"/> <entry name="KChildren sample widget (child widget), kchildren.cpp class definition" url="ch04lev1sec3.html"/>
<entry name="KChildren sample widget (child widget), ktqchildren.h class declaration" url="ch04lev1sec3.html"/> <entry name="KChildren sample widget (child widget), kchildren.h class declaration" url="ch04lev1sec3.html"/>
<entry name="KChildren sample widget (child widget), main() method" url="ch04lev1sec3.html"/> <entry name="KChildren sample widget (child widget), main() method" url="ch04lev1sec3.html"/>
<entry name="KChildren sample widget (child widget)" url="ch04lev1sec3.html"/> <entry name="KChildren sample widget (child widget)" url="ch04lev1sec3.html"/>
<entry name="kconfigdemo.cpp file (KConfigDemo widget)" url="ch07lev1sec2.html"/> <entry name="kconfigdemo.cpp file (KConfigDemo widget)" url="ch07lev1sec2.html"/>
@ -1558,9 +1558,9 @@
<entry name="KStdActionsDemo widget" url="ch05.html"/> <entry name="KStdActionsDemo widget" url="ch05.html"/>
<entry name="ktictactoe.cpp class definition (KTicTacToe widget)" url="ch04lev1sec3.html"/> <entry name="ktictactoe.cpp class definition (KTicTacToe widget)" url="ch04lev1sec3.html"/>
<entry name="ktictactoe.h class declaration (KTicTacToe widget)" url="ch04lev1sec3.html"/> <entry name="ktictactoe.h class declaration (KTicTacToe widget)" url="ch04lev1sec3.html"/>
<entry name="KTicTacToe widget (tqgeometry management example), ktictactoe.cpp class definition" url="ch04lev1sec3.html"/> <entry name="KTicTacToe widget (geometry management example), ktictactoe.cpp class definition" url="ch04lev1sec3.html"/>
<entry name="KTicTacToe widget (tqgeometry management example), ktictactoe.h class declaration" url="ch04lev1sec3.html"/> <entry name="KTicTacToe widget (geometry management example), ktictactoe.h class declaration" url="ch04lev1sec3.html"/>
<entry name="KTicTacToe widget (tqgeometry management example), playing the game" url="ch04lev1sec3.html"/> <entry name="KTicTacToe widget (geometry management example), playing the game" url="ch04lev1sec3.html"/>
<entry name="KTMainWindow class" url="ch02lev1sec3.html"/> <entry name="KTMainWindow class" url="ch02lev1sec3.html"/>
<entry name="Kulow, Stephen" url="ch16.html"/> <entry name="Kulow, Stephen" url="ch16.html"/>
<entry name="KUniqueApplication class, passing command-line parameters" url="ch13lev1sec7.html"/> <entry name="KUniqueApplication class, passing command-line parameters" url="ch13lev1sec7.html"/>
@ -1656,12 +1656,12 @@
<entry name="listings, dialog boxes, dialog from tdeui library" url="ch08lev1sec4.html"/> <entry name="listings, dialog boxes, dialog from tdeui library" url="ch08lev1sec4.html"/>
<entry name="listings, dialog boxes, KButtonBox in a dialog" url="ch08lev1sec4.html"/> <entry name="listings, dialog boxes, KButtonBox in a dialog" url="ch08lev1sec4.html"/>
<entry name="listings, dialog boxes, KEdit dialog code" url="ch08lev1sec6.html"/> <entry name="listings, dialog boxes, KEdit dialog code" url="ch08lev1sec6.html"/>
<entry name="listings, dialog boxes, manual tqgeometry strategy and QLayouts classes" url="ch08lev1sec2.html"/> <entry name="listings, dialog boxes, manual geometry strategy and QLayouts classes" url="ch08lev1sec2.html"/>
<entry name="listings, dialog boxes, modal dialog allocated from the heap" url="ch08lev1sec3.html"/> <entry name="listings, dialog boxes, modal dialog allocated from the heap" url="ch08lev1sec3.html"/>
<entry name="listings, dialog boxes, modal dialog located on the stack" url="ch08lev1sec3.html"/> <entry name="listings, dialog boxes, modal dialog located on the stack" url="ch08lev1sec3.html"/>
<entry name="listings, dialog boxes, modeless dialog example" url="ch08lev1sec3.html"/> <entry name="listings, dialog boxes, modeless dialog example" url="ch08lev1sec3.html"/>
<entry name="listings, dialog boxes, modeless dialogs, removing from memory" url="ch08lev1sec3.html"/> <entry name="listings, dialog boxes, modeless dialogs, removing from memory" url="ch08lev1sec3.html"/>
<entry name="listings, dialog boxes, QVBox widget for tqgeometry management" url="ch08lev1sec2.html"/> <entry name="listings, dialog boxes, QVBox widget for geometry management" url="ch08lev1sec2.html"/>
<entry name="listings, dialog boxes, SelectDialog class" url="ch08.html"/> <entry name="listings, dialog boxes, SelectDialog class" url="ch08.html"/>
<entry name="listings, Example_ADD interface" url="ch14lev1sec2.html"/> <entry name="listings, Example_ADD interface" url="ch14lev1sec2.html"/>
<entry name="listings, Example_ADD module" url="ch14lev1sec2.html"/> <entry name="listings, Example_ADD module" url="ch14lev1sec2.html"/>
@ -1672,8 +1672,8 @@
<entry name="listings, KabDemo application (address book dialog), kabdemo.cpp class definition" url="ch10lev1sec4.html"/> <entry name="listings, KabDemo application (address book dialog), kabdemo.cpp class definition" url="ch10lev1sec4.html"/>
<entry name="listings, KabDemo application (address book dialog), kabdemo.h class declaration" url="ch10lev1sec4.html"/> <entry name="listings, KabDemo application (address book dialog), kabdemo.h class declaration" url="ch10lev1sec4.html"/>
<entry name="listings, KabDemo application (address book dialog), main() method" url="ch10lev1sec4.html"/> <entry name="listings, KabDemo application (address book dialog), main() method" url="ch10lev1sec4.html"/>
<entry name="listings, KChildren widget, ktqchildren.cpp class definition" url="ch04lev1sec3.html"/> <entry name="listings, KChildren widget, kchildren.cpp class definition" url="ch04lev1sec3.html"/>
<entry name="listings, KChildren widget, ktqchildren.h class declaration" url="ch04lev1sec3.html"/> <entry name="listings, KChildren widget, kchildren.h class declaration" url="ch04lev1sec3.html"/>
<entry name="listings, KChildren widget, main() method" url="ch04lev1sec3.html"/> <entry name="listings, KChildren widget, main() method" url="ch04lev1sec3.html"/>
<entry name="listings, KConfigDemo widget, kconfigdemo.cpp class definition" url="ch07lev1sec2.html"/> <entry name="listings, KConfigDemo widget, kconfigdemo.cpp class definition" url="ch07lev1sec2.html"/>
<entry name="listings, KConfigDemo widget, kconfigdemo.h class declaration" url="ch07lev1sec2.html"/> <entry name="listings, KConfigDemo widget, kconfigdemo.h class declaration" url="ch07lev1sec2.html"/>
@ -1829,7 +1829,7 @@
<entry name="managing, sessions, source file example" url="ch06lev1sec2.html"/> <entry name="managing, sessions, source file example" url="ch06lev1sec2.html"/>
<entry name="managing, sessions" url="ch06lev1sec2.html"/> <entry name="managing, sessions" url="ch06lev1sec2.html"/>
<entry name="managing, sessions" url="ch07lev1sec3.html"/> <entry name="managing, sessions" url="ch07lev1sec3.html"/>
<entry name="manual tqgeometry strategy (dialog boxes)" url="ch08lev1sec2.html"/> <entry name="manual geometry strategy (dialog boxes)" url="ch08lev1sec2.html"/>
<entry name="mcopclass files" url="ch14lev1sec2.html"/> <entry name="mcopclass files" url="ch14lev1sec2.html"/>
<entry name="MCOP, future of, composition/RAD" url="ch14lev1sec7.html"/> <entry name="MCOP, future of, composition/RAD" url="ch14lev1sec7.html"/>
<entry name="MCOP, future of, GUIs" url="ch14lev1sec7.html"/> <entry name="MCOP, future of, GUIs" url="ch14lev1sec7.html"/>
@ -1937,7 +1937,7 @@
<entry name="methods, remoteFunctions()" url="ch13lev1sec6.html"/> <entry name="methods, remoteFunctions()" url="ch13lev1sec6.html"/>
<entry name="methods, remoteInterfaces()" url="ch13lev1sec6.html"/> <entry name="methods, remoteInterfaces()" url="ch13lev1sec6.html"/>
<entry name="methods, remoteObjects()" url="ch13lev1sec6.html"/> <entry name="methods, remoteObjects()" url="ch13lev1sec6.html"/>
<entry name="methods, tqrepaint(), QPainter class" url="ch04lev1sec2.html"/> <entry name="methods, repaint(), QPainter class" url="ch04lev1sec2.html"/>
<entry name="methods, resume()" url="ch13lev1sec5.html"/> <entry name="methods, resume()" url="ch13lev1sec5.html"/>
<entry name="methods, senderId()" url="ch13lev1sec6.html"/> <entry name="methods, senderId()" url="ch13lev1sec6.html"/>
<entry name="methods, send()" url="ch13lev1sec5.html"/> <entry name="methods, send()" url="ch13lev1sec5.html"/>
@ -2264,10 +2264,10 @@
<entry name="protocols, DCOP" url="ch13.html"/> <entry name="protocols, DCOP" url="ch13.html"/>
<entry name="protocols, FTP, snapshots" url="ch17lev1sec3.html"/> <entry name="protocols, FTP, snapshots" url="ch17lev1sec3.html"/>
<entry name="protocols, XDND" url="ch07.html"/> <entry name="protocols, XDND" url="ch07.html"/>
<entry name="QBoxLayout tqgeometry manager" url="ch04lev1sec3.html"/> <entry name="QBoxLayout geometry manager" url="ch04lev1sec3.html"/>
<entry name="QDataStream objects" url="ch13lev1sec3.html"/> <entry name="QDataStream objects" url="ch13lev1sec3.html"/>
<entry name="QGL widget" url="ch03lev1sec6.html"/> <entry name="QGL widget" url="ch03lev1sec6.html"/>
<entry name="QGridLayout tqgeometry manager" url="ch04lev1sec3.html"/> <entry name="QGridLayout geometry manager" url="ch04lev1sec3.html"/>
<entry name="QHBox widget, tqlayout managers, creating" url="ch08lev1sec2.html"/> <entry name="QHBox widget, tqlayout managers, creating" url="ch08lev1sec2.html"/>
<entry name="QImage class" url="ch10lev1sec2.html"/> <entry name="QImage class" url="ch10lev1sec2.html"/>
<entry name="QLayout classes, code example" url="ch08lev1sec2.html"/> <entry name="QLayout classes, code example" url="ch08lev1sec2.html"/>
@ -2278,7 +2278,7 @@
<entry name="QPainter class, example usage (listing)" url="ch03lev1sec2.html"/> <entry name="QPainter class, example usage (listing)" url="ch03lev1sec2.html"/>
<entry name="QPainter class, member function" url="ch03lev1sec2.html"/> <entry name="QPainter class, member function" url="ch03lev1sec2.html"/>
<entry name="QPainter class, methods, paintEvent()" url="ch04lev1sec2.html"/> <entry name="QPainter class, methods, paintEvent()" url="ch04lev1sec2.html"/>
<entry name="QPainter class, methods, tqrepaint()" url="ch04lev1sec2.html"/> <entry name="QPainter class, methods, repaint()" url="ch04lev1sec2.html"/>
<entry name="QPainter class, methods, update()" url="ch04lev1sec2.html"/> <entry name="QPainter class, methods, update()" url="ch04lev1sec2.html"/>
<entry name="QPainter class" url="ch03lev1sec2.html"/> <entry name="QPainter class" url="ch03lev1sec2.html"/>
<entry name="QPainter class" url="ch04lev1sec2.html"/> <entry name="QPainter class" url="ch04lev1sec2.html"/>
@ -2386,7 +2386,7 @@
<entry name="removing, modeless dialog boxes" url="ch08lev1sec3.html"/> <entry name="removing, modeless dialog boxes" url="ch08lev1sec3.html"/>
<entry name="rendering, HTML files" url="ch10.html"/> <entry name="rendering, HTML files" url="ch10.html"/>
<entry name="repainting, widgets" url="ch04lev1sec2.html"/> <entry name="repainting, widgets" url="ch04lev1sec2.html"/>
<entry name="tqrepaint() method, QPainter class" url="ch04lev1sec2.html"/> <entry name="repaint() method, QPainter class" url="ch04lev1sec2.html"/>
<entry name="replace action" url="ch06.html"/> <entry name="replace action" url="ch06.html"/>
<entry name="reportBug action" url="ch06.html"/> <entry name="reportBug action" url="ch06.html"/>
<entry name="resiceGL(int width, int height) function (QGL widget)" url="ch03lev1sec6.html"/> <entry name="resiceGL(int width, int height) function (QGL widget)" url="ch03lev1sec6.html"/>
@ -2789,7 +2789,7 @@
<entry name="widets, KImageView (image viewer/converter), main() method" url="ch10lev1sec2.html"/> <entry name="widets, KImageView (image viewer/converter), main() method" url="ch10lev1sec2.html"/>
<entry name="widets, KImageView (image viewer/converter)" url="ch10lev1sec2.html"/> <entry name="widets, KImageView (image viewer/converter)" url="ch10lev1sec2.html"/>
<entry name="widgets, attributes" url="ch04.html"/> <entry name="widgets, attributes" url="ch04.html"/>
<entry name="widgets, child widgets, tqgeometry management" url="ch04lev1sec3.html"/> <entry name="widgets, child widgets, geometry management" url="ch04lev1sec3.html"/>
<entry name="widgets, child widgets, KChildren example" url="ch04lev1sec3.html"/> <entry name="widgets, child widgets, KChildren example" url="ch04lev1sec3.html"/>
<entry name="widgets, child widgets" url="ch04lev1sec3.html"/> <entry name="widgets, child widgets" url="ch04lev1sec3.html"/>
<entry name="widgets, compared to parts" url="ch12.html"/> <entry name="widgets, compared to parts" url="ch12.html"/>

@ -257,7 +257,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi
dir = TQDir( dir.absPath() ); dir = TQDir( dir.absPath() );
TQFileInfo makeFile( dir, "Makefile" ); TQFileInfo makeFile( dir, "Makefile" );
if( !makeFile.exists() ) if( !makeFile.exists() )
return PathResolutionResult(false, i18n("Makefile is missing in folder \"%1\"").tqarg(dir.absPath()), i18n("problem while trying to resolve include-paths for %1").tqarg(file) ); return PathResolutionResult(false, i18n("Makefile is missing in folder \"%1\"").arg(dir.absPath()), i18n("problem while trying to resolve include-paths for %1").arg(file) );
TQStringList cachedPath; //If the call doesn't succeed, use the cached not up-to-date version TQStringList cachedPath; //If the call doesn't succeed, use the cached not up-to-date version
TQDateTime makeFileModification = makeFile.lastModified(); TQDateTime makeFileModification = makeFile.lastModified();
@ -298,7 +298,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi
int dot; int dot;
if( (dot = file.findRev( '.' )) == -1 ) if( (dot = file.findRev( '.' )) == -1 )
return PathResolutionResult( false, i18n( "Filename %1 seems to be malformed" ).tqarg(file) ); return PathResolutionResult( false, i18n( "Filename %1 seems to be malformed" ).arg(file) );
targetName = file.left( dot ); targetName = file.left( dot );
@ -387,12 +387,12 @@ PathResolutionResult IncludePathResolver::getFullOutput( const TQString& command
output = proc.stdOut(); output = proc.stdOut();
if( proc.exitStatus() != 0 ) if( proc.exitStatus() != 0 )
return PathResolutionResult( false, i18n("make-process finished with nonzero exit-status"), i18n("output: %1").tqarg( output ) ); return PathResolutionResult( false, i18n("make-process finished with nonzero exit-status"), i18n("output: %1").arg( output ) );
} else { } else {
bool ret = executeCommandPopen(command, workingDirectory, output); bool ret = executeCommandPopen(command, workingDirectory, output);
if( !ret ) if( !ret )
return PathResolutionResult( false, i18n("make-process failed"), i18n("output: %1").tqarg( output ) ); return PathResolutionResult( false, i18n("make-process failed"), i18n("output: %1").arg( output ) );
} }
return PathResolutionResult(true); return PathResolutionResult(true);
} }
@ -471,14 +471,14 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt
return res; return res;
return resolveIncludePathInternal( KURL::relativePath(newWorkingDirectory,u.path()), newWorkingDirectory, makeParams , newSource ); return resolveIncludePathInternal( KURL::relativePath(newWorkingDirectory,u.path()), newWorkingDirectory, makeParams , newSource );
}else{ }else{
return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The parameter-string \"%1\" does not seem to be valid. Output was: %2").tqarg(makeParams).tqarg(fullOutput) ); return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The parameter-string \"%1\" does not seem to be valid. Output was: %2").arg(makeParams).arg(fullOutput) );
} }
} else { } else {
return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The directory \"%1\" does not exist. Output was: %2").tqarg(newWorkingDirectory).tqarg(fullOutput) ); return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The directory \"%1\" does not exist. Output was: %2").arg(newWorkingDirectory).arg(fullOutput) );
} }
} else { } else {
return PathResolutionResult( false, i18n("Recursive make-call malformed"), i18n("Output was: %2").tqarg(fullOutput) ); return PathResolutionResult( false, i18n("Recursive make-call malformed"), i18n("Output was: %2").arg(fullOutput) );
} }
++offset; ++offset;
@ -488,7 +488,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt
///STEP 2: Search the output for include-paths ///STEP 2: Search the output for include-paths
TQRegExp validRx( "\\b([cg]\\+\\+|gcc)" ); TQRegExp validRx( "\\b([cg]\\+\\+|gcc)" );
if( validRx.search( fullOutput ) == -1 ) if( validRx.search( fullOutput ) == -1 )
return PathResolutionResult( false, i18n("Output seems not to be a valid gcc or g++ call"), i18n("Folder: \"%1\" Command: \"%2\" Output: \"%3\"").tqarg(workingDirectory).tqarg( source.getCommand(file, makeParameters) ).tqarg(fullOutput) ); return PathResolutionResult( false, i18n("Output seems not to be a valid gcc or g++ call"), i18n("Folder: \"%1\" Command: \"%2\" Output: \"%3\"").arg(workingDirectory).arg( source.getCommand(file, makeParameters) ).arg(fullOutput) );
PathResolutionResult ret( true ); PathResolutionResult ret( true );
ret.longErrorMessage = fullOutput; ret.longErrorMessage = fullOutput;
@ -497,7 +497,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt
TQString quotedRx( "(\\').*(\\')|(\\\").*(\\\")" ); //Matches "hello", 'hello', 'hello"hallo"', etc. TQString quotedRx( "(\\').*(\\')|(\\\").*(\\\")" ); //Matches "hello", 'hello', 'hello"hallo"', etc.
TQString escapedPathRx( "(([^)(\"'\\s]*)(\\\\\\s)?)*" ); //Matches /usr/I\ am \ a\ strange\ path/include TQString escapedPathRx( "(([^)(\"'\\s]*)(\\\\\\s)?)*" ); //Matches /usr/I\ am \ a\ strange\ path/include
TQRegExp includeRx( TQString( "%1(%2|%3)(?=\\s)" ).tqarg( includeParameterRx ).tqarg( quotedRx ).tqarg( escapedPathRx ) ); TQRegExp includeRx( TQString( "%1(%2|%3)(?=\\s)" ).arg( includeParameterRx ).arg( quotedRx ).arg( escapedPathRx ) );
includeRx.setMinimal( true ); includeRx.setMinimal( true );
includeRx.setCaseSensitive( true ); includeRx.setCaseSensitive( true );
offset = 0; offset = 0;

@ -175,7 +175,7 @@ TQStringList KDevDriver::getCustomIncludePath( const TQString& file ) {
CppTools::PathResolutionResult res = m_includePathResolver->resolveIncludePath( file ); CppTools::PathResolutionResult res = m_includePathResolver->resolveIncludePath( file );
if( !res.success ) { if( !res.success ) {
Problem p( i18n( "%1. Message: %2" ).tqarg( res.errorMessage ).tqarg( res.longErrorMessage ), 0, 0, Problem::Level_Warning ); Problem p( i18n( "%1. Message: %2" ).arg( res.errorMessage ).arg( res.longErrorMessage ), 0, 0, Problem::Level_Warning );
p.setFileName( file ); p.setFileName( file );
addProblem( file, p ); addProblem( file, p );
} }
@ -184,7 +184,7 @@ TQStringList KDevDriver::getCustomIncludePath( const TQString& file ) {
} }
bool KDevDriver::shouldParseIncludedFile( const ParsedFilePointer& file ) { bool KDevDriver::shouldParseIncludedFile( const ParsedFilePointer& file ) {
TQString compoundString = file->fileName() + "||" + TQString("%1").tqarg(file->usedMacros().valueHash()) + "||" + TQString("%1").tqarg(file->usedMacros().idHash()); TQString compoundString = file->fileName() + "||" + TQString("%1").arg(file->usedMacros().valueHash()) + "||" + TQString("%1").arg(file->usedMacros().idHash());
if( !m_shouldParseIncludedFiles ) if( !m_shouldParseIncludedFiles )
return false; return false;

@ -93,7 +93,7 @@ void SettingsDialog::validateDirectory( const TQString & dir )
elb->listBox() ->removeItem( elb->listBox() ->index( item ) ); elb->listBox() ->removeItem( elb->listBox() ->index( item ) );
} }
TQString errormsg = TQString( "<qt><b>%1</b> is not a directory</qt>" ).tqarg( dir ); TQString errormsg = TQString( "<qt><b>%1</b> is not a directory</qt>" ).arg( dir );
KMessageBox::error( 0, errormsg, "Couldn't find directory" ); KMessageBox::error( 0, errormsg, "Couldn't find directory" );
} }
emit enabled( elb->listBox()->count() > 0 ); emit enabled( elb->listBox()->count() > 0 );

@ -175,7 +175,7 @@ void ProblemReporter::slotFilter()
if(!m_tabBar->isTabEnabled(5)) if(!m_tabBar->isTabEnabled(5))
m_tabBar->setTabEnabled(5,true); m_tabBar->setTabEnabled(5,true);
m_tabBar->tab(5)->setText(i18n("Filtered: %1").tqarg( m_filterEdit->text() )); m_tabBar->tab(5)->setText(i18n("Filtered: %1").arg( m_filterEdit->text() ));
m_tabBar->setCurrentTab(5); m_tabBar->setCurrentTab(5);
m_filteredList->clear(); m_filteredList->clear();

@ -141,9 +141,9 @@ void QtBuildConfig::findTQtDir()
TQStringList qtdirs; TQStringList qtdirs;
if( m_version == 3 ) if( m_version == 3 )
qtdirs.push_back( ::getenv("QTDIR") ); qtdirs.push_back( ::getenv("QTDIR") );
qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( m_version ) ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( m_version ) );
qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").tqarg( m_version ) ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").arg( m_version ) );
qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( m_version ) ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( m_version ) );
qtdirs.push_back( TQDir::rootDirPath()+"usr" ); qtdirs.push_back( TQDir::rootDirPath()+"usr" );
qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt" ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt" );

@ -301,7 +301,7 @@ TQString SimpleTypeImpl::operatorToString( Operator op ) {
case ParenOp: case ParenOp:
return "paren-operator"; return "paren-operator";
default: default:
return TQString( "%1" ).tqarg( ( long ) op ); return TQString( "%1" ).arg( ( long ) op );
}; };
} }

@ -214,7 +214,7 @@ class SimpleTypeConfiguration {
SimpleType::destroyStore(); SimpleType::destroyStore();
} }
} }
void tqinvalidate() { void invalidate() {
m_invalid = true; m_invalid = true;
} }
}; };

@ -78,9 +78,9 @@ void TagCreator::parseTranslationUnit( const ParsedFile& ast )
ast.write( stream ); ast.write( stream );
tag.setAttribute( "cppparsedfile", data ); tag.setAttribute( "cppparsedfile", data );
tag.setAttribute( "includedFrom", ast.includedFrom() ); tag.setAttribute( "includedFrom", ast.includedFrom() );
tag.setAttribute( "skippedLines", TQString("%1").tqarg( ast.skippedLines()) ); tag.setAttribute( "skippedLines", TQString("%1").arg( ast.skippedLines()) );
tag.setAttribute( "macroValueHash", TQString("%1").tqarg( ast.usedMacros().valueHash()) ); tag.setAttribute( "macroValueHash", TQString("%1").arg( ast.usedMacros().valueHash()) );
tag.setAttribute( "macroIdHash", TQString("%1").tqarg( ast.usedMacros().idHash() ) ); tag.setAttribute( "macroIdHash", TQString("%1").arg( ast.usedMacros().idHash() ) );
tag.setScope( m_currentScope ); tag.setScope( m_currentScope );
if( !ast->comment().isEmpty() ) if( !ast->comment().isEmpty() )

@ -141,7 +141,7 @@ const char *f77_flags[] = {
const char *portability_flags[] = { const char *portability_flags[] = {
"backslash", I18N_NOOP("Backslash characters in strings"), "backslash", I18N_NOOP("Backslash characters in strings"),
"common-tqalignment", I18N_NOOP("COMMON block variables not in descending order of storage sizes"), "common-alignment", I18N_NOOP("COMMON block variables not in descending order of storage sizes"),
"hollerith", I18N_NOOP("Hollerith constants"), "hollerith", I18N_NOOP("Hollerith constants"),
0, 0 0, 0
}; };

@ -61,7 +61,7 @@
<property name="text"> <property name="text">
<string>msec</string> <string>msec</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignLeft</set> <set>AlignVCenter|AlignLeft</set>
</property> </property>
</widget> </widget>

@ -46,7 +46,7 @@ void ConfigureProblemReporter::bgParserCheckbox_toggled( bool b )
void ConfigureProblemReporter::setDelayLabel( int delay ) void ConfigureProblemReporter::setDelayLabel( int delay )
{ {
delayLabel->setText( i18n( "delay: %1 msec" ).tqarg( delay ) ); delayLabel->setText( i18n( "delay: %1 msec" ).arg( delay ) );
} }

@ -560,7 +560,7 @@ JavaSupportPart::parseProject( )
continue; continue;
if( pcs.contains(absFilePath) && t.toTime_t() == pcs[absFilePath].first ){ if( pcs.contains(absFilePath) && t.toTime_t() == pcs[absFilePath].first ){
stream.tqdevice()->at( pcs[absFilePath].second ); stream.device()->at( pcs[absFilePath].second );
FileDom file = codeModel()->create<FileModel>(); FileDom file = codeModel()->create<FileModel>();
file->read( stream ); file->read( stream );
codeModel()->addFile( file ); codeModel()->addFile( file );
@ -860,21 +860,21 @@ void JavaSupportPart::saveProjectSourceInfo( )
for( FileList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ){ for( FileList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ){
const FileDom dom = (*it); const FileDom dom = (*it);
stream << dom->name() << m_timestamp[ dom->name() ].toTime_t(); stream << dom->name() << m_timestamp[ dom->name() ].toTime_t();
offsets.insert( dom->name(), stream.tqdevice()->at() ); offsets.insert( dom->name(), stream.device()->at() );
stream << (uint)0; // dummy offset stream << (uint)0; // dummy offset
} }
for( FileList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ){ for( FileList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ){
const FileDom dom = (*it); const FileDom dom = (*it);
int offset = stream.tqdevice()->at(); int offset = stream.device()->at();
dom->write( stream ); dom->write( stream );
int end = stream.tqdevice()->at(); int end = stream.device()->at();
stream.tqdevice()->at( offsets[dom->name()] ); stream.device()->at( offsets[dom->name()] );
stream << offset; stream << offset;
stream.tqdevice()->at( end ); stream.device()->at( end );
} }
} }

@ -77,7 +77,7 @@ void ImplementationWidget::init(const TQString &formName)
TQDomDocument doc; TQDomDocument doc;
DomUtil::openDOMFile(doc, m_formName); DomUtil::openDOMFile(doc, m_formName);
m_baseClassName = DomUtil::elementByPathExt(doc, "class").text(); m_baseClassName = DomUtil::elementByPathExt(doc, "class").text();
setCaption(i18n("Create or Select Implementation Class for: %1").tqarg(m_baseClassName)); setCaption(i18n("Create or Select Implementation Class for: %1").arg(m_baseClassName));
KListViewItem *item = new KListViewItem(classView, i18n("Namespaces &amp;&amp; Classes")); KListViewItem *item = new KListViewItem(classView, i18n("Namespaces &amp;&amp; Classes"));
item->setOpen(true); item->setOpen(true);

@ -60,7 +60,7 @@ void QtDesignerIntegration::addFunction(const TQString& formName, KInterfaceDesi
ClassDom klass = m_implementations[formName]; ClassDom klass = m_implementations[formName];
if (!klass) if (!klass)
{ {
KMessageBox::error(0, i18n("Cannot find implementation class for form: %1").tqarg(formName)); KMessageBox::error(0, i18n("Cannot find implementation class for form: %1").arg(formName));
return; return;
} }

@ -59,7 +59,7 @@ options {
* *
* One of the principles here is that any time you have a list of * One of the principles here is that any time you have a list of
* stuff, you usually want to treat it like one thing (a list) a some * stuff, you usually want to treat it like one thing (a list) a some
* point in the grammar. You want trees to have a fixed number of tqchildren * point in the grammar. You want trees to have a fixed number of children
* as much as possible. For example, the definition of a procedure should * as much as possible. For example, the definition of a procedure should
* be something like #(PROCEDURE ID #(ARGDECLS ARG1 ARG2...)) not * be something like #(PROCEDURE ID #(ARGDECLS ARG1 ARG2...)) not
* #(PROCEDURE ID ARG1 ARG2 ... ) since this is harder to parse and * #(PROCEDURE ID ARG1 ARG2 ... ) since this is harder to parse and

@ -191,7 +191,7 @@ void PascalSupportPart::maybeParse( const TQString & fileName )
if( !mime || mime->name() != "text/x-pascal" ) if( !mime || mime->name() != "text/x-pascal" )
return; return;
mainWindow()->statusBar()->message( i18n("Parsing file: %1").tqarg(fileName) ); mainWindow()->statusBar()->message( i18n("Parsing file: %1").arg(fileName) );
parse( fileName ); parse( fileName );
} }

@ -184,7 +184,7 @@ domxml:string domxml_attrname([int dir_handle])
domxml:class domxml_node(string name) domxml:class domxml_node(string name)
domxml:string domxml_lastchild([int node]) domxml:string domxml_lastchild([int node])
domxml:string domxml_parent([int node]) domxml:string domxml_parent([int node])
domxml:string domxml_tqchildren([int node]) domxml:string domxml_children([int node])
domxml:string domxml_getattr([int node,] string attrname) domxml:string domxml_getattr([int node,] string attrname)
domxml:bool domxml_setattr([int node,] string attrname, string value) domxml:bool domxml_setattr([int node,] string attrname, string value)
domxml:array domxml_attributes([int node]) domxml:array domxml_attributes([int node])
@ -199,7 +199,7 @@ domxml:string domxml_add_root([int doc_handle,] string name)
domxml:class domxml_new_xmldoc(string version) domxml:class domxml_new_xmldoc(string version)
domxml:string node_namespace([int node]) domxml:string node_namespace([int node])
domxml:string node_attributes([int node]) domxml:string node_attributes([int node])
domxml:string node_tqchildren([int node]) domxml:string node_children([int node])
domxml:class xmltree(string xmldoc) domxml:class xmltree(string xmldoc)
dotnet:int dotnet_load(string module_name) dotnet:int dotnet_load(string module_name)
exif:string read_exif_data(string filename) exif:string read_exif_data(string filename)
@ -341,7 +341,7 @@ hw:hwdoc hw_gettext(int link, int objid [, int rootid])
hw:void hw_edittext(int link, hwdoc doc) hw:void hw_edittext(int link, hwdoc doc)
hw:hwdoc hw_getcgi(int link, int objid) hw:hwdoc hw_getcgi(int link, int objid)
hw:int hw_getremote(int link, int objid) hw:int hw_getremote(int link, int objid)
hw:[array|int] hw_getremotetqchildren(int link, string objrec) hw:[array|int] hw_getremotechildren(int link, string objrec)
hw:void hw_setlinkroot(int link, int rootid) hw:void hw_setlinkroot(int link, int rootid)
hw:hwdoc hw_pipedocument(int link, int objid) hw:hwdoc hw_pipedocument(int link, int objid)
hw:hwdoc hw_pipecgi(int link, int objid) hw:hwdoc hw_pipecgi(int link, int objid)
@ -360,8 +360,8 @@ hw:string hw_documentattributes(hwdoc doc)
hw:string hw_document_attributes(hwdoc doc) hw:string hw_document_attributes(hwdoc doc)
hw:array hw_getparentsobj(int link, int objid) hw:array hw_getparentsobj(int link, int objid)
hw:array hw_getparents(int link, int objid) hw:array hw_getparents(int link, int objid)
hw:array hw_tqchildren(int link, int objid) hw:array hw_children(int link, int objid)
hw:array hw_tqchildrenobj(int link, int objid) hw:array hw_childrenobj(int link, int objid)
hw:array hw_getchildcoll(int link, int objid) hw:array hw_getchildcoll(int link, int objid)
hw:array hw_getchildcollobj(int link, int objid) hw:array hw_getchildcollobj(int link, int objid)
hw:int hw_docbyanchor(int link, int anchorid) hw:int hw_docbyanchor(int link, int anchorid)
@ -1501,18 +1501,18 @@ swf:void swf_actiongotolabel(string label)
swf:void swf_defineline(int objid, double x1, double y1, double x2, double y2, double width) swf:void swf_defineline(int objid, double x1, double y1, double x2, double y2, double width)
swf:void swf_definerect(int objid, double x1, double y1, double x2, double y2, double width) swf:void swf_definerect(int objid, double x1, double y1, double x2, double y2, double width)
swf:void swf_definepoly(int obj_id, array coords, int npoints, double width) swf:void swf_definepoly(int obj_id, array coords, int npoints, double width)
swf:void swf_starttqshape(int objid) swf:void swf_startshape(int objid)
swf:void swf_tqshapelinesolid(double r, double g, double b, double a, double width) swf:void swf_shapelinesolid(double r, double g, double b, double a, double width)
swf:void swf_tqshapefilloff(void) swf:void swf_shapefilloff(void)
swf:void swf_tqshapefillsolid(double r, double g, double b, double a) swf:void swf_shapefillsolid(double r, double g, double b, double a)
swf:void swf_tqshapefillbitmapclip(int bitmapid) swf:void swf_shapefillbitmapclip(int bitmapid)
swf:void swf_tqshapefillbitmaptile(int bitmapid) swf:void swf_shapefillbitmaptile(int bitmapid)
swf:void swf_tqshapemoveto(double x, double y) swf:void swf_shapemoveto(double x, double y)
swf:void swf_tqshapelineto(double x, double y) swf:void swf_shapelineto(double x, double y)
swf:void swf_tqshapecurveto(double x1, double y1, double x2, double y2) swf:void swf_shapecurveto(double x1, double y1, double x2, double y2)
swf:void swf_tqshapecurveto3(double x1, double y1, double x2, double y2, double x3, double y3) swf:void swf_shapecurveto3(double x1, double y1, double x2, double y2, double x3, double y3)
swf:void swf_tqshapearc(double x, double y, double r, double ang1, double ang2) swf:void swf_shapearc(double x, double y, double r, double ang1, double ang2)
swf:void swf_endtqshape(void) swf:void swf_endshape(void)
swf:void swf_definefont(int fontid, string name) swf:void swf_definefont(int fontid, string name)
swf:void swf_setfont(int fontid) swf:void swf_setfont(int fontid)
swf:void swf_fontsize(double height) swf:void swf_fontsize(double height)

@ -688,7 +688,7 @@
<tocsect2 name="SWFMorph" url="class.swfmorph.php"/> <tocsect2 name="SWFMorph" url="class.swfmorph.php"/>
<tocsect2 name="SWFMovie" url="class.swfmovie.php"/> <tocsect2 name="SWFMovie" url="class.swfmovie.php"/>
<tocsect2 name="SWFPrebuiltClip" url="class.swfprebuiltclip.php"/> <tocsect2 name="SWFPrebuiltClip" url="class.swfprebuiltclip.php"/>
<tocsect2 name="SWFShape" url="class.swftqshape.php"/> <tocsect2 name="SWFShape" url="class.swfshape.php"/>
<tocsect2 name="SWFSound" url="class.swfsound.php"/> <tocsect2 name="SWFSound" url="class.swfsound.php"/>
<tocsect2 name="SWFSoundInstance" url="class.swfsoundinstance.php"/> <tocsect2 name="SWFSoundInstance" url="class.swfsoundinstance.php"/>
<tocsect2 name="SWFSprite" url="class.swfsprite.php"/> <tocsect2 name="SWFSprite" url="class.swfsprite.php"/>
@ -3841,7 +3841,7 @@
<entry name="Imagick::getImageFilename" url="function.imagick-getimagefilename.php"/> <entry name="Imagick::getImageFilename" url="function.imagick-getimagefilename.php"/>
<entry name="Imagick::getImageFormat" url="function.imagick-getimageformat.php"/> <entry name="Imagick::getImageFormat" url="function.imagick-getimageformat.php"/>
<entry name="Imagick::getImageGamma" url="function.imagick-getimagegamma.php"/> <entry name="Imagick::getImageGamma" url="function.imagick-getimagegamma.php"/>
<entry name="Imagick::getImageGeometry" url="function.imagick-getimagetqgeometry.php"/> <entry name="Imagick::getImageGeometry" url="function.imagick-getimagegeometry.php"/>
<entry name="Imagick::getImageGreenPrimary" url="function.imagick-getimagegreenprimary.php"/> <entry name="Imagick::getImageGreenPrimary" url="function.imagick-getimagegreenprimary.php"/>
<entry name="Imagick::getImageHeight" url="function.imagick-getimageheight.php"/> <entry name="Imagick::getImageHeight" url="function.imagick-getimageheight.php"/>
<entry name="Imagick::getImageHistogram" url="function.imagick-getimagehistogram.php"/> <entry name="Imagick::getImageHistogram" url="function.imagick-getimagehistogram.php"/>
@ -4067,7 +4067,7 @@
<entry name="ImagickDraw::getStrokeMiterLimit" url="function.imagickdraw-getstrokemiterlimit.php"/> <entry name="ImagickDraw::getStrokeMiterLimit" url="function.imagickdraw-getstrokemiterlimit.php"/>
<entry name="ImagickDraw::getStrokeOpacity" url="function.imagickdraw-getstrokeopacity.php"/> <entry name="ImagickDraw::getStrokeOpacity" url="function.imagickdraw-getstrokeopacity.php"/>
<entry name="ImagickDraw::getStrokeWidth" url="function.imagickdraw-getstrokewidth.php"/> <entry name="ImagickDraw::getStrokeWidth" url="function.imagickdraw-getstrokewidth.php"/>
<entry name="ImagickDraw::getTextAlignment" url="function.imagickdraw-gettexttqalignment.php"/> <entry name="ImagickDraw::getTextAlignment" url="function.imagickdraw-gettextalignment.php"/>
<entry name="ImagickDraw::getTextAntialias" url="function.imagickdraw-gettextantialias.php"/> <entry name="ImagickDraw::getTextAntialias" url="function.imagickdraw-gettextantialias.php"/>
<entry name="ImagickDraw::getTextDecoration" url="function.imagickdraw-gettextdecoration.php"/> <entry name="ImagickDraw::getTextDecoration" url="function.imagickdraw-gettextdecoration.php"/>
<entry name="ImagickDraw::getTextEncoding" url="function.imagickdraw-gettextencoding.php"/> <entry name="ImagickDraw::getTextEncoding" url="function.imagickdraw-gettextencoding.php"/>
@ -4138,7 +4138,7 @@
<entry name="ImagickDraw::setStrokeOpacity" url="function.imagickdraw-setstrokeopacity.php"/> <entry name="ImagickDraw::setStrokeOpacity" url="function.imagickdraw-setstrokeopacity.php"/>
<entry name="ImagickDraw::setStrokePatternURL" url="function.imagickdraw-setstrokepatternurl.php"/> <entry name="ImagickDraw::setStrokePatternURL" url="function.imagickdraw-setstrokepatternurl.php"/>
<entry name="ImagickDraw::setStrokeWidth" url="function.imagickdraw-setstrokewidth.php"/> <entry name="ImagickDraw::setStrokeWidth" url="function.imagickdraw-setstrokewidth.php"/>
<entry name="ImagickDraw::setTextAlignment" url="function.imagickdraw-settexttqalignment.php"/> <entry name="ImagickDraw::setTextAlignment" url="function.imagickdraw-settextalignment.php"/>
<entry name="ImagickDraw::setTextAntialias" url="function.imagickdraw-settextantialias.php"/> <entry name="ImagickDraw::setTextAntialias" url="function.imagickdraw-settextantialias.php"/>
<entry name="ImagickDraw::setTextDecoration" url="function.imagickdraw-settextdecoration.php"/> <entry name="ImagickDraw::setTextDecoration" url="function.imagickdraw-settextdecoration.php"/>
<entry name="ImagickDraw::setTextEncoding" url="function.imagickdraw-settextencoding.php"/> <entry name="ImagickDraw::setTextEncoding" url="function.imagickdraw-settextencoding.php"/>
@ -4679,7 +4679,7 @@
<entry name="SWFBitmap->getWidth()" url="function.swfbitmap.getwidth.php"/> <entry name="SWFBitmap->getWidth()" url="function.swfbitmap.getwidth.php"/>
<entry name="SWFButton->addAction()" url="function.swfbutton.addaction.php"/> <entry name="SWFButton->addAction()" url="function.swfbutton.addaction.php"/>
<entry name="SWFButton->addASound()" url="function.swfbutton.addasound.php"/> <entry name="SWFButton->addASound()" url="function.swfbutton.addasound.php"/>
<entry name="SWFButton->addShape()" url="function.swfbutton.addtqshape.php"/> <entry name="SWFButton->addShape()" url="function.swfbutton.addshape.php"/>
<entry name="SWFButton->__construct()" url="function.swfbutton.construct.php"/> <entry name="SWFButton->__construct()" url="function.swfbutton.construct.php"/>
<entry name="SWFButton->setAction()" url="function.swfbutton.setaction.php"/> <entry name="SWFButton->setAction()" url="function.swfbutton.setaction.php"/>
<entry name="SWFButton->setDown()" url="function.swfbutton.setdown.php"/> <entry name="SWFButton->setDown()" url="function.swfbutton.setdown.php"/>
@ -4723,7 +4723,7 @@
<entry name="SWFFont->getAscent()" url="function.swffont.getascent.php"/> <entry name="SWFFont->getAscent()" url="function.swffont.getascent.php"/>
<entry name="SWFFont->getDescent()" url="function.swffont.getdescent.php"/> <entry name="SWFFont->getDescent()" url="function.swffont.getdescent.php"/>
<entry name="SWFFont->getLeading()" url="function.swffont.getleading.php"/> <entry name="SWFFont->getLeading()" url="function.swffont.getleading.php"/>
<entry name="SWFFont->getShape()" url="function.swffont.gettqshape.php"/> <entry name="SWFFont->getShape()" url="function.swffont.getshape.php"/>
<entry name="SWFFont->getUTF8Width()" url="function.swffont.getutf8width.php"/> <entry name="SWFFont->getUTF8Width()" url="function.swffont.getutf8width.php"/>
<entry name="SWFFont->getWidth()" url="function.swffont.getwidth.php"/> <entry name="SWFFont->getWidth()" url="function.swffont.getwidth.php"/>
<entry name="SWFFontChar->addChars()" url="function.swffontchar.addchars.php"/> <entry name="SWFFontChar->addChars()" url="function.swffontchar.addchars.php"/>
@ -4731,8 +4731,8 @@
<entry name="SWFGradient->addEntry()" url="function.swfgradient.addentry.php"/> <entry name="SWFGradient->addEntry()" url="function.swfgradient.addentry.php"/>
<entry name="SWFGradient->__construct()" url="function.swfgradient.construct.php"/> <entry name="SWFGradient->__construct()" url="function.swfgradient.construct.php"/>
<entry name="SWFMorph->__construct()" url="function.swfmorph.construct.php"/> <entry name="SWFMorph->__construct()" url="function.swfmorph.construct.php"/>
<entry name="SWFMorph->getShape1()" url="function.swfmorph.gettqshape1.php"/> <entry name="SWFMorph->getShape1()" url="function.swfmorph.getshape1.php"/>
<entry name="SWFMorph->getShape2()" url="function.swfmorph.gettqshape2.php"/> <entry name="SWFMorph->getShape2()" url="function.swfmorph.getshape2.php"/>
<entry name="SWFMovie->add()" url="function.swfmovie.add.php"/> <entry name="SWFMovie->add()" url="function.swfmovie.add.php"/>
<entry name="SWFMovie->addExport()" url="function.swfmovie.addexport.php"/> <entry name="SWFMovie->addExport()" url="function.swfmovie.addexport.php"/>
<entry name="SWFMovie->addFont()" url="function.swfmovie.addfont.php"/> <entry name="SWFMovie->addFont()" url="function.swfmovie.addfont.php"/>
@ -4754,22 +4754,22 @@
<entry name="SWFMovie->streamMP3()" url="function.swfmovie.streammp3.php"/> <entry name="SWFMovie->streamMP3()" url="function.swfmovie.streammp3.php"/>
<entry name="SWFMovie->writeExports()" url="function.swfmovie.writeexports.php"/> <entry name="SWFMovie->writeExports()" url="function.swfmovie.writeexports.php"/>
<entry name="SWFPrebuiltClip->__construct()" url="function.swfprebuiltclip.construct.php"/> <entry name="SWFPrebuiltClip->__construct()" url="function.swfprebuiltclip.construct.php"/>
<entry name="SWFShape->addFill()" url="function.swftqshape.addfill.php"/> <entry name="SWFShape->addFill()" url="function.swfshape.addfill.php"/>
<entry name="SWFShape->__construct()" url="function.swftqshape.construct.php"/> <entry name="SWFShape->__construct()" url="function.swfshape.construct.php"/>
<entry name="SWFShape->drawArc()" url="function.swftqshape.drawarc.php"/> <entry name="SWFShape->drawArc()" url="function.swfshape.drawarc.php"/>
<entry name="SWFShape->drawCircle()" url="function.swftqshape.drawcircle.php"/> <entry name="SWFShape->drawCircle()" url="function.swfshape.drawcircle.php"/>
<entry name="SWFShape->drawCubic()" url="function.swftqshape.drawcubic.php"/> <entry name="SWFShape->drawCubic()" url="function.swfshape.drawcubic.php"/>
<entry name="SWFShape->drawCubicTo()" url="function.swftqshape.drawcubicto.php"/> <entry name="SWFShape->drawCubicTo()" url="function.swfshape.drawcubicto.php"/>
<entry name="SWFShape->drawCurve()" url="function.swftqshape.drawcurve.php"/> <entry name="SWFShape->drawCurve()" url="function.swfshape.drawcurve.php"/>
<entry name="SWFShape->drawCurveTo()" url="function.swftqshape.drawcurveto.php"/> <entry name="SWFShape->drawCurveTo()" url="function.swfshape.drawcurveto.php"/>
<entry name="SWFShape->drawGlyph()" url="function.swftqshape.drawglyph.php"/> <entry name="SWFShape->drawGlyph()" url="function.swfshape.drawglyph.php"/>
<entry name="SWFShape->drawLine()" url="function.swftqshape.drawline.php"/> <entry name="SWFShape->drawLine()" url="function.swfshape.drawline.php"/>
<entry name="SWFShape->drawLineTo()" url="function.swftqshape.drawlineto.php"/> <entry name="SWFShape->drawLineTo()" url="function.swfshape.drawlineto.php"/>
<entry name="SWFShape->movePen()" url="function.swftqshape.movepen.php"/> <entry name="SWFShape->movePen()" url="function.swfshape.movepen.php"/>
<entry name="SWFShape->movePenTo()" url="function.swftqshape.movepento.php"/> <entry name="SWFShape->movePenTo()" url="function.swfshape.movepento.php"/>
<entry name="SWFShape->setLeftFill()" url="function.swftqshape.setleftfill.php"/> <entry name="SWFShape->setLeftFill()" url="function.swfshape.setleftfill.php"/>
<entry name="SWFShape->setLine()" url="function.swftqshape.setline.php"/> <entry name="SWFShape->setLine()" url="function.swfshape.setline.php"/>
<entry name="SWFShape->setRightFill()" url="function.swftqshape.setrightfill.php"/> <entry name="SWFShape->setRightFill()" url="function.swfshape.setrightfill.php"/>
<entry name="SWFSound" url="function.swfsound.construct.php"/> <entry name="SWFSound" url="function.swfsound.construct.php"/>
<entry name="SWFSoundInstance->loopCount()" url="function.swfsoundinstance.loopcount.php"/> <entry name="SWFSoundInstance->loopCount()" url="function.swfsoundinstance.loopcount.php"/>
<entry name="SWFSoundInstance->loopInPoint()" url="function.swfsoundinstance.loopinpoint.php"/> <entry name="SWFSoundInstance->loopInPoint()" url="function.swfsoundinstance.loopinpoint.php"/>
@ -5063,7 +5063,7 @@
<entry name="ps_show_xy" url="function.ps-show-xy.php"/> <entry name="ps_show_xy" url="function.ps-show-xy.php"/>
<entry name="ps_show2" url="function.ps-show2.php"/> <entry name="ps_show2" url="function.ps-show2.php"/>
<entry name="ps_show" url="function.ps-show.php"/> <entry name="ps_show" url="function.ps-show.php"/>
<entry name="ps_string_tqgeometry" url="function.ps-string-tqgeometry.php"/> <entry name="ps_string_geometry" url="function.ps-string-geometry.php"/>
<entry name="ps_stringwidth" url="function.ps-stringwidth.php"/> <entry name="ps_stringwidth" url="function.ps-stringwidth.php"/>
<entry name="ps_stroke" url="function.ps-stroke.php"/> <entry name="ps_stroke" url="function.ps-stroke.php"/>
<entry name="ps_symbol_name" url="function.ps-symbol-name.php"/> <entry name="ps_symbol_name" url="function.ps-symbol-name.php"/>
@ -5096,7 +5096,7 @@
<entry name="swf_definetext" url="function.swf-definetext.php"/> <entry name="swf_definetext" url="function.swf-definetext.php"/>
<entry name="swf_endbutton" url="function.swf-endbutton.php"/> <entry name="swf_endbutton" url="function.swf-endbutton.php"/>
<entry name="swf_enddoaction" url="function.swf-enddoaction.php"/> <entry name="swf_enddoaction" url="function.swf-enddoaction.php"/>
<entry name="swf_endtqshape" url="function.swf-endtqshape.php"/> <entry name="swf_endshape" url="function.swf-endshape.php"/>
<entry name="swf_endsymbol" url="function.swf-endsymbol.php"/> <entry name="swf_endsymbol" url="function.swf-endsymbol.php"/>
<entry name="swf_fontsize" url="function.swf-fontsize.php"/> <entry name="swf_fontsize" url="function.swf-fontsize.php"/>
<entry name="swf_fontslant" url="function.swf-fontslant.php"/> <entry name="swf_fontslant" url="function.swf-fontslant.php"/>
@ -5124,20 +5124,20 @@
<entry name="swf_scale" url="function.swf-scale.php"/> <entry name="swf_scale" url="function.swf-scale.php"/>
<entry name="swf_setfont" url="function.swf-setfont.php"/> <entry name="swf_setfont" url="function.swf-setfont.php"/>
<entry name="swf_setframe" url="function.swf-setframe.php"/> <entry name="swf_setframe" url="function.swf-setframe.php"/>
<entry name="swf_tqshapearc" url="function.swf-tqshapearc.php"/> <entry name="swf_shapearc" url="function.swf-shapearc.php"/>
<entry name="swf_tqshapecurveto3" url="function.swf-tqshapecurveto3.php"/> <entry name="swf_shapecurveto3" url="function.swf-shapecurveto3.php"/>
<entry name="swf_tqshapecurveto" url="function.swf-tqshapecurveto.php"/> <entry name="swf_shapecurveto" url="function.swf-shapecurveto.php"/>
<entry name="swf_tqshapefillbitmapclip" url="function.swf-tqshapefillbitmapclip.php"/> <entry name="swf_shapefillbitmapclip" url="function.swf-shapefillbitmapclip.php"/>
<entry name="swf_tqshapefillbitmaptile" url="function.swf-tqshapefillbitmaptile.php"/> <entry name="swf_shapefillbitmaptile" url="function.swf-shapefillbitmaptile.php"/>
<entry name="swf_tqshapefilloff" url="function.swf-tqshapefilloff.php"/> <entry name="swf_shapefilloff" url="function.swf-shapefilloff.php"/>
<entry name="swf_tqshapefillsolid" url="function.swf-tqshapefillsolid.php"/> <entry name="swf_shapefillsolid" url="function.swf-shapefillsolid.php"/>
<entry name="swf_tqshapelinesolid" url="function.swf-tqshapelinesolid.php"/> <entry name="swf_shapelinesolid" url="function.swf-shapelinesolid.php"/>
<entry name="swf_tqshapelineto" url="function.swf-tqshapelineto.php"/> <entry name="swf_shapelineto" url="function.swf-shapelineto.php"/>
<entry name="swf_tqshapemoveto" url="function.swf-tqshapemoveto.php"/> <entry name="swf_shapemoveto" url="function.swf-shapemoveto.php"/>
<entry name="swf_showframe" url="function.swf-showframe.php"/> <entry name="swf_showframe" url="function.swf-showframe.php"/>
<entry name="swf_startbutton" url="function.swf-startbutton.php"/> <entry name="swf_startbutton" url="function.swf-startbutton.php"/>
<entry name="swf_startdoaction" url="function.swf-startdoaction.php"/> <entry name="swf_startdoaction" url="function.swf-startdoaction.php"/>
<entry name="swf_starttqshape" url="function.swf-starttqshape.php"/> <entry name="swf_startshape" url="function.swf-startshape.php"/>
<entry name="swf_startsymbol" url="function.swf-startsymbol.php"/> <entry name="swf_startsymbol" url="function.swf-startsymbol.php"/>
<entry name="swf_textwidth" url="function.swf-textwidth.php"/> <entry name="swf_textwidth" url="function.swf-textwidth.php"/>
<entry name="swf_translate" url="function.swf-translate.php"/> <entry name="swf_translate" url="function.swf-translate.php"/>
@ -5318,8 +5318,8 @@
<entry name="CachingIterator::rewind" url="cachingiterator.rewind.php"/> <entry name="CachingIterator::rewind" url="cachingiterator.rewind.php"/>
<entry name="CachingIterator::__toString" url="cachingiterator.tostring.php"/> <entry name="CachingIterator::__toString" url="cachingiterator.tostring.php"/>
<entry name="CachingIterator::valid" url="cachingiterator.valid.php"/> <entry name="CachingIterator::valid" url="cachingiterator.valid.php"/>
<entry name="RecursiveCachingIterator::getChildren" url="recursivecachingiterator.gettqchildren.php"/> <entry name="RecursiveCachingIterator::getChildren" url="recursivecachingiterator.getchildren.php"/>
<entry name="RecursiveCachingIterator::hasChildren" url="recursivecachingiterator.hastqchildren.php"/> <entry name="RecursiveCachingIterator::hasChildren" url="recursivecachingiterator.haschildren.php"/>
<entry name="DirectoryIterator::__construct" url="directoryiterator.construct.php"/> <entry name="DirectoryIterator::__construct" url="directoryiterator.construct.php"/>
<entry name="DirectoryIterator::current" url="directoryiterator.current.php"/> <entry name="DirectoryIterator::current" url="directoryiterator.current.php"/>
<entry name="DirectoryIterator::getATime" url="directoryiterator.getatime.php"/> <entry name="DirectoryIterator::getATime" url="directoryiterator.getatime.php"/>
@ -5356,12 +5356,12 @@
<entry name="LimitIterator::rewind" url="limititerator.rewind.php"/> <entry name="LimitIterator::rewind" url="limititerator.rewind.php"/>
<entry name="LimitIterator::seek" url="limititerator.seek.php"/> <entry name="LimitIterator::seek" url="limititerator.seek.php"/>
<entry name="LimitIterator::valid" url="limititerator.valid.php"/> <entry name="LimitIterator::valid" url="limititerator.valid.php"/>
<entry name="ParentIterator::getChildren" url="parentiterator.gettqchildren.php"/> <entry name="ParentIterator::getChildren" url="parentiterator.getchildren.php"/>
<entry name="ParentIterator::hasChildren" url="parentiterator.hastqchildren.php"/> <entry name="ParentIterator::hasChildren" url="parentiterator.haschildren.php"/>
<entry name="ParentIterator::next" url="parentiterator.next.php"/> <entry name="ParentIterator::next" url="parentiterator.next.php"/>
<entry name="ParentIterator::rewind" url="parentiterator.rewind.php"/> <entry name="ParentIterator::rewind" url="parentiterator.rewind.php"/>
<entry name="RecursiveDirectoryIterator::getChildren" url="recursivedirectoryiterator.gettqchildren.php"/> <entry name="RecursiveDirectoryIterator::getChildren" url="recursivedirectoryiterator.getchildren.php"/>
<entry name="RecursiveDirectoryIterator::hasChildren" url="recursivedirectoryiterator.hastqchildren.php"/> <entry name="RecursiveDirectoryIterator::hasChildren" url="recursivedirectoryiterator.haschildren.php"/>
<entry name="RecursiveDirectoryIterator::key" url="recursivedirectoryiterator.key.php"/> <entry name="RecursiveDirectoryIterator::key" url="recursivedirectoryiterator.key.php"/>
<entry name="RecursiveDirectoryIterator::next" url="recursivedirectoryiterator.next.php"/> <entry name="RecursiveDirectoryIterator::next" url="recursivedirectoryiterator.next.php"/>
<entry name="RecursiveDirectoryIterator::rewind" url="recursivedirectoryiterator.rewind.php"/> <entry name="RecursiveDirectoryIterator::rewind" url="recursivedirectoryiterator.rewind.php"/>
@ -5373,8 +5373,8 @@
<entry name="RecursiveIteratorIterator::rewind" url="recursiveiteratoriterator.rewind.php"/> <entry name="RecursiveIteratorIterator::rewind" url="recursiveiteratoriterator.rewind.php"/>
<entry name="RecursiveIteratorIterator::valid" url="recursiveiteratoriterator.valid.php"/> <entry name="RecursiveIteratorIterator::valid" url="recursiveiteratoriterator.valid.php"/>
<entry name="SimpleXMLIterator::current" url="simplexmliterator.current.php"/> <entry name="SimpleXMLIterator::current" url="simplexmliterator.current.php"/>
<entry name="SimpleXMLIterator::getChildren" url="simplexmliterator.gettqchildren.php"/> <entry name="SimpleXMLIterator::getChildren" url="simplexmliterator.getchildren.php"/>
<entry name="SimpleXMLIterator::hasChildren" url="simplexmliterator.hastqchildren.php"/> <entry name="SimpleXMLIterator::hasChildren" url="simplexmliterator.haschildren.php"/>
<entry name="SimpleXMLIterator::key" url="simplexmliterator.key.php"/> <entry name="SimpleXMLIterator::key" url="simplexmliterator.key.php"/>
<entry name="SimpleXMLIterator::next" url="simplexmliterator.next.php"/> <entry name="SimpleXMLIterator::next" url="simplexmliterator.next.php"/>
<entry name="SimpleXMLIterator::rewind" url="simplexmliterator.rewind.php"/> <entry name="SimpleXMLIterator::rewind" url="simplexmliterator.rewind.php"/>
@ -5509,7 +5509,7 @@
<entry name="tidy_set_encoding" url="function.tidy-set-encoding.php"/> <entry name="tidy_set_encoding" url="function.tidy-set-encoding.php"/>
<entry name="tidy_setopt" url="function.tidy-setopt.php"/> <entry name="tidy_setopt" url="function.tidy-setopt.php"/>
<entry name="tidy_warning_count" url="function.tidy-warning-count.php"/> <entry name="tidy_warning_count" url="function.tidy-warning-count.php"/>
<entry name="tidyNode->hasChildren" url="function.tidynode-hastqchildren.php"/> <entry name="tidyNode->hasChildren" url="function.tidynode-haschildren.php"/>
<entry name="tidyNode->hasSiblings" url="function.tidynode-hassiblings.php"/> <entry name="tidyNode->hasSiblings" url="function.tidynode-hassiblings.php"/>
<entry name="tidyNode->isAsp" url="function.tidynode-isasp.php"/> <entry name="tidyNode->isAsp" url="function.tidynode-isasp.php"/>
<entry name="tidyNode->isComment" url="function.tidynode-iscomment.php"/> <entry name="tidyNode->isComment" url="function.tidynode-iscomment.php"/>
@ -5594,8 +5594,8 @@
<entry name="ftp_systype" url="function.ftp-systype.php"/> <entry name="ftp_systype" url="function.ftp-systype.php"/>
<entry name="hw_Array2Objrec" url="function.hw-array2objrec.php"/> <entry name="hw_Array2Objrec" url="function.hw-array2objrec.php"/>
<entry name="hw_changeobject" url="function.hw-changeobject.php"/> <entry name="hw_changeobject" url="function.hw-changeobject.php"/>
<entry name="hw_Children" url="function.hw-tqchildren.php"/> <entry name="hw_Children" url="function.hw-children.php"/>
<entry name="hw_ChildrenObj" url="function.hw-tqchildrenobj.php"/> <entry name="hw_ChildrenObj" url="function.hw-childrenobj.php"/>
<entry name="hw_Close" url="function.hw-close.php"/> <entry name="hw_Close" url="function.hw-close.php"/>
<entry name="hw_Connect" url="function.hw-connect.php"/> <entry name="hw_Connect" url="function.hw-connect.php"/>
<entry name="hw_connection_info" url="function.hw-connection-info.php"/> <entry name="hw_connection_info" url="function.hw-connection-info.php"/>
@ -5629,7 +5629,7 @@
<entry name="hw_GetParentsObj" url="function.hw-getparentsobj.php"/> <entry name="hw_GetParentsObj" url="function.hw-getparentsobj.php"/>
<entry name="hw_getrellink" url="function.hw-getrellink.php"/> <entry name="hw_getrellink" url="function.hw-getrellink.php"/>
<entry name="hw_GetRemote" url="function.hw-getremote.php"/> <entry name="hw_GetRemote" url="function.hw-getremote.php"/>
<entry name="hw_getremotetqchildren" url="function.hw-getremotetqchildren.php"/> <entry name="hw_getremotechildren" url="function.hw-getremotechildren.php"/>
<entry name="hw_GetSrcByDestObj" url="function.hw-getsrcbydestobj.php"/> <entry name="hw_GetSrcByDestObj" url="function.hw-getsrcbydestobj.php"/>
<entry name="hw_GetText" url="function.hw-gettext.php"/> <entry name="hw_GetText" url="function.hw-gettext.php"/>
<entry name="hw_getusername" url="function.hw-getusername.php"/> <entry name="hw_getusername" url="function.hw-getusername.php"/>
@ -5661,7 +5661,7 @@
<entry name="hw_api_attribute" url="function.hwapi-attribute.php"/> <entry name="hw_api_attribute" url="function.hwapi-attribute.php"/>
<entry name="hw_api->checkin" url="function.hwapi-checkin.php"/> <entry name="hw_api->checkin" url="function.hwapi-checkin.php"/>
<entry name="hw_api->checkout" url="function.hwapi-checkout.php"/> <entry name="hw_api->checkout" url="function.hwapi-checkout.php"/>
<entry name="hw_api->tqchildren" url="function.hwapi-tqchildren.php"/> <entry name="hw_api->children" url="function.hwapi-children.php"/>
<entry name="hw_api_content->mimetype" url="function.hwapi-content-mimetype.php"/> <entry name="hw_api_content->mimetype" url="function.hwapi-content-mimetype.php"/>
<entry name="hw_api_content->read" url="function.hwapi-content-read.php"/> <entry name="hw_api_content->read" url="function.hwapi-content-read.php"/>
<entry name="hw_api->content" url="function.hwapi-content.php"/> <entry name="hw_api->content" url="function.hwapi-content.php"/>
@ -5731,7 +5731,7 @@
<entry name="HttpMessage::getRequestMethod" url="function.httpmessage-getrequestmethod.php"/> <entry name="HttpMessage::getRequestMethod" url="function.httpmessage-getrequestmethod.php"/>
<entry name="HttpMessage::getRequestUrl" url="function.httpmessage-getrequesturl.php"/> <entry name="HttpMessage::getRequestUrl" url="function.httpmessage-getrequesturl.php"/>
<entry name="HttpMessage::getResponseCode" url="function.httpmessage-getresponsecode.php"/> <entry name="HttpMessage::getResponseCode" url="function.httpmessage-getresponsecode.php"/>
<entry name="HttpMessage::getResponseStatus" url="function.httpmessage-getresponsestatus.php"/> <entry name="HttpMessage::getResponsetStatus" url="function.httpmessage-getresponsestatus.php"/>
<entry name="HttpMessage::getType" url="function.httpmessage-gettype.php"/> <entry name="HttpMessage::getType" url="function.httpmessage-gettype.php"/>
<entry name="HttpMessage::guessContentType" url="function.httpmessage-guesscontenttype.php"/> <entry name="HttpMessage::guessContentType" url="function.httpmessage-guesscontenttype.php"/>
<entry name="HttpMessage::prepend" url="function.httpmessage-prepend.php"/> <entry name="HttpMessage::prepend" url="function.httpmessage-prepend.php"/>
@ -5743,7 +5743,7 @@
<entry name="HttpMessage::setRequestMethod" url="function.httpmessage-setrequestmethod.php"/> <entry name="HttpMessage::setRequestMethod" url="function.httpmessage-setrequestmethod.php"/>
<entry name="HttpMessage::setRequestUrl" url="function.httpmessage-setrequesturl.php"/> <entry name="HttpMessage::setRequestUrl" url="function.httpmessage-setrequesturl.php"/>
<entry name="HttpMessage::setResponseCode" url="function.httpmessage-setresponsecode.php"/> <entry name="HttpMessage::setResponseCode" url="function.httpmessage-setresponsecode.php"/>
<entry name="HttpMessage::setResponseStatus" url="function.httpmessage-setresponsestatus.php"/> <entry name="HttpMessage::setResponsetStatus" url="function.httpmessage-setresponsestatus.php"/>
<entry name="HttpMessage::setType" url="function.httpmessage-settype.php"/> <entry name="HttpMessage::setType" url="function.httpmessage-settype.php"/>
<entry name="HttpMessage::toMessageTypeObject" url="function.httpmessage-tomessagetypeobject.php"/> <entry name="HttpMessage::toMessageTypeObject" url="function.httpmessage-tomessagetypeobject.php"/>
<entry name="HttpMessage::toString" url="function.httpmessage-tostring.php"/> <entry name="HttpMessage::toString" url="function.httpmessage-tostring.php"/>
@ -5788,7 +5788,7 @@
<entry name="HttpRequest::getResponseHeader" url="function.httprequest-getresponseheader.php"/> <entry name="HttpRequest::getResponseHeader" url="function.httprequest-getresponseheader.php"/>
<entry name="HttpRequest::getResponseInfo" url="function.httprequest-getresponseinfo.php"/> <entry name="HttpRequest::getResponseInfo" url="function.httprequest-getresponseinfo.php"/>
<entry name="HttpRequest::getResponseMessage" url="function.httprequest-getresponsemessage.php"/> <entry name="HttpRequest::getResponseMessage" url="function.httprequest-getresponsemessage.php"/>
<entry name="HttpRequest::getResponseStatus" url="function.httprequest-getresponsestatus.php"/> <entry name="HttpRequest::getResponsetStatus" url="function.httprequest-getresponsestatus.php"/>
<entry name="HttpRequest::getSslOptions" url="function.httprequest-getssloptions.php"/> <entry name="HttpRequest::getSslOptions" url="function.httprequest-getssloptions.php"/>
<entry name="HttpRequest::getUrl" url="function.httprequest-geturl.php"/> <entry name="HttpRequest::getUrl" url="function.httprequest-geturl.php"/>
<entry name="HttpRequest::resetCookies" url="function.httprequest-resetcookies.php"/> <entry name="HttpRequest::resetCookies" url="function.httprequest-resetcookies.php"/>
@ -6916,7 +6916,7 @@
<entry name="SimpleXMLElement->addChild()" url="function.simplexml-element-addChild.php"/> <entry name="SimpleXMLElement->addChild()" url="function.simplexml-element-addChild.php"/>
<entry name="SimpleXMLElement->asXML()" url="function.simplexml-element-asXML.php"/> <entry name="SimpleXMLElement->asXML()" url="function.simplexml-element-asXML.php"/>
<entry name="SimpleXMLElement->attributes()" url="function.simplexml-element-attributes.php"/> <entry name="SimpleXMLElement->attributes()" url="function.simplexml-element-attributes.php"/>
<entry name="SimpleXMLElement->tqchildren()" url="function.simplexml-element-tqchildren.php"/> <entry name="SimpleXMLElement->children()" url="function.simplexml-element-children.php"/>
<entry name="SimpleXMLElement->__construct()" url="function.simplexml-element-construct.php"/> <entry name="SimpleXMLElement->__construct()" url="function.simplexml-element-construct.php"/>
<entry name="SimpleXMLElement->getDocNamespaces()" url="function.simplexml-element-getDocNamespaces.php"/> <entry name="SimpleXMLElement->getDocNamespaces()" url="function.simplexml-element-getDocNamespaces.php"/>
<entry name="SimpleXMLElement->getName()" url="function.simplexml-element-getName.php"/> <entry name="SimpleXMLElement->getName()" url="function.simplexml-element-getName.php"/>

@ -706,7 +706,7 @@ kdDebug(9018) << "checkForArgHint 0 " << line << endl;
} }
void PHPCodeCompletion::setStatusBar(TQString expr, TQString type) { void PHPCodeCompletion::setStatusBar(TQString expr, TQString type) {
m_phpSupport->mainWindow()->statusBar()->message( i18n("Type of %1 is %2").tqarg(expr).tqarg(type), 1000 ); m_phpSupport->mainWindow()->statusBar()->message( i18n("Type of %1 is %2").arg(expr).arg(type), 1000 );
} }
#include "phpcodecompletion.moc" #include "phpcodecompletion.moc"

@ -230,7 +230,7 @@
<string>&lt;font size="+1"&gt;The php executable is called directly. Ideal for developers who want to develop terminal or graphical applications in PHP. <string>&lt;font size="+1"&gt;The php executable is called directly. Ideal for developers who want to develop terminal or graphical applications in PHP.
You need a correctly installed php cgi version.&lt;/font&gt;</string> You need a correctly installed php cgi version.&lt;/font&gt;</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set> <set>WordBreak|AlignVCenter|AlignLeft</set>
</property> </property>
<property name="hAlign" stdset="0"> <property name="hAlign" stdset="0">
@ -254,7 +254,7 @@ You need a correctly installed php cgi version.&lt;/font&gt;</string>
<string>&lt;font size="+1"&gt;Uses an existing webserver. The pages are previewed in <string>&lt;font size="+1"&gt;Uses an existing webserver. The pages are previewed in
the internal web browser. Please make sure that the webserver was compiled with PHP support.&lt;/font&gt;</string> the internal web browser. Please make sure that the webserver was compiled with PHP support.&lt;/font&gt;</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set> <set>WordBreak|AlignVCenter|AlignLeft</set>
</property> </property>
<property name="hAlign" stdset="0"> <property name="hAlign" stdset="0">

@ -151,7 +151,7 @@ void PHPErrorView::slotFilter()
if(!m_tabBar->isTabEnabled(4)) if(!m_tabBar->isTabEnabled(4))
m_tabBar->setTabEnabled(4,true); m_tabBar->setTabEnabled(4,true);
m_tabBar->tab(4)->setText(i18n("Filtered: %1").tqarg( m_filterEdit->text() )); m_tabBar->tab(4)->setText(i18n("Filtered: %1").arg( m_filterEdit->text() ));
m_tabBar->setCurrentTab(4); m_tabBar->setCurrentTab(4);
m_filteredList->clear(); m_filteredList->clear();

@ -17,8 +17,8 @@ int main(int argc, char **argv) {
char ** rubyargs = (char **) calloc(argc+4, sizeof(char *)); char ** rubyargs = (char **) calloc(argc+4, sizeof(char *));
rubyargs[0] = strdup(argv[0]); rubyargs[0] = strdup(argv[0]);
rubyargs[1] = strdup("-KU"); rubyargs[1] = strdup("-KU");
rubyargs[2] = strdup(TQString("-C%1").tqarg(program.dirPath()).latin1()); rubyargs[2] = strdup(TQString("-C%1").arg(program.dirPath()).latin1());
rubyargs[3] = strdup(TQString("-I%1").tqarg(program.dirPath()).latin1()); rubyargs[3] = strdup(TQString("-I%1").arg(program.dirPath()).latin1());
rubyargs[4] = strdup(program.fileName().latin1()); rubyargs[4] = strdup(program.fileName().latin1());
for (int i = 1; i < argc; i++) { for (int i = 1; i < argc; i++) {
rubyargs[i+4] = argv[i]; rubyargs[i+4] = argv[i];

@ -17,8 +17,8 @@ int main(int argc, char **argv) {
char ** rubyargs = (char **) calloc(argc+4, sizeof(char *)); char ** rubyargs = (char **) calloc(argc+4, sizeof(char *));
rubyargs[0] = strdup(argv[0]); rubyargs[0] = strdup(argv[0]);
rubyargs[1] = strdup("-KU"); rubyargs[1] = strdup("-KU");
rubyargs[2] = strdup(TQString("-C%1").tqarg(program.dirPath()).latin1()); rubyargs[2] = strdup(TQString("-C%1").arg(program.dirPath()).latin1());
rubyargs[3] = strdup(TQString("-I%1").tqarg(program.dirPath()).latin1()); rubyargs[3] = strdup(TQString("-I%1").arg(program.dirPath()).latin1());
rubyargs[4] = strdup(program.fileName().latin1()); rubyargs[4] = strdup(program.fileName().latin1());
for (int i = 1; i < argc; i++) { for (int i = 1; i < argc; i++) {
rubyargs[i+4] = argv[i]; rubyargs[i+4] = argv[i];

@ -17,8 +17,8 @@ int main(int argc, char **argv) {
char ** rubyargs = (char **) calloc(argc+4, sizeof(char *)); char ** rubyargs = (char **) calloc(argc+4, sizeof(char *));
rubyargs[0] = strdup(argv[0]); rubyargs[0] = strdup(argv[0]);
rubyargs[1] = strdup("-KU"); rubyargs[1] = strdup("-KU");
rubyargs[2] = strdup(TQString("-C%1").tqarg(program.dirPath()).latin1()); rubyargs[2] = strdup(TQString("-C%1").arg(program.dirPath()).latin1());
rubyargs[3] = strdup(TQString("-I%1").tqarg(program.dirPath()).latin1()); rubyargs[3] = strdup(TQString("-I%1").arg(program.dirPath()).latin1());
rubyargs[4] = strdup(program.fileName().latin1()); rubyargs[4] = strdup(program.fileName().latin1());
for (int i = 1; i < argc; i++) { for (int i = 1; i < argc; i++) {
rubyargs[i+4] = argv[i]; rubyargs[i+4] = argv[i];

@ -70,7 +70,7 @@ Breakpoint::~Breakpoint()
TQString Breakpoint::dbgRemoveCommand() const TQString Breakpoint::dbgRemoveCommand() const
{ {
// if (dbgId_>0) // if (dbgId_>0)
// return TQString("delete %1").tqarg(dbgId_); // gdb command - not translatable // return TQString("delete %1").arg(dbgId_); // gdb command - not translatable
return TQString(); return TQString();
} }
@ -161,9 +161,9 @@ TQString FilePosBreakpoint::dbgSetCommand() const
{ {
TQString cmdStr; TQString cmdStr;
if (fileName_.isEmpty()) if (fileName_.isEmpty())
cmdStr = TQString("break %1").tqarg(lineNo_); // gdb command - not translatable cmdStr = TQString("break %1").arg(lineNo_); // gdb command - not translatable
else { else {
cmdStr = TQString("break %1:%2").tqarg(fileName_).tqarg(lineNo_); cmdStr = TQString("break %1:%2").arg(fileName_).arg(lineNo_);
} }
if (isTemporary()) if (isTemporary())

@ -127,7 +127,7 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e)
setFrameStyle(TQFrame::Panel|TQFrame::Sunken); setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
TQApplication::setOverrideCursor(TQCursor(sizeAllCursor)); TQApplication::setOverrideCursor(TQCursor(sizeAllCursor));
setPalette(TQPalette(colorGroup().background())); setPalette(TQPalette(colorGroup().background()));
tqrepaint(); repaint();
} }
} }
@ -141,7 +141,7 @@ void DbgMoveHandle::mouseReleaseEvent(TQMouseEvent *e)
setFrameStyle(TQFrame::Panel|TQFrame::Raised); setFrameStyle(TQFrame::Panel|TQFrame::Raised);
TQApplication::restoreOverrideCursor(); TQApplication::restoreOverrideCursor();
setPalette(TQPalette(colorGroup().background())); setPalette(TQPalette(colorGroup().background()));
tqrepaint(); repaint();
} }
// ************************************************************************** // **************************************************************************

@ -317,10 +317,10 @@ void RubyDebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context)
if (!m_contextIdent.isEmpty()) if (!m_contextIdent.isEmpty())
{ {
TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30); TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30);
int id = popup->insertItem( i18n("Watch: %1").tqarg(squeezed), this, TQT_SLOT(contextWatch()) ); int id = popup->insertItem( i18n("Watch: %1").arg(squeezed), this, TQT_SLOT(contextWatch()) );
popup->setWhatsThis(id, i18n("<b>Watch</b><p>Adds an expression under the cursor to the Variables/Watch list.")); popup->setWhatsThis(id, i18n("<b>Watch</b><p>Adds an expression under the cursor to the Variables/Watch list."));
id = popup->insertItem( i18n("Inspect: %1").tqarg(squeezed), this, TQT_SLOT(contextRubyInspect()) ); id = popup->insertItem( i18n("Inspect: %1").arg(squeezed), this, TQT_SLOT(contextRubyInspect()) );
popup->setWhatsThis(id, i18n("<b>Inspect</b><p>Evaluates an expression under the cursor.")); popup->setWhatsThis(id, i18n("<b>Inspect</b><p>Evaluates an expression under the cursor."));
} }
} }
@ -478,7 +478,7 @@ bool RubyDebuggerPart::startDebugger()
{ {
KMessageBox::error( KMessageBox::error(
mainWindow()->main(), mainWindow()->main(),
i18n("Could not locate the debugging shell '%1'.").tqarg( shell ), i18n("Could not locate the debugging shell '%1'.").arg( shell ),
i18n("Debugging Shell Not Found") ); i18n("Debugging Shell Not Found") );
return false; return false;
} }

@ -119,7 +119,7 @@ void FramestackWidget::parseRDBThreadList(char *str)
ThreadStackItem* thread; ThreadStackItem* thread;
thread = new ThreadStackItem( this, thread = new ThreadStackItem( this,
thread_re.cap(2).toInt(), thread_re.cap(2).toInt(),
TQString("%1 %2").tqarg(thread_re.cap(2)).tqarg(thread_re.cap(3)) ); TQString("%1 %2").arg(thread_re.cap(2)).arg(thread_re.cap(3)) );
// The thread with a '+' is always the viewedthread // The thread with a '+' is always the viewedthread
if (thread_re.cap(1) == "+") { if (thread_re.cap(1) == "+") {
viewedThread_ = thread; viewedThread_ = thread;
@ -148,7 +148,7 @@ void FramestackWidget::parseRDBBacktraceList(char *str)
} }
int frameNo = frame_re.cap(1).toInt(); int frameNo = frame_re.cap(1).toInt();
TQString frameName = TQString("T%1#%2 %3").tqarg(viewedThread_->threadNo()).tqarg(frame_re.cap(1)).tqarg(method); TQString frameName = TQString("T%1#%2 %3").arg(viewedThread_->threadNo()).arg(frame_re.cap(1)).arg(method);
new FrameStackItem(viewedThread_, frameNo, TQString(frame_re.cap(0)), frameName); new FrameStackItem(viewedThread_, frameNo, TQString(frame_re.cap(0)), frameName);
// Tell the Variable Tree that this frame is active // Tell the Variable Tree that this frame is active

@ -904,7 +904,7 @@ void RDBBreakpointWidget::slotAddBreakpoint( )
{ {
if (m_add->popup()) if (m_add->popup())
{ {
m_add->popup()->popup(mapToGlobal(this->tqgeometry().topLeft())); m_add->popup()->popup(mapToGlobal(this->geometry().topLeft()));
} }
} }

@ -341,7 +341,7 @@ void RDBController::programNoApp(const TQString &msg, bool msgBox)
varTree_->viewport()->setUpdatesEnabled(false); varTree_->viewport()->setUpdatesEnabled(false);
varTree_->prune(); varTree_->prune();
varTree_->viewport()->setUpdatesEnabled(true); varTree_->viewport()->setUpdatesEnabled(true);
varTree_->tqrepaint(); varTree_->repaint();
frameStack_->clear(); frameStack_->clear();
@ -394,9 +394,9 @@ void RDBController::parseProgramLocation(char *buf)
} }
if (stateIsOn(s_appBusy)) if (stateIsOn(s_appBusy))
actOnProgramPause(i18n("No source: %1").tqarg(sourceFile)); actOnProgramPause(i18n("No source: %1").arg(sourceFile));
else else
emit dbgStatus (i18n("No source: %1").tqarg(sourceFile), state_); emit dbgStatus (i18n("No source: %1").arg(sourceFile), state_);
} }
// ************************************************************************** // **************************************************************************
@ -458,7 +458,7 @@ void RDBController::parseFrameMove(char *buf)
} }
} }
emit dbgStatus(i18n("No source: %1").tqarg(sourceFile), state_); emit dbgStatus(i18n("No source: %1").arg(sourceFile), state_);
} }
// ************************************************************************** // **************************************************************************
@ -492,7 +492,7 @@ void RDBController::parseRequestedData(char *buf)
varTree_->viewport()->setUpdatesEnabled(false); varTree_->viewport()->setUpdatesEnabled(false);
item->expandValue(buf); item->expandValue(buf);
varTree_->viewport()->setUpdatesEnabled(true); varTree_->viewport()->setUpdatesEnabled(true);
varTree_->tqrepaint(); varTree_->repaint();
} }
} }
@ -505,7 +505,7 @@ void RDBController::parseFrameSelected(char *buf)
{ {
if (!stateIsOn(s_silent)) { if (!stateIsOn(s_silent)) {
emit showStepInSource("", -1, ""); emit showStepInSource("", -1, "");
emit dbgStatus (i18n("No source: %1").tqarg(TQString(buf)), state_); emit dbgStatus (i18n("No source: %1").arg(TQString(buf)), state_);
} }
} }
@ -517,7 +517,7 @@ void RDBController::parseDisplay(char *buf, char * expr)
varTree_->viewport()->setUpdatesEnabled(false); varTree_->viewport()->setUpdatesEnabled(false);
varTree_->watchRoot()->setWatchExpression(buf, expr); varTree_->watchRoot()->setWatchExpression(buf, expr);
varTree_->viewport()->setUpdatesEnabled(true); varTree_->viewport()->setUpdatesEnabled(true);
varTree_->tqrepaint(); varTree_->repaint();
} }
// ************************************************************************** // **************************************************************************
@ -538,7 +538,7 @@ void RDBController::parseUpdateDisplay(char *buf)
} }
varTree_->viewport()->setUpdatesEnabled(true); varTree_->viewport()->setUpdatesEnabled(true);
varTree_->tqrepaint(); varTree_->repaint();
} }
// ************************************************************************** // **************************************************************************
@ -549,7 +549,7 @@ void RDBController::parseGlobals(char *buf)
varTree_->viewport()->setUpdatesEnabled(false); varTree_->viewport()->setUpdatesEnabled(false);
varTree_->globalRoot()->setGlobals(buf); varTree_->globalRoot()->setGlobals(buf);
varTree_->viewport()->setUpdatesEnabled(true); varTree_->viewport()->setUpdatesEnabled(true);
varTree_->tqrepaint(); varTree_->repaint();
} }
// ************************************************************************** // **************************************************************************
@ -584,7 +584,7 @@ void RDBController::parseLocals(char type, char *buf)
} }
varTree_->viewport()->setUpdatesEnabled(true); varTree_->viewport()->setUpdatesEnabled(true);
varTree_->tqrepaint(); varTree_->repaint();
} }
@ -766,9 +766,9 @@ void RDBController::slotStart(const TQString& ruby_interpreter, const TQString&
// BUT the app hasn't been started yet! A run command is about to be issued // BUT the app hasn't been started yet! A run command is about to be issued
// by whoever is controlling us. // by whoever is controlling us.
if (!dbgProcess_->writeStdin(TQString("%1\n").tqarg(unixSocketPath_.data()).latin1(), strlen(unixSocketPath_) + 1)) { if (!dbgProcess_->writeStdin(TQString("%1\n").arg(unixSocketPath_.data()).latin1(), strlen(unixSocketPath_) + 1)) {
kdDebug(9012) << "failed to write Unix domain socket path to rdb " kdDebug(9012) << "failed to write Unix domain socket path to rdb "
<< TQString("%1\n").tqarg(unixSocketPath_.data()).latin1() << endl; << TQString("%1\n").arg(unixSocketPath_.data()).latin1() << endl;
} }
setStateOff(s_programExited); setStateOff(s_programExited);

@ -280,7 +280,7 @@ void VariableTree::prune()
// ************************************************************************** // **************************************************************************
// The debugger has moved onto the next program pause, so tqinvalidate // The debugger has moved onto the next program pause, so invalidate
// everything in the Variable Tree // everything in the Variable Tree
void VariableTree::nextActivationId() void VariableTree::nextActivationId()
{ {
@ -635,7 +635,7 @@ void VarItem::setText(int column, const TQString &data)
} }
TQListViewItem::setText(column, data); TQListViewItem::setText(column, data);
tqrepaint(); repaint();
} }
// ************************************************************************** // **************************************************************************

@ -276,7 +276,7 @@ public:
virtual int rtti() const { return RTTI_VAR_FRAME_ROOT; } virtual int rtti() const { return RTTI_VAR_FRAME_ROOT; }
virtual TQString key(int column, bool /*ascending*/) const { virtual TQString key(int column, bool /*ascending*/) const {
return TQString("%1%2").tqarg(RTTI_VAR_FRAME_ROOT).tqarg(text(column)); return TQString("%1%2").arg(RTTI_VAR_FRAME_ROOT).arg(text(column));
} }
void addLocals(char *variables); void addLocals(char *variables);
@ -311,7 +311,7 @@ public:
virtual int rtti() const { return RTTI_WATCH_ROOT; } virtual int rtti() const { return RTTI_WATCH_ROOT; }
virtual TQString key(int column, bool /*ascending*/) const { virtual TQString key(int column, bool /*ascending*/) const {
return TQString("%1%2").tqarg(RTTI_WATCH_ROOT).tqarg(text(column)); return TQString("%1%2").arg(RTTI_WATCH_ROOT).arg(text(column));
} }
void setWatchExpression(char * buf, char * expr); void setWatchExpression(char * buf, char * expr);
@ -334,7 +334,7 @@ public:
virtual int rtti() const { return RTTI_GLOBAL_ROOT; } virtual int rtti() const { return RTTI_GLOBAL_ROOT; }
virtual TQString key(int column, bool /*ascending*/) const { virtual TQString key(int column, bool /*ascending*/) const {
return TQString("%1%2").tqarg(RTTI_GLOBAL_ROOT).tqarg(text(column)); return TQString("%1%2").arg(RTTI_GLOBAL_ROOT).arg(text(column));
} }
void setOpen(bool open); void setOpen(bool open);

@ -532,12 +532,12 @@ void RubySupportPart::slotRun ()
appFrontend->startAppCommand(project()->projectDirectory(), cmd, false); appFrontend->startAppCommand(project()->projectDirectory(), cmd, false);
} else { } else {
TQString cmd = TQString("%1 -K%2 -C\"%3\" -I\"%4\" \"%5\" %6") TQString cmd = TQString("%1 -K%2 -C\"%3\" -I\"%4\" \"%5\" %6")
.tqarg(interpreter()) .arg(interpreter())
.tqarg(characterCoding()) .arg(characterCoding())
.tqarg(runDirectory()) .arg(runDirectory())
.tqarg(program.dirPath()) .arg(program.dirPath())
.tqarg(program.fileName()) .arg(program.fileName())
.tqarg(programArgs()); .arg(programArgs());
startApplication(cmd); startApplication(cmd);
} }
} }
@ -896,12 +896,12 @@ void RubySupportPart::slotRunTestUnderCursor()
TQFileInfo program(prog); TQFileInfo program(prog);
TQString cmd = TQString("%1 -K%2 -C\"%3\" -I\"%4\" \"%5\" %6") TQString cmd = TQString("%1 -K%2 -C\"%3\" -I\"%4\" \"%5\" %6")
.tqarg(interpreter()) .arg(interpreter())
.tqarg(characterCoding()) .arg(characterCoding())
.tqarg(runDirectory()) .arg(runDirectory())
.tqarg(program.dirPath()) .arg(program.dirPath())
.tqarg(program.fileName()) .arg(program.fileName())
.tqarg(" -n " + fun->name()); .arg(" -n " + fun->name());
startApplication(cmd); startApplication(cmd);
} }

@ -86,7 +86,7 @@ void SqlListAction::refresh()
TQSqlDatabase* db = TQSqlDatabase::database( (*it), false ); TQSqlDatabase* db = TQSqlDatabase::database( (*it), false );
if ( !db ) { if ( !db ) {
kdDebug( 9000 ) << "Could not find database connection " << (*it) << endl; kdDebug( 9000 ) << "Could not find database connection " << (*it) << endl;
m_combo->insertItem( SmallIcon( "no" ), i18n("<error - no connection %1>").tqarg( *it ) ); m_combo->insertItem( SmallIcon( "no" ), i18n("<error - no connection %1>").arg( *it ) );
continue; continue;
} }
cName = db->driverName(); cName = db->driverName();

@ -44,11 +44,11 @@ public:
{ return exec( lastQuery() ); } { return exec( lastQuery() ); }
TQSqlIndex primaryIndex( bool /*prime*/ = TRUE ) const TQSqlIndex primaryIndex( bool /*prime*/ = TRUE ) const
{ return TQSqlIndex(); } { return TQSqlIndex(); }
int insert( bool /*tqinvalidate*/ = TRUE ) int insert( bool /*invalidate*/ = TRUE )
{ return FALSE; } { return FALSE; }
int update( bool /*tqinvalidate*/ = TRUE ) int update( bool /*invalidate*/ = TRUE )
{ return FALSE; } { return FALSE; }
int del( bool /*tqinvalidate*/ = TRUE ) int del( bool /*invalidate*/ = TRUE )
{ return FALSE; } { return FALSE; }
void setName( const TQString& /*name*/, bool /*autopopulate*/ = TRUE ) {} void setName( const TQString& /*name*/, bool /*autopopulate*/ = TRUE ) {}
}; };
@ -78,7 +78,7 @@ void SqlOutputWidget::showQuery( const TQString& connectionName, const TQString&
{ {
TQSqlDatabase* db = TQSqlDatabase::database( connectionName, true ); TQSqlDatabase* db = TQSqlDatabase::database( connectionName, true );
if ( !db ) { if ( !db ) {
showError( i18n("No such connection: %1").tqarg( connectionName ) ); showError( i18n("No such connection: %1").arg( connectionName ) );
return; return;
} }
if ( !db->isOpen() ) { if ( !db->isOpen() ) {
@ -101,7 +101,7 @@ void SqlOutputWidget::showQuery( const TQString& connectionName, const TQString&
void SqlOutputWidget::showSuccess( int rowsAffected ) void SqlOutputWidget::showSuccess( int rowsAffected )
{ {
m_textEdit->clear(); m_textEdit->clear();
m_textEdit->setText( i18n("Query successful, number of rows affected: %1").tqarg( rowsAffected ) ); m_textEdit->setText( i18n("Query successful, number of rows affected: %1").arg( rowsAffected ) );
m_stack->raiseWidget( m_textEdit ); m_stack->raiseWidget( m_textEdit );
} }

@ -113,7 +113,7 @@ void SQLSupportPart::loadConfig()
conName = "KDEVSQLSUPPORT_"; conName = "KDEVSQLSUPPORT_";
conName += TQString::number( i ); conName += TQString::number( i );
conNames << conName; conNames << conName;
TQSqlDatabase* db = TQSqlDatabase::addDatabase( sdb[0], TQString( "KDEVSQLSUPPORT_%1" ).tqarg( i ) ); TQSqlDatabase* db = TQSqlDatabase::addDatabase( sdb[0], TQString( "KDEVSQLSUPPORT_%1" ).arg( i ) );
db->setDatabaseName( sdb[1] ); db->setDatabaseName( sdb[1] );
db->setHostName( sdb[2] ); db->setHostName( sdb[2] );
bool ok; bool ok;

@ -63,10 +63,10 @@ public:
/// Add a node to the end of the child list for this node /// Add a node to the end of the child list for this node
virtual void addChild(RefAST c) = 0; virtual void addChild(RefAST c) = 0;
/// Get the number of tqchildren. Returns 0 if the node is a leaf /// Get the number of children. Returns 0 if the node is a leaf
virtual size_t getNumberOfChildren() const = 0; virtual size_t getNumberOfChildren() const = 0;
/// Get the first child of this node; null if no tqchildren /// Get the first child of this node; null if no children
virtual RefAST getFirstChild() const = 0; virtual RefAST getFirstChild() const = 0;
/// Get the next sibling in line after this one /// Get the next sibling in line after this one
virtual RefAST getNextSibling() const = 0; virtual RefAST getNextSibling() const = 0;

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

@ -96,7 +96,7 @@ public:
*/ */
virtual size_t getNumberOfChildren() const; virtual size_t getNumberOfChildren() const;
/// Get the first child of this node; null if no tqchildren /// Get the first child of this node; null if no children
virtual RefAST getFirstChild() const virtual RefAST getFirstChild() const
{ {
return RefAST(down); return RefAST(down);
@ -118,7 +118,7 @@ public:
return 0; return 0;
} }
/// Remove all tqchildren /// Remove all children
virtual void removeChildren() virtual void removeChildren()
{ {
down = static_cast<BaseAST*>(static_cast<AST*>(nullAST)); down = static_cast<BaseAST*>(static_cast<AST*>(nullAST));

@ -217,7 +217,7 @@ RefAST ASTFactory::dupList(RefAST t)
RefAST ASTFactory::dupTree(RefAST t) RefAST ASTFactory::dupTree(RefAST t)
{ {
RefAST result = dup(t); // make copy of root RefAST result = dup(t); // make copy of root
// copy all tqchildren of root. // copy all children of root.
if( t ) if( t )
result->setFirstChild( dupList(t->getFirstChild()) ); result->setFirstChild( dupList(t->getFirstChild()) );
return result; return result;
@ -225,7 +225,7 @@ RefAST ASTFactory::dupTree(RefAST t)
/** Make a tree from a list of nodes. The first element in the /** Make a tree from a list of nodes. The first element in the
* array is the root. If the root is null, then the tree is * array is the root. If the root is null, then the tree is
* a simple list not a tree. Handles null tqchildren nodes correctly. * a simple list not a tree. Handles null children nodes correctly.
* For example, make(a, b, null, c) yields tree (a b c). make(null,a,b) * For example, make(a, b, null, c) yields tree (a b c). make(null,a,b)
* yields tree (nil a b). * yields tree (nil a b).
*/ */
@ -240,7 +240,7 @@ RefAST ASTFactory::make(ANTLR_USE_NAMESPACE(std)vector<RefAST>& nodes)
if( root ) if( root )
root->setFirstChild(RefAST(nullASTptr)); // don't leave any old pointers set root->setFirstChild(RefAST(nullASTptr)); // don't leave any old pointers set
// link in tqchildren; // link in children;
for( unsigned int i = 1; i < nodes.size(); i++ ) for( unsigned int i = 1; i < nodes.size(); i++ )
{ {
if ( nodes[i] == 0 ) // ignore null nodes if ( nodes[i] == 0 ) // ignore null nodes
@ -336,7 +336,7 @@ void ASTFactory::loadChildren( ANTLR_USE_NAMESPACE(std)istream& infile,
{ {
char ch; char ch;
for(;;) // for all tqchildren of this node.... for(;;) // for all children of this node....
{ {
eatwhite(infile); eatwhite(infile);
@ -438,7 +438,7 @@ RefAST ASTFactory::LoadAST( ANTLR_USE_NAMESPACE(std)istream& infile )
infile.get(ch); infile.get(ch);
// now if we have a '/' here it's a single node. If it's a '>' we get // now if we have a '/' here it's a single node. If it's a '>' we get
// a tree with tqchildren // a tree with children
if( ch == '/' ) if( ch == '/' )
{ {

@ -47,7 +47,7 @@ void BaseAST::doWorkForFindAll(
(!partialMatch && sibling->equalsTree(target)) ) { (!partialMatch && sibling->equalsTree(target)) ) {
v.push_back(sibling); v.push_back(sibling);
} }
// regardless of match or not, check any tqchildren for matches // regardless of match or not, check any children for matches
if ( sibling->getFirstChild() ) { if ( sibling->getFirstChild() ) {
RefBaseAST(sibling->getFirstChild())->doWorkForFindAll(v, target, partialMatch); RefBaseAST(sibling->getFirstChild())->doWorkForFindAll(v, target, partialMatch);
} }
@ -70,7 +70,7 @@ bool BaseAST::equalsList(RefAST t) const
// as a quick optimization, check roots first. // as a quick optimization, check roots first.
if (!sibling->equals(t)) if (!sibling->equals(t))
return false; return false;
// if roots match, do full list match test on tqchildren. // if roots match, do full list match test on children.
if (sibling->getFirstChild()) { if (sibling->getFirstChild()) {
if (!sibling->getFirstChild()->equalsList(t->getFirstChild())) if (!sibling->getFirstChild()->equalsList(t->getFirstChild()))
return false; return false;
@ -103,7 +103,7 @@ bool BaseAST::equalsListPartial(RefAST sub) const
// as a quick optimization, check roots first. // as a quick optimization, check roots first.
if (!sibling->equals(sub)) if (!sibling->equals(sub))
return false; return false;
// if roots match, do partial list match test on tqchildren. // if roots match, do partial list match test on children.
if (sibling->getFirstChild()) if (sibling->getFirstChild())
if (!sibling->getFirstChild()->equalsListPartial(sub->getFirstChild())) if (!sibling->getFirstChild()->equalsListPartial(sub->getFirstChild()))
return false; return false;
@ -125,7 +125,7 @@ bool BaseAST::equalsTree(RefAST t) const
// check roots first // check roots first
if (!equals(t)) if (!equals(t))
return false; return false;
// if roots match, do full list match test on tqchildren. // if roots match, do full list match test on children.
if (getFirstChild()) { if (getFirstChild()) {
if (!getFirstChild()->equalsList(t->getFirstChild())) if (!getFirstChild()->equalsList(t->getFirstChild()))
return false; return false;
@ -149,7 +149,7 @@ bool BaseAST::equalsTreePartial(RefAST sub) const
// check roots first // check roots first
if (!equals(sub)) if (!equals(sub))
return false; return false;
// if roots match, do full list partial match test on tqchildren. // if roots match, do full list partial match test on children.
if (getFirstChild()) if (getFirstChild())
if (!getFirstChild()->equalsListPartial(sub->getFirstChild())) if (!getFirstChild()->equalsListPartial(sub->getFirstChild()))
return false; return false;
@ -256,7 +256,7 @@ void BaseAST::toStream( ANTLR_USE_NAMESPACE(std)ostream& out ) const
if( need_close_tag ) if( need_close_tag )
{ {
// got tqchildren so write them... // got children so write them...
if( node->getFirstChild() != 0 ) if( node->getFirstChild() != 0 )
node->getFirstChild()->toStream( out ); node->getFirstChild()->toStream( out );

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

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

@ -383,7 +383,7 @@ void Driver::addDependence( const TQString & fileName, const Dependence & dep )
m_currentParsedFile->addIncludeFile( file, 0, dep.second == Dep_Local ); m_currentParsedFile->addIncludeFile( file, 0, dep.second == Dep_Local );
if ( !TQFile::exists( file ) ) { if ( !TQFile::exists( file ) ) {
Problem p( i18n( "Could not find include file %1" ).tqarg( dep.first ), Problem p( i18n( "Could not find include file %1" ).arg( dep.first ),
lexer ? lexer->currentLine() : -1, lexer ? lexer->currentLine() : -1,
lexer ? lexer->currentColumn() : -1, Problem::Level_Warning ); lexer ? lexer->currentColumn() : -1, Problem::Level_Warning );
addProblem( fileName, p ); addProblem( fileName, p );

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

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

@ -210,7 +210,7 @@ public:
@param dirPath The (relative to project directory) directory which status you are asking for. @param dirPath The (relative to project directory) directory which status you are asking for.
@param callerData The pointer to some data you want the provider will return @param callerData The pointer to some data you want the provider will return
to you when it has done. to you when it has done.
@param recursive If false, retrieve information only for dirPath's immediate tqchildren. @param recursive If false, retrieve information only for dirPath's immediate children.
@param checkRepos If true, contact remote repository and augment repository's status. @param checkRepos If true, contact remote repository and augment repository's status.
If false, retrieve only for local modification information. If false, retrieve only for local modification information.
@return true if the request has been successfully started, false otherwise.*/ @return true if the request has been successfully started, false otherwise.*/

@ -28,7 +28,7 @@ KTrader::OfferList KDevPluginController::query(const TQString &serviceType,
const TQString &constraint) const TQString &constraint)
{ {
return KTrader::self()->query(serviceType, return KTrader::self()->query(serviceType,
TQString("%1 and [X-KDevelop-Version] == %2").tqarg(constraint).tqarg(KDEVELOP_PLUGIN_VERSION)); TQString("%1 and [X-KDevelop-Version] == %2").arg(constraint).arg(KDEVELOP_PLUGIN_VERSION));
} }
KTrader::OfferList KDevPluginController::queryPlugins(const TQString &constraint) KTrader::OfferList KDevPluginController::queryPlugins(const TQString &constraint)

@ -149,7 +149,7 @@ TQString KDevPluginInfo::bugsEmailAddress() const
TQVariant KDevPluginInfo::property(const TQString &name) const TQVariant KDevPluginInfo::property(const TQString &name) const
{ {
KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").tqarg(d->m_pluginName)); KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName));
if (offers.count() == 1) if (offers.count() == 1)
return offers.first()->property(name); return offers.first()->property(name);
return TQVariant(); return TQVariant();
@ -162,7 +162,7 @@ TQVariant KDevPluginInfo::operator [](const TQString &name) const
TQStringList KDevPluginInfo::propertyNames( ) const TQStringList KDevPluginInfo::propertyNames( ) const
{ {
KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").tqarg(d->m_pluginName)); KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName));
if (offers.count() == 1) if (offers.count() == 1)
return offers.first()->propertyNames(); return offers.first()->propertyNames();
return TQStringList(); return TQStringList();

@ -260,18 +260,18 @@ TQDomElement DomUtil::elementByPathExt(TQDomDocument &doc, const TQString &paths
{ {
DomPath dompath = resolvPathStringExt(pathstring); DomPath dompath = resolvPathStringExt(pathstring);
TQDomElement elem = doc.documentElement(); TQDomElement elem = doc.documentElement();
TQDomNodeList tqchildren; TQDomNodeList children;
TQDomElement nextElem = elem; TQDomElement nextElem = elem;
for (unsigned int j=0; j<dompath.count(); j++) for (unsigned int j=0; j<dompath.count(); j++)
{ {
tqchildren = nextElem.childNodes(); children = nextElem.childNodes();
DomPathElement dompathelement= dompath[j]; DomPathElement dompathelement= dompath[j];
bool wrongchild = false; bool wrongchild = false;
int matchCount = 0; int matchCount = 0;
for (unsigned int i=0; i<tqchildren.count(); i++) for (unsigned int i=0; i<children.count(); i++)
{ {
wrongchild = false; wrongchild = false;
TQDomElement child = tqchildren.item(i).toElement(); TQDomElement child = children.item(i).toElement();
TQString tag = child.tagName(); TQString tag = child.tagName();
tag = dompathelement.tagName; tag = dompathelement.tagName;
if (child.tagName() == dompathelement.tagName) if (child.tagName() == dompathelement.tagName)
@ -339,10 +339,10 @@ bool DomUtil::removeTextNodes(TQDomDocument doc,TQString pathExt)
TQDomElement elem = elementByPathExt(doc,pathExt); TQDomElement elem = elementByPathExt(doc,pathExt);
if (elem.isNull()) if (elem.isNull())
return false; return false;
TQDomNodeList tqchildren = elem.childNodes(); TQDomNodeList children = elem.childNodes();
for (unsigned int i=0;i<tqchildren.count();i++) for (unsigned int i=0;i<children.count();i++)
if (tqchildren.item(i).isText()) if (children.item(i).isText())
elem.removeChild(tqchildren.item(i)); elem.removeChild(children.item(i));
return true; return true;
} }

@ -168,7 +168,7 @@ public:
Retrieve an element specified with extended path Retrieve an element specified with extended path
examples: examples:
- 1: "widget|class=TQDialog/property|name=tqgeometry" - 1: "widget|class=TQDialog/property|name=geometry"
or "widget|class=TQDialog/property||1" or "widget|class=TQDialog/property||1"
- 2: "widget/property|name=caption/string" - 2: "widget/property|name=caption/string"
or "widget/property||2/string" or "widget/property||2/string"

@ -49,7 +49,7 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args,
bool ok = proc->start( KProcess::NotifyOnExit, KProcess::AllOutput ); bool ok = proc->start( KProcess::NotifyOnExit, KProcess::AllOutput );
if ( !ok ) { if ( !ok ) {
KMessageBox::error( 0, i18n("Could not invoke \"%1\". Please make sure it is installed correctly").tqarg( executable ), KMessageBox::error( 0, i18n("Could not invoke \"%1\". Please make sure it is installed correctly").arg( executable ),
i18n("Error Invoking Command") ); i18n("Error Invoking Command") );
emit finished( TQString(), TQString() ); emit finished( TQString(), TQString() );
@ -57,7 +57,7 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args,
} else { } else {
progressDlg = new KProgressDialog( 0, 0, i18n("Command running..."), progressDlg = new KProgressDialog( 0, 0, i18n("Command running..."),
i18n("Please wait until the \"%1\" command finishes.").tqarg( executable ), false ); i18n("Please wait until the \"%1\" command finishes.").arg( executable ), false );
connect( progressDlg, TQT_SIGNAL(cancelClicked()), connect( progressDlg, TQT_SIGNAL(cancelClicked()),
this, TQT_SLOT(cancelClicked()) ); this, TQT_SLOT(cancelClicked()) );
} }

@ -95,7 +95,7 @@ void KScriptAction::activate( )
} }
else else
{ {
KMessageBox::sorry(0, i18n("Unable to get KScript Runner for type \"%1\".").tqarg(m_scriptType), i18n("KScript Error")); KMessageBox::sorry(0, i18n("Unable to get KScript Runner for type \"%1\".").arg(m_scriptType), i18n("KScript Error"));
kdDebug() << "Query string: " << scriptTypeQuery << endl; kdDebug() << "Query string: " << scriptTypeQuery << endl;
return; return;
} }

@ -129,7 +129,7 @@ void FancyListViewItem::paintCell( TQPainter *painter, const TQColorGroup &cg,
else if ( align & AlignTop ) else if ( align & AlignTop )
yo = 0; yo = 0;
// respect horizontal tqalignment when there is no text for an item. // respect horizontal alignment when there is no text for an item.
if ( t.isEmpty() ) { if ( t.isEmpty() ) {
if ( align & AlignRight ) if ( align & AlignRight )
xo = width - 2 * marg - iconWidth; xo = width - 2 * marg - iconWidth;

@ -624,7 +624,7 @@ void FlagSpinEdit::setText( const TQString text )
TQString FlagSpinEdit::text( ) TQString FlagSpinEdit::text( )
{ {
return TQString("%1").tqarg(spb->value()); return TQString("%1").arg(spb->value());
} }
TQString FlagSpinEdit::flags( ) TQString FlagSpinEdit::flags( )

@ -227,7 +227,7 @@ void ProcessWidget::childFinished(bool normal, int status)
if (normal) { if (normal) {
if (status) { if (status) {
s = i18n("*** Exited with status: %1 ***").tqarg(status); s = i18n("*** Exited with status: %1 ***").arg(status);
t = ProcessListBoxItem::Error; t = ProcessListBoxItem::Error;
} else { } else {
s = i18n("*** Exited normally ***"); s = i18n("*** Exited normally ***");

@ -78,7 +78,7 @@ void PDoubleNumInput::updateProperty(double val)
void PDoubleNumInput::updateProperty(int val) void PDoubleNumInput::updateProperty(int val)
{ {
#ifdef PURE_QT #ifdef PURE_QT
TQString format = TQString("%.%1f").tqarg( m_edit->digits() ); TQString format = TQString("%.%1f").arg( m_edit->digits() );
TQString strVal = TQString().sprintf(format.latin1(), TQString strVal = TQString().sprintf(format.latin1(),
(val/(float)pow(m_edit->digits(),10)) ); (val/(float)pow(m_edit->digits(),10)) );
emit propertyChanged(m_property, TQVariant(strVal)); emit propertyChanged(m_property, TQVariant(strVal));

@ -61,7 +61,7 @@ void PFontButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect&
p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine,
fi.family() + (fi.bold() ? i18n(" Bold") : TQString("")) + fi.family() + (fi.bold() ? i18n(" Bold") : TQString("")) +
(fi.italic() ? i18n(" Italic") : TQString("")) + (fi.italic() ? i18n(" Italic") : TQString("")) +
" " + TQString("%1").tqarg(fi.pointSize()) ); " " + TQString("%1").arg(fi.pointSize()) );
} }
void PFontButton::setValue(const TQVariant& value, bool emitChange) void PFontButton::setValue(const TQVariant& value, bool emitChange)

@ -45,13 +45,13 @@ void PPointEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect&
p->setPen(TQt::NoPen); p->setPen(TQt::NoPen);
p->setBrush(cg.background()); p->setBrush(cg.background());
p->drawRect(r); p->drawRect(r);
p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").tqarg(value.toPoint().x()).tqarg(value.toPoint().y())); p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y()));
} }
void PPointEdit::setValue(const TQVariant& value, bool emitChange) void PPointEdit::setValue(const TQVariant& value, bool emitChange)
{ {
m_value = value; m_value = value;
m_edit->setText(TQString("[ %1, %2 ]").tqarg(value.toPoint().x()).tqarg(value.toPoint().y())); m_edit->setText(TQString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y()));
if (emitChange) if (emitChange)
emit propertyChanged(m_property, value); emit propertyChanged(m_property, value);

@ -45,13 +45,13 @@ void PRectEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r
p->setPen(TQt::NoPen); p->setPen(TQt::NoPen);
p->setBrush(cg.background()); p->setBrush(cg.background());
p->drawRect(r); p->drawRect(r);
p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2, %3, %4 ]").tqarg(value.toRect().x()).tqarg(value.toRect().y()).tqarg(value.toRect().width()).tqarg(value.toRect().height())); p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height()));
} }
void PRectEdit::setValue(const TQVariant& value, bool emitChange) void PRectEdit::setValue(const TQVariant& value, bool emitChange)
{ {
m_value = value; m_value = value;
m_edit->setText(TQString("[ %1, %2, %3, %4 ]").tqarg(value.toRect().x()).tqarg(value.toRect().y()).tqarg(value.toRect().width()).tqarg(value.toRect().height())); m_edit->setText(TQString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height()));
if (emitChange) if (emitChange)
emit propertyChanged(m_property, value); emit propertyChanged(m_property, value);

@ -270,7 +270,7 @@ void PropertyEditor::addChildProperties(PropertyItem *parent)
machine(prop); machine(prop);
} }
// qWarning("seeking tqchildren: count: %d", prop->details.count()); // qWarning("seeking children: count: %d", prop->details.count());
parent->setOpen(true); parent->setOpen(true);
for (TQValueList<ChildProperty>::iterator it = prop->details.begin(); it != prop->details.end(); ++it) for (TQValueList<ChildProperty>::iterator it = prop->details.begin(); it != prop->details.end(); ++it)
@ -301,7 +301,7 @@ void PropertyEditor::propertyValueChanged(Property *property)
m_currentEditWidget->setValue(property->value(), false); m_currentEditWidget->setValue(property->value(), false);
else else
{ {
// tqrepaint all items // repaint all items
TQListViewItemIterator it(this); TQListViewItemIterator it(this);
while (it.current()) while (it.current())
{ {
@ -386,7 +386,7 @@ void PropertyEditor::placeEditor(PropertyItem *item)
m_currentEditLayout->addWidget(editor, 0, 0); m_currentEditLayout->addWidget(editor, 0, 0);
m_currentEditLayout->addWidget(m_undoButton, 0, 1); m_currentEditLayout->addWidget(m_undoButton, 0, 1);
m_currentEditArea->resize(r.size()); m_currentEditArea->resize(r.size());
// m_currentEditLayout->tqinvalidate(); // m_currentEditLayout->invalidate();
moveChild(m_currentEditArea, r.x(), r.y()); moveChild(m_currentEditArea, r.x(), r.y());
m_currentEditWidget = editor; m_currentEditWidget = editor;
} }

@ -46,13 +46,13 @@ void PSizeEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r
p->setPen(TQt::NoPen); p->setPen(TQt::NoPen);
p->setBrush(cg.background()); p->setBrush(cg.background());
p->drawRect(r); p->drawRect(r);
p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").tqarg(value.toSize().width()).tqarg(value.toSize().height())); p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height()));
} }
void PSizeEdit::setValue(const TQVariant& value, bool emitChange) void PSizeEdit::setValue(const TQVariant& value, bool emitChange)
{ {
m_value = value; m_value = value;
m_edit->setText(TQString("[ %1, %2 ]").tqarg(value.toSize().width()).tqarg(value.toSize().height())); m_edit->setText(TQString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height()));
if (emitChange) if (emitChange)
emit propertyChanged(m_property, value); emit propertyChanged(m_property, value);

@ -47,13 +47,13 @@ void PSizePolicyEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQR
p->setPen(TQt::NoPen); p->setPen(TQt::NoPen);
p->setBrush(cg.background()); p->setBrush(cg.background());
p->drawRect(r); p->drawRect(r);
p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("%1/%2/%3/%4").tqarg(findValueDescription(value.toSizePolicy().horData())).tqarg(findValueDescription(value.toSizePolicy().verData())).tqarg(value.toSizePolicy().horStretch()).tqarg(value.toSizePolicy().verStretch())); p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("%1/%2/%3/%4").arg(findValueDescription(value.toSizePolicy().horData())).arg(findValueDescription(value.toSizePolicy().verData())).arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch()));
} }
void PSizePolicyEdit::setValue(const TQVariant& value, bool emitChange) void PSizePolicyEdit::setValue(const TQVariant& value, bool emitChange)
{ {
m_value = value; m_value = value;
m_edit->setText(TQString("%1/%2/%3/%4").tqarg(findValueDescription(value.toSizePolicy().horData())).tqarg(findValueDescription(value.toSizePolicy().verData())).tqarg(value.toSizePolicy().horStretch()).tqarg(value.toSizePolicy().verStretch())); m_edit->setText(TQString("%1/%2/%3/%4").arg(findValueDescription(value.toSizePolicy().horData())).arg(findValueDescription(value.toSizePolicy().verData())).arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch()));
if (emitChange) if (emitChange)
emit propertyChanged(m_property, value); emit propertyChanged(m_property, value);

@ -58,7 +58,7 @@ PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *parent, const char
TQVariant PSymbolCombo::value() const TQVariant PSymbolCombo::value() const
{ {
if (!(m_edit->text().isNull())) if (!(m_edit->text().isNull()))
return TQVariant(TQString("%1").tqarg(m_edit->text().tqat(0).tqunicode())); return TQVariant(TQString("%1").arg(m_edit->text().at(0).tqunicode()));
else else
return TQVariant(0); return TQVariant(0);
} }
@ -109,7 +109,7 @@ void PSymbolCombo::selectChar()
void PSymbolCombo::updateProperty(const TQString& val) void PSymbolCombo::updateProperty(const TQString& val)
{ {
emit propertyChanged(m_property, TQVariant(TQString("%1").tqarg(val.tqat(0).tqunicode()))); emit propertyChanged(m_property, TQVariant(TQString("%1").arg(val.at(0).tqunicode())));
} }
void PSymbolCombo::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value) void PSymbolCombo::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value)

@ -38,7 +38,7 @@ TQFloatInput::TQFloatInput( int min, int max, float step, int digits,
TQString TQFloatInput::mapValueToText( int value ) TQString TQFloatInput::mapValueToText( int value )
{ {
TQString format = TQString("%.%1f").tqarg( m_digits ); TQString format = TQString("%.%1f").arg( m_digits );
return TQString().sprintf(format.latin1(), return TQString().sprintf(format.latin1(),
(value/(float)pow(m_digits,10)) ); (value/(float)pow(m_digits,10)) );
} }

@ -88,7 +88,7 @@ void QComboViewData::updateLinedGeometry()
const TQPixmap *pix = combo->currentItem() ? combo->currentItem()->pixmap(0) : 0; const TQPixmap *pix = combo->currentItem() ? combo->currentItem()->pixmap(0) : 0;
if ( pix && pix->width() < r.width() ) if ( pix && pix->width() < r.width() )
r.setLeft( r.left() + pix->width() + 4 ); r.setLeft( r.left() + pix->width() + 4 );
if ( r != ed->tqgeometry() ) if ( r != ed->geometry() )
ed->setGeometry( r ); ed->setGeometry( r );
} }
@ -269,7 +269,7 @@ void QComboView::setAutoResize( bool enable )
reimp reimp
This implementation caches the size hint to avoid resizing when This implementation caches the size hint to avoid resizing when
the contents change dynamically. To tqinvalidate the cached value the contents change dynamically. To invalidate the cached value
call setFont(). call setFont().
*/ */
TQSize QComboView::sizeHint() const TQSize QComboView::sizeHint() const
@ -385,7 +385,7 @@ void QComboView::setPalette( const TQPalette &palette )
void QComboView::setFont( const TQFont &font ) void QComboView::setFont( const TQFont &font )
{ {
d->sizeHint = TQSize(); // tqinvalidate size hint d->sizeHint = TQSize(); // invalidate size hint
TQWidget::setFont( font ); TQWidget::setFont( font );
d->listView()->setFont( font ); d->listView()->setFont( font );
if (d->ed) if (d->ed)
@ -489,7 +489,7 @@ void QComboView::mousePressEvent( TQMouseEvent *e )
if ( arrowRect.contains( e->pos() ) ) { if ( arrowRect.contains( e->pos() ) ) {
d->arrowPressed = TRUE; d->arrowPressed = TRUE;
d->arrowDown = TRUE; d->arrowDown = TRUE;
tqrepaint( FALSE ); repaint( FALSE );
} }
TQTimer::singleShot( 200, this, TQT_SLOT(internalClickTimeout())); TQTimer::singleShot( 200, this, TQT_SLOT(internalClickTimeout()));
d->shortClick = TRUE; d->shortClick = TRUE;
@ -808,7 +808,7 @@ void QComboView::popDownListView()
d->listView()->setCurrentItem( d->current ); d->listView()->setCurrentItem( d->current );
if ( d->arrowDown ) { if ( d->arrowDown ) {
d->arrowDown = FALSE; d->arrowDown = FALSE;
tqrepaint( FALSE ); repaint( FALSE );
} }
d->poppedUp = FALSE; d->poppedUp = FALSE;
} }
@ -908,12 +908,12 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
if ( arrowRect.contains( comboPos ) ) { if ( arrowRect.contains( comboPos ) ) {
if ( !d->arrowDown ) { if ( !d->arrowDown ) {
d->arrowDown = TRUE; d->arrowDown = TRUE;
tqrepaint( FALSE ); repaint( FALSE );
} }
} else { } else {
if ( d->arrowDown ) { if ( d->arrowDown ) {
d->arrowDown = FALSE; d->arrowDown = FALSE;
tqrepaint( FALSE ); repaint( FALSE );
} }
} }
} }
@ -948,7 +948,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
d->arrowPressed = FALSE; d->arrowPressed = FALSE;
if ( d->arrowDown ) { if ( d->arrowDown ) {
d->arrowDown = FALSE; d->arrowDown = FALSE;
tqrepaint( FALSE ); repaint( FALSE );
} }
} }
} }
@ -1333,7 +1333,7 @@ bool QComboView::autoCompletion() const
*/ */
void QComboView::styleChange( TQStyle& s ) void QComboView::styleChange( TQStyle& s )
{ {
d->sizeHint = TQSize(); // tqinvalidate size hint... d->sizeHint = TQSize(); // invalidate size hint...
if ( d->ed ) if ( d->ed )
d->updateLinedGeometry(); d->updateLinedGeometry();
TQWidget::styleChange( s ); TQWidget::styleChange( s );

@ -486,7 +486,7 @@ void AppWizardDialog::accept()
} }
else else
{ {
KMessageBox::sorry(this, i18n("The template %1 cannot be opened.").tqarg( source + "/" + m_pCurrentAppInfo->sourceArchive ) ); KMessageBox::sorry(this, i18n("The template %1 cannot be opened.").arg( source + "/" + m_pCurrentAppInfo->sourceArchive ) );
templateArchive.close(); templateArchive.close();
return; return;
} }
@ -543,7 +543,7 @@ void AppWizardDialog::accept()
// This is too silly for words, but it's either this or reimplementing FileTemplate // This is too silly for words, but it's either this or reimplementing FileTemplate
TQString tempProjectDomSource = "<!DOCTYPE tdevelop><tdevelop><general><author>%1</author><email>%2</email><version>%3</version></general></tdevelop>"; TQString tempProjectDomSource = "<!DOCTYPE tdevelop><tdevelop><general><author>%1</author><email>%2</email><version>%3</version></general></tdevelop>";
tempProjectDomSource = tempProjectDomSource.tqarg( author_edit->text() ).tqarg( email_edit->text() ).tqarg( version_edit->text() ); tempProjectDomSource = tempProjectDomSource.arg( author_edit->text() ).arg( email_edit->text() ).arg( version_edit->text() );
TQDomDocument tempProjectDom; TQDomDocument tempProjectDom;
tempProjectDom.setContent( tempProjectDomSource ); tempProjectDom.setContent( tempProjectDomSource );
@ -559,13 +559,13 @@ void AppWizardDialog::accept()
temps.setEncoding(TQTextStream::UnicodeUTF8); temps.setEncoding(TQTextStream::UnicodeUTF8);
temps << templateText; temps << templateText;
f.flush(); f.flush();
TQString templateName( TQString( "%1_TEMPLATE" ).tqarg( (*it).suffix ).upper() ); TQString templateName( TQString( "%1_TEMPLATE" ).arg( (*it).suffix ).upper() );
cleanUpSubstMap << templateName; cleanUpSubstMap << templateName;
m_pCurrentAppInfo->subMap.insert( templateName, KMacroExpander::expandMacros(templateText , m_pCurrentAppInfo->subMap) ); m_pCurrentAppInfo->subMap.insert( templateName, KMacroExpander::expandMacros(templateText , m_pCurrentAppInfo->subMap) );
installFile file; installFile file;
file.source = tempFile->name(); file.source = tempFile->name();
file.dest = TQString( "%{dest}/templates/%1" ).tqarg( (*it).suffix ); file.dest = TQString( "%{dest}/templates/%1" ).arg( (*it).suffix );
file.process = true; file.process = true;
file.isXML = false; file.isXML = false;
m_pCurrentAppInfo->fileList.append( file ); m_pCurrentAppInfo->fileList.append( file );
@ -585,8 +585,8 @@ void AppWizardDialog::accept()
for( ; it != files.end(); ++it ) for( ; it != files.end(); ++it )
{ {
installFile file; installFile file;
file.source = TQString( "%{tdevelop}/template-common/%1" ).tqarg( *it ); file.source = TQString( "%{tdevelop}/template-common/%1" ).arg( *it );
file.dest = TQString("%{dest}/%1").tqarg( *it ); file.dest = TQString("%{dest}/%1").arg( *it );
file.process = true; file.process = true;
file.isXML = false; file.isXML = false;
m_pCurrentAppInfo->fileList.append( file ); m_pCurrentAppInfo->fileList.append( file );
@ -645,7 +645,7 @@ void AppWizardDialog::accept()
{ {
if( ! KIO::NetAccess::mkdir( (*dirIt).dir, this ) ) if( ! KIO::NetAccess::mkdir( (*dirIt).dir, this ) )
{ {
KMessageBox::sorry(this, i18n("The directory %1 cannot be created.").tqarg( (*dirIt).dir ) ); KMessageBox::sorry(this, i18n("The directory %1 cannot be created.").arg( (*dirIt).dir ) );
return; return;
} }
} }
@ -664,7 +664,7 @@ void AppWizardDialog::accept()
} }
else else
{ {
KMessageBox::sorry(this, i18n("The archive %1 cannot be opened.").tqarg( (*archIt).source ) ); KMessageBox::sorry(this, i18n("The archive %1 cannot be opened.").arg( (*archIt).source ) );
archive.close(); archive.close();
return; return;
} }
@ -682,7 +682,7 @@ void AppWizardDialog::accept()
{ {
if( !copyFile( *fileIt ) ) if( !copyFile( *fileIt ) )
{ {
KMessageBox::sorry(this, i18n("The file %1 cannot be created.").tqarg( (*fileIt).dest) ); KMessageBox::sorry(this, i18n("The file %1 cannot be created.").arg( (*fileIt).dest) );
return; return;
} }
setPermissions(*fileIt); setPermissions(*fileIt);
@ -824,7 +824,7 @@ void AppWizardDialog::unpackArchive( const KArchiveDirectory *dir, const TQStrin
// ( where should we currently get that info from? ) // ( where should we currently get that info from? )
if ( !copyFile( TQDir::cleanDirPath(tdir.name()+"/"+file->name()), dest + "/" + file->name(), false, process ) ) if ( !copyFile( TQDir::cleanDirPath(tdir.name()+"/"+file->name()), dest + "/" + file->name(), false, process ) )
{ {
KMessageBox::sorry(this, i18n("The file %1 cannot be created.").tqarg( dest) ); KMessageBox::sorry(this, i18n("The file %1 cannot be created.").arg( dest) );
return; return;
} }
setPermissions(file, dest + "/" + file->name()); setPermissions(file, dest + "/" + file->name());
@ -893,7 +893,7 @@ void AppWizardDialog::templatesTreeViewClicked(TQListViewItem *item)
if (it == l.end()) if (it == l.end())
m_lastPage = edit; m_lastPage = edit;
fileTemplate.edit = edit; fileTemplate.edit = edit;
addPage(edit, i18n("Template for .%1 Files").tqarg(fileTemplate.suffix)); addPage(edit, i18n("Template for .%1 Files").arg(fileTemplate.suffix));
m_fileTemplates.append(fileTemplate); m_fileTemplates.append(fileTemplate);
} }
licenseChanged(); // to populate the template views licenseChanged(); // to populate the template views
@ -919,7 +919,7 @@ void AppWizardDialog::destButtonClicked(const TQString& dir)
TQDir newDir (dir); TQDir newDir (dir);
kdDebug(9010) << "DevPrjDir == newdir?: " << defPrjDir.absPath() << " == " << newDir.absPath() << endl; kdDebug(9010) << "DevPrjDir == newdir?: " << defPrjDir.absPath() << " == " << newDir.absPath() << endl;
if (defPrjDir != newDir) { if (defPrjDir != newDir) {
if (KMessageBox::questionYesNo(this, i18n("Set default project location to: %1?").tqarg( newDir.absPath() ), if (KMessageBox::questionYesNo(this, i18n("Set default project location to: %1?").arg( newDir.absPath() ),
i18n("New Project"), i18n("Set"), i18n("Do Not Set")) == KMessageBox::Yes) i18n("New Project"), i18n("Set"), i18n("Do Not Set")) == KMessageBox::Yes)
{ {
config->writePathEntry("DefaultProjectsDir", newDir.absPath() + "/"); config->writePathEntry("DefaultProjectsDir", newDir.absPath() + "/");
@ -1015,7 +1015,7 @@ void AppWizardDialog::openAfterGeneration()
{ {
KMessageBox::sorry( 0, i18n("This is not a valid project file.\n" KMessageBox::sorry( 0, i18n("This is not a valid project file.\n"
"XML error in line %1, column %2:\n%3") "XML error in line %1, column %2:\n%3")
.tqarg(errorLine).tqarg(errorCol).tqarg(errorMsg)); .arg(errorLine).arg(errorCol).arg(errorMsg));
return; return;
} }
@ -1023,7 +1023,7 @@ void AppWizardDialog::openAfterGeneration()
DomUtil::writeMapEntry( projectDOM, "substmap", m_pCurrentAppInfo->subMap ); DomUtil::writeMapEntry( projectDOM, "substmap", m_pCurrentAppInfo->subMap );
//save the selected vcs //save the selected vcs
KTrader::OfferList offers = KTrader::self()->query("KDevelop/VCSIntegrator", TQString("[X-KDevelop-VCS]=='%1'").tqarg(m_vcsForm->combo->currentText())); KTrader::OfferList offers = KTrader::self()->query("KDevelop/VCSIntegrator", TQString("[X-KDevelop-VCS]=='%1'").arg(m_vcsForm->combo->currentText()));
if (offers.count() == 1) if (offers.count() == 1)
{ {
KService::Ptr service = offers.first(); KService::Ptr service = offers.first();
@ -1318,7 +1318,7 @@ void AppWizardDialog::showTemplates(bool all)
TQDictIterator<TQListViewItem> dit(m_categoryMap); TQDictIterator<TQListViewItem> dit(m_categoryMap);
for (; dit.current(); ++dit) for (; dit.current(); ++dit)
{ {
//checking whether all tqchildren are not visible //checking whether all children are not visible
kdDebug(9010) << "check: " << dit.current()->text(0) << endl; kdDebug(9010) << "check: " << dit.current()->text(0) << endl;
bool visible = false; bool visible = false;
TQListViewItemIterator it(dit.current()); TQListViewItemIterator it(dit.current());

@ -160,7 +160,7 @@
<property name="scaledContents"> <property name="scaledContents">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignCenter</set> <set>AlignCenter</set>
</property> </property>
<property name="hAlign" stdset="0"> <property name="hAlign" stdset="0">

@ -257,7 +257,7 @@ Programming &%{APPNAMELC}; plugins is a joy to behold. Just read through the nex
should consult the docbook reference for further details. The example below was should consult the docbook reference for further details. The example below was
taken from that reference and shortened a bit for readability. --> taken from that reference and shortened a bit for readability. -->
<refentry id="re-1007-unmanagetqchildren-1"> <refentry id="re-1007-unmanagechildren-1">
<refmeta> <refmeta>
<refentrytitle>XtUnmanageChildren</refentrytitle> <refentrytitle>XtUnmanageChildren</refentrytitle>
<refmiscinfo>Xt - Geometry Management</refmiscinfo> <refmiscinfo>Xt - Geometry Management</refmiscinfo>
@ -265,10 +265,10 @@ taken from that reference and shortened a bit for readability. -->
<refnamediv> <refnamediv>
<refname>XtUnmanageChildren <refname>XtUnmanageChildren
</refname> </refname>
<refpurpose>remove a list of tqchildren from a parent widget's managed <refpurpose>remove a list of children from a parent widget's managed
list. list.
<indexterm id="ix-1007-unmanagetqchildren-1"><primary>widgets</primary><secondary>removing</secondary></indexterm> <indexterm id="ix-1007-unmanagechildren-1"><primary>widgets</primary><secondary>removing</secondary></indexterm>
<indexterm id="ix-1007-unmanagetqchildren-2"><primary>XtUnmanageChildren</primary></indexterm> <indexterm id="ix-1007-unmanagechildren-2"><primary>XtUnmanageChildren</primary></indexterm>
</refpurpose> </refpurpose>
</refnamediv> </refnamediv>
@ -277,16 +277,16 @@ list.
<date>4 March 1996</date> <date>4 March 1996</date>
</refsynopsisdivinfo> </refsynopsisdivinfo>
<synopsis> <synopsis>
void XtUnmanageChildren(<replaceable class="parameter">tqchildren</replaceable>, <replaceable class="parameter">num_tqchildren</replaceable>) void XtUnmanageChildren(<replaceable class="parameter">children</replaceable>, <replaceable class="parameter">num_children</replaceable>)
WidgetList <replaceable class="parameter">tqchildren</replaceable>; WidgetList <replaceable class="parameter">children</replaceable>;
Cardinal <replaceable class="parameter">num_tqchildren</replaceable>; Cardinal <replaceable class="parameter">num_children</replaceable>;
</synopsis> </synopsis>
<refsect2 id="r2-1007-unmanagetqchildren-1"> <refsect2 id="r2-1007-unmanagechildren-1">
<title>Inputs</title> <title>Inputs</title>
<variablelist> <variablelist>
<varlistentry> <varlistentry>
<term><replaceable class="parameter">tqchildren</replaceable> <term><replaceable class="parameter">children</replaceable>
</term> </term>
<listitem> <listitem>
<para>Specifies an array of child widgets. Each child must be of <para>Specifies an array of child widgets. Each child must be of
@ -295,26 +295,26 @@ class RectObj or any subclass thereof.
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><replaceable class="parameter">num_tqchildren</replaceable> <term><replaceable class="parameter">num_children</replaceable>
</term> </term>
<listitem> <listitem>
<para>Specifies the number of elements in <replaceable class="parameter">tqchildren</replaceable>. <para>Specifies the number of elements in <replaceable class="parameter">children</replaceable>.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
</refsect2></refsynopsisdiv> </refsect2></refsynopsisdiv>
<refsect1 id="r1-1007-unmanagetqchildren-1"> <refsect1 id="r1-1007-unmanagechildren-1">
<title>Description <title>Description
</title> </title>
<para><function>XtUnmanageChildren()</function> unmaps the specified widgets <para><function>XtUnmanageChildren()</function> unmaps the specified widgets
and removes them from their parent's tqgeometry management. and removes them from their parent's geometry management.
The widgets will disappear from the screen, and (depending The widgets will disappear from the screen, and (depending
on its parent) may no longer have screen space allocated for on its parent) may no longer have screen space allocated for
them. them.
</para> </para>
<para>Each of the widgets in the <replaceable class="parameter">tqchildren</replaceable> array must have <para>Each of the widgets in the <replaceable class="parameter">children</replaceable> array must have
the same parent. the same parent.
</para> </para>
<para>See the &ldquo;Algorithm&rdquo; section below for full details of the <para>See the &ldquo;Algorithm&rdquo; section below for full details of the
@ -322,13 +322,13 @@ widget unmanagement procedure.
</para> </para>
</refsect1> </refsect1>
<refsect1 id="r1-1007-unmanagetqchildren-2"> <refsect1 id="r1-1007-unmanagechildren-2">
<title>Usage</title> <title>Usage</title>
<para>Unmanaging widgets is the usual method for temporarily <para>Unmanaging widgets is the usual method for temporarily
making them invisible. They can be re-managed with making them invisible. They can be re-managed with
<function>XtManageChildren()</function>. <function>XtManageChildren()</function>.
</para> </para>
<para>You can unmap a widget, but leave it under tqgeometry <para>You can unmap a widget, but leave it under geometry
management by calling <function>XtUnmapWidget()</function>. You can management by calling <function>XtUnmapWidget()</function>. You can
destroy a widget's window without destroying the widget by destroy a widget's window without destroying the widget by
calling <function>XtUnrealizeWidget()</function>. You can destroy a calling <function>XtUnrealizeWidget()</function>. You can destroy a
@ -345,7 +345,7 @@ method once.
</para> </para>
</refsect1> </refsect1>
<refsect1 id="r1-1007-unmanagetqchildren-3"> <refsect1 id="r1-1007-unmanagechildren-3">
<title>Algorithm <title>Algorithm
</title> </title>
<para><function>XtUnmanageChildren()</function> performs the following: <para><function>XtUnmanageChildren()</function> performs the following:
@ -374,11 +374,11 @@ by unmapping it.
</para> </para>
</refsect1> </refsect1>
<refsect1 id="r1-1007-unmanagetqchildren-4"> <refsect1 id="r1-1007-unmanagechildren-4">
<title>Structures</title> <title>Structures</title>
<para>The <type>WidgetList</type> type is simply an array of widgets: <para>The <type>WidgetList</type> type is simply an array of widgets:
</para> </para>
<screen id="sc-1007-unmanagetqchildren-1">typedef Widget *WidgetList; <screen id="sc-1007-unmanagechildren-1">typedef Widget *WidgetList;
</screen> </screen>
</refsect1> </refsect1>
</refentry> </refentry>

@ -151,7 +151,7 @@ void ImportDialog::accept()
{ {
KMessageBox::sorry( 0, i18n("This is not a valid project file.\n" KMessageBox::sorry( 0, i18n("This is not a valid project file.\n"
"XML error in line %1, column %2:\n%3") "XML error in line %1, column %2:\n%3")
.tqarg(errorLine).tqarg(errorCol).tqarg(errorMsg)); .arg(errorLine).arg(errorCol).arg(errorMsg));
return; return;
} }

@ -70,12 +70,12 @@ TQString KDevLicense::assemble( KDevFile::CommentingStyle commentingStyle, const
strFill + " * $EMAIL$ *\n" + strFill + " * $EMAIL$ *\n" +
strFill + " * *\n"; strFill + " * *\n";
// str = str.tqarg(TQDate::currentDate().year()).tqarg(author.left(45),-45).tqarg(email.left(67),-67); // str = str.arg(TQDate::currentDate().year()).arg(author.left(45),-45).arg(email.left(67),-67);
TQStringList::Iterator it; TQStringList::Iterator it;
for( it = m_rawLines.begin(); it != m_rawLines.end(); ++it ) for( it = m_rawLines.begin(); it != m_rawLines.end(); ++it )
{ {
str += TQString( "%1 * %2 *\n").tqarg( strFill ).tqarg( *it, -69 ); str += TQString( "%1 * %2 *\n").arg( strFill ).arg( *it, -69 );
} }
str += strFill + " ***************************************************************************/\n"; str += strFill + " ***************************************************************************/\n";

@ -531,7 +531,7 @@ void AStylePart::formatFiles()
} }
if ( processed != 0 ) if ( processed != 0 )
{ {
KMessageBox::information ( 0, i18n ( "Processed %1 files ending with extensions %2" ).tqarg ( processed ).tqarg(getProjectExtensions().stripWhiteSpace()) ); KMessageBox::information ( 0, i18n ( "Processed %1 files ending with extensions %2" ).arg ( processed ).arg(getProjectExtensions().stripWhiteSpace()) );
} }
m_urls.clear(); m_urls.clear();

@ -44,11 +44,11 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
parents_button->setFixedSize(parents_button->sizeHint()); parents_button->setFixedSize(parents_button->sizeHint());
TQToolTip::add(parents_button, i18n("Show parents")); TQToolTip::add(parents_button, i18n("Show parents"));
tqchildren_button = new TQToolButton(this); children_button = new TQToolButton(this);
tqchildren_button->setPixmap( UserIcon("CTtqchildren", KIcon::DefaultState, ClassViewFactory::instance()) ); children_button->setPixmap( UserIcon("CTchildren", KIcon::DefaultState, ClassViewFactory::instance()) );
tqchildren_button->setToggleButton(true); children_button->setToggleButton(true);
tqchildren_button->setFixedSize(tqchildren_button->sizeHint()); children_button->setFixedSize(children_button->sizeHint());
TQToolTip::add(tqchildren_button, i18n("Show tqchildren")); TQToolTip::add(children_button, i18n("Show children"));
clients_button = new TQToolButton(this); clients_button = new TQToolButton(this);
clients_button->setPixmap( UserIcon("CTclients", KIcon::DefaultState, ClassViewFactory::instance()) ); clients_button->setPixmap( UserIcon("CTclients", KIcon::DefaultState, ClassViewFactory::instance()) );
@ -96,7 +96,7 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
firstrowLayout->addWidget(close_button, 0); firstrowLayout->addWidget(close_button, 0);
secondrowLayout->addWidget(parents_button); secondrowLayout->addWidget(parents_button);
secondrowLayout->addWidget(tqchildren_button); secondrowLayout->addWidget(children_button);
secondrowLayout->addWidget(clients_button); secondrowLayout->addWidget(clients_button);
secondrowLayout->addWidget(suppliers_button); secondrowLayout->addWidget(suppliers_button);
secondrowLayout->addStretch(); secondrowLayout->addStretch();
@ -113,7 +113,7 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
connect( access_combo, TQT_SIGNAL(activated(const TQString&)), connect( access_combo, TQT_SIGNAL(activated(const TQString&)),
this, TQT_SLOT(slotAccessComboChoice(const TQString&)) ); this, TQT_SLOT(slotAccessComboChoice(const TQString&)) );
connect( parents_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewParents())); connect( parents_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewParents()));
connect( tqchildren_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewChildren())); connect( children_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewChildren()));
connect( clients_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewClients())); connect( clients_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewClients()));
connect( suppliers_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewSuppliers())); connect( suppliers_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewSuppliers()));
connect( methods_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewMethods())); connect( methods_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewMethods()));
@ -178,7 +178,7 @@ void ClassToolDialog::viewParents()
} }
/** View the tqchildren of the current class. */ /** View the children of the current class. */
void ClassToolDialog::viewChildren() void ClassToolDialog::viewChildren()
{ {
currentOperation = ViewChildren; currentOperation = ViewChildren;
@ -287,7 +287,7 @@ void ClassToolDialog::updateCaptionAndButtons()
caption = i18n("Parents"); caption = i18n("Parents");
break; break;
case ViewChildren: case ViewChildren:
button = tqchildren_button; button = children_button;
caption = i18n("Children"); caption = i18n("Children");
break; break;
case ViewClients: case ViewClients:
@ -300,11 +300,11 @@ void ClassToolDialog::updateCaptionAndButtons()
break; break;
case ViewMethods: case ViewMethods:
button = methods_button; button = methods_button;
caption = i18n("%1 Methods").tqarg(access_combo->currentText()); caption = i18n("%1 Methods").arg(access_combo->currentText());
break; break;
case ViewAttributes: case ViewAttributes:
button = attributes_button; button = attributes_button;
caption = i18n("%1 Attributes").tqarg(access_combo->currentText()); caption = i18n("%1 Attributes").arg(access_combo->currentText());
break; break;
default: default:
button = 0; button = 0;
@ -313,7 +313,7 @@ void ClassToolDialog::updateCaptionAndButtons()
} }
parents_button->setOn(false); parents_button->setOn(false);
tqchildren_button->setOn(false); children_button->setOn(false);
clients_button->setOn(false); clients_button->setOn(false);
suppliers_button->setOn(false); suppliers_button->setOn(false);
methods_button->setOn(false); methods_button->setOn(false);
@ -321,7 +321,7 @@ void ClassToolDialog::updateCaptionAndButtons()
if (button) { if (button) {
button->setOn(true); button->setOn(true);
setCaption(i18n("%1 of Class %2").tqarg(caption).tqarg(currentClass->name())); setCaption(i18n("%1 of Class %2").arg(caption).arg(currentClass->name()));
} else } else
setCaption(caption); setCaption(caption);
} }

@ -47,7 +47,7 @@ public slots:
void viewNone(); void viewNone();
/** View the parents of the current class. */ /** View the parents of the current class. */
void viewParents(); void viewParents();
/** View the tqchildren of the current class. */ /** View the children of the current class. */
void viewChildren(); void viewChildren();
/** View all classes that has this class as an attribute. */ /** View all classes that has this class as an attribute. */
void viewClients(); void viewClients();
@ -76,7 +76,7 @@ private:
TQComboBox *class_combo; TQComboBox *class_combo;
TQToolButton *parents_button; TQToolButton *parents_button;
TQToolButton *tqchildren_button; TQToolButton *children_button;
TQToolButton *clients_button; TQToolButton *clients_button;
TQToolButton *suppliers_button; TQToolButton *suppliers_button;
TQToolButton *methods_button; TQToolButton *methods_button;

@ -235,7 +235,7 @@ void DigraphView::process( const TQString& file, const TQString& ext )
TQTextStream &is = *ifile.textStream(); TQTextStream &is = *ifile.textStream();
is << "digraph G {" << endl; is << "digraph G {" << endl;
is << "rankdir=LR;" << endl; is << "rankdir=LR;" << endl;
is << "node [tqshape=box,fontname=Helvetica,fontsize=12];" << endl; is << "node [shape=box,fontname=Helvetica,fontsize=12];" << endl;
TQStringList::Iterator it; TQStringList::Iterator it;
for (it = inputs.begin(); it != inputs.end(); ++it) for (it = inputs.begin(); it != inputs.end(); ++it)
is << (*it) << endl; is << (*it) << endl;

@ -194,13 +194,13 @@ void CTags2Part::contextMenu(TQPopupMenu *popup, const Context *context)
popup->insertSeparator(); popup->insertSeparator();
if ( showDeclaration ) if ( showDeclaration )
popup->insertItem( i18n("CTags - Go to Declaration: %1").tqarg(squeezed), this, TQT_SLOT(slotGotoDeclaration()) ); popup->insertItem( i18n("CTags - Go to Declaration: %1").arg(squeezed), this, TQT_SLOT(slotGotoDeclaration()) );
if ( showDefinition ) if ( showDefinition )
popup->insertItem( i18n("CTags - Go to Definition: %1").tqarg(squeezed), this, TQT_SLOT(slotGotoDefinition()) ); popup->insertItem( i18n("CTags - Go to Definition: %1").arg(squeezed), this, TQT_SLOT(slotGotoDefinition()) );
if ( showLookup ) if ( showLookup )
popup->insertItem( i18n("CTags - Lookup: %1").tqarg(squeezed), this, TQT_SLOT(slotGotoTag()) ); popup->insertItem( i18n("CTags - Lookup: %1").arg(squeezed), this, TQT_SLOT(slotGotoTag()) );
} }
} }

@ -104,7 +104,7 @@ void CTags2Widget::line_edit_changed_delayed( )
void CTags2Widget::showHitCount( int n ) void CTags2Widget::showHitCount( int n )
{ {
hitcount_label->setText( i18n("Hits: %1").tqarg( n ) ); hitcount_label->setText( i18n("Hits: %1").arg( n ) );
} }
int CTags2Widget::calculateHitCount( ) int CTags2Widget::calculateHitCount( )
@ -174,7 +174,7 @@ void CTags2Widget::goToNext( )
if ( (item = item->nextSibling()) != NULL ) if ( (item = item->nextSibling()) != NULL )
{ {
item->setSelected( true ); item->setSelected( true );
output_view->tqrepaint( true ); output_view->repaint( true );
itemExecuted( item ); itemExecuted( item );
return; return;
} }

@ -182,7 +182,7 @@ void DiffPart::processExited( KProcess* p )
else else
showDiff( resultBuffer ); showDiff( resultBuffer );
} else { } else {
KMessageBox::error( 0, i18n("Diff command failed (%1):\n").tqarg( p->exitStatus() ) + resultErr ); KMessageBox::error( 0, i18n("Diff command failed (%1):\n").arg( p->exitStatus() ) + resultErr );
} }
resultBuffer = resultErr = TQString(); resultBuffer = resultErr = TQString();
delete proc; delete proc;

@ -73,7 +73,7 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p )
int i = 0; int i = 0;
for ( TQStringList::Iterator it = extPartsTranslated.begin(); it != extPartsTranslated.end(); ++it ) { for ( TQStringList::Iterator it = extPartsTranslated.begin(); it != extPartsTranslated.end(); ++it ) {
popup->insertItem( i18n( "Show in %1" ).tqarg( *it ), i + POPUP_BASE, i ); popup->insertItem( i18n( "Show in %1" ).arg( *it ), i + POPUP_BASE, i );
i++; i++;
} }
if ( !extPartsTranslated.isEmpty() ) if ( !extPartsTranslated.isEmpty() )

@ -142,14 +142,14 @@ void DistpartDialog::slotcreateSrcArchPushButtonPressed() {
} }
else else
{ {
prog->setLabel(i18n("Adding file: %1").tqarg( file) ); prog->setLabel(i18n("Adding file: %1").arg( file) );
prog->progressBar()->setValue( (idx*100)/srcDistFileListBox->numRows() ); prog->progressBar()->setValue( (idx*100)/srcDistFileListBox->numRows() );
} }
} }
tar.close( ); tar.close( );
prog->hide(); prog->hide();
delete prog; delete prog;
KMessageBox::information( this, i18n("Archive made at: %1").tqarg( filename ), i18n("Archive Done") ); KMessageBox::information( this, i18n("Archive made at: %1").arg( filename ), i18n("Archive Done") );
} }
else else
@ -592,7 +592,7 @@ void DistpartDialog::slotAddFileButtonPressed(){
} }
void DistpartDialog::slotRemoveFile(TQListBoxItem *item){ void DistpartDialog::slotRemoveFile(TQListBoxItem *item){
if ( KMessageBox::Yes == KMessageBox::warningYesNo( this, i18n("Remove %1").tqarg( item->text() ), i18n("Remove File") )){ if ( KMessageBox::Yes == KMessageBox::warningYesNo( this, i18n("Remove %1").arg( item->text() ), i18n("Remove File") )){
for(uint count =0; count< srcDistFileListBox->numRows(); count++){ for(uint count =0; count< srcDistFileListBox->numRows(); count++){
if ( item == srcDistFileListBox->item(count)){ if ( item == srcDistFileListBox->item(count)){
srcDistFileListBox->removeItem(count); srcDistFileListBox->removeItem(count);

@ -126,7 +126,7 @@ void DocumentationPart::loadDocumentationPlugins()
{ {
KTrader::OfferList docPluginOffers = KTrader::OfferList docPluginOffers =
KTrader::self()->query(TQString::fromLatin1("KDevelop/DocumentationPlugins"), KTrader::self()->query(TQString::fromLatin1("KDevelop/DocumentationPlugins"),
TQString("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION)); TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION));
KTrader::OfferList::ConstIterator serviceIt = docPluginOffers.begin(); KTrader::OfferList::ConstIterator serviceIt = docPluginOffers.begin();
for ( ; serviceIt != docPluginOffers.end(); ++serviceIt ) for ( ; serviceIt != docPluginOffers.end(); ++serviceIt )
@ -347,13 +347,13 @@ void DocumentationPart::infoPage()
void DocumentationPart::manPage(const TQString &term) void DocumentationPart::manPage(const TQString &term)
{ {
TQString url = TQString::fromLatin1("man:/%1").tqarg(term); TQString url = TQString::fromLatin1("man:/%1").arg(term);
partController()->showDocument(KURL(url)); partController()->showDocument(KURL(url));
} }
void DocumentationPart::infoPage(const TQString &term) void DocumentationPart::infoPage(const TQString &term)
{ {
TQString url = TQString::fromLatin1("info:/%1").tqarg(term); TQString url = TQString::fromLatin1("info:/%1").arg(term);
partController()->showDocument(KURL(url)); partController()->showDocument(KURL(url));
} }
@ -465,7 +465,7 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context)
TQString squeezed = KStringHandler::csqueeze(m_contextStr, 30); TQString squeezed = KStringHandler::csqueeze(m_contextStr, 30);
int id = -1; int id = -1;
if (hasContextFeature(Finder)) { if (hasContextFeature(Finder)) {
id = popup->insertItem(i18n("Find Documentation: %1").tqarg(squeezed), id = popup->insertItem(i18n("Find Documentation: %1").arg(squeezed),
this, TQT_SLOT(contextFindDocumentation())); this, TQT_SLOT(contextFindDocumentation()));
popup->setWhatsThis(id, i18n("<b>Find documentation</b><p>" popup->setWhatsThis(id, i18n("<b>Find documentation</b><p>"
"Opens the documentation finder tab and searches " "Opens the documentation finder tab and searches "
@ -474,7 +474,7 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context)
"Google, etc.")); "Google, etc."));
} }
if (hasContextFeature(IndexLookup)) { if (hasContextFeature(IndexLookup)) {
id = popup->insertItem(i18n("Look in Documentation Index: %1").tqarg(squeezed), id = popup->insertItem(i18n("Look in Documentation Index: %1").arg(squeezed),
this, TQT_SLOT(contextLookInDocumentationIndex())); this, TQT_SLOT(contextLookInDocumentationIndex()));
popup->setWhatsThis(id, i18n("<b>Look in documentation index</b><p>" popup->setWhatsThis(id, i18n("<b>Look in documentation index</b><p>"
"Opens the documentation index tab. It allows " "Opens the documentation index tab. It allows "
@ -482,7 +482,7 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context)
"the documentation index.")); "the documentation index."));
} }
if (hasContextFeature(FullTextSearch)) { if (hasContextFeature(FullTextSearch)) {
id = popup->insertItem(i18n("Search in Documentation: %1").tqarg(squeezed), id = popup->insertItem(i18n("Search in Documentation: %1").arg(squeezed),
this, TQT_SLOT(contextSearchInDocumentation())); this, TQT_SLOT(contextSearchInDocumentation()));
popup->setWhatsThis(id, i18n("<b>Search in documentation</b><p>Searches " popup->setWhatsThis(id, i18n("<b>Search in documentation</b><p>Searches "
"for a term under the cursor in " "for a term under the cursor in "
@ -491,12 +491,12 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context)
"configuration dialog of the documentation plugin.")); "configuration dialog of the documentation plugin."));
} }
if (hasContextFeature(GotoMan)) { if (hasContextFeature(GotoMan)) {
id = popup->insertItem(i18n("Goto Manpage: %1").tqarg(squeezed), id = popup->insertItem(i18n("Goto Manpage: %1").arg(squeezed),
this, TQT_SLOT(contextManPage())); this, TQT_SLOT(contextManPage()));
popup->setWhatsThis(id, i18n("<b>Goto manpage</b><p>Tries to open a man page for the term under the cursor.")); popup->setWhatsThis(id, i18n("<b>Goto manpage</b><p>Tries to open a man page for the term under the cursor."));
} }
if (hasContextFeature(GotoInfo)) { if (hasContextFeature(GotoInfo)) {
id = popup->insertItem( i18n("Goto Infopage: %1").tqarg(squeezed), id = popup->insertItem( i18n("Goto Infopage: %1").arg(squeezed),
this, TQT_SLOT(contextInfoPage()) ); this, TQT_SLOT(contextInfoPage()) );
popup->setWhatsThis(id, i18n("<b>Goto infopage</b><p>Tries to open an info page for the term under the cursor.")); popup->setWhatsThis(id, i18n("<b>Goto infopage</b><p>Tries to open an info page for the term under the cursor."));
} }

@ -87,7 +87,7 @@ void DocUtils::docItemPopup(DocumentationPart *part, const TQString &title, cons
if (showSearch) if (showSearch)
{ {
menu.insertSeparator(); menu.insertSeparator();
menu.insertItem(TQString("%1: %2").tqarg(i18n("Search")).tqarg(KStringHandler::csqueeze(title,20)), 4); menu.insertItem(TQString("%1: %2").arg(i18n("Search")).arg(KStringHandler::csqueeze(title,20)), 4);
} }
switch (menu.exec(pos)) switch (menu.exec(pos))

@ -85,7 +85,7 @@ void IndexView::searchInIndex(TQListBoxItem *item)
else else
{ {
SelectTopic *dia = new SelectTopic(urls); SelectTopic *dia = new SelectTopic(urls);
dia->topicLabel->setText(dia->topicLabel->text().tqarg(item->text())); dia->topicLabel->setText(dia->topicLabel->text().arg(item->text()));
if (dia->exec()) if (dia->exec())
m_widget->part()->partController()->showDocument(dia->selectedURL()); m_widget->part()->partController()->showDocument(dia->selectedURL());
delete dia; delete dia;

@ -450,7 +450,7 @@ void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index,
TQString filename = childEl.namedItem("filename").firstChild().toText().data(); TQString filename = childEl.namedItem("filename").firstChild().toText().data();
IndexItemProto *indexItem = new IndexItemProto(this, item, index, classname, IndexItemProto *indexItem = new IndexItemProto(this, item, index, classname,
i18n("%1 Class Reference").tqarg(classname)); i18n("%1 Class Reference").arg(classname));
indexItem->addURL(KURL(prefix + filename)); indexItem->addURL(KURL(prefix + filename));
createIndexFromTag(dom, index, item, childEl, prefix + filename); createIndexFromTag(dom, index, item, childEl, prefix + filename);
@ -467,7 +467,7 @@ void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index,
if (classname != membername) if (classname != membername)
{ {
IndexItemProto *indexItem = new IndexItemProto(this, item, index, membername,i18n("%1::%2%3 Member Reference").tqarg(classname).tqarg(membername).tqarg(arglist)); IndexItemProto *indexItem = new IndexItemProto(this, item, index, membername,i18n("%1::%2%3 Member Reference").arg(classname).arg(membername).arg(arglist));
indexItem->addURL(KURL(prefix + "#" + anchor)); indexItem->addURL(KURL(prefix + "#" + anchor));
} }
} }

@ -214,7 +214,7 @@ void DocKDevTOCPlugin::addTocSect(DocumentationItem *parent, TQDomElement childE
{ {
while (!childEl.isNull()) while (!childEl.isNull())
{ {
if (childEl.tagName() == TQString("tocsect%1").tqarg(level)) if (childEl.tagName() == TQString("tocsect%1").arg(level))
{ {
TQString name = childEl.attribute("name"); TQString name = childEl.attribute("name");
TQString url = childEl.attribute("url"); TQString url = childEl.attribute("url");

@ -121,7 +121,7 @@ struct
* The LZX document does not state the uncompressed block has an * The LZX document does not state the uncompressed block has an
* uncompressed length field. Where does this length field come from, so * uncompressed length field. Where does this length field come from, so
* we can know how large the block is? The implementation has it as the 24 * we can know how large the block is? The implementation has it as the 24
* bits following after the 3 blocktype bits, before the tqalignment * bits following after the 3 blocktype bits, before the alignment
* padding. * padding.
* *
* The LZX document states that aligned offset blocks have their aligned * The LZX document states that aligned offset blocks have their aligned

@ -182,11 +182,11 @@ void SearchView::search()
d.mkdir(savedir); d.mkdir(savedir);
TQString query = TQString("words=%1;method=%2;matchesperpage=%3;format=%4;sort=%5") TQString query = TQString("words=%1;method=%2;matchesperpage=%3;format=%4;sort=%5")
.tqarg(m_edit->text()) .arg(m_edit->text())
.tqarg(m_searchMethodBox->currentItem()==1? "or" : "and") .arg(m_searchMethodBox->currentItem()==1? "or" : "and")
.tqarg(50) .arg(50)
.tqarg("builtin-short") .arg("builtin-short")
.tqarg(m_sortMethodBox->currentItem()==2? "date" : m_sortMethodBox->currentItem()==1? "title" : "score"); .arg(m_sortMethodBox->currentItem()==2? "date" : m_sortMethodBox->currentItem()==1? "title" : "score");
kdDebug(9002) << "starting kprocess" << endl; kdDebug(9002) << "starting kprocess" << endl;
kdDebug(9002) << "htdig line:" << exe << " -c " << (indexdir + "/htdig.conf ") << query << endl; kdDebug(9002) << "htdig line:" << exe << " -c " << (indexdir + "/htdig.conf ") << query << endl;
@ -211,7 +211,7 @@ void SearchView::search()
} }
// While receiving data from the subprocess, we want // While receiving data from the subprocess, we want
// to block the user interface, but still get tqrepaint // to block the user interface, but still get repaint
// events. Hack taken from NetAccess... // events. Hack taken from NetAccess...
kapp->setOverrideCursor(waitCursor); kapp->setOverrideCursor(waitCursor);
TQWidget blocker(0, 0, WType_Dialog | WShowModal); TQWidget blocker(0, 0, WType_Dialog | WShowModal);

@ -122,7 +122,7 @@ void ProgressDialog::done(int r)
void ProgressDialog::setFilesScanned(int n) void ProgressDialog::setFilesScanned(int n)
{ {
filesLabel->setText(i18n("Files processed: %1").tqarg(n)); filesLabel->setText(i18n("Files processed: %1").arg(n));
} }
void ProgressDialog::setFilesToDig(int n) void ProgressDialog::setFilesToDig(int n)
@ -214,7 +214,7 @@ bool ProgressDialog::createConfig()
if (language == "C") if (language == "C")
language = "en"; language = "en";
TQString wrapper = locate("data", TQString("kdevdocumentation/%1/wrapper.html").tqarg(language)); TQString wrapper = locate("data", TQString("kdevdocumentation/%1/wrapper.html").arg(language));
if (wrapper.isEmpty()) if (wrapper.isEmpty())
wrapper = locate("data", TQString("kdevdocumentation/en/wrapper.html")); wrapper = locate("data", TQString("kdevdocumentation/en/wrapper.html"));
if (wrapper.isEmpty()) if (wrapper.isEmpty())

@ -5005,7 +5005,7 @@ void Config::create()
"nodes that will be shown in the graph. If the number of nodes in a graph \n" "nodes that will be shown in the graph. If the number of nodes in a graph \n"
"becomes larger than this value, doxygen will truncate the graph, which is \n" "becomes larger than this value, doxygen will truncate the graph, which is \n"
"visualized by representing a node as a red box. Note that doxygen if the \n" "visualized by representing a node as a red box. Note that doxygen if the \n"
"number of direct tqchildren of the root node in a graph is already larger than \n" "number of direct children of the root node in a graph is already larger than \n"
"DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note \n" "DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note \n"
"that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. \n", "that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. \n",
0,10000, 50 0,10000, 50
@ -5102,8 +5102,8 @@ static TQCString configFileToString(const char *name)
} }
totalSize+=size+2; totalSize+=size+2;
contents.resize(totalSize); contents.resize(totalSize);
contents.tqat(totalSize-2)='\n'; // to help the scanner contents.at(totalSize-2)='\n'; // to help the scanner
contents.tqat(totalSize-1)='\0'; contents.at(totalSize-1)='\0';
return contents; return contents;
} }
} }

@ -30,7 +30,7 @@ class ConfigOption
enum enum
{ {
/*! Maximum length of an option in the config file. Used for /*! Maximum length of an option in the config file. Used for
* tqalignment purposes. * alignment purposes.
*/ */
MAX_OPTION_LENGTH = 23 MAX_OPTION_LENGTH = 23
}; };

@ -448,7 +448,7 @@ void DoxygenPart::slotRunPreview( )
if (poDir != 0) if (poDir != 0)
*poDir->valueRef() = dirVal; *poDir->valueRef() = dirVal;
KMessageBox::error(mainWindow()->main(), i18n("Cannot create temporary file '%1'").tqarg(file.name())); KMessageBox::error(mainWindow()->main(), i18n("Cannot create temporary file '%1'").arg(file.name()));
return; return;
} }

@ -40,7 +40,7 @@
<property name="text"> <property name="text">
<string>Template &amp;name:</string> <string>Template &amp;name:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -77,7 +77,7 @@
<property name="text"> <property name="text">
<string>Set template content from &amp;file:</string> <string>Set template content from &amp;file:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">

@ -43,7 +43,7 @@
<property name="text"> <property name="text">
<string>Type &amp;extension:</string> <string>Type &amp;extension:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -75,7 +75,7 @@
<property name="text"> <property name="text">
<string>Type &amp;name:</string> <string>Type &amp;name:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -107,7 +107,7 @@
<property name="text"> <property name="text">
<string>Type &amp;description:</string> <string>Type &amp;description:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -161,7 +161,7 @@
<property name="text"> <property name="text">
<string>Set template content from &amp;file:</string> <string>Set template content from &amp;file:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">

@ -107,7 +107,7 @@ ProjectviewPart::~ProjectviewPart()
delete m_guibuilder; delete m_guibuilder;
if ( m_widget ) { if ( m_widget ) {
mainWindow()->removeView( m_widget ); mainWindow()->removeView( m_widget );
delete m_widget; // deletes the tqchildren as well delete m_widget; // deletes the children as well
} }
} }
@ -491,7 +491,7 @@ void ProjectviewPart::slotSaveAsProjectView(bool askForName)
} }
newProjectView = newProjectView.remove("="); // we use this string in config files and = would confuse it newProjectView = newProjectView.remove("="); // we use this string in config files and = would confuse it
if (m_projectViews.contains(newProjectView) > 0 && if (m_projectViews.contains(newProjectView) > 0 &&
KMessageBox::warningContinueCancel(mainWindow()->main(), i18n("<qt>A view session named <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").tqarg(newProjectView), TQString(), i18n("Overwrite")) != KMessageBox::Continue) KMessageBox::warningContinueCancel(mainWindow()->main(), i18n("<qt>A view session named <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").arg(newProjectView), TQString(), i18n("Overwrite")) != KMessageBox::Continue)
{ {
return; return;
} }

@ -352,7 +352,7 @@ void KDevFileSelector::slotFilterChange( const TQString & nf )
filter->lineEdit()->setText( TQString() ); filter->lineEdit()->setText( TQString() );
TQToolTip::add TQToolTip::add
( btnFilter, ( btnFilter,
TQString( i18n("Apply last filter (\"%1\")") ).tqarg( lastFilter ) ); TQString( i18n("Apply last filter (\"%1\")") ).arg( lastFilter ) );
} }
else else
{ {

@ -50,7 +50,7 @@ bool FileTreeViewItem::changeActiveDir( const TQString& olddir, const TQString&
m_isActiveDir = false; m_isActiveDir = false;
setVisible( listView()->shouldBeShown( this ) ); setVisible( listView()->shouldBeShown( this ) );
foundolddir = true; foundolddir = true;
tqrepaint(); repaint();
} }
if ( this->path() == newdir && isDir() && !m_isActiveDir ) if ( this->path() == newdir && isDir() && !m_isActiveDir )
@ -58,7 +58,7 @@ bool FileTreeViewItem::changeActiveDir( const TQString& olddir, const TQString&
m_isActiveDir = true; m_isActiveDir = true;
setVisible( listView()->shouldBeShown( this ) ); setVisible( listView()->shouldBeShown( this ) );
foundnewdir = true; foundnewdir = true;
tqrepaint(); repaint();
} }
if( foundnewdir && foundolddir ) if( foundnewdir && foundolddir )
@ -85,7 +85,7 @@ bool FileTreeViewItem::setProjectFile( TQString const & path, bool pf )
kdDebug( 9017 ) << "FileTreeViewItem::setProjectFile(): " + path << " projectfile: " << pf << endl; kdDebug( 9017 ) << "FileTreeViewItem::setProjectFile(): " + path << " projectfile: " << pf << endl;
m_isProjectFile = pf; m_isProjectFile = pf;
setVisible( listView()->shouldBeShown( this ) ); setVisible( listView()->shouldBeShown( this ) );
tqrepaint(); repaint();
return true; return true;
} }
@ -103,7 +103,7 @@ bool FileTreeViewItem::setProjectFile( TQString const & path, bool pf )
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
void FileTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, void FileTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg,
int column, int width, int tqalignment) int column, int width, int alignment)
{ {
if ( listView()->showNonProjectFiles() && isProjectFile() ) if ( listView()->showNonProjectFiles() && isProjectFile() )
{ {
@ -119,7 +119,7 @@ void FileTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg,
p->setFont( font ); p->setFont( font );
} }
TQListViewItem::paintCell( p, cg, column, width, tqalignment ); TQListViewItem::paintCell( p, cg, column, width, alignment );
} }

@ -41,7 +41,7 @@ namespace filetreeview
virtual ~FileTreeViewItem() {} virtual ~FileTreeViewItem() {}
public: public:
virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ); virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment );
FileTreeWidget* listView() const; FileTreeWidget* listView() const;
void hideOrShow(); void hideOrShow();
bool isProjectFile() const { return m_isProjectFile; } bool isProjectFile() const { return m_isProjectFile; }

@ -101,7 +101,7 @@ void PartWidget::slotFilterChange( const TQString & nf )
if ( empty ) if ( empty )
{ {
m_filter->lineEdit()->setText( TQString() ); m_filter->lineEdit()->setText( TQString() );
TQToolTip::add( m_btnFilter, i18n("Apply last filter (\"%1\")").tqarg( m_lastFilter ) ); TQToolTip::add( m_btnFilter, i18n("Apply last filter (\"%1\")").arg( m_lastFilter ) );
} }
else else
{ {

@ -46,12 +46,12 @@ public:
: FileTreeViewItem( parent, item, branch, pf ), m_statusColor( &FileViewPart::vcsColors.unknown ) {} : FileTreeViewItem( parent, item, branch, pf ), m_statusColor( &FileViewPart::vcsColors.unknown ) {}
VCSFileTreeViewItem( KFileTreeView* parent, KFileItem* item, KFileTreeBranch* branch ) VCSFileTreeViewItem( KFileTreeView* parent, KFileItem* item, KFileTreeBranch* branch )
: FileTreeViewItem( parent, item, branch ), m_statusColor( &FileViewPart::vcsColors.unknown ) {} : FileTreeViewItem( parent, item, branch ), m_statusColor( &FileViewPart::vcsColors.unknown ) {}
virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ) virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment )
{ {
// paint cell in a different color depending on VCS state // paint cell in a different color depending on VCS state
TQColorGroup mycg( cg ); TQColorGroup mycg( cg );
mycg.setColor( TQColorGroup::Base, *m_statusColor ); mycg.setColor( TQColorGroup::Base, *m_statusColor );
FileTreeViewItem::paintCell( p, mycg, column, width, tqalignment ); FileTreeViewItem::paintCell( p, mycg, column, width, alignment );
} }
void setVCSInfo( const VCSFileInfo &info ); void setVCSInfo( const VCSFileInfo &info );

@ -120,7 +120,7 @@ void ShellFilterDialog::slotProcessExited(KProcess *)
accept(); accept();
} else { } else {
KMessageBox::error(this, i18n("Process exited with status %1") KMessageBox::error(this, i18n("Process exited with status %1")
.tqarg(m_proc->exitStatus())); .arg(m_proc->exitStatus()));
reject(); reject();
} }
} }

@ -117,7 +117,7 @@ void ShellInsertDialog::slotProcessExited(KProcess *)
accept(); accept();
} else { } else {
KMessageBox::error(this, i18n("Process exited with status %1") KMessageBox::error(this, i18n("Process exited with status %1")
.tqarg(m_proc->exitStatus())); .arg(m_proc->exitStatus()));
reject(); reject();
} }
} }

@ -116,7 +116,7 @@ void GrepViewPart::contextMenu(TQPopupMenu *popup, const Context *context)
if (!ident.isEmpty()) { if (!ident.isEmpty()) {
m_popupstr = ident; m_popupstr = ident;
TQString squeezed = KStringHandler::csqueeze(ident, 30); TQString squeezed = KStringHandler::csqueeze(ident, 30);
int id = popup->insertItem( i18n("Grep: %1").tqarg(squeezed), int id = popup->insertItem( i18n("Grep: %1").arg(squeezed),
this, TQT_SLOT(slotContextGrep()) ); this, TQT_SLOT(slotContextGrep()) );
popup->setWhatsThis(id, i18n("<b>Grep</b><p>Opens the find in files dialog " popup->setWhatsThis(id, i18n("<b>Grep</b><p>Opens the find in files dialog "
"and sets the pattern to the text under the cursor.")); "and sets the pattern to the text under the cursor."));

@ -100,7 +100,7 @@ void AppOutputViewPart::startAppCommand(const TQString &directory, const TQStrin
cmd = Settings::terminalEmulatorName( *kapp->config() ); cmd = Settings::terminalEmulatorName( *kapp->config() );
if ( cmd == "konsole" && !directory.isNull() ) { // isn't setting the working directory below enough? if ( cmd == "konsole" && !directory.isNull() ) { // isn't setting the working directory below enough?
// If a directory was specified, use it // If a directory was specified, use it
cmd += TQString(" --workdir '%1'").tqarg(directory); cmd += TQString(" --workdir '%1'").arg(directory);
} }
cmd += " -e /bin/sh -c '"; cmd += " -e /bin/sh -c '";
cmd += program; cmd += program;

@ -79,7 +79,7 @@ void AppOutputWidget::slotRowSelected(TQListBoxItem* row)
if (row) { if (row) {
if (assertMatch.exactMatch(row->text())) { if (assertMatch.exactMatch(row->text())) {
m_part->partController()->editDocument(KURL( assertMatch.cap(2) ), assertMatch.cap(3).toInt() - 1); m_part->partController()->editDocument(KURL( assertMatch.cap(2) ), assertMatch.cap(3).toInt() - 1);
m_part->mainWindow()->statusBar()->message(i18n("Assertion failed: %1").tqarg(assertMatch.cap(1)), 10000); m_part->mainWindow()->statusBar()->message(i18n("Assertion failed: %1").arg(assertMatch.cap(1)), 10000);
m_part->mainWindow()->lowerView(this); m_part->mainWindow()->lowerView(this);
} else if (lineInfoMatch.search(row->text()) != -1) { } else if (lineInfoMatch.search(row->text()) != -1) {

@ -124,7 +124,7 @@ ExitStatusItem::ExitStatusItem( bool normalExit, int exitStatus )
m_text = i18n("*** Compilation aborted ***"); m_text = i18n("*** Compilation aborted ***");
if ( m_normalExit ) if ( m_normalExit )
if (m_exitStatus ) if (m_exitStatus )
m_text = i18n("*** Exited with status: %1 ***").tqarg( m_exitStatus ); m_text = i18n("*** Exited with status: %1 ***").arg( m_exitStatus );
else else
m_text = i18n("*** Success ***"); m_text = i18n("*** Success ***");
} }
@ -139,14 +139,14 @@ bool DirectoryItem::m_showDirectoryMessages = true;
TQString EnteringDirectoryItem::text( EOutputLevel outputLevel ) TQString EnteringDirectoryItem::text( EOutputLevel outputLevel )
{ {
if ( outputLevel < eFull ) if ( outputLevel < eFull )
return i18n("Entering directory %1").tqarg( directory ); return i18n("Entering directory %1").arg( directory );
return m_text; return m_text;
} }
TQString ExitingDirectoryItem::text( EOutputLevel outputLevel ) TQString ExitingDirectoryItem::text( EOutputLevel outputLevel )
{ {
if ( outputLevel < eFull ) if ( outputLevel < eFull )
return i18n("Leaving directory %1").tqarg( directory ); return i18n("Leaving directory %1").arg( directory );
return m_text; return m_text;
} }

@ -580,7 +580,7 @@ void MakeWidget::slotProcessExited(KProcess *)
insertItem( item ); insertItem( item );
displayPendingItem(); displayPendingItem();
m_part->mainWindow()->statusBar()->message( TQString("%1: %2").tqarg(currentCommand).tqarg(item->m_text), 3000); m_part->mainWindow()->statusBar()->message( TQString("%1: %2").arg(currentCommand).arg(item->m_text), 3000);
m_part->core()->running(m_part, false); m_part->core()->running(m_part, false);
// Defensive programming: We emit this with a single shot timer so that we go once again // Defensive programming: We emit this with a single shot timer so that we go once again

@ -47,7 +47,7 @@ public:
TQString tipText() const TQString tipText() const
{ {
TQString tip = i18n("Name: %1 | Type: %2 | Value: %3"); TQString tip = i18n("Name: %1 | Type: %2 | Value: %3");
return tip.tqarg( text(0) ).tqarg( text(1) ).tqarg( text(2) ); return tip.arg( text(0) ).arg( text(1) ).arg( text(2) );
} }
}; };
@ -220,7 +220,7 @@ void PartExplorerForm::fillServiceList( const KTrader::OfferList &services )
} }
TQString dProperty = " *** Found property < %1, %2, %3 >"; TQString dProperty = " *** Found property < %1, %2, %3 >";
dProperty = dProperty.tqarg( propertyName ).tqarg( propertyType ).tqarg( propertyValue ); dProperty = dProperty.arg( propertyName ).arg( propertyType ).arg( propertyValue );
kdDebug( 9000 ) << dProperty << endl; kdDebug( 9000 ) << dProperty << endl;
new PartExplorer::PropertyItem( serviceItem, propertyName, propertyType, propertyValue ); new PartExplorer::PropertyItem( serviceItem, propertyName, propertyType, propertyValue );

@ -78,7 +78,7 @@ void QuickOpenClassDialog::accept()
TQString fileStr; TQString fileStr;
QuickOpenFunctionChooseForm fdlg( this, "" ); QuickOpenFunctionChooseForm fdlg( this, "" );
fdlg.setCaption(i18n("Select The Location of Class %1").tqarg(klasses.first()->name())); fdlg.setCaption(i18n("Select The Location of Class %1").arg(klasses.first()->name()));
fdlg.textLabel2->setText(i18n("Class name:")); fdlg.textLabel2->setText(i18n("Class name:"));
for( ClassList::const_iterator it = klasses.constBegin(); it != klasses.constEnd() ; ++it ) for( ClassList::const_iterator it = klasses.constBegin(); it != klasses.constEnd() ; ++it )

@ -31,7 +31,7 @@
QuickOpenFunctionChooseForm::QuickOpenFunctionChooseForm(TQWidget* parent, const char* name, bool modal, WFlags fl) QuickOpenFunctionChooseForm::QuickOpenFunctionChooseForm(TQWidget* parent, const char* name, bool modal, WFlags fl)
: QuickOpenFunctionChooseFormBase(parent,name, modal,fl) : QuickOpenFunctionChooseFormBase(parent,name, modal,fl)
{ {
setCaption( i18n("Select One Argument or File of Function %1").tqarg( name ) ); setCaption( i18n("Select One Argument or File of Function %1").arg( name ) );
slotArgsChange( 0 ); slotArgsChange( 0 );
slotFileChange( 0 ); slotFileChange( 0 );
} }

@ -99,7 +99,7 @@ void ReplacePart::contextMenu(TQPopupMenu *popup, const Context *context)
if (!ident.isEmpty()) { if (!ident.isEmpty()) {
m_popupstr = ident; m_popupstr = ident;
TQString squeezed = KStringHandler::csqueeze(ident, 30); TQString squeezed = KStringHandler::csqueeze(ident, 30);
int id = popup->insertItem( i18n("Replace Project Wide: %1").tqarg(squeezed), int id = popup->insertItem( i18n("Replace Project Wide: %1").arg(squeezed),
this, TQT_SLOT(slotReplace()) ); this, TQT_SLOT(slotReplace()) );
popup->setWhatsThis(id, i18n("<b>Replace Project Wide</b><p>Opens the find in files dialog " popup->setWhatsThis(id, i18n("<b>Replace Project Wide</b><p>Opens the find in files dialog "
"and sets the pattern to the text under the cursor.")); "and sets the pattern to the text under the cursor."));

@ -56,7 +56,7 @@ void ReplaceItem::setChecked( bool checked )
return; return;
} }
// this is a parent item, set self and tqchildren // this is a parent item, set self and children
ReplaceItem * item = firstChild(); ReplaceItem * item = firstChild();
while ( item ) while ( item )
{ {

@ -114,7 +114,7 @@ TQStringList SnippetPart::getAllLanguages()
KTrader::OfferList languageSupportOffers = KTrader::OfferList languageSupportOffers =
KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"), KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"),
TQString::fromLatin1("[X-KDevelop-Version] == %1" TQString::fromLatin1("[X-KDevelop-Version] == %1"
).tqarg( KDEVELOP_PLUGIN_VERSION )); ).arg( KDEVELOP_PLUGIN_VERSION ));
TQStringList languages; TQStringList languages;

@ -327,9 +327,9 @@ void SnippetWidget::writeConfig()
SnippetGroup * group = dynamic_cast<SnippetGroup*>(item); SnippetGroup * group = dynamic_cast<SnippetGroup*>(item);
if (group) { if (group) {
kdDebug(9035) << "-->GROUP " << item->getName() << group->getId() << " " << iGroupCount<< endl; kdDebug(9035) << "-->GROUP " << item->getName() << group->getId() << " " << iGroupCount<< endl;
strKeyName=TQString("snippetGroupName_%1").tqarg(iGroupCount); strKeyName=TQString("snippetGroupName_%1").arg(iGroupCount);
strKeyId=TQString("snippetGroupId_%1").tqarg(iGroupCount); strKeyId=TQString("snippetGroupId_%1").arg(iGroupCount);
strKeyText=TQString("snippetGroupLang_%1").tqarg(iGroupCount); strKeyText=TQString("snippetGroupLang_%1").arg(iGroupCount);
_cfg->writeEntry(strKeyName, group->getName()); _cfg->writeEntry(strKeyName, group->getName());
_cfg->writeEntry(strKeyId, group->getId()); _cfg->writeEntry(strKeyId, group->getId());
@ -337,9 +337,9 @@ void SnippetWidget::writeConfig()
iGroupCount++; iGroupCount++;
} else if (dynamic_cast<SnippetItem*>(item)) { } else if (dynamic_cast<SnippetItem*>(item)) {
kdDebug(9035) << "-->ITEM " << item->getName() << item->getParent() << " " << iSnipCount << endl; kdDebug(9035) << "-->ITEM " << item->getName() << item->getParent() << " " << iSnipCount << endl;
strKeyName=TQString("snippetName_%1").tqarg(iSnipCount); strKeyName=TQString("snippetName_%1").arg(iSnipCount);
strKeyText=TQString("snippetText_%1").tqarg(iSnipCount); strKeyText=TQString("snippetText_%1").arg(iSnipCount);
strKeyId=TQString("snippetParent_%1").tqarg(iSnipCount); strKeyId=TQString("snippetParent_%1").arg(iSnipCount);
_cfg->writeEntry(strKeyName, item->getName()); _cfg->writeEntry(strKeyName, item->getName());
_cfg->writeEntry(strKeyText, item->getText()); _cfg->writeEntry(strKeyText, item->getText());
@ -357,8 +357,8 @@ void SnippetWidget::writeConfig()
for ( it = _mapSaved.begin(); it != _mapSaved.end(); ++it ) { //write the saved variable values for ( it = _mapSaved.begin(); it != _mapSaved.end(); ++it ) { //write the saved variable values
if (it.data().length()<=0) continue; //is the saved value has no length -> no need to save it if (it.data().length()<=0) continue; //is the saved value has no length -> no need to save it
strKeyName=TQString("snippetSavedName_%1").tqarg(iCount); strKeyName=TQString("snippetSavedName_%1").arg(iCount);
strKeyText=TQString("snippetSavedVal_%1").tqarg(iCount); strKeyText=TQString("snippetSavedVal_%1").arg(iCount);
_cfg->writeEntry(strKeyName, it.key()); _cfg->writeEntry(strKeyName, it.key());
_cfg->writeEntry(strKeyText, it.data()); _cfg->writeEntry(strKeyText, it.data());
@ -394,8 +394,8 @@ void SnippetWidget::initConfigOldVersion(KConfig *cfg)
TQString strKeyName=""; TQString strKeyName="";
TQString strKeyText=""; TQString strKeyText="";
for ( int i=0; i<iCount; i++) { //read the snippet-list for ( int i=0; i<iCount; i++) { //read the snippet-list
strKeyName=TQString("snippetName_%1").tqarg(i); strKeyName=TQString("snippetName_%1").arg(i);
strKeyText=TQString("snippetText_%1").tqarg(i); strKeyText=TQString("snippetText_%1").arg(i);
TQString strNameVal=""; TQString strNameVal="";
TQString strTextVal=""; TQString strTextVal="";
@ -434,9 +434,9 @@ void SnippetWidget::initConfig()
int iCount = _cfg->readNumEntry("snippetGroupCount", -1); int iCount = _cfg->readNumEntry("snippetGroupCount", -1);
for ( int i=0; i<iCount; i++) { //read the group-list for ( int i=0; i<iCount; i++) { //read the group-list
strKeyName=TQString("snippetGroupName_%1").tqarg(i); strKeyName=TQString("snippetGroupName_%1").arg(i);
strKeyId=TQString("snippetGroupId_%1").tqarg(i); strKeyId=TQString("snippetGroupId_%1").arg(i);
strKeyText=TQString("snippetGroupLang_%1").tqarg(i); strKeyText=TQString("snippetGroupLang_%1").arg(i);
TQString strNameVal=""; TQString strNameVal="";
int iIdVal=-1; int iIdVal=-1;
@ -465,9 +465,9 @@ void SnippetWidget::initConfig()
if (iCount != -1) { if (iCount != -1) {
iCount = _cfg->readNumEntry("snippetCount", 0); iCount = _cfg->readNumEntry("snippetCount", 0);
for ( int i=0; i<iCount; i++) { //read the snippet-list for ( int i=0; i<iCount; i++) { //read the snippet-list
strKeyName=TQString("snippetName_%1").tqarg(i); strKeyName=TQString("snippetName_%1").arg(i);
strKeyText=TQString("snippetText_%1").tqarg(i); strKeyText=TQString("snippetText_%1").arg(i);
strKeyId=TQString("snippetParent_%1").tqarg(i); strKeyId=TQString("snippetParent_%1").arg(i);
TQString strNameVal=""; TQString strNameVal="";
TQString strTextVal=""; TQString strTextVal="";
@ -492,8 +492,8 @@ void SnippetWidget::initConfig()
iCount = _cfg->readNumEntry("snippetSavedCount", 0); iCount = _cfg->readNumEntry("snippetSavedCount", 0);
for ( int i=1; i<=iCount; i++) { //read the saved-values and store in TQMap for ( int i=1; i<=iCount; i++) { //read the saved-values and store in TQMap
strKeyName=TQString("snippetSavedName_%1").tqarg(i); strKeyName=TQString("snippetSavedName_%1").arg(i);
strKeyText=TQString("snippetSavedVal_%1").tqarg(i); strKeyText=TQString("snippetSavedVal_%1").arg(i);
TQString strNameVal=""; TQString strNameVal="";
TQString strTextVal=""; TQString strTextVal="";
@ -597,7 +597,7 @@ TQString SnippetWidget::parseText(TQString text, TQString del)
if ( strName != del+del ) { //if not doubel-delimiter if ( strName != del+del ) { //if not doubel-delimiter
if (iInMeth == 0) { //if input-method "single" is selected if (iInMeth == 0) { //if input-method "single" is selected
if ( mapVar[strName].length() <= 0 ) { // and not already in map if ( mapVar[strName].length() <= 0 ) { // and not already in map
strMsg=i18n("Please enter the value for <b>%1</b>:").tqarg(strName); strMsg=i18n("Please enter the value for <b>%1</b>:").arg(strName);
strNew = showSingleVarDialog( strName, &_mapSaved, rSingle ); strNew = showSingleVarDialog( strName, &_mapSaved, rSingle );
if (strNew=="") if (strNew=="")
return ""; //user clicked Cancle return ""; //user clicked Cancle
@ -742,7 +742,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
bool bReturn = false; bool bReturn = false;
//resize the textedits //resize the textedits
if (iWidth > 1) { if (iWidth > 1) {
TQRect r = dlg.tqgeometry(); TQRect r = dlg.geometry();
r.setHeight(iBasicHeight + iOneHeight*mapVar2Te.count()); r.setHeight(iBasicHeight + iOneHeight*mapVar2Te.count());
r.setWidth(iWidth); r.setWidth(iWidth);
dlg.setGeometry(r); dlg.setGeometry(r);
@ -763,9 +763,9 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
} }
bReturn = true; bReturn = true;
iBasicHeight = dlg.tqgeometry().height() - layoutVar->tqgeometry().height(); iBasicHeight = dlg.geometry().height() - layoutVar->geometry().height();
iOneHeight = layoutVar->tqgeometry().height() / mapVar2Te.count(); iOneHeight = layoutVar->geometry().height() / mapVar2Te.count();
iWidth = dlg.tqgeometry().width(); iWidth = dlg.geometry().width();
} }
//do some cleanup //do some cleanup
@ -811,7 +811,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
labTop = new TQLabel( &dlg, "label" ); labTop = new TQLabel( &dlg, "label" );
layoutTop->addWidget(labTop, 0, 0); layoutTop->addWidget(labTop, 0, 0);
labTop->setText(i18n("Enter the replacement values for %1:").tqarg( var )); labTop->setText(i18n("Enter the replacement values for %1:").arg( var ));
tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
@ -863,7 +863,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
strReturn = te->text(); //copy the entered values back the the given map strReturn = te->text(); //copy the entered values back the the given map
dlgSize = dlg.tqgeometry(); dlgSize = dlg.geometry();
} }
//do some cleanup //do some cleanup

@ -116,7 +116,7 @@
<property name="text"> <property name="text">
<string>&amp;Snippet:</string> <string>&amp;Snippet:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignTop</set> <set>AlignTop</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">

@ -45,7 +45,7 @@ public:
TQString text(int) const TQString text(int) const
{ {
return extra.isNull()? tag : TQString("%1: %2").tqarg(tag).tqarg(extra); return extra.isNull()? tag : TQString("%1: %2").arg(tag).arg(extra);
} }
TextStructItem *parentStructItem() TextStructItem *parentStructItem()
{ return static_cast<TextStructItem*>(parent()); } { return static_cast<TextStructItem*>(parent()); }

@ -117,7 +117,7 @@ void KDevAppTreeListItem::activate()
void KDevAppTreeListItem::setOpen( bool o ) void KDevAppTreeListItem::setOpen( bool o )
{ {
if( o && !parsed ) { // fill the tqchildren before opening if( o && !parsed ) { // fill the children before opening
((KDevApplicationTree *) parent())->addDesktopGroup( path, this ); ((KDevApplicationTree *) parent())->addDesktopGroup( path, this );
parsed = true; parsed = true;
} }

@ -162,7 +162,7 @@ void ToolsConfig::updateList()
_list->insertItem(it.current()->icon, it.current()->name); _list->insertItem(it.current()->icon, it.current()->name);
_list->setUpdatesEnabled(true); _list->setUpdatesEnabled(true);
_list->tqrepaint(); _list->repaint();
} }

@ -213,7 +213,7 @@
<property name="text"> <property name="text">
<string>Note: Changes will take effect after KDevelop is restarted</string> <string>Note: Changes will take effect after KDevelop is restarted</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignCenter</set> <set>WordBreak|AlignCenter</set>
</property> </property>
</widget> </widget>

@ -141,10 +141,10 @@
</widget> </widget>
<widget class="TQCheckBox"> <widget class="TQCheckBox">
<property name="name"> <property name="name">
<cstring>tqchildrenBox</cstring> <cstring>childrenBox</cstring>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Trace tqchildren</string> <string>&amp;Trace children</string>
</property> </property>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
@ -271,7 +271,7 @@
<cstring>ctChildrenBox</cstring> <cstring>ctChildrenBox</cstring>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Trace tqchildren</string> <string>&amp;Trace children</string>
</property> </property>
</widget> </widget>
</grid> </grid>
@ -323,7 +323,7 @@
<tabstop>paramEdit</tabstop> <tabstop>paramEdit</tabstop>
<tabstop>memleakBox</tabstop> <tabstop>memleakBox</tabstop>
<tabstop>reachableBox</tabstop> <tabstop>reachableBox</tabstop>
<tabstop>tqchildrenBox</tabstop> <tabstop>childrenBox</tabstop>
<tabstop>valExecutableEdit</tabstop> <tabstop>valExecutableEdit</tabstop>
<tabstop>valParamEdit</tabstop> <tabstop>valParamEdit</tabstop>
<tabstop>ctChildrenBox</tabstop> <tabstop>ctChildrenBox</tabstop>

@ -89,7 +89,7 @@ void ValgrindDialog::setValExecutable( const TQString& ve )
static const TQString memCheckParam( "--tool=memcheck" ); static const TQString memCheckParam( "--tool=memcheck" );
static const TQString leakCheckParam( "--leak-check=yes" ); static const TQString leakCheckParam( "--leak-check=yes" );
static const TQString reachableParam( "--show-reachable=yes" ); static const TQString reachableParam( "--show-reachable=yes" );
static const TQString tqchildrenParam( "--trace-tqchildren=yes" ); static const TQString childrenParam( "--trace-children=yes" );
TQString ValgrindDialog::valParams() const TQString ValgrindDialog::valParams() const
{ {
@ -100,8 +100,8 @@ TQString ValgrindDialog::valParams() const
params += " " + leakCheckParam; params += " " + leakCheckParam;
if ( w->reachableBox->isChecked() ) if ( w->reachableBox->isChecked() )
params += " " + reachableParam; params += " " + reachableParam;
if ( w->tqchildrenBox->isChecked() ) if ( w->childrenBox->isChecked() )
params += " " + tqchildrenParam; params += " " + childrenParam;
return params; return params;
} }
@ -113,14 +113,14 @@ void ValgrindDialog::setValParams( const TQString& params )
w->memleakBox->setChecked( true ); w->memleakBox->setChecked( true );
if ( myParams.contains( reachableParam ) ) if ( myParams.contains( reachableParam ) )
w->reachableBox->setChecked( true ); w->reachableBox->setChecked( true );
if ( myParams.contains( tqchildrenParam ) ) if ( myParams.contains( childrenParam ) )
w->tqchildrenBox->setChecked( true ); w->childrenBox->setChecked( true );
w->init(); w->init();
myParams = myParams.replace( TQRegExp( memCheckParam ), "" ); myParams = myParams.replace( TQRegExp( memCheckParam ), "" );
myParams = myParams.replace( TQRegExp( leakCheckParam ), "" ); myParams = myParams.replace( TQRegExp( leakCheckParam ), "" );
myParams = myParams.replace( TQRegExp( reachableParam ), "" ); myParams = myParams.replace( TQRegExp( reachableParam ), "" );
myParams = myParams.replace( TQRegExp( tqchildrenParam ), "" ); myParams = myParams.replace( TQRegExp( childrenParam ), "" );
myParams = myParams.stripWhiteSpace(); myParams = myParams.stripWhiteSpace();
w->valParamEdit->setText( myParams ); w->valParamEdit->setText( myParams );
} }
@ -150,7 +150,7 @@ TQString ValgrindDialog::ctParams() const
{ {
TQString params = w->ctParamEdit->text(); TQString params = w->ctParamEdit->text();
if ( w->ctChildrenBox->isChecked() ) if ( w->ctChildrenBox->isChecked() )
params += " " + tqchildrenParam; params += " " + childrenParam;
return params; return params;
} }
@ -161,11 +161,11 @@ void ValgrindDialog::setCtParams( const TQString& params )
//force --tool=callgrind if no params are given //force --tool=callgrind if no params are given
if (myParams.isEmpty()) if (myParams.isEmpty())
myParams = "--tool=callgrind"; myParams = "--tool=callgrind";
if ( myParams.contains( tqchildrenParam ) ) if ( myParams.contains( childrenParam ) )
w->ctChildrenBox->setChecked( true ); w->ctChildrenBox->setChecked( true );
w->init(); w->init();
myParams = myParams.replace( TQRegExp( tqchildrenParam ), "" ); myParams = myParams.replace( TQRegExp( childrenParam ), "" );
myParams = myParams.stripWhiteSpace(); myParams = myParams.stripWhiteSpace();
w->ctParamEdit->setText( myParams ); w->ctParamEdit->setText( myParams );
} }

@ -93,7 +93,7 @@ void ValgrindPart::loadOutput()
TQFile f( fName ); TQFile f( fName );
if ( !f.open( IO_ReadOnly ) ) { if ( !f.open( IO_ReadOnly ) ) {
KMessageBox::sorry( 0, i18n("Could not open valgrind output: %1").tqarg(fName) ); KMessageBox::sorry( 0, i18n("Could not open valgrind output: %1").arg(fName) );
return; return;
} }
@ -234,7 +234,7 @@ void ValgrindPart::runValgrind( const TQString& exec, const TQString& params, co
DomUtil::PairList::ConstIterator it; DomUtil::PairList::ConstIterator it;
for (it = run_envvars.begin(); it != run_envvars.end(); ++it) for (it = run_envvars.begin(); it != run_envvars.end(); ++it)
{ {
envVarList << TQString("%1=\"%2\" ").tqarg((*it).first).tqarg((*it).second); envVarList << TQString("%1=\"%2\" ").arg((*it).first).arg((*it).second);
} }
*proc << envVarList.join("") << valExec << valParams << exec << params; *proc << envVarList.join("") << valExec << valParams << exec << params;
@ -312,7 +312,7 @@ void ValgrindPart::processExited( KProcess* p )
KProcess *kcProc = new KProcess; KProcess *kcProc = new KProcess;
// kcProc->setWorkingDirectory(kcInfo.kcWorkDir); // kcProc->setWorkingDirectory(kcInfo.kcWorkDir);
*kcProc << kcInfo.kcPath; *kcProc << kcInfo.kcPath;
*kcProc << TQString("callgrind.out.%1").tqarg(p->pid()); *kcProc << TQString("callgrind.out.%1").arg(p->pid());
kcProc->start(KProcess::DontCare); kcProc->start(KProcess::DontCare);
} }
} }

@ -95,7 +95,7 @@ void VCSManagerPart::loadVCSPlugin()
m_vcsPluginName = DomUtil::readEntry( dom, "/general/versioncontrol" ).stripWhiteSpace(); m_vcsPluginName = DomUtil::readEntry( dom, "/general/versioncontrol" ).stripWhiteSpace();
if ( m_vcsPluginName.isEmpty() ) return; if ( m_vcsPluginName.isEmpty() ) return;
TQString constraint = TQString( "DesktopEntryName=='%1'" ).tqarg( m_vcsPluginName ); TQString constraint = TQString( "DesktopEntryName=='%1'" ).arg( m_vcsPluginName );
pluginController()->loadPlugin( "KDevelop/VersionControl", constraint ); pluginController()->loadPlugin( "KDevelop/VersionControl", constraint );
} }

@ -51,7 +51,7 @@ void VCSManagerProjectConfig::setup( )
int current = 0; int current = 0;
TQString constraint = TQString("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION); TQString constraint = TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
KTrader::OfferList offers = KTrader::self()->query("KDevelop/VersionControl", constraint ); KTrader::OfferList offers = KTrader::self()->query("KDevelop/VersionControl", constraint );
KTrader::OfferList::const_iterator it = offers.begin(); KTrader::OfferList::const_iterator it = offers.begin();
for ( int i = 1; it != offers.end(); ++it, ++i ) for ( int i = 1; it != offers.end(); ++it, ++i )

@ -26,7 +26,7 @@
<property name="text"> <property name="text">
<string>Version control system to use for this project:</string> <string>Version control system to use for this project:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>

@ -92,7 +92,7 @@ void GeneralInfoWidget::configureinUpdateVersion( TQString configureinpath, TQSt
TQFile configurein(configureinpath); TQFile configurein(configureinpath);
if ( !configurein.open( IO_ReadOnly ) ){ if ( !configurein.open( IO_ReadOnly ) ){
KMessageBox::error(this, i18n("Could not open %1 for reading.").tqarg(configureinpath)); KMessageBox::error(this, i18n("Could not open %1 for reading.").arg(configureinpath));
return; return;
} }
@ -152,7 +152,7 @@ void GeneralInfoWidget::configureinUpdateVersion( TQString configureinpath, TQSt
// write our changes.. // write our changes..
TQFile configureout(configureinpath); TQFile configureout(configureinpath);
if ( !configureout.open( IO_WriteOnly ) ){ if ( !configureout.open( IO_WriteOnly ) ){
KMessageBox::error(this, i18n("Could not open %1 for writing.").tqarg(configureinpath)); KMessageBox::error(this, i18n("Could not open %1 for writing.").arg(configureinpath));
return ; return ;
} }
TQTextStream output( &configureout); TQTextStream output( &configureout);
@ -217,13 +217,13 @@ void GeneralInfoWidget::slotProjectDirectoryChanged( const TQString& text ) {
else if(isProjectDirectoryAbsolute() && text[0] != '/') else if(isProjectDirectoryAbsolute() && text[0] != '/')
{ {
setProjectDirectoryError( setProjectDirectoryError(
i18n("'%1' is not an absolute path.").tqarg( i18n("'%1' is not an absolute path.").arg(
project_directory_edit->text())); project_directory_edit->text()));
} }
else if(!isProjectDirectoryAbsolute() && text[0] == '/') else if(!isProjectDirectoryAbsolute() && text[0] == '/')
{ {
setProjectDirectoryError( setProjectDirectoryError(
i18n("'%1' is not a relative path.").tqarg( i18n("'%1' is not a relative path.").arg(
project_directory_edit->text())); project_directory_edit->text()));
} }
else else
@ -231,11 +231,11 @@ void GeneralInfoWidget::slotProjectDirectoryChanged( const TQString& text ) {
TQFileInfo info(projectDirectory()); TQFileInfo info(projectDirectory());
if(!info.exists()) if(!info.exists())
setProjectDirectoryError( setProjectDirectoryError(
i18n("'%1' does not exist.").tqarg( i18n("'%1' does not exist.").arg(
project_directory_edit->text())); project_directory_edit->text()));
else if(!info.isDir()) else if(!info.isDir())
setProjectDirectoryError( setProjectDirectoryError(
i18n("'%1' is not a directory.").tqarg( i18n("'%1' is not a directory.").arg(
project_directory_edit->text())); project_directory_edit->text()));
else else
setProjectDirectorySuccess(); setProjectDirectorySuccess();
@ -261,10 +261,10 @@ void GeneralInfoWidget::setProjectDirectorySuccess() {
project_directory_diagnostic_icon->setPixmap(SmallIcon("ok")); project_directory_diagnostic_icon->setPixmap(SmallIcon("ok"));
if(isProjectDirectoryAbsolute()) if(isProjectDirectoryAbsolute())
project_directory_diagnostic_label->setText( project_directory_diagnostic_label->setText(
i18n("'%1' is a valid project directory.").tqarg(projectDirectory())); i18n("'%1' is a valid project directory.").arg(projectDirectory()));
else else
project_directory_diagnostic_label->setText( project_directory_diagnostic_label->setText(
i18n("'%1' is a valid project directory.").tqarg(projectDirectory())); i18n("'%1' is a valid project directory.").arg(projectDirectory()));
} }
TQString makeRelativePath(const TQString& fromPath, const TQString& toPath) TQString makeRelativePath(const TQString& fromPath, const TQString& toPath)

@ -108,11 +108,11 @@ void LanguageSelectWidget::readProjectConfig()
KTrader::OfferList languageSupportOffers = KTrader::OfferList languageSupportOffers =
KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"), KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"),
TQString::fromLatin1("[X-KDevelop-Version] == %1" TQString::fromLatin1("[X-KDevelop-Version] == %1"
).tqarg( KDEVELOP_PLUGIN_VERSION )); ).arg( KDEVELOP_PLUGIN_VERSION ));
TQStringList languages = DomUtil::readListEntry(m_projectDom, "/general/secondaryLanguages", "language"); TQStringList languages = DomUtil::readListEntry(m_projectDom, "/general/secondaryLanguages", "language");
TQString language = DomUtil::readEntry(m_projectDom, "/general/primarylanguage"); TQString language = DomUtil::readEntry(m_projectDom, "/general/primarylanguage");
_currentLanguage->setText(i18n("Primary language is '%1'. Please select additional languages the project might contain.").tqarg(language)); _currentLanguage->setText(i18n("Primary language is '%1'. Please select additional languages the project might contain.").arg(language));
for (KTrader::OfferList::ConstIterator it = languageSupportOffers.begin(); it != languageSupportOffers.end(); ++it) for (KTrader::OfferList::ConstIterator it = languageSupportOffers.begin(); it != languageSupportOffers.end(); ++it)
{ {

@ -127,30 +127,30 @@ void MainWindowShare::createActions()
this, TQT_SLOT(slotShowMenuBar()), this, TQT_SLOT(slotShowMenuBar()),
m_pMainWnd->actionCollection(), "settings_show_menubar" ); m_pMainWnd->actionCollection(), "settings_show_menubar" );
action->setToolTip(beautifyToolTip(action->text())); action->setToolTip(beautifyToolTip(action->text()));
action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(action->text())).tqarg(i18n("Lets you switch the menubar on/off."))); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you switch the menubar on/off.")));
action = KStdAction::keyBindings( action = KStdAction::keyBindings(
this, TQT_SLOT(slotKeyBindings()), this, TQT_SLOT(slotKeyBindings()),
m_pMainWnd->actionCollection(), "settings_configure_shortcuts" ); m_pMainWnd->actionCollection(), "settings_configure_shortcuts" );
action->setToolTip(beautifyToolTip(action->text())); action->setToolTip(beautifyToolTip(action->text()));
action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(action->text())).tqarg(i18n("Lets you configure shortcut keys."))); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure shortcut keys.")));
action = KStdAction::configureToolbars( action = KStdAction::configureToolbars(
this, TQT_SLOT(slotConfigureToolbars()), this, TQT_SLOT(slotConfigureToolbars()),
m_pMainWnd->actionCollection(), "settings_configure_toolbars" ); m_pMainWnd->actionCollection(), "settings_configure_toolbars" );
action->setToolTip(beautifyToolTip(action->text())); action->setToolTip(beautifyToolTip(action->text()));
action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(action->text())).tqarg(i18n("Lets you configure toolbars."))); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure toolbars.")));
action = KStdAction::configureNotifications( action = KStdAction::configureNotifications(
this, TQT_SLOT(slotConfigureNotifications()), this, TQT_SLOT(slotConfigureNotifications()),
m_pMainWnd->actionCollection(), "settings_configure_notifications" ); m_pMainWnd->actionCollection(), "settings_configure_notifications" );
action->setToolTip(beautifyToolTip(action->text())); action->setToolTip(beautifyToolTip(action->text()));
action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(action->text())).tqarg(i18n("Lets you configure system notifications."))); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure system notifications.")));
action = KStdAction::preferences(this, TQT_SLOT(slotSettings()), action = KStdAction::preferences(this, TQT_SLOT(slotSettings()),
m_pMainWnd->actionCollection(), "settings_configure" ); m_pMainWnd->actionCollection(), "settings_configure" );
action->setToolTip( i18n( "Configure KDevelop" ) ); action->setToolTip( i18n( "Configure KDevelop" ) );
action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(i18n( "Configure KDevelop" )).tqarg(i18n("Lets you customize KDevelop."))); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(i18n( "Configure KDevelop" )).arg(i18n("Lets you customize KDevelop.")));
m_toggleStatusbar = KStdAction::showToolbar(this, TQT_SLOT(slotToggleStatusbar()),m_pMainWnd->actionCollection(), "settings_statusbar"); m_toggleStatusbar = KStdAction::showToolbar(this, TQT_SLOT(slotToggleStatusbar()),m_pMainWnd->actionCollection(), "settings_statusbar");
m_toggleStatusbar->setText(i18n("Show &Statusbar")); m_toggleStatusbar->setText(i18n("Show &Statusbar"));

@ -62,9 +62,9 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
KConfig *config = kapp->config(); KConfig *config = kapp->config();
config->setGroup("UI"); config->setGroup("UI");
TQString accel = config->readEntry(TQString("button_%1").tqarg(text), ""); TQString accel = config->readEntry(TQString("button_%1").arg(text), "");
if (!accel.isEmpty()) if (!accel.isEmpty())
setRealText(TQString("&%1 %2").tqarg(accel).tqarg(m_realText)); setRealText(TQString("&%1 %2").arg(accel).arg(m_realText));
} }
Button::~Button() Button::~Button()
@ -80,11 +80,11 @@ Button::~Button()
TQString text = m_realText; TQString text = m_realText;
if (text.contains(r2)) if (text.contains(r2))
text.remove(r2); text.remove(r2);
config->writeEntry(TQString("button_%1").tqarg(text), r.cap(1)); config->writeEntry(TQString("button_%1").arg(text), r.cap(1));
} }
else else
{ {
config->writeEntry(TQString("button_%1").tqarg(m_realText), ""); config->writeEntry(TQString("button_%1").arg(m_realText), "");
} }
} }
@ -319,7 +319,7 @@ void Button::assignAccel()
if (ok) if (ok)
{ {
TQString text = realTextWithoutAccel(); TQString text = realTextWithoutAccel();
text = TQString("&%1 %2").tqarg(num).tqarg(text); text = TQString("&%1 %2").arg(num).arg(text);
setRealText(text); setRealText(text);
} }
} }

@ -104,7 +104,7 @@ void DDockWindow::setVisible(bool v)
{ {
//write dock width to the config file //write dock width to the config file
KConfig *config = kapp->config(); KConfig *config = kapp->config();
TQString group = TQString("%1").tqarg(m_name); TQString group = TQString("%1").arg(m_name);
config->setGroup(group); config->setGroup(group);
if (m_visible) if (m_visible)
@ -115,7 +115,7 @@ void DDockWindow::setVisible(bool v)
v ? m_widgetStack->show() : m_widgetStack->hide(); v ? m_widgetStack->show() : m_widgetStack->hide();
m_visible = v; m_visible = v;
m_internalLayout->tqinvalidate(); m_internalLayout->invalidate();
if (!m_visible) if (!m_visible)
{ {
if (m_position == DDockWindow::Bottom) if (m_position == DDockWindow::Bottom)
@ -148,7 +148,7 @@ void DDockWindow::loadSettings()
void DDockWindow::saveSettings() void DDockWindow::saveSettings()
{ {
KConfig *config = kapp->config(); KConfig *config = kapp->config();
TQString group = TQString("%1").tqarg(m_name); TQString group = TQString("%1").arg(m_name);
int invisibleWidth = 0; int invisibleWidth = 0;
config->setGroup(group); config->setGroup(group);
if (config->hasKey("ViewWidth")) if (config->hasKey("ViewWidth"))
@ -200,7 +200,7 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc
//if the widget was selected last time the dock is deleted //if the widget was selected last time the dock is deleted
//we need to show it //we need to show it
KConfig *config = kapp->config(); KConfig *config = kapp->config();
TQString group = TQString("%1").tqarg(m_name); TQString group = TQString("%1").arg(m_name);
config->setGroup(group); config->setGroup(group);
if (config->readEntry("ViewLastWidget") == title) if (config->readEntry("ViewLastWidget") == title)
{ {

@ -185,7 +185,7 @@ DTabWidget *DMainWindow::splitVertical()
void DMainWindow::invalidateActiveTabWidget() void DMainWindow::invalidateActiveTabWidget()
{ {
/* TQWidget *focused = m_central->focusWidget(); /* TQWidget *focused = m_central->focusWidget();
kdDebug(9000) << "tqinvalidate: " << focused << endl; kdDebug(9000) << "invalidate: " << focused << endl;
if (focused == 0) if (focused == 0)
return; return;
if (!m_widgets.contains(focused)) if (!m_widgets.contains(focused))

@ -85,7 +85,7 @@ void DTabWidget::insertTab(TQWidget *child, const TQString &label, int index)
if (m_closeButton && m_closeButtonShown) if (m_closeButton && m_closeButtonShown)
m_closeButton->show(); m_closeButton->show();
KTabWidget::insertTab(child, label, index); KTabWidget::insertTab(child, label, index);
if (index != -1) tabBar()->tqrepaint(); if (index != -1) tabBar()->repaint();
} }
void DTabWidget::insertTab(TQWidget *child, const TQIconSet &iconset, void DTabWidget::insertTab(TQWidget *child, const TQIconSet &iconset,
@ -94,7 +94,7 @@ void DTabWidget::insertTab(TQWidget *child, const TQIconSet &iconset,
if (m_closeButton && m_closeButtonShown) if (m_closeButton && m_closeButtonShown)
m_closeButton->show(); m_closeButton->show();
KTabWidget::insertTab(child, iconset, label, index); KTabWidget::insertTab(child, iconset, label, index);
if (index != -1) tabBar()->tqrepaint(); if (index != -1) tabBar()->repaint();
} }
/*void DTabWidget::updateHistory(TQWidget *w) /*void DTabWidget::updateHistory(TQWidget *w)

@ -131,7 +131,7 @@ void PartController::setupActions()
newAction->setWhatsThis( i18n("<b>Open file</b><p>Opens an existing file without adding it to the project.</p>") ); newAction->setWhatsThis( i18n("<b>Open file</b><p>Opens an existing file without adding it to the project.</p>") );
m_openRecentAction = KStdAction::openRecent( this, TQT_SLOT(slotOpenRecent(const KURL&) ), ac, "file_open_recent" ); m_openRecentAction = KStdAction::openRecent( this, TQT_SLOT(slotOpenRecent(const KURL&) ), ac, "file_open_recent" );
m_openRecentAction->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(m_openRecentAction->text())).tqarg(i18n("Opens recently opened file."))); m_openRecentAction->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(m_openRecentAction->text())).arg(i18n("Opens recently opened file.")));
m_openRecentAction->loadEntries( kapp->config(), "RecentFiles" ); m_openRecentAction->loadEntries( kapp->config(), "RecentFiles" );
m_saveAllFilesAction = new KAction(i18n("Save Al&l"), 0, this, TQT_SLOT(slotSaveAllFiles()), ac, "file_save_all"); m_saveAllFilesAction = new KAction(i18n("Save Al&l"), 0, this, TQT_SLOT(slotSaveAllFiles()), ac, "file_save_all");
@ -146,7 +146,7 @@ void PartController::setupActions()
m_closeWindowAction = KStdAction::close(this, TQT_SLOT(slotCloseWindow()), ac, "file_close"); m_closeWindowAction = KStdAction::close(this, TQT_SLOT(slotCloseWindow()), ac, "file_close");
m_closeWindowAction->setToolTip( i18n("Close current file") ); m_closeWindowAction->setToolTip( i18n("Close current file") );
m_closeWindowAction->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(m_closeWindowAction->text())).tqarg(i18n("Closes current file."))); m_closeWindowAction->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(m_closeWindowAction->text())).arg(i18n("Closes current file.")));
m_closeWindowAction->setEnabled(false); m_closeWindowAction->setEnabled(false);
m_closeAllWindowsAction = new KAction(i18n("Close All"), 0, this, TQT_SLOT(slotCloseAllWindows()), ac, "file_close_all"); m_closeAllWindowsAction = new KAction(i18n("Close All"), 0, this, TQT_SLOT(slotCloseAllWindows()), ac, "file_close_all");
@ -534,8 +534,8 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
else else
{ {
MimeWarningDialog dlg; MimeWarningDialog dlg;
dlg.text2->setText( TQString( "<qt><b>%1</b></qt>" ).tqarg(url.path())); dlg.text2->setText( TQString( "<qt><b>%1</b></qt>" ).arg(url.path()));
dlg.text3->setText( dlg.text3->text().tqarg(MimeType->name()) ); dlg.text3->setText( dlg.text3->text().arg(MimeType->name()) );
if ( dlg.exec() == TQDialog::Accepted ) if ( dlg.exec() == TQDialog::Accepted )
{ {
@ -593,7 +593,7 @@ void PartController::showDocument(const KURL &url, bool newWin)
KParts::Factory *PartController::findPartFactory(const TQString &mimeType, const TQString &partType, const TQString &preferredName) KParts::Factory *PartController::findPartFactory(const TQString &mimeType, const TQString &partType, const TQString &preferredName)
{ {
KTrader::OfferList offers = KTrader::self()->query(mimeType, TQString("'%1' in ServiceTypes").tqarg(partType)); KTrader::OfferList offers = KTrader::self()->query(mimeType, TQString("'%1' in ServiceTypes").arg(partType));
if (offers.count() > 0) if (offers.count() > 0)
{ {
@ -1005,7 +1005,7 @@ void PartController::reloadFile( const KURL & url )
if ( part->isModified() ) if ( part->isModified() )
{ {
if ( KMessageBox::warningYesNo( TopLevel::getInstance()->main(), if ( KMessageBox::warningYesNo( TopLevel::getInstance()->main(),
i18n( "The file \"%1\" is modified in memory. Are you sure you want to reload it? (Local changes will be lost.)" ).tqarg( url.path() ), i18n( "The file \"%1\" is modified in memory. Are you sure you want to reload it? (Local changes will be lost.)" ).arg( url.path() ),
i18n( "File is Modified" ), i18n("Reload"), i18n("Do Not Reload") ) == KMessageBox::Yes ) i18n( "File is Modified" ), i18n("Reload"), i18n("Do Not Reload") ) == KMessageBox::Yes )
{ {
part->setModified( false ); part->setModified( false );
@ -1120,7 +1120,7 @@ bool PartController::saveFile( const KURL & url, bool force )
case DirtyAndModified: case DirtyAndModified:
{ {
int code = KMessageBox::warningYesNoCancel( TopLevel::getInstance()->main(), int code = KMessageBox::warningYesNoCancel( TopLevel::getInstance()->main(),
i18n("The file \"%1\" is modified on disk.\n\nAre you sure you want to overwrite it? (External changes will be lost.)").tqarg( url.path() ), i18n("The file \"%1\" is modified on disk.\n\nAre you sure you want to overwrite it? (External changes will be lost.)").arg( url.path() ),
i18n("File Externally Modified"), i18n("Overwrite"), i18n("Do Not Overwrite") ); i18n("File Externally Modified"), i18n("Overwrite"), i18n("Do Not Overwrite") );
if ( code == KMessageBox::Yes ) if ( code == KMessageBox::Yes )
{ {
@ -1481,7 +1481,7 @@ bool PartController::reactToDirty( KURL const & url, unsigned char reason )
{ {
KMessageBox::sorry( TopLevel::getInstance()->main(), KMessageBox::sorry( TopLevel::getInstance()->main(),
i18n("Conflict: The file \"%1\" has changed on disk while being modified in memory.\n\n" i18n("Conflict: The file \"%1\" has changed on disk while being modified in memory.\n\n"
"You should investigate before saving to make sure you are not losing data.").tqarg( url.path() ), "You should investigate before saving to make sure you are not losing data.").arg( url.path() ),
i18n("Conflict") ); i18n("Conflict") );
return false; return false;
} }
@ -1490,7 +1490,7 @@ bool PartController::reactToDirty( KURL const & url, unsigned char reason )
{ {
KMessageBox::sorry( TopLevel::getInstance()->main(), KMessageBox::sorry( TopLevel::getInstance()->main(),
i18n("Warning: The file \"%1\" has been deleted on disk.\n\n" i18n("Warning: The file \"%1\" has been deleted on disk.\n\n"
"If this was not your intention, make sure to save this file now.").tqarg( url.path() ), "If this was not your intention, make sure to save this file now.").arg( url.path() ),
i18n("File Deleted") ); i18n("File Deleted") );
return false; return false;
} }
@ -1498,7 +1498,7 @@ bool PartController::reactToDirty( KURL const & url, unsigned char reason )
if ( dirtyAction == "alert" ) if ( dirtyAction == "alert" )
{ {
if ( KMessageBox::warningYesNo( TopLevel::getInstance()->main(), if ( KMessageBox::warningYesNo( TopLevel::getInstance()->main(),
i18n("The file \"%1\" has changed on disk.\n\nDo you want to reload it?").tqarg( url.path() ), i18n("The file \"%1\" has changed on disk.\n\nDo you want to reload it?").arg( url.path() ),
i18n("File Changed"), i18n("Reload"), i18n("Do Not Reload") ) == KMessageBox::No ) i18n("File Changed"), i18n("Reload"), i18n("Do Not Reload") ) == KMessageBox::No )
{ {
return false; return false;
@ -1628,7 +1628,7 @@ void PartController::slotBackAboutToShow()
TQValueList<HistoryEntry>::ConstIterator it = m_backHistory.begin(); TQValueList<HistoryEntry>::ConstIterator it = m_backHistory.begin();
while( i < 10 && it != m_backHistory.end() ) while( i < 10 && it != m_backHistory.end() )
{ {
popup->insertItem( (*it).url.fileName() + TQString(" (%1)").tqarg( (*it).line +1), (*it).id ); popup->insertItem( (*it).url.fileName() + TQString(" (%1)").arg( (*it).line +1), (*it).id );
++i; ++i;
++it; ++it;
} }
@ -1645,7 +1645,7 @@ void PartController::slotForwardAboutToShow( )
TQValueList<HistoryEntry>::ConstIterator it = m_forwardHistory.begin(); TQValueList<HistoryEntry>::ConstIterator it = m_forwardHistory.begin();
while( i < 10 && it != m_forwardHistory.end() ) while( i < 10 && it != m_forwardHistory.end() )
{ {
popup->insertItem( (*it).url.fileName() + TQString(" (%1)").tqarg( (*it).line +1), (*it).id ); popup->insertItem( (*it).url.fileName() + TQString(" (%1)").arg( (*it).line +1), (*it).id );
++i; ++i;
++it; ++it;
} }

@ -49,7 +49,7 @@ namespace
template <class ComponentType> template <class ComponentType>
ComponentType *loadDefaultPart( const TQString &serviceType ) ComponentType *loadDefaultPart( const TQString &serviceType )
{ {
KTrader::OfferList offers = KTrader::self()->query(serviceType, TQString("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION)); KTrader::OfferList offers = KTrader::self()->query(serviceType, TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION));
KTrader::OfferList::ConstIterator serviceIt = offers.begin(); KTrader::OfferList::ConstIterator serviceIt = offers.begin();
for ( ; serviceIt != offers.end(); ++serviceIt ) { for ( ; serviceIt != offers.end(); ++serviceIt ) {
KService::Ptr service = *serviceIt; KService::Ptr service = *serviceIt;
@ -147,7 +147,7 @@ void PluginController::loadPlugins( KTrader::OfferList offers, const TQStringLis
if( m_parts[ name ] != 0 || ignorePlugins.contains( name ) ) if( m_parts[ name ] != 0 || ignorePlugins.contains( name ) )
continue; continue;
emit loadingPlugin(i18n("Loading: %1").tqarg((*it)->genericName())); emit loadingPlugin(i18n("Loading: %1").arg((*it)->genericName()));
KDevPlugin *plugin = loadPlugin( *it ); KDevPlugin *plugin = loadPlugin( *it );
if ( plugin ) if ( plugin )
@ -218,7 +218,7 @@ KDevPlugin *PluginController::loadPlugin( const KService::Ptr &service )
0, 0,
i18n("<b>Could not load plugin</b><br>" i18n("<b>Could not load plugin</b><br>"
"Plugin %1 could not be loaded<br>" "Plugin %1 could not be loaded<br>"
"Library loader error: %2").tqarg(service->name()). "Library loader error: %2").arg(service->name()).
arg(KLibLoader::self()->lastErrorMessage()), arg(KLibLoader::self()->lastErrorMessage()),
i18n("Could not load plugin")); i18n("Could not load plugin"));
} }

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

@ -69,12 +69,12 @@ public:
bool isDerived() const { return m_derived; } bool isDerived() const { return m_derived; }
virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
{ {
TQColorGroup cgNew = cg; TQColorGroup cgNew = cg;
if (m_derived) if (m_derived)
cgNew.setColor(TQColorGroup::Text, KGlobalSettings::inactiveTextColor()); cgNew.setColor(TQColorGroup::Text, KGlobalSettings::inactiveTextColor());
KListViewItem::paintCell(p, cgNew, column, width, tqalignment); KListViewItem::paintCell(p, cgNew, column, width, alignment);
} }
private: private:

@ -59,18 +59,18 @@ Profile::Profile(Profile *parent, const TQString &name, const TQString &genericN
Profile::~Profile() Profile::~Profile()
{ {
for (TQValueList<Profile*>::iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) for (TQValueList<Profile*>::iterator it = m_children.begin(); it != m_children.end(); ++it)
delete *it; delete *it;
} }
void Profile::addChildProfile(Profile *profile) void Profile::addChildProfile(Profile *profile)
{ {
m_tqchildren.append(profile); m_children.append(profile);
} }
void Profile::removeChildProfile(Profile *profile) void Profile::removeChildProfile(Profile *profile)
{ {
m_tqchildren.remove(profile); m_children.remove(profile);
} }
TQString Profile::dirName() const TQString Profile::dirName() const

@ -49,7 +49,7 @@ public:
Profile(Profile *parent, const TQString &name, const TQString &genericName, const TQString &description); Profile(Profile *parent, const TQString &name, const TQString &genericName, const TQString &description);
~Profile(); ~Profile();
TQValueList<Profile*> tqchildren() const { return m_tqchildren; } TQValueList<Profile*> children() const { return m_children; }
Profile *parent() const { return m_parent; } Profile *parent() const { return m_parent; }
void save(); void save();
@ -81,7 +81,7 @@ protected:
private: private:
Profile *m_parent; Profile *m_parent;
TQValueList<Profile*> m_tqchildren; TQValueList<Profile*> m_children;
TQString m_name; TQString m_name;

@ -78,7 +78,7 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
if (!profile) if (!profile)
return KTrader::OfferList(); return KTrader::OfferList();
TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION); TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
switch (offerType) { switch (offerType) {
case Global: case Global:
constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'"); constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'");
@ -95,7 +95,7 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
int i = 0; int i = 0;
for (Profile::EntryList::const_iterator it = properties.begin(); it != properties.end(); ++it) for (Profile::EntryList::const_iterator it = properties.begin(); it != properties.end(); ++it)
constraint_add += TQString::fromLatin1(" %1 '%2' in [X-KDevelop-Properties]"). constraint_add += TQString::fromLatin1(" %1 '%2' in [X-KDevelop-Properties]").
tqarg((i++)==0?"":"or").tqarg((*it).name); arg((i++)==0?"":"or").arg((*it).name);
if (!constraint_add.isEmpty()) if (!constraint_add.isEmpty())
constraint += " and ( " + constraint_add + " ) "; constraint += " and ( " + constraint_add + " ) ";
@ -129,8 +129,8 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
{ {
if (names.contains((*it).name)) if (names.contains((*it).name))
continue; continue;
TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION); TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
constraint += TQString::fromLatin1("and [Name] == '%1'").tqarg((*it).name); constraint += TQString::fromLatin1("and [Name] == '%1'").arg((*it).name);
KTrader::OfferList enable = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint); KTrader::OfferList enable = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint);
list += enable; list += enable;
} }
@ -149,7 +149,7 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
KTrader::OfferList ProfileEngine::allOffers(OfferType offerType) KTrader::OfferList ProfileEngine::allOffers(OfferType offerType)
{ {
TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION); TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
switch (offerType) { switch (offerType) {
case Global: case Global:
constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'"); constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'");

@ -177,8 +177,8 @@ public:
template<class Operation> template<class Operation>
void walkProfiles(Operation &op, Profile *root) void walkProfiles(Operation &op, Profile *root)
{ {
TQValueList<Profile*> tqchildren = root->tqchildren(); TQValueList<Profile*> children = root->children();
for (TQValueList<Profile*>::iterator it = tqchildren.begin(); it != tqchildren.end(); ++it) for (TQValueList<Profile*>::iterator it = children.begin(); it != children.end(); ++it)
{ {
op(*it); op(*it);
walkProfiles<Operation>(op, *it); walkProfiles<Operation>(op, *it);
@ -244,8 +244,8 @@ public:
template<class Operation, class Result> template<class Operation, class Result>
void walkProfiles(Operation &op, Result *result, Profile *root) void walkProfiles(Operation &op, Result *result, Profile *root)
{ {
TQValueList<Profile*> tqchildren = root->tqchildren(); TQValueList<Profile*> children = root->children();
for (TQValueList<Profile*>::iterator it = tqchildren.begin(); it != tqchildren.end(); ++it) for (TQValueList<Profile*>::iterator it = children.begin(); it != children.end(); ++it)
{ {
Result *newResult = op(result, *it); Result *newResult = op(result, *it);
walkProfiles<Operation>(op, newResult, *it); walkProfiles<Operation>(op, newResult, *it);

@ -355,7 +355,7 @@ bool ProjectManager::loadProjectFile()
TQString path; TQString path;
if (!KIO::NetAccess::download(m_info->m_projectURL, path, 0)) { if (!KIO::NetAccess::download(m_info->m_projectURL, path, 0)) {
KMessageBox::sorry(TopLevel::getInstance()->main(), KMessageBox::sorry(TopLevel::getInstance()->main(),
i18n("Could not read project file: %1").tqarg(m_info->m_projectURL.prettyURL())); i18n("Could not read project file: %1").arg(m_info->m_projectURL.prettyURL()));
return false; return false;
} }
@ -363,7 +363,7 @@ bool ProjectManager::loadProjectFile()
if (!fin.open(IO_ReadOnly)) if (!fin.open(IO_ReadOnly))
{ {
KMessageBox::sorry(TopLevel::getInstance()->main(), KMessageBox::sorry(TopLevel::getInstance()->main(),
i18n("Could not read project file: %1").tqarg(m_info->m_projectURL.prettyURL())); i18n("Could not read project file: %1").arg(m_info->m_projectURL.prettyURL()));
return false; return false;
} }
@ -374,7 +374,7 @@ bool ProjectManager::loadProjectFile()
KMessageBox::sorry(TopLevel::getInstance()->main(), KMessageBox::sorry(TopLevel::getInstance()->main(),
i18n("This is not a valid project file.\n" i18n("This is not a valid project file.\n"
"XML error in line %1, column %2:\n%3") "XML error in line %1, column %2:\n%3")
.tqarg(errorLine).tqarg(errorCol).tqarg(errorMsg)); .arg(errorLine).arg(errorCol).arg(errorMsg));
fin.close(); fin.close();
KIO::NetAccess::removeTempFile(path); KIO::NetAccess::removeTempFile(path);
return false; return false;
@ -486,7 +486,7 @@ bool ProjectManager::loadProjectPart()
if (!projectService) { if (!projectService) {
KMessageBox::sorry(TopLevel::getInstance()->main(), KMessageBox::sorry(TopLevel::getInstance()->main(),
i18n("No project management plugin %1 found.") i18n("No project management plugin %1 found.")
.tqarg(m_info->m_projectPlugin)); .arg(m_info->m_projectPlugin));
return false; return false;
} }
@ -496,7 +496,7 @@ bool ProjectManager::loadProjectPart()
if ( !projectPart ) { if ( !projectPart ) {
KMessageBox::sorry(TopLevel::getInstance()->main(), KMessageBox::sorry(TopLevel::getInstance()->main(),
i18n("Could not create project management plugin %1.") i18n("Could not create project management plugin %1.")
.tqarg(m_info->m_projectPlugin)); .arg(m_info->m_projectPlugin));
return false; return false;
} }
@ -537,12 +537,12 @@ bool ProjectManager::loadLanguageSupport(const TQString& lang)
KTrader::OfferList languageSupportOffers = KTrader::OfferList languageSupportOffers =
KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"), KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"),
TQString::fromLatin1("[X-KDevelop-Language] == '%1' and [X-KDevelop-Version] == %2").tqarg(lang).tqarg(KDEVELOP_PLUGIN_VERSION)); TQString::fromLatin1("[X-KDevelop-Language] == '%1' and [X-KDevelop-Version] == %2").arg(lang).arg(KDEVELOP_PLUGIN_VERSION));
if (languageSupportOffers.isEmpty()) { if (languageSupportOffers.isEmpty()) {
KMessageBox::sorry(TopLevel::getInstance()->main(), KMessageBox::sorry(TopLevel::getInstance()->main(),
i18n("No language plugin for %1 found.") i18n("No language plugin for %1 found.")
.tqarg(lang)); .arg(lang));
return false; return false;
} }
@ -556,7 +556,7 @@ bool ProjectManager::loadLanguageSupport(const TQString& lang)
if ( !langSupport ) { if ( !langSupport ) {
KMessageBox::sorry(TopLevel::getInstance()->main(), KMessageBox::sorry(TopLevel::getInstance()->main(),
i18n("Could not create language plugin for %1.") i18n("Could not create language plugin for %1.")
.tqarg(lang)); .arg(lang));
return false; return false;
} }

@ -79,7 +79,7 @@ bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQ
if (!ok) { if (!ok) {
KMessageBox::sorry(0L, KMessageBox::sorry(0L,
i18n("The file %1 does not contain valid XML.\n" i18n("The file %1 does not contain valid XML.\n"
"The loading of the session failed.").tqarg(sessionFileName)); "The loading of the session failed.").arg(sessionFileName));
initXMLTree(); // because it was now broken after failed setContent() initXMLTree(); // because it was now broken after failed setContent()
return false; return false;
} }
@ -91,8 +91,8 @@ bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQ
// Check for proper document type. // Check for proper document type.
if (domdoc.doctype().name() != "KDevPrjSession") { if (domdoc.doctype().name() != "KDevPrjSession") {
KMessageBox::sorry(0L, KMessageBox::sorry(0L,
i18n("The file %1 does not contain a valid KDevelop project session ('KDevPrjSession').\n").tqarg(sessionFileName) i18n("The file %1 does not contain a valid KDevelop project session ('KDevPrjSession').\n").arg(sessionFileName)
+ i18n("The document type seems to be: '%1'.").tqarg(domdoc.doctype().name())); + i18n("The document type seems to be: '%1'.").arg(domdoc.doctype().name()));
return false; return false;
} }

@ -43,7 +43,7 @@
<property name="text"> <property name="text">
<string>&lt;qt&gt;&lt;h3&gt;Project Settings&lt;/h3&gt;&lt;/qt&gt;</string> <string>&lt;qt&gt;&lt;h3&gt;Project Settings&lt;/h3&gt;&lt;/qt&gt;</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -129,7 +129,7 @@
<property name="textFormat"> <property name="textFormat">
<enum>AutoText</enum> <enum>AutoText</enum>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignBottom|AlignLeft</set> <set>WordBreak|AlignBottom|AlignLeft</set>
</property> </property>
</widget> </widget>
@ -319,7 +319,7 @@
<property name="text"> <property name="text">
<string>&lt;qt&gt;&lt;h3&gt;Terminal Emulation&lt;/h3&gt;&lt;/qt&gt;</string> <string>&lt;qt&gt;&lt;h3&gt;Terminal Emulation&lt;/h3&gt;&lt;/qt&gt;</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignTop</set> <set>AlignTop</set>
</property> </property>
</widget> </widget>
@ -364,7 +364,7 @@
<property name="text"> <property name="text">
<string>&lt;qt&gt;&lt;h3&gt;UI Designer Integration&lt;/h3&gt;This will only be used when no project is opened. For the project specific setting see Project Options/C++ Specific and open the Qt tab.&lt;/qt&gt;</string> <string>&lt;qt&gt;&lt;h3&gt;UI Designer Integration&lt;/h3&gt;This will only be used when no project is opened. For the project specific setting see Project Options/C++ Specific and open the Qt tab.&lt;/qt&gt;</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
</widget> </widget>
@ -479,7 +479,7 @@
<property name="title"> <property name="title">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignAuto</set> <set>AlignAuto</set>
</property> </property>
<vbox> <vbox>

@ -765,7 +765,7 @@ void SimpleMainWindow::fillWindowMenu()
while (itt != list.end()) while (itt != list.end())
{ {
temp = m_windowMenu->insertItem( i < 10 ? TQString("&%1 %2").tqarg(i).tqarg((*itt).fileName()) : (*itt).fileName() ); temp = m_windowMenu->insertItem( i < 10 ? TQString("&%1 %2").arg(i).arg((*itt).fileName()) : (*itt).fileName() );
m_windowList << tqMakePair(temp, *itt); m_windowList << tqMakePair(temp, *itt);
++i; ++i;
++itt; ++itt;

@ -29,7 +29,7 @@ KDevSplashScreen::~KDevSplashScreen()
void KDevSplashScreen::animate() void KDevSplashScreen::animate()
{ {
state = ((state + 1) % (2*progress_bar_size-1)); state = ((state + 1) % (2*progress_bar_size-1));
tqrepaint(); repaint();
} }
@ -74,7 +74,7 @@ void KDevSplashScreen::drawContents (TQPainter* painter)
// Draw version number // Draw version number
TQRect r = rect(); TQRect r = rect();
r.setRect(r.x() + 5, r.y() + 5, r.width() - 10, r.height() - 10); r.setRect(r.x() + 5, r.y() + 5, r.width() - 10, r.height() - 10);
painter->drawText(r, TQt::AlignRight, i18n("Version %1").tqarg( VERSION )); painter->drawText(r, TQt::AlignRight, i18n("Version %1").arg( VERSION ));
// Draw message at given position, limited to 43 chars // Draw message at given position, limited to 43 chars
// If message is too long, string is truncated // If message is too long, string is truncated

@ -98,7 +98,7 @@ void KDevStatusBar::setStatus(const TQString &str)
void KDevStatusBar::setCursorPosition(int line, int col) void KDevStatusBar::setCursorPosition(int line, int col)
{ {
_status->setText(i18n(" Line: %1 Col: %2 ").tqarg(line+1).tqarg(col)); _status->setText(i18n(" Line: %1 Col: %2 ").arg(line+1).arg(col));
} }
void KDevStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent) void KDevStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent)

@ -86,7 +86,7 @@ void ClearcasePart::contextMenu(TQPopupMenu *popup, const Context *context)
KPopupMenu *sub = new KPopupMenu(popup); KPopupMenu *sub = new KPopupMenu(popup);
TQString name = fi.fileName(); TQString name = fi.fileName();
sub->insertTitle( i18n("Actions for %1").tqarg(name) ); sub->insertTitle( i18n("Actions for %1").arg(name) );
sub->insertItem( i18n("Checkin"), sub->insertItem( i18n("Checkin"),
this, TQT_SLOT(slotCheckin()) ); this, TQT_SLOT(slotCheckin()) );
sub->insertItem( i18n("Checkout"), sub->insertItem( i18n("Checkout"),

@ -106,7 +106,7 @@ void AnnotatePage::slotJobExited( bool normalExit, int exitStatus )
if (!normalExit) if (!normalExit)
{ {
KMessageBox::sorry( this, i18n("Annotate failed with exitStatus == %1").tqarg( exitStatus), i18n("Annotate Failed") ); KMessageBox::sorry( this, i18n("Annotate failed with exitStatus == %1").arg( exitStatus), i18n("Annotate Failed") );
return; return;
} }

@ -79,7 +79,7 @@ void CVSLogDialog::slotDiffRequested( const TQString &pathName, const TQString &
kdDebug(9006) << "CVSLogDialog::slotDiffRequested()" << endl; kdDebug(9006) << "CVSLogDialog::slotDiffRequested()" << endl;
// Create a new CVSDiffPage and start diffing process // Create a new CVSDiffPage and start diffing process
TQString diffTitle = i18n("Diff between %1 and %2").tqarg( revA ).tqarg( revB ); TQString diffTitle = i18n("Diff between %1 and %2").arg( revA ).arg( revB );
TQVBox *vbox = addVBoxPage( diffTitle ); TQVBox *vbox = addVBoxPage( diffTitle );
CVSDiffPage *diffPage = new CVSDiffPage( m_cvsService, vbox ); CVSDiffPage *diffPage = new CVSDiffPage( m_cvsService, vbox );
diffPage->startDiff( pathName, revA, revB ); diffPage->startDiff( pathName, revA, revB );

@ -113,7 +113,7 @@ void CVSLogPage::slotJobExited( bool normalExit, int exitStatus )
// m_part->core()->running( m_part, false ); // m_part->core()->running( m_part, false );
if (!normalExit) if (!normalExit)
{ {
KMessageBox::sorry( this, i18n("Log failed with exitStatus == %1").tqarg( exitStatus), i18n("Log Failed") ); KMessageBox::sorry( this, i18n("Log failed with exitStatus == %1").arg( exitStatus), i18n("Log Failed") );
return; return;
} }

@ -142,7 +142,7 @@ bool CvsProcessWidget::startJob( const DCOPRef &aJob )
// disconnect 3rd party slots from our signals // disconnect 3rd party slots from our signals
disconnect( TQT_SIGNAL(jobFinished(bool, int)) ); disconnect( TQT_SIGNAL(jobFinished(bool, int)) );
showInfo( i18n("Started job: %1").tqarg( cmdLine ) ); showInfo( i18n("Started job: %1").arg( cmdLine ) );
#ifdef MYDCOPDEBUG #ifdef MYDCOPDEBUG
g_dcopExitCounter = 0; g_dcopExitCounter = 0;
@ -187,7 +187,7 @@ void CvsProcessWidget::slotJobExited( bool normalExit, int exitStatus )
m_job = 0; m_job = 0;
} }
TQString exitMsg = i18n("Job finished with exitCode == %1"); TQString exitMsg = i18n("Job finished with exitCode == %1");
showInfo( exitMsg.tqarg( exitStatus) ); showInfo( exitMsg.arg( exitStatus) );
m_part->core()->running( m_part, false ); m_part->core()->running( m_part, false );
m_part->mainWindow()->statusBar()->message( i18n("Done CVS command ..."), 2000 ); m_part->mainWindow()->statusBar()->message( i18n("Done CVS command ..."), 2000 );

@ -83,7 +83,7 @@ void DiffDialog::languageChange() {
//FIXME: We need a function in CVSEntry to return the latest revision there is in cvs //FIXME: We need a function in CVSEntry to return the latest revision there is in cvs
// if(!m_entry.revision().isNull()) // if(!m_entry.revision().isNull())
// diffLocalHeadRadio->setText( tr2i18n( "Local copy and &HEAD (%1)" ).tqarg( m_entry.revision()) ); // diffLocalHeadRadio->setText( tr2i18n( "Local copy and &HEAD (%1)" ).arg( m_entry.revision()) );
} }
#include "diffdialog.moc" #include "diffdialog.moc"

@ -70,7 +70,7 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p )
int i = 0; int i = 0;
for ( TQStringList::Iterator it = extPartsTranslated.begin(); it != extPartsTranslated.end(); ++it ) { for ( TQStringList::Iterator it = extPartsTranslated.begin(); it != extPartsTranslated.end(); ++it ) {
popup->insertItem( i18n( "Show in %1" ).tqarg( *it ), i + POPUP_BASE, i ); popup->insertItem( i18n( "Show in %1" ).arg( *it ), i + POPUP_BASE, i );
i++; i++;
} }
if ( !extPartsTranslated.isEmpty() ) if ( !extPartsTranslated.isEmpty() )

@ -61,7 +61,7 @@ void EditorsDialog::slotJobExited( bool normalExit, int exitStatus )
{ {
if (!normalExit) if (!normalExit)
{ {
KMessageBox::sorry( this, i18n("Log failed with exitStatus == %1").tqarg( exitStatus), i18n("Log Failed") ); KMessageBox::sorry( this, i18n("Log failed with exitStatus == %1").arg( exitStatus), i18n("Log Failed") );
return; return;
} }

@ -81,11 +81,11 @@ void IntegratorDlg::init_clicked()
if (!proc->normalExit()) if (!proc->normalExit())
KMessageBox::error(this, i18n("cvs init did not exit normally. Please check if cvs is installed and works correctly."), i18n("Init CVS Repository")); KMessageBox::error(this, i18n("cvs init did not exit normally. Please check if cvs is installed and works correctly."), i18n("Init CVS Repository"));
else if (proc->exitStatus() != 0) else if (proc->exitStatus() != 0)
KMessageBox::error(this, i18n("cvs init exited with status %1. Please check if the cvs location is correct.").tqarg(proc->exitStatus()), i18n("Init CVS Repository")); KMessageBox::error(this, i18n("cvs init exited with status %1. Please check if the cvs location is correct.").arg(proc->exitStatus()), i18n("Init CVS Repository"));
else else
{ {
repository->insertItem(TQString(":local:%1").tqarg(url)); repository->insertItem(TQString(":local:%1").arg(url));
repository->setCurrentText(TQString(":local:%1").tqarg(url)); repository->setCurrentText(TQString(":local:%1").arg(url));
} }
} }
} }
@ -122,13 +122,13 @@ void IntegratorDlg::accept()
proc->setWorkingDirectory(m_projectLocation); proc->setWorkingDirectory(m_projectLocation);
*proc << "cvs"; *proc << "cvs";
*proc << "-d" << repository->currentText() << "import" *proc << "-d" << repository->currentText() << "import"
<< "-m" << TQString("\"%1\"").tqarg(comment->text()) << module->text() << "-m" << TQString("\"%1\"").arg(comment->text()) << module->text()
<< vendorTag->text() << releaseTag->text(); << vendorTag->text() << releaseTag->text();
proc->start(KProcess::Block); proc->start(KProcess::Block);
if (!proc->normalExit()) if (!proc->normalExit())
KMessageBox::error(this, i18n("cvs import did not exit normally. Please check if cvs is installed and works correctly."), i18n("Init CVS Repository")); KMessageBox::error(this, i18n("cvs import did not exit normally. Please check if cvs is installed and works correctly."), i18n("Init CVS Repository"));
else if (proc->exitStatus() != 0) else if (proc->exitStatus() != 0)
KMessageBox::error(this, i18n("cvs import exited with status %1. Please check if the cvs location is correct.").tqarg(proc->exitStatus()), i18n("Init CVS Repository")); KMessageBox::error(this, i18n("cvs import exited with status %1. Please check if the cvs location is correct.").arg(proc->exitStatus()), i18n("Init CVS Repository"));
else else
{ {
kdDebug() << "Project is in: " << m_projectLocation << endl; kdDebug() << "Project is in: " << m_projectLocation << endl;

@ -37,7 +37,7 @@
<property name="title"> <property name="title">
<string>Revision</string> <string>Revision</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignLeft</set> <set>AlignVCenter|AlignLeft</set>
</property> </property>
<vbox> <vbox>

@ -94,7 +94,7 @@ void PerforcePart::contextMenu(TQPopupMenu *popup, const Context *context)
KPopupMenu *sub = new KPopupMenu(popup); KPopupMenu *sub = new KPopupMenu(popup);
TQString name = fi.fileName(); TQString name = fi.fileName();
sub->insertTitle( i18n("Actions for %1").tqarg(name) ); sub->insertTitle( i18n("Actions for %1").arg(name) );
int id = sub->insertItem( i18n("Edit"), int id = sub->insertItem( i18n("Edit"),
this, TQT_SLOT(slotEdit()) ); this, TQT_SLOT(slotEdit()) );
@ -153,7 +153,7 @@ void PerforcePart::revert( const TQString& filename )
{ {
if ( KMessageBox::questionYesNo( 0, if ( KMessageBox::questionYesNo( 0,
i18n("Do you really want to revert " i18n("Do you really want to revert "
"the file %1 and lose all your changes?").tqarg( filename ), TQString(), i18n("Revert"), i18n("Do Not Revert") ) == KMessageBox::Yes ) { "the file %1 and lose all your changes?").arg( filename ), TQString(), i18n("Revert"), i18n("Do Not Revert") ) == KMessageBox::Yes ) {
execCommand( "revert", filename ); execCommand( "revert", filename );
} }
} }

@ -223,7 +223,7 @@ void subversionCore::diff( const KURL::List& list, const TQString& where){
if ( where=="HEAD"){ if ( where=="HEAD"){
diffTo=i18n("the current svn HEAD version."); diffTo=i18n("the current svn HEAD version.");
} }
KMessageBox::information( 0, i18n("No differences between the file and %1").tqarg(diffTo), i18n("No difference") ); KMessageBox::information( 0, i18n("No differences between the file and %1").arg(diffTo), i18n("No difference") );
} }
diffresult.clear(); diffresult.clear();
} }

@ -223,7 +223,7 @@ svn_error_t* kio_svnProtocol::checkAuth(svn_auth_cred_simple_t **cred, void *bat
p->info.url = p->myURL; p->info.url = p->myURL;
p->info.username = username; //( const char* )svn_auth_get_parameter( p->ctx->auth_baton, SVN_AUTH_PARAM_DEFAULT_USERNAME ); p->info.username = username; //( const char* )svn_auth_get_parameter( p->ctx->auth_baton, SVN_AUTH_PARAM_DEFAULT_USERNAME );
if (realm) { if (realm) {
p->info.prompt = i18n("Username and Password for %1.").tqarg(realm); p->info.prompt = i18n("Username and Password for %1.").arg(realm);
} }
// if ( !p->checkCachedAuthentication( p->info ) ){ // if ( !p->checkCachedAuthentication( p->info ) ){
@ -246,7 +246,7 @@ void kio_svnProtocol::get(const KURL& url ){
kdDebug(9036) << "kio_svn::get(const KURL& url)" << endl ; kdDebug(9036) << "kio_svn::get(const KURL& url)" << endl ;
TQString remoteServer = url.host(); TQString remoteServer = url.host();
infoMessage(i18n("Looking for %1...").tqarg( remoteServer ) ); infoMessage(i18n("Looking for %1...").arg( remoteServer ) );
apr_pool_t *subpool = svn_pool_create (pool); apr_pool_t *subpool = svn_pool_create (pool);
kbaton *bt = (kbaton*)apr_pcalloc(subpool, sizeof(*bt)); kbaton *bt = (kbaton*)apr_pcalloc(subpool, sizeof(*bt));
@ -1261,7 +1261,7 @@ void kio_svnProtocol::svn_switch_relocate( const KURL &wc, const KURL &origUrl,
} }
m_counter = 0L; m_counter = 0L;
setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string", setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string",
TQString("switched to %1").tqarg( toUrl ) ); TQString("switched to %1").arg( toUrl ) );
finished(); finished();
svn_pool_destroy( subpool ); svn_pool_destroy( subpool );
} }
@ -1384,7 +1384,7 @@ void kio_svnProtocol::commit2(bool recurse, bool keeplocks, const KURL::List& wc
TQString userstring = i18n ( "Nothing to commit." ); TQString userstring = i18n ( "Nothing to commit." );
if ( SVN_IS_VALID_REVNUM( commit_info->revision ) ) if ( SVN_IS_VALID_REVNUM( commit_info->revision ) )
userstring = i18n( "Committed revision %1." ).tqarg(commit_info->revision); userstring = i18n( "Committed revision %1." ).arg(commit_info->revision);
setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "path", nurl.path() ); setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "path", nurl.path() );
setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "action", "0" ); setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "action", "0" );
setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "kind", "0" ); setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "kind", "0" );
@ -1584,7 +1584,7 @@ void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const TQString &
if( commit_info ){ if( commit_info ){
setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string", setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string",
i18n("Copied Revision %1").tqarg( commit_info->revision) ); i18n("Copied Revision %1").arg( commit_info->revision) );
} else { } else {
setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string", setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string",
i18n("Copied") ); i18n("Copied") );
@ -1900,42 +1900,42 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
switch ( action ) { switch ( action ) {
case svn_wc_notify_add : //add case svn_wc_notify_add : //add
if (mime_type && (svn_mime_type_is_binary (mime_type))) if (mime_type && (svn_mime_type_is_binary (mime_type)))
userstring = i18n( "A (bin) %1" ).tqarg( path ); userstring = i18n( "A (bin) %1" ).arg( path );
else else
userstring = i18n( "A %1" ).tqarg( path ); userstring = i18n( "A %1" ).arg( path );
break; break;
case svn_wc_notify_copy: //copy case svn_wc_notify_copy: //copy
userstring = i18n( "Copied %1 " ).tqarg( path ); userstring = i18n( "Copied %1 " ).arg( path );
break; break;
case svn_wc_notify_delete: //delete case svn_wc_notify_delete: //delete
nb->received_some_change = TRUE; nb->received_some_change = TRUE;
userstring = i18n( "D %1" ).tqarg( path ); userstring = i18n( "D %1" ).arg( path );
break; break;
case svn_wc_notify_restore : //restore case svn_wc_notify_restore : //restore
userstring=i18n( "Restored %1." ).tqarg( path ); userstring=i18n( "Restored %1." ).arg( path );
break; break;
case svn_wc_notify_revert : //revert case svn_wc_notify_revert : //revert
userstring=i18n( "Reverted %1." ).tqarg( path ); userstring=i18n( "Reverted %1." ).arg( path );
break; break;
case svn_wc_notify_failed_revert: //failed revert case svn_wc_notify_failed_revert: //failed revert
userstring=i18n( "Failed to revert %1.\nTry updating instead." ).tqarg( path ); userstring=i18n( "Failed to revert %1.\nTry updating instead." ).arg( path );
break; break;
case svn_wc_notify_resolved: //resolved case svn_wc_notify_resolved: //resolved
userstring=i18n( "Resolved conflicted state of %1." ).tqarg( path ); userstring=i18n( "Resolved conflicted state of %1." ).arg( path );
break; break;
case svn_wc_notify_skip: //skip case svn_wc_notify_skip: //skip
if ( content_state == svn_wc_notify_state_missing ) if ( content_state == svn_wc_notify_state_missing )
userstring=i18n("Skipped missing target %1.").tqarg( path ); userstring=i18n("Skipped missing target %1.").arg( path );
else else
userstring=i18n("Skipped %1.").tqarg( path ); userstring=i18n("Skipped %1.").arg( path );
break; break;
case svn_wc_notify_update_delete: //update_delete case svn_wc_notify_update_delete: //update_delete
nb->received_some_change = TRUE; nb->received_some_change = TRUE;
userstring=i18n( "D %1" ).tqarg( path ); userstring=i18n( "D %1" ).arg( path );
break; break;
case svn_wc_notify_update_add: //update_add case svn_wc_notify_update_add: //update_add
nb->received_some_change = TRUE; nb->received_some_change = TRUE;
userstring=i18n( "A %1" ).tqarg( path ); userstring=i18n( "A %1" ).arg( path );
break; break;
case svn_wc_notify_update_update: //update_update case svn_wc_notify_update_update: //update_update
{ {
@ -1980,25 +1980,25 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
if (SVN_IS_VALID_REVNUM (revision)) { if (SVN_IS_VALID_REVNUM (revision)) {
if (nb->is_export) { if (nb->is_export) {
if ( nb->in_external ) if ( nb->in_external )
userstring = i18n("Exported external at revision %1.").tqarg( revision ); userstring = i18n("Exported external at revision %1.").arg( revision );
else else
userstring = i18n("Exported revision %1.").tqarg( revision ); userstring = i18n("Exported revision %1.").arg( revision );
} else if (nb->is_checkout) { } else if (nb->is_checkout) {
if ( nb->in_external ) if ( nb->in_external )
userstring = i18n("Checked out external at revision %1.").tqarg( revision ); userstring = i18n("Checked out external at revision %1.").arg( revision );
else else
userstring = i18n("Checked out revision %1.").tqarg( revision); userstring = i18n("Checked out revision %1.").arg( revision);
} else { } else {
if (nb->received_some_change) { if (nb->received_some_change) {
if ( nb->in_external ) if ( nb->in_external )
userstring=i18n("Updated external to revision %1.").tqarg( revision ); userstring=i18n("Updated external to revision %1.").arg( revision );
else else
userstring = i18n("Updated to revision %1.").tqarg( revision); userstring = i18n("Updated to revision %1.").arg( revision);
} else { } else {
if ( nb->in_external ) if ( nb->in_external )
userstring = i18n("External at revision %1.").tqarg( revision ); userstring = i18n("External at revision %1.").arg( revision );
else else
userstring = i18n("At revision %1.").tqarg( revision); userstring = i18n("At revision %1.").arg( revision);
} }
} }
} else /* no revision */ { } else /* no revision */ {
@ -2026,30 +2026,30 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
break; break;
case svn_wc_notify_update_external: //update_external case svn_wc_notify_update_external: //update_external
nb->in_external = TRUE; nb->in_external = TRUE;
userstring = i18n("Fetching external item into %1." ).tqarg( path ); userstring = i18n("Fetching external item into %1." ).arg( path );
break; break;
case svn_wc_notify_status_completed: //status_completed case svn_wc_notify_status_completed: //status_completed
if (SVN_IS_VALID_REVNUM (revision)) if (SVN_IS_VALID_REVNUM (revision))
userstring = i18n( "Status against revision: %1.").tqarg( revision ); userstring = i18n( "Status against revision: %1.").arg( revision );
break; break;
case svn_wc_notify_status_external: //status_external case svn_wc_notify_status_external: //status_external
userstring = i18n("Performing status on external item at %1.").tqarg( path ); userstring = i18n("Performing status on external item at %1.").arg( path );
break; break;
case svn_wc_notify_commit_modified: //commit_modified case svn_wc_notify_commit_modified: //commit_modified
userstring = i18n( "Sending %1").tqarg( path ); userstring = i18n( "Sending %1").arg( path );
break; break;
case svn_wc_notify_commit_added: //commit_added case svn_wc_notify_commit_added: //commit_added
if (mime_type && svn_mime_type_is_binary (mime_type)) { if (mime_type && svn_mime_type_is_binary (mime_type)) {
userstring = i18n( "Adding (bin) %1.").tqarg( path ); userstring = i18n( "Adding (bin) %1.").arg( path );
} else { } else {
userstring = i18n( "Adding %1.").tqarg( path ); userstring = i18n( "Adding %1.").arg( path );
} }
break; break;
case svn_wc_notify_commit_deleted: //commit_deleted case svn_wc_notify_commit_deleted: //commit_deleted
userstring = i18n( "Deleting %1.").tqarg( path ); userstring = i18n( "Deleting %1.").arg( path );
break; break;
case svn_wc_notify_commit_replaced: //commit_replaced case svn_wc_notify_commit_replaced: //commit_replaced
userstring = i18n( "Replacing %1.").tqarg( path ); userstring = i18n( "Replacing %1.").arg( path );
break; break;
case svn_wc_notify_commit_postfix_txdelta: //commit_postfix_txdelta case svn_wc_notify_commit_postfix_txdelta: //commit_postfix_txdelta
if (! nb->sent_first_txdelta) { if (! nb->sent_first_txdelta) {
@ -2062,7 +2062,7 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
break; break;
case svn_wc_notify_blame_revision: //blame_revision case svn_wc_notify_blame_revision: //blame_revision
userstring = i18n("Blame %1.").tqarg(path); userstring = i18n("Blame %1.").arg(path);
break; break;
default: default:
break; break;

@ -24,7 +24,7 @@
<cstring>nonRecurseCheck</cstring> <cstring>nonRecurseCheck</cstring>
</property> </property>
<property name="text"> <property name="text">
<string>Non-recursive. (Switch its immediate tqchildren only)</string> <string>Non-recursive. (Switch its immediate children only)</string>
</property> </property>
</widget> </widget>
<widget class="Line" row="5" column="0" rowspan="1" colspan="2"> <widget class="Line" row="5" column="0" rowspan="1" colspan="2">

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

Loading…
Cancel
Save