Rename obsolete tq methods to standard names

pull/1/head
Timothy Pearson 13 years ago
parent 5183781c5d
commit ba335c4be7

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -40,7 +40,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@ -73,7 +73,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@ -186,7 +186,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">

@ -29,10 +29,10 @@ K3bCddbMultiEntriesDialog::K3bCddbMultiEntriesDialog( TQWidget* parent, const ch
: KDialogBase( Plain, i18n("CDDB Database Entry"), Ok|Cancel, Ok, parent, name )
{
TQFrame* frame = plainPage();
TQVBoxLayout* tqlayout = new TQVBoxLayout( frame );
tqlayout->setAutoAdd( true );
tqlayout->setSpacing( spacingHint() );
tqlayout->setMargin( 0 );
TQVBoxLayout* layout = new TQVBoxLayout( frame );
layout->setAutoAdd( true );
layout->setSpacing( spacingHint() );
layout->setMargin( 0 );
TQLabel* infoLabel = new TQLabel( i18n("K3b found multiple inexact CDDB entries. Please select one."), frame );
infoLabel->setAlignment( WordBreak );

@ -192,7 +192,7 @@ TQStringList K3bProcess::splitOutput( char* data, int len,
// check if line ends with a newline
// if not save the last line because it is not finished
TQChar c = buffer.right(1).at(0);
bool hasUnfinishedLine = ( c != '\n' && c != '\r' && c != TQChar(46) ); // What is tqunicode 46?? It is printed as a point
bool hasUnfinishedLine = ( c != '\n' && c != '\r' && c != TQChar(46) ); // What is unicode 46?? It is printed as a point
if( hasUnfinishedLine ) {
kdDebug() << "(K3bProcess) found unfinished line: '" << lines.last() << "'" << endl;
kdDebug() << "(K3bProcess) last char: '" << buffer.right(1) << "'" << endl;

@ -1,9 +1,9 @@
<!--
This document describes the tqlayout of the toc.xml file in a K3b image archive.
A K3b image archive is a TAR archive with a simple tqlayout as follows.
This document describes the layout of the toc.xml file in a K3b image archive.
A K3b image archive is a TAR archive with a simple layout as follows.
Every K3b image archive contains the toc.xml file as described in this document
which describes the tqlayout of the CD or DVD saved in the K3b image archive.
which describes the layout of the CD or DVD saved in the K3b image archive.
Additionally the K3b image archive contains an arbitrary number of files which
contain the CD/DVD sector data. These files are referenced in the elements of
type "file".

@ -205,7 +205,7 @@ void K3bCutComboBox::resizeEvent( TQResizeEvent* e )
void K3bCutComboBox::cutText()
{
d->width = TQStyle::visualRect( tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, this,
d->width = TQStyle::visualRect( style().querySubControlMetrics(TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxEditField), this ).width();
for( int i = 0; i < (int)d->originalItems.count(); ++i ) {

@ -448,8 +448,8 @@ void K3bListViewItem::paintProgressBar( TQPainter* p, const TQColorGroup& cgh, i
// some styles use the widget's geometry
s_dummyProgressBar->setGeometry( r );
listView()->tqstyle().drawControl(TQStyle::CE_ProgressBarContents, &dbPainter, s_dummyProgressBar, r, cgh, flags );
listView()->tqstyle().drawControl(TQStyle::CE_ProgressBarLabel, &dbPainter, s_dummyProgressBar, r, cgh, flags );
listView()->style().drawControl(TQStyle::CE_ProgressBarContents, &dbPainter, s_dummyProgressBar, r, cgh, flags );
listView()->style().drawControl(TQStyle::CE_ProgressBarLabel, &dbPainter, s_dummyProgressBar, r, cgh, flags );
// now we really paint the progress in the listview
p->drawPixmap( 0, 0, *doubleBuffer );
@ -508,7 +508,7 @@ void K3bCheckListViewItem::paintK3bCell( TQPainter* p, const TQColorGroup& cg, i
if( col == 0 ) {
if( m_checked ) {
TQRect r( 0, marginVertical(), width, /*listView()->tqstyle().pixelMetric( TQStyle::PM_CheckListButtonSize )*/height()-2*marginVertical() );
TQRect r( 0, marginVertical(), width, /*listView()->style().pixelMetric( TQStyle::PM_CheckListButtonSize )*/height()-2*marginVertical() );
TQStyle::SFlags flags = TQStyle::Style_Default;
if( listView()->isEnabled() )
@ -520,7 +520,7 @@ void K3bCheckListViewItem::paintK3bCell( TQPainter* p, const TQColorGroup& cg, i
else
flags |= TQStyle::Style_Off;
listView()->tqstyle().tqdrawPrimitive( TQStyle::PE_CheckMark, p, r, cg, flags );
listView()->style().tqdrawPrimitive( TQStyle::PE_CheckMark, p, r, cg, flags );
}
}
}

@ -59,8 +59,8 @@ TQSize K3bMsfEdit::sizeHint() const
TQFontMetrics fm( font() );
int w = fm.width( "00:00:00" );
int wx = fm.width( ' ' )*2;
int frame = tqstyle().pixelMetric( TQStyle::PM_SpinBoxFrameWidth );
return tqstyle().tqsizeFromContents(TQStyle::CT_SpinBox, this,
int frame = style().pixelMetric( TQStyle::PM_SpinBoxFrameWidth );
return style().tqsizeFromContents(TQStyle::CT_SpinBox, this,
TQSize( w + wx + downRect().width() + frame*2,
h + frame*2).
expandedTo( TQApplication::globalStrut() ));

@ -21,7 +21,7 @@
#include <k3b_export.h>
/**
* @short A replacement for TQLabel that supports richtext and proper tqlayout management
* @short A replacement for TQLabel that supports richtext and proper layout management
*
* @author Waldo Bastian <bastian@kde.org>
*/

@ -60,7 +60,7 @@ K3bToolBoxSeparator::K3bToolBoxSeparator( K3bToolBox* parent )
TQSize K3bToolBoxSeparator::sizeHint() const
{
int extent = tqstyle().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
int extent = style().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
this );
return TQSize( extent, 0 );
}
@ -71,7 +71,7 @@ void K3bToolBoxSeparator::paintEvent( TQPaintEvent* )
TQPainter p( this );
TQStyle::SFlags flags = TQStyle::Style_Default|TQStyle::Style_Horizontal;
tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
style().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
colorGroup(), flags );
}

@ -68,7 +68,7 @@ void K3bToolButton::drawButton( TQPainter* p )
if( isEnabled() )
arrowFlags |= TQStyle::Style_Enabled;
tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, p,
style().tqdrawPrimitive(TQStyle::PE_ArrowDown, p,
TQRect(width()-7, height()-7, 7, 7), colorGroup(),
arrowFlags, TQStyleOption() );
}

@ -88,7 +88,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<hbox>
<property name="name">

@ -48,7 +48,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@ -125,7 +125,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<grid>
<property name="name">
@ -200,7 +200,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout12</cstring>
<cstring>layout12</cstring>
</property>
<hbox>
<property name="name">
@ -237,7 +237,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout11</cstring>
<cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@ -326,7 +326,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">

@ -43,7 +43,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">

@ -33,7 +33,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@ -110,7 +110,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<grid>
<property name="name">
@ -196,7 +196,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<hbox>
<property name="name">

@ -30,7 +30,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@ -55,7 +55,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<grid>
<property name="name">

@ -104,7 +104,7 @@ K3bAudioMetainfoRenamerPluginWidget::K3bAudioMetainfoRenamerPluginWidget( K3bDoc
d->viewFiles->addColumn( i18n("Old Name") );
d->viewFiles->setNoItemText( i18n("Please click the Scan button to search for renameable files.") );
// tqlayout
// layout
TQVBoxLayout* box = new TQVBoxLayout( this );
box->setMargin( 0 );
box->setSpacing( KDialog::spacingHint() );

@ -194,7 +194,7 @@ K3bAudioPlayer::K3bAudioPlayer( TQWidget* parent, const char* name )
m_updateTimer = new TQTimer( this );
// ------------------------------------------------------------------------
// tqlayout
// layout
// ------------------------------------------------------------------------
TQGridLayout* grid = new TQGridLayout( this );
grid->setSpacing( 2 );

@ -51,7 +51,7 @@ K3bContentsView::~K3bContentsView()
void K3bContentsView::setMainWidget( TQWidget* w )
{
m_centerWidget = w;
((TQVBoxLayout*)tqlayout())->addWidget( w );
((TQVBoxLayout*)layout())->addWidget( w );
}

@ -156,7 +156,7 @@ void K3bDebuggingOutputDialog::slotUser1()
void K3bDebuggingOutputDialog::slotUser2()
{
TQApplication::tqclipboard()->setText( debugView->text(), TQClipboard::Clipboard );
TQApplication::clipboard()->setText( debugView->text(), TQClipboard::Clipboard );
}
#include "k3bdebuggingoutputdialog.moc"

@ -175,7 +175,7 @@ void K3bFileTreeComboBox::popup()
y = y - h - height();
TQRect rect =
tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
style().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxListBoxPopup,
TQStyleOption( x, y, w, h ) );
// work around older styles that don't implement the combobox
@ -274,7 +274,7 @@ bool K3bFileTreeComboBox::eventFilter( TQObject* o, TQEvent* e )
else if( e->type() == TQEvent::MouseButtonPress ) {
TQMouseEvent* me = (TQMouseEvent*)e;
if ( !TQT_TQRECT_OBJECT(m_fileTreeView->rect()).contains( me->pos() ) ) {
TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQRect arrowRect = style().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxArrow);
arrowRect = TQStyle::visualRect(arrowRect, this);
@ -308,7 +308,7 @@ void K3bFileTreeComboBox::mousePressEvent( TQMouseEvent* e )
return;
}
TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQRect arrowRect = style().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxArrow);
arrowRect = TQStyle::visualRect(arrowRect, this);
@ -356,13 +356,13 @@ void K3bFileTreeComboBox::paintEvent( TQPaintEvent* )
// bool reverse = TQApplication::reverseLayout();
tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
style().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
flags, TQStyle::SC_All,
(d->poppedUp ?
TQStyle::SC_ComboBoxArrow :
TQStyle::SC_None ));
TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQRect re = style().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxEditField );
re = TQStyle::visualRect(re, this);
p.setClipRect( re );

@ -238,7 +238,7 @@ void K3bDeviceBranchViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, i
textheight++;
if ( textheight < height() ) {
int w = listView()->treeStepSize() / 2;
listView()->tqstyle().drawComplexControl( TQStyle::CC_ListView, p, listView(),
listView()->style().drawComplexControl( TQStyle::CC_ListView, p, listView(),
TQRect( 0, textheight, w + 1, height() - textheight + 1 ), cg,
TQStyle::Style_Enabled,
TQStyle::SC_ListViewExpand,

@ -63,15 +63,15 @@ KActionCollection* K3bFileView::actionCollection() const
void K3bFileView::setupGUI()
{
TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
// tqlayout->setAutoAdd( true );
TQVBoxLayout* layout = new TQVBoxLayout( this );
// layout->setAutoAdd( true );
m_dirOp = new K3bDirOperator( KURL::fromPathOrURL(TQDir::home().absPath()), this );
m_toolBox = new K3bToolBox( this );
tqlayout->addWidget( m_toolBox );
tqlayout->addWidget( m_dirOp );
tqlayout->setStretchFactor( m_dirOp, 1 );
layout->addWidget( m_toolBox );
layout->addWidget( m_dirOp );
layout->setStretchFactor( m_dirOp, 1 );
// setup actions
KAction* actionHome = m_dirOp->actionCollection()->action("home");

@ -82,7 +82,7 @@ K3bInteractionDialog::K3bInteractionDialog( TQWidget* parent,
// settings buttons
// ---------------------------------------------------------------------------------------------------
if( !m_configGroup.isEmpty() ) {
TQHBoxLayout* tqlayout2 = new TQHBoxLayout( 0, 0, spacingHint(), "tqlayout2");
TQHBoxLayout* layout2 = new TQHBoxLayout( 0, 0, spacingHint(), "layout2");
m_buttonLoadSettings = new K3bToolButton( /*i18n("User Defaults"), */this );
((K3bToolButton*)m_buttonLoadSettings)->setIconSet( SmallIconSet( "revert" ) );
TQPopupMenu* userDefaultsPopup = new TQPopupMenu( m_buttonLoadSettings );
@ -91,13 +91,13 @@ K3bInteractionDialog::K3bInteractionDialog( TQWidget* parent,
userDefaultsPopup->insertItem( i18n("Load last used settings"), this, TQT_SLOT(slotLoadLastSettings()) );
((TQToolButton*)m_buttonLoadSettings)->setPopup( userDefaultsPopup );
((K3bToolButton*)m_buttonLoadSettings)->setInstantMenu( true );
tqlayout2->addWidget( m_buttonLoadSettings );
layout2->addWidget( m_buttonLoadSettings );
m_buttonSaveSettings = new TQToolButton( /*i18n("Save User Defaults"), */this, "m_buttonSaveSettings" );
((TQToolButton*)m_buttonSaveSettings)->setIconSet( SmallIconSet( "filesave" ) );
tqlayout2->addWidget( m_buttonSaveSettings );
layout2->addWidget( m_buttonSaveSettings );
mainGrid->addLayout( tqlayout2, 2, 0 );
mainGrid->addLayout( layout2, 2, 0 );
}
TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
@ -106,7 +106,7 @@ K3bInteractionDialog::K3bInteractionDialog( TQWidget* parent,
// action buttons
// ---------------------------------------------------------------------------------------------------
TQHBoxLayout* tqlayout5 = new TQHBoxLayout( 0, 0, spacingHint(), "tqlayout5");
TQHBoxLayout* layout5 = new TQHBoxLayout( 0, 0, spacingHint(), "layout5");
if( buttonMask & START_BUTTON ) {
KGuiItem startItem = KStdGuiItem::ok();
@ -149,33 +149,33 @@ K3bInteractionDialog::K3bInteractionDialog( TQWidget* parent,
case 0: // KDE default
default:
if ( m_buttonStart )
tqlayout5->addWidget( m_buttonStart );
layout5->addWidget( m_buttonStart );
if ( m_buttonSave )
tqlayout5->addWidget( m_buttonSave );
layout5->addWidget( m_buttonSave );
if ( m_buttonCancel )
tqlayout5->addWidget( m_buttonCancel );
layout5->addWidget( m_buttonCancel );
break;
case 1: // something different
if ( m_buttonCancel )
tqlayout5->addWidget( m_buttonCancel );
layout5->addWidget( m_buttonCancel );
if ( m_buttonSave )
tqlayout5->addWidget( m_buttonSave );
layout5->addWidget( m_buttonSave );
if ( m_buttonStart )
tqlayout5->addWidget( m_buttonStart );
layout5->addWidget( m_buttonStart );
break;
case 2: // GTK-Style
if ( m_buttonSave )
tqlayout5->addWidget( m_buttonSave );
layout5->addWidget( m_buttonSave );
if ( m_buttonCancel )
tqlayout5->addWidget( m_buttonCancel );
layout5->addWidget( m_buttonCancel );
if ( m_buttonStart )
tqlayout5->addWidget( m_buttonStart );
layout5->addWidget( m_buttonStart );
break;
}
mainGrid->addLayout( tqlayout5, 2, 2 );
mainGrid->addLayout( layout5, 2, 2 );
mainGrid->setRowStretch( 1, 1 );

@ -198,28 +198,28 @@ void K3bJobProgressDialog::setupGUI()
mainLayout->addWidget( progressHeaderFrame );
// ------------------------------------------------------------------------------------------
TQHBoxLayout* tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3");
TQHBoxLayout* layout3 = new TQHBoxLayout( 0, 0, 6, "layout3");
m_labelSubTask = new KCutLabel( this, "m_labelSubTask" );
tqlayout3->addWidget( m_labelSubTask );
layout3->addWidget( m_labelSubTask );
m_labelSubProcessedSize = new TQLabel( this, "m_labelSubProcessedSize" );
m_labelSubProcessedSize->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
tqlayout3->addWidget( m_labelSubProcessedSize );
mainLayout->addLayout( tqlayout3 );
layout3->addWidget( m_labelSubProcessedSize );
mainLayout->addLayout( layout3 );
m_progressSubPercent = new KProgress( this, "m_progressSubPercent" );
mainLayout->addWidget( m_progressSubPercent );
TQHBoxLayout* tqlayout4 = new TQHBoxLayout( 0, 0, 6, "tqlayout4");
TQHBoxLayout* layout4 = new TQHBoxLayout( 0, 0, 6, "layout4");
TQLabel* textLabel5 = new TQLabel( i18n("Overall progress:"), this, "textLabel5" );
tqlayout4->addWidget( textLabel5 );
layout4->addWidget( textLabel5 );
m_labelProcessedSize = new TQLabel( this, "m_labelProcessedSize" );
m_labelProcessedSize->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
tqlayout4->addWidget( m_labelProcessedSize );
mainLayout->addLayout( tqlayout4 );
layout4->addWidget( m_labelProcessedSize );
mainLayout->addLayout( layout4 );
m_progressPercent = new KProgress( this, "m_progressPercent" );
mainLayout->addWidget( m_progressPercent );
@ -237,18 +237,18 @@ void K3bJobProgressDialog::setupGUI()
line2->setFrameShadow( TQFrame::Sunken );
mainLayout->addWidget( line2 );
TQHBoxLayout* tqlayout5 = new TQHBoxLayout( 0, 0, 6, "tqlayout5");
TQHBoxLayout* layout5 = new TQHBoxLayout( 0, 0, 6, "layout5");
TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
tqlayout5->addItem( spacer );
layout5->addItem( spacer );
m_buttonCancel = new KPushButton( KStdGuiItem::cancel(), this, "m_buttonCancel" );
tqlayout5->addWidget( m_buttonCancel );
layout5->addWidget( m_buttonCancel );
m_buttonClose = new KPushButton( KStdGuiItem::close(), this );
tqlayout5->addWidget( m_buttonClose );
layout5->addWidget( m_buttonClose );
m_buttonShowDebug = new TQPushButton( i18n("Show Debugging Output"), this );
tqlayout5->addWidget( m_buttonShowDebug );
layout5->addWidget( m_buttonShowDebug );
mainLayout->addLayout( tqlayout5 );
mainLayout->addLayout( layout5 );
m_pixLabel->setThemePixmap( K3bTheme::PROGRESS_WORKING );
@ -581,7 +581,7 @@ void K3bJobProgressDialog::keyPressEvent( TQKeyEvent *e )
TQSize K3bJobProgressDialog::sizeHint() const
{
TQSize s = tqlayout()->totalSizeHint();
TQSize s = layout()->totalSizeHint();
if( s.width() < s.height() )
s.setWidth( s.height() );
return s;

@ -411,7 +411,7 @@ TQString K3bMedium::beautifiedVolumeId() const
return oldId;
// replace underscore with space
else if( c.tqunicode() == 95 ) {
else if( c.unicode() == 95 ) {
newId.append( ' ' );
newWord = true;
}

@ -130,7 +130,7 @@ K3bPassivePopup::K3bPassivePopup( TQWidget* parent )
connect( d->timeoutWidget, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotClose()) );
d->closeButton = new K3bMiniButton( d->titleLabel );
d->closeButton->setPixmap( tqstyle().stylePixmap( TQStyle::SP_TitleBarCloseButton, this ) );
d->closeButton->setPixmap( style().stylePixmap( TQStyle::SP_TitleBarCloseButton, this ) );
d->closeButton->setFixedSize( d->closeButton->pixmap()->width(), d->closeButton->pixmap()->height() );
TQToolTip::add( d->closeButton, i18n("Close") );
connect( d->closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose()) );

@ -43,7 +43,7 @@ K3bSidePanel::K3bSidePanel( K3bMainWindow* m, TQWidget* parent, const char* name
addButton( cdProjectsFrame, m_mainWindow->action( "file_new_mixed" ) );
addButton( cdProjectsFrame, m_mainWindow->action( "file_new_vcd" ) );
addButton( cdProjectsFrame, m_mainWindow->action( "file_new_movix" ) );
TQGridLayout* grid = (TQGridLayout*)cdProjectsFrame->tqlayout();
TQGridLayout* grid = (TQGridLayout*)cdProjectsFrame->layout();
grid->setRowSpacing( grid->numRows(), 15 );
addButton( cdProjectsFrame, m_mainWindow->action( "tools_copy_cd" ) );
addButton( cdProjectsFrame, m_mainWindow->action( "tools_write_cd_image" ) );
@ -56,7 +56,7 @@ K3bSidePanel::K3bSidePanel( K3bMainWindow* m, TQWidget* parent, const char* name
addButton( dvdProjectsFrame, m_mainWindow->action( "file_new_dvd" ) );
addButton( dvdProjectsFrame, m_mainWindow->action( "file_new_video_dvd" ) );
addButton( dvdProjectsFrame, m_mainWindow->action( "file_new_movix_dvd" ) );
grid = (TQGridLayout*)dvdProjectsFrame->tqlayout();
grid = (TQGridLayout*)dvdProjectsFrame->layout();
grid->setRowSpacing( grid->numRows(), 15 );
addButton( dvdProjectsFrame, m_mainWindow->action( "tools_copy_dvd" ) );
addButton( dvdProjectsFrame, m_mainWindow->action( "tools_write_dvd_iso" ) );
@ -98,7 +98,7 @@ void K3bSidePanel::addButton( TQFrame* frame, KAction* a )
connect( b, TQT_SIGNAL(clicked()), a, TQT_SLOT(activate()) );
TQGridLayout* grid = (TQGridLayout*)(frame->tqlayout());
TQGridLayout* grid = (TQGridLayout*)(frame->layout());
grid->addWidget( b, grid->numRows(), 0 );
}
else

@ -108,7 +108,7 @@ K3bSystemProblemDialog::K3bSystemProblemDialog( const TQValueList<K3bSystemProbl
view->setTextFormat(RichText);
// tqlayout everything
// layout everything
TQGridLayout* grid = new TQGridLayout( this );
grid->setMargin( marginHint() );
grid->setSpacing( spacingHint() );

@ -44,8 +44,8 @@ K3bTempDirSelectionWidget::K3bTempDirSelectionWidget( TQWidget *parent, const ch
m_labelCdSize(0),
m_defaultImageFileName( "k3b_image.iso" )
{
tqlayout()->setSpacing( KDialog::spacingHint() );
tqlayout()->setMargin( KDialog::marginHint() );
layout()->setSpacing( KDialog::spacingHint() );
layout()->setMargin( KDialog::marginHint() );
m_imageFileLabel = new TQLabel( this );
m_editDirectory = new KURLRequester( this, "m_editDirectory" );

@ -84,9 +84,9 @@ void K3bThemedHeader::init()
setLineWidth( 1 );
setMargin( 1 );
TQHBoxLayout* tqlayout = new TQHBoxLayout( this );
tqlayout->setMargin( 2 ); // to make sure the frame gets displayed
tqlayout->setSpacing( 0 );
TQHBoxLayout* layout = new TQHBoxLayout( this );
layout->setMargin( 2 ); // to make sure the frame gets displayed
layout->setSpacing( 0 );
m_leftLabel = new TQLabel( this );
m_leftLabel->setScaledContents( false );
@ -94,10 +94,10 @@ void K3bThemedHeader::init()
m_rightLabel = new TQLabel( this );
m_rightLabel->setScaledContents( false );
tqlayout->addWidget( m_leftLabel );
tqlayout->addWidget( m_titleLabel );
tqlayout->setStretchFactor( m_titleLabel, 1 );
tqlayout->addWidget( m_rightLabel );
layout->addWidget( m_leftLabel );
layout->addWidget( m_titleLabel );
layout->setStretchFactor( m_titleLabel, 1 );
layout->addWidget( m_rightLabel );
m_leftPix = K3bTheme::DIALOG_LEFT;
m_rightPix = K3bTheme::DIALOG_RIGHT;

@ -121,10 +121,10 @@ K3bWriterSelectionWidget::K3bWriterSelectionWidget( TQWidget *parent, const char
TQGroupBox* groupWriter = new TQGroupBox( this );
groupWriter->setTitle( i18n( "Burn Medium" ) );
groupWriter->setColumnLayout(0, Qt::Vertical );
groupWriter->tqlayout()->setSpacing( 0 );
groupWriter->tqlayout()->setMargin( 0 );
groupWriter->layout()->setSpacing( 0 );
groupWriter->layout()->setMargin( 0 );
TQGridLayout* groupWriterLayout = new TQGridLayout( groupWriter->tqlayout() );
TQGridLayout* groupWriterLayout = new TQGridLayout( groupWriter->layout() );
groupWriterLayout->setAlignment( TQt::AlignTop );
groupWriterLayout->setSpacing( KDialog::spacingHint() );
groupWriterLayout->setMargin( KDialog::marginHint() );

@ -109,8 +109,8 @@ void K3bBlankingDialog::setupGui()
// --- setup the blanking type button group -----------------------------
TQGroupBox* groupBlankType = new TQGroupBox( 1, Qt::Vertical, i18n("&Erase Type"), frame );
groupBlankType->tqlayout()->setSpacing( spacingHint() );
groupBlankType->tqlayout()->setMargin( marginHint() );
groupBlankType->layout()->setSpacing( spacingHint() );
groupBlankType->layout()->setMargin( marginHint() );
m_comboEraseMode = new TQComboBox( groupBlankType );
// ----------------------------------------------------------------------

@ -588,14 +588,14 @@ void K3bCdImageWritingDialog::createIso9660InfoItems( K3bIso9660* isoF )
K3bListViewItem* isoRootItem = new K3bListViewItem( m_infoView, m_infoView->lastItem(),
i18n("Detected:"),
i18n("Iso9660 image") );
isoRootItem->setForegroundColor( 0, tqpalette().disabled().foreground() );
isoRootItem->setForegroundColor( 0, palette().disabled().foreground() );
isoRootItem->setPixmap( 0, SmallIcon( "cdimage") );
KIO::filesize_t size = K3b::filesize( KURL::fromPathOrURL(isoF->fileName()) );
K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(),
i18n("Filesize:"),
KIO::convertSize( size ) );
item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
@ -603,7 +603,7 @@ void K3bCdImageWritingDialog::createIso9660InfoItems( K3bIso9660* isoF )
isoF->primaryDescriptor().systemId.isEmpty()
? TQString("-")
: isoF->primaryDescriptor().systemId );
item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
@ -611,7 +611,7 @@ void K3bCdImageWritingDialog::createIso9660InfoItems( K3bIso9660* isoF )
isoF->primaryDescriptor().volumeId.isEmpty()
? TQString("-")
: isoF->primaryDescriptor().volumeId );
item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
@ -619,7 +619,7 @@ void K3bCdImageWritingDialog::createIso9660InfoItems( K3bIso9660* isoF )
isoF->primaryDescriptor().volumeSetId.isEmpty()
? TQString("-")
: isoF->primaryDescriptor().volumeSetId );
item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
@ -627,14 +627,14 @@ void K3bCdImageWritingDialog::createIso9660InfoItems( K3bIso9660* isoF )
isoF->primaryDescriptor().publisherId.isEmpty()
? TQString("-")
: isoF->primaryDescriptor().publisherId );
item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
i18n("Preparer Id:"),
isoF->primaryDescriptor().preparerId.isEmpty()
? TQString("-") : isoF->primaryDescriptor().preparerId );
item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
@ -642,7 +642,7 @@ void K3bCdImageWritingDialog::createIso9660InfoItems( K3bIso9660* isoF )
isoF->primaryDescriptor().applicationId.isEmpty()
? TQString("-")
: isoF->primaryDescriptor().applicationId );
item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item->setForegroundColor( 0, palette().disabled().foreground() );
isoRootItem->setOpen( true );
}
@ -653,24 +653,24 @@ void K3bCdImageWritingDialog::createCdrecordCloneItems( const TQString& tocFile,
K3bListViewItem* isoRootItem = new K3bListViewItem( m_infoView, m_infoView->lastItem(),
i18n("Detected:"),
i18n("Cdrecord clone image") );
isoRootItem->setForegroundColor( 0, tqpalette().disabled().foreground() );
isoRootItem->setForegroundColor( 0, palette().disabled().foreground() );
isoRootItem->setPixmap( 0, SmallIcon( "cdimage") );
K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(),
i18n("Filesize:"), KIO::convertSize( K3b::filesize(KURL::fromPathOrURL(imageFile)) ) );
item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
i18n("Image file:"),
imageFile );
item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
i18n("TOC file:"),
tocFile );
item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item->setForegroundColor( 0, palette().disabled().foreground() );
isoRootItem->setOpen( true );
}
@ -681,24 +681,24 @@ void K3bCdImageWritingDialog::createCueBinItems( const TQString& cueFile, const
K3bListViewItem* isoRootItem = new K3bListViewItem( m_infoView, m_infoView->lastItem(),
i18n("Detected:"),
i18n("Cue/bin image") );
isoRootItem->setForegroundColor( 0, tqpalette().disabled().foreground() );
isoRootItem->setForegroundColor( 0, palette().disabled().foreground() );
isoRootItem->setPixmap( 0, SmallIcon( "cdimage") );
K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(),
i18n("Filesize:"), KIO::convertSize( K3b::filesize(KURL::fromPathOrURL(imageFile)) ) );
item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
i18n("Image file:"),
imageFile );
item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
i18n("Cue file:"),
cueFile );
item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item->setForegroundColor( 0, palette().disabled().foreground() );
isoRootItem->setOpen( true );
}
@ -709,7 +709,7 @@ void K3bCdImageWritingDialog::createAudioCueItems( const K3bCueFileParser& cp )
K3bListViewItem* rootItem = new K3bListViewItem( m_infoView, m_infoView->lastItem(),
i18n("Detected:"),
i18n("Audio Cue Image") );
rootItem->setForegroundColor( 0, tqpalette().disabled().foreground() );
rootItem->setForegroundColor( 0, palette().disabled().foreground() );
rootItem->setPixmap( 0, SmallIcon( "sound") );
K3bListViewItem* trackParent = new K3bListViewItem( rootItem,
@ -839,7 +839,7 @@ void K3bCdImageWritingDialog::calculateMd5Sum( const TQString& file )
d->md5SumItem = new K3bListViewItem( m_infoView, m_infoView->firstChild() );
d->md5SumItem->setText( 0, i18n("Md5 Sum:") );
d->md5SumItem->setForegroundColor( 0, tqpalette().disabled().foreground() );
d->md5SumItem->setForegroundColor( 0, palette().disabled().foreground() );
d->md5SumItem->setProgress( 1, 0 );
d->md5SumItem->setPixmap( 0, SmallIcon( "exec") );
@ -907,7 +907,7 @@ void K3bCdImageWritingDialog::slotContextMenu( KListView*, TQListViewItem*, cons
}
}
else if( r == copyItem ) {
TQApplication::tqclipboard()->setText( d->md5Job->hexDigest().lower(), TQClipboard::Clipboard );
TQApplication::clipboard()->setText( d->md5Job->hexDigest().lower(), TQClipboard::Clipboard );
}
}

@ -169,7 +169,7 @@ K3bDvdCopyDialog::K3bDvdCopyDialog( TQWidget* parent, const char* name, bool mod
//
// setup tqlayout
// setup layout
// //////////////////////////////////////////////////////////////////////////
TQGridLayout* grid = new TQGridLayout( w );
grid->setMargin( 0 );

@ -59,15 +59,15 @@ K3bDvdFormattingDialog::K3bDvdFormattingDialog( TQWidget* parent, const char* na
m_writerSelectionWidget->setForceAutoSpeed(true);
TQGroupBox* groupWritingMode = new TQGroupBox( 1, Qt::Vertical, i18n("Writing Mode"), frame );
groupWritingMode->tqlayout()->setMargin( marginHint() );
groupWritingMode->tqlayout()->setSpacing( spacingHint() );
groupWritingMode->layout()->setMargin( marginHint() );
groupWritingMode->layout()->setSpacing( spacingHint() );
m_writingModeWidget = new K3bWritingModeWidget( K3b::WRITING_MODE_INCR_SEQ|K3b::WRITING_MODE_RES_OVWR,
groupWritingMode );
TQGroupBox* groupOptions = new TQGroupBox( 2, Qt::Vertical, i18n("Settings"), frame );
groupOptions->tqlayout()->setMargin( marginHint() );
groupOptions->tqlayout()->setSpacing( spacingHint() );
groupOptions->layout()->setMargin( marginHint() );
groupOptions->layout()->setSpacing( spacingHint() );
m_checkForce = new TQCheckBox( i18n("Force"), groupOptions );
m_checkQuickFormat = new TQCheckBox( i18n("Quick format"), groupOptions );

@ -319,12 +319,12 @@ void K3bIsoImageWritingDialog::updateImageSize( const TQString& path )
K3bListViewItem* isoRootItem = new K3bListViewItem( m_infoView, m_infoView->lastItem(),
i18n("Iso9660 image") );
isoRootItem->setForegroundColor( 0, tqpalette().disabled().foreground() );
isoRootItem->setForegroundColor( 0, palette().disabled().foreground() );
isoRootItem->setPixmap( 0, SmallIcon( "cdimage") );
K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(),
i18n("Filesize:"), KIO::convertSize( imageSize ) );
item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
@ -332,7 +332,7 @@ void K3bIsoImageWritingDialog::updateImageSize( const TQString& path )
isoF.primaryDescriptor().systemId.isEmpty()
? TQString("-")
: isoF.primaryDescriptor().systemId );
item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
@ -340,7 +340,7 @@ void K3bIsoImageWritingDialog::updateImageSize( const TQString& path )
isoF.primaryDescriptor().volumeId.isEmpty()
? TQString("-")
: isoF.primaryDescriptor().volumeId );
item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
@ -348,7 +348,7 @@ void K3bIsoImageWritingDialog::updateImageSize( const TQString& path )
isoF.primaryDescriptor().volumeSetId.isEmpty()
? TQString("-")
: isoF.primaryDescriptor().volumeSetId );
item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
@ -356,14 +356,14 @@ void K3bIsoImageWritingDialog::updateImageSize( const TQString& path )
isoF.primaryDescriptor().publisherId.isEmpty()
? TQString("-")
: isoF.primaryDescriptor().publisherId );
item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
i18n("Preparer Id:"),
isoF.primaryDescriptor().preparerId.isEmpty()
? TQString("-") : isoF.primaryDescriptor().preparerId );
item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
@ -371,7 +371,7 @@ void K3bIsoImageWritingDialog::updateImageSize( const TQString& path )
isoF.primaryDescriptor().applicationId.isEmpty()
? TQString("-")
: isoF.primaryDescriptor().applicationId );
item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item->setForegroundColor( 0, palette().disabled().foreground() );
isoRootItem->setOpen( true );
@ -441,7 +441,7 @@ void K3bIsoImageWritingDialog::calculateMd5Sum( const TQString& file )
d->md5SumItem = new K3bListViewItem( m_infoView, m_infoView->firstChild() );
d->md5SumItem->setText( 0, i18n("Md5 Sum:") );
d->md5SumItem->setForegroundColor( 0, tqpalette().disabled().foreground() );
d->md5SumItem->setForegroundColor( 0, palette().disabled().foreground() );
d->md5SumItem->setProgress( 1, 0 );
d->md5SumItem->setPixmap( 0, SmallIcon( "exec") );
@ -509,7 +509,7 @@ void K3bIsoImageWritingDialog::slotContextMenu( KListView*, TQListViewItem*, con
}
}
else if( r == copyItem ) {
TQApplication::tqclipboard()->setText( m_md5Job->hexDigest().lower(), TQClipboard::Clipboard );
TQApplication::clipboard()->setText( m_md5Job->hexDigest().lower(), TQClipboard::Clipboard );
}
}

