Rename obsolete tq methods to standard names

pull/1/head
Timothy Pearson 13 years ago
parent 1fc61c6e1d
commit cd3688b73b

@ -98,7 +98,7 @@ void ECPotentiometer::drawShape( TQPainter &p )
pa[1] = TQPoint( 4, -3 ); pa[1] = TQPoint( 4, -3 );
pa[2] = TQPoint( 4, 3 ); pa[2] = TQPoint( 4, 3 );
int space = m_pSlider->tqstyle().pixelMetric( TQStyle::PM_SliderSpaceAvailable, m_pSlider ); int space = m_pSlider->style().pixelMetric( TQStyle::PM_SliderSpaceAvailable, m_pSlider );
int base_y = _y + (( angleDegrees() == 0 || angleDegrees() == 270 ) ? 1 : -1) * int( space * m_sliderProp ); int base_y = _y + (( angleDegrees() == 0 || angleDegrees() == 270 ) ? 1 : -1) * int( space * m_sliderProp );
pa.translate( _x+16, base_y ); pa.translate( _x+16, base_y );

@ -42,18 +42,18 @@ ContextHelp::ContextHelp( KateMDI::ToolView * parent )
{ {
TQWhatsThis::add( this, i18n("Provides context-sensitive help relevant to the current editing being performed.") ); TQWhatsThis::add( this, i18n("Provides context-sensitive help relevant to the current editing being performed.") );
TQVBoxLayout *vtqlayout = new TQVBoxLayout( this, 0, 6 ); TQVBoxLayout *vlayout = new TQVBoxLayout( this, 0, 6 );
m_nameLbl = new TQLabel( this, "" ); m_nameLbl = new TQLabel( this, "" );
vtqlayout->addWidget(m_nameLbl); vlayout->addWidget(m_nameLbl);
vtqlayout->addSpacing(8); vlayout->addSpacing(8);
m_info = new TQTextBrowser( this, "" ); m_info = new TQTextBrowser( this, "" );
vtqlayout->addWidget(m_info); vlayout->addWidget(m_info);
m_info->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); m_info->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding );
TQSpacerItem *spacer3 = new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Preferred ); TQSpacerItem *spacer3 = new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Preferred );
vtqlayout->addItem(spacer3); vlayout->addItem(spacer3);
slotClear(); slotClear();
} }

@ -152,7 +152,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout8_2</cstring> <cstring>layout8_2</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">

