summaryrefslogtreecommitdiffstats
path: root/kdevdesigner
diff options
context:
space:
mode:
Diffstat (limited to 'kdevdesigner')
-rw-r--r--kdevdesigner/designer/about.ui14
-rw-r--r--kdevdesigner/designer/actiondnd.cpp26
-rw-r--r--kdevdesigner/designer/actiondnd.h2
-rw-r--r--kdevdesigner/designer/actioneditor.ui2
-rw-r--r--kdevdesigner/designer/command.cpp94
-rw-r--r--kdevdesigner/designer/command.h14
-rw-r--r--kdevdesigner/designer/configtoolboxdialog.ui6
-rw-r--r--kdevdesigner/designer/configtoolboxdialog.ui.h6
-rw-r--r--kdevdesigner/designer/connectiondialog.ui2
-rw-r--r--kdevdesigner/designer/connectiondialog.ui.h2
-rw-r--r--kdevdesigner/designer/connectionitems.cpp22
-rw-r--r--kdevdesigner/designer/connectionitems.h4
-rw-r--r--kdevdesigner/designer/createtemplate.ui4
-rw-r--r--kdevdesigner/designer/customwidgeteditor.ui18
-rw-r--r--kdevdesigner/designer/customwidgeteditorimpl.cpp24
-rw-r--r--kdevdesigner/designer/dbconnectioneditor.ui4
-rw-r--r--kdevdesigner/designer/dbconnectionimpl.cpp2
-rw-r--r--kdevdesigner/designer/dbconnections.ui12
-rw-r--r--kdevdesigner/designer/dbconnectionsimpl.cpp2
-rw-r--r--kdevdesigner/designer/designer_pch.h2
-rw-r--r--kdevdesigner/designer/designerapp.cpp2
-rw-r--r--kdevdesigner/designer/designerappiface.cpp10
-rw-r--r--kdevdesigner/designer/editfunctions.ui18
-rw-r--r--kdevdesigner/designer/editfunctionsimpl.cpp4
-rw-r--r--kdevdesigner/designer/filechooser.cpp10
-rw-r--r--kdevdesigner/designer/finddialog.ui2
-rw-r--r--kdevdesigner/designer/formfile.cpp22
-rw-r--r--kdevdesigner/designer/formfile.h2
-rw-r--r--kdevdesigner/designer/formwindow.cpp96
-rw-r--r--kdevdesigner/designer/gotolinedialog.ui4
-rw-r--r--kdevdesigner/designer/hierarchyview.cpp12
-rw-r--r--kdevdesigner/designer/iconvieweditor.ui10
-rw-r--r--kdevdesigner/designer/iconvieweditorimpl.cpp2
-rw-r--r--kdevdesigner/designer/kdevdesigner_part.cpp10
-rw-r--r--kdevdesigner/designer/kdevdesigner_part.h2
-rw-r--r--kdevdesigner/designer/layout.cpp72
-rw-r--r--kdevdesigner/designer/layout.h14
-rw-r--r--kdevdesigner/designer/listboxdnd.cpp10
-rw-r--r--kdevdesigner/designer/listboxeditor.ui10
-rw-r--r--kdevdesigner/designer/listboxeditorimpl.cpp2
-rw-r--r--kdevdesigner/designer/listboxrename.cpp4
-rw-r--r--kdevdesigner/designer/listeditor.ui2
-rw-r--r--kdevdesigner/designer/listviewdnd.cpp14
-rw-r--r--kdevdesigner/designer/listvieweditor.ui18
-rw-r--r--kdevdesigner/designer/listvieweditorimpl.cpp2
-rw-r--r--kdevdesigner/designer/mainwindow.cpp110
-rw-r--r--kdevdesigner/designer/mainwindowactions.cpp86
-rw-r--r--kdevdesigner/designer/menubareditor.cpp12
-rw-r--r--kdevdesigner/designer/menubareditor.h6
-rw-r--r--kdevdesigner/designer/metadatabase.cpp58
-rw-r--r--kdevdesigner/designer/metadatabase.h2
-rw-r--r--kdevdesigner/designer/multilineeditor.ui2
-rw-r--r--kdevdesigner/designer/multilineeditorimpl.cpp20
-rw-r--r--kdevdesigner/designer/multilineeditorimpl.h2
-rw-r--r--kdevdesigner/designer/newform.ui4
-rw-r--r--kdevdesigner/designer/newformimpl.cpp4
-rw-r--r--kdevdesigner/designer/outputwindow.cpp6
-rw-r--r--kdevdesigner/designer/outputwindow.h4
-rw-r--r--kdevdesigner/designer/paletteeditor.ui14
-rw-r--r--kdevdesigner/designer/paletteeditoradvanced.ui10
-rw-r--r--kdevdesigner/designer/paletteeditoradvancedimpl.cpp12
-rw-r--r--kdevdesigner/designer/pixmapchooser.cpp6
-rw-r--r--kdevdesigner/designer/pixmapcollection.cpp2
-rw-r--r--kdevdesigner/designer/pixmapcollectioneditor.ui2
-rw-r--r--kdevdesigner/designer/pixmapfunction.ui4
-rw-r--r--kdevdesigner/designer/popupmenueditor.cpp20
-rw-r--r--kdevdesigner/designer/preferences.ui6
-rw-r--r--kdevdesigner/designer/previewframe.cpp2
-rw-r--r--kdevdesigner/designer/previewwidget.ui4
-rw-r--r--kdevdesigner/designer/project.cpp4
-rw-r--r--kdevdesigner/designer/projectsettings.ui4
-rw-r--r--kdevdesigner/designer/projectsettingsimpl.cpp2
-rw-r--r--kdevdesigner/designer/propertyeditor.cpp142
-rw-r--r--kdevdesigner/designer/propertyeditor.h8
-rw-r--r--kdevdesigner/designer/propertyobject.cpp4
-rw-r--r--kdevdesigner/designer/propertyobject.h2
-rw-r--r--kdevdesigner/designer/qcompletionedit.cpp4
-rw-r--r--kdevdesigner/designer/replacedialog.ui2
-rw-r--r--kdevdesigner/designer/resource.cpp128
-rw-r--r--kdevdesigner/designer/resource.h6
-rw-r--r--kdevdesigner/designer/richtextfontdialog.ui8
-rw-r--r--kdevdesigner/designer/richtextfontdialog.ui.h2
-rw-r--r--kdevdesigner/designer/sizehandle.cpp14
-rw-r--r--kdevdesigner/designer/sourceeditor.cpp2
-rw-r--r--kdevdesigner/designer/sourcefile.cpp10
-rw-r--r--kdevdesigner/designer/startdialog.ui2
-rw-r--r--kdevdesigner/designer/startdialogimpl.cpp4
-rw-r--r--kdevdesigner/designer/styledbutton.cpp22
-rw-r--r--kdevdesigner/designer/styledbutton.h4
-rw-r--r--kdevdesigner/designer/syntaxhighlighter_html.cpp4
-rw-r--r--kdevdesigner/designer/syntaxhighlighter_html.h2
-rw-r--r--kdevdesigner/designer/tableeditor.ui18
-rw-r--r--kdevdesigner/designer/tableeditorimpl.cpp2
-rw-r--r--kdevdesigner/designer/variabledialog.ui4
-rw-r--r--kdevdesigner/designer/widgetfactory.cpp170
-rw-r--r--kdevdesigner/designer/widgetfactory.h16
-rw-r--r--kdevdesigner/designer/wizardeditor.ui4
-rw-r--r--kdevdesigner/designer/wizardeditorimpl.cpp14
-rw-r--r--kdevdesigner/designer/workspace.cpp10
-rw-r--r--kdevdesigner/plugins/languageinterfaceimpl.cpp2
-rw-r--r--kdevdesigner/shared/parser.cpp2
-rw-r--r--kdevdesigner/shared/ui2uib.cpp4
-rw-r--r--kdevdesigner/shared/uib.cpp4
-rw-r--r--kdevdesigner/shared/uib.h2
-rw-r--r--kdevdesigner/shared/widgetdatabase.cpp4
-rw-r--r--kdevdesigner/uilib/qwidgetfactory.cpp168
-rw-r--r--kdevdesigner/uilib/qwidgetfactory.h6
107 files changed, 912 insertions, 912 deletions
diff --git a/kdevdesigner/designer/about.ui b/kdevdesigner/designer/about.ui
index 7034bca4..48d53486 100644
--- a/kdevdesigner/designer/about.ui
+++ b/kdevdesigner/designer/about.ui
@@ -66,7 +66,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">
@@ -79,7 +79,7 @@
<property name="text">
<string>Version 3.2</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">
@@ -92,7 +92,7 @@
<property name="text">
<string>Copyright (C) 2000-2003 Trolltech AS. All Rights Reserved.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">
@@ -113,7 +113,7 @@
<property name="text">
<string>&lt;p&gt;Qt Commercial Edition license holders: This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.&lt;/p&gt;&lt;p&gt;&lt;/p&gt;&lt;p&gt;Qt Free Edition users: This program is licensed to you under the terms of the GNU General Public License Version 2. For details, see the file LICENSE.GPL that came with this software distribution.&lt;/p&gt;&lt;p&gt;The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.&lt;/p&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
</property>
<property name="wordwrap" stdset="0">
@@ -129,7 +129,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -160,7 +160,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -191,7 +191,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/actiondnd.cpp b/kdevdesigner/designer/actiondnd.cpp
index 9eb97cbd..a4988bda 100644
--- a/kdevdesigner/designer/actiondnd.cpp
+++ b/kdevdesigner/designer/actiondnd.cpp
@@ -38,7 +38,7 @@
#include <tqbitmap.h>
#include <tqdragobject.h>
#include <tqinputdialog.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqmainwindow.h>
#include <tqmenudata.h>
#include <tqmessagebox.h>
@@ -140,7 +140,7 @@ QDesignerToolBarSeparator::QDesignerToolBarSeparator(Qt::Orientation o , TQToolB
setOrientation( o );
setBackgroundMode( parent->backgroundMode() );
setBackgroundOrigin( ParentOrigin );
- tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+ setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
}
void QDesignerToolBarSeparator::setOrientation( Qt::Orientation o )
@@ -153,9 +153,9 @@ void QDesignerToolBarSeparator::styleChange( TQStyle& )
setOrientation( orient );
}
-TQSize QDesignerToolBarSeparator::tqsizeHint() const
+TQSize QDesignerToolBarSeparator::sizeHint() const
{
- int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
+ int extent = tqstyle().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
this );
if ( orient ==Qt::Horizontal )
return TQSize( extent, 0 );
@@ -172,7 +172,7 @@ void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * )
flags |= TQStyle::Style_Horizontal;
tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
- tqcolorGroup(), flags );
+ colorGroup(), flags );
}
@@ -349,7 +349,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();
@@ -409,7 +409,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();
@@ -429,7 +429,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();
@@ -464,7 +464,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();
@@ -487,7 +487,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();
@@ -504,7 +504,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();
@@ -571,7 +571,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();
@@ -699,7 +699,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();
diff --git a/kdevdesigner/designer/actiondnd.h b/kdevdesigner/designer/actiondnd.h
index 5e830949..0050ace8 100644
--- a/kdevdesigner/designer/actiondnd.h
+++ b/kdevdesigner/designer/actiondnd.h
@@ -160,7 +160,7 @@ class QDesignerToolBarSeparator : public TQWidget
public:
QDesignerToolBarSeparator( Qt::Orientation, TQToolBar *parent, const char* name=0 );
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
Qt::Orientation orientation() const { return orient; }
public slots:
void setOrientation( Qt::Orientation );
diff --git a/kdevdesigner/designer/actioneditor.ui b/kdevdesigner/designer/actioneditor.ui
index 38d1f966..c2c5988c 100644
--- a/kdevdesigner/designer/actioneditor.ui
+++ b/kdevdesigner/designer/actioneditor.ui
@@ -127,7 +127,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/command.cpp b/kdevdesigner/designer/command.cpp
index 60a14cdf..50c604bd 100644
--- a/kdevdesigner/designer/command.cpp
+++ b/kdevdesigner/designer/command.cpp
@@ -43,11 +43,11 @@
#include <tqwidget.h>
#include <tqmetaobject.h>
#include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqmessagebox.h>
#include <tqlistbox.h>
#include <tqiconview.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqptrstack.h>
#include <tqheader.h>
#include <tqsplitter.h>
@@ -261,19 +261,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->tqminimumSize() );
- s = s.expandedTo( widget->tqminimumSizeHint() );
- TQRect r( tqgeometry.topLeft(), s );
+ TQSize s = geometry.size().expandedTo( widget->minimumSize() );
+ s = s.expandedTo( widget->minimumSizeHint() );
+ TQRect r( geometry.topLeft(), s );
widget->setGeometry( r );
}
widget->show();
@@ -369,17 +369,17 @@ DeleteCommand::DeleteCommand( const TQString &n, FormWindow *fw,
TQWidgetList copyOfWidgets = widgets;
copyOfWidgets.setAutoDelete(FALSE);
- // Include the tqchildren of the selected items when deleting
+ // Include the children of the selected items when deleting
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
- TQObjectList *tqchildren = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
- for ( TQWidget *c = (TQWidget *)tqchildren->first(); c; c = (TQWidget *)tqchildren->next() ) {
+ TQObjectList *children = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ for ( TQWidget *c = (TQWidget *)children->first(); c; c = (TQWidget *)children->next() ) {
if ( copyOfWidgets.find( c ) == -1 && formWindow()->widgets()->find( c ) ) {
widgets.insert(widgets.at() + 1, c);
widgets.prev();
copyOfWidgets.append(c);
}
}
- delete tqchildren;
+ delete children;
}
}
@@ -490,7 +490,7 @@ bool SetPropertyCommand::canMerge( Command *c )
if ( !widget )
return FALSE;
const TQMetaProperty *p =
- widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( propName, TRUE ), TRUE );
+ widget->metaObject()->property( widget->metaObject()->findProperty( propName, TRUE ), TRUE );
if ( !p ) {
if ( propName == "toolTip" || propName == "whatsThis" )
return TRUE;
@@ -563,26 +563,26 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
if ( select )
editor->propertyList()->setCurrentProperty( propName );
const TQMetaProperty *p =
- widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( propName, TRUE ), TRUE );
+ widget->metaObject()->property( widget->metaObject()->findProperty( propName, TRUE ), TRUE );
if ( !p ) {
if ( propName == "hAlign" ) {
- p = widget->tqmetaObject()->property( widget->tqmetaObject()->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->tqmetaObject()->property( widget->tqmetaObject()->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" ) {
TQVariant val = v;
if ( val.toString() == "default" )
@@ -674,21 +674,21 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
LayoutHorizontalCommand::LayoutHorizontalCommand( const TQString &n, FormWindow *fw,
TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl )
- : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase )
+ : Command( n, fw ), layout( wl, parent, fw, layoutBase )
{
}
void LayoutHorizontalCommand::execute()
{
formWindow()->clearSelection( FALSE );
- tqlayout.doLayout();
+ layout.doLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
}
void LayoutHorizontalCommand::unexecute()
{
formWindow()->clearSelection( FALSE );
- tqlayout.undoLayout();
+ layout.undoLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
}
@@ -697,21 +697,21 @@ void LayoutHorizontalCommand::unexecute()
LayoutHorizontalSplitCommand::LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw,
TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl )
- : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, TRUE, TRUE )
+ : Command( n, fw ), layout( wl, parent, fw, layoutBase, TRUE, TRUE )
{
}
void LayoutHorizontalSplitCommand::execute()
{
formWindow()->clearSelection( FALSE );
- tqlayout.doLayout();
+ layout.doLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
}
void LayoutHorizontalSplitCommand::unexecute()
{
formWindow()->clearSelection( FALSE );
- tqlayout.undoLayout();
+ layout.undoLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
}
@@ -720,21 +720,21 @@ void LayoutHorizontalSplitCommand::unexecute()
LayoutVerticalCommand::LayoutVerticalCommand( const TQString &n, FormWindow *fw,
TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl )
- : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase )
+ : Command( n, fw ), layout( wl, parent, fw, layoutBase )
{
}
void LayoutVerticalCommand::execute()
{
formWindow()->clearSelection( FALSE );
- tqlayout.doLayout();
+ layout.doLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
}
void LayoutVerticalCommand::unexecute()
{
formWindow()->clearSelection( FALSE );
- tqlayout.undoLayout();
+ layout.undoLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
}
@@ -743,21 +743,21 @@ void LayoutVerticalCommand::unexecute()
LayoutVerticalSplitCommand::LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw,
TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl )
- : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, TRUE, TRUE )
+ : Command( n, fw ), layout( wl, parent, fw, layoutBase, TRUE, TRUE )
{
}
void LayoutVerticalSplitCommand::execute()
{
formWindow()->clearSelection( FALSE );
- tqlayout.doLayout();
+ layout.doLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
}
void LayoutVerticalSplitCommand::unexecute()
{
formWindow()->clearSelection( FALSE );
- tqlayout.undoLayout();
+ layout.undoLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
}
@@ -766,21 +766,21 @@ void LayoutVerticalSplitCommand::unexecute()
LayoutGridCommand::LayoutGridCommand( const TQString &n, FormWindow *fw,
TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl, int xres, int yres )
- : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) )
+ : Command( n, fw ), layout( wl, parent, fw, layoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) )
{
}
void LayoutGridCommand::execute()
{
formWindow()->clearSelection( FALSE );
- tqlayout.doLayout();
+ layout.doLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
}
void LayoutGridCommand::unexecute()
{
formWindow()->clearSelection( FALSE );
- tqlayout.undoLayout();
+ layout.undoLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
}
@@ -793,21 +793,21 @@ BreakLayoutCommand::BreakLayoutCommand( const TQString &n, FormWindow *fw,
WidgetFactory::LayoutType lay = WidgetFactory::layoutType( layoutBase );
spacing = MetaDataBase::spacing( TQT_TQOBJECT(layoutBase) );
margin = MetaDataBase::margin( TQT_TQOBJECT(layoutBase) );
- tqlayout = 0;
+ layout = 0;
if ( lay == WidgetFactory::HBox )
- tqlayout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqqt_cast<TQSplitter*>(layoutBase) != 0 );
+ layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqqt_cast<TQSplitter*>(layoutBase) != 0 );
else if ( lay == WidgetFactory::VBox )
- tqlayout = new VerticalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqqt_cast<TQSplitter*>(layoutBase) != 0 );
+ layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqqt_cast<TQSplitter*>(layoutBase) != 0 );
else if ( lay == WidgetFactory::Grid )
- tqlayout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), FALSE );
+ layout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), FALSE );
}
void BreakLayoutCommand::execute()
{
- if ( !tqlayout )
+ if ( !layout )
return;
formWindow()->clearSelection( FALSE );
- tqlayout->breakLayout();
+ layout->breakLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
for ( TQWidget *w = widgets.first(); w; w = widgets.next() )
w->resize( TQMAX( 16, w->width() ), TQMAX( 16, w->height() ) );
@@ -815,10 +815,10 @@ void BreakLayoutCommand::execute()
void BreakLayoutCommand::unexecute()
{
- if ( !tqlayout )
+ if ( !layout )
return;
formWindow()->clearSelection( FALSE );
- tqlayout->doLayout();
+ layout->doLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), spacing );
MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), margin );
@@ -2390,8 +2390,8 @@ TQString RenameMenuCommand::makeLegal( const TQString &str )
// remove illegal characters
TQString d;
char c = 0, i = 0;
- while ( !str.tqat(i).isNull() ) {
- c = str.tqat(i).latin1();
+ while ( !str.at(i).isNull() ) {
+ c = str.at(i).latin1();
if ( c == '-' || c == ' ' )
d += '_';
else if ( ( c >= '0' && c <= '9') || ( c >= 'A' && c <= 'Z' )
diff --git a/kdevdesigner/designer/command.h b/kdevdesigner/designer/command.h
index 909c8ea4..b2c2d161 100644
--- a/kdevdesigner/designer/command.h
+++ b/kdevdesigner/designer/command.h
@@ -208,7 +208,7 @@ public:
private:
TQWidget *widget;
- TQRect tqgeometry;
+ TQRect geometry;
};
@@ -290,7 +290,7 @@ public:
Type type() const { return LayoutHorizontal; }
private:
- HorizontalLayout tqlayout;
+ HorizontalLayout layout;
};
@@ -306,7 +306,7 @@ public:
Type type() const { return LayoutHorizontalSplitter; }
private:
- HorizontalLayout tqlayout;
+ HorizontalLayout layout;
};
@@ -322,7 +322,7 @@ public:
Type type() const { return LayoutVertical; }
private:
- VerticalLayout tqlayout;
+ VerticalLayout layout;
};
@@ -338,7 +338,7 @@ public:
Type type() const { return LayoutVerticalSplitter; }
private:
- VerticalLayout tqlayout;
+ VerticalLayout layout;
};
@@ -354,7 +354,7 @@ public:
Type type() const { return LayoutGrid; }
private:
- GridLayout tqlayout;
+ GridLayout layout;
};
@@ -369,7 +369,7 @@ public:
Type type() const { return BreakLayout; }
private:
- Layout *tqlayout;
+ Layout *layout;
int spacing;
int margin;
TQWidget *lb;
diff --git a/kdevdesigner/designer/configtoolboxdialog.ui b/kdevdesigner/designer/configtoolboxdialog.ui
index 05a1e52f..226cdd35 100644
--- a/kdevdesigner/designer/configtoolboxdialog.ui
+++ b/kdevdesigner/designer/configtoolboxdialog.ui
@@ -62,7 +62,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>342</width>
<height>0</height>
@@ -119,7 +119,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>111</width>
<height>0</height>
@@ -215,7 +215,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>0</height>
diff --git a/kdevdesigner/designer/configtoolboxdialog.ui.h b/kdevdesigner/designer/configtoolboxdialog.ui.h
index 711c51e6..7dcd6530 100644
--- a/kdevdesigner/designer/configtoolboxdialog.ui.h
+++ b/kdevdesigner/designer/configtoolboxdialog.ui.h
@@ -87,7 +87,7 @@ void ConfigToolboxDialog::addTool()
if ( (*it)->isSelected() ) {
if ( (*it)->childCount() == 0 ) {
- // Selected, no tqchildren
+ // Selected, no children
TQListViewItem *i = new TQListViewItem( listViewCommon, listViewCommon->lastItem() );
i->setText( 0, (*it)->text(0) );
i->setPixmap( 0, *((*it)->pixmap(0)) );
@@ -96,7 +96,7 @@ void ConfigToolboxDialog::addTool()
} else if ( !addKids ) {
// Children processing not set, so set it
// Also find the item were we shall quit
- // processing tqchildren...if any such item
+ // processing children...if any such item
addKids = TRUE;
nextSibling = (*it)->nextSibling();
nextParent = (*it)->parent();
@@ -106,7 +106,7 @@ void ConfigToolboxDialog::addTool()
}
}
} else if ( ((*it)->childCount() == 0) && addKids ) {
- // Leaf node, and we _do_ process tqchildren
+ // Leaf node, and we _do_ process children
TQListViewItem *i = new TQListViewItem( listViewCommon, listViewCommon->lastItem() );
i->setText( 0, (*it)->text(0) );
i->setPixmap( 0, *((*it)->pixmap(0)) );
diff --git a/kdevdesigner/designer/connectiondialog.ui b/kdevdesigner/designer/connectiondialog.ui
index cfc590a5..51995633 100644
--- a/kdevdesigner/designer/connectiondialog.ui
+++ b/kdevdesigner/designer/connectiondialog.ui
@@ -114,7 +114,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/connectiondialog.ui.h b/kdevdesigner/designer/connectiondialog.ui.h
index 4969c8fd..25a5d5f2 100644
--- a/kdevdesigner/designer/connectiondialog.ui.h
+++ b/kdevdesigner/designer/connectiondialog.ui.h
@@ -175,7 +175,7 @@ ConnectionContainer *ConnectionDialog::addConnection( TQObject *sender, TQObject
void ConnectionDialog::updateConnectionState( ConnectionContainer *c )
{
- c->tqrepaint();
+ c->repaint();
if ( c->isValid() )
connectionsTable->verticalHeader()->setLabel( c->row(),
*validConnection, TQString() );
diff --git a/kdevdesigner/designer/connectionitems.cpp b/kdevdesigner/designer/connectionitems.cpp
index d43bb874..12b03a1d 100644
--- a/kdevdesigner/designer/connectionitems.cpp
+++ b/kdevdesigner/designer/connectionitems.cpp
@@ -49,11 +49,11 @@ 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)",
+ "repaint()",
+ "repaint(bool)",
+ "repaint(int,int,int,int,bool)",
+ "repaint(const TQRect&,bool)",
+ "repaint(const TQRegion&,bool)",
"show()",
"hide()",
"iconify()",
@@ -170,7 +170,7 @@ void ConnectionItem::paint( TQPainter *p, const TQColorGroup &cg,
p->setFont( f );
}
- p->drawText( x + 2, 0, w - x - 4, h, tqalignment(), currentText() );
+ p->drawText( x + 2, 0, w - x - 4, h, alignment(), currentText() );
p->setFont( oldf );
}
@@ -338,7 +338,7 @@ SignalItem::SignalItem( TQTable *table, FormWindow *fw )
void SignalItem::senderChanged( TQObject *sender )
{
- TQStrList sigs = sender->tqmetaObject()->signalNames( TRUE );
+ TQStrList sigs = sender->metaObject()->signalNames( TRUE );
sigs.remove( "destroyed()" );
sigs.remove( "destroyed(TQObject*)" );
sigs.remove( "accessibilityChanged(int)" );
@@ -441,15 +441,15 @@ void SlotItem::updateSlotList()
}
TQString signal = MetaDataBase::normalizeFunction( lastSignal );
- int n = lastReceiver->tqmetaObject()->numSlots( TRUE );
+ int n = lastReceiver->metaObject()->numSlots( TRUE );
TQStringList slts;
for( int i = 0; i < n; ++i ) {
// accept only public slots. For the form window, also accept protected slots
- const TQMetaData* md = lastReceiver->tqmetaObject()->slot( i, TRUE );
- if ( ( (lastReceiver->tqmetaObject()->slot( i, TRUE )->tqt_mo_access == TQMetaData::Public) ||
+ const TQMetaData* md = lastReceiver->metaObject()->slot( i, TRUE );
+ if ( ( (lastReceiver->metaObject()->slot( i, TRUE )->tqt_mo_access == TQMetaData::Public) ||
(formWindow->isMainContainer( TQT_TQOBJECT(lastReceiver) ) &&
- lastReceiver->tqmetaObject()->slot(i, TRUE)->tqt_mo_access ==
+ lastReceiver->metaObject()->slot(i, TRUE)->tqt_mo_access ==
TQMetaData::Protected) ) &&
!ignoreSlot( md->tqt_mo_ci_name ) &&
checkConnectArgs( signal.latin1(), lastReceiver, md->tqt_mo_ci_name ) )
diff --git a/kdevdesigner/designer/connectionitems.h b/kdevdesigner/designer/connectionitems.h
index 4087c59f..76c57065 100644
--- a/kdevdesigner/designer/connectionitems.h
+++ b/kdevdesigner/designer/connectionitems.h
@@ -183,7 +183,7 @@ public:
}
bool isModified() const { return mod; }
- void setModified( bool b ) { mod = b; tqrepaint(); }
+ void setModified( bool b ) { mod = b; repaint(); }
bool isValid() const {
return se->currentText()[0] != '<' &&
si->currentText()[0] != '<' &&
@@ -191,7 +191,7 @@ public:
sl->currentText()[0] != '<';
}
- void tqrepaint() {
+ void repaint() {
se->table()->updateCell( se->row(), se->col() );
si->table()->updateCell( si->row(), si->col() );
re->table()->updateCell( re->row(), re->col() );
diff --git a/kdevdesigner/designer/createtemplate.ui b/kdevdesigner/designer/createtemplate.ui
index 60f6a3b6..e03340b1 100644
--- a/kdevdesigner/designer/createtemplate.ui
+++ b/kdevdesigner/designer/createtemplate.ui
@@ -110,7 +110,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -165,7 +165,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/customwidgeteditor.ui b/kdevdesigner/designer/customwidgeteditor.ui
index 7ba5dd29..85e09c9b 100644
--- a/kdevdesigner/designer/customwidgeteditor.ui
+++ b/kdevdesigner/designer/customwidgeteditor.ui
@@ -127,7 +127,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -160,7 +160,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -246,7 +246,7 @@
<property name="name">
<cstring>buttonChoosePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -293,7 +293,7 @@
<property name="name">
<cstring>buttonChooseHeader</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -527,7 +527,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -546,7 +546,7 @@
</property>
<property name="whatsThis" stdset="0">
<string>&lt;p&gt;&lt;b&gt;Container Widget&lt;/b&gt;&lt;/p&gt;
-&lt;p&gt;If this custom widget is able to contain other widgets (tqchildren), check this checkbox.&lt;/p&gt;</string>
+&lt;p&gt;If this custom widget is able to contain other widgets (children), check this checkbox.&lt;/p&gt;</string>
</property>
</widget>
</grid>
@@ -600,7 +600,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -814,7 +814,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -900,7 +900,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/customwidgeteditorimpl.cpp b/kdevdesigner/designer/customwidgeteditorimpl.cpp
index d2d0f5b5..b94b0a03 100644
--- a/kdevdesigner/designer/customwidgeteditorimpl.cpp
+++ b/kdevdesigner/designer/customwidgeteditorimpl.cpp
@@ -48,9 +48,9 @@
#include <tqapplication.h>
#include <tqlistview.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqdom.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <tqcheckbox.h>
#include <klocale.h>
@@ -199,8 +199,8 @@ void CustomWidgetEditor::currentWidgetChanged( TQListBoxItem *i )
previewPixmap->setPixmap( *w->pixmap );
else
previewPixmap->setText( "" );
- spinWidth->setValue( w->tqsizeHint.width() );
- spinHeight->setValue( w->tqsizeHint.height() );
+ spinWidth->setValue( w->sizeHint.width() );
+ spinHeight->setValue( w->sizeHint.height() );
sizeHor->setCurrentItem( size_type_to_int( w->sizePolicy.horData() ) );
sizeVer->setCurrentItem( size_type_to_int( w->sizePolicy.verData() ) );
checkContainer->setChecked( w->isContainer );
@@ -222,7 +222,7 @@ void CustomWidgetEditor::addWidgetClicked()
TQMessageBox::information( this, i18n( "Adding Custom Widget" ),
i18n( "Custom widget names must be unique.\n"
"A custom widget called '%1' already exists, so it is not possible "
- "to add another widget with this name." ).tqarg( s ) );
+ "to add another widget with this name." ).arg( s ) );
return;
}
@@ -310,7 +310,7 @@ void CustomWidgetEditor::heightChanged( int h )
if ( !i || !w )
return;
- w->tqsizeHint.setHeight( h );
+ w->sizeHint.setHeight( h );
updateCustomWidgetSizes();
}
@@ -354,7 +354,7 @@ void CustomWidgetEditor::widthChanged( int wid )
if ( !i || !w )
return;
- w->tqsizeHint.setWidth( wid );
+ w->sizeHint.setWidth( wid );
updateCustomWidgetSizes();
}
@@ -397,7 +397,7 @@ void CustomWidgetEditor::checkWidgetName()
TQMessageBox::information( this, i18n( "Renaming Custom Widget" ),
i18n( "Custom widget names must be unique.\n"
"A custom widget called '%1' already exists, so it is not possible "
- "to rename this widget with this name." ).tqarg( s ) );
+ "to rename this widget with this name." ).arg( s ) );
if ( i != boxWidgets->item( boxWidgets->currentItem() ) ) {
boxWidgets->setCurrentItem( i );
tqApp->processEvents();
@@ -710,8 +710,8 @@ void CustomWidgetEditor::saveDescription()
<< "\">" << w->includeFile << "</header>" << endl;
ts << makeIndent2( indent ) << "<sizehint>" << endl;
indent++;
- ts << makeIndent2( indent ) << "<width>" << w->tqsizeHint.width() << "</width>" << endl;
- ts << makeIndent2( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl;
+ ts << makeIndent2( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl;
+ ts << makeIndent2( indent ) << "<height>" << w->sizeHint.height() << "</height>" << endl;
indent--;
ts << makeIndent2( indent ) << "</sizehint>" << endl;
ts << makeIndent2( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl;
@@ -802,7 +802,7 @@ void CustomWidgetEditor::horDataChanged( int a )
CustomWidget *cw = (CustomWidget*)o;
if ( cw->realClassName() == boxWidgets->currentText() ) {
if ( cw->sizePolicy() == osp )
- cw->tqsetSizePolicy( w->sizePolicy );
+ cw->setSizePolicy( w->sizePolicy );
}
}
}
@@ -823,7 +823,7 @@ void CustomWidgetEditor::verDataChanged( int a )
CustomWidget *cw = (CustomWidget*)o;
if ( cw->realClassName() == boxWidgets->currentText() ) {
if ( cw->sizePolicy() == osp )
- cw->tqsetSizePolicy( w->sizePolicy );
+ cw->setSizePolicy( w->sizePolicy );
}
}
}
diff --git a/kdevdesigner/designer/dbconnectioneditor.ui b/kdevdesigner/designer/dbconnectioneditor.ui
index abf8beed..40ef0a9b 100644
--- a/kdevdesigner/designer/dbconnectioneditor.ui
+++ b/kdevdesigner/designer/dbconnectioneditor.ui
@@ -79,7 +79,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -113,7 +113,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/dbconnectionimpl.cpp b/kdevdesigner/designer/dbconnectionimpl.cpp
index 3cfd1fdc..eea4bb3e 100644
--- a/kdevdesigner/designer/dbconnectionimpl.cpp
+++ b/kdevdesigner/designer/dbconnectionimpl.cpp
@@ -32,7 +32,7 @@
#include <tqcombobox.h>
#include <tqspinbox.h>
#include <klineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqsqldatabase.h>
DatabaseConnectionEditor::DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent,
diff --git a/kdevdesigner/designer/dbconnections.ui b/kdevdesigner/designer/dbconnections.ui
index e373b2be..64cc65c1 100644
--- a/kdevdesigner/designer/dbconnections.ui
+++ b/kdevdesigner/designer/dbconnections.ui
@@ -109,7 +109,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -142,7 +142,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -209,7 +209,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -237,7 +237,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -256,7 +256,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/dbconnectionsimpl.cpp b/kdevdesigner/designer/dbconnectionsimpl.cpp
index b5b4409f..a9403a69 100644
--- a/kdevdesigner/designer/dbconnectionsimpl.cpp
+++ b/kdevdesigner/designer/dbconnectionsimpl.cpp
@@ -27,7 +27,7 @@
#include "dbconnectionsimpl.h"
#include <tqptrlist.h>
#include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include "project.h"
#include <tqlistbox.h>
#include <tqcombobox.h>
diff --git a/kdevdesigner/designer/designer_pch.h b/kdevdesigner/designer/designer_pch.h
index fa840181..5171ca63 100644
--- a/kdevdesigner/designer/designer_pch.h
+++ b/kdevdesigner/designer/designer_pch.h
@@ -16,7 +16,7 @@
#include <tqdialog.h>
#include <tqheader.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqlistbox.h>
#include <tqlistview.h>
diff --git a/kdevdesigner/designer/designerapp.cpp b/kdevdesigner/designer/designerapp.cpp
index ebe10a70..22d1e531 100644
--- a/kdevdesigner/designer/designerapp.cpp
+++ b/kdevdesigner/designer/designerapp.cpp
@@ -48,7 +48,7 @@ void set_splash_status( const TQString &txt )
if ( !splash )
return;
TQString splashText = "Licensed to "
- + TQString::tqfromLatin1( TQT_PRODUCT_LICENSEE ) + "\n"
+ + TQString::fromLatin1( TQT_PRODUCT_LICENSEE ) + "\n"
+ txt;
splash->message( splashText, TQt::AlignRight|TQt::AlignTop );
}
diff --git a/kdevdesigner/designer/designerappiface.cpp b/kdevdesigner/designer/designerappiface.cpp
index cfafb4e9..767ecf3a 100644
--- a/kdevdesigner/designer/designerappiface.cpp
+++ b/kdevdesigner/designer/designerappiface.cpp
@@ -37,7 +37,7 @@
#include "../shared/widgetdatabase.h"
#include <tqvariant.h>
#include <tqlistview.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqstatusbar.h>
#include "pixmapcollection.h"
#include "hierarchyview.h"
@@ -770,8 +770,8 @@ void DesignerFormWindowImpl::addFunction( const TQCString &function, const TQStr
void DesignerFormWindowImpl::setProperty( TQObject *o, const char *property, const TQVariant &value )
{
- int id = o->tqmetaObject()->findProperty( property, TRUE );
- const TQMetaProperty* p = o->tqmetaObject()->property( id, TRUE );
+ int id = o->metaObject()->findProperty( property, TRUE );
+ const TQMetaProperty* p = o->metaObject()->property( id, TRUE );
if ( p && p->isValid() )
o->setProperty( property, value );
else
@@ -780,8 +780,8 @@ void DesignerFormWindowImpl::setProperty( TQObject *o, const char *property, con
TQVariant DesignerFormWindowImpl::property( TQObject *o, const char *prop ) const
{
- int id = o->tqmetaObject()->findProperty( prop, TRUE );
- const TQMetaProperty* p = o->tqmetaObject()->property( id, TRUE );
+ int id = o->metaObject()->findProperty( prop, TRUE );
+ const TQMetaProperty* p = o->metaObject()->property( id, TRUE );
if ( p && p->isValid() )
return o->property( prop );
return MetaDataBase::fakeProperty( o, prop );
diff --git a/kdevdesigner/designer/editfunctions.ui b/kdevdesigner/designer/editfunctions.ui
index 1119282a..c3483b1d 100644
--- a/kdevdesigner/designer/editfunctions.ui
+++ b/kdevdesigner/designer/editfunctions.ui
@@ -189,7 +189,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -283,7 +283,7 @@
<property name="text">
<string>&amp;Function:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -316,7 +316,7 @@
<property name="text">
<string>&amp;Return type:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -354,7 +354,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -379,7 +379,7 @@
<property name="text">
<string>S&amp;pecifier:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -432,7 +432,7 @@
<property name="text">
<string>&amp;Access:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -480,7 +480,7 @@
<property name="text">
<string>&amp;Type:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -518,7 +518,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -566,7 +566,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/editfunctionsimpl.cpp b/kdevdesigner/designer/editfunctionsimpl.cpp
index b28ff0ad..ca757b6a 100644
--- a/kdevdesigner/designer/editfunctionsimpl.cpp
+++ b/kdevdesigner/designer/editfunctionsimpl.cpp
@@ -41,7 +41,7 @@
#include <tqcombobox.h>
#include <tqstrlist.h>
#include <tqmessagebox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqgroupbox.h>
#include <tqheader.h>
@@ -132,7 +132,7 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots )
void EditFunctions::okClicked()
{
TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(formWindow) );
- TQString n = i18n( "Add/Remove functions of '%1'" ).tqarg( formWindow->name() );
+ TQString n = i18n( "Add/Remove functions of '%1'" ).arg( formWindow->name() );
TQPtrList<Command> commands;
TQValueList<MetaDataBase::Function>::Iterator fit;
if ( !functionList.isEmpty() ) {
diff --git a/kdevdesigner/designer/filechooser.cpp b/kdevdesigner/designer/filechooser.cpp
index 961cfee0..9f4a9401 100644
--- a/kdevdesigner/designer/filechooser.cpp
+++ b/kdevdesigner/designer/filechooser.cpp
@@ -28,25 +28,25 @@
#include <tqlineedit.h>
#include <tqpushbutton.h>
#include <tqfiledialog.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kfiledialog.h>
FileChooser::FileChooser( TQWidget *parent, const char *name )
: TQWidget( parent, name ), md( File )
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
- tqlayout->setMargin( 0 );
+ TQHBoxLayout *layout = new TQHBoxLayout( this );
+ layout->setMargin( 0 );
lineEdit = new TQLineEdit( this, "filechooser_lineedit" );
- tqlayout->addWidget( lineEdit );
+ layout->addWidget( lineEdit );
connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
this, TQT_SIGNAL( fileNameChanged( const TQString & ) ) );
button = new TQPushButton( "...", this, "filechooser_button" );
button->setFixedWidth( button->fontMetrics().width( " ... " ) );
- tqlayout->addWidget( button );
+ layout->addWidget( button );
connect( button, TQT_SIGNAL( clicked() ),
this, TQT_SLOT( chooseFile() ) );
diff --git a/kdevdesigner/designer/finddialog.ui b/kdevdesigner/designer/finddialog.ui
index f806a3aa..9b16cd8c 100644
--- a/kdevdesigner/designer/finddialog.ui
+++ b/kdevdesigner/designer/finddialog.ui
@@ -117,7 +117,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/formfile.cpp b/kdevdesigner/designer/formfile.cpp
index 93486243..325862aa 100644
--- a/kdevdesigner/designer/formfile.cpp
+++ b/kdevdesigner/designer/formfile.cpp
@@ -77,7 +77,7 @@ FormFile::FormFile( const TQString &fn, bool temp, Project *p, const char *name
if ( !temp )
checkFileName( FALSE );
- connect(this, TQT_SIGNAL(somethingChanged(FormFile* )), this, TQT_SLOT(emitNewtqStatus(FormFile* )));
+ connect(this, TQT_SIGNAL(somethingChanged(FormFile* )), this, TQT_SLOT(emitNewStatus(FormFile* )));
}
FormFile::~FormFile()
@@ -192,7 +192,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified )
f2.writeBlock( data );
} else {
TQMessageBox::warning( MainWindow::self, i18n( "Save" ),
- i18n( "The file %1 could not be saved" ).tqarg( codeFile() ) );
+ i18n( "The file %1 could not be saved" ).arg( codeFile() ) );
}
}
}
@@ -215,7 +215,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified )
f2.writeBlock( data );
} else if ( tqApp->type() != TQApplication::Tty ) {
TQMessageBox::warning( MainWindow::self, i18n( "Save" ),
- i18n( "The file %1 could not be saved" ).tqarg( codeFile() ) );
+ i18n( "The file %1 could not be saved" ).arg( codeFile() ) );
}
}
}
@@ -227,7 +227,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified )
bool formCodeOnly = isModified( WFormCode ) && !isModified( WFormWindow );
if ( !resource.save( pro->makeAbsolute( filename ), formCodeOnly ) ) {
if ( MainWindow::self )
- MainWindow::self->statusMessage( i18n( "Failed to save file '%1'.").tqarg( formCodeOnly ? codeFile(): filename ) );
+ MainWindow::self->statusMessage( i18n( "Failed to save file '%1'.").arg( formCodeOnly ? codeFile(): filename ) );
if ( formCodeOnly )
return FALSE;
return saveAs();
@@ -263,7 +263,7 @@ bool FormFile::saveAs( bool ignoreModified )
fn = KFileDialog::getSaveFileName( f,
i18n( "*.ui|TQt User-Interface Files" ) + "\n" +
i18n( "*|All Files" ), MainWindow::self, /*0,*/
- i18n( "Save Form '%1' As").tqarg( formName() )/*,
+ i18n( "Save Form '%1' As").arg( formName() )/*,
MainWindow::self ? &MainWindow::self->lastSaveFilter : 0*/ );
if ( fn.isEmpty() )
return FALSE;
@@ -294,7 +294,7 @@ bool FormFile::saveAs( bool ignoreModified )
pro->setModified( TRUE );
timeStamp.setFileName( pro->makeAbsolute( codeFile() ) );
if ( ed && TQT_TQOBJECT(formWindow()) )
- ed->setCaption( i18n( "Edit %1" ).tqarg( formWindow()->name() ) );
+ ed->setCaption( i18n( "Edit %1" ).arg( formWindow()->name() ) );
setModified( TRUE );
if ( pro->isDummy() )
fw->mainWindow()->addRecentlyOpenedFile( fn );
@@ -326,7 +326,7 @@ bool FormFile::closeEvent()
editor()->save();
switch ( TQMessageBox::warning( MainWindow::self, i18n( "Save Form" ),
- i18n( "Save changes to form '%1'?" ).tqarg( filename ),
+ i18n( "Save changes to form '%1'?" ).arg( filename ),
i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) {
case 0: // save
if ( !save() )
@@ -653,7 +653,7 @@ void FormFile::checkTimeStamp()
if ( codeEdited ) {
if ( TQMessageBox::information( MainWindow::self, i18n( "TQt Designer" ),
i18n( "File '%1' has been changed outside TQt Designer.\n"
- "Do you want to reload it?" ).tqarg( timeStamp.fileName() ),
+ "Do you want to reload it?" ).arg( timeStamp.fileName() ),
i18n( "&Yes" ), i18n( "&No" ) ) == 0 ) {
TQFile f( timeStamp.fileName() );
if ( f.open( IO_ReadOnly ) ) {
@@ -854,7 +854,7 @@ bool FormFile::checkFileName( bool allowBreak )
if ( ff )
TQMessageBox::warning( MainWindow::self, i18n( "Invalid Filename" ),
i18n( "The project already contains a form with a\n"
- "filename of '%1'. Please choose a new filename." ).tqarg( filename ) );
+ "filename of '%1'. Please choose a new filename." ).arg( filename ) );
while ( ff ) {
TQString fn;
while ( fn.isEmpty() ) {
@@ -899,7 +899,7 @@ void FormFile::notifyFormWindowChange()
pro->formOpened( fw );
}
-void FormFile::emitNewtqStatus(FormFile *file)
+void FormFile::emitNewStatus(FormFile *file)
{
- fw->mainWindow()->part()->emitNewtqStatus(fileName(), isModified());
+ fw->mainWindow()->part()->emitNewStatus(fileName(), isModified());
}
diff --git a/kdevdesigner/designer/formfile.h b/kdevdesigner/designer/formfile.h
index 097beff4..f6d71a26 100644
--- a/kdevdesigner/designer/formfile.h
+++ b/kdevdesigner/designer/formfile.h
@@ -116,7 +116,7 @@ signals:
private slots:
void formWindowChangedSomehow();
void notifyFormWindowChange();
- void emitNewtqStatus(FormFile* file);
+ void emitNewStatus(FormFile* file);
private:
bool isFormWindowModified() const;
diff --git a/kdevdesigner/designer/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp
index fbd7e1ad..05636e38 100644
--- a/kdevdesigner/designer/formwindow.cpp
+++ b/kdevdesigner/designer/formwindow.cpp
@@ -31,7 +31,7 @@
#include "sizehandle.h"
#include "metadatabase.h"
#include "resource.h"
-#include "tqlayout.h"
+#include "layout.h"
#include "connectiondialog.h"
#include <widgetdatabase.h>
#include "pixmapchooser.h"
@@ -55,11 +55,11 @@
#include <tqobjectlist.h>
#include <tqtimer.h>
#include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqspinbox.h>
#include <tqstatusbar.h>
#include <tqapplication.h>
-#include <tqpalette.h>
+#include <palette.h>
#include <tqmessagebox.h>
#include <tqpopupmenu.h>
#include <tqsizegrip.h>
@@ -108,7 +108,7 @@ static void restoreCursors( TQWidget *start, FormWindow *fw )
}
}
-#if defined(TQ_WS_WIN32) // #### needed for the workaround for tqrepaint problem on windows
+#if defined(TQ_WS_WIN32) // #### needed for the workaround for repaint problem on windows
#include <tqt_windows.h>
static void flickerfree_update( TQWidget *w )
{
@@ -260,7 +260,7 @@ void FormWindow::paintGrid( TQWidget *w, TQPaintEvent *e )
grid_name.sprintf("FormWindowGrid_%d_%d", mainWindow()->grid().x(), mainWindow()->grid().y());
if( !TQPixmapCache::find( grid_name, grid ) ) {
grid = TQPixmap( 350 + ( 350 % mainWindow()->grid().x() ), 350 + ( 350 % mainWindow()->grid().y() ) );
- grid.fill( tqcolorGroup().color( TQColorGroup::Foreground ) );
+ grid.fill( colorGroup().color( TQColorGroup::Foreground ) );
TQBitmap mask( grid.width(), grid.height() );
mask.fill( color0 );
TQPainter p( &mask );
@@ -321,7 +321,7 @@ TQPoint FormWindow::gridPoint( const TQPoint &p )
void FormWindow::drawSizePreview( const TQPoint &pos, const TQString& text )
{
unclippedPainter->save();
- unclippedPainter->setPen( TQPen( tqcolorGroup().foreground(), 1 ));
+ unclippedPainter->setPen( TQPen( colorGroup().foreground(), 1 ));
unclippedPainter->setRasterOp( CopyROP );
if ( !sizePreviewPixmap.isNull() )
unclippedPainter->drawPixmap( sizePreviewPos, sizePreviewPixmap );
@@ -383,13 +383,13 @@ 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, TQString("<b>A %1</b><p>%2</p>").tqarg( tt ).tqarg( wt ) );
+ TQWhatsThis::add( w, TQString("<b>A %1</b><p>%2</p>").arg( tt ).arg( wt ) );
}
TQString s = w->name();
@@ -416,8 +416,8 @@ void FormWindow::insertWidget()
r.setHeight( 20 );
}
} else {
- r.setWidth( w->tqsizeHint().width() );
- r.setHeight( w->tqsizeHint().height() );
+ r.setWidth( w->sizeHint().width() );
+ r.setHeight( w->sizeHint().height() );
}
}
@@ -463,13 +463,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();
}
@@ -479,7 +479,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();
}
@@ -510,13 +510,13 @@ 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, TQString("<b>A %1</b><p>%2</p>").tqarg( tt ).tqarg( wt ) );
+ TQWhatsThis::add( w, TQString("<b>A %1</b><p>%2</p>").arg( tt ).arg( wt ) );
}
restoreCursors( w, this );
@@ -577,7 +577,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
switch ( currTool ) {
case POINTER_TOOL:
if ( !isMainContainer( TQT_TQOBJECT(w) ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget
- // if the clicked widget is not in a tqlayout, raise it
+ // if the clicked widget is not in a layout, raise it
if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout )
w->raise();
if ( ( e->state() & ControlButton ) ) { // with control pressed, always start rubber band selection
@@ -592,7 +592,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
if ( !sel ) { // ...and widget no selectted: unselect all
clearSelection( FALSE );
} else { // ...widget selected
- // only if widget has a tqlayout (it is a tqlayout meta widget or a laid out container!), unselect its childs
+ // only if widget has a layout (it is a layout meta widget or a laid out container!), unselect its childs
if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ) {
TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
setPropertyShowingBlocked( TRUE );
@@ -622,7 +622,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.find(w) ) )
w = w->parentWidget();
- if ( e->button() == Qt::LeftButton ) { // left button: store original tqgeometry and more as the widget might start moving
+ if ( e->button() == Qt::LeftButton ) { // left button: store original geometry and more as the widget might start moving
widgetPressed = TRUE;
widgetGeom = TQRect( w->pos(), w->size() );
oldPressPos = w->mapFromGlobal( e->globalPos() );
@@ -660,9 +660,9 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
break;
clearSelection( FALSE );
validForBuddy = TRUE;
- mainWindow()->statusMessage( i18n( "Set buddy for '%1' to..." ).tqarg( w->name() ) );
+ mainWindow()->statusMessage( i18n( "Set buddy for '%1' to..." ).arg( w->name() ) );
} else {
- mainWindow()->statusMessage( i18n( "Connect '%1' with..." ).tqarg( w->name() ) );
+ mainWindow()->statusMessage( i18n( "Connect '%1' with..." ).arg( w->name() ) );
}
saveBackground();
startPos = mapFromGlobal( e->globalPos() );
@@ -824,7 +824,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
targetContainer = wa;
hadOwnPalette = wa->ownPalette();
restorePalette = wa->palette();
- wa->setPaletteBackgroundColor( wa->tqcolorGroup().midlight() );
+ wa->setPaletteBackgroundColor( wa->colorGroup().midlight() );
}
}
else if ( targetContainer ) {
@@ -837,7 +837,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( i18n( "%1/%2" ).tqarg( w->pos().x() ).tqarg( w->pos().y() ) );
+ sizePreviewLabel->setText( i18n( "%1/%2" ).arg( w->pos().x() ).arg( w->pos().y() ) );
sizePreviewLabel->adjustSize();
TQRect lg( mapFromGlobal( e->globalPos() ) + TQPoint( 16, 16 ), sizePreviewLabel->size() );
checkPreviewGeometry( lg );
@@ -871,7 +871,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
if ( newendWidget &&
( isMainContainer( TQT_TQOBJECT(newendWidget) ) || insertedWidgets.find( newendWidget ) ) && !isCentralWidget( TQT_TQOBJECT(newendWidget) ) )
endWidget = newendWidget;
- mainWindow()->statusMessage( i18n( "Connect '%1' to '%2'" ).tqarg( startWidget->name() ).
+ mainWindow()->statusMessage( i18n( "Connect '%1' to '%2'" ).arg( startWidget->name() ).
arg( endWidget->name() ) );
currentPos = mapFromGlobal( e->globalPos() );
tqApp->processEvents();
@@ -899,10 +899,10 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
else if ( insertedWidgets.find( newendWidget ) && !isCentralWidget( TQT_TQOBJECT(newendWidget) ) )
endWidget = newendWidget;
if ( endWidget )
- mainWindow()->statusMessage( i18n( "Set buddy '%1' to '%2'" ).tqarg( startWidget->name() ).
+ mainWindow()->statusMessage( i18n( "Set buddy '%1' to '%2'" ).arg( startWidget->name() ).
arg( endWidget->name() ) );
else
- mainWindow()->statusMessage( i18n( "Set buddy '%1' to ..." ).tqarg( startWidget->name() ) );
+ mainWindow()->statusMessage( i18n( "Set buddy '%1' to ..." ).arg( startWidget->name() ) );
currentPos = mapFromGlobal( e->globalPos() );
tqApp->processEvents();
if ( drawRecRect && oldendWidget )
@@ -958,15 +958,15 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
if ( wa == it.key()->parentWidget() )
goto make_move_command;
- // break tqlayout if necessary
+ // break layout if necessary
if ( WidgetFactory::layoutType( wa ) != WidgetFactory::NoLayout ) {
if ( TQMessageBox::information( mainWindow(), i18n( "Inserting Widget" ),
i18n( "You tried to insert a widget into the "
- "tqlayout Container Widget '%1'.\n"
+ "layout Container Widget '%1'.\n"
"This is not possible. "
- "In order to insert the widget, the tqlayout of '%1'\n"
+ "In order to insert the widget, the layout of '%1'\n"
"must first be broken.\n"
- "Break the tqlayout or cancel the operation?" ).
+ "Break the layout or cancel the operation?" ).
arg( wa->name() ).
arg( wa->name() ), i18n( "&Break Layout" ), i18n( "&Cancel" ) ) )
goto make_move_command; // cancel
@@ -1044,7 +1044,7 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
TQString oldBuddy = startWidget->property( "buddy" ).toString();
if ( oldBuddy.isNull() )
oldBuddy = "";
- SetPropertyCommand *cmd = new SetPropertyCommand( i18n( "Set Buddy for %1" ).tqarg( startWidget->name() ),
+ SetPropertyCommand *cmd = new SetPropertyCommand( i18n( "Set Buddy for %1" ).arg( startWidget->name() ),
this, TQT_TQOBJECT(startWidget), mainWindow()->propertyeditor(),
"buddy", startWidget->property( "buddy" ),
endWidget->name(), endWidget->name(),
@@ -1067,11 +1067,11 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
if ( WidgetFactory::layoutType( insertParent ) != WidgetFactory::NoLayout ) {
if ( TQMessageBox::information( mainWindow(), i18n( "Inserting Widget" ),
i18n( "You tried to insert a widget into the "
- "tqlayout Container Widget '%1'.\n"
+ "layout Container Widget '%1'.\n"
"This is not possible. "
- "In order to insert the widget, the tqlayout of '%1'\n"
+ "In order to insert the widget, the layout of '%1'\n"
"must first be broken.\n"
- "Break the tqlayout or cancel the operation?" ).
+ "Break the layout or cancel the operation?" ).
arg( insertParent->name() ).
arg( insertParent->name() ), i18n( "&Break Layout" ), i18n( "&Cancel" ) ) == 0 ) {
breakLayout( insertParent );
@@ -1327,7 +1327,7 @@ void FormWindow::continueRectDraw( const TQPoint &p, const TQPoint &global, TQWi
if ( currRect == r ) {
TQString t = i18n( "%1/%2" );
- t = t.tqarg( r.width() - 1 ).tqarg( r.height() - 1 );
+ t = t.arg( r.width() - 1 ).arg( r.height() - 1 );
drawSizePreview( pos, t );
return;
}
@@ -1339,7 +1339,7 @@ void FormWindow::continueRectDraw( const TQPoint &p, const TQPoint &global, TQWi
currRect = r;
if ( t == Insert ) {
TQString t = i18n( "%1/%2" );
- t = t.tqarg( r.width() - 1 ).tqarg( r.height() - 1 );
+ t = t.arg( r.width() - 1 ).arg( r.height() - 1 );
drawSizePreview( pos, t );
}
unclippedPainter->setClipRegion( TQRegion( rect() ).subtract( TQRect( sizePreviewPos, sizePreviewPixmap.size() ) ) );
@@ -1502,13 +1502,13 @@ void FormWindow::editAdjustSize()
TQPtrList<Command> commands;
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 );
commandHistory()->addCommand( cmd );
@@ -1518,9 +1518,9 @@ void FormWindow::editAdjustSize()
for ( TQWidget* w = widgets.first(); w; w = widgets.next() ) {
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 ) );
}
@@ -1759,7 +1759,7 @@ void FormWindow::currentToolChanged()
emitShowProperties( TQT_TQOBJECT(mainContainer()) );
break;
default:
- mainWindow()->statusMessage( i18n( "Click on the form to insert a %1..." ).tqarg( WidgetDatabase::toolTip( currTool ).lower() ) );
+ mainWindow()->statusMessage( i18n( "Click on the form to insert a %1..." ).arg( WidgetDatabase::toolTip( currTool ).lower() ) );
setCursorToAll( CrossCursor, this );
if ( mainWindow()->formWindow() == this )
emitShowProperties( TQT_TQOBJECT(mainContainer()) );
@@ -1832,7 +1832,7 @@ bool FormWindow::checkCustomWidgets()
if ( !missingCustomWidgets.isEmpty() ) {
TQString txt = i18n( "The following custom widgets are used in '%1',\n"
- "but are not known to TQt Designer:\n" ).tqarg( name() );
+ "but are not known to TQt Designer:\n" ).arg( name() );
for ( TQStringList::Iterator sit = missingCustomWidgets.begin(); sit != missingCustomWidgets.end(); ++sit )
txt += " " + *sit + "\n";
txt += i18n( "If you save this form and generate code for it using uic, \n"
@@ -1910,11 +1910,11 @@ void FormWindow::checkAccels()
insertedWidgets[ (void*)o ] ) {
TQWidget *w = (TQWidget*)o;
const TQMetaProperty* text =
- w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE );
+ w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE );
const TQMetaProperty* title =
- w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE );
+ w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE );
const TQMetaProperty* pageTitle =
- w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pageTitle", TRUE ), TRUE );
+ w->metaObject()->property( w->metaObject()->findProperty( "pageTitle", TRUE ), TRUE );
if ( text )
find_accel( w->property( "text" ).toString(), accels, w );
if ( title )
@@ -1935,7 +1935,7 @@ void FormWindow::checkAccels()
ok = FALSE;
switch ( TQMessageBox::information( mainWindow(), i18n( "Check Accelerators" ),
i18n( "Accelerator '%1' is used once.", "Accelerator '%1' is used %n times.", (*it).count()
- ).tqarg( it.key().upper() ),
+ ).arg( it.key().upper() ),
i18n( "&Select" ),
i18n( "&Cancel" ), TQString(), 2 ) ) {
case 0: // select
@@ -2581,7 +2581,7 @@ void FormWindow::setMainContainer( TQWidget *w )
delete mContainer;
mContainer = w;
insertedWidgets.insert( mContainer, mContainer );
- delete tqlayout();
+ delete layout();
TQHBoxLayout *l = new TQHBoxLayout( this );
l->addWidget( w );
if ( resetPropertyWidget ) {
diff --git a/kdevdesigner/designer/gotolinedialog.ui b/kdevdesigner/designer/gotolinedialog.ui
index 28c1005e..99df35d2 100644
--- a/kdevdesigner/designer/gotolinedialog.ui
+++ b/kdevdesigner/designer/gotolinedialog.ui
@@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -139,7 +139,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/hierarchyview.cpp b/kdevdesigner/designer/hierarchyview.cpp
index c91f5333..2f2d97b4 100644
--- a/kdevdesigner/designer/hierarchyview.cpp
+++ b/kdevdesigner/designer/hierarchyview.cpp
@@ -46,7 +46,7 @@
#include "kdevdesigner_part.h"
#include <klocale.h>
-#include <tqpalette.h>
+#include <palette.h>
#include <tqobjectlist.h>
#include <tqheader.h>
#include <tqpopupmenu.h>
@@ -654,7 +654,7 @@ void HierarchyList::removeTabPage()
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();
@@ -665,7 +665,7 @@ void HierarchyList::removeTabPage()
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 );
@@ -1102,11 +1102,11 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos )
if ( i->rtti() == HierarchyItem::Definition )
i = i->parent();
ListEditor dia( this, 0, TRUE );
- dia.setCaption( i18n( "Edit %1" ).tqarg( i->text( 0 ) ) );
+ dia.setCaption( i18n( "Edit %1" ).arg( i->text( 0 ) ) );
TQStringList entries = lIface->definitionEntries( i->text( 0 ), MainWindow::self->designerInterface() );
dia.setList( entries );
dia.exec();
- Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).tqarg( i->text( 0 )), formWindow,
+ Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).arg( i->text( 0 )), formWindow,
lIface, i->text( 0 ), dia.items() );
formWindow->commandHistory()->addCommand( cmd );
cmd->execute();
@@ -1218,7 +1218,7 @@ void FormDefinitionView::save( TQListViewItem *p, TQListViewItem *i )
lst << i->text( 0 );
i = i->nextSibling();
}
- Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).tqarg( p->text( 0 ) ), formWindow,
+ Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).arg( p->text( 0 ) ), formWindow,
lIface, p->text( 0 ), lst );
formWindow->commandHistory()->addCommand( cmd );
cmd->execute();
diff --git a/kdevdesigner/designer/iconvieweditor.ui b/kdevdesigner/designer/iconvieweditor.ui
index 369fdb67..8711bd6b 100644
--- a/kdevdesigner/designer/iconvieweditor.ui
+++ b/kdevdesigner/designer/iconvieweditor.ui
@@ -130,7 +130,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -179,7 +179,7 @@
<property name="name">
<cstring>itemText</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -229,7 +229,7 @@
<property name="name">
<cstring>itemDeletePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -252,7 +252,7 @@
<property name="name">
<cstring>itemChoosePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -309,7 +309,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/iconvieweditorimpl.cpp b/kdevdesigner/designer/iconvieweditorimpl.cpp
index 07db9813..a5781e89 100644
--- a/kdevdesigner/designer/iconvieweditorimpl.cpp
+++ b/kdevdesigner/designer/iconvieweditorimpl.cpp
@@ -129,7 +129,7 @@ void IconViewEditor::applyClicked()
items.append( item );
}
- PopulateIconViewCommand *cmd = new PopulateIconViewCommand( i18n( "Edit the Items of '%1'" ).tqarg( iconview->name() ),
+ PopulateIconViewCommand *cmd = new PopulateIconViewCommand( i18n( "Edit the Items of '%1'" ).arg( iconview->name() ),
formwindow, iconview, items );
cmd->execute();
formwindow->commandHistory()->addCommand( cmd );
diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp
index bb0f2955..65724614 100644
--- a/kdevdesigner/designer/kdevdesigner_part.cpp
+++ b/kdevdesigner/designer/kdevdesigner_part.cpp
@@ -30,7 +30,7 @@
#include <kiconloader.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqtoolbar.h>
#include <tqmenubar.h>
#include <tqptrlist.h>
@@ -146,9 +146,9 @@ void KDevDesignerPart::setupActions( )
action = new KAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQT_SLOT(layoutAdjustSize()), actionCollection(), "layout_adjustsize");
stateSync(action, m_widget->actionEditAdjustSize);
- action = new KAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithtqlayout.png"), CTRL + Key_H, this, TQT_SLOT(layoutHLayout()), actionCollection(), "layout_h");
+ action = new KAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithlayout.png"), CTRL + Key_H, this, TQT_SLOT(layoutHLayout()), actionCollection(), "layout_h");
stateSync(action, m_widget->actionEditHLayout);
- action = new KAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvtqlayout.png"), CTRL + Key_V, this, TQT_SLOT(layoutVLayout()), actionCollection(), "layout_v");
+ action = new KAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvlayout.png"), CTRL + Key_V, this, TQT_SLOT(layoutVLayout()), actionCollection(), "layout_v");
stateSync(action, m_widget->actionEditVLayout);
action = new KAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQT_SLOT(layoutGridLayout()), actionCollection(), "layout_grid");
stateSync(action, m_widget->actionEditGridLayout);
@@ -552,9 +552,9 @@ void KDevDesignerPart::emitEditSource(const TQString &formName)
emit editSource(designerType(), formName);
}
-void KDevDesignerPart::emitNewtqStatus(const TQString &formName, int status)
+void KDevDesignerPart::emitNewStatus(const TQString &formName, int status)
{
- emit newtqStatus(formName, status);
+ emit newStatus(formName, status);
}
void KDevDesignerPart::toolsEditCustomWidgets( )
diff --git a/kdevdesigner/designer/kdevdesigner_part.h b/kdevdesigner/designer/kdevdesigner_part.h
index 5d402856..4a98f1a7 100644
--- a/kdevdesigner/designer/kdevdesigner_part.h
+++ b/kdevdesigner/designer/kdevdesigner_part.h
@@ -61,7 +61,7 @@ public:
void emitEditFunction(const TQString &formName, const TQString &functionName);
void emitEditSource(const TQString &formName);
- void emitNewtqStatus(const TQString &formName, int status);
+ void emitNewStatus(const TQString &formName, int status);
protected:
virtual bool openFile();
diff --git a/kdevdesigner/designer/layout.cpp b/kdevdesigner/designer/layout.cpp
index f908dd4b..89dfe821 100644
--- a/kdevdesigner/designer/layout.cpp
+++ b/kdevdesigner/designer/layout.cpp
@@ -25,11 +25,11 @@
**********************************************************************/
#include "formwindow.h"
-#include "tqlayout.h"
+#include "layout.h"
#include <widgetdatabase.h>
#include "widgetfactory.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqevent.h>
#include <tqpainter.h>
#include <tqpen.h>
@@ -44,7 +44,7 @@ bool operator<( const TQGuardedPtr<TQWidget> &p1, const TQGuardedPtr<TQWidget> &
}
/*!
- \class Layout tqlayout.h
+ \class Layout layout.h
\brief Baseclass for layouting widgets in the Designer
Classes derived from this abstract base class are used for layouting
@@ -67,7 +67,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
@@ -85,7 +85,7 @@ void Layout::setup()
TQWidget *w = 0;
// Go through all widgets of the list we got. As we can only
- // tqlayout widgets which have the same parent, we first do some
+ // layout widgets which have the same parent, we first do some
// sorting which means create a list for each parent containing
// its child here. After that we keep working on the list of
// childs which has the most entries.
@@ -120,7 +120,7 @@ void Layout::setup()
}
// If we found no list (because no widget did fit at all) or the
- // best list has only one entry and we do not tqlayout a container,
+ // best list has only one entry and we do not layout a container,
// we leave here.
if ( !lastList || ( lastList->count() < 2 &&
( !layoutBase ||
@@ -133,11 +133,11 @@ void Layout::setup()
}
// Now we have a new and clean widget list, which makes sense
- // to tqlayout
+ // to layout
widgets = *lastList;
// Also use the only correct parent later, so store it
parent = WidgetFactory::widgetOfContainer( widgets.first()->parentWidget() );
- // Now calculate the position where the tqlayout-meta-widget should
+ // Now calculate the position where the layout-meta-widget should
// be placed and connect to widgetDestroyed() signals of the
// widgets to get informed if one gets deleted to be able to
// handle that and do not crash in this case
@@ -149,7 +149,7 @@ void Layout::setup()
geometries.insert( w, TQRect( w->pos(), w->size() ) );
// Change the Z-order, as saving/loading uses the Z-order for
// writing/creating widgets and this has to be the same as in
- // the tqlayout. Else saving + loading will give different results
+ // the layout. Else saving + loading will give different results
w->raise();
}
}
@@ -182,7 +182,7 @@ bool Layout::prepareLayout( bool &needMove, bool &needReparent )
return TRUE;
}
-void Layout::finishLayout( bool needMove, TQLayout *tqlayout )
+void Layout::finishLayout( bool needMove, TQLayout *layout )
{
if ( needMove )
layoutBase->move( startPoint );
@@ -193,7 +193,7 @@ void Layout::finishLayout( bool needMove, TQLayout *tqlayout )
layoutBase->setGeometry( oldGeometry );
oldGeometry = g;
layoutBase->show();
- tqlayout->activate();
+ layout->activate();
formWindow->insertWidget( layoutBase );
formWindow->selectWidget( TQT_TQOBJECT(layoutBase) );
TQString n = layoutBase->name();
@@ -236,7 +236,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 ||
@@ -311,16 +311,16 @@ void HorizontalLayout::doLayout()
if ( !prepareLayout( needMove, needReparent ) )
return;
- TQHBoxLayout *tqlayout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox );
+ TQHBoxLayout *layout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox );
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
if ( !useSplitter ) {
if ( qstrcmp( w->className(), "Spacer" ) == 0 )
- tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() );
+ layout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
else
- tqlayout->addWidget( w );
+ layout->addWidget( w );
if ( ::tqqt_cast<TQLayoutWidget*>(w) )
( (TQLayoutWidget*)w )->updateSizePolicy();
}
@@ -330,7 +330,7 @@ void HorizontalLayout::doLayout()
if ( ::tqqt_cast<TQSplitter*>(layoutBase) )
( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal );
- finishLayout( needMove, tqlayout );
+ finishLayout( needMove, layout );
}
@@ -375,16 +375,16 @@ void VerticalLayout::doLayout()
if ( !prepareLayout( needMove, needReparent ) )
return;
- TQVBoxLayout *tqlayout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox );
+ TQVBoxLayout *layout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox );
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
if ( !useSplitter ) {
if ( qstrcmp( w->className(), "Spacer" ) == 0 )
- tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() );
+ layout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
else
- tqlayout->addWidget( w );
+ layout->addWidget( w );
if ( ::tqqt_cast<TQLayoutWidget*>(w) )
( (TQLayoutWidget*)w )->updateSizePolicy();
}
@@ -394,7 +394,7 @@ void VerticalLayout::doLayout()
if ( ::tqqt_cast<TQSplitter*>(layoutBase) )
( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical );
- finishLayout( needMove, tqlayout );
+ finishLayout( needMove, layout );
}
@@ -747,7 +747,7 @@ void GridLayout::doLayout()
if ( !prepareLayout( needMove, needReparent ) )
return;
- QDesignerGridLayout *tqlayout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid );
+ QDesignerGridLayout *layout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid );
if ( !grid )
buildGrid();
@@ -759,18 +759,18 @@ 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, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->tqalignment() : 0 );
+ layout->addWidget( w, r, c, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->alignment() : 0 );
} else {
- tqlayout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->tqalignment() : 0 );
+ layout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->alignment() : 0 );
}
if ( ::tqqt_cast<TQLayoutWidget*>(w) )
( (TQLayoutWidget*)w )->updateSizePolicy();
w->show();
} else {
- qWarning("ooops, widget '%s' does not fit in tqlayout", w->name() );
+ qWarning("ooops, widget '%s' does not fit in layout", w->name() );
}
}
- finishLayout( needMove, tqlayout );
+ finishLayout( needMove, layout );
}
void GridLayout::setup()
@@ -787,7 +787,7 @@ void GridLayout::buildGrid()
// Pixel to cell conversion:
// By keeping a list of start'n'stop values (x & y) for each widget,
// it is possible to create a very small grid of cells to represent
- // the widget tqlayout.
+ // the widget layout.
// -----------------------------------------------------------------
// We need a list of both start and stop values for x- & y-axis
@@ -798,7 +798,7 @@ void GridLayout::buildGrid()
int index = 0;
TQWidget* w = 0;
for ( w = widgets.first(); w; w = widgets.next() ) {
- TQRect widgetPos = w->tqgeometry();
+ TQRect widgetPos = w->geometry();
x[index] = widgetPos.left();
x[index+1] = widgetPos.right();
y[index] = widgetPos.top();
@@ -829,7 +829,7 @@ void GridLayout::buildGrid()
current++;
}
- // Create the smallest grid possible to represent the current tqlayout
+ // Create the smallest grid possible to represent the current layout
// Since no widget will be placed in the last row and column, we'll
// skip them to increase speed even further
delete grid;
@@ -837,7 +837,7 @@ void GridLayout::buildGrid()
// Mark the cells in the grid that contains a widget
for ( w = widgets.first(); w; w = widgets.next() ) {
- TQRect c(0,0,0,0), widgetPos = w->tqgeometry();
+ TQRect c(0,0,0,0), widgetPos = w->geometry();
// From left til right (not including)
for (uint cw=0; cw<x.size(); cw++) {
if ( x[cw] == widgetPos.left() )
@@ -936,25 +936,25 @@ void Spacer::setSizeType( SizeType t )
sizeP = TQSizePolicy( TQSizePolicy::Minimum, (TQSizePolicy::SizeType)t );
else
sizeP = TQSizePolicy( (TQSizePolicy::SizeType)t, TQSizePolicy::Minimum );
- tqsetSizePolicy( sizeP );
+ setSizePolicy( sizeP );
}
Spacer::SizeType Spacer::sizeType() const
{
if ( orient ==Qt::Vertical )
- return (SizeType)tqsizePolicy().verData();
- return (SizeType)tqsizePolicy().horData();
+ return (SizeType)sizePolicy().verData();
+ return (SizeType)sizePolicy().horData();
}
-int Spacer::tqalignment() const
+int Spacer::alignment() const
{
if ( orient ==Qt::Vertical )
return AlignHCenter;
return AlignVCenter;
}
-TQSize Spacer::tqminimumSize() const
+TQSize Spacer::minimumSize() const
{
TQSize s = TQSize( 20,20 );
if ( sizeType() == Expanding )
@@ -965,7 +965,7 @@ TQSize Spacer::tqminimumSize() const
return s;
}
-TQSize Spacer::tqsizeHint() const
+TQSize Spacer::sizeHint() const
{
return sh;
}
@@ -975,7 +975,7 @@ void Spacer::setSizeHint( const TQSize &s )
{
sh = s;
if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout )
- resize( tqsizeHint() );
+ resize( sizeHint() );
updateGeometry();
}
diff --git a/kdevdesigner/designer/layout.h b/kdevdesigner/designer/layout.h
index d71368ab..c42fb373 100644
--- a/kdevdesigner/designer/layout.h
+++ b/kdevdesigner/designer/layout.h
@@ -31,7 +31,7 @@
#include <tqmap.h>
#include <tqguardedptr.h>
#include <tqobject.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqmap.h>
#include <tqwidgetlist.h>
@@ -51,7 +51,7 @@ public:
virtual void undoLayout();
virtual void breakLayout();
virtual bool prepareLayout( bool &needMove, bool &needReparent );
- virtual void finishLayout( bool needMove, TQLayout *tqlayout );
+ virtual void finishLayout( bool needMove, TQLayout *layout );
protected:
TQWidgetList widgets;
@@ -125,8 +125,8 @@ class Spacer : public TQWidget
TQ_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation )
Q_ENUMS( SizeType )
TQ_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType )
- TQ_PROPERTY( TQSize tqsizeHint READ tqsizeHint WRITE setSizeHint DESIGNABLE true STORED true )
- TQ_OVERRIDE( TQRect tqgeometry DESIGNABLE false )
+ TQ_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true )
+ TQ_OVERRIDE( TQRect geometry DESIGNABLE false )
private:
enum { HSize = 6, HMask = 0x3f, VMask = HMask << HSize,
@@ -142,11 +142,11 @@ public:
Spacer( TQWidget *parent, const char *name );
- TQSize tqminimumSize() const;
- TQSize tqsizeHint() const;
+ TQSize minimumSize() const;
+ 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/kdevdesigner/designer/listboxdnd.cpp b/kdevdesigner/designer/listboxdnd.cpp
index 920559c5..54498478 100644
--- a/kdevdesigner/designer/listboxdnd.cpp
+++ b/kdevdesigner/designer/listboxdnd.cpp
@@ -152,8 +152,8 @@ void ListBoxDnd::updateLine( const TQPoint & dragPos )
TQListBoxItem *item = itemAt( dragPos );
int ypos = item ?
- ( src->tqitemRect( item ).bottom() - ( line->height() / 2 ) ) :
- ( src->tqitemRect( ((TQListBox *)src)->firstItem() ).top() );
+ ( src->itemRect( item ).bottom() - ( line->height() / 2 ) ) :
+ ( src->itemRect( ((TQListBox *)src)->firstItem() ).top() );
line->resize( src->viewport()->width(), line->height() );
line->move( 0, ypos );
@@ -166,9 +166,9 @@ TQListBoxItem * ListBoxDnd::itemAt( TQPoint pos )
TQListBoxItem * last = src->item( src->count() - 1 );
int i = src->index( result );
- if ( result && ( pos.y() < (src->tqitemRect(result).top() + src->itemHeight(i)/2) ) )
+ if ( result && ( pos.y() < (src->itemRect(result).top() + src->itemHeight(i)/2) ) )
result = result->prev();
- else if ( !result && pos.y() > src->tqitemRect( last ).bottom() )
+ else if ( !result && pos.y() > src->itemRect( last ).bottom() )
result = last;
return result;
@@ -240,7 +240,7 @@ bool ListBoxItemDrag::canDecode( TQDragMoveEvent * event )
bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBoxItem * after )
{
- TQByteArray data = event->tqencodedData( "qt/listboxitem" );
+ TQByteArray data = event->encodedData( "qt/listboxitem" );
if ( data.size() ) {
event->accept();
diff --git a/kdevdesigner/designer/listboxeditor.ui b/kdevdesigner/designer/listboxeditor.ui
index 2827c93d..df584ddf 100644
--- a/kdevdesigner/designer/listboxeditor.ui
+++ b/kdevdesigner/designer/listboxeditor.ui
@@ -91,7 +91,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -196,7 +196,7 @@
<property name="name">
<cstring>itemDeletePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -219,7 +219,7 @@
<property name="name">
<cstring>itemChoosePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -250,7 +250,7 @@
<property name="name">
<cstring>itemText</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -303,7 +303,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/listboxeditorimpl.cpp b/kdevdesigner/designer/listboxeditorimpl.cpp
index 98c5c835..db3ddcc8 100644
--- a/kdevdesigner/designer/listboxeditorimpl.cpp
+++ b/kdevdesigner/designer/listboxeditorimpl.cpp
@@ -161,7 +161,7 @@ void ListBoxEditor::applyClicked()
items.append( item );
}
- PopulateListBoxCommand *cmd = new PopulateListBoxCommand( i18n( "Edit the Items of '%1'" ).tqarg( listbox->name() ),
+ PopulateListBoxCommand *cmd = new PopulateListBoxCommand( i18n( "Edit the Items of '%1'" ).arg( listbox->name() ),
formwindow, listbox, items );
cmd->execute();
formwindow->commandHistory()->addCommand( cmd );
diff --git a/kdevdesigner/designer/listboxrename.cpp b/kdevdesigner/designer/listboxrename.cpp
index 53f0deea..0a32d292 100644
--- a/kdevdesigner/designer/listboxrename.cpp
+++ b/kdevdesigner/designer/listboxrename.cpp
@@ -113,7 +113,7 @@ bool ListBoxRename::eventFilter( TQObject *, TQEvent * event )
case TQEvent::Resize:
if ( clickedItem && ed && !ed->isHidden() ) {
- TQRect rect = src->tqitemRect( clickedItem );
+ TQRect rect = src->itemRect( clickedItem );
ed->resize( rect.right() - rect.left() - 1,
rect.bottom() - rect.top() - 1 );
}
@@ -130,7 +130,7 @@ void ListBoxRename::showLineEdit()
{
if ( !clickedItem || activity )
return;
- TQRect rect = src->tqitemRect( clickedItem );
+ TQRect rect = src->itemRect( clickedItem );
ed->resize( rect.right() - rect.left() - 1,
rect.bottom() - rect.top() - 1 );
ed->move( rect.left() + 1, rect.top() + 1 );
diff --git a/kdevdesigner/designer/listeditor.ui b/kdevdesigner/designer/listeditor.ui
index 30b766a0..c477ff1a 100644
--- a/kdevdesigner/designer/listeditor.ui
+++ b/kdevdesigner/designer/listeditor.ui
@@ -114,7 +114,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/listviewdnd.cpp b/kdevdesigner/designer/listviewdnd.cpp
index 953551df..32dcc6d5 100644
--- a/kdevdesigner/designer/listviewdnd.cpp
+++ b/kdevdesigner/designer/listviewdnd.cpp
@@ -142,12 +142,12 @@ int ListViewDnd::buildFlatList( ListViewItemList & list )
if ( (*it)->isSelected() ) {
if ( (*it)->childCount() == 0 ) {
- // Selected, no tqchildren
+ // Selected, no children
list.append( *it );
} else if ( !addKids ) {
// Children processing not set, so set it
// Also find the item were we shall quit
- // processing tqchildren...if any such item
+ // processing children...if any such item
addKids = TRUE;
nextSibling = (*it)->nextSibling();
nextParent = (*it)->parent();
@@ -157,7 +157,7 @@ int ListViewDnd::buildFlatList( ListViewItemList & list )
}
}
} else if ( ((*it)->childCount() == 0) && addKids ) {
- // Leaf node, and we _do_ process tqchildren
+ // Leaf node, and we _do_ process children
list.append( *it );
}
}
@@ -191,8 +191,8 @@ void ListViewDnd::updateLine( const TQPoint & dragPos )
TQListView * src = (TQListView *) this->src;
int ypos = item ?
- ( src->tqitemRect( item ).bottom() - ( line->height() / 2 ) ) :
- ( src->tqitemRect( src->firstChild() ).top() );
+ ( src->itemRect( item ).bottom() - ( line->height() / 2 ) ) :
+ ( src->itemRect( src->firstChild() ).top() );
int xpos = dropDepth( item, dragPos ) * src->treeStepSize();
line->resize( src->viewport()->width() - xpos, line->height() );
@@ -217,7 +217,7 @@ TQListViewItem * ListViewDnd::itemAt( TQPoint pos )
while ( result && !result->isVisible() && result->parent() )
result = result->parent();
- if ( !result && src->firstChild() && (pos.y() > src->tqitemRect(src->firstChild()).bottom()) ) {
+ if ( !result && src->firstChild() && (pos.y() > src->itemRect(src->firstChild()).bottom()) ) {
result = src->lastItem();
if ( !result->isVisible() )
// Handle special case where last item is actually hidden
@@ -284,7 +284,7 @@ bool ListViewItemDrag::canDecode( TQDragMoveEvent * event )
bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * parent, TQListViewItem * insertPoint, DropRelation dr )
{
- TQByteArray data = event->tqencodedData( "qt/listviewitem" );
+ TQByteArray data = event->encodedData( "qt/listviewitem" );
TQListViewItem* itemParent = insertPoint ? insertPoint->parent() : 0;
// Change from sibling (default) to child creation
diff --git a/kdevdesigner/designer/listvieweditor.ui b/kdevdesigner/designer/listvieweditor.ui
index e2f3447f..8a0abe14 100644
--- a/kdevdesigner/designer/listvieweditor.ui
+++ b/kdevdesigner/designer/listvieweditor.ui
@@ -142,7 +142,7 @@
<property name="name">
<cstring>itemText</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -203,7 +203,7 @@
<property name="name">
<cstring>itemDeletePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -226,7 +226,7 @@
<property name="name">
<cstring>itemChoosePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -292,7 +292,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -426,7 +426,7 @@
<property name="name">
<cstring>colDeletePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -449,7 +449,7 @@
<property name="name">
<cstring>colChoosePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -480,7 +480,7 @@
<property name="name">
<cstring>colText</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -597,7 +597,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -642,7 +642,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/listvieweditorimpl.cpp b/kdevdesigner/designer/listvieweditorimpl.cpp
index 9e6c54ed..bd6c0e64 100644
--- a/kdevdesigner/designer/listvieweditorimpl.cpp
+++ b/kdevdesigner/designer/listvieweditorimpl.cpp
@@ -127,7 +127,7 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw
void ListViewEditor::applyClicked()
{
setupItems();
- PopulateListViewCommand *cmd = new PopulateListViewCommand( i18n( "Edit the Items and Columns of '%1'" ).tqarg( listview->name() ),
+ PopulateListViewCommand *cmd = new PopulateListViewCommand( i18n( "Edit the Items and Columns of '%1'" ).arg( listview->name() ),
formwindow, listview, itemsPreview );
cmd->execute();
formwindow->commandHistory()->addCommand( cmd );
diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp
index dbc2b932..cc56386a 100644
--- a/kdevdesigner/designer/mainwindow.cpp
+++ b/kdevdesigner/designer/mainwindow.cpp
@@ -92,7 +92,7 @@
#include <tqpixmap.h>
#include <tqworkspace.h>
#include <tqfiledialog.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqmessagebox.h>
#include <tqbuffer.h>
#include <tqdir.h>
@@ -113,7 +113,7 @@
#include <tqaccel.h>
#include <tqtooltip.h>
#include <tqsizegrip.h>
-#include <tqtextview.h>
+#include <textview.h>
#include <tqassistantclient.h>
#include <stdlib.h>
@@ -537,7 +537,7 @@ int MainWindow::currentTool() const
{
if ( !actionCurrentTool )
return POINTER_TOOL;
- return TQString::tqfromLatin1(actionCurrentTool->name()).toInt();
+ return TQString::fromLatin1(actionCurrentTool->name()).toInt();
}
void MainWindow::runProjectPrecondition()
@@ -735,14 +735,14 @@ void MainWindow::previewForm( const TQString & style )
void MainWindow::helpContents()
{
- TQWidget *tqfocusWidget = tqApp->tqfocusWidget();
+ TQWidget *focusWidget = tqApp->focusWidget();
bool showClassDocu = TRUE;
- while ( tqfocusWidget ) {
- if ( tqfocusWidget->isA( "PropertyList" ) ) {
+ while ( focusWidget ) {
+ if ( focusWidget->isA( "PropertyList" ) ) {
showClassDocu = FALSE;
break;
}
- tqfocusWidget = tqfocusWidget->parentWidget();
+ focusWidget = focusWidget->parentWidget();
}
TQString source = "designer-manual.html";
@@ -767,7 +767,7 @@ void MainWindow::helpContents()
if ( propertyEditor->widget() && !showClassDocu ) {
if ( !propertyEditor->currentProperty().isEmpty() ) {
- TQMetaObject* mo = propertyEditor->tqmetaObjectOfCurrentProperty();
+ TQMetaObject* mo = propertyEditor->metaObjectOfCurrentProperty();
TQString s;
TQString cp = propertyEditor->currentProperty();
if ( cp == "layoutMargin" ) {
@@ -783,7 +783,7 @@ void MainWindow::helpContents()
source = propertyDocumentation[ "TQObject/name" ];
} else {
while ( mo && !propertyDocumentation.contains( ( s = TQString( mo->className() ) + "/" + cp ) ) )
- mo = mo->tqsuperClass();
+ mo = mo->superClass();
if ( mo )
source = "p:" + propertyDocumentation[s];
}
@@ -794,7 +794,7 @@ void MainWindow::helpContents()
if ( classname.lower() == "spacer" )
source = "qspaceritem.html#details";
else if ( classname == TQLAYOUTWIDGET_OBJECT_NAME_STRING )
- source = "tqlayout.html";
+ source = "layout.html";
else
source = TQString( WidgetFactory::classNameOf( propertyEditor->widget() ) ).lower() + ".html#details";
}
@@ -822,7 +822,7 @@ void MainWindow::helpAbout()
dlg.aboutLicense->setText( iface->aboutText() );
}
dlg.aboutVersion->setText(TQString("Version ") + TQString(TQT_VERSION_STR));
- dlg.resize( dlg.width(), dlg.tqlayout()->heightForWidth(dlg.width()) );
+ dlg.resize( dlg.width(), dlg.layout()->heightForWidth(dlg.width()) );
dlg.exec();
}
@@ -1279,7 +1279,7 @@ void MainWindow::insertFormWindow( FormWindow *fw )
{
if ( fw )
TQWhatsThis::add( fw, i18n( "<b>The Form Window</b>"
- "<p>Use the various tools to add widgets or to change the tqlayout "
+ "<p>Use the various tools to add widgets or to change the layout "
"and behavior of the components in the form. Select one or multiple "
"widgets to move them or lay them out. If a single widget is chosen it can "
"be resized using the resize handles.</p>"
@@ -1484,11 +1484,11 @@ void MainWindow::updateUndoRedo( bool undoAvailable, bool redoAvailable,
actionEditUndo->setEnabled( undoAvailable );
actionEditRedo->setEnabled( redoAvailable );
if ( !undoCmd.isEmpty() )
- actionEditUndo->setMenuText( i18n( "&Undo: %1" ).tqarg( undoCmd ) );
+ actionEditUndo->setMenuText( i18n( "&Undo: %1" ).arg( undoCmd ) );
else
actionEditUndo->setMenuText( i18n( "&Undo: Not Available" ) );
if ( !redoCmd.isEmpty() )
- actionEditRedo->setMenuText( i18n( "&Redo: %1" ).tqarg( redoCmd ) );
+ actionEditRedo->setMenuText( i18n( "&Redo: %1" ).arg( redoCmd ) );
else
actionEditRedo->setMenuText( i18n( "&Redo: Not Available" ) );
@@ -1554,18 +1554,18 @@ void MainWindow::popupWidgetMenu( const TQPoint &gp, FormWindow * /*fw*/, TQWidg
void MainWindow::setupRMBProperties( TQValueList<uint> &ids, TQMap<TQString, int> &props, TQWidget *w )
{
- const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE );
+ const TQMetaProperty* text = w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE );
if ( text && qstrcmp( text->type(), TQSTRING_OBJECT_NAME_STRING) != 0 )
text = 0;
- const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE );
+ const TQMetaProperty* title = w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE );
if ( title && qstrcmp( title->type(), TQSTRING_OBJECT_NAME_STRING) != 0 )
title = 0;
const TQMetaProperty* pagetitle =
- w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pageTitle", TRUE ), TRUE );
+ w->metaObject()->property( w->metaObject()->findProperty( "pageTitle", TRUE ), TRUE );
if ( pagetitle && qstrcmp( pagetitle->type(), TQSTRING_OBJECT_NAME_STRING) != 0 )
pagetitle = 0;
const TQMetaProperty* pixmap =
- w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pixmap", TRUE ), TRUE );
+ w->metaObject()->property( w->metaObject()->findProperty( "pixmap", TRUE ), TRUE );
if ( pixmap && qstrcmp( pixmap->type(), TQPIXMAP_OBJECT_NAME_STRING) != 0 )
pixmap = 0;
@@ -1721,7 +1721,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid
bool ok = FALSE;
bool oldDoWrap = FALSE;
if ( ::tqqt_cast<TQLabel*>(w) ) {
- int align = w->property( "tqalignment" ).toInt();
+ int align = w->property( "alignment" ).toInt();
if ( align & WordBreak )
oldDoWrap = TRUE;
}
@@ -1737,7 +1737,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid
}
if ( ok ) {
if ( oldDoWrap != doWrap ) {
- TQString pn( i18n( "Set 'wordwrap' of '%1'" ).tqarg( w->name() ) );
+ TQString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) );
SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
"wordwrap", TQVariant( oldDoWrap, 0 ),
TQVariant( doWrap, 0 ), TQString(), TQString() );
@@ -1746,7 +1746,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid
MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "wordwrap", TRUE );
}
- 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() );
@@ -1759,7 +1759,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid
TQString title = TQInputDialog::getText( i18n("Title"), i18n( "New title" ),
TQLineEdit::Normal, 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" ),
title, TQString(), TQString() );
@@ -1772,7 +1772,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid
TQString text = TQInputDialog::getText( i18n("Page Title"), i18n( "New page title" ),
TQLineEdit::Normal, w->property("pageTitle").toString(), &ok, this );
if ( ok ) {
- TQString pn( i18n( "Set the 'pageTitle' of '%2'" ).tqarg( w->name() ) );
+ TQString pn( i18n( "Set the 'pageTitle' of '%2'" ).arg( w->name() ) );
SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
"pageTitle",
w->property( "pageTitle" ),
@@ -1785,7 +1785,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid
TQPixmap oldPix = TQVariant(w->property( "pixmap" )).toPixmap();
TQPixmap pix = qChoosePixmap( this, formWindow(), oldPix );
if ( !pix.isNull() ) {
- TQString pn( i18n( "Set the 'pixmap' of '%2'" ).tqarg( w->name() ) );
+ TQString pn( i18n( "Set the 'pixmap' of '%2'" ).arg( w->name() ) );
SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
"pixmap", w->property( "pixmap" ),
pix, TQString(), TQString() );
@@ -1802,7 +1802,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
TQTabWidget *tw = (TQTabWidget*)w;
if ( id == commands[ "add" ] ) {
AddTabPageCommand *cmd =
- new AddTabPageCommand( i18n( "Add Page to %1" ).tqarg( tw->name() ), formWindow(),
+ new AddTabPageCommand( i18n( "Add Page to %1" ).arg( tw->name() ), formWindow(),
tw, "Tab" );
formWindow()->commandHistory()->addCommand( cmd );
cmd->execute();
@@ -1811,7 +1811,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
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();
@@ -1821,7 +1821,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
TQToolBox *tb = (TQToolBox*)w;
if ( id == commands[ "add" ] ) {
AddToolBoxPageCommand *cmd =
- new AddToolBoxPageCommand( i18n( "Add Page to %1" ).tqarg( tb->name() ),
+ new AddToolBoxPageCommand( i18n( "Add Page to %1" ).arg( tb->name() ),
formWindow(),
tb, "Page" );
formWindow()->commandHistory()->addCommand( cmd );
@@ -1841,7 +1841,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
QDesignerWidgetStack *ws = (QDesignerWidgetStack*)w;
if ( id == commands[ "add" ] ) {
AddWidgetStackPageCommand *cmd =
- new AddWidgetStackPageCommand( i18n( "Add Page to %1" ).tqarg( ws->name() ),
+ new AddWidgetStackPageCommand( i18n( "Add Page to %1" ).arg( ws->name() ),
formWindow(), ws );
formWindow()->commandHistory()->addCommand( cmd );
cmd->execute();
@@ -1849,14 +1849,14 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
if ( ws->visibleWidget() ) {
DeleteWidgetStackPageCommand *cmd =
new DeleteWidgetStackPageCommand( i18n( "Delete Page %1 of %2" ).
- tqarg( ws->currentPage() ).tqarg( ws->name() ),
+ arg( ws->currentPage() ).arg( ws->name() ),
formWindow(), ws, ws->visibleWidget() );
formWindow()->commandHistory()->addCommand( cmd );
cmd->execute();
}
} else if ( id == commands[ "nextpage" ] ) {
int currentPage = w->property( "currentPage" ).toInt();
- TQString pn( i18n( "Raise next page of '%2'" ).tqarg( w->name() ) );
+ TQString pn( i18n( "Raise next page of '%2'" ).arg( w->name() ) );
SetPropertyCommand *cmd =
new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
"currentPage", currentPage,
@@ -1866,7 +1866,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "currentPage", TRUE );
} else if ( id == commands[ "prevpage" ] ) {
int currentPage = w->property( "currentPage" ).toInt();
- TQString pn( i18n( "Raise previous page of '%2'" ).tqarg( w->name() ) );
+ TQString pn( i18n( "Raise previous page of '%2'" ).arg( w->name() ) );
SetPropertyCommand *cmd =
new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
"currentPage", currentPage,
@@ -1881,7 +1881,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) {
if ( id == commands[ "add" ] ) {
AddContainerPageCommand *cmd =
- new AddContainerPageCommand( i18n( "Add Page to %1" ).tqarg( w->name() ),
+ new AddContainerPageCommand( i18n( "Add Page to %1" ).arg( w->name() ),
formWindow(), w, "Page" );
formWindow()->commandHistory()->addCommand( cmd );
cmd->execute();
@@ -1892,7 +1892,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
int index = iface->currentIndex( wClassName, w );
DeleteContainerPageCommand *cmd =
new DeleteContainerPageCommand( i18n( "Delete Page %1 of %2" ).
- tqarg( iface->pageLabel( wClassName,
+ arg( iface->pageLabel( wClassName,
w, index ) ).
arg( w->name() ),
formWindow(), w, index );
@@ -1942,7 +1942,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
TQWizard *wiz = (TQWizard*)fw->mainContainer();
if ( id == commands[ "add" ] ) {
AddWizardPageCommand *cmd =
- new AddWizardPageCommand( i18n( "Add Page to %1" ).tqarg( wiz->name() ),
+ new AddWizardPageCommand( i18n( "Add Page to %1" ).arg( wiz->name() ),
formWindow(), wiz, "WizardPage" );
formWindow()->commandHistory()->addCommand( cmd );
cmd->execute();
@@ -1951,7 +1951,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
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 );
@@ -1968,7 +1968,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
TQString text = TQInputDialog::getText( i18n("Page Title"), i18n( "New page title" ),
TQLineEdit::Normal, 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 );
@@ -1980,13 +1980,13 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
TQMainWindow *mw = (TQMainWindow*)fw->mainContainer();
if ( id == commands[ "add_toolbar" ] ) {
AddToolBarCommand *cmd =
- new AddToolBarCommand( i18n( "Add Toolbar to '%1'" ).tqarg( formWindow()->name() ),
+ new AddToolBarCommand( i18n( "Add Toolbar to '%1'" ).arg( formWindow()->name() ),
formWindow(), mw );
formWindow()->commandHistory()->addCommand( cmd );
cmd->execute();
} else if ( id == commands[ "add_menu_item" ] ) {
AddMenuCommand *cmd =
- new AddMenuCommand( i18n( "Add Menu to '%1'" ).tqarg( formWindow()->name() ),
+ new AddMenuCommand( i18n( "Add Menu to '%1'" ).arg( formWindow()->name() ),
formWindow(), mw );
formWindow()->commandHistory()->addCommand( cmd );
cmd->execute();
@@ -2211,8 +2211,8 @@ void MainWindow::writeConfig()
l << w->className;
l << w->includeFile;
l << TQString::number( (int)w->includePolicy );
- l << TQString::number( w->tqsizeHint.width() );
- l << TQString::number( w->tqsizeHint.height() );
+ l << TQString::number( w->sizeHint.width() );
+ l << TQString::number( w->sizeHint.height() );
l << TQString::number( w->lstSignals.count() );
for ( TQValueList<TQCString>::ConstIterator it = w->lstSignals.begin(); it != w->lstSignals.end(); ++it )
l << TQString( fixArgs( *it ) );
@@ -2333,7 +2333,7 @@ void MainWindow::readConfig()
r.setWidth( config.readNumEntry( keybase + "Geometries/MainwindowWidth", r.width() ) );
r.setHeight( config.readNumEntry( keybase + "Geometries/MainwindowHeight", r.height() ) );
- TQRect desk = TQApplication::desktop()->tqgeometry();
+ TQRect desk = TQApplication::desktop()->geometry();
TQRect inter = desk.intersect( r );
resize( r.size() );
if ( inter.width() * inter.height() > ( r.width() * r.height() / 20 ) ) {
@@ -2351,8 +2351,8 @@ void MainWindow::readConfig()
w->className = l[ 0 ];
w->includeFile = l[ 1 ];
w->includePolicy = (MetaDataBase::CustomWidget::IncludePolicy)l[ 2 ].toInt();
- w->tqsizeHint.setWidth( l[ 3 ].toInt() );
- w->tqsizeHint.setHeight( l[ 4 ].toInt() );
+ w->sizeHint.setWidth( l[ 3 ].toInt() );
+ w->sizeHint.setHeight( l[ 4 ].toInt() );
uint c = 5;
if ( l.count() > c ) {
int numSignals = l[ c ].toInt();
@@ -2513,7 +2513,7 @@ void MainWindow::closeEvent( TQCloseEvent *e )
++it;
if ( pro->isModified() ) {
switch ( TQMessageBox::warning( this, i18n( "Save Project Settings" ),
- i18n( "Save changes to '%1'?" ).tqarg( pro->fileName() ),
+ i18n( "Save changes to '%1'?" ).arg( pro->fileName() ),
i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) {
case 0: // save
pro->save();
@@ -2610,20 +2610,20 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f )
}
if ( WidgetFactory::hasSpecialEditor( WidgetDatabase::
idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), TQT_TQOBJECT(w) ) ) {
- statusMessage( i18n( "Edit %1..." ).tqarg( w->className() ) );
+ statusMessage( i18n( "Edit %1..." ).arg( w->className() ) );
WidgetFactory::editWidget( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ),
this, w, formWindow() );
statusBar()->clear();
return TRUE;
}
- const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE );
- const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE );
+ const TQMetaProperty* text = w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE );
+ const TQMetaProperty* title = w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE );
if ( text && text->designable(w) ) {
bool ok = FALSE;
bool oldDoWrap = FALSE;
if ( ::tqqt_cast<TQLabel*>(w) ) {
- int align = w->property( "tqalignment" ).toInt();
+ int align = w->property( "alignment" ).toInt();
if ( align & WordBreak )
oldDoWrap = TRUE;
}
@@ -2640,7 +2640,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f )
}
if ( ok ) {
if ( oldDoWrap != doWrap ) {
- TQString pn( i18n( "Set 'wordwrap' of '%1'" ).tqarg( w->name() ) );
+ TQString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) );
SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
"wordwrap", TQVariant( oldDoWrap, 0 ),
TQVariant( doWrap, 0 ), TQString(), TQString() );
@@ -2649,7 +2649,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f )
MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "wordwrap", TRUE );
}
- TQString pn( i18n( "Set the 'text' of '%1'" ).tqarg( w->name() ) );
+ TQString pn( i18n( "Set the 'text' of '%1'" ).arg( w->name() ) );
SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
"text", w->property( "text" ),
text, TQString(), TQString() );
@@ -2664,7 +2664,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f )
TQString text;
text = TQInputDialog::getText( i18n("Title"), i18n( "New title" ), TQLineEdit::Normal, 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() );
@@ -2706,12 +2706,12 @@ void MainWindow::rebuildCustomWidgetGUI()
a->setToggleAction( TRUE );
a->setText( w->className );
a->setIconSet( *w->pixmap );
- a->setStatusTip( i18n( "Insert a %1 (custom widget)" ).tqarg( w->className ) );
+ a->setStatusTip( i18n( "Insert a %1 (custom widget)" ).arg( w->className ) );
a->setWhatsThis( i18n("<b>%1 (custom widget)</b>"
"<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> menu to "
"add and change custom widgets. You can add properties as well as "
"signals and slots to integrate them into TQt Designer, "
- "and provide a pixmap which will be used to represent the widget on the form.</p>").tqarg( w->className ) );
+ "and provide a pixmap which will be used to represent the widget on the form.</p>").arg( w->className ) );
a->addTo( customWidgetToolBar );
a->addTo( customWidgetToolBar2 );
@@ -2856,7 +2856,7 @@ void MainWindow::checkTempFiles()
void MainWindow::showDialogHelp()
{
TQWidget *w = (TQWidget*)sender();
- w = w->tqtopLevelWidget();
+ w = w->topLevelWidget();
TQString link = documentationPath() + "/designer-manual-13.html#";
@@ -2967,7 +2967,7 @@ void MainWindow::editFunction( const TQString &func, bool rereadSource )
if ( !MetaDataBase::hasEditor( lang ) ) {
TQMessageBox::information( this, i18n( "Edit Source" ),
i18n( "There is no plugin for editing %1 code installed.\n"
- "Note: Plugins are not available in static TQt configurations." ).tqarg( lang ) );
+ "Note: Plugins are not available in static TQt configurations." ).arg( lang ) );
return;
}
diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp
index e7ba30f3..72f2469b 100644
--- a/kdevdesigner/designer/mainwindowactions.cpp
+++ b/kdevdesigner/designer/mainwindowactions.cpp
@@ -44,12 +44,12 @@
#include <tqmessagebox.h>
#include <tqstatusbar.h>
#include <tqlistbox.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqcombobox.h>
#include <tqspinbox.h>
#include <tqinputdialog.h>
#include <tqdatetimeedit.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include "defs.h"
#include "project.h"
@@ -225,7 +225,7 @@ void MainWindow::setupEditActions()
/* TQToolBar *tb = new TQToolBar( this, "Edit" );
tb->setCloseMode( TQDockWindow::Undocked );
- TQWhatsThis::add( tb, i18n( "<b>The Edit toolbar</b>%1").tqarg(i18n(toolbarHelp).tqarg("")) );
+ TQWhatsThis::add( tb, i18n( "<b>The Edit toolbar</b>%1").arg(i18n(toolbarHelp).arg("")) );
addToolBar( tb, i18n( "Edit" ) );
actionEditUndo->addTo( tb );
actionEditRedo->addTo( tb );
@@ -330,14 +330,14 @@ void MainWindow::setupLayoutActions()
connect( actionEditAdjustSize, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editAdjustSize() ) );
actionEditAdjustSize->setEnabled( FALSE );
- actionEditHLayout = new DesignerAction( i18n( "Lay OutQt::Horizontally" ), createIconSet("designer_edithtqlayout.png"),
+ actionEditHLayout = new DesignerAction( i18n( "Lay OutQt::Horizontally" ), createIconSet("designer_edithlayout.png"),
i18n( "Lay Out &Horizontally" ), CTRL + Key_H, TQT_TQOBJECT(this), 0 );
actionEditHLayout->setStatusTip(i18n("Lays out the selected widgets horizontally") );
actionEditHLayout->setWhatsThis( whatsThisFrom( "Layout|Lay OutQt::Horizontally" ) );
connect( actionEditHLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutHorizontal() ) );
actionEditHLayout->setEnabled( FALSE );
- actionEditVLayout = new DesignerAction( i18n( "Lay OutQt::Vertically" ), createIconSet("designer_editvtqlayout.png"),
+ actionEditVLayout = new DesignerAction( i18n( "Lay OutQt::Vertically" ), createIconSet("designer_editvlayout.png"),
i18n( "Lay Out &Vertically" ), CTRL + Key_L, TQT_TQOBJECT(this), 0 );
actionEditVLayout->setStatusTip(i18n("Lays out the selected widgets vertically") );
actionEditVLayout->setWhatsThis( whatsThisFrom( "Layout|Lay OutQt::Vertically" ) );
@@ -367,7 +367,7 @@ void MainWindow::setupLayoutActions()
actionEditBreakLayout = new DesignerAction( i18n( "Break Layout" ), createIconSet("designer_editbreaklayout.png"),
i18n( "&Break Layout" ), CTRL + Key_B, TQT_TQOBJECT(this), 0 );
- actionEditBreakLayout->setStatusTip(i18n("Breaks the selected tqlayout") );
+ actionEditBreakLayout->setStatusTip(i18n("Breaks the selected layout") );
actionEditBreakLayout->setWhatsThis( whatsThisFrom( "Layout|Break Layout" ) );
connect( actionEditBreakLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editBreakLayout() ) );
actionEditBreakLayout->setEnabled( FALSE );
@@ -376,23 +376,23 @@ void MainWindow::setupLayoutActions()
actionInsertSpacer = new WidgetAction( i18n( "Layout" ), actionGroupTools, TQString::number( id ).latin1() );
actionInsertSpacer->setToggleAction( TRUE );
actionInsertSpacer->setText( WidgetDatabase::className( id ) );
- actionInsertSpacer->setMenuText( i18n( "Add %1").tqarg( WidgetDatabase::className( id ) ) );
+ actionInsertSpacer->setMenuText( i18n( "Add %1").arg( WidgetDatabase::className( id ) ) );
actionInsertSpacer->setIconSet( WidgetDatabase::iconSet( id ) );
actionInsertSpacer->setToolTip( WidgetDatabase::toolTip( id ) );
- actionInsertSpacer->setStatusTip( i18n( "Insert a %1").tqarg(WidgetDatabase::toolTip( id )) );
+ actionInsertSpacer->setStatusTip( i18n( "Insert a %1").arg(WidgetDatabase::toolTip( id )) );
actionInsertSpacer->setWhatsThis( i18n("<b>A %1</b><p>%2</p>"
"<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 ) ));
+ .arg(WidgetDatabase::toolTip( id ))
+ .arg(WidgetDatabase::whatsThis( id ))
+ .arg(WidgetDatabase::toolTip( id ) ));
actionInsertSpacer->addTo( commonWidgetsToolBar );
commonWidgetsPage.append( actionInsertSpacer );
TQWidget *w;
commonWidgetsToolBar->setStretchableWidget( ( w = new TQWidget( commonWidgetsToolBar ) ) );
w->setBackgroundMode( commonWidgetsToolBar->backgroundMode() );
- TQWhatsThis::add( layoutToolBar, i18n( "<b>The Layout toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("")) );
+ TQWhatsThis::add( layoutToolBar, i18n( "<b>The Layout toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("")) );
actionEditAdjustSize->addTo( layoutToolBar );
layoutToolBar->addSeparator();
actionEditHLayout->addTo( layoutToolBar );
@@ -461,7 +461,7 @@ void MainWindow::setupToolActions()
TQToolBar *tb = new TQToolBar( this, "Tools" );
tb->setCloseMode( TQDockWindow::Undocked );
toolsToolBar = tb;
- TQWhatsThis::add( tb, i18n( "<b>The Tools toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("")) );
+ TQWhatsThis::add( tb, i18n( "<b>The Tools toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("")) );
addToolBar( tb, i18n( "Tools" ), TQMainWindow::DockTop, FALSE );
actionPointerTool->addTo( tb );
@@ -505,13 +505,13 @@ void MainWindow::setupToolActions()
widgetToolBars.append( tb );
bool plural = grp[(int)grp.length()-1] == 's';
if ( plural ) {
- TQWhatsThis::add( tb, i18n( "<b>The %1</b>%2" ).tqarg(grp).tqarg(i18n(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(i18n(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(i18n(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(i18n(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 );
tb->hide();
@@ -552,11 +552,11 @@ void MainWindow::setupToolActions()
a->setToolTip( ttip );
if ( !WidgetDatabase::isWhatsThisLoaded() )
WidgetDatabase::loadWhatsThis( documentationPath() );
- a->setStatusTip( i18n( "Insert a %1").tqarg(WidgetDatabase::className( i )) );
+ a->setStatusTip( i18n( "Insert a %1").arg(WidgetDatabase::className( i )) );
- TQString whats = i18n("<b>A %1</b>").tqarg( WidgetDatabase::className( i ) );
+ TQString whats = i18n("<b>A %1</b>").arg( WidgetDatabase::className( i ) );
if ( !WidgetDatabase::whatsThis( i ).isEmpty() )
- 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" )
@@ -617,7 +617,7 @@ void MainWindow::setupFileActions()
tb->setCloseMode( TQDockWindow::Undocked );
projectToolBar = tb;
- TQWhatsThis::add( tb, i18n( "<b>The File toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("")) );
+ TQWhatsThis::add( tb, i18n( "<b>The File toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("")) );
addToolBar( tb, i18n( "File" ) );
fileMenu = new TQPopupMenu( this, "File" );
menubar->insertItem( i18n( "&File" ), fileMenu );
@@ -883,12 +883,12 @@ void MainWindow::setupPreviewActions()
else if ( *it == "MotifPlus" )
info = i18n( "The preview will use the advanced Motif look and feel used by the GIMP toolkit (GTK) on Linux." );
- a = new DesignerAction( i18n( "Preview Form in %1 Style" ).tqarg( *it ), TQPixmap(),
- i18n( "... in %1 Style" ).tqarg( *it ), 0, TQT_TQOBJECT(this), 0 );
- a->setStatusTip( i18n("Opens a preview in %1 style").tqarg( *it ) );
+ a = new DesignerAction( i18n( "Preview Form in %1 Style" ).arg( *it ), TQPixmap(),
+ i18n( "... in %1 Style" ).arg( *it ), 0, TQT_TQOBJECT(this), 0 );
+ a->setStatusTip( i18n("Opens a preview in %1 style").arg( *it ) );
a->setWhatsThis( i18n("<b>Open a preview in %1 style.</b>"
"<p>Use the preview to test the design and "
- "signal-slot connections of the current form. %2</p>").tqarg( *it ).tqarg( info ) );
+ "signal-slot connections of the current form. %2</p>").arg( *it ).arg( info ) );
mapper->setMapping( a, *it );
connect( a, TQT_SIGNAL(activated()), mapper, TQT_SLOT(map()) );
connect( this, TQT_SIGNAL( hasActiveForm(bool) ), a, TQT_SLOT( setEnabled(bool) ) );
@@ -965,7 +965,7 @@ void MainWindow::setupWindowActions()
j++;
TQString itemText;
if ( j < 10 )
- itemText = TQString("&%1 ").tqarg( j );
+ itemText = TQString("&%1 ").arg( j );
if ( ::tqqt_cast<FormWindow*>(w) )
itemText += w->name();
else
@@ -1015,7 +1015,7 @@ void MainWindow::setupHelpActions()
/* TQToolBar *tb = new TQToolBar( this, "Help" );
tb->setCloseMode( TQDockWindow::Undocked );
- TQWhatsThis::add( tb, i18n( "<b>The Help toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("") ));
+ TQWhatsThis::add( tb, i18n( "<b>The Help toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("") ));
addToolBar( tb, i18n( "Help" ) );
actionHelpWhatsThis->addTo( tb );*/
@@ -1125,7 +1125,7 @@ void MainWindow::fileCloseProject()
if ( a ) {
if ( pro->isModified() ) {
switch ( TQMessageBox::warning( this, i18n( "Save Project Settings" ),
- i18n( "Save changes to '%1'?" ).tqarg( pro->fileName() ),
+ i18n( "Save changes to '%1'?" ).arg( pro->fileName() ),
i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) {
case 0: // save
pro->save();
@@ -1166,7 +1166,7 @@ void MainWindow::fileCloseProject()
currentProject = 0;
if ( lastValid ) {
projectSelected( lastValid );
- statusMessage( i18n( "Selected project '%1'" ).tqarg( currentProject->projectName() ) );
+ statusMessage( i18n( "Selected project '%1'" ).arg( currentProject->projectName() ) );
}
if ( !windows.isEmpty() ) {
for ( TQWidget *w = windows.first(); w; w = windows.next() ) {
@@ -1276,11 +1276,11 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co
arg( filename )/*, 3000*/ );
return;
}
- statusMessage( i18n( "Importing '%1' using import filter ...").tqarg( filename ) );
+ statusMessage( i18n( "Importing '%1' using import filter ...").arg( filename ) );
TQStringList list = iface->import( filter, filename );
iface->release();
if ( list.isEmpty() ) {
- statusMessage( i18n( "Nothing to load in '%1'").tqarg( filename )/*, 3000*/ );
+ statusMessage( i18n( "Nothing to load in '%1'").arg( filename )/*, 3000*/ );
return;
}
if ( !inProject )
@@ -1319,7 +1319,7 @@ FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFile
return formWindow();
}
- statusMessage( i18n( "Reading file '%1'...").tqarg( filename ) );
+ statusMessage( i18n( "Reading file '%1'...").arg( filename ) );
FormFile *ff2 = currentProject->findFormFile( currentProject->makeRelative(filename) );
if ( ff2 && ff2->formWindow() ) {
ff2->formWindow()->setFocus();
@@ -1338,10 +1338,10 @@ FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFile
TQApplication::restoreOverrideCursor();
if ( b ) {
rebuildCustomWidgetGUI();
- statusMessage( i18n( "Loaded file '%1'").tqarg( filename )/*, 3000 */);
+ statusMessage( i18n( "Loaded file '%1'").arg( filename )/*, 3000 */);
} else {
- statusMessage( i18n( "Failed to load file '%1'").tqarg( filename )/*, 5000 */);
- TQMessageBox::information( this, i18n("Load File"), i18n("Could not load file '%1'.").tqarg( filename ) );
+ statusMessage( i18n( "Failed to load file '%1'").arg( filename )/*, 5000 */);
+ TQMessageBox::information( this, i18n("Load File"), i18n("Could not load file '%1'.").arg( filename ) );
delete ff;
}
return (FormWindow*)resource.widget();
@@ -1389,7 +1389,7 @@ bool MainWindow::fileSaveForm()
bool MainWindow::fileSaveProject()
{
currentProject->save();
- statusMessage( i18n( "Project '%1' saved.").tqarg( currentProject->projectName() )/*, 3000 */);
+ statusMessage( i18n( "Project '%1' saved.").arg( currentProject->projectName() )/*, 3000 */);
return TRUE;
}
@@ -1482,7 +1482,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;
@@ -1567,7 +1567,7 @@ void MainWindow::editPaste()
} else {
TQMessageBox::information( this, i18n( "Paste Error" ),
i18n( "Cannot paste widgets. Designer could not find a container\n"
- "to paste into which does not contain a tqlayout. Break the tqlayout\n"
+ "to paste into which does not contain a layout. Break the layout\n"
"of the container you want to paste into and select this container\n"
"and then paste again." ) );
}
@@ -1761,7 +1761,7 @@ SourceEditor *MainWindow::openSourceEditor()
if ( !MetaDataBase::hasEditor( lang ) ) {
TQMessageBox::information( this, i18n( "Edit Source" ),
i18n( "There is no plugin for editing %1 code installed.\n"
- "Note: Plugins are not available in static TQt configurations." ).tqarg( lang ) );
+ "Note: Plugins are not available in static TQt configurations." ).arg( lang ) );
return 0;
}
@@ -1784,7 +1784,7 @@ SourceEditor *MainWindow::editSource( SourceFile *f )
if ( !MetaDataBase::hasEditor( lang ) ) {
TQMessageBox::information( this, i18n( "Edit Source" ),
i18n( "There is no plugin for editing %1 code installed.\n"
- "Note: Plugins are not available in static TQt configurations." ).tqarg( lang ) );
+ "Note: Plugins are not available in static TQt configurations." ).arg( lang ) );
return 0;
}
@@ -1921,7 +1921,7 @@ void MainWindow::editPreferences()
setUsesTextLabel( dia->checkBoxTextLabels->isChecked() );
if (dia->textEditPluginPaths->isModified()) {
pluginPaths = dia->textEditPluginPaths->text();
- TQApplication::tqsetLibraryPaths(TQStringList::split("\n", pluginPaths));
+ TQApplication::setLibraryPaths(TQStringList::split("\n", pluginPaths));
savePluginPaths = TRUE;
}
diff --git a/kdevdesigner/designer/menubareditor.cpp b/kdevdesigner/designer/menubareditor.cpp
index 498c6827..550c9b60 100644
--- a/kdevdesigner/designer/menubareditor.cpp
+++ b/kdevdesigner/designer/menubareditor.cpp
@@ -74,7 +74,7 @@ bool MenuBarEditorItemPtrDrag::canDecode( TQDragMoveEvent * e )
bool MenuBarEditorItemPtrDrag::decode( TQDropEvent * e, MenuBarEditorItem ** i )
{
- TQByteArray data = e->tqencodedData( "qt/menubareditoritemptr" );
+ TQByteArray data = e->encodedData( "qt/menubareditoritemptr" );
TQDataStream stream( data, IO_ReadOnly );
if ( !data.size() )
@@ -502,7 +502,7 @@ void MenuBarEditor::deleteItem( int index )
}
}
-TQSize MenuBarEditor::tqsizeHint() const
+TQSize MenuBarEditor::sizeHint() const
{
return TQSize( parentWidget()->width(), heightForWidth( parentWidget()->width() ) );
}
@@ -576,7 +576,7 @@ bool MenuBarEditor::eventFilter( TQObject * o, TQEvent * e )
lineEdit->hide();
update();
} else if ( e->type() == TQEvent::LayoutHint ) {
- resize( tqsizeHint() );
+ resize( sizeHint() );
}
return TQMenuBar::eventFilter( o, e );
}
@@ -586,7 +586,7 @@ void MenuBarEditor::paintEvent( TQPaintEvent * )
TQPainter p( this );
TQRect r = rect();
tqstyle().tqdrawPrimitive( TQStyle::PE_PanelMenuBar, &p,
- r, tqcolorGroup() );
+ r, colorGroup() );
drawItems( p );
}
@@ -817,7 +817,7 @@ void MenuBarEditor::keyPressEvent( TQKeyEvent * e )
void MenuBarEditor::focusOutEvent( TQFocusEvent * e )
{
- TQWidget * fw = tqApp->tqfocusWidget();
+ TQWidget * fw = tqApp->focusWidget();
if ( e->lostFocus() && !::tqqt_cast<PopupMenuEditor*>(fw) )
hideItem();
update();
@@ -834,7 +834,7 @@ void MenuBarEditor::drawItems( TQPainter & p )
TQPoint pos( borderSize(), 0 );
uint c = 0;
- p.setPen( tqcolorGroup().buttonText() );
+ p.setPen( colorGroup().buttonText() );
MenuBarEditorItem * i = itemList.first();
while ( i ) {
diff --git a/kdevdesigner/designer/menubareditor.h b/kdevdesigner/designer/menubareditor.h
index 0725fd5f..ec933d0b 100644
--- a/kdevdesigner/designer/menubareditor.h
+++ b/kdevdesigner/designer/menubareditor.h
@@ -120,9 +120,9 @@ public:
void focusItem( int index = -1 );
void deleteItem( int index = -1 );
- TQSize tqsizeHint() const;
- TQSize tqminimumSize() const { return tqsizeHint(); }
- TQSize tqminimumSizeHint() const { return tqsizeHint(); }
+ TQSize sizeHint() const;
+ TQSize minimumSize() const { return sizeHint(); }
+ TQSize minimumSizeHint() const { return sizeHint(); }
int heightForWidth( int max_width ) const;
void show();
diff --git a/kdevdesigner/designer/metadatabase.cpp b/kdevdesigner/designer/metadatabase.cpp
index 5f8ce367..fec4a368 100644
--- a/kdevdesigner/designer/metadatabase.cpp
+++ b/kdevdesigner/designer/metadatabase.cpp
@@ -42,7 +42,7 @@
#include <tqapplication.h>
#include <tqobject.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqptrdict.h>
#include <tqobjectlist.h>
#include <tqstrlist.h>
@@ -54,7 +54,7 @@
#include <tqdatetime.h>
#include <tqfile.h>
#include <tqfileinfo.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <stdlib.h>
@@ -167,14 +167,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 );
@@ -303,16 +303,16 @@ void MetaDataBase::setSpacing( TQObject *o, int spacing )
}
r->spacing = spacing;
- TQLayout * tqlayout = 0;
- WidgetFactory::layoutType( (TQWidget*)o, tqlayout );
- if ( tqlayout ) {
+ TQLayout * layout = 0;
+ WidgetFactory::layoutType( (TQWidget*)o, layout );
+ if ( layout ) {
int spadef = 6;
if ( MainWindow::self->formWindow() )
spadef = MainWindow::self->formWindow()->layoutDefaultSpacing();
if ( spacing == -1 )
- tqlayout->setSpacing( spadef );
+ layout->setSpacing( spadef );
else
- tqlayout->setSpacing( spacing );
+ layout->setSpacing( spacing );
}
}
@@ -346,8 +346,8 @@ void MetaDataBase::setMargin( TQObject *o, int margin )
}
r->margin = margin;
- TQLayout * tqlayout = 0;
- WidgetFactory::layoutType( (TQWidget*)o, tqlayout );
+ TQLayout * layout = 0;
+ WidgetFactory::layoutType( (TQWidget*)o, layout );
bool isInnerLayout = TRUE;
@@ -358,18 +358,18 @@ void MetaDataBase::setMargin( TQObject *o, int margin )
isInnerLayout = FALSE;
- if ( tqlayout ) {
+ if ( layout ) {
int mardef = 11;
if ( MainWindow::self->formWindow() )
mardef = MainWindow::self->formWindow()->layoutDefaultMargin();
if ( margin == -1 ) {
if ( isInnerLayout )
- tqlayout->setMargin( 1 );
+ layout->setMargin( 1 );
else
- tqlayout->setMargin( TQMAX( 1, mardef ) );
+ layout->setMargin( TQMAX( 1, mardef ) );
}
else
- tqlayout->setMargin( TQMAX( 1, margin ) );
+ layout->setMargin( TQMAX( 1, margin ) );
}
}
@@ -648,12 +648,12 @@ 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->tqmetaObject()->signalNames( TRUE );
- TQStrList slotList = receiver->tqmetaObject()->slotNames( TRUE );
+ TQStrList signalList = sender->metaObject()->signalNames( TRUE );
+ TQStrList slotList = receiver->metaObject()->slotNames( TRUE );
// avoid warnings
if ( signalList.find( conn.signal ) == -1 ||
@@ -675,13 +675,13 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom
}
if ( !onlyCustom ) {
- TQStrList slotList = o->tqmetaObject()->slotNames( TRUE );
+ TQStrList slotList = o->metaObject()->slotNames( TRUE );
if ( slotList.find( slot ) != -1 )
return TRUE;
if ( ::tqqt_cast<FormWindow*>(o) ) {
o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer());
- slotList = o->tqmetaObject()->slotNames( TRUE );
+ slotList = o->metaObject()->slotNames( TRUE );
if ( slotList.find( slot ) != -1 )
return TRUE;
}
@@ -905,13 +905,13 @@ bool MetaDataBase::hasFunction( TQObject *o, const TQCString &function, bool onl
}
if ( !onlyCustom ) {
- TQStrList functionList = o->tqmetaObject()->slotNames( TRUE );
+ TQStrList functionList = o->metaObject()->slotNames( TRUE );
if ( functionList.find( function ) != -1 )
return TRUE;
if ( ::tqqt_cast<FormWindow*>(o) ) {
o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer());
- functionList = o->tqmetaObject()->slotNames( TRUE );
+ functionList = o->metaObject()->slotNames( TRUE );
if ( functionList.find( function ) != -1 )
return TRUE;
}
@@ -1276,7 +1276,7 @@ MetaDataBase::CustomWidget::CustomWidget()
className = "MyCustomWidget";
includeFile = "mywidget.h";
includePolicy = Local;
- tqsizeHint = TQSize( -1, -1 );
+ sizeHint = TQSize( -1, -1 );
pixmap = new TQPixmap( BarIcon( "designer_customwidget.png", KDevDesignerPartFactory::instance() ) );
id = -1;
sizePolicy = TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred );
@@ -1288,7 +1288,7 @@ MetaDataBase::CustomWidget::CustomWidget( const CustomWidget &w )
className = w.className;
includeFile = w.includeFile;
includePolicy = w.includePolicy;
- tqsizeHint = w.tqsizeHint;
+ sizeHint = w.sizeHint;
if ( w.pixmap )
pixmap = new TQPixmap( *w.pixmap );
else
@@ -1339,7 +1339,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW
className = w.className;
includeFile = w.includeFile;
includePolicy = w.includePolicy;
- tqsizeHint = w.tqsizeHint;
+ sizeHint = w.sizeHint;
if ( w.pixmap )
pixmap = new TQPixmap( *w.pixmap );
else
@@ -1354,7 +1354,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW
bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const
{
- TQStrList sigList = TQWidget::tqstaticMetaObject()->signalNames( TRUE );
+ TQStrList sigList = TQWidget::staticMetaObject()->signalNames( TRUE );
if ( sigList.find( signal ) != -1 )
return TRUE;
for ( TQValueList<TQCString>::ConstIterator it = lstSignals.begin(); it != lstSignals.end(); ++it ) {
@@ -1366,7 +1366,7 @@ bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const
bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const
{
- TQStrList slotList = TQWidget::tqstaticMetaObject()->slotNames( TRUE );
+ TQStrList slotList = TQWidget::staticMetaObject()->slotNames( TRUE );
if ( slotList.find( normalizeFunction( slot ) ) != -1 )
return TRUE;
@@ -1379,7 +1379,7 @@ bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const
bool MetaDataBase::CustomWidget::hasProperty( const TQCString &prop ) const
{
- TQStrList propList = TQWidget::tqstaticMetaObject()->propertyNames( TRUE );
+ TQStrList propList = TQWidget::staticMetaObject()->propertyNames( TRUE );
if ( propList.find( prop ) != -1 )
return TRUE;
diff --git a/kdevdesigner/designer/metadatabase.h b/kdevdesigner/designer/metadatabase.h
index 9b00deb9..352e10d7 100644
--- a/kdevdesigner/designer/metadatabase.h
+++ b/kdevdesigner/designer/metadatabase.h
@@ -102,7 +102,7 @@ public:
TQString className;
TQString includeFile;
IncludePolicy includePolicy;
- TQSize tqsizeHint;
+ TQSize sizeHint;
TQSizePolicy sizePolicy;
TQPixmap *pixmap;
TQValueList<TQCString> lstSignals;
diff --git a/kdevdesigner/designer/multilineeditor.ui b/kdevdesigner/designer/multilineeditor.ui
index 1fe1ea63..f0ff2129 100644
--- a/kdevdesigner/designer/multilineeditor.ui
+++ b/kdevdesigner/designer/multilineeditor.ui
@@ -124,7 +124,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/multilineeditorimpl.cpp b/kdevdesigner/designer/multilineeditorimpl.cpp
index 166ab877..ef1926f3 100644
--- a/kdevdesigner/designer/multilineeditorimpl.cpp
+++ b/kdevdesigner/designer/multilineeditorimpl.cpp
@@ -35,10 +35,10 @@
#include <kiconloader.h>
#include "kdevdesigner_part.h"
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqrichtext_p.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtoolbutton.h>
#include <tqapplication.h>
#include <tqaction.h>
@@ -231,8 +231,8 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget
mlined = (TQTextEdit*)editWidget;
mlined->setReadOnly( TRUE );
- const TQMetaProperty *wordWrap = mlined->tqmetaObject()->property(
- mlined->tqmetaObject()->findProperty( "wordWrap", TRUE ), TRUE );
+ const TQMetaProperty *wordWrap = mlined->metaObject()->property(
+ mlined->metaObject()->findProperty( "wordWrap", TRUE ), TRUE );
oldWrapMode = 0;
oldWrapString = "NoWrap";
if ( wordWrap ) {
@@ -241,7 +241,7 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget
if ( oldWrapString != "NoWrap" )
doWrap = TRUE;
}
- textEdit->tqsetAlignment( mlined->tqalignment() );
+ textEdit->setAlignment( mlined->alignment() );
textEdit->setWordWrap( mlined->wordWrap() );
textEdit->setWrapColumnOrWidth( mlined->wrapColumnOrWidth() );
textEdit->setWrapPolicy( mlined->wrapPolicy() );
@@ -276,13 +276,13 @@ void MultiLineEditor::okClicked()
void MultiLineEditor::applyClicked()
{
if ( !callStatic ) {
- PopulateMultiLineEditCommand *cmd = new PopulateMultiLineEditCommand( i18n( "Set the Text of '%1'" ).tqarg( mlined->name() ),
+ PopulateMultiLineEditCommand *cmd = new PopulateMultiLineEditCommand( i18n( "Set the Text of '%1'" ).arg( mlined->name() ),
formwindow, mlined, textEdit->text() );
cmd->execute();
formwindow->commandHistory()->addCommand( cmd );
if ( oldDoWrap != doWrap ) {
- TQString pn( i18n( "Set 'wordWrap' of '%2'" ).tqarg( mlined->name() ) );
+ TQString pn( i18n( "Set 'wordWrap' of '%2'" ).arg( mlined->name() ) );
SetPropertyCommand *propcmd;
if ( doWrap )
propcmd = new SetPropertyCommand( pn, formwindow,
@@ -325,7 +325,7 @@ void MultiLineEditor::insertTags( const TQString &tag )
if ( textEdit->hasSelectedText() ) {
textEdit->getSelection( &pfrom, &ifrom, &pto, &ito );
TQString buf = textEdit->selectedText();
- buf = TQString( "<%1>%3</%2>" ).tqarg( tag ).tqarg( tagend ).tqarg( buf );
+ buf = TQString( "<%1>%3</%2>" ).arg( tag ).arg( tagend ).arg( buf );
textEdit->removeSelectedText();
textEdit->insertAt( buf, pfrom, ifrom );
textEdit->setCursorPosition( pto, ito + 2 + tag.length() );
@@ -333,7 +333,7 @@ void MultiLineEditor::insertTags( const TQString &tag )
else {
int para, index;
textEdit->getCursorPosition( &para, &index );
- textEdit->insert( TQString( "<%1></%2>" ).tqarg( tag ).tqarg( tagend ) );
+ textEdit->insert( TQString( "<%1></%2>" ).arg( tag ).arg( tagend ) );
index += 2 + tag.length();
textEdit->setCursorPosition( para, index );
}
@@ -363,7 +363,7 @@ void MultiLineEditor::showFontDialog()
if ( fd->getFont() != "default" )
font = "face=\"" + fd->getFont() + "\"";
TQString tag( TQString( "font %1 %2 %3" )
- .tqarg( color ).tqarg( size ).tqarg( font ) );
+ .arg( color ).arg( size ).arg( font ) );
if ( selText )
textEdit->setSelection( pfrom, ifrom, pto, ito );
diff --git a/kdevdesigner/designer/multilineeditorimpl.h b/kdevdesigner/designer/multilineeditorimpl.h
index 4756f37c..36697cd7 100644
--- a/kdevdesigner/designer/multilineeditorimpl.h
+++ b/kdevdesigner/designer/multilineeditorimpl.h
@@ -28,7 +28,7 @@
#define MULTILINEEDITORIMPL_H
#include <tqaction.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqrichtext_p.h>
#include "multilineeditor.h"
diff --git a/kdevdesigner/designer/newform.ui b/kdevdesigner/designer/newform.ui
index 3fcbd914..81cb4fa5 100644
--- a/kdevdesigner/designer/newform.ui
+++ b/kdevdesigner/designer/newform.ui
@@ -91,7 +91,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -177,7 +177,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/newformimpl.cpp b/kdevdesigner/designer/newformimpl.cpp
index 6026a9bd..2d631833 100644
--- a/kdevdesigner/designer/newformimpl.cpp
+++ b/kdevdesigner/designer/newformimpl.cpp
@@ -158,7 +158,7 @@ void CustomFormItem::insert( Project *pro )
FormFile *ff = new FormFile( filename, TRUE, pro );
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;
}
@@ -249,7 +249,7 @@ void NewForm::insertTemplates( TQIconView *tView,
TQStringList languages = MetaDataBase::languages();
if ( !MainWindow::self->singleProjectMode() ) {
for ( it = languages.begin(); it != languages.end(); ++it ) {
- ProjectItem *pi = new ProjectItem( tView, i18n("%1 Project" ).tqarg( *it ) );
+ ProjectItem *pi = new ProjectItem( tView, i18n("%1 Project" ).arg( *it ) );
allItems.append( pi );
pi->setLanguage( *it );
pi->setPixmap( BarIcon( "designer_project.png" , KDevDesignerPartFactory::instance()) );
diff --git a/kdevdesigner/designer/outputwindow.cpp b/kdevdesigner/designer/outputwindow.cpp
index 33113ef5..f69125bd 100644
--- a/kdevdesigner/designer/outputwindow.cpp
+++ b/kdevdesigner/designer/outputwindow.cpp
@@ -30,7 +30,7 @@
#include "mainwindow.h"
#include <tqlistview.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqapplication.h>
#include <tqheader.h>
#include <stdlib.h>
@@ -196,7 +196,7 @@ ErrorItem::ErrorItem( TQListView *parent, TQListViewItem *after, const TQString
}
void ErrorItem::paintCell( TQPainter *p, const TQColorGroup & cg,
- int column, int width, int tqalignment )
+ int column, int width, int alignment )
{
TQColorGroup g( cg );
g.setColor( TQColorGroup::Text, type == Error ? TQt::red : TQt::darkYellow );
@@ -205,5 +205,5 @@ void ErrorItem::paintCell( TQPainter *p, const TQColorGroup & cg,
f.setBold( TRUE );
p->setFont( f );
}
- TQListViewItem::paintCell( p, g, column, width, tqalignment );
+ TQListViewItem::paintCell( p, g, column, width, alignment );
}
diff --git a/kdevdesigner/designer/outputwindow.h b/kdevdesigner/designer/outputwindow.h
index 04ebc065..a3276da6 100644
--- a/kdevdesigner/designer/outputwindow.h
+++ b/kdevdesigner/designer/outputwindow.h
@@ -45,9 +45,9 @@ public:
const TQString &locationString, TQObject *locationObject );
void paintCell( TQPainter *, const TQColorGroup & cg,
- int column, int width, int tqalignment );
+ int column, int width, int alignment );
- void setRead( bool b ) { read = b; tqrepaint(); }
+ void setRead( bool b ) { read = b; repaint(); }
TQObject *location() const { return object; }
int line() const { return text( 2 ).toInt(); }
diff --git a/kdevdesigner/designer/paletteeditor.ui b/kdevdesigner/designer/paletteeditor.ui
index 79e04792..32b14b54 100644
--- a/kdevdesigner/designer/paletteeditor.ui
+++ b/kdevdesigner/designer/paletteeditor.ui
@@ -69,7 +69,7 @@
<property name="title">
<string>Build Palette</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignAuto</set>
</property>
<hbox>
@@ -92,7 +92,7 @@
<vsizetype>1</vsizetype>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
@@ -110,7 +110,7 @@
<property name="text">
<string>&amp;3-D effects:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignAuto|AlignVCenter</set>
</property>
<property name="buddy" stdset="0">
@@ -150,7 +150,7 @@
<vsizetype>1</vsizetype>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
@@ -168,7 +168,7 @@
<property name="text">
<string>Back&amp;ground:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignAuto|AlignVCenter</set>
</property>
<property name="buddy" stdset="0">
@@ -208,7 +208,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -343,7 +343,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/paletteeditoradvanced.ui b/kdevdesigner/designer/paletteeditoradvanced.ui
index a8ba6c03..579f0e68 100644
--- a/kdevdesigner/designer/paletteeditoradvanced.ui
+++ b/kdevdesigner/designer/paletteeditoradvanced.ui
@@ -266,7 +266,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -323,7 +323,7 @@
<vsizetype>1</vsizetype>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -473,7 +473,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -490,7 +490,7 @@
<vsizetype>1</vsizetype>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -565,7 +565,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/paletteeditoradvancedimpl.cpp b/kdevdesigner/designer/paletteeditoradvancedimpl.cpp
index e8c780fc..903c1a4f 100644
--- a/kdevdesigner/designer/paletteeditoradvancedimpl.cpp
+++ b/kdevdesigner/designer/paletteeditoradvancedimpl.cpp
@@ -250,15 +250,15 @@ void PaletteEditorAdvanced::onCentral( int item )
case 0:
default:
c = editPalette.active().color( centralFromItem(item) );
- p = editPalette.active().tqbrush( centralFromItem(item) ).pixmap();
+ p = editPalette.active().brush( centralFromItem(item) ).pixmap();
break;
case 1:
c = editPalette.inactive().color( centralFromItem(item) );
- p = editPalette.inactive().tqbrush( centralFromItem(item) ).pixmap();
+ p = editPalette.inactive().brush( centralFromItem(item) ).pixmap();
break;
case 2:
c = editPalette.disabled().color( centralFromItem(item) );
- p = editPalette.disabled().tqbrush( centralFromItem(item) ).pixmap();
+ p = editPalette.disabled().brush( centralFromItem(item) ).pixmap();
break;
}
@@ -514,17 +514,17 @@ void PaletteEditorAdvanced::updateStyledButtons()
default:
central = editPalette.active().color( centralFromItem( comboCentral->currentItem() ) );
effect = editPalette.active().color( effectFromItem( comboEffect->currentItem() ) );
- pm = editPalette.active().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
+ pm = editPalette.active().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
break;
case 1:
central = editPalette.inactive().color( centralFromItem( comboCentral->currentItem() ) );
effect = editPalette.inactive().color( effectFromItem( comboEffect->currentItem() ) );
- pm = editPalette.inactive().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
+ pm = editPalette.inactive().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
break;
case 2:
central = editPalette.disabled().color( centralFromItem( comboCentral->currentItem() ) );
effect = editPalette.disabled().color( effectFromItem( comboEffect->currentItem() ) );
- pm = editPalette.disabled().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
+ pm = editPalette.disabled().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
break;
}
diff --git a/kdevdesigner/designer/pixmapchooser.cpp b/kdevdesigner/designer/pixmapchooser.cpp
index 1da0557b..976343bd 100644
--- a/kdevdesigner/designer/pixmapchooser.cpp
+++ b/kdevdesigner/designer/pixmapchooser.cpp
@@ -66,12 +66,12 @@ 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 )
{
- p->fillRect( cx, cy, cw, ch, tqcolorGroup().brush( TQColorGroup::Base ) );
+ p->fillRect( cx, cy, cw, ch, colorGroup().brush( TQColorGroup::Base ) );
p->drawPixmap( 0, 0, pixmap );
}
@@ -98,7 +98,7 @@ static void buildImageFormatList( TQString &filter, TQString &all )
else
outputExtension = "jpg;*.jpeg";
filter += TQString(tqApp->translate( "qChoosePixmap", "%1-Pixmaps (%2)\n" )).
- tqarg( outputFormat ).tqarg( "*." + outputExtension);
+ arg( outputFormat ).arg( "*." + outputExtension);
all += "*." + outputExtension + ";";
}
filter.prepend( all + tqApp->translate( "qChoosePixmap", ")\n" ) );
diff --git a/kdevdesigner/designer/pixmapcollection.cpp b/kdevdesigner/designer/pixmapcollection.cpp
index 880423a3..936dbc4d 100644
--- a/kdevdesigner/designer/pixmapcollection.cpp
+++ b/kdevdesigner/designer/pixmapcollection.cpp
@@ -30,7 +30,7 @@
#include <tqmime.h>
#include <tqdir.h>
#include <tqfileinfo.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqimage.h>
PixmapCollection::PixmapCollection( Project *pro )
diff --git a/kdevdesigner/designer/pixmapcollectioneditor.ui b/kdevdesigner/designer/pixmapcollectioneditor.ui
index a6ed1bd6..30f74183 100644
--- a/kdevdesigner/designer/pixmapcollectioneditor.ui
+++ b/kdevdesigner/designer/pixmapcollectioneditor.ui
@@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/pixmapfunction.ui b/kdevdesigner/designer/pixmapfunction.ui
index e5f13817..760abe56 100644
--- a/kdevdesigner/designer/pixmapfunction.ui
+++ b/kdevdesigner/designer/pixmapfunction.ui
@@ -877,7 +877,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -919,7 +919,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/popupmenueditor.cpp b/kdevdesigner/designer/popupmenueditor.cpp
index 7770dcda..ea4ffec7 100644
--- a/kdevdesigner/designer/popupmenueditor.cpp
+++ b/kdevdesigner/designer/popupmenueditor.cpp
@@ -80,7 +80,7 @@ bool PopupMenuEditorItemPtrDrag::canDecode( TQDragMoveEvent * e )
bool PopupMenuEditorItemPtrDrag::decode( TQDropEvent * e, PopupMenuEditorItem ** i )
{
- TQByteArray data = e->tqencodedData( "qt/popupmenueditoritemptr" );
+ TQByteArray data = e->encodedData( "qt/popupmenueditoritemptr" );
TQDataStream stream( data, IO_ReadOnly );
if ( !data.size() )
@@ -170,7 +170,7 @@ PopupMenuEditorItem::ItemType PopupMenuEditorItem::type() const
void PopupMenuEditorItem::setVisible( bool enable )
{
if ( a )
- a->tqsetVisible( enable );
+ a->setVisible( enable );
}
bool PopupMenuEditorItem::isVisible() const
@@ -730,7 +730,7 @@ void PopupMenuEditor::paintEvent( TQPaintEvent * )
rect().width() - borderSize * 2, rect().height() - borderSize * 2 );
reg -= mid;
p.setClipRegion( reg );
- tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, rect(), tqcolorGroup() );
+ tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, rect(), colorGroup() );
p.restore();
drawItems( &p );
}
@@ -1011,7 +1011,7 @@ void PopupMenuEditor::focusInEvent( TQFocusEvent * )
void PopupMenuEditor::focusOutEvent( TQFocusEvent * )
{
- TQWidget * fw = tqApp->tqfocusWidget();
+ TQWidget * fw = tqApp->focusWidget();
if ( !fw || ( !::tqqt_cast<PopupMenuEditor*>(fw) && fw != lineEdit ) ) {
hideSubMenu();
if ( fw && ::tqqt_cast<MenuBarEditor*>(fw) )
@@ -1031,12 +1031,12 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
int y = r.y();
int h = r.height();
- p->fillRect( r, tqcolorGroup().brush( TQColorGroup::Background ) );
+ p->fillRect( r, colorGroup().brush( TQColorGroup::Background ) );
if ( i->isSeparator() ) {
tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, p,
TQRect( r.x(), r.y() + 2, r.width(), 1 ),
- tqcolorGroup(), TQStyle::Style_Sunken | f );
+ colorGroup(), TQStyle::Style_Sunken | f );
return;
}
@@ -1044,7 +1044,7 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
if ( a->isToggleAction() && a->isOn() ) {
tqstyle().tqdrawPrimitive( TQStyle::PE_CheckMark, p,
TQRect( x , y, iconWidth, h ),
- tqcolorGroup(), f );
+ colorGroup(), f );
} else {
TQPixmap icon = a->iconSet().pixmap( TQIconSet::Automatic, TQIconSet::Normal );
p->drawPixmap( x + ( iconWidth - icon.width() ) / 2,
@@ -1066,7 +1066,7 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
if ( i->count() ) // Item has submenu
tqstyle().tqdrawPrimitive( TQStyle::PE_ArrowRight, p,
TQRect( r.width() - arrowWidth, r.y(), arrowWidth, r.height() ),
- tqcolorGroup(), f );
+ colorGroup(), f );
}
void PopupMenuEditor::drawWinFocusRect( TQPainter * p, const TQRect & r ) const
@@ -1092,8 +1092,8 @@ void PopupMenuEditor::drawItems( TQPainter * p )
int flags = 0;
int idx = 0;
- TQColorGroup enabled = tqcolorGroup();
- TQColorGroup disabled = tqpalette().disabled();
+ TQColorGroup enabled = colorGroup();
+ TQColorGroup disabled = palette().disabled();
TQRect focus;
TQRect rect( borderSize, borderSize, width() - borderSize * 2, 0 );
diff --git a/kdevdesigner/designer/preferences.ui b/kdevdesigner/designer/preferences.ui
index a4335bc7..363164ed 100644
--- a/kdevdesigner/designer/preferences.ui
+++ b/kdevdesigner/designer/preferences.ui
@@ -95,7 +95,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -156,7 +156,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -519,7 +519,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/previewframe.cpp b/kdevdesigner/designer/previewframe.cpp
index c63e994f..c26d51fc 100644
--- a/kdevdesigner/designer/previewframe.cpp
+++ b/kdevdesigner/designer/previewframe.cpp
@@ -37,7 +37,7 @@ PreviewFrame::PreviewFrame( TQWidget *parent, const char *name )
setLineWidth(1);
PreviewWorkspace * w = new PreviewWorkspace( this );
- w->setEraseColor(tqcolorGroup().dark());
+ w->setEraseColor(colorGroup().dark());
previewWidget = new PreviewWidget( w );
previewWidget->move( 10, 10 );
}
diff --git a/kdevdesigner/designer/previewwidget.ui b/kdevdesigner/designer/previewwidget.ui
index 0cc680c8..3b792253 100644
--- a/kdevdesigner/designer/previewwidget.ui
+++ b/kdevdesigner/designer/previewwidget.ui
@@ -259,7 +259,7 @@
<property name="name">
<cstring>textView</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>50</height>
@@ -288,7 +288,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/project.cpp b/kdevdesigner/designer/project.cpp
index 1410361d..a250c1f8 100644
--- a/kdevdesigner/designer/project.cpp
+++ b/kdevdesigner/designer/project.cpp
@@ -37,11 +37,11 @@
#include "outputwindow.h"
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqurl.h>
#include <tqobjectlist.h>
#include <tqfeatures.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <tqdom.h>
#include <tqmessagebox.h>
#include <tqapplication.h>
diff --git a/kdevdesigner/designer/projectsettings.ui b/kdevdesigner/designer/projectsettings.ui
index 486ce960..4ac40534 100644
--- a/kdevdesigner/designer/projectsettings.ui
+++ b/kdevdesigner/designer/projectsettings.ui
@@ -161,7 +161,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>71</height>
@@ -206,7 +206,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/projectsettingsimpl.cpp b/kdevdesigner/designer/projectsettingsimpl.cpp
index 5cea9192..9a043e65 100644
--- a/kdevdesigner/designer/projectsettingsimpl.cpp
+++ b/kdevdesigner/designer/projectsettingsimpl.cpp
@@ -38,7 +38,7 @@
#include <klocale.h>
#include <klineedit.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqcheckbox.h>
#include <tqfiledialog.h>
#include <tqcombobox.h>
diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp
index 01a2bb9f..a37679d4 100644
--- a/kdevdesigner/designer/propertyeditor.cpp
+++ b/kdevdesigner/designer/propertyeditor.cpp
@@ -50,7 +50,7 @@
#include "kdevdesigner_part.h"
#include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
#include <tqapplication.h>
#include <tqheader.h>
#include <tqlineedit.h>
@@ -68,7 +68,7 @@
#include <tqcolor.h>
#include <tqcolordialog.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqsizepolicy.h>
#include <tqbitmap.h>
#include <tqtooltip.h>
@@ -86,7 +86,7 @@
#include <tqmultilineedit.h> // FIXME: obsolete
#include <tqsplitter.h>
#include <tqdatatable.h>
-#include <tqtextview.h>
+#include <textview.h>
#include <limits.h>
@@ -119,7 +119,7 @@ static TQStringList getFontList()
fontDataBase = new TQFontDatabase;
qAddPostRoutine( cleanupFontDatabase );
}
- return fontDataBase->tqfamilies();
+ return fontDataBase->families();
}
@@ -329,9 +329,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;
@@ -387,7 +387,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 );
}
@@ -413,8 +413,8 @@ void PropertyItem::createResetButton()
resetButton = new TQPushButton( hbox );
setupStyle( resetButton );
resetButton->setPixmap( DesignerResetPix );
- resetButton->setFixedWidth( resetButton->tqsizeHint().width() );
- hbox->tqlayout()->tqsetAlignment( TQt::AlignRight );
+ resetButton->setFixedWidth( resetButton->sizeHint().width() );
+ hbox->layout()->setAlignment( TQt::AlignRight );
listview->addChild( hbox );
hbox->hide();
TQObject::connect( resetButton, TQT_SIGNAL( clicked() ),
@@ -441,13 +441,13 @@ void PropertyItem::updateResetButtonState()
void PropertyItem::placeEditor( TQWidget *w )
{
createResetButton();
- TQRect r = listview->tqitemRect( this );
+ TQRect r = listview->itemRect( this );
if ( !r.size().isValid() ) {
listview->ensureItemVisible( this );
#if defined(TQ_WS_WIN)
listview->repaintContents( FALSE );
#endif
- r = listview->tqitemRect( this );
+ r = listview->itemRect( this );
}
r.setX( listview->header()->sectionPos( 1 ) );
r.setWidth( listview->header()->sectionSize( 1 ) - 1 );
@@ -455,7 +455,7 @@ void PropertyItem::placeEditor( TQWidget *w )
r = TQRect( listview->viewportToContents( r.topLeft() ), r.size() );
w->resize( r.size() );
listview->moveChild( w, r.x(), r.y() );
- resetButton->parentWidget()->resize( resetButton->tqsizeHint().width() + 10, r.height() );
+ resetButton->parentWidget()->resize( resetButton->sizeHint().width() + 10, r.height() );
listview->moveChild( resetButton->parentWidget(), r.x() + r.width() - 8, r.y() );
resetButton->setFixedHeight( TQMAX( 0, r.height() - 3 ) );
}
@@ -491,18 +491,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
@@ -553,10 +553,10 @@ TQString PropertyItem::currentItemFromObject() const
void PropertyItem::setFocus( TQWidget *w )
{
- if ( !tqApp->tqfocusWidget() ||
+ if ( !tqApp->focusWidget() ||
listview->propertyEditor()->formWindow() &&
- ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->tqfocusWidget()) ) &&
- !tqApp->tqfocusWidget()->inherits( "Editor" ) ) )
+ ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->focusWidget()) ) &&
+ !tqApp->focusWidget()->inherits( "Editor" ) ) )
w->setFocus();
}
@@ -1635,8 +1635,8 @@ PropertyPixmapItem::PropertyPixmapItem( PropertyList *l, PropertyItem *after, Pr
box = new TQHBox( listview->viewport() );
box->hide();
pixPrev = new TQLabel( box );
- pixPrev->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Minimum ) );
- pixPrev->setBackgroundColor( pixPrev->tqcolorGroup().color( TQColorGroup::Base ) );
+ pixPrev->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Minimum ) );
+ pixPrev->setBackgroundColor( pixPrev->colorGroup().color( TQColorGroup::Base ) );
button = new TQPushButton( "...", box );
setupStyle( button );
button->setFixedWidth( 20 );
@@ -1679,7 +1679,7 @@ void PropertyPixmapItem::setValue( const TQVariant &v )
else
pixPrev->setPixmap( v.toImage() );
PropertyItem::setValue( v );
- tqrepaint();
+ repaint();
}
void PropertyPixmapItem::getPixmap()
@@ -1714,8 +1714,8 @@ void PropertyPixmapItem::drawCustomContents( TQPainter *p, const TQRect &r )
if ( !pix.isNull() ) {
p->save();
- p->setClipRect( TQRect( TQPoint( (int)(p->tqworldMatrix().dx() + r.x()),
- (int)(p->tqworldMatrix().dy() + r.y()) ),
+ p->setClipRect( TQRect( TQPoint( (int)(p->worldMatrix().dx() + r.x()),
+ (int)(p->worldMatrix().dy() + r.y()) ),
r.size() ) );
p->drawPixmap( r.x(), r.y() + ( r.height() - pix.height() ) / 2, pix );
p->restore();
@@ -1726,8 +1726,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();
@@ -2224,7 +2224,7 @@ void PropertySizePolicyItem::setValue( const TQVariant &v )
return;
TQString s = i18n( "%1/%2/%3/%4" );
- s = s.tqarg( size_type_to_string( v.toSizePolicy().horData() ) ).
+ s = s.arg( size_type_to_string( v.toSizePolicy().horData() ) ).
arg( size_type_to_string( v.toSizePolicy().verData() ) ).
arg( v.toSizePolicy().horStretch() ).
arg( v.toSizePolicy().verStretch() );
@@ -2298,7 +2298,7 @@ void PropertyPaletteItem::setValue( const TQVariant &v )
TQString s;
palettePrev->setPalette( v.toPalette() );
PropertyItem::setValue( v );
- tqrepaint();
+ repaint();
}
void PropertyPaletteItem::getPalette()
@@ -2311,7 +2311,7 @@ void PropertyPaletteItem::getPalette()
w = ( (TQScrollView*)w )->viewport();
TQPalette pal = PaletteEditor::getPalette( &ok, val.toPalette(),
#if defined(TQT_NON_COMMERCIAL)
- w->backgroundMode(), listview->tqtopLevelWidget(),
+ w->backgroundMode(), listview->topLevelWidget(),
#else
w->backgroundMode(), listview,
#endif
@@ -2331,8 +2331,8 @@ void PropertyPaletteItem::drawCustomContents( TQPainter *p, const TQRect &r )
{
TQPalette pal( value().toPalette() );
p->save();
- p->setClipRect( TQRect( TQPoint( (int)(p->tqworldMatrix().dx() + r.x()),
- (int)(p->tqworldMatrix().dy() + r.y()) ),
+ p->setClipRect( TQRect( TQPoint( (int)(p->worldMatrix().dx() + r.x()),
+ (int)(p->worldMatrix().dy() + r.y()) ),
r.size() ) );
TQRect r2( r );
r2.setX( r2.x() + 2 );
@@ -2411,7 +2411,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() );
@@ -2434,7 +2434,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 );
@@ -2678,7 +2678,7 @@ void EnumBox::popupClosed()
void EnumBox::paintEvent( TQPaintEvent * )
{
TQPainter p( this );
- const TQColorGroup & g = tqcolorGroup();
+ const TQColorGroup & g = colorGroup();
p.setPen(g.text());
TQStyle::SFlags flags = TQStyle::Style_Default;
@@ -2692,7 +2692,7 @@ void EnumBox::paintEvent( TQPaintEvent * )
&g.brush( TQColorGroup::Button ) );
return;
}
- tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
+ tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
flags, TQStyle::SC_All,
(arrowDown ?
TQStyle::SC_ComboBoxArrow :
@@ -2700,7 +2700,7 @@ void EnumBox::paintEvent( TQPaintEvent * )
TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxEditField );
- re = TQStyle::tqvisualRect(re, this);
+ re = TQStyle::visualRect(re, this);
p.setClipRect( re );
if ( !str.isNull() ) {
@@ -2730,7 +2730,7 @@ void EnumBox::popup()
popupShown = FALSE;
return;
}
- pop->move( ((TQWidget*)parent())->mapToGlobal( tqgeometry().bottomLeft() ) );
+ pop->move( ((TQWidget*)parent())->mapToGlobal( geometry().bottomLeft() ) );
pop->setMinimumWidth( width() );
emit aboutToShowPopup();
pop->show();
@@ -2744,13 +2744,13 @@ void EnumBox::mousePressEvent( TQMouseEvent *e )
TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxArrow);
- arrowRect = TQStyle::tqvisualRect(arrowRect, this);
+ arrowRect = TQStyle::visualRect(arrowRect, this);
arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) );
if ( arrowRect.contains( e->pos() ) ) {
arrowDown = TRUE;
- tqrepaint( FALSE );
+ repaint( FALSE );
}
popup();
@@ -2770,13 +2770,13 @@ void EnumBox::keyPressEvent( TQKeyEvent *e )
void EnumBox::restoreArrow()
{
arrowDown = FALSE;
- tqrepaint( FALSE );
+ repaint( FALSE );
}
void EnumBox::setText( const TQString &text )
{
str = text;
- tqrepaint( FALSE );
+ repaint( FALSE );
}
@@ -3040,7 +3040,7 @@ void PropertyList::setupProperties()
if ( !editor->widget() )
return;
bool allProperties = !::tqqt_cast<Spacer*>(editor->widget());
- TQStrList lst = editor->widget()->tqmetaObject()->propertyNames( allProperties );
+ TQStrList lst = editor->widget()->metaObject()->propertyNames( allProperties );
PropertyItem *item = 0;
TQMap<TQString, bool> unique;
TQObject *w = editor->widget();
@@ -3051,11 +3051,11 @@ void PropertyList::setupProperties()
WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
const TQMetaProperty* p =
- editor->widget()->tqmetaObject()->
- property( editor->widget()->tqmetaObject()->findProperty( it.current(), allProperties), allProperties );
+ editor->widget()->metaObject()->
+ property( editor->widget()->metaObject()->findProperty( it.current(), allProperties), allProperties );
if ( !p )
continue;
- if ( unique.contains( TQString::tqfromLatin1( it.current() ) ) )
+ if ( unique.contains( TQString::fromLatin1( it.current() ) ) )
continue;
if ( ::tqqt_cast<QDesignerToolBar*>(editor->widget()) ||
::tqqt_cast<MenuBarEditor*>(editor->widget()) ) {
@@ -3071,12 +3071,12 @@ void PropertyList::setupProperties()
continue;
if ( qstrcmp( p->name(), "sizePolicy" ) == 0 )
continue;
- if ( qstrcmp( p->name(), "tqminimumSize" ) == 0 )
+ if ( qstrcmp( p->name(), "minimumSize" ) == 0 )
continue;
- if ( qstrcmp( p->name(), "tqmaximumSize" ) == 0 )
+ if ( qstrcmp( p->name(), "maximumSize" ) == 0 )
continue;
}
- unique.insert( TQString::tqfromLatin1( it.current() ), TRUE );
+ unique.insert( TQString::fromLatin1( it.current() ), TRUE );
if ( editor->widget()->isWidgetType() &&
editor->formWindow()->isMainContainer( TQT_TQOBJECT(editor->widget()) ) ) {
if ( qstrcmp( p->name(), "geometry" ) == 0 )
@@ -3107,9 +3107,9 @@ void PropertyList::setupProperties()
continue;
if ( qstrcmp( p->name(), "geometry" ) == 0 )
continue;
- if ( qstrcmp( p->name(), "tqminimumSize" ) == 0 )
+ if ( qstrcmp( p->name(), "minimumSize" ) == 0 )
continue;
- if ( qstrcmp( p->name(), "tqmaximumSize" ) == 0 )
+ if ( qstrcmp( p->name(), "maximumSize" ) == 0 )
continue;
if ( qstrcmp( p->name(), "enabled" ) == 0 )
continue;
@@ -3164,7 +3164,7 @@ void PropertyList::setupProperties()
isPropertyObject && p->designable( ( (PropertyObject*)w )->widgetList().first() ) ) &&
( !isPropertyObject || qstrcmp( p->name(), "name" ) != 0 ) ) {
if ( p->isSetType() ) {
- if ( TQString( p->name() ) == "tqalignment" ) {
+ if ( TQString( p->name() ) == "alignment" ) {
TQStringList lst;
lst << p->valueToKey( AlignAuto )
<< p->valueToKey( AlignLeft )
@@ -3486,7 +3486,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() ),
@@ -3500,7 +3500,7 @@ void PropertyList::layoutInitValue( PropertyItem *i, bool changed )
{
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() ),
@@ -3692,25 +3692,25 @@ static void clearAlignList( TQStrList &l )
void PropertyList::setPropertyValue( PropertyItem *i )
{
const TQMetaProperty *p =
- editor->widget()->tqmetaObject()->
- property( editor->widget()->tqmetaObject()->findProperty( i->name(), TRUE), TRUE );
+ editor->widget()->metaObject()->
+ property( editor->widget()->metaObject()->findProperty( i->name(), TRUE), TRUE );
if ( !p ) {
if ( i->name() == "hAlign" ) {
- int align = editor->widget()->property( "tqalignment" ).toInt();
- p = editor->widget()->tqmetaObject()->
- property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE );
+ int align = editor->widget()->property( "alignment" ).toInt();
+ p = editor->widget()->metaObject()->
+ 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();
- p = editor->widget()->tqmetaObject()->
- property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE );
+ int align = editor->widget()->property( "alignment" ).toInt();
+ p = editor->widget()->metaObject()->
+ 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
@@ -3769,7 +3769,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(),
@@ -3864,7 +3864,7 @@ TQString PropertyList::whatsThisText( TQListViewItem *i )
if ( ( (PropertyItem*)i )->propertyParent() )
i = ( (PropertyItem*)i )->propertyParent();
- const TQMetaObject *mo = editor->widget()->tqmetaObject();
+ const TQMetaObject *mo = editor->widget()->metaObject();
TQString prop = ( (PropertyItem*)i )->name();
while ( mo ) {
TQString s;
@@ -3873,10 +3873,10 @@ TQString PropertyList::whatsThisText( TQListViewItem *i )
if ( ( it = propertyDocs.find( s ) ) != propertyDocs.end() ) {
return *it;
}
- mo = mo->tqsuperClass();
+ 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()
@@ -4190,7 +4190,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();
@@ -4274,21 +4274,21 @@ TQString PropertyEditor::classOfCurrentProperty() const
return TQString();
TQObject *o = wid;
TQString curr = currentProperty();
- TQMetaObject *mo = o->tqmetaObject();
+ TQMetaObject *mo = o->metaObject();
while ( mo ) {
TQStrList props = mo->propertyNames( FALSE );
if ( props.find( curr.latin1() ) != -1 )
return mo->className();
- mo = mo->tqsuperClass();
+ mo = mo->superClass();
}
return TQString();
}
-TQMetaObject* PropertyEditor::tqmetaObjectOfCurrentProperty() const
+TQMetaObject* PropertyEditor::metaObjectOfCurrentProperty() const
{
if ( !wid )
return 0;
- return wid->tqmetaObject();
+ return wid->metaObject();
}
void PropertyEditor::resetFocus()
diff --git a/kdevdesigner/designer/propertyeditor.h b/kdevdesigner/designer/propertyeditor.h
index 1b0fcc85..c3d842aa 100644
--- a/kdevdesigner/designer/propertyeditor.h
+++ b/kdevdesigner/designer/propertyeditor.h
@@ -35,7 +35,7 @@
#include <tqtabwidget.h>
#include <tqmodules.h>
#include <tqptrlist.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqcombobox.h>
#include "hierarchyview.h"
@@ -129,7 +129,7 @@ private:
bool open, changed;
PropertyItem *property;
TQString propertyName;
- TQPtrList<PropertyItem> tqchildren;
+ TQPtrList<PropertyItem> children;
TQColor backColor;
TQPushButton *resetButton;
@@ -376,7 +376,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();
@@ -789,7 +789,7 @@ public:
TQString currentProperty() const;
TQString classOfCurrentProperty() const;
- TQMetaObject* tqmetaObjectOfCurrentProperty() const;
+ TQMetaObject* metaObjectOfCurrentProperty() const;
void resetFocus();
diff --git a/kdevdesigner/designer/propertyobject.cpp b/kdevdesigner/designer/propertyobject.cpp
index 39d23b48..1bd1883f 100644
--- a/kdevdesigner/designer/propertyobject.cpp
+++ b/kdevdesigner/designer/propertyobject.cpp
@@ -39,11 +39,11 @@ PropertyObject::PropertyObject( const TQWidgetList &objs )
v.setAutoDelete( TRUE );
for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) {
- const TQMetaObject *m = o->tqmetaObject();
+ const TQMetaObject *m = o->metaObject();
TQPtrList<TQMetaObject> *mol = new TQPtrList<TQMetaObject>;
while ( m ) {
mol->insert( 0, m );
- m = m->tqsuperClass();
+ m = m->superClass();
}
v.insert( v.count(), mol );
}
diff --git a/kdevdesigner/designer/propertyobject.h b/kdevdesigner/designer/propertyobject.h
index 4cfb54fd..2590399a 100644
--- a/kdevdesigner/designer/propertyobject.h
+++ b/kdevdesigner/designer/propertyobject.h
@@ -8,7 +8,7 @@
class PropertyObject : public TQObject
{
public:
- TQMetaObject *tqmetaObject() const { return (TQMetaObject*)mobj; }
+ TQMetaObject *metaObject() const { return (TQMetaObject*)mobj; }
const char *className() const { return "PropertyObject"; }
TQObject* qObject() { return (TQObject*)this; }
private:
diff --git a/kdevdesigner/designer/qcompletionedit.cpp b/kdevdesigner/designer/qcompletionedit.cpp
index 7407370c..ed0c986e 100644
--- a/kdevdesigner/designer/qcompletionedit.cpp
+++ b/kdevdesigner/designer/qcompletionedit.cpp
@@ -88,8 +88,8 @@ void QCompletionEdit::placeListBox()
return;
}
- popup->resize( TQMAX( listbox->tqsizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ),
- listbox->tqsizeHint().height() + listbox->horizontalScrollBar()->height() + 4 );
+ popup->resize( TQMAX( listbox->sizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ),
+ listbox->sizeHint().height() + listbox->horizontalScrollBar()->height() + 4 );
TQPoint p( mapToGlobal( TQPoint( 0, 0 ) ) );
if ( p.y() + height() + popup->height() <= TQApplication::desktop()->height() )
diff --git a/kdevdesigner/designer/replacedialog.ui b/kdevdesigner/designer/replacedialog.ui
index 635b2315..27d01a58 100644
--- a/kdevdesigner/designer/replacedialog.ui
+++ b/kdevdesigner/designer/replacedialog.ui
@@ -144,7 +144,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp
index 0d83cb1e..12b4e490 100644
--- a/kdevdesigner/designer/resource.cpp
+++ b/kdevdesigner/designer/resource.cpp
@@ -54,7 +54,7 @@
#include <tqheader.h>
#include <tqiconview.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlistbox.h>
#include <tqlistview.h>
#include <tqmenudata.h>
@@ -69,8 +69,8 @@
#endif
#include <tqtabwidget.h>
#include <tqtabwidget.h>
-#include <tqtextcodec.h>
-#include <tqtextstream.h>
+#include <textcodec.h>
+#include <textstream.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include <tqwidget.h>
@@ -225,7 +225,7 @@ static TQString platformNeutralKeySequence(const TQKeySequence &ks)
// represent, but is clearly impossible to trigger...
p = TQChar(basekey & 0xffff);
} else if ( basekey >= TQt::Key_F1 && basekey <= TQt::Key_F35 ) {
- p = TQAccel::tr( "F%1" ).tqarg(basekey - TQt::Key_F1 + 1);
+ p = TQAccel::tr( "F%1" ).arg(basekey - TQt::Key_F1 + 1);
} else if ( basekey > TQt::Key_Space && basekey <= TQt::Key_AsciiTilde ) {
p.sprintf( "%c", basekey );
} else {
@@ -238,7 +238,7 @@ static TQString platformNeutralKeySequence(const TQKeySequence &ks)
++i;
}
// If we can't find the actual translatable keyname,
- // fall back on the tqunicode representation of it...
+ // fall back on the unicode representation of it...
// Or else characters like Key_aring may not get displayed
// ( Really depends on you locale )
if ( !keyname[i].name )
@@ -622,13 +622,13 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject )
if ( formwindow ) {
formwindow->killAccels( TQT_TQOBJECT(formwindow) );
- if ( formwindow->tqlayout() )
- formwindow->tqlayout()->activate();
+ if ( formwindow->layout() )
+ formwindow->layout()->activate();
if ( hadGeometry )
- formwindow->resize( formwindow->size().expandedTo( formwindow->tqminimumSize().
- expandedTo( formwindow->tqminimumSizeHint() ) ) );
+ formwindow->resize( formwindow->size().expandedTo( formwindow->minimumSize().
+ expandedTo( formwindow->minimumSizeHint() ) ) );
else
- formwindow->resize( formwindow->size().expandedTo( formwindow->tqsizeHint() ) );
+ formwindow->resize( formwindow->size().expandedTo( formwindow->sizeHint() ) );
}
return TRUE;
@@ -1054,14 +1054,14 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
MetaDataBase::CustomWidget *cw = new MetaDataBase::CustomWidget;
cw->className = className;
cw->includeFile = WidgetDatabase::includeFile( classID );
- TQStrList lst = w->tqmetaObject()->signalNames( TRUE );
+ TQStrList lst = w->metaObject()->signalNames( TRUE );
for ( TQPtrListIterator<char> it(lst); it.current(); ++it )
cw->lstSignals.append(it.current());
int i;
- int total = w->tqmetaObject()->numProperties( TRUE );
+ int total = w->metaObject()->numProperties( TRUE );
for ( i = 0; i < total; i++ ) {
- const TQMetaProperty *p = w->tqmetaObject()->property( i, TRUE );
+ const TQMetaProperty *p = w->metaObject()->property( i, TRUE );
if ( p->designable(w) ) {
MetaDataBase::Property prop;
prop.property = p->name();
@@ -1079,9 +1079,9 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
}
}
- total = w->tqmetaObject()->numSlots( TRUE );
+ total = w->metaObject()->numSlots( TRUE );
for ( i = 0; i < total; i++ ) {
- const TQMetaData *md = w->tqmetaObject()->slot( i, TRUE );
+ const TQMetaData *md = w->metaObject()->slot( i, TRUE );
MetaDataBase::Function funky;
// Find out if we have a return type.
if ( md->method->count > 0 ) {
@@ -1344,17 +1344,17 @@ 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
- TQLayout *tqlayout = 0;
+ // if the widget has a layout we pretend that all widget's childs are childs of the layout - makes the structure nicer
+ TQLayout *layout = 0;
QDesignerGridLayout* grid = 0;
if ( !::tqqt_cast<TQSplitter*>(obj) &&
WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( obj ) ) ) &&
obj->isWidgetType() &&
- WidgetFactory::layoutType( (TQWidget*)obj, tqlayout ) != WidgetFactory::NoLayout ) {
- WidgetFactory::LayoutType lay = WidgetFactory::layoutType( (TQWidget*)obj, tqlayout );
+ WidgetFactory::layoutType( (TQWidget*)obj, layout ) != WidgetFactory::NoLayout ) {
+ WidgetFactory::LayoutType lay = WidgetFactory::layoutType( (TQWidget*)obj, layout );
switch ( lay ) {
case WidgetFactory::HBox:
closeTag = makeIndent( indent ) + "</hbox>";
@@ -1370,15 +1370,15 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent )
closeTag = makeIndent( indent ) + "</grid>";
ts << makeIndent( indent ) << "<grid>" << endl;
++indent;
- grid = (QDesignerGridLayout*) tqlayout;
+ grid = (QDesignerGridLayout*) layout;
break;
default:
break;
}
- // save properties of tqlayout
+ // save properties of layout
if ( lay != WidgetFactory::NoLayout )
- saveObjectProperties( TQT_TQOBJECT(tqlayout), ts, indent );
+ saveObjectProperties( TQT_TQOBJECT(layout), ts, indent );
}
@@ -1399,8 +1399,8 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
changed = MetaDataBase::changedProperties( w );
if ( w->isWidgetType() ) {
if ( ::tqqt_cast<Spacer*>(w) ) {
- if ( !changed.contains( "tqsizeHint" ) )
- changed << "tqsizeHint";
+ if ( !changed.contains( "sizeHint" ) )
+ changed << "sizeHint";
if ( !changed.contains( "geometry" ) )
changed << "geometry";
} else {
@@ -1432,15 +1432,15 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
bool inLayout = TQT_BASE_OBJECT(w) != TQT_BASE_OBJECT(formwindow->mainContainer()) && !copying && w->isWidgetType() && ( (TQWidget*)w )->parentWidget() &&
WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
- TQStrList lst = w->tqmetaObject()->propertyNames( !::tqqt_cast<Spacer*>(w) );
+ TQStrList lst = w->metaObject()->propertyNames( !::tqqt_cast<Spacer*>(w) );
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
- if ( changed.find( TQString::tqfromLatin1( it.current() ) ) == changed.end() )
+ if ( changed.find( TQString::fromLatin1( it.current() ) ) == changed.end() )
continue;
- if ( saved.find( TQString::tqfromLatin1( it.current() ) ) != saved.end() )
+ if ( saved.find( TQString::fromLatin1( it.current() ) ) != saved.end() )
continue;
- saved << TQString::tqfromLatin1( it.current() );
- const TQMetaProperty* p = w->tqmetaObject()->
- property( w->tqmetaObject()->findProperty( it.current(), TRUE ), TRUE );
+ saved << TQString::fromLatin1( it.current() );
+ const TQMetaProperty* p = w->metaObject()->
+ property( w->metaObject()->findProperty( it.current(), TRUE ), TRUE );
if ( !p || !p->stored( w ) || ( inLayout && qstrcmp( p->name(), "geometry" ) == 0 ) )
continue;
if ( ::tqqt_cast<TQLabel*>(w) && qstrcmp( p->name(), "pixmap" ) == 0 &&
@@ -1496,7 +1496,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent )
{
- const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( name, TRUE ), TRUE );
+ const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, TRUE ), TRUE );
TQStrList l( p->valueToKeys( w->property( name ).toInt() ) );
TQString v;
for ( uint i = 0; i < l.count(); ++i ) {
@@ -1509,7 +1509,7 @@ void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Ty
void Resource::saveEnumProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent )
{
- const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( name, TRUE ), TRUE );
+ const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, TRUE ), TRUE );
ts << makeIndent( indent ) << "<enum>" << p->valueToKey( w->property( name ).toInt() ) << "</enum>" << endl;
}
@@ -1680,7 +1680,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();
@@ -1743,7 +1743,7 @@ void Resource::saveColorGroup( TQTextStream &ts, int indent, const TQColorGroup
saveColor( ts, indent, cg.color( (TQColorGroup::ColorRole)r ) );
indent--;
ts << makeIndent( indent ) << "</color>" << endl;
- TQPixmap* pm = cg.tqbrush( (TQColorGroup::ColorRole)r ).pixmap();
+ TQPixmap* pm = cg.brush( (TQColorGroup::ColorRole)r ).pixmap();
if ( pm && !pm->isNull() )
savePixmap( *pm, ts, indent );
}
@@ -1756,7 +1756,7 @@ void Resource::saveColor( TQTextStream &ts, int indent, const TQColor &c )
ts << makeIndent( indent ) << "<blue>" << TQString::number( c.blue() ) << "</blue>" << endl;
}
-TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout )
+TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLayout* layout )
{
lastItem = 0;
TQDomElement n = e.firstChild().toElement();
@@ -1787,7 +1787,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
TQMessageBox::critical( MainWindow::self, i18n( "Loading File" ),
i18n( "Error loading %1.\n"
"The widget %2 could not be created." ).
- tqarg( currFileName ).tqarg( className ) );
+ arg( currFileName ).arg( className ) );
return 0;
}
if ( !mainContainerSet ) {
@@ -1798,16 +1798,16 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
w = (TQWidget*)obj;
if ( ::tqqt_cast<TQMainWindow*>(w) )
w = ( (TQMainWindow*)w )->centralWidget();
- if ( tqlayout ) {
- switch ( WidgetFactory::layoutType( tqlayout ) ) {
+ if ( layout ) {
+ switch ( WidgetFactory::layoutType( layout ) ) {
case WidgetFactory::HBox:
- ( (TQHBoxLayout*)tqlayout )->addWidget( w );
+ ( (TQHBoxLayout*)layout )->addWidget( w );
break;
case WidgetFactory::VBox:
- ( (TQVBoxLayout*)tqlayout )->addWidget( w );
+ ( (TQVBoxLayout*)layout )->addWidget( w );
break;
case WidgetFactory::Grid:
- ( (QDesignerGridLayout*)tqlayout )->addMultiCellWidget( w, row, row + rowspan - 1,
+ ( (QDesignerGridLayout*)layout )->addMultiCellWidget( w, row, row + rowspan - 1,
col, col + colspan - 1 );
break;
default:
@@ -1817,7 +1817,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
if ( !toplevel )
toplevel = w;
- tqlayout = 0;
+ layout = 0;
if ( w && formwindow ) {
if ( !parent ||
@@ -1848,22 +1848,22 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
while ( !n.isNull() ) {
if ( n.tagName() == "spacer" ) {
- createSpacer( n, w, tqlayout, Qt::Horizontal );
+ createSpacer( n, w, layout, Qt::Horizontal );
} else if ( n.tagName() == "widget" ) {
- createObject( n, w, tqlayout );
+ createObject( n, w, layout );
} else if ( n.tagName() == "hbox" ) {
- tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::HBox );
- obj = TQT_TQOBJECT(tqlayout);
+ layout = WidgetFactory::createLayout( w, layout, WidgetFactory::HBox );
+ obj = TQT_TQOBJECT(layout);
n = n.firstChild().toElement();
continue;
} else if ( n.tagName() == "grid" ) {
- tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::Grid );
- obj = TQT_TQOBJECT(tqlayout);
+ layout = WidgetFactory::createLayout( w, layout, WidgetFactory::Grid );
+ obj = TQT_TQOBJECT(layout);
n = n.firstChild().toElement();
continue;
} else if ( n.tagName() == "vbox" ) {
- tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::VBox );
- obj = TQT_TQOBJECT(tqlayout);
+ layout = WidgetFactory::createLayout( w, layout, WidgetFactory::VBox );
+ obj = TQT_TQOBJECT(layout);
n = n.firstChild().toElement();
continue;
} else if ( n.tagName() == "property" && obj ) {
@@ -2104,7 +2104,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt
}
}
-TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *tqlayout, Qt::Orientation o )
+TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o )
{
TQDomElement n = e.firstChild().toElement();
int row = e.attribute( "row" ).toInt();
@@ -2128,12 +2128,12 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay
spacer->setInteraciveMode( TRUE );
if ( formwindow )
formwindow->insertWidget( spacer, pasting );
- if ( tqlayout ) {
- if ( ::tqqt_cast<TQBoxLayout*>(tqlayout) )
- ( (TQBoxLayout*)tqlayout )->addWidget( spacer, 0, spacer->tqalignment() );
+ if ( layout ) {
+ if ( ::tqqt_cast<TQBoxLayout*>(layout) )
+ ( (TQBoxLayout*)layout )->addWidget( spacer, 0, spacer->alignment() );
else
- ( (QDesignerGridLayout*)tqlayout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1,
- spacer->tqalignment() );
+ ( (QDesignerGridLayout*)layout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1,
+ spacer->alignment() );
}
return spacer;
}
@@ -2143,7 +2143,7 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay
*/
void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQDomElement &e )
{
- const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->findProperty( prop, TRUE ), TRUE );
+ const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, TRUE ), TRUE );
if ( !::tqqt_cast<TQLayout*>(obj) ) {// no layouts in metadatabase... (RS)
if ( obj->inherits( "CustomWidget" ) ) {
@@ -2591,8 +2591,8 @@ void Resource::saveCustomWidgets( TQTextStream &ts, int indent )
<< "\">" << w->includeFile << "</header>" << endl;
ts << makeIndent( indent ) << "<sizehint>" << endl;
indent++;
- ts << makeIndent( indent ) << "<width>" << w->tqsizeHint.width() << "</width>" << endl;
- ts << makeIndent( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl;
+ ts << makeIndent( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl;
+ ts << makeIndent( indent ) << "<height>" << w->sizeHint.height() << "</height>" << endl;
indent--;
ts << makeIndent( indent ) << "</sizehint>" << endl;
ts << makeIndent( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl;
@@ -2648,9 +2648,9 @@ void Resource::loadCustomWidgets( const TQDomElement &e, Resource *r )
TQDomElement n3 = n2.firstChild().toElement();
while ( !n3.isNull() ) {
if ( n3.tagName() == "width" )
- w->tqsizeHint.setWidth( n3.firstChild().toText().data().toInt() );
+ w->sizeHint.setWidth( n3.firstChild().toText().data().toInt() );
else if ( n3.tagName() == "height" )
- w->tqsizeHint.setHeight( n3.firstChild().toText().data().toInt() );
+ w->sizeHint.setHeight( n3.firstChild().toText().data().toInt() );
n3 = n3.nextSibling().toElement();
}
} else if ( n2.tagName() == "sizepolicy" ) {
@@ -2897,9 +2897,9 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
TQString s = "";
TQString m = "";
if ( !formwindow->spacingFunction().isEmpty() )
- s = TQString( " spacing=\"%1\"" ).tqarg( formwindow->spacingFunction() );
+ s = TQString( " spacing=\"%1\"" ).arg( formwindow->spacingFunction() );
if ( !formwindow->marginFunction().isEmpty() )
- m = TQString( " margin=\"%1\"" ).tqarg( formwindow->marginFunction() );
+ m = TQString( " margin=\"%1\"" ).arg( formwindow->marginFunction() );
ts << makeIndent( indent ) << "<layoutfunctions" << s << m << "/>" << endl;
}
}
diff --git a/kdevdesigner/designer/resource.h b/kdevdesigner/designer/resource.h
index ddbffb07..8f362d95 100644
--- a/kdevdesigner/designer/resource.h
+++ b/kdevdesigner/designer/resource.h
@@ -28,7 +28,7 @@
#define RESOURCE_H
#include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqvariant.h>
#include <tqvaluelist.h>
#include <tqimage.h>
@@ -111,8 +111,8 @@ private:
void saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent );
void savePopupMenu( PopupMenuEditor *pm, TQMainWindow *mw, TQTextStream &ts, int indent );
- TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout = 0 );
- TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *tqlayout, Qt::Orientation o );
+ TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* layout = 0 );
+ TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o );
void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 );
void createColumn( const TQDomElement &e, TQWidget *widget );
void setObjectProperty( TQObject* widget, const TQString &prop, const TQDomElement &e);
diff --git a/kdevdesigner/designer/richtextfontdialog.ui b/kdevdesigner/designer/richtextfontdialog.ui
index 0eaef760..d7d6c5a7 100644
--- a/kdevdesigner/designer/richtextfontdialog.ui
+++ b/kdevdesigner/designer/richtextfontdialog.ui
@@ -109,7 +109,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -195,7 +195,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>40</width>
<height>20</height>
@@ -227,7 +227,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -272,7 +272,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/richtextfontdialog.ui.h b/kdevdesigner/designer/richtextfontdialog.ui.h
index 263b5f90..27a11a21 100644
--- a/kdevdesigner/designer/richtextfontdialog.ui.h
+++ b/kdevdesigner/designer/richtextfontdialog.ui.h
@@ -11,7 +11,7 @@
void RichTextFontDialog::init()
{
TQFontDatabase *db = new TQFontDatabase();
- fontCombo->insertStringList( db->tqfamilies() );
+ fontCombo->insertStringList( db->families() );
}
void RichTextFontDialog::selectColor()
diff --git a/kdevdesigner/designer/sizehandle.cpp b/kdevdesigner/designer/sizehandle.cpp
index 6ba2ba3f..f9daaefc 100644
--- a/kdevdesigner/designer/sizehandle.cpp
+++ b/kdevdesigner/designer/sizehandle.cpp
@@ -213,7 +213,7 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e )
sel->updateGeometry();
oldPressPos += ( p - pos() );
- formWindow->sizePreview()->setText( i18n( "%1/%2" ).tqarg( widget->width() ).tqarg( widget->height() ) );
+ formWindow->sizePreview()->setText( i18n( "%1/%2" ).arg( widget->width() ).arg( widget->height() ) );
formWindow->sizePreview()->adjustSize();
TQRect lg( formWindow->mapFromGlobal( e->globalPos() ) + TQPoint( 16, 16 ),
formWindow->sizePreview()->size() );
@@ -231,19 +231,19 @@ 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) );
}
void SizeHandle::trySetGeometry( TQWidget *w, int x, int y, int width, int height )
{
- int minw = TQMAX( w->tqminimumSizeHint().width(), w->tqminimumSize().width() );
+ int minw = TQMAX( w->minimumSizeHint().width(), w->minimumSize().width() );
minw = TQMAX( minw, 2 * formWindow->grid().x() );
- int minh = TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() );
+ int minh = TQMAX( w->minimumSizeHint().height(), w->minimumSize().height() );
minh = TQMAX( minh, 2 * formWindow->grid().y() );
if ( TQMAX( minw, width ) > w->maximumWidth() ||
TQMAX( minh, height ) > w->maximumHeight() )
@@ -257,9 +257,9 @@ void SizeHandle::trySetGeometry( TQWidget *w, int x, int y, int width, int heigh
void SizeHandle::tryResize( TQWidget *w, int width, int height )
{
- int minw = TQMAX( w->tqminimumSizeHint().width(), w->tqminimumSize().width() );
+ int minw = TQMAX( w->minimumSizeHint().width(), w->minimumSize().width() );
minw = TQMAX( minw, 16 );
- int minh = TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() );
+ int minh = TQMAX( w->minimumSizeHint().height(), w->minimumSize().height() );
minh = TQMAX( minh, 16 );
w->resize( TQMAX( minw, width ), TQMAX( minh, height ) );
}
diff --git a/kdevdesigner/designer/sourceeditor.cpp b/kdevdesigner/designer/sourceeditor.cpp
index 2850e20e..206a4646 100644
--- a/kdevdesigner/designer/sourceeditor.cpp
+++ b/kdevdesigner/designer/sourceeditor.cpp
@@ -37,7 +37,7 @@
#include "sourcefile.h"
#include "hierarchyview.h"
#include <tqmessagebox.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include "kdevdesigner_part.h"
SourceEditor::SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface )
diff --git a/kdevdesigner/designer/sourcefile.cpp b/kdevdesigner/designer/sourcefile.cpp
index ad76e201..faf9dd10 100644
--- a/kdevdesigner/designer/sourcefile.cpp
+++ b/kdevdesigner/designer/sourcefile.cpp
@@ -26,7 +26,7 @@
#include "sourcefile.h"
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include "designerappiface.h"
#include "sourceeditor.h"
#include "metadatabase.h"
@@ -138,7 +138,7 @@ bool SourceFile::saveAs( bool ignoreModified )
pro->setModified( TRUE );
timeStamp.setFileName( pro->makeAbsolute( filename ) );
if ( ed )
- ed->setCaption( i18n( "Edit %1" ).tqarg( filename ) );
+ ed->setCaption( i18n( "Edit %1" ).arg( filename ) );
setModified( TRUE );
if ( pro->isDummy() ) {
TQObject *o = ed->parent();
@@ -220,7 +220,7 @@ bool SourceFile::closeEvent()
ed->save();
switch ( TQMessageBox::warning( MainWindow::self, i18n( "Save Code" ),
- i18n( "Save changes to '%1'?" ).tqarg( filename ),
+ i18n( "Save changes to '%1'?" ).arg( filename ),
i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) {
case 0: // save
if ( !save() )
@@ -265,7 +265,7 @@ void SourceFile::checkTimeStamp()
timeStamp.update();
if ( TQMessageBox::information( MainWindow::self, i18n( "TQt Designer" ),
i18n( "File '%1' has been changed outside TQt Designer.\n"
- "Do you want to reload it?" ).tqarg( filename ),
+ "Do you want to reload it?" ).arg( filename ),
i18n( "&Yes" ), i18n( "&No" ) ) == 0 ) {
load();
if ( ed )
@@ -279,7 +279,7 @@ bool SourceFile::checkFileName( bool allowBreak )
if ( sf )
TQMessageBox::warning( MainWindow::self, i18n( "Invalid Filename" ),
i18n( "The project already contains a source file with \n"
- "filename '%1'. Please choose a new filename." ).tqarg( filename ) );
+ "filename '%1'. Please choose a new filename." ).arg( filename ) );
while ( sf ) {
LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() );
TQString filter;
diff --git a/kdevdesigner/designer/startdialog.ui b/kdevdesigner/designer/startdialog.ui
index 8843ba87..383fdfda 100644
--- a/kdevdesigner/designer/startdialog.ui
+++ b/kdevdesigner/designer/startdialog.ui
@@ -216,7 +216,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
diff --git a/kdevdesigner/designer/startdialogimpl.cpp b/kdevdesigner/designer/startdialogimpl.cpp
index 9bf43f87..3e1a4fdf 100644
--- a/kdevdesigner/designer/startdialogimpl.cpp
+++ b/kdevdesigner/designer/startdialogimpl.cpp
@@ -10,7 +10,7 @@
#include <tqpoint.h>
#include <tqobjectlist.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqfileinfo.h>
#include <tqmap.h>
#include <tqdatetime.h>
@@ -108,7 +108,7 @@ void StartDialog::recentItemChanged( TQIconViewItem *item )
}
TQDateTime dt( f.lastModified() );
TQString date( dt.toString( "MMMM dd hh:mm" ));
- msg = TQString( "%1 (%2 %3) %4" ).tqarg(msg).tqarg(s).tqarg(unit).tqarg(date);
+ msg = TQString( "%1 (%2 %3) %4" ).arg(msg).arg(s).arg(unit).arg(date);
fileInfoLabel->setText( msg );
}
diff --git a/kdevdesigner/designer/styledbutton.cpp b/kdevdesigner/designer/styledbutton.cpp
index d2aea25f..d84ee135 100644
--- a/kdevdesigner/designer/styledbutton.cpp
+++ b/kdevdesigner/designer/styledbutton.cpp
@@ -29,7 +29,7 @@
#include "formwindow.h"
#include "pixmapchooser.h"
#include <tqcolordialog.h>
-#include <tqpalette.h>
+#include <palette.h>
#include <tqlabel.h>
#include <tqpainter.h>
#include <tqimage.h>
@@ -41,7 +41,7 @@
StyledButton::StyledButton(TQWidget* parent, const char* name)
: TQButton( parent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( FALSE )
{
- setMinimumSize( tqminimumSizeHint() );
+ setMinimumSize( minimumSizeHint() );
setAcceptDrops( TRUE );
connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(onEditor()));
@@ -54,7 +54,7 @@ StyledButton::StyledButton( const TQBrush& b, TQWidget* parent, const char* name
{
col = b.color();
pix = b.pixmap();
- setMinimumSize( tqminimumSizeHint() );
+ setMinimumSize( minimumSizeHint() );
}
StyledButton::~StyledButton()
@@ -117,12 +117,12 @@ void StyledButton::setScale( bool on )
scalePixmap();
}
-TQSize StyledButton::tqsizeHint() const
+TQSize StyledButton::sizeHint() const
{
return TQSize( 50, 25 );
}
-TQSize StyledButton::tqminimumSizeHint() const
+TQSize StyledButton::minimumSizeHint() const
{
return TQSize( 50, 25 );
}
@@ -151,25 +151,25 @@ void StyledButton::resizeEvent( TQResizeEvent* e )
void StyledButton::drawButton( TQPainter *paint )
{
- tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), tqcolorGroup(),
+ tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(),
isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Raised);
drawButtonLabel(paint);
if (hasFocus())
tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, paint,
tqstyle().subRect(TQStyle::SR_PushButtonFocusRect, this),
- tqcolorGroup(), TQStyle::Style_Default);
+ colorGroup(), TQStyle::Style_Default);
}
void StyledButton::drawButtonLabel( TQPainter *paint )
{
TQColor pen = isEnabled() ?
- hasFocus() ? tqpalette().active().buttonText() : tqpalette().inactive().buttonText()
- : tqpalette().disabled().buttonText();
+ hasFocus() ? palette().active().buttonText() : palette().inactive().buttonText()
+ : palette().disabled().buttonText();
paint->setPen( pen );
if(!isEnabled()) {
- paint->setBrush( TQBrush( tqcolorGroup().button() ) );
+ paint->setBrush( TQBrush( colorGroup().button() ) );
}
else if ( edit == PixmapEditor && spix ) {
paint->setBrush( TQBrush( col, *spix ) );
@@ -184,7 +184,7 @@ void StyledButton::onEditor()
{
switch (edit) {
case ColorEditor: {
- TQColor c = TQColorDialog::getColor( tqpalette().active().background(), this );
+ TQColor c = TQColorDialog::getColor( palette().active().background(), this );
if ( c.isValid() ) {
setColor( c );
emit changed();
diff --git a/kdevdesigner/designer/styledbutton.h b/kdevdesigner/designer/styledbutton.h
index f5a193b6..c9c582bd 100644
--- a/kdevdesigner/designer/styledbutton.h
+++ b/kdevdesigner/designer/styledbutton.h
@@ -65,8 +65,8 @@ public:
void setScale( bool );
bool scale() const;
- TQSize tqsizeHint() const;
- TQSize tqminimumSizeHint() const;
+ TQSize sizeHint() const;
+ TQSize minimumSizeHint() const;
void setFormWindow( FormWindow *fw ) { formWindow = fw; }
diff --git a/kdevdesigner/designer/syntaxhighlighter_html.cpp b/kdevdesigner/designer/syntaxhighlighter_html.cpp
index baa6a9f5..5bb681f9 100644
--- a/kdevdesigner/designer/syntaxhighlighter_html.cpp
+++ b/kdevdesigner/designer/syntaxhighlighter_html.cpp
@@ -46,7 +46,7 @@ SyntaxHighlighter_HTML::~SyntaxHighlighter_HTML()
{
}
-void SyntaxHighlighter_HTML::process( TQTextDocument *doc, TQTextParagraph *string, int, bool tqinvalidate )
+void SyntaxHighlighter_HTML::process( TQTextDocument *doc, TQTextParagraph *string, int, bool invalidate )
{
TQTextFormat *formatStandard = format( Standard );
@@ -131,7 +131,7 @@ void SyntaxHighlighter_HTML::process( TQTextDocument *doc, TQTextParagraph *stri
string->setEndState( state );
string->setFirstPreProcess( FALSE );
- if ( tqinvalidate && string->next() &&
+ if ( invalidate && string->next() &&
!string->next()->firstPreProcess() && string->next()->endState() != -1 ) {
TQTextParagraph *p = string->next();
while ( p ) {
diff --git a/kdevdesigner/designer/syntaxhighlighter_html.h b/kdevdesigner/designer/syntaxhighlighter_html.h
index 87f94872..efd1a616 100644
--- a/kdevdesigner/designer/syntaxhighlighter_html.h
+++ b/kdevdesigner/designer/syntaxhighlighter_html.h
@@ -42,7 +42,7 @@ public:
SyntaxHighlighter_HTML();
virtual ~SyntaxHighlighter_HTML();
- void process( TQTextDocument *doc, TQTextParagraph *string, int start, bool tqinvalidate = TRUE );
+ void process( TQTextDocument *doc, TQTextParagraph *string, int start, bool invalidate = TRUE );
TQTextFormat *format( int id );
private:
diff --git a/kdevdesigner/designer/tableeditor.ui b/kdevdesigner/designer/tableeditor.ui
index b278019b..deacf5d4 100644
--- a/kdevdesigner/designer/tableeditor.ui
+++ b/kdevdesigner/designer/tableeditor.ui
@@ -102,7 +102,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -187,7 +187,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -209,7 +209,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -314,7 +314,7 @@
<property name="name">
<cstring>buttonDeleteColPixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -337,7 +337,7 @@
<property name="name">
<cstring>buttonChooseColPixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -440,7 +440,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -496,7 +496,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -581,7 +581,7 @@
<property name="name">
<cstring>buttonDeleteRowPixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -604,7 +604,7 @@
<property name="name">
<cstring>buttonChooseRowPixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
diff --git a/kdevdesigner/designer/tableeditorimpl.cpp b/kdevdesigner/designer/tableeditorimpl.cpp
index 4f549a28..0013398c 100644
--- a/kdevdesigner/designer/tableeditorimpl.cpp
+++ b/kdevdesigner/designer/tableeditorimpl.cpp
@@ -343,7 +343,7 @@ void TableEditor::applyClicked()
row.pix = table->verticalHeader()->iconSet( i )->pixmap();
rows.append( row );
}
- PopulateTableCommand *cmd = new PopulateTableCommand( i18n( "Edit the Rows and Columns of '%1' " ).tqarg( editTable->name() ),
+ PopulateTableCommand *cmd = new PopulateTableCommand( i18n( "Edit the Rows and Columns of '%1' " ).arg( editTable->name() ),
formWindow, editTable, rows, cols );
cmd->execute();
formWindow->commandHistory()->addCommand( cmd );
diff --git a/kdevdesigner/designer/variabledialog.ui b/kdevdesigner/designer/variabledialog.ui
index 4e4fbd83..0e7fe478 100644
--- a/kdevdesigner/designer/variabledialog.ui
+++ b/kdevdesigner/designer/variabledialog.ui
@@ -181,7 +181,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>21</height>
@@ -214,7 +214,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>21</height>
diff --git a/kdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp
index e31f5d82..1cf435e5 100644
--- a/kdevdesigner/designer/widgetfactory.cpp
+++ b/kdevdesigner/designer/widgetfactory.cpp
@@ -31,7 +31,7 @@
#include "mainwindow.h"
#include "formwindow.h"
#include "propertyeditor.h"
-#include "tqlayout.h"
+#include "layout.h"
#include "listboxeditorimpl.h"
#include "listvieweditorimpl.h"
#include "iconvieweditorimpl.h"
@@ -64,9 +64,9 @@
#include <tqlineedit.h>
#include <tqspinbox.h>
#include <tqmultilineedit.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqwidgetstack.h>
#include <tqcombobox.h>
#include <tqtabbar.h>
@@ -77,8 +77,8 @@
#include <tqslider.h>
#include <tqdial.h>
#include <tqprogressbar.h>
-#include <tqtextview.h>
-#include <tqtextbrowser.h>
+#include <textview.h>
+#include <textbrowser.h>
#include <tqframe.h>
#include <tqmetaobject.h>
#include <tqwidgetstack.h>
@@ -296,11 +296,11 @@ QDesignerWidgetStack::QDesignerWidgetStack( TQWidget *parent, const char *name )
prev = new TQToolButton( TQt::LeftArrow, this, "designer_wizardstack_button" );
prev->setAutoRaise( TRUE );
prev->setAutoRepeat( TRUE );
- prev->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
+ prev->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
next = new TQToolButton( TQt::RightArrow, this, "designer_wizardstack_button" );
next->setAutoRaise( TRUE );
next->setAutoRepeat( TRUE );
- next->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
+ next->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
connect( prev, TQT_SIGNAL( clicked() ), this, TQT_SLOT( prevPage() ) );
connect( next, TQT_SIGNAL( clicked() ), this, TQT_SLOT( nextPage() ) );
updateButtons();
@@ -498,7 +498,7 @@ TQMap< int, TQStringList > *changedProperties = 0;
void WidgetFactory::saveDefaultProperties( TQObject *w, int id )
{
TQMap< TQString, TQVariant> propMap;
- TQStrList lst = w->tqmetaObject()->propertyNames( TRUE );
+ TQStrList lst = w->metaObject()->propertyNames( TRUE );
for ( uint i = 0; i < lst.count(); ++i ) {
TQVariant var = w->property( lst.at( i ) );
if ( !var.isValid() && qstrcmp( "pixmap", lst.at( i ) ) == 0 )
@@ -553,11 +553,11 @@ TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, boo
return w;
}
-/*! Creates a tqlayout on the widget \a widget of the type \a type
+/*! Creates a layout on the widget \a widget of the type \a type
which can be \c HBox, \c VBox or \c Grid.
*/
-TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, LayoutType type )
+TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, LayoutType type )
{
int spacing = MainWindow::self->currentLayoutDefaultSpacing();
int margin = 0;
@@ -570,40 +570,40 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay
widget && ::tqqt_cast<FormWindow*>(widget->parentWidget()) ) )
margin = MainWindow::self->currentLayoutDefaultMargin();
- if ( !tqlayout && ::tqqt_cast<TQTabWidget*>(widget) )
+ if ( !layout && ::tqqt_cast<TQTabWidget*>(widget) )
widget = ((TQTabWidget*)widget)->currentPage();
- if ( !tqlayout && ::tqqt_cast<TQWizard*>(widget) )
+ if ( !layout && ::tqqt_cast<TQWizard*>(widget) )
widget = ((TQWizard*)widget)->currentPage();
- if ( !tqlayout && ::tqqt_cast<TQMainWindow*>(widget) )
+ if ( !layout && ::tqqt_cast<TQMainWindow*>(widget) )
widget = ((TQMainWindow*)widget)->centralWidget();
- if ( !tqlayout && ::tqqt_cast<TQWidgetStack*>(widget) )
+ if ( !layout && ::tqqt_cast<TQWidgetStack*>(widget) )
widget = ((TQWidgetStack*)widget)->visibleWidget();
- if ( !tqlayout && ::tqqt_cast<TQToolBox*>(widget) )
+ if ( !layout && ::tqqt_cast<TQToolBox*>(widget) )
widget = ((TQToolBox*)widget)->currentItem();
MetaDataBase::addEntry( TQT_TQOBJECT(widget) );
TQLayout *l = 0;
int align = 0;
- if ( !tqlayout && ::tqqt_cast<TQGroupBox*>(widget) ) {
+ if ( !layout && ::tqqt_cast<TQGroupBox*>(widget) ) {
TQGroupBox *gb = (TQGroupBox*)widget;
gb->setColumnLayout( 0, Qt::Vertical );
- tqlayout = gb->tqlayout();
- tqlayout->setMargin( 0 );
- tqlayout->setSpacing( 0 );
+ layout = gb->layout();
+ layout->setMargin( 0 );
+ layout->setSpacing( 0 );
switch ( type ) {
case HBox:
- l = new TQHBoxLayout( tqlayout );
+ l = new TQHBoxLayout( layout );
break;
case VBox:
- l = new TQVBoxLayout( tqlayout );
+ l = new TQVBoxLayout( layout );
break;
case Grid:
- l = new QDesignerGridLayout( tqlayout );
+ l = new QDesignerGridLayout( layout );
break;
default:
return 0;
@@ -612,16 +612,16 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay
MetaDataBase::setMargin( TQT_TQOBJECT(gb), metamargin );
MetaDataBase::setSpacing( TQT_TQOBJECT(gb), metaspacing );
} else {
- if ( tqlayout ) {
+ if ( layout ) {
switch ( type ) {
case HBox:
- l = new TQHBoxLayout( tqlayout );
+ l = new TQHBoxLayout( layout );
break;
case VBox:
- l = new TQVBoxLayout( tqlayout );
+ l = new TQVBoxLayout( layout );
break;
case Grid:
- l = new QDesignerGridLayout( tqlayout );
+ l = new QDesignerGridLayout( layout );
break;
default:
return 0;
@@ -653,7 +653,7 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay
}
}
}
- l->tqsetAlignment( align );
+ l->setAlignment( align );
MetaDataBase::addEntry( TQT_TQOBJECT(l) );
return l;
}
@@ -673,7 +673,7 @@ void WidgetFactory::deleteLayout( TQWidget *widget )
widget = ((TQWidgetStack*)widget)->visibleWidget();
if ( ::tqqt_cast<TQToolBox*>(widget) )
widget = ((TQToolBox*)widget)->currentItem();
- delete widget->tqlayout();
+ delete widget->layout();
}
/*! Factory functions for creating a widget of the type \a className
@@ -690,7 +690,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
TQPushButton *b = 0;
if ( init ) {
b = new QDesignerPushButton( parent, name );
- b->setText( TQString::tqfromLatin1( name ) );
+ b->setText( TQString::fromLatin1( name ) );
} else {
b = new QDesignerPushButton( parent, name );
}
@@ -714,24 +714,24 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
} else if ( className == TQCHECKBOX_OBJECT_NAME_STRING ) {
if ( init ) {
QDesignerCheckBox *cb = new QDesignerCheckBox( parent, name );
- cb->setText( TQString::tqfromLatin1( name ) );
+ cb->setText( TQString::fromLatin1( name ) );
return cb;
}
return new QDesignerCheckBox( parent, name );
} else if ( className == TQRADIOBUTTON_OBJECT_NAME_STRING ) {
if ( init ) {
QDesignerRadioButton *rb = new QDesignerRadioButton( parent, name );
- rb->setText( TQString::tqfromLatin1( name ) );
+ rb->setText( TQString::fromLatin1( name ) );
return rb;
}
return new QDesignerRadioButton( parent, name );
} else if ( className == TQGROUPBOX_OBJECT_NAME_STRING ) {
if ( init )
- return new TQGroupBox( TQString::tqfromLatin1( name ), parent, name );
+ return new TQGroupBox( TQString::fromLatin1( name ), parent, name );
return new TQGroupBox( parent, name );
} else if ( className == TQBUTTONGROUP_OBJECT_NAME_STRING ) {
if ( init )
- return new TQButtonGroup( TQString::tqfromLatin1( name ), parent, name );
+ return new TQButtonGroup( TQString::fromLatin1( name ), parent, name );
return new TQButtonGroup( parent, name );
} else if ( className == TQICONVIEW_OBJECT_NAME_STRING ) {
#if !defined(TQT_NO_ICONVIEW)
@@ -789,7 +789,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
else if ( className == TQLABEL_OBJECT_NAME_STRING || className == "TextLabel" ) {
QDesignerLabel *l = new QDesignerLabel( parent, name );
if ( init ) {
- l->setText( TQString::tqfromLatin1( name ) );
+ l->setText( TQString::fromLatin1( name ) );
MetaDataBase::addEntry( TQT_TQOBJECT(l) );
MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "text", TRUE );
}
@@ -1001,14 +1001,14 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
-/*! Find out which type the tqlayout of the widget is. Returns \c HBox,
- \c VBox, \c Grid or \c NoLayout. \a tqlayout points to this
- TQWidget::tqlayout() of \a w or to 0 after the function call.
+/*! Find out which type the layout of the widget is. Returns \c HBox,
+ \c VBox, \c Grid or \c NoLayout. \a layout points to this
+ TQWidget::layout() of \a w or to 0 after the function call.
*/
-WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tqlayout )
+WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&layout )
{
- tqlayout = 0;
+ layout = 0;
if ( ::tqqt_cast<TQTabWidget*>(w) )
w = ((TQTabWidget*)w)->currentPage();
@@ -1024,9 +1024,9 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tql
if ( ::tqqt_cast<TQSplitter*>(w) )
return ( (TQSplitter*)w )->orientation() ==Qt::Horizontal ? HBox : VBox;
- if ( !w || !w->tqlayout() )
+ if ( !w || !w->layout() )
return NoLayout;
- TQLayout *lay = w->tqlayout();
+ TQLayout *lay = w->layout();
if ( ::tqqt_cast<TQGroupBox*>(w) ) {
TQObjectList *l = TQT_TQOBJECT(lay)->queryList( TQLAYOUT_OBJECT_NAME_STRING );
@@ -1034,7 +1034,7 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tql
lay = (TQLayout*)l->first();
delete l;
}
- tqlayout = lay;
+ layout = lay;
if ( ::tqqt_cast<TQHBoxLayout*>(lay) )
return HBox;
@@ -1048,13 +1048,13 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tql
/*!
\overload
*/
-WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *tqlayout )
+WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *layout )
{
- if ( ::tqqt_cast<TQHBoxLayout*>(tqlayout) )
+ if ( ::tqqt_cast<TQHBoxLayout*>(layout) )
return HBox;
- else if ( ::tqqt_cast<TQVBoxLayout*>(tqlayout) )
+ else if ( ::tqqt_cast<TQVBoxLayout*>(layout) )
return VBox;
- else if ( ::tqqt_cast<TQGridLayout*>(tqlayout) )
+ else if ( ::tqqt_cast<TQGridLayout*>(layout) )
return Grid;
return NoLayout;
}
@@ -1069,9 +1069,9 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w )
}
-TQWidget *WidgetFactory::layoutParent( TQLayout *tqlayout )
+TQWidget *WidgetFactory::layoutParent( TQLayout *layout )
{
- TQObject *o = TQT_TQOBJECT(tqlayout);
+ TQObject *o = TQT_TQOBJECT(layout);
while ( o ) {
if ( o->isWidgetType() )
return (TQWidget*)o;
@@ -1080,7 +1080,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
@@ -1469,7 +1469,7 @@ bool WidgetFactory::canResetProperty( TQObject *w, const TQString &propName )
bool WidgetFactory::resetProperty( TQObject *w, const TQString &propName )
{
- const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->
+ const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->
findProperty( propName, TRUE ), TRUE );
if (!p )
return FALSE;
@@ -1479,10 +1479,10 @@ 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::tqfromLatin1( "" ) );
+ return TQVariant( TQString::fromLatin1( "" ) );
} else if ( w->inherits( "CustomWidget" ) ) {
return TQVariant();
} else if ( propName == "frameworkCode" ) {
@@ -1496,10 +1496,10 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName )
TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propName )
{
- const TQMetaProperty *p = w->tqmetaObject()->
- property( w->tqmetaObject()->findProperty( propName, TRUE ), TRUE );
+ 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";
@@ -1536,8 +1536,8 @@ TQWidget *WidgetFactory::createCustomWidget( TQWidget *parent, const char *name,
TQVariant WidgetFactory::property( TQObject *w, const char *name )
{
- int id = w->tqmetaObject()->findProperty( name, TRUE );
- const TQMetaProperty* p = w->tqmetaObject()->property( id, TRUE );
+ int id = w->metaObject()->findProperty( name, TRUE );
+ const TQMetaProperty* p = w->metaObject()->property( id, TRUE );
if ( !p || !p->isValid() )
return MetaDataBase::fakeProperty( w, name );
return w->property( name );
@@ -1549,7 +1549,7 @@ void QDesignerLabel::updateBuddy()
if ( myBuddy.isEmpty() )
return;
- TQObjectList *l = tqtopLevelWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, myBuddy, FALSE, TRUE );
+ TQObjectList *l = topLevelWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, myBuddy, FALSE, TRUE );
if ( !l || !l->first() ) {
delete l;
return;
@@ -1601,13 +1601,13 @@ bool TQLayoutWidget::event( TQEvent *e )
/*
This function must be called on TQLayoutWidget creation and whenever
- the TQLayoutWidget's parent tqlayout changes (e.g., from a TQHBoxLayout
+ the TQLayoutWidget's parent layout changes (e.g., from a TQHBoxLayout
to a TQVBoxLayout), because of the (illogical) way layouting works.
*/
void TQLayoutWidget::updateSizePolicy()
{
if ( childrenListObject().isEmpty() || childrenListObject().count() == 0 ) {
- sp = TQWidget::tqsizePolicy();
+ sp = TQWidget::sizePolicy();
return;
}
@@ -1624,14 +1624,14 @@ void TQLayoutWidget::updateSizePolicy()
int ht = (int) TQSizePolicy::Preferred;
int vt = (int) TQSizePolicy::Preferred;
- if ( tqlayout() ) {
+ if ( layout() ) {
/*
- parentLayout is set to the parent tqlayout if there is one and if it is
+ parentLayout is set to the parent layout if there is one and if it is
top level, in which case layouting is illogical.
*/
TQLayout *parentLayout = 0;
if ( parent() && parent()->isWidgetType() ) {
- parentLayout = ((TQWidget *)parent())->tqlayout();
+ parentLayout = ((TQWidget *)parent())->layout();
if ( parentLayout &&
::tqqt_cast<TQLayoutWidget*>(parentLayout->mainWidget()) )
parentLayout = 0;
@@ -1640,7 +1640,7 @@ void TQLayoutWidget::updateSizePolicy()
TQObjectListIt it( childrenListObject() );
TQObject *o;
- if ( ::tqqt_cast<TQVBoxLayout*>(tqlayout()) ) {
+ if ( ::tqqt_cast<TQVBoxLayout*>(layout()) ) {
if ( ::tqqt_cast<TQHBoxLayout*>(parentLayout) )
vt = TQSizePolicy::Minimum;
else
@@ -1652,16 +1652,16 @@ void TQLayoutWidget::updateSizePolicy()
continue;
TQWidget *w = (TQWidget*)o;
- if ( !w->tqsizePolicy().mayGrowHorizontally() )
+ if ( !w->sizePolicy().mayGrowHorizontally() )
ht &= ~TQSizePolicy::Minimum;
- if ( !w->tqsizePolicy().mayShrinkHorizontally() )
+ if ( !w->sizePolicy().mayShrinkHorizontally() )
ht &= ~TQSizePolicy::Maximum;
- if ( w->tqsizePolicy().mayGrowVertically() )
+ if ( w->sizePolicy().mayGrowVertically() )
vt |= TQSizePolicy::Minimum;
- if ( w->tqsizePolicy().mayShrinkVertically() )
+ if ( w->sizePolicy().mayShrinkVertically() )
vt |= TQSizePolicy::Maximum;
}
- } else if ( ::tqqt_cast<TQHBoxLayout*>(tqlayout()) ) {
+ } else if ( ::tqqt_cast<TQHBoxLayout*>(layout()) ) {
if ( ::tqqt_cast<TQVBoxLayout*>(parentLayout) )
ht = TQSizePolicy::Minimum;
else
@@ -1673,16 +1673,16 @@ void TQLayoutWidget::updateSizePolicy()
continue;
TQWidget *w = (TQWidget*)o;
- if ( w->tqsizePolicy().mayGrowHorizontally() )
+ if ( w->sizePolicy().mayGrowHorizontally() )
ht |= TQSizePolicy::Minimum;
- if ( w->tqsizePolicy().mayShrinkHorizontally() )
+ if ( w->sizePolicy().mayShrinkHorizontally() )
ht |= TQSizePolicy::Maximum;
- if ( !w->tqsizePolicy().mayGrowVertically() )
+ if ( !w->sizePolicy().mayGrowVertically() )
vt &= ~TQSizePolicy::Minimum;
- if ( !w->tqsizePolicy().mayShrinkVertically() )
+ if ( !w->sizePolicy().mayShrinkVertically() )
vt &= ~TQSizePolicy::Maximum;
}
- } else if ( ::tqqt_cast<TQGridLayout*>(tqlayout()) ) {
+ } else if ( ::tqqt_cast<TQGridLayout*>(layout()) ) {
ht = TQSizePolicy::Fixed;
vt = TQSizePolicy::Fixed;
if ( parentLayout ) {
@@ -1698,30 +1698,30 @@ void TQLayoutWidget::updateSizePolicy()
continue;
TQWidget *w = (TQWidget*)o;
- if ( w->tqsizePolicy().mayGrowHorizontally() )
+ if ( w->sizePolicy().mayGrowHorizontally() )
ht |= TQSizePolicy::Minimum;
- if ( w->tqsizePolicy().mayShrinkHorizontally() )
+ if ( w->sizePolicy().mayShrinkHorizontally() )
ht |= TQSizePolicy::Maximum;
- if ( w->tqsizePolicy().mayGrowVertically() )
+ if ( w->sizePolicy().mayGrowVertically() )
vt |= TQSizePolicy::Minimum;
- if ( w->tqsizePolicy().mayShrinkVertically() )
+ if ( w->sizePolicy().mayShrinkVertically() )
vt |= TQSizePolicy::Maximum;
}
}
#ifdef USE_QT4
- if ( tqlayout()->expandingDirections() & TQSizePolicy::Horizontally )
+ if ( layout()->expanding() & TQSizePolicy::Horizontally )
#else // USE_QT4
- if ( tqlayout()->expanding() & TQSizePolicy::Horizontally )
+ if ( layout()->expanding() & TQSizePolicy::Horizontally )
#endif // USE_QT4
ht = TQSizePolicy::Expanding;
#ifdef USE_QT4
- if ( tqlayout()->expandingDirections() & TQSizePolicy::Vertically )
+ if ( layout()->expanding() & TQSizePolicy::Vertically )
#else // USE_QT4
- if ( tqlayout()->expanding() & TQSizePolicy::Vertically )
+ if ( layout()->expanding() & TQSizePolicy::Vertically )
#endif // USE_QT4
vt = TQSizePolicy::Expanding;
- tqlayout()->tqinvalidate();
+ layout()->invalidate();
}
sp = TQSizePolicy( (TQSizePolicy::SizeType) ht, (TQSizePolicy::SizeType) vt );
@@ -1734,8 +1734,8 @@ void CustomWidget::paintEvent( TQPaintEvent *e )
( (FormWindow*)parentWidget() )->paintGrid( this, e );
} else {
TQPainter p( this );
- p.fillRect( rect(), tqcolorGroup().dark() );
- p.setPen( tqcolorGroup().light() );
+ p.fillRect( rect(), colorGroup().dark() );
+ p.setPen( colorGroup().light() );
p.drawText( 2, 2, width() - 4, height() - 4, TQt::AlignAuto | TQt::AlignTop, cusw->className );
p.drawPixmap( ( width() - cusw->pixmap->width() ) / 2,
( height() - cusw->pixmap->height() ) / 2,
diff --git a/kdevdesigner/designer/widgetfactory.h b/kdevdesigner/designer/widgetfactory.h
index 1bb1f1f3..80c43f8f 100644
--- a/kdevdesigner/designer/widgetfactory.h
+++ b/kdevdesigner/designer/widgetfactory.h
@@ -78,13 +78,13 @@ public:
static TQWidget *create( int id, TQWidget *parent, const char *name = 0, bool init = TRUE,
const TQRect *rect = 0, Qt::Orientation orient = Qt::Horizontal );
- static TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type );
+ static TQLayout *createLayout( TQWidget *widget, TQLayout* layout, LayoutType type );
static void deleteLayout( TQWidget *widget );
static LayoutType layoutType( TQWidget *w );
- static LayoutType layoutType( TQWidget *w, TQLayout *&tqlayout );
- static LayoutType layoutType( TQLayout *tqlayout );
- static TQWidget *layoutParent( TQLayout *tqlayout );
+ static LayoutType layoutType( TQWidget *w, TQLayout *&layout );
+ static LayoutType layoutType( TQLayout *layout );
+ static TQWidget *layoutParent( TQLayout *layout );
static TQWidget* containerOfWidget( TQWidget *w );
static TQWidget* widgetOfContainer( TQWidget *w );
@@ -264,16 +264,16 @@ public:
CustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *cw )
: TQWidget( parent, name ), cusw( cw ) {
alwaysExpand = parentWidget() && parentWidget()->inherits( "FormWindow" );
- tqsetSizePolicy( cw->sizePolicy );
+ setSizePolicy( cw->sizePolicy );
if ( !alwaysExpand )
setBackgroundMode( PaletteDark );
}
- TQSize tqsizeHint() const {
- TQSize sh = cusw->tqsizeHint;
+ TQSize sizeHint() const {
+ TQSize sh = cusw->sizeHint;
if ( sh.isValid() )
return sh;
- return TQWidget::tqsizeHint();
+ return TQWidget::sizeHint();
}
TQString realClassName() { return cusw->className; }
diff --git a/kdevdesigner/designer/wizardeditor.ui b/kdevdesigner/designer/wizardeditor.ui
index 028a1341..84302d09 100644
--- a/kdevdesigner/designer/wizardeditor.ui
+++ b/kdevdesigner/designer/wizardeditor.ui
@@ -133,7 +133,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -201,7 +201,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/wizardeditorimpl.cpp b/kdevdesigner/designer/wizardeditorimpl.cpp
index 850cafef..5933793e 100644
--- a/kdevdesigner/designer/wizardeditorimpl.cpp
+++ b/kdevdesigner/designer/wizardeditorimpl.cpp
@@ -130,7 +130,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 );
@@ -149,7 +149,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 );
@@ -169,8 +169,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
@@ -189,7 +189,7 @@ 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
@@ -217,7 +217,7 @@ void WizardEditor::itemSelected( int index )
if ( index < 0 ) return;
// Called when TQt::Key_Enter was pressed.
// ListBoxRename has renamed the list item, so we only need to rename the page to the same name.
- TQString pn( i18n( "Rename page %1 of %2" ).tqarg( wizard->title( wizard->page( index ) ) ).tqarg( wizard->name() ) );
+ TQString pn( i18n( "Rename page %1 of %2" ).arg( wizard->title( wizard->page( index ) ) ).arg( wizard->name() ) );
RenameWizardPageCommand *cmd = new RenameWizardPageCommand( pn, formwindow, wizard, index, listBox->text( index ) );
commands.append( cmd );
}
@@ -248,6 +248,6 @@ void WizardEditor::itemDropped( TQListBoxItem * i )
int droppedItem = listBox->index( i );
//qDebug( "Moving page %d -> %d", draggedItem, droppedItem );
- MoveWizardPageCommand *cmd = new MoveWizardPageCommand( i18n( "Move Page %1 to %2 in %3" ).tqarg( draggedItem ).tqarg( droppedItem ).tqarg( wizard->name() ), formwindow, wizard, draggedItem, droppedItem );
+ MoveWizardPageCommand *cmd = new MoveWizardPageCommand( i18n( "Move Page %1 to %2 in %3" ).arg( draggedItem ).arg( droppedItem ).arg( wizard->name() ), formwindow, wizard, draggedItem, droppedItem );
commands.append( cmd );
}
diff --git a/kdevdesigner/designer/workspace.cpp b/kdevdesigner/designer/workspace.cpp
index 5f92b691..9e948107 100644
--- a/kdevdesigner/designer/workspace.cpp
+++ b/kdevdesigner/designer/workspace.cpp
@@ -48,7 +48,7 @@
#include <tqobjectlist.h>
#include <tqworkspace.h>
#include <tqpopupmenu.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include "qcompletionedit.h"
#include <klocale.h>
@@ -121,8 +121,8 @@ void WorkspaceItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column,
( !formFile->hasFormCode() || ( formFile->codeFileState() == FormFile::Deleted && formFile->formWindow() ) ) &&
parent() && parent()->parent() && ( (WorkspaceItem*)parent()->parent() )->project &&
( (WorkspaceItem*)parent()->parent() )->project->isCpp() ) {
- g.setColor( TQColorGroup::Text, listView()->tqpalette().disabled().color( TQColorGroup::Text) );
- g.setColor( TQColorGroup::HighlightedText, listView()->tqpalette().disabled().color( TQColorGroup::Text) );
+ g.setColor( TQColorGroup::Text, listView()->palette().disabled().color( TQColorGroup::Text) );
+ g.setColor( TQColorGroup::HighlightedText, listView()->palette().disabled().color( TQColorGroup::Text) );
} else {
g.setColor( TQColorGroup::Text, TQt::black );
}
@@ -419,9 +419,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/kdevdesigner/plugins/languageinterfaceimpl.cpp b/kdevdesigner/plugins/languageinterfaceimpl.cpp
index d761a9e7..2e4f9f20 100644
--- a/kdevdesigner/plugins/languageinterfaceimpl.cpp
+++ b/kdevdesigner/plugins/languageinterfaceimpl.cpp
@@ -231,7 +231,7 @@ void LanguageInterfaceImpl::preferedExtensions( TQMap<TQString, TQString> &exten
TQStrList LanguageInterfaceImpl::signalNames( TQObject *obj ) const
{
TQStrList sigs;
- sigs = obj->tqmetaObject()->signalNames( TRUE );
+ sigs = obj->metaObject()->signalNames( TRUE );
sigs.remove( "destroyed()" );
return sigs;
}
diff --git a/kdevdesigner/shared/parser.cpp b/kdevdesigner/shared/parser.cpp
index 1ba246bd..1fb2c5a7 100644
--- a/kdevdesigner/shared/parser.cpp
+++ b/kdevdesigner/shared/parser.cpp
@@ -68,5 +68,5 @@ TQString Parser::cleanArgs( const TQString &func )
}
res += ")";
- return TQString::tqfromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) );
+ return TQString::fromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) );
}
diff --git a/kdevdesigner/shared/ui2uib.cpp b/kdevdesigner/shared/ui2uib.cpp
index d4645eaa..5cff46e0 100644
--- a/kdevdesigner/shared/ui2uib.cpp
+++ b/kdevdesigner/shared/ui2uib.cpp
@@ -470,11 +470,11 @@ static void outputLayoutWidgetsSubLayout( TQMap<int, TQStringList>& buddies,
if ( subLayoutNo != -1 ) {
/*
- Remove the sub-tqlayout's Object_End marker, append the grid
+ Remove the sub-layout's Object_End marker, append the grid
cell and the correct name property, and put the Object_End
marker back.
*/
- out.tqdevice()->at( out.tqdevice()->at() - 1 );
+ out.device()->at( out.device()->at() - 1 );
outputGridCell( out, elem );
outputProperty( buddies, subLayoutNo, strings, out, nameElem );
out << (TQ_UINT8) Object_End;
diff --git a/kdevdesigner/shared/uib.cpp b/kdevdesigner/shared/uib.cpp
index 443df331..7072626a 100644
--- a/kdevdesigner/shared/uib.cpp
+++ b/kdevdesigner/shared/uib.cpp
@@ -31,8 +31,8 @@ static const char commonStrings[] =
"TQComboBox\0TQDialog\0TQFrame\0TQGridLayout\0TQGroupBox\0TQHBoxLayout\0TQLabel\0"
"TQLineEdit\0TQListView\0TQPushButton\0TQRadioButton\0TQVBoxLayout\0TQWidget\0"
"TextLabel1\0XPM.GZ\0accept\0autoDefault\0buddy\0caption\0clicked\0"
- "default\0destroy\0frameShadow\0frameShape\0tqgeometry\0init\0margin\0"
- "tqmaximumSize\0tqminimumSize\0name\0reject\0sizePolicy\0spacing\0text\0title\0"
+ "default\0destroy\0frameShadow\0frameShape\0geometry\0init\0margin\0"
+ "maximumSize\0minimumSize\0name\0reject\0sizePolicy\0spacing\0text\0title\0"
"toolTip\0unnamed\0whatsThis";
UibStrTable::UibStrTable()
diff --git a/kdevdesigner/shared/uib.h b/kdevdesigner/shared/uib.h
index 9f2090f7..e6a6b05f 100644
--- a/kdevdesigner/shared/uib.h
+++ b/kdevdesigner/shared/uib.h
@@ -128,7 +128,7 @@ inline TQString UibStrTable::asString( int offset ) const
{
if ( table[offset] == 0x7f ) {
TQDataStream in( table, IO_ReadOnly );
- in.tqdevice()->at( offset + 1 );
+ in.device()->at( offset + 1 );
TQString str;
in >> str;
return str;
diff --git a/kdevdesigner/shared/widgetdatabase.cpp b/kdevdesigner/shared/widgetdatabase.cpp
index 80e8c131..a37f5260 100644
--- a/kdevdesigner/shared/widgetdatabase.cpp
+++ b/kdevdesigner/shared/widgetdatabase.cpp
@@ -38,7 +38,7 @@
#include <tqstrlist.h>
#include <tqdict.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqcleanuphandler.h>
#include <tqfeatures.h>
@@ -735,7 +735,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/kdevdesigner/uilib/qwidgetfactory.cpp b/kdevdesigner/uilib/qwidgetfactory.cpp
index c61584a7..3dc55c01 100644
--- a/kdevdesigner/uilib/qwidgetfactory.cpp
+++ b/kdevdesigner/uilib/qwidgetfactory.cpp
@@ -33,7 +33,7 @@
#include "database2.h"
#include <tqdom.h>
#include <tqdir.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqmetaobject.h>
#include <domtool.h>
#include <uib.h>
@@ -76,14 +76,14 @@
#include <tqwizard.h>
#include <tqlcdnumber.h>
#include <tqprogressbar.h>
-#include <tqtextview.h>
-#include <tqtextbrowser.h>
+#include <textview.h>
+#include <textbrowser.h>
#include <tqdial.h>
#include <tqslider.h>
#include <tqframe.h>
#include <tqwidgetstack.h>
#include <tqtoolbox.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqscrollbar.h>
#include <tqmainwindow.h>
#include <tqsplitter.h>
@@ -682,7 +682,7 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in,
if ( name == "orientation" ) {
vertical = ( value == "Vertical" );
- } else if ( name == "tqsizeHint" ) {
+ } else if ( name == "sizeHint" ) {
w = value.toSize().width();
h = value.toSize().height();
} else if ( name == "sizeType" ) {
@@ -907,7 +907,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
{
TQObject *obj = 0;
TQWidget *widget = 0;
- TQLayout *tqlayout = 0;
+ TQLayout *layout = 0;
TQWidget *parentWidget = 0;
TQLayout *parentLayout = 0;
@@ -942,11 +942,11 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
type = VBox;
}
if ( parentLayout != 0 && parentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
- tqlayout = createLayout( 0, 0, type );
+ layout = createLayout( 0, 0, type );
} else {
- tqlayout = createLayout( parentWidget, parentLayout, type );
+ layout = createLayout( parentWidget, parentLayout, type );
}
- obj = TQT_TQOBJECT(tqlayout);
+ obj = TQT_TQOBJECT(layout);
} else if ( className == TQMENUBAR_OBJECT_NAME_STRING ) {
unpackCString( strings, in, className );
widget = ((TQMainWindow *) parent)->menuBar();
@@ -1047,7 +1047,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
case Object_PaletteProperty:
{
TQPalette palette;
- TQColorGroup tqcolorGroup;
+ TQColorGroup colorGroup;
TQColor color;
int role = -1;
@@ -1057,26 +1057,26 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
while ( !in.atEnd() && paletteTag != Palette_End ) {
switch ( paletteTag ) {
case Palette_Active:
- palette.setActive( tqcolorGroup );
+ palette.setActive( colorGroup );
role = -1;
break;
case Palette_Inactive:
- palette.setInactive( tqcolorGroup );
+ palette.setInactive( colorGroup );
role = -1;
break;
case Palette_Disabled:
- palette.setDisabled( tqcolorGroup );
+ palette.setDisabled( colorGroup );
role = -1;
break;
case Palette_Color:
role++;
in >> color;
- tqcolorGroup.setColor( (TQColorGroup::ColorRole) role,
+ colorGroup.setColor( (TQColorGroup::ColorRole) role,
color );
break;
case Palette_Pixmap:
unpackVariant( strings, in, value );
- tqcolorGroup.setBrush( (TQColorGroup::ColorRole) role,
+ colorGroup.setBrush( (TQColorGroup::ColorRole) role,
TQBrush(color, value.asPixmap()) );
break;
default:
@@ -1092,7 +1092,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
inputColumnOrRow( strings, in, obj, TRUE );
break;
case Object_Spacer:
- inputSpacer( strings, in, tqlayout );
+ inputSpacer( strings, in, layout );
break;
case Object_Separator:
((TQToolBar *) widget)->addSeparator();
@@ -1160,10 +1160,10 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
} else {
((TQBoxLayout *) parentLayout)->addWidget( widget );
}
- } else if ( tqlayout != 0 ) {
+ } else if ( layout != 0 ) {
if ( parentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
((TQGridLayout *) parentLayout)->addMultiCellLayout(
- tqlayout, row, row + rowspan - 1, column,
+ layout, row, row + rowspan - 1, column,
column + colspan - 1 );
}
}
@@ -1175,7 +1175,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
TQObject * /* connector */ , TQWidget *parent, const char *name )
{
#define END_OF_BLOCK() \
- ( in.atEnd() || in.tqdevice()->at() >= nextBlock )
+ ( in.atEnd() || in.device()->at() >= nextBlock )
TQ_UINT8 lf;
TQ_UINT8 cr;
@@ -1204,7 +1204,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
in >> blockType;
while ( !in.atEnd() && blockType != Block_End ) {
unpackUInt32( in, blockSize );
- TQIODevice::Offset nextBlock = in.tqdevice()->at() + blockSize;
+ TQIODevice::Offset nextBlock = in.device()->at() + blockSize;
switch ( blockType ) {
case Block_Actions:
@@ -1258,7 +1258,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
case Block_Functions:
// ###
qWarning( "Block_Functions not supported" );
- in.tqdevice()->at( nextBlock );
+ in.device()->at( nextBlock );
break;
case Block_Images:
{
@@ -1340,7 +1340,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
case Block_Variables:
// ###
qWarning( "Block_Variables not supported" );
- in.tqdevice()->at( nextBlock );
+ in.device()->at( nextBlock );
break;
case Block_Widget:
toplevel = (TQWidget *)
@@ -1568,7 +1568,7 @@ bool TQWidgetFactory::supportsWidget( const TQString &widget )
}
TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget *parent,
- TQLayout* tqlayout, const TQString &classNameArg )
+ TQLayout* layout, const TQString &classNameArg )
{
d->lastItem = 0;
TQDomElement n = e.firstChild().toElement();
@@ -1589,12 +1589,12 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
bool isTQLayoutWidget = FALSE;
if ( !className.isEmpty() ) {
- if ( !tqlayout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) {
+ if ( !layout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) {
className = TQWIDGET_OBJECT_NAME_STRING;
isTQLayoutWidget = TRUE;
}
- if ( tqlayout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) {
- // hide tqlayout widgets
+ if ( layout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) {
+ // hide layout widgets
w = parent;
} else {
obj = TQT_TQOBJECT(TQWidgetFactory::createWidget( className, parent, 0 ));
@@ -1605,16 +1605,16 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
toplevel = w;
if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) )
w = ( (TQMainWindow*)w )->centralWidget();
- if ( tqlayout ) {
- switch( layoutType( tqlayout ) ) {
+ if ( layout ) {
+ switch( layoutType( layout ) ) {
case HBox:
- ( (TQHBoxLayout*)tqlayout )->addWidget( w );
+ ( (TQHBoxLayout*)layout )->addWidget( w );
break;
case VBox:
- ( (TQVBoxLayout*)tqlayout )->addWidget( w );
+ ( (TQVBoxLayout*)layout )->addWidget( w );
break;
case Grid:
- ( (TQGridLayout*)tqlayout )->addMultiCellWidget( w, row, row + rowspan - 1,
+ ( (TQGridLayout*)layout )->addMultiCellWidget( w, row, row + rowspan - 1,
col, col + colspan - 1 );
break;
default:
@@ -1622,7 +1622,7 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
}
}
- tqlayout = 0;
+ layout = 0;
}
}
#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
@@ -1636,45 +1636,45 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
int idx = 0;
while ( !n.isNull() ) {
if ( n.tagName() == "spacer" ) {
- createSpacer( n, tqlayout );
+ createSpacer( n, layout );
} else if ( n.tagName() == "widget" ) {
TQMap< TQString, TQString> *oldDbControls = dbControls;
- createWidgetInternal( n, w, tqlayout, n.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) );
+ createWidgetInternal( n, w, layout, n.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) );
dbControls = oldDbControls;
} else if ( n.tagName() == "hbox" ) {
- TQLayout *parentLayout = tqlayout;
- if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
- tqlayout = createLayout( 0, 0, TQWidgetFactory::HBox, isTQLayoutWidget );
+ TQLayout *parentLayout = layout;
+ if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+ layout = createLayout( 0, 0, TQWidgetFactory::HBox, isTQLayoutWidget );
else
- tqlayout = createLayout( w, tqlayout, TQWidgetFactory::HBox, isTQLayoutWidget );
- obj = TQT_TQOBJECT(tqlayout);
+ layout = createLayout( w, layout, TQWidgetFactory::HBox, isTQLayoutWidget );
+ obj = TQT_TQOBJECT(layout);
n = n.firstChild().toElement();
if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
- ( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row,
+ ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row,
row + rowspan - 1, col, col + colspan - 1 );
continue;
} else if ( n.tagName() == "grid" ) {
- TQLayout *parentLayout = tqlayout;
- if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
- tqlayout = createLayout( 0, 0, TQWidgetFactory::Grid, isTQLayoutWidget );
+ TQLayout *parentLayout = layout;
+ if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+ layout = createLayout( 0, 0, TQWidgetFactory::Grid, isTQLayoutWidget );
else
- tqlayout = createLayout( w, tqlayout, TQWidgetFactory::Grid, isTQLayoutWidget );
- obj = TQT_TQOBJECT(tqlayout);
+ layout = createLayout( w, layout, TQWidgetFactory::Grid, isTQLayoutWidget );
+ obj = TQT_TQOBJECT(layout);
n = n.firstChild().toElement();
if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
- ( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row,
+ ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row,
row + rowspan - 1, col, col + colspan - 1 );
continue;
} else if ( n.tagName() == "vbox" ) {
- TQLayout *parentLayout = tqlayout;
- if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
- tqlayout = createLayout( 0, 0, TQWidgetFactory::VBox, isTQLayoutWidget );
+ TQLayout *parentLayout = layout;
+ if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+ layout = createLayout( 0, 0, TQWidgetFactory::VBox, isTQLayoutWidget );
else
- tqlayout = createLayout( w, tqlayout, TQWidgetFactory::VBox, isTQLayoutWidget );
- obj = TQT_TQOBJECT(tqlayout);
+ layout = createLayout( w, layout, TQWidgetFactory::VBox, isTQLayoutWidget );
+ obj = TQT_TQOBJECT(layout);
n = n.firstChild().toElement();
if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
- ( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row,
+ ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row,
row + rowspan - 1, col, col + colspan - 1 );
continue;
} else if ( n.tagName() == "property" && obj ) {
@@ -1728,47 +1728,47 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
return w;
}
-TQLayout *TQWidgetFactory::createLayout( TQWidget *widget, TQLayout* tqlayout,
+TQLayout *TQWidgetFactory::createLayout( TQWidget *widget, TQLayout* layout,
LayoutType type, bool isTQLayoutWidget )
{
int spacing = defSpacing;
int margin = defMargin;
- if ( tqlayout || !widget || isTQLayoutWidget )
+ if ( layout || !widget || isTQLayoutWidget )
margin = 0;
- if ( !tqlayout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
+ if ( !layout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
widget = ((TQTabWidget*)widget)->currentPage();
- if ( !tqlayout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) )
+ if ( !layout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) )
widget = ((TQWizard*)widget)->currentPage();
- if ( !tqlayout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
+ if ( !layout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
widget = ((TQWidgetStack*)widget)->visibleWidget();
- if ( !tqlayout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) )
+ if ( !layout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) )
widget = ((TQToolBox*)widget)->currentItem();
TQLayout *l = 0;
int align = 0;
- if ( !tqlayout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) {
+ if ( !layout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) {
TQGroupBox *gb = (TQGroupBox*)widget;
gb->setColumnLayout( 0, Qt::Vertical );
- tqlayout = gb->tqlayout();
- tqlayout->setMargin( 0 );
- tqlayout->setSpacing( 0 );
+ layout = gb->layout();
+ layout->setMargin( 0 );
+ layout->setSpacing( 0 );
align = TQt::AlignTop;
}
- if ( tqlayout ) {
+ if ( layout ) {
switch ( type ) {
case HBox:
- l = new TQHBoxLayout( tqlayout );
+ l = new TQHBoxLayout( layout );
break;
case VBox:
- l = new TQVBoxLayout( tqlayout );
+ l = new TQVBoxLayout( layout );
break;
case Grid:
- l = new TQGridLayout( tqlayout );
+ l = new TQGridLayout( layout );
break;
default:
return 0;
@@ -1788,19 +1788,19 @@ TQLayout *TQWidgetFactory::createLayout( TQWidget *widget, TQLayout* tqlayout,
return 0;
}
}
- l->tqsetAlignment( align );
+ l->setAlignment( align );
l->setMargin( margin );
l->setSpacing( spacing );
return l;
}
-TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *tqlayout ) const
+TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *layout ) const
{
- if ( tqlayout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
+ if ( layout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
return HBox;
- else if ( tqlayout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) )
+ else if ( layout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) )
return VBox;
- else if ( tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+ else if ( layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
return Grid;
return NoLayout;
}
@@ -1808,7 +1808,7 @@ TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *tqlayout ) co
void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop,
TQVariant value )
{
- int offset = obj->tqmetaObject()->findProperty( prop.ascii(), TRUE );
+ int offset = obj->metaObject()->findProperty( prop.ascii(), TRUE );
if ( offset != -1 ) {
if ( prop == "geometry" && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(toplevel) ) {
@@ -1819,7 +1819,7 @@ void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop,
if ( value.type() == TQVariant::String ||
value.type() == TQVariant::CString ) {
const TQMetaProperty *metaProp =
- obj->tqmetaObject()->property( offset, TRUE );
+ obj->metaObject()->property( offset, TRUE );
if ( metaProp != 0 && metaProp->isEnumType() ) {
if ( metaProp->isSetType() ) {
TQStrList flagsCStr;
@@ -1917,7 +1917,7 @@ void TQWidgetFactory::setProperty( TQObject* widget, const TQString &prop, const
setProperty( widget, prop, value );
}
-void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *tqlayout )
+void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *layout )
{
TQDomElement n = e.firstChild().toElement();
int row = e.attribute( "row" ).toInt();
@@ -1938,7 +1938,7 @@ void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *tqlayout )
orient = Qt::Vertical;
} else if ( prop == "sizeType" ) {
sizeType = stringToSizeType( n.firstChild().firstChild().toText().data() );
- } else if ( prop == "tqsizeHint" ) {
+ } else if ( prop == "sizeHint" ) {
w = n.firstChild().firstChild().firstChild().toText().data().toInt();
h = n.firstChild().firstChild().nextSibling().firstChild().toText().data().toInt();
}
@@ -1952,11 +1952,11 @@ void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *tqlayout )
colspan = 1;
TQSpacerItem *item = new TQSpacerItem( w, h, orient == Qt::Horizontal ? sizeType : TQSizePolicy::Minimum,
orient == Qt::Vertical ? sizeType : TQSizePolicy::Minimum );
- if ( tqlayout ) {
- if ( tqlayout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) )
- ( (TQBoxLayout*)tqlayout )->addItem( item );
+ if ( layout ) {
+ if ( layout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) )
+ ( (TQBoxLayout*)layout )->addItem( item );
else
- ( (TQGridLayout*)tqlayout )->addMultiCell( item, row, row + rowspan - 1, col, col + colspan - 1,
+ ( (TQGridLayout*)layout )->addMultiCell( item, row, row + rowspan - 1, col, col + colspan - 1,
orient == Qt::Horizontal ? TQt::AlignVCenter : TQt::AlignHCenter );
}
}
@@ -2140,16 +2140,16 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto
}
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->tqmetaObject()->signalNames( TRUE );
- TQStrList slotList = receiver->tqmetaObject()->slotNames( TRUE );
+ TQStrList signalList = sender->metaObject()->signalNames( TRUE );
+ TQStrList slotList = receiver->metaObject()->slotNames( TRUE );
// if this is a connection to a custom slot and we have a connector, try this as receiver
if ( slotList.find( conn.slot ) == -1 && (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(toplevel)) && connector ) {
- slotList = connector->tqmetaObject()->slotNames( TRUE );
+ slotList = connector->metaObject()->slotNames( TRUE );
receiver = connector;
}
diff --git a/kdevdesigner/uilib/qwidgetfactory.h b/kdevdesigner/uilib/qwidgetfactory.h
index c6770341..8f2b1427 100644
--- a/kdevdesigner/uilib/qwidgetfactory.h
+++ b/kdevdesigner/uilib/qwidgetfactory.h
@@ -66,12 +66,12 @@ private:
void loadImageCollection( const TQDomElement &e );
void loadConnections( const TQDomElement &e, TQObject *connector );
void loadTabOrder( const TQDomElement &e );
- TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout, const TQString &classNameArg );
- TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type, bool isTQLayoutWidget = FALSE );
+ TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* layout, const TQString &classNameArg );
+ TQLayout *createLayout( TQWidget *widget, TQLayout* layout, LayoutType type, bool isTQLayoutWidget = FALSE );
LayoutType layoutType( TQLayout *l ) const;
void setProperty( TQObject* widget, const TQString &prop, TQVariant value );
void setProperty( TQObject* widget, const TQString &prop, const TQDomElement &e );
- void createSpacer( const TQDomElement &e, TQLayout *tqlayout );
+ void createSpacer( const TQDomElement &e, TQLayout *layout );
TQImage loadFromCollection( const TQString &name );
TQPixmap loadPixmap( const TQString &name );
TQPixmap loadPixmap( const TQDomElement &e );