diff options
67 files changed, 251 insertions, 251 deletions
diff --git a/k3bsetup/base_k3bsetup2.ui b/k3bsetup/base_k3bsetup2.ui index eee5857..25df4e2 100644 --- a/k3bsetup/base_k3bsetup2.ui +++ b/k3bsetup/base_k3bsetup2.ui @@ -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"> diff --git a/libk3b/cddb/k3bcddbmultientriesdialog.cpp b/libk3b/cddb/k3bcddbmultientriesdialog.cpp index 66f617a..ddcd9e4 100644 --- a/libk3b/cddb/k3bcddbmultientriesdialog.cpp +++ b/libk3b/cddb/k3bcddbmultientriesdialog.cpp @@ -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 ); diff --git a/libk3b/core/k3bprocess.cpp b/libk3b/core/k3bprocess.cpp index ca8d2e0..c46fd0a 100644 --- a/libk3b/core/k3bprocess.cpp +++ b/libk3b/core/k3bprocess.cpp @@ -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; diff --git a/libk3b/k3bimage.xsd b/libk3b/k3bimage.xsd index 607bd95..ab7f36c 100644 --- a/libk3b/k3bimage.xsd +++ b/libk3b/k3bimage.xsd @@ -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". diff --git a/libk3b/tools/k3bcutcombobox.cpp b/libk3b/tools/k3bcutcombobox.cpp index 089e27e..a92ae6a 100644 --- a/libk3b/tools/k3bcutcombobox.cpp +++ b/libk3b/tools/k3bcutcombobox.cpp @@ -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 ) { diff --git a/libk3b/tools/k3blistview.cpp b/libk3b/tools/k3blistview.cpp index b998cf5..048f2ee 100644 --- a/libk3b/tools/k3blistview.cpp +++ b/libk3b/tools/k3blistview.cpp @@ -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 ); } } } diff --git a/libk3b/tools/k3bmsfedit.cpp b/libk3b/tools/k3bmsfedit.cpp index e3d3a70..07ed77d 100644 --- a/libk3b/tools/k3bmsfedit.cpp +++ b/libk3b/tools/k3bmsfedit.cpp @@ -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() )); diff --git a/libk3b/tools/k3brichtextlabel.h b/libk3b/tools/k3brichtextlabel.h index a23c9df..d2c7250 100644 --- a/libk3b/tools/k3brichtextlabel.h +++ b/libk3b/tools/k3brichtextlabel.h @@ -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> */ diff --git a/libk3b/tools/k3btoolbox.cpp b/libk3b/tools/k3btoolbox.cpp index e812f0a..f260b7d 100644 --- a/libk3b/tools/k3btoolbox.cpp +++ b/libk3b/tools/k3btoolbox.cpp @@ -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 ); } diff --git a/libk3b/tools/k3btoolbutton.cpp b/libk3b/tools/k3btoolbutton.cpp index 3866265..cc8cb1b 100644 --- a/libk3b/tools/k3btoolbutton.cpp +++ b/libk3b/tools/k3btoolbutton.cpp @@ -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() ); } diff --git a/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui b/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui index 2923474..1f61071 100644 --- a/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui +++ b/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui @@ -88,7 +88,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> diff --git a/plugins/encoder/lame/base_k3blameencodersettingswidget.ui b/plugins/encoder/lame/base_k3blameencodersettingswidget.ui index ec10059..a874760 100644 --- a/plugins/encoder/lame/base_k3blameencodersettingswidget.ui +++ b/plugins/encoder/lame/base_k3blameencodersettingswidget.ui @@ -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"> diff --git a/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui b/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui index e5baeac..9df1c17 100644 --- a/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui +++ b/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui @@ -43,7 +43,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> diff --git a/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui b/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui index 227e3bf..a76c3c5 100644 --- a/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui +++ b/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui @@ -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"> diff --git a/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui b/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui index d870db2..ce874d3 100644 --- a/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui +++ b/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui @@ -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"> diff --git a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp index f30f802..22edc55 100644 --- a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp +++ b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp @@ -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() ); diff --git a/src/k3baudioplayer.cpp b/src/k3baudioplayer.cpp index ddc960b..a44a368 100644 --- a/src/k3baudioplayer.cpp +++ b/src/k3baudioplayer.cpp @@ -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 ); diff --git a/src/k3bcontentsview.cpp b/src/k3bcontentsview.cpp index 2cafbf2..fe8299c 100644 --- a/src/k3bcontentsview.cpp +++ b/src/k3bcontentsview.cpp @@ -51,7 +51,7 @@ K3bContentsView::~K3bContentsView() void K3bContentsView::setMainWidget( TQWidget* w ) { m_centerWidget = w; - ((TQVBoxLayout*)tqlayout())->addWidget( w ); + ((TQVBoxLayout*)layout())->addWidget( w ); } diff --git a/src/k3bdebuggingoutputdialog.cpp b/src/k3bdebuggingoutputdialog.cpp index ecc86e8..dee77c1 100644 --- a/src/k3bdebuggingoutputdialog.cpp +++ b/src/k3bdebuggingoutputdialog.cpp @@ -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" diff --git a/src/k3bfiletreecombobox.cpp b/src/k3bfiletreecombobox.cpp index 88a835c..eb66226 100644 --- a/src/k3bfiletreecombobox.cpp +++ b/src/k3bfiletreecombobox.cpp @@ -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 ); diff --git a/src/k3bfiletreeview.cpp b/src/k3bfiletreeview.cpp index d3c8159..8e54cc4 100644 --- a/src/k3bfiletreeview.cpp +++ b/src/k3bfiletreeview.cpp @@ -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, diff --git a/src/k3bfileview.cpp b/src/k3bfileview.cpp index 556bab3..328be04 100644 --- a/src/k3bfileview.cpp +++ b/src/k3bfileview.cpp @@ -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"); diff --git a/src/k3binteractiondialog.cpp b/src/k3binteractiondialog.cpp index 698e781..073179a 100644 --- a/src/k3binteractiondialog.cpp +++ b/src/k3binteractiondialog.cpp @@ -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 ); diff --git a/src/k3bjobprogressdialog.cpp b/src/k3bjobprogressdialog.cpp index b1088c2..1542922 100644 --- a/src/k3bjobprogressdialog.cpp +++ b/src/k3bjobprogressdialog.cpp @@ -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; diff --git a/src/k3bmedium.cpp b/src/k3bmedium.cpp index 64f856b..e3cf946 100644 --- a/src/k3bmedium.cpp +++ b/src/k3bmedium.cpp @@ -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; } diff --git a/src/k3bpassivepopup.cpp b/src/k3bpassivepopup.cpp index 7fe3605..a7ab856 100644 --- a/src/k3bpassivepopup.cpp +++ b/src/k3bpassivepopup.cpp @@ -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()) ); diff --git a/src/k3bsidepanel.cpp b/src/k3bsidepanel.cpp index 3ef831d..459b139 100644 --- a/src/k3bsidepanel.cpp +++ b/src/k3bsidepanel.cpp @@ -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 diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp index 4d75395..fbf5c66 100644 --- a/src/k3bsystemproblemdialog.cpp +++ b/src/k3bsystemproblemdialog.cpp @@ -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() ); diff --git a/src/k3btempdirselectionwidget.cpp b/src/k3btempdirselectionwidget.cpp index 0d7b326..fb69b34 100644 --- a/src/k3btempdirselectionwidget.cpp +++ b/src/k3btempdirselectionwidget.cpp @@ -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" ); diff --git a/src/k3bthemedheader.cpp b/src/k3bthemedheader.cpp index 934af88..a0e59ca 100644 --- a/src/k3bthemedheader.cpp +++ b/src/k3bthemedheader.cpp @@ -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; diff --git a/src/k3bwriterselectionwidget.cpp b/src/k3bwriterselectionwidget.cpp index 79c9a87..df4f756 100644 --- a/src/k3bwriterselectionwidget.cpp +++ b/src/k3bwriterselectionwidget.cpp @@ -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() ); diff --git a/src/misc/k3bblankingdialog.cpp b/src/misc/k3bblankingdialog.cpp index e80f22b..904683b 100644 --- a/src/misc/k3bblankingdialog.cpp +++ b/src/misc/k3bblankingdialog.cpp @@ -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 ); // ---------------------------------------------------------------------- diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp index 9f0c3e1..57b313b 100644 --- a/src/misc/k3bcdimagewritingdialog.cpp +++ b/src/misc/k3bcdimagewritingdialog.cpp @@ -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 ); } } diff --git a/src/misc/k3bdvdcopydialog.cpp b/src/misc/k3bdvdcopydialog.cpp index ff721b3..24aeace 100644 --- a/src/misc/k3bdvdcopydialog.cpp +++ b/src/misc/k3bdvdcopydialog.cpp @@ -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 ); diff --git a/src/misc/k3bdvdformattingdialog.cpp b/src/misc/k3bdvdformattingdialog.cpp index c088588..309f48c 100644 --- a/src/misc/k3bdvdformattingdialog.cpp +++ b/src/misc/k3bdvdformattingdialog.cpp @@ -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 ); diff --git a/src/misc/k3bisoimagewritingdialog.cpp b/src/misc/k3bisoimagewritingdialog.cpp index 1e734b9..3d23020 100644 --- a/src/misc/k3bisoimagewritingdialog.cpp +++ b/src/misc/k3bisoimagewritingdialog.cpp @@ -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 ); } } diff --git a/src/option/base_k3bmiscoptiontab.ui b/src/option/base_k3bmiscoptiontab.ui index eeef7da..89a20cf 100644 --- a/src/option/base_k3bmiscoptiontab.ui +++ b/src/option/base_k3bmiscoptiontab.ui @@ -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"> diff --git a/src/option/base_k3bthemeoptiontab.ui b/src/option/base_k3bthemeoptiontab.ui index 77eb41b..cad57b1 100644 --- a/src/option/base_k3bthemeoptiontab.ui +++ b/src/option/base_k3bthemeoptiontab.ui @@ -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"> diff --git a/src/option/k3bburningoptiontab.cpp b/src/option/k3bburningoptiontab.cpp index 7792f2a..55a65ee 100644 --- a/src/option/k3bburningoptiontab.cpp +++ b/src/option/k3bburningoptiontab.cpp @@ -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() ); diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp index 4410b4a..da8d7bd 100644 --- a/src/option/k3bcddboptiontab.cpp +++ b/src/option/k3bcddboptiontab.cpp @@ -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() ); diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp index 63c2bd0..c592956 100644 --- a/src/option/k3bdevicewidget.cpp +++ b/src/option/k3bdevicewidget.cpp @@ -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() systemDeviceItem->setText( 1, TQString("%1 (%2)").arg(dev->device->devicename()).arg(dev->device->busTargetLun()) ); else systemDeviceItem->setText( 1, dev->device->devicename() ); - systemDeviceItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + systemDeviceItem->setForegroundColor( 1, palette().disabled().foreground() ); K3bListViewItem* interfaceItem = new K3bListViewItem( devRoot, systemDeviceItem, i18n("Interface type:"), ( dev->device->interfaceType() == K3bDevice::SCSI ? i18n("Generic SCSI") : i18n("ATAPI") ) ); - interfaceItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + interfaceItem->setForegroundColor( 1, palette().disabled().foreground() ); K3bListViewItem* vendorItem = new K3bListViewItem( devRoot, interfaceItem, i18n("Vendor:"), dev->device->vendor() ); - vendorItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + vendorItem->setForegroundColor( 1, palette().disabled().foreground() ); K3bListViewItem* modelItem = new K3bListViewItem( devRoot, vendorItem, i18n("Description:"), dev->device->description() ); - modelItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + modelItem->setForegroundColor( 1, palette().disabled().foreground() ); K3bListViewItem* versionItem = new K3bListViewItem( devRoot, modelItem, i18n("Firmware:"), dev->device->version() ); - versionItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + versionItem->setForegroundColor( 1, palette().disabled().foreground() ); // drive type @@ -285,33 +285,33 @@ void K3bDeviceWidget::updateDeviceListViews() K3bListViewItem* typeItem = new K3bListViewItem( devRoot, versionItem, i18n("Writes CD-R:"), dev->device->writesCd() ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + typeItem->setForegroundColor( 1, palette().disabled().foreground() ); typeItem = new K3bListViewItem( devRoot, typeItem, i18n("Writes CD-RW:"), dev->device->writesCdrw() ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + typeItem->setForegroundColor( 1, palette().disabled().foreground() ); typeItem = new K3bListViewItem( devRoot, typeItem, i18n("Reads DVD:"), dev->device->readsDvd() ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + typeItem->setForegroundColor( 1, palette().disabled().foreground() ); typeItem = new K3bListViewItem( devRoot, typeItem, i18n("Writes DVD-R(W):"), dev->device->writesDvdMinus() ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + typeItem->setForegroundColor( 1, palette().disabled().foreground() ); typeItem = new K3bListViewItem( devRoot, typeItem, i18n("Writes DVD-R Dual Layer:"), (dev->device->type() & K3bDevice::DEVICE_DVD_R_DL) ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + typeItem->setForegroundColor( 1, palette().disabled().foreground() ); typeItem = new K3bListViewItem( devRoot, typeItem, i18n("Writes DVD+R(W):"), dev->device->writesDvdPlus() ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + typeItem->setForegroundColor( 1, palette().disabled().foreground() ); typeItem = new K3bListViewItem( devRoot, typeItem, i18n("Writes DVD+R Double Layer:"), (dev->device->type() & K3bDevice::DEVICE_DVD_PLUS_R_DL) ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + typeItem->setForegroundColor( 1, palette().disabled().foreground() ); // -------------------------------- @@ -320,7 +320,7 @@ void K3bDeviceWidget::updateDeviceListViews() typeItem = new K3bListViewItem( devRoot, typeItem, i18n("Buffer Size:"), KIO::convertSizeFromKB(dev->device->bufferSize()) ); - typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + typeItem->setForegroundColor( 1, palette().disabled().foreground() ); } PrivateDeviceViewItem1* cdrdaoDriverItem = new PrivateDeviceViewItem1( PrivateDeviceViewItem1::t_cdrdaoDriver, @@ -339,14 +339,14 @@ void K3bDeviceWidget::updateDeviceListViews() typeItem = new K3bListViewItem( devRoot, cdTextItem, i18n("Supports Burnfree:"), dev->device->burnfree() ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + typeItem->setForegroundColor( 1, palette().disabled().foreground() ); // and at last the write modes (new K3bListViewItem( devRoot, typeItem, i18n("Write modes:"), - K3bDevice::writingModeString(dev->device->writingModes()) ))->setForegroundColor( 1, tqpalette().disabled().foreground() ); + K3bDevice::writingModeString(dev->device->writingModes()) ))->setForegroundColor( 1, palette().disabled().foreground() ); } devRoot->setOpen(true); diff --git a/src/projects/base_k3badvanceddataimagesettings.ui b/src/projects/base_k3badvanceddataimagesettings.ui index 5961ea3..17bb26f 100644 --- a/src/projects/base_k3badvanceddataimagesettings.ui +++ b/src/projects/base_k3badvanceddataimagesettings.ui @@ -129,7 +129,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/src/projects/base_k3baudiocdtextallfieldswidget.ui b/src/projects/base_k3baudiocdtextallfieldswidget.ui index ba6cff3..c0e2556 100644 --- a/src/projects/base_k3baudiocdtextallfieldswidget.ui +++ b/src/projects/base_k3baudiocdtextallfieldswidget.ui @@ -25,7 +25,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="1"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -62,7 +62,7 @@ </widget> <widget class="TQLayoutWidget" row="5" column="1"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -121,7 +121,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -184,7 +184,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -235,7 +235,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> diff --git a/src/projects/base_k3baudiocdtextwidget.ui b/src/projects/base_k3baudiocdtextwidget.ui index a15dc9d..4010416 100644 --- a/src/projects/base_k3baudiocdtextwidget.ui +++ b/src/projects/base_k3baudiocdtextwidget.ui @@ -70,7 +70,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -96,7 +96,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -135,7 +135,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <hbox> <property name="name"> diff --git a/src/projects/base_k3baudiotrackwidget.ui b/src/projects/base_k3baudiotrackwidget.ui index a6b71d0..ce969da 100644 --- a/src/projects/base_k3baudiotrackwidget.ui +++ b/src/projects/base_k3baudiotrackwidget.ui @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -217,7 +217,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> diff --git a/src/projects/base_k3bbootimageview.ui b/src/projects/base_k3bbootimageview.ui index 1aeddd8..3d5b488 100644 --- a/src/projects/base_k3bbootimageview.ui +++ b/src/projects/base_k3bbootimageview.ui @@ -14,7 +14,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <hbox> <property name="name"> @@ -190,7 +190,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <grid> <property name="name"> @@ -246,7 +246,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <hbox> <property name="name"> @@ -281,7 +281,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <hbox> <property name="name"> diff --git a/src/projects/base_k3bdataimagesettings.ui b/src/projects/base_k3bdataimagesettings.ui index 6f9c2b9..d1444a9 100644 --- a/src/projects/base_k3bdataimagesettings.ui +++ b/src/projects/base_k3bdataimagesettings.ui @@ -89,7 +89,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> diff --git a/src/projects/base_k3bdatavolumedescwidget.ui b/src/projects/base_k3bdatavolumedescwidget.ui index ee29467..75b5d0a 100644 --- a/src/projects/base_k3bdatavolumedescwidget.ui +++ b/src/projects/base_k3bdatavolumedescwidget.ui @@ -107,7 +107,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -231,7 +231,7 @@ </widget> <widget class="TQLayoutWidget" row="11" column="1"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -260,7 +260,7 @@ </widget> <widget class="TQLayoutWidget" row="9" column="1"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -289,7 +289,7 @@ </widget> <widget class="TQLayoutWidget" row="10" column="1"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> diff --git a/src/projects/base_k3bmovixoptionswidget.ui b/src/projects/base_k3bmovixoptionswidget.ui index c0bb2fe..293ca92 100644 --- a/src/projects/base_k3bmovixoptionswidget.ui +++ b/src/projects/base_k3bmovixoptionswidget.ui @@ -55,7 +55,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -239,10 +239,10 @@ <cstring>m_comboKeyboardLayout</cstring> </property> <property name="toolTip" stdset="0"> - <string>Select the tqlayout of the keyboard</string> + <string>Select the layout of the keyboard</string> </property> <property name="whatsThis" stdset="0"> - <string><p>The keyboard tqlayout selected here will be used for the eMovix commands like controlling the media player.</string> + <string><p>The keyboard layout selected here will be used for the eMovix commands like controlling the media player.</string> </property> </widget> </grid> diff --git a/src/projects/k3baudiodatasourceviewitem.cpp b/src/projects/k3baudiodatasourceviewitem.cpp index 04371b1..2f0b7a5 100644 --- a/src/projects/k3baudiodatasourceviewitem.cpp +++ b/src/projects/k3baudiodatasourceviewitem.cpp @@ -39,7 +39,7 @@ K3bAudioDataSourceViewItem::K3bAudioDataSourceViewItem( K3bAudioTrackViewItem* p // setMarginVertical( 2 ); // gray out filename - setForegroundColor( 5, listView()->tqpalette().disabled().foreground() ); + setForegroundColor( 5, listView()->palette().disabled().foreground() ); // smaller filename f = listView()->font(); diff --git a/src/projects/k3baudiotracksplitdialog.cpp b/src/projects/k3baudiotracksplitdialog.cpp index 6a987e6..b57ab32 100644 --- a/src/projects/k3baudiotracksplitdialog.cpp +++ b/src/projects/k3baudiotracksplitdialog.cpp @@ -42,19 +42,19 @@ K3bAudioTrackSplitDialog::K3bAudioTrackSplitDialog( K3bAudioTrack* track, TQWidg m_msfEditStart = new K3bMsfEdit( frame ); m_msfEditEnd = new K3bMsfEdit( frame ); - TQGridLayout* tqlayout = new TQGridLayout( frame ); - tqlayout->setMargin( 0 ); - tqlayout->setSpacing( spacingHint() ); + TQGridLayout* layout = new TQGridLayout( frame ); + layout->setMargin( 0 ); + layout->setSpacing( spacingHint() ); // FIXME: After the string freeze replace the text with a better one explaning how to use this dialog - tqlayout->addMultiCellWidget( new TQLabel( i18n("Please select the position where the track should be split."), + layout->addMultiCellWidget( new TQLabel( i18n("Please select the position where the track should be split."), frame ), 0, 0, 0, 3 ); - tqlayout->addMultiCellWidget( m_editorWidget, 1, 1, 0, 3 ); - tqlayout->addWidget( m_msfEditStart, 2, 1 ); - tqlayout->addWidget( new TQLabel( " - ", frame ), 2, 2 ); - tqlayout->addWidget( m_msfEditEnd, 2, 3 ); - tqlayout->addWidget( new TQLabel( i18n("Split track at:"), frame ), 2, 0 ); - tqlayout->setColStretch( 0, 1 ); + layout->addMultiCellWidget( m_editorWidget, 1, 1, 0, 3 ); + layout->addWidget( m_msfEditStart, 2, 1 ); + layout->addWidget( new TQLabel( " - ", frame ), 2, 2 ); + layout->addWidget( m_msfEditEnd, 2, 3 ); + layout->addWidget( new TQLabel( i18n("Split track at:"), frame ), 2, 0 ); + layout->setColStretch( 0, 1 ); m_editorWidget->setAllowOverlappingRanges( false ); m_editorWidget->enableRangeSelection( true ); diff --git a/src/projects/k3baudiotrackviewitem.cpp b/src/projects/k3baudiotrackviewitem.cpp index 3027eac..67483ad 100644 --- a/src/projects/k3baudiotrackviewitem.cpp +++ b/src/projects/k3baudiotrackviewitem.cpp @@ -57,7 +57,7 @@ K3bAudioTrackViewItem::K3bAudioTrackViewItem( K3bAudioTrackView* parent, setFont( 3, f ); // gray out filename - setForegroundColor( 5, listView()->tqpalette().disabled().foreground() ); + setForegroundColor( 5, listView()->palette().disabled().foreground() ); // smaller filename f = listView()->font(); diff --git a/src/projects/k3bdataimagesettingswidget.cpp b/src/projects/k3bdataimagesettingswidget.cpp index 918ebdf..ced699c 100644 --- a/src/projects/k3bdataimagesettingswidget.cpp +++ b/src/projects/k3bdataimagesettingswidget.cpp @@ -171,7 +171,7 @@ K3bDataImageSettingsWidget::K3bDataImageSettingsWidget( TQWidget* parent, const : base_K3bDataImageSettings( parent, name ), m_fileSystemOptionsShown(true) { - tqlayout()->setMargin( KDialog::marginHint() ); + layout()->setMargin( KDialog::marginHint() ); m_customFsDlg = new CustomFilesystemsDialog( this ); m_volDescDlg = new VolumeDescDialog( this ); diff --git a/src/projects/k3bdatapropertiesdialog.cpp b/src/projects/k3bdatapropertiesdialog.cpp index b1a5794..67c6602 100644 --- a/src/projects/k3bdatapropertiesdialog.cpp +++ b/src/projects/k3bdatapropertiesdialog.cpp @@ -215,7 +215,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge "in the ISO9660 filesystem. A higher weighting means that the " "file will be located closer to the beginning of the image " "(and the disk)." - "<p>This option is useful in order to optimize the data tqlayout " + "<p>This option is useful in order to optimize the data layout " "on a CD/DVD." "<p><b>Caution:</b> This does not sort the order of the file " "names that appear in the ISO9660 directory." diff --git a/src/projects/k3bdataviewitem.cpp b/src/projects/k3bdataviewitem.cpp index 475d411..414fe6d 100644 --- a/src/projects/k3bdataviewitem.cpp +++ b/src/projects/k3bdataviewitem.cpp @@ -65,7 +65,7 @@ void K3bDataViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, int colum TQColorGroup _cg = cg; if( !dataItem()->isRemoveable() && dataItem()->doc()->root() != dataItem() ) { - _cg.setColor( TQColorGroup::Text, listView()->tqpalette().disabled().foreground() ); + _cg.setColor( TQColorGroup::Text, listView()->palette().disabled().foreground() ); } if( column == 0 ) { diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp index 967e1d0..e71db6e 100644 --- a/src/projects/k3bfillstatusdisplay.cpp +++ b/src/projects/k3bfillstatusdisplay.cpp @@ -346,12 +346,12 @@ K3bFillStatusDisplay::K3bFillStatusDisplay( K3bDoc* doc, TQWidget *parent, const // TQToolTip::add( d->buttonMenu, i18n("Fill display properties") ); // connect( d->buttonMenu, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotMenuButtonClicked()) ); - TQGridLayout* tqlayout = new TQGridLayout( this ); - tqlayout->setSpacing(5); - tqlayout->setMargin(frameWidth()); - tqlayout->addWidget( d->displayWidget, 0, 0 ); - // tqlayout->addWidget( d->buttonMenu, 0, 1 ); - tqlayout->setColStretch( 0, 1 ); + TQGridLayout* layout = new TQGridLayout( this ); + layout->setSpacing(5); + layout->setMargin(frameWidth()); + layout->addWidget( d->displayWidget, 0, 0 ); + // layout->addWidget( d->buttonMenu, 0, 1 ); + layout->setColStretch( 0, 1 ); setupPopupMenu(); diff --git a/src/projects/k3bprojectburndialog.cpp b/src/projects/k3bprojectburndialog.cpp index f66ea9b..d486f23 100644 --- a/src/projects/k3bprojectburndialog.cpp +++ b/src/projects/k3bprojectburndialog.cpp @@ -269,9 +269,9 @@ void K3bProjectBurnDialog::prepareGui() m_writingModeWidget = new K3bWritingModeWidget( groupWritingMode ); m_optionGroup = new TQGroupBox( 0, Qt::Vertical, i18n("Settings"), w ); - m_optionGroup->tqlayout()->setMargin(0); - m_optionGroup->tqlayout()->setSpacing(0); - m_optionGroupLayout = new TQVBoxLayout( m_optionGroup->tqlayout() ); + m_optionGroup->layout()->setMargin(0); + m_optionGroup->layout()->setSpacing(0); + m_optionGroupLayout = new TQVBoxLayout( m_optionGroup->layout() ); m_optionGroupLayout->setMargin( KDialog::marginHint() ); m_optionGroupLayout->setSpacing( KDialog::spacingHint() ); diff --git a/src/projects/k3bvcdburndialog.cpp b/src/projects/k3bvcdburndialog.cpp index 199b578..1d6d8a9 100644 --- a/src/projects/k3bvcdburndialog.cpp +++ b/src/projects/k3bvcdburndialog.cpp @@ -307,10 +307,10 @@ void K3bVcdBurnDialog::setupAdvancedTab() // -------------------------------------------- gaps & margins group ---- m_groupGaps = new TQGroupBox( 0, Qt::Vertical, i18n( "Gaps" ), w ); - m_groupGaps->tqlayout() ->setSpacing( spacingHint() ); - m_groupGaps->tqlayout() ->setMargin( marginHint() ); + m_groupGaps->layout() ->setSpacing( spacingHint() ); + m_groupGaps->layout() ->setMargin( marginHint() ); - TQGridLayout* groupGapsLayout = new TQGridLayout( m_groupGaps->tqlayout() ); + TQGridLayout* groupGapsLayout = new TQGridLayout( m_groupGaps->layout() ); groupGapsLayout->setAlignment( TQt::AlignTop ); m_checkGaps = new TQCheckBox( i18n( "Customize gaps and margins" ), m_groupGaps ); @@ -403,10 +403,10 @@ void K3bVcdBurnDialog::setupAdvancedTab() // ------------------------------------------------------- misc group ---- m_groupMisc = new TQGroupBox( 0, Qt::Vertical, i18n( "Misc" ), w ); - m_groupMisc->tqlayout() ->setSpacing( spacingHint() ); - m_groupMisc->tqlayout() ->setMargin( marginHint() ); + m_groupMisc->layout() ->setSpacing( spacingHint() ); + m_groupMisc->layout() ->setMargin( marginHint() ); - TQGridLayout* groupMiscLayout = new TQGridLayout( m_groupMisc->tqlayout() ); + TQGridLayout* groupMiscLayout = new TQGridLayout( m_groupMisc->layout() ); groupMiscLayout->setAlignment( TQt::AlignTop ); m_labelRestriction = new TQLabel( i18n( "Restriction category (0..3):" ), m_groupMisc, "m_labelRestriction" ); diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp index 5a13991..09a1340 100644 --- a/src/projects/k3bvcdtrackdialog.cpp +++ b/src/projects/k3bvcdtrackdialog.cpp @@ -375,10 +375,10 @@ void K3bVcdTrackDialog::prepareGui() // FILE-INFO BOX /////////////////////////////////////////////////// TQGroupBox* groupFileInfo = new TQGroupBox( 0, Qt::Vertical, i18n( "File Info" ), frame, "groupFileInfo" ); - groupFileInfo->tqlayout() ->setSpacing( 0 ); - groupFileInfo->tqlayout() ->setMargin( 0 ); + groupFileInfo->layout() ->setSpacing( 0 ); + groupFileInfo->layout() ->setMargin( 0 ); - TQGridLayout* groupFileInfoLayout = new TQGridLayout( groupFileInfo->tqlayout() ); + TQGridLayout* groupFileInfoLayout = new TQGridLayout( groupFileInfo->layout() ); groupFileInfoLayout->setAlignment( TQt::AlignTop ); groupFileInfoLayout->setSpacing( spacingHint() ); groupFileInfoLayout->setMargin( marginHint() ); @@ -450,8 +450,8 @@ void K3bVcdTrackDialog::setupPbcTab() ////////////////////////////////////////////////////////////////////////////////////////// TQGroupBox* groupOptions = new TQGroupBox( 3, Qt::Vertical, i18n( "Settings" ), w ); - groupOptions->tqlayout() ->setSpacing( spacingHint() ); - groupOptions->tqlayout() ->setMargin( marginHint() ); + groupOptions->layout() ->setSpacing( spacingHint() ); + groupOptions->layout() ->setMargin( marginHint() ); m_check_pbc = new TQCheckBox( i18n( "Enable playback control (for the whole CD)" ), groupOptions, "m_check_pbc" ); @@ -463,10 +463,10 @@ void K3bVcdTrackDialog::setupPbcTab() ////////////////////////////////////////////////////////////////////////////////////////// m_groupPlay = new TQGroupBox( 0, Qt::Vertical, i18n( "Playing" ), w ); - m_groupPlay->tqlayout() ->setSpacing( spacingHint() ); - m_groupPlay->tqlayout() ->setMargin( marginHint() ); + m_groupPlay->layout() ->setSpacing( spacingHint() ); + m_groupPlay->layout() ->setMargin( marginHint() ); - TQGridLayout* groupPlayLayout = new TQGridLayout( m_groupPlay->tqlayout() ); + TQGridLayout* groupPlayLayout = new TQGridLayout( m_groupPlay->layout() ); groupPlayLayout->setAlignment( TQt::AlignTop ); TQLabel* labelPlaying = new TQLabel( i18n( "Playing track" ) , m_groupPlay, "labelPlaying" ); @@ -499,10 +499,10 @@ void K3bVcdTrackDialog::setupPbcTab() ////////////////////////////////////////////////////////////////////////////////////////// m_groupPbc = new TQGroupBox( 0, Qt::Vertical, i18n( "Key Pressed Interaction" ), w ); - m_groupPbc->tqlayout() ->setSpacing( spacingHint() ); - m_groupPbc->tqlayout() ->setMargin( marginHint() ); + m_groupPbc->layout() ->setSpacing( spacingHint() ); + m_groupPbc->layout() ->setMargin( marginHint() ); - TQGridLayout* groupPbcLayout = new TQGridLayout( m_groupPbc->tqlayout() ); + TQGridLayout* groupPbcLayout = new TQGridLayout( m_groupPbc->layout() ); groupPbcLayout->setAlignment( TQt::AlignTop ); TQLabel* labelPbc_previous = new TQLabel( i18n( "Previous:" ), m_groupPbc, "labelPbc_previous" ); @@ -559,8 +559,8 @@ void K3bVcdTrackDialog::setupPbcKeyTab() m_groupKey = new TQGroupBox( 3, Qt::Vertical, i18n( "Numeric Keys" ), m_widgetnumkeys ); m_groupKey->setEnabled( false ); - m_groupKey->tqlayout() ->setSpacing( spacingHint() ); - m_groupKey->tqlayout() ->setMargin( marginHint() ); + m_groupKey->layout() ->setSpacing( spacingHint() ); + m_groupKey->layout() ->setMargin( marginHint() ); m_list_keys = new K3bListView( m_groupKey, "m_list_keys" ); m_list_keys->setAllColumnsShowFocus( true ); diff --git a/src/projects/k3bview.cpp b/src/projects/k3bview.cpp index fbd3a91..bddc819 100644 --- a/src/projects/k3bview.cpp +++ b/src/projects/k3bview.cpp @@ -87,7 +87,7 @@ K3bView::~K3bView() void K3bView::setMainWidget( TQWidget* w ) { - static_cast<TQGridLayout*>(tqlayout())->addMultiCellWidget( w, 1, 1, 0, 1 ); + static_cast<TQGridLayout*>(layout())->addMultiCellWidget( w, 1, 1, 0, 1 ); } diff --git a/src/rip/base_k3baudiorippingoptionwidget.ui b/src/rip/base_k3baudiorippingoptionwidget.ui index 4eb9634..66d34ea 100644 --- a/src/rip/base_k3baudiorippingoptionwidget.ui +++ b/src/rip/base_k3baudiorippingoptionwidget.ui @@ -83,7 +83,7 @@ which can be used with programs like xmms or noatun. </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -148,7 +148,7 @@ file will contain all tracks one after the other. </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6_2</cstring> + <cstring>layout6_2</cstring> </property> <hbox> <property name="name"> diff --git a/src/rip/base_k3bcddbpatternwidget.ui b/src/rip/base_k3bcddbpatternwidget.ui index da050bd..09d8062 100644 --- a/src/rip/base_k3bcddbpatternwidget.ui +++ b/src/rip/base_k3bcddbpatternwidget.ui @@ -27,7 +27,7 @@ </property> <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -107,7 +107,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> diff --git a/src/rip/k3bcddbpatternwidget.cpp b/src/rip/k3bcddbpatternwidget.cpp index 79e1375..cd0c3f1 100644 --- a/src/rip/k3bcddbpatternwidget.cpp +++ b/src/rip/k3bcddbpatternwidget.cpp @@ -32,8 +32,8 @@ K3bCddbPatternWidget::K3bCddbPatternWidget( TQWidget* parent, const char* name ) : base_K3bCddbPatternWidget( parent, name ) { - // fix the tqlayout - ((TQGridLayout*)tqlayout())->setRowStretch( 4, 1 ); + // fix the layout + ((TQGridLayout*)layout())->setRowStretch( 4, 1 ); // setup validators // there can never be one of the following characters in both dir and filename: diff --git a/src/rip/k3bvideocdrippingdialog.cpp b/src/rip/k3bvideocdrippingdialog.cpp index 064e0e0..855de41 100644 --- a/src/rip/k3bvideocdrippingdialog.cpp +++ b/src/rip/k3bvideocdrippingdialog.cpp @@ -73,10 +73,10 @@ void K3bVideoCdRippingDialog::setupGui() // ---------------------------------------------------- Directory group --- TQGroupBox* groupDirectory = new TQGroupBox( 0, Qt::Vertical, i18n( "Destination Directory" ), frame ); - groupDirectory->tqlayout() ->setSpacing( KDialog::spacingHint() ); - groupDirectory->tqlayout() ->setMargin( KDialog::marginHint() ); + groupDirectory->layout() ->setSpacing( KDialog::spacingHint() ); + groupDirectory->layout() ->setMargin( KDialog::marginHint() ); - TQGridLayout* groupDirectoryLayout = new TQGridLayout( groupDirectory->tqlayout() ); + TQGridLayout* groupDirectoryLayout = new TQGridLayout( groupDirectory->layout() ); groupDirectoryLayout->setAlignment( TQt::AlignTop ); TQLabel* rippathLabel = new TQLabel( i18n( "Rip files to:" ), groupDirectory ); diff --git a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui index 4bc1a0f..5c22e83 100644 --- a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui +++ b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui @@ -67,7 +67,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -106,7 +106,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -252,7 +252,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -326,7 +326,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -397,7 +397,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -423,7 +423,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -464,7 +464,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -515,7 +515,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp index 8938e4d..95093de 100644 --- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp @@ -233,7 +233,7 @@ void K3bVideoDVDRippingDialog::populateTitleView( const TQValueList<int>& titles if( m_dvd[*it-1].audioStream(i).format() == K3bVideoDVD::AUDIO_FORMAT_DTS ) { // width of the radio button from TQCheckListItem::paintCell - int buttonSize = tqstyle().pixelMetric( TQStyle::PM_CheckListButtonSize, m_w->m_titleView ) + 4; + int buttonSize = style().pixelMetric( TQStyle::PM_CheckListButtonSize, m_w->m_titleView ) + 4; int spaceWidth = fontMetrics().width( ' ' ); int numSpaces = buttonSize/spaceWidth; asI = new TQListViewItem( titleItem, asI, TQString().fill( ' ', numSpaces ) + text + " (" + i18n("not supported") + ")" ); diff --git a/src/rip/videodvd/k3bvideodvdrippingview.cpp b/src/rip/videodvd/k3bvideodvdrippingview.cpp index 56ecf0c..763cbe0 100644 --- a/src/rip/videodvd/k3bvideodvdrippingview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingview.cpp @@ -65,7 +65,7 @@ K3bVideoDVDRippingView::K3bVideoDVDRippingView( TQWidget* parent, const char * n connect( m_titleView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); - // general tqlayout + // general layout // ---------------------------------------------------------------------------------- mainGrid->addLayout( toolBoxLayout, 0, 0 ); mainGrid->addWidget( m_titleView, 1, 0 ); |