summaryrefslogtreecommitdiffstats
path: root/kommander
diff options
context:
space:
mode:
Diffstat (limited to 'kommander')
-rw-r--r--kommander/editor/actiondnd.cpp34
-rw-r--r--kommander/editor/assoctexteditorimpl.cpp8
-rw-r--r--kommander/editor/choosewidgetimpl.cpp4
-rw-r--r--kommander/editor/choosewidgetimpl.h2
-rw-r--r--kommander/editor/command.cpp26
-rw-r--r--kommander/editor/command.h2
-rw-r--r--kommander/editor/connectioneditorimpl.cpp18
-rw-r--r--kommander/editor/createtemplate.ui2
-rw-r--r--kommander/editor/formfile.cpp8
-rw-r--r--kommander/editor/formwindow.cpp42
-rw-r--r--kommander/editor/functionsimpl.cpp24
-rw-r--r--kommander/editor/hierarchyview.cpp8
-rw-r--r--kommander/editor/iconvieweditorimpl.cpp2
-rw-r--r--kommander/editor/kommander-new.xml4
-rw-r--r--kommander/editor/kommander.xml4
-rw-r--r--kommander/editor/layout.cpp18
-rw-r--r--kommander/editor/layout.h4
-rw-r--r--kommander/editor/listboxeditorimpl.cpp2
-rw-r--r--kommander/editor/listvieweditorimpl.cpp2
-rw-r--r--kommander/editor/mainwindow.cpp50
-rw-r--r--kommander/editor/mainwindowactions.cpp44
-rw-r--r--kommander/editor/messagelog.cpp4
-rw-r--r--kommander/editor/metadatabase.cpp8
-rw-r--r--kommander/editor/multilineeditor.ui2
-rw-r--r--kommander/editor/multilineeditorimpl.cpp4
-rw-r--r--kommander/editor/newformimpl.cpp2
-rw-r--r--kommander/editor/paletteeditor.ui6
-rw-r--r--kommander/editor/pixmapchooser.cpp2
-rw-r--r--kommander/editor/pixmapfunction.ui2
-rw-r--r--kommander/editor/propertyeditor.cpp52
-rw-r--r--kommander/editor/propertyeditor.h4
-rw-r--r--kommander/editor/resource.cpp8
-rw-r--r--kommander/editor/sizehandle.cpp6
-rw-r--r--kommander/editor/tableeditorimpl.cpp2
-rw-r--r--kommander/editor/widgetdatabase.cpp2
-rw-r--r--kommander/editor/widgetfactory.cpp8
-rw-r--r--kommander/editor/wizardeditorimpl.cpp14
-rw-r--r--kommander/editor/workspace.cpp4
-rw-r--r--kommander/examples/current/passvariables.kmdr12
-rw-r--r--kommander/examples/tutorial/widgets.kmdr2
-rw-r--r--kommander/executor/dcopkommanderif.h2
-rw-r--r--kommander/executor/instance.cpp8
-rw-r--r--kommander/executor/instance.h2
-rw-r--r--kommander/factory/kommanderfactory.cpp4
-rwxr-xr-xkommander/kmdrtools/dcoptool-oldparser.kmdr12
-rw-r--r--kommander/plugin/specialinformation.cpp12
-rw-r--r--kommander/plugin/specials.h4
-rw-r--r--kommander/pluginmanager/main.cpp4
-rw-r--r--kommander/pluginmanager/mainwindow.cpp2
-rw-r--r--kommander/widget/functionlib.cpp14
-rw-r--r--kommander/widget/kommanderfunctions.cpp14
-rw-r--r--kommander/widget/kommanderwidget.cpp44
-rw-r--r--kommander/widget/myprocess.cpp2
-rw-r--r--kommander/widget/parser.cpp24
-rw-r--r--kommander/widgets/buttongroup.cpp4
-rw-r--r--kommander/widgets/checkbox.cpp4
-rw-r--r--kommander/widgets/combobox.cpp4
-rw-r--r--kommander/widgets/datepicker.cpp4
-rw-r--r--kommander/widgets/dialog.cpp4
-rw-r--r--kommander/widgets/execbutton.cpp4
-rw-r--r--kommander/widgets/groupbox.cpp4
-rw-r--r--kommander/widgets/label.cpp4
-rw-r--r--kommander/widgets/lineedit.cpp4
-rw-r--r--kommander/widgets/listbox.cpp4
-rw-r--r--kommander/widgets/pixmaplabel.cpp4
-rw-r--r--kommander/widgets/popupmenu.cpp6
-rw-r--r--kommander/widgets/progressbar.cpp4
-rw-r--r--kommander/widgets/radiobutton.cpp4
-rw-r--r--kommander/widgets/richtexteditor.cpp8
-rw-r--r--kommander/widgets/spinboxint.cpp4
-rw-r--r--kommander/widgets/table.cpp6
-rw-r--r--kommander/widgets/textedit.cpp4
-rw-r--r--kommander/widgets/toolbox.cpp4
-rw-r--r--kommander/widgets/treewidget.cpp10
74 files changed, 347 insertions, 347 deletions
diff --git a/kommander/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp
index 3fc26240..3910b4cf 100644
--- a/kommander/editor/actiondnd.cpp
+++ b/kommander/editor/actiondnd.cpp
@@ -294,7 +294,7 @@ void QDesignerToolBar::contextMenuEvent( TQContextMenuEvent *e )
menu.insertItem( i18n("Delete Toolbar" ), 1 );
int res = menu.exec( e->globalPos() );
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->commandHistory()->addCommand( cmd );
cmd->execute();
@@ -360,7 +360,7 @@ void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject *
int index = actionList.find( a );
RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand(
i18n("Delete Action '%1' From Toolbar '%2'" ).
- tqarg( a->name() ).tqarg( caption() ),
+ arg( a->name() ).arg( caption() ),
formWindow, a, this, index );
formWindow->commandHistory()->addCommand( cmd );
cmd->execute();
@@ -380,7 +380,7 @@ void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject *
formWindow->commandHistory()->addCommand( cmd );
cmd->execute();
} 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->commandHistory()->addCommand( cmd );
cmd->execute();
@@ -420,7 +420,7 @@ void QDesignerToolBar::removeWidget( TQWidget *w )
int index = actionList.find( a );
RemoveActionFromToolBarCommand *cmd =
new RemoveActionFromToolBarCommand( i18n("Delete Action '%1' From Toolbar '%2'" ).
- tqarg( a->name() ).tqarg( caption() ),
+ arg( a->name() ).arg( caption() ),
formWindow, a, this, index );
formWindow->commandHistory()->addCommand( cmd );
cmd->execute();
@@ -443,7 +443,7 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o )
int index = actionList.find( a );
RemoveActionFromToolBarCommand *cmd =
new RemoveActionFromToolBarCommand( i18n("Delete Action '%1' From Toolbar '%2'" ).
- tqarg( a->name() ).tqarg( caption() ),
+ arg( a->name() ).arg( caption() ),
formWindow, a, this, index );
formWindow->commandHistory()->addCommand( cmd );
cmd->execute();
@@ -462,7 +462,7 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o )
}
if ( !drag->drag() ) {
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->commandHistory()->addCommand( cmd );
cmd->execute();
@@ -543,7 +543,7 @@ void QDesignerToolBar::dropEvent( TQDropEvent *e )
}
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->commandHistory()->addCommand( cmd );
cmd->execute();
@@ -671,7 +671,7 @@ void QDesignerToolBar::doInsertWidget( const TQPoint &p )
if ( !insertAnchor )
index = 0;
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->commandHistory()->addCommand( cmd );
cmd->execute();
@@ -739,15 +739,15 @@ void QDesignerMenuBar::contextMenuEvent( TQContextMenuEvent *e )
int res = menu.exec( e->globalPos() );
if ( res == 1 ) {
TQMenuItem *item = findItem( idAt( itm ) );
- RemoveMenuCommand *cmd = new RemoveMenuCommand( i18n("Delete Menu '%1'" ).tqarg( item->text() ),
+ RemoveMenuCommand *cmd = new RemoveMenuCommand( i18n("Delete Menu '%1'" ).arg( item->text() ),
formWindow,
(TQMainWindow*)parentWidget(), this,
(QDesignerPopupMenu*)item->popup(),
idAt( itm ), itm, item->text() );
formWindow->commandHistory()->addCommand( cmd );
cmd->execute();
- // #### need to do a proper tqinvalidate and re-tqlayout
- parentWidget()->tqlayout()->tqinvalidate();
+ // #### need to do a proper invalidate and re-tqlayout
+ parentWidget()->tqlayout()->invalidate();
parentWidget()->tqlayout()->activate();
} else if ( res == 2 ) {
bool ok;
@@ -756,7 +756,7 @@ void QDesignerMenuBar::contextMenuEvent( TQContextMenuEvent *e )
text( idAt( itm ) ), &ok, 0 );
if ( ok ) {
RenameMenuCommand *cmd = new RenameMenuCommand(
- i18n("Rename Menu '%1' to '%2'" ).tqarg( old ).tqarg( txt ),
+ i18n("Rename Menu '%1' to '%2'" ).arg( old ).arg( txt ),
formWindow, this, idAt( itm ), old, txt );
formWindow->commandHistory()->addCommand( cmd );
cmd->execute();
@@ -880,7 +880,7 @@ void QDesignerMenuBar::dropEvent( TQDropEvent *e )
TQString txt = s2;
insertItem( txt, popup, -1, insertAt );
- MoveMenuCommand *cmd = new MoveMenuCommand( i18n("Move Menu '%1'" ).tqarg( txt ), formWindow,
+ MoveMenuCommand *cmd = new MoveMenuCommand( i18n("Move Menu '%1'" ).arg( txt ), formWindow,
this, (QDesignerPopupMenu*)popup, oldPos, insertAt, txt );
// do not execute, we did the work already
formWindow->commandHistory()->addCommand( cmd );
@@ -1030,7 +1030,7 @@ void QDesignerPopupMenu::createPopupMenu()
return;
RemoveActionFromPopupCommand *cmd = new RemoveActionFromPopupCommand(
i18n("Delete Action '%1' From Popup Menu '%2'" ).
- tqarg( a->name() ).tqarg( caption() ),
+ arg( a->name() ).arg( caption() ),
formWindow, a, this, itm );
formWindow->commandHistory()->addCommand( cmd );
cmd->execute();
@@ -1069,7 +1069,7 @@ void QDesignerPopupMenu::mouseMoveEvent( TQMouseEvent *e )
if ( !a )
return;
RemoveActionFromPopupCommand *cmd = new RemoveActionFromPopupCommand( i18n("Delete Action '%1' From Popup Menu '%2'" ).
- tqarg( a->name() ).tqarg( caption() ),
+ arg( a->name() ).arg( caption() ),
formWindow, a, this, itm );
formWindow->commandHistory()->addCommand( cmd );
cmd->execute();
@@ -1082,7 +1082,7 @@ void QDesignerPopupMenu::mouseMoveEvent( TQMouseEvent *e )
drag->setPixmap( a->iconSet().pixmap() );
if ( !drag->drag() ) {
AddActionToPopupCommand *cmd = new AddActionToPopupCommand( i18n("Add Action '%1' to Popup Menu '%2'" ).
- tqarg( a->name() ).tqarg( name() ),
+ arg( a->name() ).arg( name() ),
formWindow, a, this, itm );
formWindow->commandHistory()->addCommand( cmd );
cmd->execute();
@@ -1164,7 +1164,7 @@ void QDesignerPopupMenu::dropEvent( TQDropEvent *e )
}
AddActionToPopupCommand *cmd = new AddActionToPopupCommand( i18n("Add Action '%1' to Popup Menu '%2'" ).
- tqarg( a->name() ).tqarg( name() ),
+ arg( a->name() ).arg( name() ),
formWindow, a, this, insertAt );
formWindow->commandHistory()->addCommand( cmd );
cmd->execute();
diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp
index d0eaa69a..6d7f88f6 100644
--- a/kommander/editor/assoctexteditorimpl.cpp
+++ b/kommander/editor/assoctexteditorimpl.cpp
@@ -268,7 +268,7 @@ void AssocTextEditor::save() const
if (atw->associatedText() != associatedText())
{
- TQString text = i18n("Set the \'text association\' of \'%1\'").tqarg(m_widget->name());
+ TQString text = i18n("Set the \'text association\' of \'%1\'").arg(m_widget->name());
SetPropertyCommand *cmd = new SetPropertyCommand(text, m_formWindow,
TQT_TQOBJECT(m_widget), m_propertyEditor, "associations", atw->associatedText(),
associatedText(), TQString(), TQString(), false);
@@ -278,7 +278,7 @@ void AssocTextEditor::save() const
}
if (atw->populationText() != populationText())
{
- TQString text = i18n("Set the \'population text\' of \'%1\'").tqarg(m_widget->name());
+ TQString text = i18n("Set the \'population text\' of \'%1\'").arg(m_widget->name());
SetPropertyCommand *cmd = new SetPropertyCommand(text, m_formWindow, TQT_TQOBJECT(m_widget),
m_propertyEditor, "populationText", atw->populationText(),
populationText(), TQString(), TQString(), false);
@@ -427,7 +427,7 @@ void AssocTextEditor::insertFile()
TQFile insertFile(fileName);
if(!insertFile.open(IO_ReadOnly))
{
- KMessageBox::error( this, i18n("<qt>Cannot open file<br><b>%1</b></qt").tqarg( fileName ) );
+ KMessageBox::error( this, i18n("<qt>Cannot open file<br><b>%1</b></qt").arg( fileName ) );
return;
}
TQTextStream insertStream(&insertFile);
@@ -456,7 +456,7 @@ TQString AssocTextEditor::widgetToString(TQWidget* widget, bool formatted)
if (!widget)
return TQString();
else if (formatted)
- return TQString("%1 (%2)").tqarg(widget->name()).tqarg(widget->className());
+ return TQString("%1 (%2)").arg(widget->name()).arg(widget->className());
else
return widget->name();
}
diff --git a/kommander/editor/choosewidgetimpl.cpp b/kommander/editor/choosewidgetimpl.cpp
index 84951ff5..3ed6f9c9 100644
--- a/kommander/editor/choosewidgetimpl.cpp
+++ b/kommander/editor/choosewidgetimpl.cpp
@@ -55,7 +55,7 @@ void ChooseWidget::setWidget(TQWidget* w)
TQPtrStack<TQWidget> p_widgets;
TQPtrStack<TQListViewItem> p_items;
- item = new TQListViewItem(widgetView, TQString("%1 (%2)").tqarg(w->name()).tqarg(w->className()));
+ item = new TQListViewItem(widgetView, TQString("%1 (%2)").arg(w->name()).arg(w->className()));
item->setOpen(true);
p_widgets.push(w);
@@ -68,7 +68,7 @@ void ChooseWidget::setWidget(TQWidget* w)
for (TQObjectListIt it(*objectList); it.current(); ++it) {
TQListViewItem* newItem = item;
if (isKommanderWidget(*it))
- newItem = new TQListViewItem(item, TQString("%1 (%2)").tqarg((*it)->name()).tqarg((*it)->className()));
+ newItem = new TQListViewItem(item, TQString("%1 (%2)").arg((*it)->name()).arg((*it)->className()));
if (!(*it)->childrenListObject().isEmpty()) {
p_widgets.push((TQWidget*)(*it));
p_items.push(newItem);
diff --git a/kommander/editor/choosewidgetimpl.h b/kommander/editor/choosewidgetimpl.h
index 4c2bbd45..e6cf034b 100644
--- a/kommander/editor/choosewidgetimpl.h
+++ b/kommander/editor/choosewidgetimpl.h
@@ -26,7 +26,7 @@ class ChooseWidget : public ChooseWidgetBase
public:
ChooseWidget(TQWidget*, const char* = 0, bool=true);
~ChooseWidget();
- // Put current widget and all of its tqchildren in a tree
+ // Put current widget and all of its children in a tree
void setWidget(TQWidget *);
// Return current widget
TQString selection();
diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp
index 7e295285..dba41040 100644
--- a/kommander/editor/command.cpp
+++ b/kommander/editor/command.cpp
@@ -253,19 +253,19 @@ void ResizeCommand::unexecute()
InsertCommand::InsertCommand( const TQString &n, FormWindow *fw,
TQWidget *w, const TQRect &g )
- : Command( n, fw ), widget( w ), tqgeometry( g )
+ : Command( n, fw ), widget( w ), geometry( g )
{
}
void InsertCommand::execute()
{
- if ( tqgeometry.size() == TQSize( 0, 0 ) ) {
- widget->move( tqgeometry.topLeft() );
+ if ( geometry.size() == TQSize( 0, 0 ) ) {
+ widget->move( geometry.topLeft() );
widget->adjustSize();
} else {
- TQSize s = tqgeometry.size().expandedTo( widget->minimumSize() );
+ TQSize s = geometry.size().expandedTo( widget->minimumSize() );
s = s.expandedTo( widget->minimumSizeHint() );
- TQRect r( tqgeometry.topLeft(), s );
+ TQRect r( geometry.topLeft(), s );
widget->setGeometry( r );
}
widget->show();
@@ -535,23 +535,23 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
widget->metaObject()->property( widget->metaObject()->findProperty( propName, true ), true );
if ( !p ) {
if ( propName == "hAlign" ) {
- p = widget->metaObject()->property( widget->metaObject()->findProperty( "tqalignment", true ), true );
- int align = widget->property( "tqalignment" ).toInt();
+ p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", true ), true );
+ int align = widget->property( "alignment" ).toInt();
align &= ~( AlignHorizontal_Mask );
align |= p->keyToValue( currentItemText );
- widget->setProperty( "tqalignment", TQVariant( align ) );
+ widget->setProperty( "alignment", TQVariant( align ) );
} else if ( propName == "vAlign" ) {
- p = widget->metaObject()->property( widget->metaObject()->findProperty( "tqalignment", true ), true );
- int align = widget->property( "tqalignment" ).toInt();
+ p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", true ), true );
+ int align = widget->property( "alignment" ).toInt();
align &= ~( AlignVertical_Mask );
align |= p->keyToValue( currentItemText );
- widget->setProperty( "tqalignment", TQVariant( align ) );
+ widget->setProperty( "alignment", TQVariant( align ) );
} else if ( propName == "wordwrap" ) {
- int align = widget->property( "tqalignment" ).toInt();
+ int align = widget->property( "alignment" ).toInt();
align &= ~WordBreak;
if ( v.toBool() )
align |= WordBreak;
- widget->setProperty( "tqalignment", TQVariant( align ) );
+ widget->setProperty( "alignment", TQVariant( align ) );
} else if ( propName == "layoutSpacing" ) {
MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), v.toInt() );
} else if ( propName == "layoutMargin" ) {
diff --git a/kommander/editor/command.h b/kommander/editor/command.h
index 4d1a3aa5..5c84271e 100644
--- a/kommander/editor/command.h
+++ b/kommander/editor/command.h
@@ -181,7 +181,7 @@ public:
private:
TQWidget *widget;
- TQRect tqgeometry;
+ TQRect geometry;
};
diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp
index f8d8b9ff..ce21fc92 100644
--- a/kommander/editor/connectioneditorimpl.cpp
+++ b/kommander/editor/connectioneditorimpl.cpp
@@ -44,14 +44,14 @@ static const char *const ignore_slots[] = {
"update()",
"update(int,int,int,int)",
"update(const TQRect&)",
- "tqrepaint()",
- "tqrepaint(bool)",
- "tqrepaint(int,int,int,int,bool)",
- "tqrepaint(const TQRect&,bool)",
- "tqrepaint(const TQRegion&,bool)",
- "tqrepaint(int,int,int,int)",
- "tqrepaint(const TQRect&)",
- "tqrepaint(const TQRegion&)",
+ "repaint()",
+ "repaint(bool)",
+ "repaint(int,int,int,int,bool)",
+ "repaint(const TQRect&,bool)",
+ "repaint(const TQRegion&,bool)",
+ "repaint(int,int,int,int)",
+ "repaint(const TQRect&)",
+ "repaint(const TQRegion&)",
//"show()",
//"hide()",
"iconify()",
@@ -226,7 +226,7 @@ void ConnectionEditor::disconnectClicked()
void ConnectionEditor::okClicked()
{
MacroCommand* rmConn = 0, *addConn = 0;
- TQString n = i18n("Connect/Disconnect the signals and slots of '%1' and '%2'").tqarg(m_sender->name()).
+ TQString n = i18n("Connect/Disconnect the signals and slots of '%1' and '%2'").arg(m_sender->name()).
arg(m_receiver->name());
TQValueList <MetaDataBase::Connection>::Iterator cit;
if (!m_oldConnections.isEmpty())
diff --git a/kommander/editor/createtemplate.ui b/kommander/editor/createtemplate.ui
index e31865ef..263d71c1 100644
--- a/kommander/editor/createtemplate.ui
+++ b/kommander/editor/createtemplate.ui
@@ -25,7 +25,7 @@
<cstring>CreateTemplate</cstring>
</property>
<property stdset="1">
- <name>tqgeometry</name>
+ <name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
diff --git a/kommander/editor/formfile.cpp b/kommander/editor/formfile.cpp
index ff2e4c06..90e78f3c 100644
--- a/kommander/editor/formfile.cpp
+++ b/kommander/editor/formfile.cpp
@@ -119,12 +119,12 @@ bool FormFile::save(bool withMsgBox)
if (!resource.save(filename, false))
{
if (KMessageBox::questionYesNo(MainWindow::self, i18n("Failed to save file '%1'.\n"
- "Do you want to use another file name?").tqarg(filename), TQString(), i18n("Try Another"), i18n("Do Not Try")) == KMessageBox::Yes)
+ "Do you want to use another file name?").arg(filename), TQString(), i18n("Try Another"), i18n("Do Not Try")) == KMessageBox::Yes)
return saveAs();
else
return false;
}
- MainWindow::self->statusBar()->message(i18n("'%1' saved.").tqarg(filename), 3000);
+ MainWindow::self->statusBar()->message(i18n("'%1' saved.").arg(filename), 3000);
::chmod(filename.local8Bit(), S_IRWXU);
setModified(false);
return true;
@@ -139,7 +139,7 @@ bool FormFile::saveAs()
while (!saved) {
TQString fn = KFileDialog::getSaveFileName(TQString(),
i18n("*.kmdr|Kommander Files"), MainWindow::self,
- i18n("Save Form '%1' As").tqarg(formWindow()->name()));
+ i18n("Save Form '%1' As").arg(formWindow()->name()));
if (fn.isEmpty())
return false;
TQFileInfo fi(fn);
@@ -182,7 +182,7 @@ bool FormFile::closeEvent()
}
switch (KMessageBox::warningYesNoCancel(MainWindow::self, i18n("Dialog '%1' was modified."
- "Do you want to save it?").tqarg(filename), i18n("Save File?"), KStdGuiItem::save(), KStdGuiItem::discard())) {
+ "Do you want to save it?").arg(filename), i18n("Save File?"), KStdGuiItem::save(), KStdGuiItem::discard())) {
case KMessageBox::Yes:
if (!save())
return false;
diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp
index 50be9f1d..313c7c1e 100644
--- a/kommander/editor/formwindow.cpp
+++ b/kommander/editor/formwindow.cpp
@@ -320,15 +320,15 @@ void FormWindow::insertWidget()
"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 "
"the widget on the form.</p>")
- .tqarg(WidgetDatabase::toolTip(id)));
- TQToolTip::add(w, i18n("A %1 (custom widget)").tqarg(WidgetDatabase::toolTip(id)));
+ .arg(WidgetDatabase::toolTip(id)));
+ TQToolTip::add(w, i18n("A %1 (custom widget)").arg(WidgetDatabase::toolTip(id)));
}
else
{
TQString tt = WidgetDatabase::toolTip(id);
TQString wt = WidgetDatabase::whatsThis(id);
if (!wt.isEmpty() && !tt.isEmpty())
- TQWhatsThis::add(w, i18n("<b>A %1</b><p>%2</p>").tqarg(tt).tqarg(wt));
+ TQWhatsThis::add(w, i18n("<b>A %1</b><p>%2</p>").arg(tt).arg(wt));
}
TQString s = w->name();
@@ -387,13 +387,13 @@ void FormWindow::insertWidget()
else
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;
commands.append(mv);
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);
mc->execute();
}
@@ -404,7 +404,7 @@ void FormWindow::insertWidget()
else
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);
cmd->execute();
}
@@ -428,15 +428,15 @@ void FormWindow::insertWidget(TQWidget *w, bool checkName)
"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 "
"the widget on the form.</p>")
- .tqarg(WidgetDatabase::toolTip(id)));
- TQToolTip::add(w, i18n("A %1 (custom widget)").tqarg(WidgetDatabase::toolTip(id)));
+ .arg(WidgetDatabase::toolTip(id)));
+ TQToolTip::add(w, i18n("A %1 (custom widget)").arg(WidgetDatabase::toolTip(id)));
}
else
{
TQString tt = WidgetDatabase::toolTip(id);
TQString wt = WidgetDatabase::whatsThis(id);
if (!wt.isEmpty() && !tt.isEmpty())
- TQWhatsThis::add(w, i18n("<b>A %1</b><p>%2</p>").tqarg(tt).tqarg(wt));
+ TQWhatsThis::add(w, i18n("<b>A %1</b><p>%2</p>").arg(tt).arg(wt));
}
restoreCursors(w, this);
@@ -556,7 +556,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
w = w->parentWidget();
if (e->button() == Qt::LeftButton)
- { // left button: store original tqgeometry and more as the widget might start moving
+ { // left button: store original geometry and more as the widget might start moving
widgetPressed = true;
widgetGeom = TQRect(w->pos(), w->size());
oldPressPos = w->mapFromGlobal(e->globalPos());
@@ -594,7 +594,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
if (e->button() != Qt::LeftButton)
break;
saveBackground();
- mainWindow()->statusBar()->message(i18n("Connect '%1' with...").tqarg(w->name()));
+ mainWindow()->statusBar()->message(i18n("Connect '%1' with...").arg(w->name()));
connectStartPos = mapFromGlobal(e->globalPos());
currentConnectPos = mapFromGlobal(e->globalPos());
connectSender = TQT_TQOBJECT(designerWidget(TQT_TQOBJECT(w)));
@@ -767,7 +767,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w)
// finally move the selected widgets and show/update preview label
moveSelectedWidgets(x - p.x(), y - p.y());
- sizePreviewLabel->setText(TQString("%1/%2").tqarg(w->pos().x()).tqarg(w->pos().y()));
+ sizePreviewLabel->setText(TQString("%1/%2").arg(w->pos().x()).arg(w->pos().y()));
sizePreviewLabel->adjustSize();
TQRect lg(mapFromGlobal(e->globalPos()) + TQPoint(16, 16), sizePreviewLabel->size());
checkPreviewGeometry(lg);
@@ -803,7 +803,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w)
if (newReceiver && (isMainContainer(TQT_TQOBJECT(newReceiver))
|| insertedWidgets.find(newReceiver)) && !isCentralWidget(TQT_TQOBJECT(newReceiver)))
connectReceiver = connectableObject(TQT_TQOBJECT(newReceiver), TQT_TQOBJECT(connectReceiver));
- mainWindow()->statusBar()->message(i18n("Connect '%1' to '%2'").tqarg(connectSender->name()).
+ mainWindow()->statusBar()->message(i18n("Connect '%1' to '%2'").arg(connectSender->name()).
arg(connectReceiver->name()));
tqApp->processEvents();
if (drawRecRect)
@@ -871,7 +871,7 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w)
"In order to insert the widget, the tqlayout of '%1'\n"
"must first be broken.\n"
"Break the tqlayout or cancel the operation?").
- tqarg(wa->name()).tqarg(wa->name()), i18n("Inserting Widget"),
+ arg(wa->name()).arg(wa->name()), i18n("Inserting Widget"),
i18n("&Break Layout"), KStdGuiItem::cancel()) == KMessageBox::No)
goto make_move_command; // cancel
breakLayout(wa);
@@ -1239,7 +1239,7 @@ void FormWindow::continueRectDraw(const TQPoint & p, const TQPoint & global, TQW
if (currRect == r)
{
TQString t("%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);
return;
}
@@ -1253,7 +1253,7 @@ void FormWindow::continueRectDraw(const TQPoint & p, const TQPoint & global, TQW
if (t == Insert)
{
TQString t("%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);
}
unclippedPainter->setClipRegion(TQRegion(rect()).subtract(TQRect(sizePreviewPos,
@@ -1431,13 +1431,13 @@ void FormWindow::editAdjustSize()
TQWidgetList widgets = selectedWidgets();
if (widgets.isEmpty())
{
- TQRect oldr = tqgeometry();
+ TQRect oldr = geometry();
mainContainer()->adjustSize();
resize(mainContainer()->size());
// check whether our own size constraint hit us
if (size() != mainContainer()->size())
mainContainer()->resize(size());
- TQRect nr = tqgeometry();
+ TQRect nr = geometry();
if (oldr != nr)
{
ResizeCommand *cmd = new ResizeCommand(i18n("Adjust Size"), this, this, oldr, nr);
@@ -1450,9 +1450,9 @@ void FormWindow::editAdjustSize()
if (w->parentWidget()
&& WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout)
continue;
- TQRect oldr = w->tqgeometry();
+ TQRect oldr = w->geometry();
w->adjustSize();
- TQRect nr = w->tqgeometry();
+ TQRect nr = w->geometry();
if (oldr != nr)
commands.append(new ResizeCommand(i18n("Adjust Size"), this, w, oldr, nr));
}
@@ -1844,7 +1844,7 @@ void FormWindow::checkAccels()
{
ok = false;
if (KMessageBox::questionYesNo(mainWindow(),
- i18n("Accelerator '%1' is used %2 times.").tqarg(it.key().upper()).tqarg((*it).count()),
+ i18n("Accelerator '%1' is used %2 times.").arg(it.key().upper()).arg((*it).count()),
i18n("Check Accelerators"), i18n("&Select"), KStdGuiItem::cancel()) == KMessageBox::Yes)
{
clearSelection(false);
diff --git a/kommander/editor/functionsimpl.cpp b/kommander/editor/functionsimpl.cpp
index 2649da52..b7a5449c 100644
--- a/kommander/editor/functionsimpl.cpp
+++ b/kommander/editor/functionsimpl.cpp
@@ -130,13 +130,13 @@ TQString FunctionsDialog::currentFunctionText()
function = s + ".";
}
if (groupComboBox->currentText() == "Kommander")
- return TQString("%1%2%3").tqarg(prefix).tqarg(functionListBox->currentText()).tqarg(params());
+ return TQString("%1%2%3").arg(prefix).arg(functionListBox->currentText()).arg(params());
else if (groupComboBox->currentItem() == m_DCOP || groupComboBox->currentItem() == m_Slots)
- return TQString("%1%2.%3%4").tqarg(prefix).tqarg(widgetComboBox->currentText().section(' ', 0, 0))
- .tqarg(functionListBox->currentText().left(functionListBox->currentText().find('('))).tqarg(params());
+ return TQString("%1%2.%3%4").arg(prefix).arg(widgetComboBox->currentText().section(' ', 0, 0))
+ .arg(functionListBox->currentText().left(functionListBox->currentText().find('('))).arg(params());
else
- return TQString("%1%2%3%4").tqarg(prefix).tqarg(function)
- .tqarg(functionListBox->currentText()).tqarg(params());
+ return TQString("%1%2%3%4").arg(prefix).arg(function)
+ .arg(functionListBox->currentText()).arg(params());
}
void FunctionsDialog::groupChanged(int index)
@@ -195,13 +195,13 @@ void FunctionsDialog::functionChanged(int)
{
KommanderWidget* w = dynamic_cast<KommanderWidget *>(m_widgetList[widgetComboBox->currentText()]);
TQObject *o = w->object();
- TQString slotHelp = i18n("To learn more about the slot, look at the documentation of the base TQt/KDE class, most probably <i>%1</i>.").tqarg(o->metaObject()->superClassName() ? TQString(o->metaObject()->superClassName()) : TQString(o->className()) );
+ TQString slotHelp = i18n("To learn more about the slot, look at the documentation of the base TQt/KDE class, most probably <i>%1</i>.").arg(o->metaObject()->superClassName() ? TQString(o->metaObject()->superClassName()) : TQString(o->className()) );
TQString slotName = functionListBox->currentText();
TQString slot = m_slotList[slotName];
descriptionText->clear();
descriptionText->setText(i18n("<qt><h3>%1</h3>"
"<p><b>Description:</b> %2\n<p><b>Syntax:</b> <i>%3</i>%4</qt>")
- .tqarg(slotName).tqarg(slotHelp).tqarg(slot).tqarg(""));
+ .arg(slotName).arg(slotHelp).arg(slot).arg(""));
} else
{
int index = groupComboBox->currentItem();
@@ -224,8 +224,8 @@ void FunctionsDialog::functionChanged(int)
descriptionText->clear();
descriptionText->setText(i18n("<qt><h3>%1</h3>"
"<p><b>Description:</b> %2\n<p><b>Syntax:</b> <i>%3</i>%4</qt>")
- .tqarg(functionListBox->currentText()).tqarg(m_function.description())
- .tqarg(m_function.prototype(pflags)).tqarg(defArgs));
+ .arg(functionListBox->currentText()).arg(m_function.description())
+ .arg(m_function.prototype(pflags)).arg(defArgs));
}
showParameters();
@@ -262,7 +262,7 @@ void FunctionsDialog::showParameters()
if (i < argsCount)
{
type = slotArgs[i].remove(TQRegExp("\\*|\\&|const\\s"));
- labels[i]->setText(TQString("%1:").tqarg(type));
+ labels[i]->setText(TQString("%1:").arg(type));
}
quotes[i]->setChecked(true);
quotes[i]->setShown(false);
@@ -303,7 +303,7 @@ void FunctionsDialog::showParameters()
{
labels[i]->setShown(i < argsCount);
if (i < argsCount)
- labels[i]->setText(TQString("%1:").tqarg(m_function.argumentName(i)));
+ labels[i]->setText(TQString("%1:").arg(m_function.argumentName(i)));
quotes[i]->setChecked(true);
quotes[i]->setShown(false);
if (m_function.argumentType(i) == "bool")
@@ -383,7 +383,7 @@ TQString FunctionsDialog::params()
}
TQString a_param = pars.join(", ");
if (params)
- return TQString("(%1)").tqarg(a_param);
+ return TQString("(%1)").arg(a_param);
else
return a_param;
}
diff --git a/kommander/editor/hierarchyview.cpp b/kommander/editor/hierarchyview.cpp
index 9ec77020..25ad2872 100644
--- a/kommander/editor/hierarchyview.cpp
+++ b/kommander/editor/hierarchyview.cpp
@@ -516,13 +516,13 @@ void HierarchyList::addTabPage()
return;
if ( w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) {
TQTabWidget *tw = (TQTabWidget*)w;
- AddTabPageCommand *cmd = new AddTabPageCommand( i18n("Add Page to %1" ).tqarg( tw->name() ), formWindow,
+ AddTabPageCommand *cmd = new AddTabPageCommand( i18n("Add Page to %1" ).arg( tw->name() ), formWindow,
tw, "Tab" );
formWindow->commandHistory()->addCommand( cmd );
cmd->execute();
} else if ( w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) {
TQWizard *wiz = (TQWizard*)formWindow->mainContainer();
- AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n("Add Page to %1" ).tqarg( wiz->name() ), formWindow,
+ AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n("Add Page to %1" ).arg( wiz->name() ), formWindow,
wiz, "Page" );
formWindow->commandHistory()->addCommand( cmd );
cmd->execute();
@@ -539,7 +539,7 @@ void HierarchyList::removeTabPage()
if ( tw->currentPage() ) {
QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw;
DeleteTabPageCommand *cmd = 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->commandHistory()->addCommand( cmd );
cmd->execute();
@@ -549,7 +549,7 @@ void HierarchyList::removeTabPage()
if ( wiz->currentPage() ) {
QDesignerWizard *dw = (QDesignerWizard*)wiz;
DeleteWizardPageCommand *cmd = new DeleteWizardPageCommand( i18n("Delete Page %1 of %2" ).
- tqarg( dw->pageTitle() ).tqarg( wiz->name() ),
+ arg( dw->pageTitle() ).arg( wiz->name() ),
formWindow, wiz,
wiz->indexOf( wiz->currentPage() ), true );
formWindow->commandHistory()->addCommand( cmd );
diff --git a/kommander/editor/iconvieweditorimpl.cpp b/kommander/editor/iconvieweditorimpl.cpp
index 911f6ec8..7ca5b989 100644
--- a/kommander/editor/iconvieweditorimpl.cpp
+++ b/kommander/editor/iconvieweditorimpl.cpp
@@ -121,7 +121,7 @@ void IconViewEditor::applyClicked()
items.append( item );
}
- PopulateIconViewCommand *cmd = new PopulateIconViewCommand( i18n("Edit Items of '%1'" ).tqarg( iconview->name() ),
+ PopulateIconViewCommand *cmd = new PopulateIconViewCommand( i18n("Edit Items of '%1'" ).arg( iconview->name() ),
formwindow, iconview, items );
cmd->execute();
formwindow->commandHistory()->addCommand( cmd );
diff --git a/kommander/editor/kommander-new.xml b/kommander/editor/kommander-new.xml
index 5c170485..deb3d88a 100644
--- a/kommander/editor/kommander-new.xml
+++ b/kommander/editor/kommander-new.xml
@@ -25,7 +25,7 @@
<item>cellText</item>
<item>clear</item>
<item>checked</item>
- <item>tqchildren</item>
+ <item>children</item>
<item>columnCount</item>
<item>count</item>
<item>currentColumn</item>
@@ -33,7 +33,7 @@
<item>currentRow</item>
<item>execute</item>
<item>findItem</item>
- <item>tqgeometry</item>
+ <item>geometry</item>
<item>global</item>
<item>hasFocus</item>
<item>insertColumn</item>
diff --git a/kommander/editor/kommander.xml b/kommander/editor/kommander.xml
index a2f926fa..004e173e 100644
--- a/kommander/editor/kommander.xml
+++ b/kommander/editor/kommander.xml
@@ -25,14 +25,14 @@
<item>cellText</item>
<item>clear</item>
<item>checked</item>
- <item>tqchildren</item>
+ <item>children</item>
<item>count</item>
<item>currentColumn</item>
<item>currentItem</item>
<item>currentRow</item>
<item>execute</item>
<item>findItem</item>
- <item>tqgeometry</item>
+ <item>geometry</item>
<item>global</item>
<item>hasFocus</item>
<item>insertColumn</item>
diff --git a/kommander/editor/layout.cpp b/kommander/editor/layout.cpp
index aadd2212..0d3e4cc1 100644
--- a/kommander/editor/layout.cpp
+++ b/kommander/editor/layout.cpp
@@ -59,7 +59,7 @@ Layout::Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *l
widgets.setAutoDelete( false );
layoutBase = lb;
if ( !doSetup && layoutBase )
- oldGeometry = layoutBase->tqgeometry();
+ oldGeometry = layoutBase->geometry();
}
/*! The widget list we got in the constructor might contain too much
@@ -228,7 +228,7 @@ void Layout::breakLayout()
if ( !widgets.isEmpty() ) {
TQWidget *w;
for ( w = widgets.first(); w; w = widgets.next() )
- rects.insert( w, w->tqgeometry() );
+ rects.insert( w, w->geometry() );
}
WidgetFactory::deleteLayout( layoutBase );
bool needReparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 ||
@@ -310,7 +310,7 @@ void HorizontalLayout::doLayout()
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false );
if ( !useSplitter ) {
if ( qstrcmp( w->className(), "Spacer" ) == 0 )
- tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() );
+ tqlayout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
else
tqlayout->addWidget( w );
if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
@@ -374,7 +374,7 @@ void VerticalLayout::doLayout()
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false );
if ( !useSplitter ) {
if ( qstrcmp( w->className(), "Spacer" ) == 0 )
- tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() );
+ tqlayout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
else
tqlayout->addWidget( w );
if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
@@ -745,9 +745,9 @@ void GridLayout::doLayout()
if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false );
if ( rs * cs == 1 ) {
- tqlayout->addWidget( w, r, c, w->inherits( "Spacer" ) ? ( (Spacer*)w )->tqalignment() : 0 );
+ tqlayout->addWidget( w, r, c, w->inherits( "Spacer" ) ? ( (Spacer*)w )->alignment() : 0 );
} else {
- tqlayout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, w->inherits( "Spacer" ) ? ( (Spacer*)w )->tqalignment() : 0 );
+ tqlayout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, w->inherits( "Spacer" ) ? ( (Spacer*)w )->alignment() : 0 );
}
if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
( (TQLayoutWidget*)w )->updateSizePolicy();
@@ -770,7 +770,7 @@ void GridLayout::buildGrid()
TQWidget* w;
TQRect br;
for ( w = widgets.first(); w; w = widgets.next() )
- br = br.unite( w->tqgeometry() );
+ br = br.unite( w->geometry() );
delete grid;
grid = new Grid( br.height() / resolution.height() + 1,
@@ -784,7 +784,7 @@ void GridLayout::buildGrid()
TQRect cr( p, resolution );
for ( w = widgets.first(); w; w = widgets.next() ) {
// check that the overlap is significant
- TQRect intersect = cr.intersect( w->tqgeometry() );
+ TQRect intersect = cr.intersect( w->geometry() );
if ( intersect.size().width() > resolution.width()/2 &&
intersect.size().height() > resolution.height()/2 ) {
grid->setCell( r, c, w );
@@ -885,7 +885,7 @@ Spacer::SizeType Spacer::sizeType() const
return (SizeType)sizePolicy().horData();
}
-int Spacer::tqalignment() const
+int Spacer::alignment() const
{
if ( orient ==Qt::Vertical )
return AlignHCenter;
diff --git a/kommander/editor/layout.h b/kommander/editor/layout.h
index 2b33bb3b..b6d6d71e 100644
--- a/kommander/editor/layout.h
+++ b/kommander/editor/layout.h
@@ -119,7 +119,7 @@ class Spacer : public TQWidget
Q_ENUMS( SizeType )
TQ_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType )
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:
enum { HSize = 6, HMask = 0x3f, VMask = HMask << HSize,
@@ -139,7 +139,7 @@ public:
TQSize sizeHint() const;
void setSizeType( SizeType t );
SizeType sizeType() const;
- int tqalignment() const;
+ int alignment() const;
Qt::Orientation orientation() const;
void setOrientation( Qt::Orientation o );
void setInteraciveMode( bool b ) { interactive = b; };
diff --git a/kommander/editor/listboxeditorimpl.cpp b/kommander/editor/listboxeditorimpl.cpp
index b9ec7fee..22c07cea 100644
--- a/kommander/editor/listboxeditorimpl.cpp
+++ b/kommander/editor/listboxeditorimpl.cpp
@@ -131,7 +131,7 @@ void ListBoxEditor::applyClicked()
items.append( item );
}
- PopulateListBoxCommand *cmd = new PopulateListBoxCommand( i18n("Edit Items of '%1'" ).tqarg( listbox->name() ),
+ PopulateListBoxCommand *cmd = new PopulateListBoxCommand( i18n("Edit Items of '%1'" ).arg( listbox->name() ),
formwindow, listbox, items );
cmd->execute();
formwindow->commandHistory()->addCommand( cmd );
diff --git a/kommander/editor/listvieweditorimpl.cpp b/kommander/editor/listvieweditorimpl.cpp
index d7baba57..c07e8334 100644
--- a/kommander/editor/listvieweditorimpl.cpp
+++ b/kommander/editor/listvieweditorimpl.cpp
@@ -63,7 +63,7 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw
void ListViewEditor::applyClicked()
{
setupItems();
- PopulateListViewCommand *cmd = new PopulateListViewCommand( i18n("Edit Items and Columns of '%1'" ).tqarg( listview->name() ),
+ PopulateListViewCommand *cmd = new PopulateListViewCommand( i18n("Edit Items and Columns of '%1'" ).arg( listview->name() ),
formwindow, listview, itemsPreview );
cmd->execute();
formwindow->commandHistory()->addCommand( cmd );
diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index d2bcff45..3897c4f8 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -392,7 +392,7 @@ void MainWindow::slotCreateBackups()
form->formFile()->setModified(true);
if (!form->formFile()->save(false))
{
- KMessageBox::error(this, i18n("<qt>Cannot create backup file <i>%1</i>.</qt>").tqarg(backupName));
+ KMessageBox::error(this, i18n("<qt>Cannot create backup file <i>%1</i>.</qt>").arg(backupName));
}
form->formFile()->setFileName(fileName);
form->formFile()->setModified(modified);
@@ -436,7 +436,7 @@ void MainWindow::runForm()
::stat(m_fileName.local8Bit(), &statbuf);
if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true))
{
- KMessageBox::error(this, i18n("<qt>Cannot create temporary file <i>%1</i>.</qt>").tqarg(m_backupName));
+ KMessageBox::error(this, i18n("<qt>Cannot create temporary file <i>%1</i>.</qt>").arg(m_backupName));
return;
}
form->formFile()->setFileName(m_fileName);
@@ -446,12 +446,12 @@ void MainWindow::runForm()
{
if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true))
{
- KMessageBox::error(this, i18n("<qt>Cannot create backup file <i>%1</i>.</qt>").tqarg(m_fileName + ".backup"));
+ KMessageBox::error(this, i18n("<qt>Cannot create backup file <i>%1</i>.</qt>").arg(m_fileName + ".backup"));
}
::chmod(m_fileName.local8Bit(), S_IRWXU);
KProcess* process = new KProcess;
process->setUseShell(true);
- (*process) << "kmdr-executor" << TQString("\"%1\"").tqarg(form->formFile()->fileName());
+ (*process) << "kmdr-executor" << TQString("\"%1\"").arg(form->formFile()->fileName());
connect(process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), messageLog,
TQT_SLOT(receivedStdout(KProcess*, char*, int)));
connect(process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), messageLog,
@@ -500,7 +500,7 @@ void MainWindow::runForm4()
::stat(m_fileName.local8Bit(), &statbuf);
if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true))
{
- KMessageBox::error(this, i18n("<qt>Cannot create temporary file <i>%1</i>.</qt>").tqarg(m_backupName));
+ KMessageBox::error(this, i18n("<qt>Cannot create temporary file <i>%1</i>.</qt>").arg(m_backupName));
return;
}
form->formFile()->setFileName(m_fileName);
@@ -510,12 +510,12 @@ void MainWindow::runForm4()
{
if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true))
{
- KMessageBox::error(this, i18n("<qt>Cannot create backup file <i>%1</i>.</qt>").tqarg(m_fileName + ".backup"));
+ KMessageBox::error(this, i18n("<qt>Cannot create backup file <i>%1</i>.</qt>").arg(m_fileName + ".backup"));
}
::chmod(m_fileName.local8Bit(), S_IRWXU);
KProcess* process = new KProcess;
process->setUseShell(true);
- (*process) << "kommander" << TQString("\"%1\"").tqarg(form->formFile()->fileName());
+ (*process) << "kommander" << TQString("\"%1\"").arg(form->formFile()->fileName());
connect(process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), messageLog,
TQT_SLOT(receivedStdout(KProcess*, char*, int)));
connect(process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), messageLog,
@@ -952,11 +952,11 @@ void MainWindow::updateUndoRedo(bool undoAvailable, bool redoAvailable,
actionEditUndo->setEnabled(undoAvailable);
actionEditRedo->setEnabled(redoAvailable);
if (!undoCmd.isEmpty())
- actionEditUndo->setText(i18n("&Undo: %1").tqarg(undoCmd));
+ actionEditUndo->setText(i18n("&Undo: %1").arg(undoCmd));
else
actionEditUndo->setText(i18n("&Undo: Not Available"));
if (!redoCmd.isEmpty())
- actionEditRedo->setText(i18n("&Redo: %1").tqarg(redoCmd));
+ actionEditRedo->setText(i18n("&Redo: %1").arg(redoCmd));
else
actionEditRedo->setText(i18n("&Redo: Not Available"));
@@ -1153,7 +1153,7 @@ void MainWindow::handleRMBProperties(int id, TQMap<TQString, int> &props, TQWidg
text = KInputDialog::getText(i18n("Text"), i18n("New text:"), w->property("text").toString(), &ok, this);
}
if (ok) {
- 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,
"text", w->property("text"),
text, TQString(), TQString());
@@ -1165,7 +1165,7 @@ void MainWindow::handleRMBProperties(int id, TQMap<TQString, int> &props, TQWidg
bool ok = false;
TQString title = KInputDialog::getText(i18n("Title"), i18n("New title:"), w->property("title").toString(), &ok, this);
if (ok) {
- TQString pn(i18n("Set the 'title' of '%1'").tqarg(w->name()));
+ TQString pn(i18n("Set the 'title' of '%1'").arg(w->name()));
SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
"title", w->property("title"),
title, TQString(), TQString());
@@ -1177,7 +1177,7 @@ void MainWindow::handleRMBProperties(int id, TQMap<TQString, int> &props, TQWidg
bool ok = false;
TQString text = KInputDialog::getText(i18n("Page Title"), i18n("New page title:"), w->property("pageTitle").toString(), &ok, this);
if (ok) {
- TQString pn(i18n("Set the 'pageTitle' of '%1'").tqarg(w->name()));
+ TQString pn(i18n("Set the 'pageTitle' of '%1'").arg(w->name()));
SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
"pageTitle", w->property("pageTitle"),
text, TQString(), TQString());
@@ -1189,7 +1189,7 @@ void MainWindow::handleRMBProperties(int id, TQMap<TQString, int> &props, TQWidg
TQPixmap oldPix = TQVariant(w->property("pixmap")).toPixmap();
TQPixmap pix = qChoosePixmap(this, formWindow(), oldPix);
if (!pix.isNull()) {
- TQString pn(i18n("Set the 'pixmap' of '%1'").tqarg(w->name()));
+ TQString pn(i18n("Set the 'pixmap' of '%1'").arg(w->name()));
SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
"pixmap", w->property("pixmap"),
pix, TQString(), TQString());
@@ -1214,7 +1214,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
if (w->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) {
TQTabWidget *tw = (TQTabWidget*)w;
if (id == commands[ "add" ]) {
- AddTabPageCommand *cmd = new AddTabPageCommand(i18n("Add Page to %1").tqarg(tw->name()), formWindow(),
+ AddTabPageCommand *cmd = new AddTabPageCommand(i18n("Add Page to %1").arg(tw->name()), formWindow(),
tw, "Tab");
formWindow()->commandHistory()->addCommand(cmd);
cmd->execute();
@@ -1222,7 +1222,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
if (tw->currentPage()) {
QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw;
DeleteTabPageCommand *cmd = 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()->commandHistory()->addCommand(cmd);
cmd->execute();
@@ -1232,7 +1232,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
if (w->inherits(TQTOOLBOX_OBJECT_NAME_STRING)) {
TQToolBox *tw = (TQToolBox*)w;
if (id == commands[ "add" ]) {
- AddToolBoxPageCommand *cmd = new AddToolBoxPageCommand(i18n("Add Page to %1").tqarg(tw->name()), formWindow(),
+ AddToolBoxPageCommand *cmd = new AddToolBoxPageCommand(i18n("Add Page to %1").arg(tw->name()), formWindow(),
tw, "Page");
formWindow()->commandHistory()->addCommand(cmd);
cmd->execute();
@@ -1240,7 +1240,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
if (tw->currentItem()) {
EditorToolBox *dtw = (EditorToolBox*)tw;
DeleteToolBoxPageCommand *cmd = new DeleteToolBoxPageCommand(i18n("Delete Page %1 of %2").
- tqarg(dtw->pageTitle()).tqarg(tw->name()),
+ arg(dtw->pageTitle()).arg(tw->name()),
formWindow(), tw, tw->currentItem());
formWindow()->commandHistory()->addCommand(cmd);
cmd->execute();
@@ -1267,7 +1267,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
if (fw->mainContainer()->inherits(TQWIZARD_OBJECT_NAME_STRING)) {
TQWizard *wiz = (TQWizard*)fw->mainContainer();
if (id == commands[ "add" ]) {
- AddWizardPageCommand *cmd = new AddWizardPageCommand(i18n("Add Page to %1").tqarg(wiz->name()), formWindow(),
+ AddWizardPageCommand *cmd = new AddWizardPageCommand(i18n("Add Page to %1").arg(wiz->name()), formWindow(),
wiz, "Page");
formWindow()->commandHistory()->addCommand(cmd);
cmd->execute();
@@ -1275,7 +1275,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
if (wiz->currentPage()) {
QDesignerWizard *dw = (QDesignerWizard*)wiz;
DeleteWizardPageCommand *cmd = new DeleteWizardPageCommand(i18n("Delete Page %1 of %2").
- tqarg(dw->pageTitle()).tqarg(wiz->name()),
+ arg(dw->pageTitle()).arg(wiz->name()),
formWindow(), wiz, wiz->indexOf(wiz->currentPage()));
formWindow()->commandHistory()->addCommand(cmd);
cmd->execute();
@@ -1290,7 +1290,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
QDesignerWizard *dw = (QDesignerWizard*)wiz;
TQString text = KInputDialog::getText(i18n("Page Title"), i18n("New page title:"), dw->pageTitle(), &ok, this);
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 = new RenameWizardPageCommand(pn, formWindow()
, wiz, wiz->indexOf(wiz->currentPage()), text);
formWindow()->commandHistory()->addCommand(cmd);
@@ -1300,11 +1300,11 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
} else if (fw->mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) {
TQMainWindow *mw = (TQMainWindow*)fw->mainContainer();
if (id == commands[ "add_toolbar" ]) {
- AddToolBarCommand *cmd = new AddToolBarCommand(i18n("Add Toolbar to '%1'").tqarg(formWindow()->name()), formWindow(), mw);
+ AddToolBarCommand *cmd = new AddToolBarCommand(i18n("Add Toolbar to '%1'").arg(formWindow()->name()), formWindow(), mw);
formWindow()->commandHistory()->addCommand(cmd);
cmd->execute();
} else if (id == commands[ "add_menu_item" ]) {
- AddMenuCommand *cmd = new AddMenuCommand(i18n("Add Menu to '%1'").tqarg(formWindow()->name()), formWindow(), mw);
+ AddMenuCommand *cmd = new AddMenuCommand(i18n("Add Menu to '%1'").arg(formWindow()->name()), formWindow(), mw);
formWindow()->commandHistory()->addCommand(cmd);
cmd->execute();
}
@@ -1621,7 +1621,7 @@ ActionEditor *MainWindow::actioneditor() const
bool MainWindow::openEditor(TQWidget* w, FormWindow*)
{
if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))))) {
- statusBar()->message(i18n("Edit %1...").tqarg(w->className()));
+ statusBar()->message(i18n("Edit %1...").arg(w->className()));
WidgetFactory::editWidget(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))), this, w, formWindow());
statusBar()->clear();
return true;
@@ -1639,7 +1639,7 @@ bool MainWindow::openEditor(TQWidget* w, FormWindow*)
text = KInputDialog::getText(i18n("Text"), i18n("New text:"), w->property("text").toString(), &ok, this);
}
if (ok) {
- TQString pn(i18n("Set the 'text' of '%2'").tqarg(w->name()));
+ TQString pn(i18n("Set the 'text' of '%2'").arg(w->name()));
SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
"text", w->property("text"),
text, TQString(), TQString());
@@ -1654,7 +1654,7 @@ bool MainWindow::openEditor(TQWidget* w, FormWindow*)
TQString text;
text = KInputDialog::getText(i18n("Title"), i18n("New title:"), w->property("title").toString(), &ok, this);
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,
"title", w->property("title"),
text, TQString(), TQString());
diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index a35bbd8b..557d109e 100644
--- a/kommander/editor/mainwindowactions.cpp
+++ b/kommander/editor/mainwindowactions.cpp
@@ -170,7 +170,7 @@ void MainWindow::setupEditActions()
KToolBar *tb = new KToolBar(this, "Edit");
tb->setFullSize(false);
- TQWhatsThis::add(tb, i18n("<b>The Edit toolbar</b>%1").tqarg(toolbarHelp));
+ TQWhatsThis::add(tb, i18n("<b>The Edit toolbar</b>%1").arg(toolbarHelp));
addToolBar(tb, i18n("Edit"));
actionEditUndo->plug(tb);
actionEditRedo->plug(tb);
@@ -249,13 +249,13 @@ void MainWindow::setupLayoutActions()
actionCollection(), TQString::number(id).latin1());
a->setExclusiveGroup("tool");
a->setText(i18n("Add ") + WidgetDatabase::className(id));
- a->setToolTip(i18n("Insert a %1").tqarg(WidgetDatabase::toolTip(id)));
+ a->setToolTip(i18n("Insert a %1").arg(WidgetDatabase::toolTip(id)));
a->setWhatsThis(i18n("<b>A %1</b><p>%2</p>"
"<p>Click to insert a single %3,"
- "or double click to keep the tool selected.").tqarg(WidgetDatabase::toolTip(id)).
- tqarg(WidgetDatabase::whatsThis(id)).tqarg(WidgetDatabase::toolTip(id)));
+ "or double click to keep the tool selected.").arg(WidgetDatabase::toolTip(id)).
+ arg(WidgetDatabase::whatsThis(id)).arg(WidgetDatabase::toolTip(id)));
- TQWhatsThis::add(layoutToolBar, i18n("<b>The Layout toolbar</b>%1").tqarg(toolbarHelp));
+ TQWhatsThis::add(layoutToolBar, i18n("<b>The Layout toolbar</b>%1").arg(toolbarHelp));
actionEditAdjustSize->plug(layoutToolBar);
layoutToolBar->addSeparator();
actionEditHLayout->plug(layoutToolBar);
@@ -306,7 +306,7 @@ void MainWindow::setupToolActions()
KToolBar *tb = new KToolBar(this, "Tools");
tb->setFullSize(false);
- TQWhatsThis::add(tb, i18n("<b>The Tools toolbar</b>%1").tqarg(toolbarHelp));
+ TQWhatsThis::add(tb, i18n("<b>The Tools toolbar</b>%1").arg(toolbarHelp));
addToolBar(tb, i18n("Tools"), TQMainWindow::DockTop, true);
actionPointerTool->plug(tb);
@@ -330,14 +330,14 @@ void MainWindow::setupToolActions()
bool plural = grp[(int) grp.length() - 1] == 's';
if (plural)
{
- TQWhatsThis::add(tb, i18n("<b>The %1</b>%2").tqarg(grp).tqarg(toolbarHelp).
- tqarg(i18n(" Click on a button to insert a single widget, "
- "or double click to insert multiple %1.")).tqarg(grp));
+ TQWhatsThis::add(tb, i18n("<b>The %1</b>%2").arg(grp).arg(toolbarHelp).
+ arg(i18n(" Click on a button to insert a single widget, "
+ "or double click to insert multiple %1.")).arg(grp));
} else
{
- TQWhatsThis::add(tb, i18n("<b>The %1 Widgets</b>%2").tqarg(grp).tqarg(toolbarHelp).
- tqarg(i18n(" Click on a button to insert a single %1 widget, "
- "or double click to insert multiple widgets.")).tqarg(grp));
+ TQWhatsThis::add(tb, i18n("<b>The %1 Widgets</b>%2").arg(grp).arg(toolbarHelp).
+ arg(i18n(" Click on a button to insert a single %1 widget, "
+ "or double click to insert multiple widgets.")).arg(grp));
}
addToolBar(tb, grp);
TQPopupMenu *menu = new TQPopupMenu(this, grp.latin1());
@@ -363,11 +363,11 @@ void MainWindow::setupToolActions()
a->setToolTip(ttip);
if (!WidgetDatabase::isWhatsThisLoaded())
WidgetDatabase::loadWhatsThis(documentationPath());
- a->setToolTip(i18n("Insert a %1").tqarg(WidgetDatabase::className(i)));
+ a->setToolTip(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())
- 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>"));
if (grp != "KDE")
@@ -409,7 +409,7 @@ void MainWindow::setupFileActions()
fileTb = new KToolBar(this, "File");
fileTb->setFullSize(false);
- TQWhatsThis::add(fileTb, i18n("<b>The File toolbar</b>%1").tqarg(toolbarHelp));
+ TQWhatsThis::add(fileTb, i18n("<b>The File toolbar</b>%1").arg(toolbarHelp));
addToolBar(fileTb, i18n("File"));
fileMenu = new TQPopupMenu(this, "File");
menuBar()->insertItem(i18n("&File"), fileMenu);
@@ -560,7 +560,7 @@ void MainWindow::setupWindowActions()
j++;
TQString itemText;
if (j < 10)
- itemText = TQString("&%1 ").tqarg(j);
+ itemText = TQString("&%1 ").arg(j);
if (w->inherits("FormWindow"))
itemText += w->name();
else
@@ -671,7 +671,7 @@ FormWindow *MainWindow::openFormWindow(const TQString &filename, bool validFileN
}
if (!makeNew)
{
- statusBar()->message(i18n("Reading file '%1'...").tqarg(filename));
+ statusBar()->message(i18n("Reading file '%1'...").arg(filename));
if (TQFile::exists(filename))
{
TQApplication::setOverrideCursor(WaitCursor);
@@ -684,14 +684,14 @@ FormWindow *MainWindow::openFormWindow(const TQString &filename, bool validFileN
TQApplication::restoreOverrideCursor();
if (b)
{
- statusBar()->message(i18n("Loaded file '%1'").tqarg(filename), 3000);
+ statusBar()->message(i18n("Loaded file '%1'").arg(filename), 3000);
} else
{
emit removedFormFile(ff);
ff->close();
delete ff;
- statusBar()->message(i18n("Could not load file '%1'").tqarg(filename), 5000);
- KMessageBox::information(this, i18n("Could not load file '%1'").tqarg(filename), i18n("Load File"));
+ statusBar()->message(i18n("Could not load file '%1'").arg(filename), 5000);
+ KMessageBox::information(this, i18n("Could not load file '%1'").arg(filename), i18n("Load File"));
}
return (FormWindow *) resource.widget();
} else
@@ -845,7 +845,7 @@ void MainWindow::createNewTemplate()
ts << " <cstring>" << cn << "Form</cstring>" << endl;
ts << "</property>" << endl;
ts << "<property stdset=\"1\">" << endl;
- ts << " <name>tqgeometry</name>" << endl;
+ ts << " <name>geometry</name>" << endl;
ts << " <rect>" << endl;
ts << " <width>300</width>" << endl;
ts << " <height>400</height>" << endl;
diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp
index 0968eafd..88dd6a21 100644
--- a/kommander/editor/messagelog.cpp
+++ b/kommander/editor/messagelog.cpp
@@ -125,12 +125,12 @@ void MessageLog::saveToFile()
TQFileInfo fileinfo(url.path());
if (fileinfo.exists() && KMessageBox::warningContinueCancel(0,
i18n("<qt>File<br><b>%1</b><br>already exists. Overwrite it?</qt>")
- .tqarg(url.path()), TQString(), i18n("Overwrite")) == KMessageBox::Cancel)
+ .arg(url.path()), TQString(), i18n("Overwrite")) == KMessageBox::Cancel)
return;
TQFile file(url.path());
if (!file.open(IO_WriteOnly)) {
KMessageBox::error(0, i18n("<qt>Cannot save log file<br><b>%1</b></qt>")
- .tqarg(url.url()));
+ .arg(url.url()));
return;
}
TQTextStream textfile(&file);
diff --git a/kommander/editor/metadatabase.cpp b/kommander/editor/metadatabase.cpp
index ff401fd3..4a9ada61 100644
--- a/kommander/editor/metadatabase.cpp
+++ b/kommander/editor/metadatabase.cpp
@@ -147,14 +147,14 @@ void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bo
if ( doUpdate &&
( property == "hAlign" || property == "vAlign" || property == "wordwrap" ) ) {
doUpdate = false;
- setPropertyChanged( o, "tqalignment", changed ||
+ setPropertyChanged( o, "alignment", changed ||
isPropertyChanged( o, "hAlign" ) ||
isPropertyChanged( o, "vAlign" ) ||
isPropertyChanged( o, "wordwrap" ) );
doUpdate = true;
}
- if ( doUpdate && property == "tqalignment" ) {
+ if ( doUpdate && property == "alignment" ) {
doUpdate = false;
setPropertyChanged( o, "hAlign", changed );
setPropertyChanged( o, "vAlign", changed );
@@ -465,9 +465,9 @@ void MetaDataBase::doConnections( TQObject *o )
delete l;
}
TQString s = "2""%1";
- s = s.tqarg( conn.signal.data() );
+ s = s.arg( conn.signal.data() );
TQString s2 = "1""%1";
- s2 = s2.tqarg( conn.slot.data() );
+ s2 = s2.arg( conn.slot.data() );
TQStrList signalList = sender->metaObject()->signalNames( true );
TQStrList slotList = receiver->metaObject()->slotNames( true );
diff --git a/kommander/editor/multilineeditor.ui b/kommander/editor/multilineeditor.ui
index 2c2c4f6d..e08dd943 100644
--- a/kommander/editor/multilineeditor.ui
+++ b/kommander/editor/multilineeditor.ui
@@ -25,7 +25,7 @@
<cstring>MultiLineEditorBase</cstring>
</property>
<property stdset="1">
- <name>tqgeometry</name>
+ <name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
diff --git a/kommander/editor/multilineeditorimpl.cpp b/kommander/editor/multilineeditorimpl.cpp
index ce5efe77..5a9c4f1b 100644
--- a/kommander/editor/multilineeditorimpl.cpp
+++ b/kommander/editor/multilineeditorimpl.cpp
@@ -34,7 +34,7 @@ MultiLineEditor::MultiLineEditor( TQWidget *parent, TQWidget *editWidget, FormWi
connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
mlined = (TQMultiLineEdit*)editWidget;
// #### complete list of properties here
- preview->setAlignment( mlined->tqalignment() );
+ preview->setAlignment( mlined->alignment() );
preview->setMaxLines( mlined->maxLines() );
preview->setWordWrap( mlined->wordWrap() );
preview->setWrapColumnOrWidth( mlined->wrapColumnOrWidth() );
@@ -53,7 +53,7 @@ void MultiLineEditor::okClicked()
void MultiLineEditor::applyClicked()
{
- PopulateMultiLineEditCommand *cmd = new PopulateMultiLineEditCommand( i18n("Set Text of '%1'" ).tqarg( mlined->name() ),
+ PopulateMultiLineEditCommand *cmd = new PopulateMultiLineEditCommand( i18n("Set Text of '%1'" ).arg( mlined->name() ),
formwindow, mlined, preview->text() );
cmd->execute();
formwindow->commandHistory()->addCommand( cmd );
diff --git a/kommander/editor/newformimpl.cpp b/kommander/editor/newformimpl.cpp
index ca029d48..48a7e5bb 100644
--- a/kommander/editor/newformimpl.cpp
+++ b/kommander/editor/newformimpl.cpp
@@ -121,7 +121,7 @@ void CustomFormItem::insert()
if (!resource.load(ff))
{
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;
return;
}
diff --git a/kommander/editor/paletteeditor.ui b/kommander/editor/paletteeditor.ui
index 4c8f89ad..cadcb3f5 100644
--- a/kommander/editor/paletteeditor.ui
+++ b/kommander/editor/paletteeditor.ui
@@ -67,7 +67,7 @@
<property name="title">
<string>Build Palette</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignAuto</set>
</property>
<hbox>
@@ -110,7 +110,7 @@
<property name="text">
<string>&amp;3D effects:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter</set>
</property>
<property name="buddy" stdset="0">
@@ -172,7 +172,7 @@
<property name="text">
<string>Back&amp;ground:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter</set>
</property>
<property name="buddy" stdset="0">
diff --git a/kommander/editor/pixmapchooser.cpp b/kommander/editor/pixmapchooser.cpp
index ef8636c0..a2f8356c 100644
--- a/kommander/editor/pixmapchooser.cpp
+++ b/kommander/editor/pixmapchooser.cpp
@@ -886,7 +886,7 @@ void PixmapView::setPixmap( const TQPixmap &pix )
{
pixmap = pix;
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 )
diff --git a/kommander/editor/pixmapfunction.ui b/kommander/editor/pixmapfunction.ui
index f4b241e3..e93a94b5 100644
--- a/kommander/editor/pixmapfunction.ui
+++ b/kommander/editor/pixmapfunction.ui
@@ -25,7 +25,7 @@
<cstring>PixmapFunction</cstring>
</property>
<property stdset="1">
- <name>tqgeometry</name>
+ <name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp
index ad46f6ec..8c68ed5e 100644
--- a/kommander/editor/propertyeditor.cpp
+++ b/kommander/editor/propertyeditor.cpp
@@ -105,7 +105,7 @@ static TQStringList getFontList()
fontDataBase = new TQFontDatabase;
qAddPostRoutine( cleanupFontDatabase );
}
- return fontDataBase->tqfamilies();
+ return fontDataBase->families();
}
@@ -317,9 +317,9 @@ void PropertyItem::setOpen( bool b )
open = b;
if ( !open ) {
- tqchildren.setAutoDelete( true );
- tqchildren.clear();
- tqchildren.setAutoDelete( false );
+ children.setAutoDelete( true );
+ children.clear();
+ children.setAutoDelete( false );
tqApp->processEvents();
listview->updateEditorSize();
return;
@@ -375,7 +375,7 @@ void PropertyItem::setChanged( bool b, bool updateDb )
if ( changed == b )
return;
changed = b;
- tqrepaint();
+ repaint();
if ( updateDb )
MetaDataBase::setPropertyChanged( listview->propertyEditor()->widget(), name(), changed );
updateResetButtonState();
@@ -475,18 +475,18 @@ void PropertyItem::childValueChanged( PropertyItem * )
void PropertyItem::addChild( PropertyItem *i )
{
- tqchildren.append( i );
+ children.append( i );
}
int PropertyItem::childCount() const
{
- return tqchildren.count();
+ return children.count();
}
PropertyItem *PropertyItem::child( int i ) const
{
// 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
@@ -1580,7 +1580,7 @@ void PropertyPixmapItem::setValue( const TQVariant &v )
else
pixPrev->setPixmap( v.toIconSet().pixmap() );
PropertyItem::setValue( v );
- tqrepaint();
+ repaint();
}
void PropertyPixmapItem::getPixmap()
@@ -1617,8 +1617,8 @@ void PropertyPixmapItem::drawCustomContents( TQPainter *p, const TQRect &r )
// --------------------------------------------------------------
PropertyColorItem::PropertyColorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
- const TQString &propName, bool tqchildren )
- : PropertyItem( l, after, prop, propName ), withChildren( tqchildren )
+ const TQString &propName, bool children )
+ : PropertyItem( l, after, prop, propName ), withChildren( children )
{
box = new TQHBox( listview->viewport() );
box->hide();
@@ -2112,7 +2112,7 @@ void PropertySizePolicyItem::setValue( const TQVariant &v )
return;
TQString s = TQString( "%1/%2/%2/%2" );
- 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( v.toSizePolicy().horStretch() ).
arg( v.toSizePolicy().verStretch() );
@@ -2185,7 +2185,7 @@ void PropertyPaletteItem::setValue( const TQVariant &v )
TQString s;
palettePrev->setPalette( v.toPalette() );
PropertyItem::setValue( v );
- tqrepaint();
+ repaint();
}
void PropertyPaletteItem::getPalette()
@@ -2325,7 +2325,7 @@ void PropertyCursorItem::showEditor()
PropertyItem::showEditor();
if ( !comb ) {
combo()->blockSignals( true );
- combo()->setCurrentItem( (int)value().toCursor().tqshape() );
+ combo()->setCurrentItem( (int)value().toCursor().shape() );
combo()->blockSignals( false );
}
placeEditor( combo() );
@@ -2348,7 +2348,7 @@ void PropertyCursorItem::setValue( const TQVariant &v )
return;
combo()->blockSignals( true );
- combo()->setCurrentItem( (int)v.toCursor().tqshape() );
+ combo()->setCurrentItem( (int)v.toCursor().shape() );
combo()->blockSignals( false );
setText( 1, combo()->currentText() );
PropertyItem::setValue( v );
@@ -2642,7 +2642,7 @@ void PropertyList::setupProperties()
if ( p->designable(w) ) {
if ( p->isSetType() ) {
- if ( TQString( p->name() ) == "tqalignment" ) {
+ if ( TQString( p->name() ) == "alignment" ) {
TQStringList lst;
lst << p->valueToKey( AlignAuto )
<< p->valueToKey( AlignLeft )
@@ -2672,7 +2672,7 @@ void PropertyList::setupProperties()
item->setChanged( true, false );
}
} else {
- qWarning( "Sets except 'tqalignment' not supported yet.... %s.", p->name() );
+ qWarning( "Sets except 'alignment' not supported yet.... %s.", p->name() );
}
} else if ( p->isEnumType() ) {
TQStrList l = p->enumKeys();
@@ -2882,7 +2882,7 @@ void PropertyList::valueChanged( PropertyItem *i )
{
if ( !editor->widget() )
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(),
editor->widget(), editor,
i->name(), WidgetFactory::property( editor->widget(), i->name() ),
@@ -3065,21 +3065,21 @@ void PropertyList::setPropertyValue( PropertyItem *i )
property( editor->widget()->metaObject()->findProperty( i->name(), true), true );
if ( !p ) {
if ( i->name() == "hAlign" ) {
- int align = editor->widget()->property( "tqalignment" ).toInt();
+ int align = editor->widget()->property( "alignment" ).toInt();
p = editor->widget()->metaObject()->
- property( editor->widget()->metaObject()->findProperty( "tqalignment", true ), true );
+ property( editor->widget()->metaObject()->findProperty( "alignment", true ), true );
align &= ~AlignVertical_Mask;
TQStrList l = p->valueToKeys( align );
clearAlignList( l );
( (PropertyListItem*)i )->setCurrentItem( l.last() );
} else if ( i->name() == "vAlign" ) {
- int align = editor->widget()->property( "tqalignment" ).toInt();
+ int align = editor->widget()->property( "alignment" ).toInt();
p = editor->widget()->metaObject()->
- property( editor->widget()->metaObject()->findProperty( "tqalignment", true ), true );
+ property( editor->widget()->metaObject()->findProperty( "alignment", true ), true );
align &= ~AlignHorizontal_Mask;
( (PropertyListItem*)i )->setCurrentItem( p->valueToKeys( align ).last() );
} else if ( i->name() == "wordwrap" ) {
- int align = editor->widget()->property( "tqalignment" ).toInt();
+ int align = editor->widget()->property( "alignment" ).toInt();
if ( align & WordBreak )
i->setValue( TQVariant( true, 0 ) );
else
@@ -3134,7 +3134,7 @@ void PropertyList::resetProperty()
PropertyItem *i = (PropertyItem*)currentItem();
if ( !MetaDataBase::isPropertyChanged( editor->widget(), i->PropertyItem::name() ) )
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(),
editor->widget(), editor,
i->name(), i->value(),
@@ -3241,7 +3241,7 @@ TQString PropertyList::whatsThisText( TQListViewItem *i )
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()
@@ -3588,7 +3588,7 @@ void PropertyEditor::setWidget( TQObject *w, FormWindow *fw )
wid = w;
formwindow = fw;
- setCaption( i18n("Property Editor (%1)" ).tqarg( formwindow->name() ) );
+ setCaption( i18n("Property Editor (%1)" ).arg( formwindow->name() ) );
listview->viewport()->setUpdatesEnabled( false );
listview->setUpdatesEnabled( false );
clear();
diff --git a/kommander/editor/propertyeditor.h b/kommander/editor/propertyeditor.h
index b49924e2..d0eb517b 100644
--- a/kommander/editor/propertyeditor.h
+++ b/kommander/editor/propertyeditor.h
@@ -118,7 +118,7 @@ private:
bool open, changed;
PropertyItem *property;
TQString propertyName;
- TQPtrList<PropertyItem> tqchildren;
+ TQPtrList<PropertyItem> children;
TQColor backColor;
TQPushButton *resetButton;
@@ -340,7 +340,7 @@ class PropertyColorItem : public TQObject,
public:
PropertyColorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
- const TQString &propName, bool tqchildren );
+ const TQString &propName, bool children );
~PropertyColorItem();
virtual void createChildren();
diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp
index c5450658..8a804858 100644
--- a/kommander/editor/resource.cpp
+++ b/kommander/editor/resource.cpp
@@ -931,7 +931,7 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent )
{
const TQObjectList l = obj->childrenListObject();
if ( l.isEmpty() )
- return; // no tqchildren to save
+ return; // no children to save
TQString closeTag;
// if the widget has a tqlayout we pretend that all widget's childs are childs of the tqlayout - makes the structure nicer
@@ -1240,7 +1240,7 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant
ts << makeIndent( indent ) << "</palette>" << endl;
} break;
case TQVariant::Cursor:
- ts << makeIndent( indent ) << "<cursor>" << value.toCursor().tqshape() << "</cursor>" << endl;
+ ts << makeIndent( indent ) << "<cursor>" << value.toCursor().shape() << "</cursor>" << endl;
break;
case TQVariant::StringList: {
TQStringList lst = value.toStringList();
@@ -1631,10 +1631,10 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay
formwindow->insertWidget( spacer, pasting );
if ( tqlayout ) {
if ( tqlayout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) )
- ( (TQBoxLayout*)tqlayout )->addWidget( spacer, 0, spacer->tqalignment() );
+ ( (TQBoxLayout*)tqlayout )->addWidget( spacer, 0, spacer->alignment() );
else
( (QDesignerGridLayout*)tqlayout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1,
- spacer->tqalignment() );
+ spacer->alignment() );
}
return spacer;
}
diff --git a/kommander/editor/sizehandle.cpp b/kommander/editor/sizehandle.cpp
index 10b4efb3..7b0d4a97 100644
--- a/kommander/editor/sizehandle.cpp
+++ b/kommander/editor/sizehandle.cpp
@@ -208,7 +208,7 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e )
sel->updateGeometry();
oldPressPos += ( p - pos() );
- formWindow->sizePreview()->setText( TQString( "%1/%2" ).tqarg( widget->width() ).tqarg( widget->height() ) );
+ formWindow->sizePreview()->setText( TQString( "%1/%2" ).arg( widget->width() ).arg( widget->height() ) );
formWindow->sizePreview()->adjustSize();
TQRect lg( formWindow->mapFromGlobal( e->globalPos() ) + TQPoint( 16, 16 ),
formWindow->sizePreview()->size() );
@@ -226,11 +226,11 @@ void SizeHandle::mouseReleaseEvent( TQMouseEvent *e )
return;
formWindow->sizePreview()->hide();
- if ( geom != widget->tqgeometry() )
+ if ( geom != widget->geometry() )
formWindow->commandHistory()->addCommand( new ResizeCommand( i18n("Resize" ),
formWindow,
widget, origGeom,
- widget->tqgeometry() ) );
+ widget->geometry() ) );
formWindow->emitUpdateProperties( TQT_TQOBJECT(widget) );
}
diff --git a/kommander/editor/tableeditorimpl.cpp b/kommander/editor/tableeditorimpl.cpp
index 5fc56f41..f54094b3 100644
--- a/kommander/editor/tableeditorimpl.cpp
+++ b/kommander/editor/tableeditorimpl.cpp
@@ -312,7 +312,7 @@ void TableEditor::applyClicked()
row.pix = table->verticalHeader()->iconSet( i )->pixmap();
rows.append( row );
}
- PopulateTableCommand *cmd = new PopulateTableCommand( i18n("Edit Rows and Columns of '%1' " ).tqarg( editTable->name() ),
+ PopulateTableCommand *cmd = new PopulateTableCommand( i18n("Edit Rows and Columns of '%1' " ).arg( editTable->name() ),
formWindow, editTable, rows, cols );
cmd->execute();
formWindow->commandHistory()->addCommand( cmd );
diff --git a/kommander/editor/widgetdatabase.cpp b/kommander/editor/widgetdatabase.cpp
index 37c9672d..62b7bea8 100644
--- a/kommander/editor/widgetdatabase.cpp
+++ b/kommander/editor/widgetdatabase.cpp
@@ -833,7 +833,7 @@ bool WidgetDatabase::isForm( int id )
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 )
diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp
index 585d720d..815c9f89 100644
--- a/kommander/editor/widgetfactory.cpp
+++ b/kommander/editor/widgetfactory.cpp
@@ -1336,7 +1336,7 @@ TQWidget *WidgetFactory::layoutParent( TQLayout *tqlayout )
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.
Usually that is \a w itself, sometimes it is different (e.g. a
@@ -1678,7 +1678,7 @@ bool WidgetFactory::resetProperty( TQObject *w, const TQString &propName )
TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName )
{
if ( propName == "wordwrap" ) {
- int v = defaultValue( w, "tqalignment" ).toInt();
+ int v = defaultValue( w, "alignment" ).toInt();
return TQVariant( ( v & WordBreak ) == WordBreak, 0 );
} else if ( propName == "toolTip" || propName == "whatsThis" ) {
return TQVariant( TQString::fromLatin1( "" ) );
@@ -1704,7 +1704,7 @@ TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propNam
const TQMetaProperty *p = w->metaObject()->
property( w->metaObject()->findProperty( propName, true ), true );
if ( !p ) {
- int v = defaultValue( w, "tqalignment" ).toInt();
+ int v = defaultValue( w, "alignment" ).toInt();
if ( propName == "hAlign" ) {
if ( ( v & AlignAuto ) == AlignAuto )
return "AlignAuto";
@@ -1912,7 +1912,7 @@ void TQLayoutWidget::updateSizePolicy()
vt = TQSizePolicy::Expanding;
#endif // USE_QT4
- tqlayout()->tqinvalidate();
+ tqlayout()->invalidate();
}
sp = TQSizePolicy( (TQSizePolicy::SizeType) ht, (TQSizePolicy::SizeType) vt );
diff --git a/kommander/editor/wizardeditorimpl.cpp b/kommander/editor/wizardeditorimpl.cpp
index 56ff0028..129760d1 100644
--- a/kommander/editor/wizardeditorimpl.cpp
+++ b/kommander/editor/wizardeditorimpl.cpp
@@ -109,7 +109,7 @@ void WizardEditor::addClicked()
listBox->insertItem( i18n( "Page" ), index );
// 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);
commands.append( cmd );
@@ -128,7 +128,7 @@ void WizardEditor::removeClicked()
// schedule remove command
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 );
commands.append( cmd );
@@ -148,8 +148,8 @@ void WizardEditor::upClicked()
listBox->setCurrentItem( index2 );
// schedule swap command
- SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n("Swap Pages %1 and %2 of %3" ).tqarg( index1 ).tqarg( index2 )
- .tqarg( wizard->name() ), formwindow, wizard, index1, index2);
+ SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n("Swap Pages %1 and %2 of %3" ).arg( index1 ).arg( index2 )
+ .arg( wizard->name() ), formwindow, wizard, index1, index2);
commands.append( cmd );
// update buttons
@@ -168,8 +168,8 @@ void WizardEditor::downClicked()
listBox->setCurrentItem( index2 );
// 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 );
// update buttons
@@ -199,7 +199,7 @@ void WizardEditor::itemSelected( int index )
bool ok = false;
TQString text = KInputDialog::getText( i18n("Page Title"), i18n("New page title:" ), listBox->text( index ), &ok, this );
if ( ok ) {
- TQString pn( i18n("Rename page %1 of %2" ).tqarg( listBox->text( index ) ).tqarg( wizard->name() ) );
+ TQString pn( i18n("Rename page %1 of %2" ).arg( listBox->text( index ) ).arg( wizard->name() ) );
RenameWizardPageCommand *cmd = new RenameWizardPageCommand( pn, formwindow, wizard, index, text );
commands.append( cmd );
listBox->changeItem( text, index );
diff --git a/kommander/editor/workspace.cpp b/kommander/editor/workspace.cpp
index 99fcf474..506b603e 100644
--- a/kommander/editor/workspace.cpp
+++ b/kommander/editor/workspace.cpp
@@ -485,9 +485,9 @@ void Workspace::update( FormFile* ff )
{
TQListViewItem* i = findItem( ff );
if ( i ) {
- i->tqrepaint();
+ i->repaint();
if ( (i = i->firstChild()) )
- i->tqrepaint();
+ i->repaint();
}
}
diff --git a/kommander/examples/current/passvariables.kmdr b/kommander/examples/current/passvariables.kmdr
index 7ea9a156..3d4b848d 100644
--- a/kommander/examples/current/passvariables.kmdr
+++ b/kommander/examples/current/passvariables.kmdr
@@ -90,7 +90,7 @@ LineEdit6.setText(ret)</string>
<property name="text">
<string>Set</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -101,7 +101,7 @@ LineEdit6.setText(ret)</string>
<property name="text">
<string>Pass back</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -140,7 +140,7 @@ endif</string>
<property name="text">
<string>Pass back</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -151,7 +151,7 @@ endif</string>
<property name="text">
<string>Set with @</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -162,7 +162,7 @@ endif</string>
<property name="text">
<string>Return</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -178,7 +178,7 @@ endif</string>
<property name="text">
<string>Return</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/kommander/examples/tutorial/widgets.kmdr b/kommander/examples/tutorial/widgets.kmdr
index 3cdd5e1c..5f283e49 100644
--- a/kommander/examples/tutorial/widgets.kmdr
+++ b/kommander/examples/tutorial/widgets.kmdr
@@ -68,7 +68,7 @@
</property>
<property name="associations" stdset="0">
<stringlist>
- <string>@WidgetList.setText(@Form1.tqchildren(true))</string>
+ <string>@WidgetList.setText(@Form1.children(true))</string>
</stringlist>
</property>
</widget>
diff --git a/kommander/executor/dcopkommanderif.h b/kommander/executor/dcopkommanderif.h
index 3158fa6e..1ba67cbb 100644
--- a/kommander/executor/dcopkommanderif.h
+++ b/kommander/executor/dcopkommanderif.h
@@ -58,7 +58,7 @@ virtual void setChecked(const TQString &widgetName, bool checked) = 0;
virtual void setAssociatedText(const TQString &widgetName, const TQString &text) = 0;
virtual TQStringList associatedText(const TQString &widgetName) = 0;
virtual TQString type(const TQString& widget) = 0;
-virtual TQStringList tqchildren(const TQString& parent, bool recursive) = 0;
+virtual TQStringList children(const TQString& parent, bool recursive) = 0;
virtual TQString global(const TQString& variableName) = 0;
virtual void setGlobal(const TQString& variableName, const TQString& value) = 0;
virtual void setMaximum(const TQString &widgetName, int value) = 0;
diff --git a/kommander/executor/instance.cpp b/kommander/executor/instance.cpp
index 44e56c21..f322b913 100644
--- a/kommander/executor/instance.cpp
+++ b/kommander/executor/instance.cpp
@@ -75,7 +75,7 @@ void Instance::addCmdlineArguments(const TQStringList& args)
}
int i = 0;
for (TQStringList::ConstIterator it = stdArgs.begin(); it != stdArgs.end(); ++it)
- m_textInstance->setGlobal(TQString("_ARG%1").tqarg(++i), *it);
+ m_textInstance->setGlobal(TQString("_ARG%1").arg(++i), *it);
m_textInstance->setGlobal("_ARGS", stdArgs.join(" "));
m_textInstance->setGlobal("_ARGCOUNT", TQString::number(stdArgs.count()));
}
@@ -185,7 +185,7 @@ bool Instance::isFileValid(const KURL& fname) const
if (!TQFileInfo(fname.path()).exists())
{
KMessageBox::sorry(0, i18n("<qt>Kommander file<br><b>%1</b><br>does not "
- "exist.</qt>").tqarg(fname.path()));
+ "exist.</qt>").arg(fname.path()));
return false;
}
@@ -220,7 +220,7 @@ bool Instance::isFileValid(const KURL& fname) const
}
if (!TQFileInfo(fname.path()).isExecutable())
{
- if (KMessageBox::warningContinueCancel(0, i18n("<qt>The Kommander file <i>%1</i> does not have the <b>executable attribute</b> set and could possibly contain dangerous exploits.<p>If you trust the scripting (viewable in kmdr-editor) in this program, make it executable to get rid of this warning.<p>Are you sure you want to continue?</qt>").tqarg(fname.pathOrURL()), TQString(), i18n("Run Nevertheless")) == KMessageBox::Cancel)
+ if (KMessageBox::warningContinueCancel(0, i18n("<qt>The Kommander file <i>%1</i> does not have the <b>executable attribute</b> set and could possibly contain dangerous exploits.<p>If you trust the scripting (viewable in kmdr-editor) in this program, make it executable to get rid of this warning.<p>Are you sure you want to continue?</qt>").arg(fname.pathOrURL()), TQString(), i18n("Run Nevertheless")) == KMessageBox::Cancel)
return false;
}
return true;
@@ -431,7 +431,7 @@ TQString Instance::type(const TQString& widget)
return TQString();
}
-TQStringList Instance::tqchildren(const TQString& parent, bool recursive)
+TQStringList Instance::children(const TQString& parent, bool recursive)
{
TQStringList matching;
TQObject* child = stringToWidget(parent);
diff --git a/kommander/executor/instance.h b/kommander/executor/instance.h
index c61f0c03..231a8189 100644
--- a/kommander/executor/instance.h
+++ b/kommander/executor/instance.h
@@ -90,7 +90,7 @@ public:
virtual void setAssociatedText(const TQString &widgetName, const TQString &text);
virtual TQStringList associatedText(const TQString &widgetName);
virtual TQString type(const TQString& widget);
- virtual TQStringList tqchildren(const TQString& parent, bool recursive);
+ virtual TQStringList children(const TQString& parent, bool recursive);
virtual TQString global(const TQString& variableName);
virtual void setGlobal(const TQString& variableName, const TQString& value);
virtual void setMaximum(const TQString &widgetName, int value);
diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp
index 7820c848..03b82473 100644
--- a/kommander/factory/kommanderfactory.cpp
+++ b/kommander/factory/kommanderfactory.cpp
@@ -1093,9 +1093,9 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect
if ( lang == "C++" ) {
TQString s = "2""%1";
- s = s.tqarg( conn.signal.data() );
+ s = s.arg( conn.signal.data() );
TQString s2 = "1""%1";
- s2 = s2.tqarg( conn.slot.data() );
+ s2 = s2.arg( conn.slot.data() );
TQStrList signalList = sender->metaObject()->signalNames( true );
TQStrList slotList = receiver->metaObject()->slotNames( true );
diff --git a/kommander/kmdrtools/dcoptool-oldparser.kmdr b/kommander/kmdrtools/dcoptool-oldparser.kmdr
index 50b4a08d..f4d758ca 100755
--- a/kommander/kmdrtools/dcoptool-oldparser.kmdr
+++ b/kommander/kmdrtools/dcoptool-oldparser.kmdr
@@ -61,7 +61,7 @@ openfiles(QString,QString,QString)")
associatedText(QString)
cellText(QString,int,int)
checked(QString)
-tqchildren(QString,bool)
+children(QString,bool)
clear(QString)
count(QString)
currentColumn(QString)
@@ -645,9 +645,9 @@ fi
@end
@setGlobal(pdlg,@exec(kdialog --menu "Select a dialog other than pid @pid to parse" @global(kdlg)))
@#@exec(kdialog --msgbox "@global(_KDDIR)\n")
-@# dcop kmdr-executor-32730 KommanderIf tqchildren kmdr-executor-32730 1
+@# dcop kmdr-executor-32730 KommanderIf children kmdr-executor-32730 1
@wname.clear
-@setGlobal(items,@dcop(@global(pdlg), KommanderIf, "tqchildren(QString,bool)", @global(pdlg), 1 ))
+@setGlobal(items,@dcop(@global(pdlg), KommanderIf, "children(QString,bool)", @global(pdlg), 1 ))
@setGlobal(iwd,"")
@forEach(i, @global(items))
@setGlobal(iwd, "@global(iwd)@i (@dcop(@global(pdlg), KommanderIf, "type(QString)", @i))\n")
@@ -789,13 +789,13 @@ fi
@setGlobal(PARM4,"")
@setGlobal(short,checked)
@setGlobal(DESC,"Returns 1 for checked boxes, 0 for unchecked.")
-@case(DCOP::tqchildren(QString,bool))
+@case(DCOP::children(QString,bool))
@setGlobal(enWidget,1)
@setGlobal(PARM1,"recursive")
@setGlobal(PARM2,"")
@setGlobal(PARM3,"")
@setGlobal(PARM4,"")
- @setGlobal(short,tqchildren)
+ @setGlobal(short,children)
@setGlobal(DESC,"Returns the list of child widgets contained in the parent widget. Set the &lt;i&gt;recursive&lt;/i&gt; parameter to &lt;i&gt;true&lt;/i&gt; to include widgets contained by child widgets.")
@case(DCOP::clear(QString))
@setGlobal(enWidget,1)
@@ -1820,7 +1820,7 @@ fi
associatedText(QString)
cellText(QString,int,int)
checked(QString)
-tqchildren(QString,bool)
+children(QString,bool)
clear(QString)
count(QString)
currentColumn(QString)
diff --git a/kommander/plugin/specialinformation.cpp b/kommander/plugin/specialinformation.cpp
index bb248dda..d6ed318b 100644
--- a/kommander/plugin/specialinformation.cpp
+++ b/kommander/plugin/specialinformation.cpp
@@ -71,15 +71,15 @@ TQString SpecialFunction::prototype(uint prototypeFlags) const
TQStringList params;
for (uint i=start; i<m_types.count(); i++)
if (prototypeFlags & ShowArgumentNames)
- params.append(TQString("%1 %2").tqarg(m_types[i]).tqarg(m_args[i]));
+ params.append(TQString("%1 %2").arg(m_types[i]).arg(m_args[i]));
else
params.append(m_types[i]);
if (!params.count())
return m_function;
else if (prototypeFlags & NoSpaces)
- return TQString("%1(%2)").tqarg(m_function).tqarg(params.join(","));
+ return TQString("%1(%2)").arg(m_function).arg(params.join(","));
else
- return TQString("%1(%2)").tqarg(m_function).tqarg(params.join(", "));
+ return TQString("%1(%2)").arg(m_function).arg(params.join(", "));
}
TQString SpecialFunction::argumentName(uint i) const
@@ -291,7 +291,7 @@ void SpecialInformation::registerSpecials()
i18n("Returns text of a cell in a table."), 3);
insert(DCOP::checked, "checked(TQString widget)",
i18n("Returns 1 for checked boxes, 0 for unchecked."), 1);
- insert(DCOP::tqchildren, "tqchildren(TQString widget, bool recursive)",
+ insert(DCOP::children, "children(TQString widget, bool recursive)",
i18n("Returns the list of child widgets contained in the parent widget. Set the <i>recursive</i> parameter to <i>true</i> to include widgets contained by child widgets."), 2);
insert(DCOP::clear, "clear(TQString widget)",
i18n("Removes all content from the widget."), 1);
@@ -375,8 +375,8 @@ void SpecialInformation::registerSpecials()
i18n("Returns type(class) of widget."), 1);
insert(DCOP::setEditable, "setEditable(TQString widget, bool editable)",
i18n("Makes the widget editable or read only, depending on the editable argument."), 2);
- insertInternal(DCOP::tqgeometry, "tqgeometry(TQString widget)",
- i18n("Return the widget's tqgeometry as <i>x y w h</i>. This is useful for positioning a created widget."), 1);
+ insertInternal(DCOP::geometry, "geometry(TQString widget)",
+ i18n("Return the widget's geometry as <i>x y w h</i>. This is useful for positioning a created widget."), 1);
insertInternal(DCOP::hasFocus, "hasFocus(TQString widget)",
i18n("Returns true if the widget has focus."), 1);
insertInternal(DCOP::getBackgroundColor, "getBackgroundColor(TQString widget)",
diff --git a/kommander/plugin/specials.h b/kommander/plugin/specials.h
index f7cc3671..2d46200a 100644
--- a/kommander/plugin/specials.h
+++ b/kommander/plugin/specials.h
@@ -28,12 +28,12 @@ namespace Group
namespace DCOP
{
- enum {addUniqueItem, associatedText, cancel, cellText, clear, checked, tqchildren, columnCount, count, currentColumn,
+ enum {addUniqueItem, associatedText, cancel, cellText, clear, checked, children, columnCount, count, currentColumn,
currentItem, currentRow, execute, findItem, global, insertColumn, insertItem, insertItems, insertRow,
item, itemDepth, itemPath, removeColumn, removeItem, removeRow, selection, setAssociatedText, setChecked,
setCellText, setCurrentItem, insertTab, setColumnCaption, setEnabled, setGlobal, setMaximum, setPixmap,
setRowCaption, setSelection, setText, getBackgroundColor, setBackgroundColor,
- setVisible, text, type, setCellWidget, cellWidget, setEditable, tqgeometry, hasFocus, isModified};
+ setVisible, text, type, setCellWidget, cellWidget, setEditable, geometry, hasFocus, isModified};
}
namespace Kommander
diff --git a/kommander/pluginmanager/main.cpp b/kommander/pluginmanager/main.cpp
index 0e663476..a4191778 100644
--- a/kommander/pluginmanager/main.cpp
+++ b/kommander/pluginmanager/main.cpp
@@ -77,12 +77,12 @@ int main(int argc, char *argv[])
QCStringList items = args->getOptionList("add");
for (QCStringList::ConstIterator it = items.begin(); it != items.end(); ++it)
if (!P.add(*it))
- cerr << i18n("Error adding plugin '%1'").tqarg((*it).data()).local8Bit().data();
+ cerr << i18n("Error adding plugin '%1'").arg((*it).data()).local8Bit().data();
items = args->getOptionList("remove");
for (QCStringList::ConstIterator it = items.begin(); it != items.end(); ++it)
if (!P.remove(*it))
- cerr << i18n("Error removing plugin '%1'").tqarg((*it).data()).local8Bit().data();
+ cerr << i18n("Error removing plugin '%1'").arg((*it).data()).local8Bit().data();
if (args->isSet("list"))
{
diff --git a/kommander/pluginmanager/mainwindow.cpp b/kommander/pluginmanager/mainwindow.cpp
index 6148296b..94d365f5 100644
--- a/kommander/pluginmanager/mainwindow.cpp
+++ b/kommander/pluginmanager/mainwindow.cpp
@@ -77,7 +77,7 @@ void MainWindow::add(const TQString &plugin)
{
if (!m_pluginManager->add(plugin))
{
- TQString errMsg = i18n("<qt>Unable to load Kommander plugin<br><b>%1</b></qt>").tqarg(plugin);
+ TQString errMsg = i18n("<qt>Unable to load Kommander plugin<br><b>%1</b></qt>").arg(plugin);
KMessageBox::error(this, errMsg, i18n("Cannot add plugin"));
}
else
diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp
index b67c08b0..b75a6f2b 100644
--- a/kommander/widget/functionlib.cpp
+++ b/kommander/widget/functionlib.cpp
@@ -129,11 +129,11 @@ static ParseNode f_stringSection(Parser*, const ParameterList& params)
static ParseNode f_stringArgs(Parser*, const ParameterList& params)
{
if (params.count() == 2)
- return params[0].toString().tqarg(params[1].toString());
+ return params[0].toString().arg(params[1].toString());
else if (params.count() == 3)
- return params[0].toString().tqarg(params[1].toString()).tqarg(params[2].toString());
+ return params[0].toString().arg(params[1].toString()).arg(params[2].toString());
else
- return params[0].toString().tqarg(params[1].toString()).tqarg(params[2].toString()).tqarg(params[3].toString());
+ return params[0].toString().arg(params[1].toString()).arg(params[2].toString()).arg(params[3].toString());
}
static ParseNode f_stringIsNumber(Parser*, const ParameterList& params)
@@ -361,7 +361,7 @@ static ParseNode f_dcop(Parser*, const ParameterList& params)
else
byteDataStream << params[i++].toString();
}
- function.append(TQString("(%1)").tqarg(items.join(",")));
+ function.append(TQString("(%1)").arg(items.join(",")));
TQCString replyType, byteReply;
DCOPClient* cl = KApplication::dcopClient();
if (!cl || !cl->call(appId, object, function.latin1(),
@@ -397,7 +397,7 @@ static ParseNode f_dcop(Parser*, const ParameterList& params)
}
else if(replyType != "void")
{
- qDebug("%s", TQString("DCOP return type %1 is not yet implemented.").tqarg(replyType.data()).latin1());
+ qDebug("%s", TQString("DCOP return type %1 is not yet implemented.").arg(replyType.data()).latin1());
}
return ParseNode();
@@ -499,7 +499,7 @@ static ParseNode f_dialog(Parser* P, const ParameterList& params)
return TQString();
}
TQString cmd = TQString("kmdr-executor %1 %2 _PARENTPID=%3 _PARENTDCOPID=kmdr-executor-%4")
- .tqarg(pFileName).tqarg(a_params).tqarg(getpid()).tqarg(getpid());
+ .arg(pFileName).arg(a_params).arg(getpid()).arg(getpid());
MyProcess proc(P->currentWidget());
TQString text;
@@ -571,7 +571,7 @@ static ParseNode f_arrayToString(Parser* P, const ParameterList& params)
TQValueList<ParseNode>::Iterator itval = values.begin();
while (*it)
{
- array += TQString("%1\t%2\n").tqarg(*it).tqarg((*itval).toString());
+ array += TQString("%1\t%2\n").arg(*it).arg((*itval).toString());
++it;
++itval;
}
diff --git a/kommander/widget/kommanderfunctions.cpp b/kommander/widget/kommanderfunctions.cpp
index 701b5e01..a960bbd3 100644
--- a/kommander/widget/kommanderfunctions.cpp
+++ b/kommander/widget/kommanderfunctions.cpp
@@ -145,9 +145,9 @@ TQString KommanderWidget::evalForEachBlock(const TQStringList& args, const TQStr
TQString var = args[0];
TQStringList loop = TQStringList::split("\n", args[1]);
TQString output;
- TQString block = substituteVariable(s.mid(start, f - start), TQString("%1_count").tqarg(var),
+ TQString block = substituteVariable(s.mid(start, f - start), TQString("%1_count").arg(var),
TQString::number(loop.count()));
- TQString varidx = TQString("%1_index").tqarg(var);
+ TQString varidx = TQString("%1_index").arg(var);
for (uint i=0; i<loop.count(); i++)
output += evalAssociatedText(substituteVariable(substituteVariable(block, varidx, TQString::number(i+1)),
var, loop[i]));
@@ -302,7 +302,7 @@ TQString KommanderWidget::evalArrayFunction(const TQString& function, const TQSt
const TQMap<TQString, ParseNode> map = parser.array(array);
TQString arraystring;
for (TQMap<TQString, ParseNode>::ConstIterator it = map.begin(); it != map.end(); ++it)
- arraystring += TQString("%1\t%2\n").tqarg(it.key()).tqarg(it.data().toString());
+ arraystring += TQString("%1\t%2\n").arg(it.key()).arg(it.data().toString());
return arraystring;
}
default:
@@ -317,7 +317,7 @@ TQString KommanderWidget::evalWidgetFunction(const TQString& identifier, const T
KommanderWidget* pWidget = parseWidget(identifier);
if (!pWidget)
{
- printError(i18n("Unknown widget: @%1.").tqarg(identifier));
+ printError(i18n("Unknown widget: @%1.").arg(identifier));
return TQString();
}
if (s[pos] == '.')
@@ -335,13 +335,13 @@ TQString KommanderWidget::evalWidgetFunction(const TQString& identifier, const T
}
else if (pWidget == this)
{
- printError(i18n("Infinite loop: @%1 called inside @%2.").tqarg(pWidget->widgetName())
- .tqarg(pWidget->widgetName()));
+ printError(i18n("Infinite loop: @%1 called inside @%2.").arg(pWidget->widgetName())
+ .arg(pWidget->widgetName()));
return TQString();
}
else if (!pWidget->hasAssociatedText())
{
- printError(i18n("Script for @%1 is empty.").tqarg(pWidget->widgetName()));
+ printError(i18n("Script for @%1 is empty.").arg(pWidget->widgetName()));
return TQString();
}
return pWidget->evalAssociatedText();
diff --git a/kommander/widget/kommanderwidget.cpp b/kommander/widget/kommanderwidget.cpp
index 533e8b9e..182f7faf 100644
--- a/kommander/widget/kommanderwidget.cpp
+++ b/kommander/widget/kommanderwidget.cpp
@@ -131,7 +131,7 @@ TQString KommanderWidget::evalAssociatedText(const TQString& a_text)
p.setWidget(this);
p.setString(a_text);
if (!p.setString(a_text) || !p.parse())
- printError(i18n("Line %1: %2.\n").tqarg(p.errorLine()+1).tqarg(p.errorMessage()));
+ printError(i18n("Line %1: %2.\n").arg(p.errorLine()+1).arg(p.errorMessage()));
return TQString();
}
/* Old macro-only parser is implemented below */
@@ -241,7 +241,7 @@ TQString KommanderWidget::evalAssociatedText(const TQString& a_text)
}
else
{
- printError(i18n("Unknown special: \'%1\'.").tqarg(identifier));
+ printError(i18n("Unknown special: \'%1\'.").arg(identifier));
return TQString();
}
}
@@ -271,13 +271,13 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query)
}
if (!ok)
{
- printError(i18n("Unmatched parenthesis in DCOP call \'%1\'.").tqarg(a_query[2]));
+ printError(i18n("Unmatched parenthesis in DCOP call \'%1\'.").arg(a_query[2]));
return TQString();
}
const TQStringList argTypes = parseArgs(pTypes, ok);
if (!ok || argTypes.count() != a_query.count() - 3)
{
- printError(i18n("Incorrect arguments in DCOP call \'%1\'.").tqarg(a_query[2]));
+ printError(i18n("Incorrect arguments in DCOP call \'%1\'.").arg(a_query[2]));
return TQString();
}
@@ -338,7 +338,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query)
}
else if(replyType != "void")
{
- printError(i18n("DCOP return type %1 is not yet implemented.").tqarg(replyType.data()));
+ printError(i18n("DCOP return type %1 is not yet implemented.").arg(replyType.data()));
}
return TQString();
@@ -392,7 +392,7 @@ TQString KommanderWidget::runDialog(const TQString& a_dialog, const TQString& a_
return TQString();
}
TQString cmd = TQString("kmdr-executor %1 %2 _PARENTPID=%3 _PARENTDCOPID=kmdr-executor-%4")
- .tqarg(pFileName).tqarg(a_params).tqarg(getpid()).tqarg(getpid());
+ .arg(pFileName).arg(a_params).arg(getpid()).arg(getpid());
return execCommand(cmd);
}
@@ -405,8 +405,8 @@ void KommanderWidget::printError(const TQString& a_error) const
KDialogBase::Yes, KDialogBase::No, 0, 0, true, false,
i18n("Continue"), i18n("Continue && Ignore Next Errors"), i18n("Stop"));
switch (KMessageBox::createKMessageBox(dialog, TQMessageBox::Warning,
- i18n("<qt>Error in widget <b>%1</b>:<p><i>%2</i></qt>").tqarg(TQString(m_thisObject->name()))
- .tqarg(a_error), TQStringList(), TQString(), 0, 0))
+ i18n("<qt>Error in widget <b>%1</b>:<p><i>%2</i></qt>").arg(TQString(m_thisObject->name()))
+ .arg(a_error), TQStringList(), TQString(), 0, 0))
{
case KDialogBase::No:
showErrors = false;
@@ -424,7 +424,7 @@ void KommanderWidget::printError(const TQString& a_error) const
}
else
{
- kdError() << i18n("Error in widget %1:\n %2\n").tqarg(m_thisObject->name()).tqarg(a_error);
+ kdError() << i18n("Error in widget %1:\n %2\n").arg(m_thisObject->name()).arg(a_error);
}
}
@@ -579,7 +579,7 @@ TQStringList KommanderWidget::parseFunction(const TQString& group, const TQStrin
TQString arg = parseBrackets(s, from, ok);
if (!ok)
{
- printError(i18n("Unmatched parenthesis after \'%1\'.").tqarg(function));
+ printError(i18n("Unmatched parenthesis after \'%1\'.").arg(function));
return TQString();
}
const TQStringList args = parseArgs(arg, ok);
@@ -588,23 +588,23 @@ TQStringList KommanderWidget::parseFunction(const TQString& group, const TQStrin
bool extraArg = gname == Group::DCOP;
if (!ok)
- printError(i18n("Unmatched quotes in argument of \'%1\'.").tqarg(function));
+ printError(i18n("Unmatched quotes in argument of \'%1\'.").arg(function));
else if (gname == -1)
- printError(i18n("Unknown function group: \'%1\'.").tqarg(group));
+ printError(i18n("Unknown function group: \'%1\'.").arg(group));
else if (fname == -1 && !extraArg)
- printError(i18n("Unknown function: \'%1\' in group '%2'.").tqarg(function).tqarg(group));
+ printError(i18n("Unknown function: \'%1\' in group '%2'.").arg(function).arg(group));
else if (fname == -1 && extraArg)
- printError(i18n("Unknown widget function: \'%1\'.").tqarg(function));
+ printError(i18n("Unknown widget function: \'%1\'.").arg(function));
else if ((int)args.count() + extraArg < SpecialInformation::minArg(gname, fname))
printError(i18n("Not enough arguments for \'%1\' (%2 instead of %3).<p>"
"Correct syntax is: %4")
- .tqarg(function).tqarg(args.count() + extraArg).tqarg(SpecialInformation::minArg(gname, fname))
- .tqarg(SpecialInformation::prototype(gname, fname, SpecialFunction::ShowArgumentNames)));
+ .arg(function).arg(args.count() + extraArg).arg(SpecialInformation::minArg(gname, fname))
+ .arg(SpecialInformation::prototype(gname, fname, SpecialFunction::ShowArgumentNames)));
else if ((int)args.count() + extraArg > SpecialInformation::maxArg(gname, fname))
printError(i18n("Too many arguments for \'%1\' (%2 instead of %3).<p>"
"Correct syntax is: %4")
- .tqarg(function).tqarg(args.count() + extraArg).tqarg(SpecialInformation::maxArg(gname, fname))
- .tqarg(SpecialInformation::prototype(gname, fname, SpecialFunction::ShowArgumentNames)));
+ .arg(function).arg(args.count() + extraArg).arg(SpecialInformation::maxArg(gname, fname))
+ .arg(SpecialInformation::prototype(gname, fname, SpecialFunction::ShowArgumentNames)));
else
success = true;
ok = success;
@@ -627,7 +627,7 @@ int KommanderWidget::parseBlockBoundary(const TQString& s, int from, const TQStr
TQString KommanderWidget::substituteVariable(TQString text, TQString variable, TQString value) const
{
- TQString var = TQString("@%1").tqarg(variable);
+ TQString var = TQString("@%1").arg(variable);
TQString newtext;
int newpos, pos = 0;
while (true)
@@ -692,7 +692,7 @@ TQString KommanderWidget::handleDCOP(const int function, const TQStringList& arg
break;
case DCOP::type:
return current->className();
- case DCOP::tqchildren:
+ case DCOP::children:
{
TQStringList matching;
TQObjectList* widgets = current->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, args.count() == 0 || args[0] != "false");
@@ -707,12 +707,12 @@ TQString KommanderWidget::handleDCOP(const int function, const TQStringList& arg
bool KommanderWidget::isFunctionSupported(int f)
{
- return f == DCOP::setEnabled || f == DCOP::setVisible || f == DCOP::tqchildren || f == DCOP::type;
+ return f == DCOP::setEnabled || f == DCOP::setVisible || f == DCOP::children || f == DCOP::type;
}
bool KommanderWidget::isCommonFunction(int f)
{
- return f == DCOP::setEnabled || f == DCOP::setVisible || f == DCOP::tqchildren || f == DCOP::type;
+ return f == DCOP::setEnabled || f == DCOP::setVisible || f == DCOP::children || f == DCOP::type;
}
ParserData* KommanderWidget::internalParserData() const
diff --git a/kommander/widget/myprocess.cpp b/kommander/widget/myprocess.cpp
index 90d2caf0..111612b5 100644
--- a/kommander/widget/myprocess.cpp
+++ b/kommander/widget/myprocess.cpp
@@ -91,7 +91,7 @@ TQString MyProcess::run(const TQString& a_command, const TQString& a_shell)
if(!mProcess->start(KProcess::NotifyOnExit, KProcess::All))
{
- m_atw->printError(i18n("<qt>Failed to start shell process<br><b>%1</b></qt>").tqarg(shellName));
+ m_atw->printError(i18n("<qt>Failed to start shell process<br><b>%1</b></qt>").arg(shellName));
return TQString();
}
mProcess->writeStdin(m_input, m_input.length());
diff --git a/kommander/widget/parser.cpp b/kommander/widget/parser.cpp
index 848507bb..09841908 100644
--- a/kommander/widget/parser.cpp
+++ b/kommander/widget/parser.cpp
@@ -113,7 +113,7 @@ bool Parser::setString(const TQString& s)
else // Bad character
{
insertNode(s.mid(start, 1), lines);
- setError(i18n("Invalid character: '%1'").tqarg(s[start]), m_parts.count()-1);
+ setError(i18n("Invalid character: '%1'").arg(s[start]), m_parts.count()-1);
return false;
}
}
@@ -220,7 +220,7 @@ ParseNode Parser::parseValue(Mode mode)
return parseWidget(mode, value);
}else if (mode == Execute)
{
- setError(i18n("'%1' (%2) is not a widget").tqarg(p.variableName()).tqarg(variable(p.variableName()).toString()));
+ setError(i18n("'%1' (%2) is not a widget").arg(p.variableName()).arg(variable(p.variableName()).toString()));
return ParseNode();
} else
{
@@ -232,7 +232,7 @@ ParseNode Parser::parseValue(Mode mode)
}
else if (tryKeyword(LeftParenthesis, CheckOnly))
{
- setError(i18n("'%1' is not a function").tqarg(p.variableName()));
+ setError(i18n("'%1' is not a function").arg(p.variableName()));
return ParseNode();
}
else
@@ -423,15 +423,15 @@ ParseNode Parser::parseFunction(Mode mode)
tryKeyword(RightParenthesis);
}
if (f.minArgs() > params.count())
- setError(i18n("in function '%1': %2").tqarg(name).tqarg(i18n("too few parameters")), pos);
+ setError(i18n("in function '%1': %2").arg(name).arg(i18n("too few parameters")), pos);
else if (f.maxArgs() < params.count())
- setError(i18n("in function '%1': %2").tqarg(name).tqarg(i18n("too many parameters")), pos);
+ setError(i18n("in function '%1': %2").arg(name).arg(i18n("too many parameters")), pos);
else if (mode == Execute)
{
ParseNode p = f.execute(this, params);
if (!p.isValid())
{
- setError(i18n("in function '%1': %2").tqarg(name).tqarg(p.errorMessage()), pos);
+ setError(i18n("in function '%1': %2").arg(name).arg(p.errorMessage()), pos);
return ParseNode();
}
else
@@ -471,7 +471,7 @@ ParseNode Parser::parseWidget(Mode mode, const TQString &widgetName)
ParseNode p = f.execute(this, params);
if (!p.isValid())
{
- setError(i18n("in widget function '%1.%2': %3").tqarg(widget).tqarg(var).tqarg(p.errorMessage()), pos);
+ setError(i18n("in widget function '%1.%2': %3").arg(widget).arg(var).arg(p.errorMessage()), pos);
return ParseNode();
}
else
@@ -514,12 +514,12 @@ ParseNode Parser::parseAssignment(Mode mode)
m_start = m_start - 2;
return parseWidget(mode);
} else
- setError(i18n("'%1' is not a widget").tqarg(var));
+ setError(i18n("'%1' is not a widget").arg(var));
}
else if (tryKeyword(LeftParenthesis, CheckOnly))
- setError(i18n("'%1' is not a function").tqarg(var));
+ setError(i18n("'%1' is not a function").arg(var));
else
- setError(i18n("Unexpected symbol after variable '%1'").tqarg(var));
+ setError(i18n("Unexpected symbol after variable '%1'").arg(var));
return ParseNode();
}
@@ -738,9 +738,9 @@ bool Parser::tryKeyword(Keyword k, Mode mode)
if (mode == Execute)
{
if (k == Dot)
- setError(i18n("Expected '%1'<br><br>Possible cause of the error is having a variable with the same name as a widget").tqarg(m_data->keywordToString(k)));
+ setError(i18n("Expected '%1'<br><br>Possible cause of the error is having a variable with the same name as a widget").arg(m_data->keywordToString(k)));
else
- setError(i18n("Expected '%1'").tqarg(m_data->keywordToString(k)));
+ setError(i18n("Expected '%1'").arg(m_data->keywordToString(k)));
}
return false;
}
diff --git a/kommander/widgets/buttongroup.cpp b/kommander/widgets/buttongroup.cpp
index e0c8b6ed..a110889a 100644
--- a/kommander/widgets/buttongroup.cpp
+++ b/kommander/widgets/buttongroup.cpp
@@ -109,7 +109,7 @@ void ButtonGroup::contextMenuEvent( TQContextMenuEvent * e )
bool ButtonGroup::isFunctionSupported(int f)
{
- return f == DCOP::text || f == DCOP::checked || f == DCOP::setChecked || f == DCOP::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction);
+ return f == DCOP::text || f == DCOP::checked || f == DCOP::setChecked || f == DCOP::geometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction);
}
@@ -133,7 +133,7 @@ TQString ButtonGroup::handleDCOP(int function, const TQStringList& args)
case BG_selectedId:
return TQString::number(this->selectedId() );
break;
- case DCOP::tqgeometry:
+ case DCOP::geometry:
{
TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
return geo;
diff --git a/kommander/widgets/checkbox.cpp b/kommander/widgets/checkbox.cpp
index 696a9b2b..61ab0aff 100644
--- a/kommander/widgets/checkbox.cpp
+++ b/kommander/widgets/checkbox.cpp
@@ -102,7 +102,7 @@ void CheckBox::showEvent(TQShowEvent* e)
bool CheckBox::isFunctionSupported(int f)
{
- return f == DCOP::text || f == DCOP::setText || f == DCOP::checked || f == DCOP::setChecked || f == DCOP::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
+ return f == DCOP::text || f == DCOP::setText || f == DCOP::checked || f == DCOP::setChecked || f == DCOP::geometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
}
void CheckBox::contextMenuEvent( TQContextMenuEvent * e )
@@ -125,7 +125,7 @@ TQString CheckBox::handleDCOP(int function, const TQStringList& args)
case DCOP::setChecked:
setChecked(args[0] != "false" && args[0] != "0");
break;
- case DCOP::tqgeometry:
+ case DCOP::geometry:
{
TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
return geo;
diff --git a/kommander/widgets/combobox.cpp b/kommander/widgets/combobox.cpp
index 4efa3a2c..89d3bb4d 100644
--- a/kommander/widgets/combobox.cpp
+++ b/kommander/widgets/combobox.cpp
@@ -121,7 +121,7 @@ bool ComboBox::isFunctionSupported(int f)
return f == DCOP::text || f == DCOP::selection || f == DCOP::setSelection ||
f == DCOP::currentItem || f == DCOP::setCurrentItem || f == DCOP::item ||
f == DCOP::removeItem || f == DCOP::insertItem || f == DCOP::insertItems ||
- f == DCOP::addUniqueItem || f == DCOP::clear || f == DCOP::count || f == DCOP::setEditable || f == DCOP::tqgeometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction);
+ f == DCOP::addUniqueItem || f == DCOP::clear || f == DCOP::count || f == DCOP::setEditable || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction);
}
TQString ComboBox::handleDCOP(int function, const TQStringList& args)
@@ -192,7 +192,7 @@ TQString ComboBox::handleDCOP(int function, const TQStringList& args)
case popupList:
TQComboBox::popup();
break;
- case DCOP::tqgeometry:
+ case DCOP::geometry:
{
TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
return geo;
diff --git a/kommander/widgets/datepicker.cpp b/kommander/widgets/datepicker.cpp
index 1e321ed5..64a064d3 100644
--- a/kommander/widgets/datepicker.cpp
+++ b/kommander/widgets/datepicker.cpp
@@ -101,7 +101,7 @@ void DatePicker::contextMenuEvent( TQContextMenuEvent * e )
bool DatePicker::isFunctionSupported(int f)
{
- return f == DCOP::text || f == DCOP::setText || f == DCOP::tqgeometry || f == DCOP::hasFocus ;
+ return f == DCOP::text || f == DCOP::setText || f == DCOP::geometry || f == DCOP::hasFocus ;
}
TQString DatePicker::handleDCOP(int function, const TQStringList& args)
@@ -112,7 +112,7 @@ TQString DatePicker::handleDCOP(int function, const TQStringList& args)
case DCOP::setText:
setDate(TQDate::fromString(args[0], Qt::ISODate));
break;
- case DCOP::tqgeometry:
+ case DCOP::geometry:
{
TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
return geo;
diff --git a/kommander/widgets/dialog.cpp b/kommander/widgets/dialog.cpp
index f7a3fb9b..21a3f7c1 100644
--- a/kommander/widgets/dialog.cpp
+++ b/kommander/widgets/dialog.cpp
@@ -193,7 +193,7 @@ void Dialog::contextMenuEvent( TQContextMenuEvent * e )
bool Dialog::isFunctionSupported(int f)
{
- return f == DCOP::text || f == DCOP::setText || f == DCOP::tqgeometry || (f > FirstFunction && f < LastFunction);
+ return f == DCOP::text || f == DCOP::setText || f == DCOP::geometry || (f > FirstFunction && f < LastFunction);
}
TQString Dialog::handleDCOP(int function, const TQStringList& args)
@@ -204,7 +204,7 @@ TQString Dialog::handleDCOP(int function, const TQStringList& args)
case DCOP::setText:
setWidgetText(args[0]);
break;
- case DCOP::tqgeometry:
+ case DCOP::geometry:
return TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
break;
case D_focusWidget:
diff --git a/kommander/widgets/execbutton.cpp b/kommander/widgets/execbutton.cpp
index b715dd4e..049d0578 100644
--- a/kommander/widgets/execbutton.cpp
+++ b/kommander/widgets/execbutton.cpp
@@ -180,7 +180,7 @@ void ExecButton::contextMenuEvent( TQContextMenuEvent * e )
bool ExecButton::isFunctionSupported(int f)
{
- return f == DCOP::text || f == DCOP::setText || f == DCOP::execute || f == DCOP::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction);
+ return f == DCOP::text || f == DCOP::setText || f == DCOP::execute || f == DCOP::geometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction);
}
TQString ExecButton::handleDCOP(int function, const TQStringList& args)
@@ -215,7 +215,7 @@ TQString ExecButton::handleDCOP(int function, const TQStringList& args)
}
break;
}
- case DCOP::tqgeometry:
+ case DCOP::geometry:
{
TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
return geo;
diff --git a/kommander/widgets/groupbox.cpp b/kommander/widgets/groupbox.cpp
index aef8042d..7d4f43e8 100644
--- a/kommander/widgets/groupbox.cpp
+++ b/kommander/widgets/groupbox.cpp
@@ -108,7 +108,7 @@ void GroupBox::contextMenuEvent( TQContextMenuEvent * e )
bool GroupBox::isFunctionSupported(int f)
{
- return f == DCOP::text || f == DCOP::setText || f == DCOP::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
+ return f == DCOP::text || f == DCOP::setText || f == DCOP::geometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
// || (f >= FirstFunction && f <= LastFunction);
}
@@ -126,7 +126,7 @@ TQString GroupBox::handleDCOP(int function, const TQStringList& args)
case DCOP::setText:
setTitle(args[0]);
break;
- case DCOP::tqgeometry:
+ case DCOP::geometry:
{
TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
return geo;
diff --git a/kommander/widgets/label.cpp b/kommander/widgets/label.cpp
index ce56b3c4..31d0adac 100644
--- a/kommander/widgets/label.cpp
+++ b/kommander/widgets/label.cpp
@@ -88,7 +88,7 @@ void Label::showEvent(TQShowEvent *e)
bool Label::isFunctionSupported(int f)
{
- return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
+ return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::geometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
}
TQString Label::handleDCOP(int function, const TQStringList& args)
@@ -102,7 +102,7 @@ TQString Label::handleDCOP(int function, const TQStringList& args)
case DCOP::clear:
setWidgetText("");
break;
- case DCOP::tqgeometry:
+ case DCOP::geometry:
{
TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
return geo;
diff --git a/kommander/widgets/lineedit.cpp b/kommander/widgets/lineedit.cpp
index 2f4f9de6..1ee00e0a 100644
--- a/kommander/widgets/lineedit.cpp
+++ b/kommander/widgets/lineedit.cpp
@@ -124,7 +124,7 @@ void LineEdit::contextMenuEvent( TQContextMenuEvent * e )
bool LineEdit::isFunctionSupported(int f)
{
return f == DCOP::text || f == DCOP::setText || f == DCOP::selection || f == DCOP::setSelection ||
- f == DCOP::clear || f == DCOP::setEditable || f == DCOP::tqgeometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || f == DCOP::isModified || (f >= FirstFunction && f <= LastFunction) ;
+ f == DCOP::clear || f == DCOP::setEditable || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || f == DCOP::isModified || (f >= FirstFunction && f <= LastFunction) ;
}
TQString LineEdit::handleDCOP(int function, const TQStringList& args)
@@ -146,7 +146,7 @@ TQString LineEdit::handleDCOP(int function, const TQStringList& args)
case DCOP::setEditable:
setReadOnly(args[0] == "false" || args[0] == "0");
break;
- case DCOP::tqgeometry:
+ case DCOP::geometry:
{
TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
return geo;
diff --git a/kommander/widgets/listbox.cpp b/kommander/widgets/listbox.cpp
index ad0cbafa..c823452b 100644
--- a/kommander/widgets/listbox.cpp
+++ b/kommander/widgets/listbox.cpp
@@ -96,7 +96,7 @@ bool ListBox::isFunctionSupported(int f)
return f == DCOP::text || f == DCOP::setText || f == DCOP::selection || f == DCOP::setSelection ||
f == DCOP::insertItems || f == DCOP::insertItem || f == DCOP::removeItem || f == DCOP::clear ||
f == DCOP::currentItem || f == DCOP::setCurrentItem || f == DCOP::item || f == DCOP::addUniqueItem ||
- f == DCOP::findItem || f == DCOP::setPixmap || f == DCOP::count || f == DCOP::tqgeometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
+ f == DCOP::findItem || f == DCOP::setPixmap || f == DCOP::count || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
}
void ListBox::contextMenuEvent( TQContextMenuEvent * e )
@@ -197,7 +197,7 @@ TQString ListBox::handleDCOP(int function, const TQStringList& args)
strings += item(i)->text();
return strings.join("\n");
}
- case DCOP::tqgeometry:
+ case DCOP::geometry:
{
TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
return geo;
diff --git a/kommander/widgets/pixmaplabel.cpp b/kommander/widgets/pixmaplabel.cpp
index e8b013db..07e0b595 100644
--- a/kommander/widgets/pixmaplabel.cpp
+++ b/kommander/widgets/pixmaplabel.cpp
@@ -103,7 +103,7 @@ void PixmapLabel::contextMenuEvent( TQContextMenuEvent * e )
bool PixmapLabel::isFunctionSupported(int f)
{
- return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::tqgeometry;
+ return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::geometry;
}
TQString PixmapLabel::handleDCOP(int function, const TQStringList& args)
@@ -117,7 +117,7 @@ TQString PixmapLabel::handleDCOP(int function, const TQStringList& args)
break;
case DCOP::text:
return text();
- case DCOP::tqgeometry:
+ case DCOP::geometry:
{
TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
return geo;
diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp
index 7bf77c27..740ad092 100644
--- a/kommander/widgets/popupmenu.cpp
+++ b/kommander/widgets/popupmenu.cpp
@@ -114,7 +114,7 @@ void PopupMenu::popup(int x, int y)
void PopupMenu::slotMenuItemActivated(int id)
{
TQString widget = m_associations[id];
- KommanderWidget::evalAssociatedText(TQString("#!kommander\n%1.execute(%2)").tqarg(widget).tqarg(id));
+ KommanderWidget::evalAssociatedText(TQString("#!kommander\n%1.execute(%2)").arg(widget).arg(id));
}
void PopupMenu::populate()
@@ -138,7 +138,7 @@ TQString PopupMenu::insertSubmenu(const TQString& title, const TQString &menuWid
bool PopupMenu::isFunctionSupported(int f)
{
- return f == DCOP::clear || f == DCOP::execute || f == DCOP::item || (f >= INSERTMENUITEM && f <= LAST_FUNCTION) || f == DCOP::count || f == DCOP::tqgeometry;
+ return f == DCOP::clear || f == DCOP::execute || f == DCOP::item || (f >= INSERTMENUITEM && f <= LAST_FUNCTION) || f == DCOP::count || f == DCOP::geometry;
}
TQString PopupMenu::handleDCOP(int function, const TQStringList& args)
@@ -229,7 +229,7 @@ TQString PopupMenu::handleDCOP(int function, const TQStringList& args)
case DCOP::count:
return TQString::number(m_menu->count());
break;
- case DCOP::tqgeometry:
+ case DCOP::geometry:
{
TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
return geo;
diff --git a/kommander/widgets/progressbar.cpp b/kommander/widgets/progressbar.cpp
index 27233dd8..e9257fff 100644
--- a/kommander/widgets/progressbar.cpp
+++ b/kommander/widgets/progressbar.cpp
@@ -94,7 +94,7 @@ void ProgressBar::showEvent(TQShowEvent *e)
bool ProgressBar::isFunctionSupported(int f)
{
- return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::setMaximum || f == DCOP::tqgeometry || (f > FirstFunction && f < LastFunction);
+ return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::setMaximum || f == DCOP::geometry || (f > FirstFunction && f < LastFunction);
}
TQString ProgressBar::handleDCOP(int function, const TQStringList& args)
@@ -111,7 +111,7 @@ TQString ProgressBar::handleDCOP(int function, const TQStringList& args)
case DCOP::setMaximum:
setTotalSteps(args[0].toUInt());
break;
- case DCOP::tqgeometry:
+ case DCOP::geometry:
{
TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
return geo;
diff --git a/kommander/widgets/radiobutton.cpp b/kommander/widgets/radiobutton.cpp
index 317263e4..d6306c80 100644
--- a/kommander/widgets/radiobutton.cpp
+++ b/kommander/widgets/radiobutton.cpp
@@ -101,7 +101,7 @@ void RadioButton::contextMenuEvent( TQContextMenuEvent * e )
bool RadioButton::isFunctionSupported(int f)
{
- return f == DCOP::text || f == DCOP::setText || f == DCOP::setChecked || f == DCOP::checked || f == DCOP::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
+ return f == DCOP::text || f == DCOP::setText || f == DCOP::setChecked || f == DCOP::checked || f == DCOP::geometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
}
TQString RadioButton::handleDCOP(int function, const TQStringList& args)
@@ -117,7 +117,7 @@ TQString RadioButton::handleDCOP(int function, const TQStringList& args)
break;
case DCOP::checked:
return TQString::number(isOn());
- case DCOP::tqgeometry:
+ case DCOP::geometry:
{
TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
return geo;
diff --git a/kommander/widgets/richtexteditor.cpp b/kommander/widgets/richtexteditor.cpp
index 0aebf718..1faa12b4 100644
--- a/kommander/widgets/richtexteditor.cpp
+++ b/kommander/widgets/richtexteditor.cpp
@@ -196,13 +196,13 @@ void RichTextEditor::fontChanged(const TQFont &a_font)
m_buttonTextUnder->setOn(a_font.underline());
}
-void RichTextEditor::alignmentChanged(int a_tqalignment)
+void RichTextEditor::alignmentChanged(int a_alignment)
{
- if((a_tqalignment == AlignAuto) || (a_tqalignment & AlignLeft))
+ if((a_alignment == AlignAuto) || (a_alignment & AlignLeft))
m_buttonTextLeft->setOn(true);
- else if(a_tqalignment & AlignHCenter)
+ else if(a_alignment & AlignHCenter)
m_buttonTextCenter->setOn(true);
- else if(a_tqalignment & AlignRight)
+ else if(a_alignment & AlignRight)
m_buttonTextRight->setOn(true);
}
diff --git a/kommander/widgets/spinboxint.cpp b/kommander/widgets/spinboxint.cpp
index cc264f34..72991376 100644
--- a/kommander/widgets/spinboxint.cpp
+++ b/kommander/widgets/spinboxint.cpp
@@ -101,7 +101,7 @@ void SpinBoxInt::focusInEvent( TQFocusEvent * e)
bool SpinBoxInt::isFunctionSupported(int f)
{
- return f == DCOP::text || f == DCOP::setText || f == DCOP::setMaximum || f == DCOP::tqgeometry|| f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
+ return f == DCOP::text || f == DCOP::setText || f == DCOP::setMaximum || f == DCOP::geometry|| f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
}
TQString SpinBoxInt::handleDCOP(int function, const TQStringList& args)
@@ -115,7 +115,7 @@ TQString SpinBoxInt::handleDCOP(int function, const TQStringList& args)
case DCOP::setMaximum:
setMaxValue(args[0].toUInt());
break;
- case DCOP::tqgeometry:
+ case DCOP::geometry:
{
TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
return geo;
diff --git a/kommander/widgets/table.cpp b/kommander/widgets/table.cpp
index f4d21629..12fda10d 100644
--- a/kommander/widgets/table.cpp
+++ b/kommander/widgets/table.cpp
@@ -114,7 +114,7 @@ void Table::setWidgetText(const TQString&)
TQString Table::selectedArea()
{
TQTableSelection sel = selection(currentSelection());
- return TQString("%1,%2,%3,%4").tqarg(sel.topRow()).tqarg(sel.leftCol()).tqarg(sel.bottomRow()).tqarg(sel.rightCol());
+ return TQString("%1,%2,%3,%4").arg(sel.topRow()).arg(sel.leftCol()).arg(sel.bottomRow()).arg(sel.rightCol());
}
@@ -123,7 +123,7 @@ bool Table::isFunctionSupported(int f)
return f == DCOP::currentColumn || f == DCOP::currentRow || f == DCOP::insertColumn ||
f == DCOP::insertRow || f == DCOP::cellText || f == DCOP::setCellText || f == DCOP::setCellWidget || f == DCOP::cellWidget || f == DCOP::columnCount ||
f == DCOP::removeRow || f == DCOP::removeColumn || f == DCOP::setColumnCaption ||
- f == DCOP::setRowCaption || f == DCOP::text || f == DCOP::setText || f == DCOP::selection || f == DCOP::tqgeometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction);
+ f == DCOP::setRowCaption || f == DCOP::text || f == DCOP::setText || f == DCOP::selection || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction);
}
void Table::setCellWidget(int row, int col, const TQString & _widgetName)
@@ -354,7 +354,7 @@ TQString Table::handleDCOP(int function, const TQStringList& args)
return "No row at index "+args[0];
break;
}
- case DCOP::tqgeometry:
+ case DCOP::geometry:
{
TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
return geo;
diff --git a/kommander/widgets/textedit.cpp b/kommander/widgets/textedit.cpp
index dbdb59d7..dd17f33a 100644
--- a/kommander/widgets/textedit.cpp
+++ b/kommander/widgets/textedit.cpp
@@ -143,7 +143,7 @@ void TextEdit::contextMenuEvent( TQContextMenuEvent * e )
bool TextEdit::isFunctionSupported(int f)
{
- return f == DCOP::text || f == DCOP::setText || f == DCOP::selection || f == DCOP::setSelection || f == DCOP::clear || f == DCOP::setEditable || f == DCOP::tqgeometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || f == DCOP::isModified || (f >= FirstFunction && f <= LastFunction);
+ return f == DCOP::text || f == DCOP::setText || f == DCOP::selection || f == DCOP::setSelection || f == DCOP::clear || f == DCOP::setEditable || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || f == DCOP::isModified || (f >= FirstFunction && f <= LastFunction);
}
TQString TextEdit::handleDCOP(int function, const TQStringList& args)
@@ -210,7 +210,7 @@ TQString TextEdit::handleDCOP(int function, const TQStringList& args)
case TE_VAnormalScript:
TQTextEdit::setVerticalAlignment(AlignNormal);
break;
- case DCOP::tqgeometry:
+ case DCOP::geometry:
{
TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
return geo;
diff --git a/kommander/widgets/toolbox.cpp b/kommander/widgets/toolbox.cpp
index fad8ca38..90b1bb64 100644
--- a/kommander/widgets/toolbox.cpp
+++ b/kommander/widgets/toolbox.cpp
@@ -121,7 +121,7 @@ void ToolBox::contextMenuEvent( TQContextMenuEvent * e )
bool ToolBox::isFunctionSupported(int f)
{
- return f == DCOP::count || f == DCOP::tqgeometry || (f >= FIRST_FUNCTION && f <= LAST_FUNCTION) ;
+ return f == DCOP::count || f == DCOP::geometry || (f >= FIRST_FUNCTION && f <= LAST_FUNCTION) ;
}
TQString ToolBox::handleDCOP(int function, const TQStringList& args)
@@ -176,7 +176,7 @@ TQString ToolBox::handleDCOP(int function, const TQStringList& args)
}
case DCOP::count:
return TQString::number(count());
- case DCOP::tqgeometry:
+ case DCOP::geometry:
{
TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
return geo;
diff --git a/kommander/widgets/treewidget.cpp b/kommander/widgets/treewidget.cpp
index 9a19d2b0..5f04a74b 100644
--- a/kommander/widgets/treewidget.cpp
+++ b/kommander/widgets/treewidget.cpp
@@ -208,8 +208,8 @@ TQString TreeWidget::itemsText()
if (path.isEmpty())
items.append(itemText(it.current()));
else
- items.append(TQString("%1%2%3").tqarg(path).tqarg(m_pathSeparator)
- .tqarg(itemText(it.current())));
+ items.append(TQString("%1%2%3").arg(path).arg(m_pathSeparator)
+ .arg(itemText(it.current())));
++it;
}
return items.join("\n");
@@ -307,7 +307,7 @@ bool TreeWidget::isFunctionSupported(int f)
return f == DCOP::insertItem || f == DCOP::text || f == DCOP::setText || f == DCOP::insertItems ||
f == DCOP::selection || f == DCOP::setSelection || f == DCOP::clear || f == DCOP::removeItem ||
f == DCOP::currentItem || f == DCOP::setCurrentItem || f == DCOP::findItem || f == DCOP::item ||
- f == DCOP::itemPath || f == DCOP::itemDepth || f == DCOP::setPixmap || f == DCOP::setColumnCaption || f == DCOP::removeColumn || f == DCOP::columnCount || f == DCOP::tqgeometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f > FirstFunction && f < LastFunction) || (f >= TW_FUNCTION && f <= TW_LAST_FUNCTION);
+ f == DCOP::itemPath || f == DCOP::itemDepth || f == DCOP::setPixmap || f == DCOP::setColumnCaption || f == DCOP::removeColumn || f == DCOP::columnCount || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f > FirstFunction && f < LastFunction) || (f >= TW_FUNCTION && f <= TW_LAST_FUNCTION);
}
TQString TreeWidget::handleDCOP(int function, const TQStringList& args)
@@ -342,7 +342,7 @@ TQString TreeWidget::handleDCOP(int function, const TQStringList& args)
{
if (it.current()->isSelected())
{
- selection.append(TQString("%1\n").tqarg(itemToIndexSafe(it.current())));
+ selection.append(TQString("%1\n").arg(itemToIndexSafe(it.current())));
}
++it;
}
@@ -494,7 +494,7 @@ TQString TreeWidget::handleDCOP(int function, const TQStringList& args)
case TW_childCount:
return TQString::number(childCount());
break;
- case DCOP::tqgeometry:
+ case DCOP::geometry:
{
TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
return geo;