@ -42,17 +42,17 @@ ItemEditor::ItemEditor( KateMDI::ToolView * parent )
{ {
TQWhatsThis::add( this, i18n("This allows editing of advanced properties of the selected item(s). Right click on the picture of the item to set the orientation.") ); TQWhatsThis::add( this, i18n("This allows editing of advanced properties of the selected item(s). Right click on the picture of the item to set the orientation.") );
TQVBoxLayout *vtqlayout = new TQVBoxLayout( this, 0, 6 ); TQVBoxLayout *vlayout = new TQVBoxLayout( this, 0, 6 );
m_nameLbl = new TQLabel( this, "" ); m_nameLbl = new TQLabel( this, "" );
vtqlayout->addWidget(m_nameLbl); vlayout->addWidget(m_nameLbl);
vtqlayout->addSpacing(8); vlayout->addSpacing(8);
propList = new PropertiesListView(this); propList = new PropertiesListView(this);
vtqlayout->addWidget(propList); vlayout->addWidget(propList);
TQWhatsThis::add(propList,i18n("<qt>Shows properties associated with the currently selected item(s).<p>Select a property to change its value. If multiple items are selected with different values then the property will appear greyed out, use ""Merge Properties"" to make them the same.<p>Select ""Defaults to set all properties to their default values""")); TQWhatsThis::add(propList,i18n("<qt>Shows properties associated with the currently selected item(s).<p>Select a property to change its value. If multiple items are selected with different values then the property will appear greyed out, use ""Merge Properties"" to make them the same.<p>Select ""Defaults to set all properties to their default values"""));
TQHBoxLayout *h1Layout = new TQHBoxLayout( vtqlayout, 4 ); TQHBoxLayout *h1Layout = new TQHBoxLayout( vlayout, 4 );
TQSpacerItem *spacer1 = new TQSpacerItem( 1, 1 ); TQSpacerItem *spacer1 = new TQSpacerItem( 1, 1 );
h1Layout->addItem(spacer1); h1Layout->addItem(spacer1);
@ -67,7 +67,7 @@ ItemEditor::ItemEditor( KateMDI::ToolView * parent )
h1Layout->addWidget(m_mergeBtn); h1Layout->addWidget(m_mergeBtn);
// Qt::Orientation widget stuff // Qt::Orientation widget stuff
TQHBoxLayout *h2Layout = new TQHBoxLayout( vtqlayout, 6 ); TQHBoxLayout *h2Layout = new TQHBoxLayout( vlayout, 6 );
TQSpacerItem *spacer2 = new TQSpacerItem( 1, 1 ); TQSpacerItem *spacer2 = new TQSpacerItem( 1, 1 );
h2Layout->addItem(spacer2); h2Layout->addItem(spacer2);
m_orientationWidget = new OrientationWidget(this); m_orientationWidget = new OrientationWidget(this);

@ -69,9 +69,9 @@ MicroSettingsDlg::MicroSettingsDlg( MicroSettings * microSettings, TQWidget *par
TQGroupBox * groupBox = new TQGroupBox( *it, m_pWidget->portsGroupBox ); TQGroupBox * groupBox = new TQGroupBox( *it, m_pWidget->portsGroupBox );
groupBox->setColumnLayout(0, Qt::Vertical ); groupBox->setColumnLayout(0, Qt::Vertical );
groupBox->tqlayout()->setSpacing( 6 ); groupBox->layout()->setSpacing( 6 );
groupBox->tqlayout()->setMargin( 11 ); groupBox->layout()->setMargin( 11 );
TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->tqlayout() ); TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->layout() );
groupBoxLayout->setAlignment( TQt::AlignTop ); groupBoxLayout->setAlignment( TQt::AlignTop );
// TODO: replace this with i18n( "the type", "Type (TRIS register):" ); // TODO: replace this with i18n( "the type", "Type (TRIS register):" );
@ -84,8 +84,8 @@ MicroSettingsDlg::MicroSettingsDlg( MicroSettings * microSettings, TQWidget *par
m_portStateEdit[row] = new KLineEdit( portState, groupBox ); m_portStateEdit[row] = new KLineEdit( portState, groupBox );
groupBoxLayout->addWidget( m_portStateEdit[row], 1, 1 ); groupBoxLayout->addWidget( m_portStateEdit[row], 1, 1 );
// (dynamic_cast<TQVBoxLayout*>(m_pWidget->portsGroupBox->tqlayout()))->insertWidget( row, groupBox ); // (dynamic_cast<TQVBoxLayout*>(m_pWidget->portsGroupBox->layout()))->insertWidget( row, groupBox );
(dynamic_cast<TQVBoxLayout*>(m_pWidget->portsGroupBox->tqlayout()))->addWidget( groupBox ); (dynamic_cast<TQVBoxLayout*>(m_pWidget->portsGroupBox->layout()))->addWidget( groupBox );
} }
//END Initialize initial port settings //END Initialize initial port settings