@ -35,7 +35,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@ -92,7 +92,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@ -202,7 +202,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">

@ -98,7 +98,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@ -153,7 +153,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">

@ -60,8 +60,8 @@ void K3bBurningOptionTab::setupGui()
TQGroupBox* groupWritingApp = new TQGroupBox( 0, Qt::Vertical, i18n("Burning"), this );
groupWritingApp->tqlayout()->setMargin( 0 );
TQGridLayout* bufferLayout = new TQGridLayout( groupWritingApp->tqlayout() );
groupWritingApp->layout()->setMargin( 0 );
TQGridLayout* bufferLayout = new TQGridLayout( groupWritingApp->layout() );
bufferLayout->setMargin( KDialog::marginHint() );
bufferLayout->setSpacing( KDialog::spacingHint() );

@ -50,20 +50,20 @@ K3bCddbOptionTab::K3bCddbOptionTab( TQWidget* parent, const char* name )
base_K3bCddbOptionTabLayout->setMargin( 0 );
base_K3bCddbOptionTabLayout->setSpacing( KDialog::spacingHint() );
m_mainTabbed->page(0)->tqlayout()->setMargin( KDialog::marginHint() );
m_mainTabbed->page(0)->tqlayout()->setSpacing( KDialog::spacingHint() );
m_mainTabbed->page(1)->tqlayout()->setMargin( KDialog::marginHint() );
m_mainTabbed->page(1)->tqlayout()->setSpacing( KDialog::spacingHint() );
m_mainTabbed->page(0)->layout()->setMargin( KDialog::marginHint() );
m_mainTabbed->page(0)->layout()->setSpacing( KDialog::spacingHint() );
m_mainTabbed->page(1)->layout()->setMargin( KDialog::marginHint() );
m_mainTabbed->page(1)->layout()->setSpacing( KDialog::spacingHint() );
// m_groupLocalDir->tqlayout()->setMargin( 0 );
// m_groupLocalDir->layout()->setMargin( 0 );
// m_groupLocalDirLayout->setMargin( KDialog::marginHint() );
// m_groupLocalDirLayout->setSpacing( KDialog::spacingHint() );
// m_groupCddbServer->tqlayout()->setMargin( 0 );
// m_groupCddbServer->layout()->setMargin( 0 );
// m_groupCddbServerLayout->setMargin( KDialog::marginHint() );
// m_groupCddbServerLayout->setSpacing( KDialog::spacingHint() );
m_groupCgi->tqlayout()->setMargin( 0 );
m_groupCgi->layout()->setMargin( 0 );
m_groupCgiLayout->setMargin( KDialog::marginHint() );
m_groupCgiLayout->setSpacing( KDialog::spacingHint() );

@ -170,8 +170,8 @@ K3bDeviceWidget::K3bDeviceWidget( K3bDevice::DeviceManager* manager, TQWidget *p
// Devices Box
// ------------------------------------------------
TQGroupBox* groupDevices = new TQGroupBox( 1, Qt::Vertical, i18n( "CD/DVD Drives" ), this );
groupDevices->tqlayout()->setSpacing( KDialog::spacingHint() );
groupDevices->tqlayout()->setMargin( KDialog::marginHint() );
groupDevices->layout()->setSpacing( KDialog::spacingHint() );
groupDevices->layout()->setMargin( KDialog::marginHint() );
m_viewDevices = new K3bListView( groupDevices, "m_viewDevicesReader" );
m_viewDevices->addColumn( "V" );
@ -257,27 +257,27 @@ void K3bDeviceWidget::updateDeviceListViews()