@ -30,7 +30,7 @@ const int _size = 44;
OrientationWidget::OrientationWidget(TQWidget *parent, const char *name) OrientationWidget::OrientationWidget(TQWidget *parent, const char *name)
: TQWidget(parent, name) : TQWidget(parent, name)
{ {
TQGridLayout *tqlayout = new TQGridLayout( this, 2, 4, 0, 4 ); TQGridLayout *layout = new TQGridLayout( this, 2, 4, 0, 4 );
p_activeFlowPart = 0l; p_activeFlowPart = 0l;
for ( int row=0; row<2; ++row ) for ( int row=0; row<2; ++row )
@ -39,7 +39,7 @@ OrientationWidget::OrientationWidget(TQWidget *parent, const char *name)
{ {
TQPushButton *btn = new TQPushButton(this); TQPushButton *btn = new TQPushButton(this);
m_toolBtn[row][col] = btn; m_toolBtn[row][col] = btn;
tqlayout->addWidget( btn, row, col ); layout->addWidget( btn, row, col );
btn->setFixedSize( _size+6, _size+6 ); btn->setFixedSize( _size+6, _size+6 );
// btn->setFlat(true); // btn->setFlat(true);
btn->setEnabled(false); btn->setEnabled(false);

@ -27,7 +27,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="3" rowspan="2" colspan="1"> <widget class="TQLayoutWidget" row="0" column="3" rowspan="2" colspan="1">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -92,7 +92,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
<property name="name"> <property name="name">
<cstring>tqlayout9</cstring> <cstring>layout9</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">

@ -215,7 +215,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout5</cstring> <cstring>layout5</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

@ -46,8 +46,8 @@ void PIEditor::valueChanged( TQVariant /*variant*/ )
PIBool::PIBool(TQString id, Variant *data, TQWidget *parent, const char *name ) PIBool::PIBool(TQString id, Variant *data, TQWidget *parent, const char *name )
: PIEditor( id, data, parent, name ) : PIEditor( id, data, parent, name )
{ {
TQHBoxLayout *tqlayout = new TQHBoxLayout(this); TQHBoxLayout *layout = new TQHBoxLayout(this);
tqlayout->setAutoAdd(true); layout->setAutoAdd(true);
m_comboBox = new KComboBox(this); m_comboBox = new KComboBox(this);
m_comboBox->insertItem( i18n("True"), 0 ); m_comboBox->insertItem( i18n("True"), 0 );
@ -82,8 +82,8 @@ void PIBool::valueChanged( TQVariant /*variant*/ )
PIColor::PIColor(TQString id, Variant *data, TQWidget *parent, const char *name ) PIColor::PIColor(TQString id, Variant *data, TQWidget *parent, const char *name )
: PIEditor(id,data,parent, name) : PIEditor(id,data,parent, name)
{ {
TQHBoxLayout *tqlayout = new TQHBoxLayout(this); TQHBoxLayout *layout = new TQHBoxLayout(this);
tqlayout->setAutoAdd(true); layout->setAutoAdd(true);
m_combo = new ColorCombo( (ColorCombo::ColorScheme)m_data->colorScheme(), this ); m_combo = new ColorCombo( (ColorCombo::ColorScheme)m_data->colorScheme(), this );
m_combo->setColor(m_data->value().toColor()); m_combo->setColor(m_data->value().toColor());
@ -117,8 +117,8 @@ void PIColor::valueChanged( TQVariant /*variant*/ )
PIDouble::PIDouble(TQString id, Variant *data, TQWidget *parent, const char *name ) PIDouble::PIDouble(TQString id, Variant *data, TQWidget *parent, const char *name )
: PIEditor(id,data,parent, name) : PIEditor(id,data,parent, name)
{ {
TQHBoxLayout *tqlayout = new TQHBoxLayout(this); TQHBoxLayout *layout = new TQHBoxLayout(this);
tqlayout->setAutoAdd(true); layout->setAutoAdd(true);
spin = new DoubleSpinBox(m_data->minValue(),m_data->maxValue(),m_data->minAbsValue(),m_data->value().toDouble(),m_data->unit(),this); spin = new DoubleSpinBox(m_data->minValue(),m_data->maxValue(),m_data->minAbsValue(),m_data->value().toDouble(),m_data->unit(),this);
@ -145,8 +145,8 @@ void PIDouble::valueChanged( TQVariant /*variant*/ )
PIFilename::PIFilename(TQString id, Variant *data, TQWidget *parent, const char *name ) PIFilename::PIFilename(TQString id, Variant *data, TQWidget *parent, const char *name )
: PIEditor(id,data,parent, name) : PIEditor(id,data,parent, name)
{ {
TQHBoxLayout *tqlayout = new TQHBoxLayout(this); TQHBoxLayout *layout = new TQHBoxLayout(this);
tqlayout->setAutoAdd(true); layout->setAutoAdd(true);
m_combo = 0L; m_combo = 0L;
if( m_data->allowed().count() == 0 ) if( m_data->allowed().count() == 0 )
@ -196,8 +196,8 @@ void PIFilename::valueChanged( TQVariant /*variant*/ )
PIInt::PIInt( const TQString &id, Variant *data, TQWidget *parent, const char *name ) PIInt::PIInt( const TQString &id, Variant *data, TQWidget *parent, const char *name )
: PIEditor( id, data, parent, name ) : PIEditor( id, data, parent, name )
{ {
TQHBoxLayout *tqlayout = new TQHBoxLayout(this); TQHBoxLayout *layout = new TQHBoxLayout(this);
tqlayout->setAutoAdd(true); layout->setAutoAdd(true);
spin = new KIntSpinBox( (int)m_data->minValue(), (int)m_data->maxValue(), 1, m_data->value().toInt(), 10, this ); spin = new KIntSpinBox( (int)m_data->minValue(), (int)m_data->maxValue(), 1, m_data->value().toInt(), 10, this );
@ -224,8 +224,8 @@ void PIInt::valueChanged( TQVariant /*variant*/ )
PILineEdit::PILineEdit(TQString id, Variant *data, TQWidget *parent, const char *name) PILineEdit::PILineEdit(TQString id, Variant *data, TQWidget *parent, const char *name)
: PIEditor( id, data, parent, name) : PIEditor( id, data, parent, name)
{ {
TQHBoxLayout *tqlayout = new TQHBoxLayout(this); TQHBoxLayout *layout = new TQHBoxLayout(this);
tqlayout->setAutoAdd(true); layout->setAutoAdd(true);
m_edit = new KLineEdit( m_data->value().toString() , this ); m_edit = new KLineEdit( m_data->value().toString() , this );
connect(m_edit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(slotEditTextChanged())); connect(m_edit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(slotEditTextChanged()));
} }
@ -251,8 +251,8 @@ void PILineEdit::valueChanged( TQVariant /*variant*/ )
PIStringCombo::PIStringCombo(TQString id, Variant *data, TQWidget *parent, const char *name) PIStringCombo::PIStringCombo(TQString id, Variant *data, TQWidget *parent, const char *name)
: PIEditor( id, data, parent, name) : PIEditor( id, data, parent, name)
{ {
TQHBoxLayout *tqlayout = new TQHBoxLayout(this); TQHBoxLayout *layout = new TQHBoxLayout(this);
tqlayout->setAutoAdd(true); layout->setAutoAdd(true);
m_combo = new KComboBox( this ); m_combo = new KComboBox( this );
m_combo->insertStringList(m_data->allowed()); m_combo->insertStringList(m_data->allowed());

@ -165,8 +165,8 @@ LinkerOptionsDlg::LinkerOptionsDlg( LinkerOptions * linkingOptions, TQWidget *pa
delete m_pWidget->m_pExternalLibraries; delete m_pWidget->m_pExternalLibraries;
m_pWidget->m_pExternalLibraries = new KEditListBox( i18n("Link libraries outside project"), m_pExternalLibraryRequester->customEditor(), m_pWidget ); m_pWidget->m_pExternalLibraries = new KEditListBox( i18n("Link libraries outside project"), m_pExternalLibraryRequester->customEditor(), m_pWidget );
m_pWidget->m_pExternalLibraries->tqlayout()->setMargin(11); m_pWidget->m_pExternalLibraries->layout()->setMargin(11);
(dynamic_cast<TQGridLayout*>(m_pWidget->tqlayout()))->addMultiCellWidget( m_pWidget->m_pExternalLibraries, 7, 7, 0, 1 ); (dynamic_cast<TQGridLayout*>(m_pWidget->layout()))->addMultiCellWidget( m_pWidget->m_pExternalLibraries, 7, 7, 0, 1 );
#if defined(KDE_MAKE_VERSION) #if defined(KDE_MAKE_VERSION)
# if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0) # if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0)

@ -1030,7 +1030,7 @@ void ICNDocument::copy()
data.addNodes( nodeList ); data.addNodes( nodeList );
data.addConnectors( connectorList ); data.addConnectors( connectorList );
KApplication::tqclipboard()->setText( data.toXML(), TQClipboard::Clipboard ); KApplication::clipboard()->setText( data.toXML(), TQClipboard::Clipboard );
} }
void ICNDocument::selectAll() void ICNDocument::selectAll()

@ -313,11 +313,11 @@ bool Item::mouseDoubleClickEvent( const EventInfo &eventInfo )
KDialogBase *dlg = new KDialogBase( 0l, "", true, v->editorCaption(), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::User1, KDialogBase::Ok, false, KStdGuiItem::clear() ); KDialogBase *dlg = new KDialogBase( 0l, "", true, v->editorCaption(), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::User1, KDialogBase::Ok, false, KStdGuiItem::clear() );
TQFrame *frame = dlg->makeMainWidget(); TQFrame *frame = dlg->makeMainWidget();
TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, dlg->spacingHint() ); TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, dlg->spacingHint() );
KTextEdit *textEdit = new KTextEdit( frame ); KTextEdit *textEdit = new KTextEdit( frame );
textEdit->setTextFormat( PlainText ); textEdit->setTextFormat( PlainText );
textEdit->setText( v->value().toString() ); textEdit->setText( v->value().toString() );
tqlayout->addWidget( textEdit, 10 ); layout->addWidget( textEdit, 10 );
textEdit->setFocus(); textEdit->setFocus();
connect( dlg, TQT_SIGNAL( user1Clicked() ), textEdit, TQT_SLOT( clear() ) ); connect( dlg, TQT_SIGNAL( user1Clicked() ), textEdit, TQT_SLOT( clear() ) );
dlg->setMinimumWidth( 600 ); dlg->setMinimumWidth( 600 );

@ -406,7 +406,7 @@ void ItemDocument::cut()
void ItemDocument::paste() void ItemDocument::paste()
{ {
TQString xml = KApplication::tqclipboard()->text( TQClipboard::Clipboard ); TQString xml = KApplication::clipboard()->text( TQClipboard::Clipboard );
if ( xml.isEmpty() ) if ( xml.isEmpty() )
return; return;

@ -508,7 +508,7 @@ void Sidebar::restoreSession (KConfig *config)
} }
// then: remove this items from the button bar // then: remove this items from the button bar
// do this backwards, to minimize the retqlayout efforts // do this backwards, to minimize the relayout efforts
for (int i=m_toolviews.size()-1; i >= (int)firstWrong; --i) for (int i=m_toolviews.size()-1; i >= (int)firstWrong; --i)
{ {
removeTab (m_widgetToId[m_toolviews[i]]); removeTab (m_widgetToId[m_toolviews[i]]);

@ -29,11 +29,11 @@ ViewContainer::ViewContainer( const TQString & caption, KTechlab * ktechlab, TQW
if (ktechlab) if (ktechlab)
connect( ktechlab, TQT_SIGNAL(needUpdateCaptions()), this, TQT_SLOT(updateCaption()) ); connect( ktechlab, TQT_SIGNAL(needUpdateCaptions()), this, TQT_SLOT(updateCaption()) );
TQHBoxLayout *tqlayout = new TQHBoxLayout(this); TQHBoxLayout *layout = new TQHBoxLayout(this);
m_baseViewArea = new ViewArea( this, this, 0, "viewarea_0" ); m_baseViewArea = new ViewArea( this, this, 0, "viewarea_0" );
connect( m_baseViewArea, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(baseViewAreaDestroyed(TQObject* )) ); connect( m_baseViewArea, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(baseViewAreaDestroyed(TQObject* )) );
tqlayout->addWidget(m_baseViewArea); layout->addWidget(m_baseViewArea);
m_activeViewArea = 0; m_activeViewArea = 0;
b_focused = false; b_focused = false;

@ -68,7 +68,7 @@ public:
*/ */
ViewArea *createViewArea( Position position, uint id ); ViewArea *createViewArea( Position position, uint id );
/** /**
* Adds the given View to the main part of the tqlayout * Adds the given View to the main part of the layout
*/ */
void setView( View *view ); void setView( View *view );
/** /**
@ -197,7 +197,7 @@ public:
*/ */
void setIdUsed( int id ); void setIdUsed( int id );
/** /**
* Writes the state of the View Container (tqlayout of views and view URLs) * Writes the state of the View Container (layout of views and view URLs)
* to the given KConfig. Doesn't change the group - so preset it if * to the given KConfig. Doesn't change the group - so preset it if
* needed! * needed!
*/ */

Loading…
Cancel
Save