TDE
/
k3b
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/k3b
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove the tq in front of these incorrectly TQt4-converted methods/data members:

Browse Source 
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent a9a875756e
commit 85723d544d
65 changed files with 122 additions and 122 deletions
Show Stats Download Patch File Download Diff File

2
k3bsetup/base_k3bsetup2.ui
Unescape View File

@ -370,7 +370,7 @@
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
</connection> </connection>
</connections> </connections>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>

2
libk3b/core/k3bglobals.cpp
Unescape View File

@ -189,7 +189,7 @@ TQString K3b::prepareDir( const TQString& dir )
} }
TQString K3b::tqparentDir( const TQString& path ) TQString K3b::parentDir( const TQString& path )
{ {
TQString tqparent = path; TQString tqparent = path;
if( path[path.length()-1] == '/' ) if( path[path.length()-1] == '/' )

2
libk3b/core/k3bglobals.h
Unescape View File

@ -166,7 +166,7 @@ namespace K3b
* *
* Example: /usr/share/doc -> /usr/share/ * Example: /usr/share/doc -> /usr/share/
*/ */
TQString tqparentDir( const TQString& path ); TQString parentDir( const TQString& path );
/** /**
* For now this just replaces multiple occurrences of / with a single / * For now this just replaces multiple occurrences of / with a single /

2
libk3b/core/k3bjob.h
Unescape View File

@ -207,7 +207,7 @@ class LIBK3B_EXPORT K3bJob : public TQObject, public K3bJobHandler
* \param hdl the handler of the job. This allows for some user interaction without * \param hdl the handler of the job. This allows for some user interaction without
* specifying any details (like the GUI). * specifying any details (like the GUI).
* The job handler can also be another job. In that case this job is a sub job * The job handler can also be another job. In that case this job is a sub job
* and will be part of the tqparents running sub jobs. * and will be part of the parents running sub jobs.
* *
* \see runningSubJobs() * \see runningSubJobs()
* \see numRunningSubJobs() * \see numRunningSubJobs()

2
libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
Unescape View File

@ -521,7 +521,7 @@ TQString K3bVideoDVDTitleTranscodingJob::videoCodecDescription( K3bVideoDVDTitle
"volunteer programmers after the OpenDivX source was closed in July 2001.") "volunteer programmers after the OpenDivX source was closed in July 2001.")
+ "<br>" + "<br>"
+ i18n("XviD features MPEG-4 Advanced Profile settings such as b-frames, global " + i18n("XviD features MPEG-4 Advanced Profile settings such as b-frames, global "
"and quarter pixel motion compensation, lumi tqmasking, trellis quantization, and " "and quarter pixel motion compensation, lumi masking, trellis quantization, and "
"H.263, MPEG and custom quantization matrices.") "H.263, MPEG and custom quantization matrices.")
+ "<br>" + "<br>"
+ i18n("XviD is a primary competitor of DivX (XviD being DivX spelled backwards). " + i18n("XviD is a primary competitor of DivX (XviD being DivX spelled backwards). "

2
libk3b/projects/datacd/k3bdatadoc.cpp
Unescape View File

@ -944,7 +944,7 @@ void K3bDataDoc::itemAddedToDir( K3bDirItem*, K3bDataItem* item )
void K3bDataDoc::moveItem( K3bDataItem* item, K3bDirItem* newParent ) void K3bDataDoc::moveItem( K3bDataItem* item, K3bDirItem* newParent )
{ {
if( !item || !newParent ) { if( !item || !newParent ) {
kdDebug() << "(K3bDataDoc) item or tqparentitem was NULL while moving." << endl; kdDebug() << "(K3bDataDoc) item or parentitem was NULL while moving." << endl;
return; return;
} }

10
libk3b/projects/datacd/k3bdataitem.cpp
Unescape View File

@ -186,14 +186,14 @@ TQString K3bDataItem::iso9660Path() const
K3bDataItem* K3bDataItem::nextSibling() const K3bDataItem* K3bDataItem::nextSibling() const
{ {
K3bDataItem* item = const_cast<K3bDataItem*>(this); // urg, but we know that we don't mess with it, so... K3bDataItem* item = const_cast<K3bDataItem*>(this); // urg, but we know that we don't mess with it, so...
K3bDirItem* tqparentItem = getParent(); K3bDirItem* parentItem = getParent();
while( tqparentItem ) { while( parentItem ) {
if( K3bDataItem* i = tqparentItem->nextChild( item ) ) if( K3bDataItem* i = parentItem->nextChild( item ) )
return i; return i;
item = tqparentItem; item = parentItem;
tqparentItem = item->getParent(); parentItem = item->getParent();
} }
return 0; return 0;

4
libk3b/projects/datacd/k3bdiritem.cpp
Unescape View File

@ -25,8 +25,8 @@
#include <kdebug.h> #include <kdebug.h>
K3bDirItem::K3bDirItem(const TQString& name, K3bDataDoc* doc, K3bDirItem* tqparentDir) K3bDirItem::K3bDirItem(const TQString& name, K3bDataDoc* doc, K3bDirItem* parentDir)
: K3bDataItem( doc, tqparentDir ), : K3bDataItem( doc, parentDir ),
m_size(0), m_size(0),
m_followSymlinksSize(0), m_followSymlinksSize(0),
m_blocks(0), m_blocks(0),

2
libk3b/projects/datacd/k3bdiritem.h
Unescape View File

@ -34,7 +34,7 @@ class K3bDataDoc;
class LIBK3B_EXPORT K3bDirItem : public K3bDataItem class LIBK3B_EXPORT K3bDirItem : public K3bDataItem
{ {
public: public:
K3bDirItem( const TQString& name, K3bDataDoc*, K3bDirItem* tqparentDir = 0 ); K3bDirItem( const TQString& name, K3bDataDoc*, K3bDirItem* parentDir = 0 );
/** /**
* Default copy constructor. Copies the dir including all tqchildren. However, none of the * Default copy constructor. Copies the dir including all tqchildren. However, none of the

2
libk3b/projects/datacd/k3bfileitem.cpp
Unescape View File

@ -171,7 +171,7 @@ K3bFileItem::K3bFileItem( const K3bFileItem& item )
K3bFileItem::~K3bFileItem() K3bFileItem::~K3bFileItem()
{ {
// remove this from tqparentdir // remove this from parentdir
take(); take();
} }

2
libk3b/projects/datacd/k3bsessionimportitem.cpp
Unescape View File

@ -47,7 +47,7 @@ K3bSessionImportItem::~K3bSessionImportItem()
if( m_replaceItem ) if( m_replaceItem )
m_replaceItem->setReplacedItemFromOldSession(0); m_replaceItem->setReplacedItemFromOldSession(0);
// remove this from tqparentdir // remove this from parentdir
if( tqparent() ) if( tqparent() )
tqparent()->takeDataItem( this ); tqparent()->takeDataItem( this );
} }

2
libk3b/projects/datacd/k3bspecialdataitem.h
Unescape View File

@ -47,7 +47,7 @@ class K3bSpecialDataItem : public K3bDataItem
} }
~K3bSpecialDataItem() { ~K3bSpecialDataItem() {
// remove this from tqparentdir // remove this from parentdir
if( tqparent() ) if( tqparent() )
tqparent()->takeDataItem( this ); tqparent()->takeDataItem( this );
} }

16
libk3b/projects/k3bcuefileparser.cpp
Unescape View File

@ -408,15 +408,15 @@ bool K3bCueFileParser::findImageFileName( const TQString& dataFile )
} }
// try the filename in the cue's directory // try the filename in the cue's directory
if( TQFileInfo( K3b::tqparentDir(filename()) + dataFile.section( '/', -1 ) ).isFile() ) { if( TQFileInfo( K3b::parentDir(filename()) + dataFile.section( '/', -1 ) ).isFile() ) {
setImageFilename( K3b::tqparentDir(filename()) + dataFile.section( '/', -1 ) ); setImageFilename( K3b::parentDir(filename()) + dataFile.section( '/', -1 ) );
kdDebug() << "(K3bCueFileParser) found image file: " << imageFilename() << endl; kdDebug() << "(K3bCueFileParser) found image file: " << imageFilename() << endl;
return true; return true;
} }
// try the filename ignoring case // try the filename ignoring case
if( TQFileInfo( K3b::tqparentDir(filename()) + TQString(dataFile.section( '/', -1 )).lower() ).isFile() ) { if( TQFileInfo( K3b::parentDir(filename()) + TQString(dataFile.section( '/', -1 )).lower() ).isFile() ) {
setImageFilename( K3b::tqparentDir(filename()) + TQString(dataFile.section( '/', -1 )).lower() ); setImageFilename( K3b::parentDir(filename()) + TQString(dataFile.section( '/', -1 )).lower() );
kdDebug() << "(K3bCueFileParser) found image file: " << imageFilename() << endl; kdDebug() << "(K3bCueFileParser) found image file: " << imageFilename() << endl;
return true; return true;
} }
@ -435,21 +435,21 @@ bool K3bCueFileParser::findImageFileName( const TQString& dataFile )
// Search for another one having the same filename as the cue but a different extension // Search for another one having the same filename as the cue but a different extension
// //
TQDir tqparentDir( K3b::tqparentDir(filename()) ); TQDir parentDir( K3b::parentDir(filename()) );
TQString filenamePrefix = filename().section( '/', -1 ); TQString filenamePrefix = filename().section( '/', -1 );
filenamePrefix.truncate( filenamePrefix.length() - 3 ); // remove cue extension filenamePrefix.truncate( filenamePrefix.length() - 3 ); // remove cue extension
kdDebug() << "(K3bCueFileParser) checking folder " << tqparentDir.path() << " for files: " << filenamePrefix << "*" << endl; kdDebug() << "(K3bCueFileParser) checking folder " << parentDir.path() << " for files: " << filenamePrefix << "*" << endl;
// //
// we cannot use the nameFilter in TQDir because of the spaces that may occur in filenames // we cannot use the nameFilter in TQDir because of the spaces that may occur in filenames
// //
TQStringList possibleImageFiles = tqparentDir.entryList( TQDir::Files ); TQStringList possibleImageFiles = parentDir.entryList( TQDir::Files );
int cnt = 0; int cnt = 0;
for( TQStringList::const_iterator it = possibleImageFiles.constBegin(); it != possibleImageFiles.constEnd(); ++it ) { for( TQStringList::const_iterator it = possibleImageFiles.constBegin(); it != possibleImageFiles.constEnd(); ++it ) {
if( (*it).lower() == TQString(dataFile.section( '/', -1 )).lower() || if( (*it).lower() == TQString(dataFile.section( '/', -1 )).lower() ||
(*it).startsWith( filenamePrefix ) && !(*it).endsWith( "cue" ) ) { (*it).startsWith( filenamePrefix ) && !(*it).endsWith( "cue" ) ) {
++cnt; ++cnt;
setImageFilename( K3b::tqparentDir(filename()) + *it ); setImageFilename( K3b::parentDir(filename()) + *it );
} }
} }

2
libk3b/projects/movixcd/k3bmovixfileitem.cpp
Unescape View File

@ -36,7 +36,7 @@ K3bMovixFileItem::~K3bMovixFileItem()
if( m_subTitleItem ) if( m_subTitleItem )
m_doc->removeSubTitleItem( this ); m_doc->removeSubTitleItem( this );
// remove this from tqparentdir // remove this from parentdir
// it is important to do it here and not // it is important to do it here and not
// rely on the K3bFileItem destructor becasue // rely on the K3bFileItem destructor becasue
// otherwise the doc is not informed early enough // otherwise the doc is not informed early enough

8
libk3b/tools/k3blistview.cpp
Unescape View File

@ -802,7 +802,7 @@ void K3bListView::setCurrentItem( TQListViewItem* i )
return; return;
// I cannot remember why I did this here exactly. However, it resets the // I cannot remember why I did this here exactly. However, it resets the
// m_lastClickedItem and thus tqinvalidates the editing. // m_lastClickedItem and thus invalidates the editing.
// doRename(); // doRename();
// hideEditor(); // hideEditor();
// m_currentEditItem = 0; // m_currentEditItem = 0;
@ -1143,7 +1143,7 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e )
TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) ||
TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorComboBox) ) { TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorComboBox) ) {
// make sure we did not lose the focus to one of the edit widgets' tqchildren // make sure we did not lose the focus to one of the edit widgets' tqchildren
if( !tqApp->tqfocusWidget() || TQT_BASE_OBJECT(tqApp->tqfocusWidget()->tqparentWidget()) != TQT_BASE_OBJECT(o) ) { if( !tqApp->tqfocusWidget() || TQT_BASE_OBJECT(tqApp->tqfocusWidget()->parentWidget()) != TQT_BASE_OBJECT(o) ) {
doRename(); doRename();
hideEditor(); hideEditor();
} }
@ -1206,14 +1206,14 @@ void K3bListView::viewportResizeEvent( TQResizeEvent* e )
} }
TQListViewItem* K3bListView::tqparentItem( TQListViewItem* item ) TQListViewItem* K3bListView::parentItem( TQListViewItem* item )
{ {
if( !item ) if( !item )
return 0; return 0;
if( item->tqparent() ) if( item->tqparent() )
return item->tqparent(); return item->tqparent();
else else
return K3bListView::tqparentItem( item->itemAbove() ); return K3bListView::parentItem( item->itemAbove() );
} }

2
libk3b/tools/k3blistview.h
Unescape View File

@ -190,7 +190,7 @@ class LIBK3B_EXPORT K3bListView : public KListView
* Searches for the first item above @p i which is one level higher. * Searches for the first item above @p i which is one level higher.
* For 1st level items this will always be the listview's root item. * For 1st level items this will always be the listview's root item.
*/ */
static TQListViewItem* tqparentItem( TQListViewItem* i ); static TQListViewItem* parentItem( TQListViewItem* i );
signals: signals:
void editorButtonClicked( K3bListViewItem*, int ); void editorButtonClicked( K3bListViewItem*, int );

2
libk3b/tools/k3btitlelabel.h
Unescape View File

@ -45,7 +45,7 @@ class LIBK3B_EXPORT K3bTitleLabel : public TQFrame
void setSubTitle( const TQString& subTitle ); void setSubTitle( const TQString& subTitle );
/** /**
* The title label only supports tqalignments left, hcenter, and right * The title label only supports alignments left, hcenter, and right
* *
* Default tqalignment is left. * Default tqalignment is left.
*/ */

2
plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui vendored
Unescape View File

@ -141,7 +141,7 @@
</widget> </widget>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint>
</includehints> </includehints>

2
plugins/encoder/external/base_k3bexternalencodereditwidget.ui vendored
Unescape View File

@ -154,7 +154,7 @@ Please insert the command used to encode the audio data. The command has to read
<tabstop>m_editExtension</tabstop> <tabstop>m_editExtension</tabstop>
<tabstop>m_editCommand</tabstop> <tabstop>m_editCommand</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

2
plugins/encoder/lame/base_k3blameencodersettingswidget.ui
Unescape View File

@ -473,7 +473,7 @@ This results in many wasted bits for high bitrate encodings but will ensure
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
</connection> </connection>
</connections> </connections>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>
</includehints> </includehints>

2
plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui
Unescape View File

@ -269,5 +269,5 @@ The input will be encoded as a mono signal. If it was a stereo signal, it will b
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
</connection> </connection>
</connections> </connections>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

2
plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui
Unescape View File

@ -383,7 +383,7 @@
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
</connection> </connection>
</connections> </connections>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>

2
plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui
Unescape View File

@ -254,5 +254,5 @@
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
</connection> </connection>
</connections> </connections>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

16
src/k3bemptydiscwaiter.cpp
Unescape View File

@ -337,7 +337,7 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev )
if( formatWithoutAsking || if( formatWithoutAsking ||
!hasIso || !hasIso ||
KMessageBox::warningContinueCancel( tqparentWidgetToUse(), KMessageBox::warningContinueCancel( parentWidgetToUse(),
i18n("Found %1 media in %2 - %3. " i18n("Found %1 media in %2 - %3. "
"Should it be overwritten?") "Should it be overwritten?")
.tqarg("DVD+RW") .tqarg("DVD+RW")
@ -407,7 +407,7 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev )
if( formatWithoutAsking || if( formatWithoutAsking ||
!hasIso || !hasIso ||
KMessageBox::warningContinueCancel( tqparentWidgetToUse(), KMessageBox::warningContinueCancel( parentWidgetToUse(),
i18n("Found %1 media in %2 - %3. " i18n("Found %1 media in %2 - %3. "
"Should it be overwritten?") "Should it be overwritten?")
.tqarg(K3bDevice::mediaTypeString(medium.diskInfo().mediaType())) .tqarg(K3bDevice::mediaTypeString(medium.diskInfo().mediaType()))
@ -464,7 +464,7 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev )
kdDebug() << "(K3bEmptyDiscWaiter) ------ DVD-RW needs to be formated." << endl; kdDebug() << "(K3bEmptyDiscWaiter) ------ DVD-RW needs to be formated." << endl;
if( formatWithoutAsking || if( formatWithoutAsking ||
KMessageBox::warningContinueCancel( tqparentWidgetToUse(), KMessageBox::warningContinueCancel( parentWidgetToUse(),
i18n("Found %1 media in %2 - %3. " i18n("Found %1 media in %2 - %3. "
"Should it be formatted?") "Should it be formatted?")
.tqarg( K3bDevice::mediaTypeString(medium.diskInfo().mediaType()) ) .tqarg( K3bDevice::mediaTypeString(medium.diskInfo().mediaType()) )
@ -540,7 +540,7 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev )
medium.diskInfo().rewritable() ) { medium.diskInfo().rewritable() ) {
if( formatWithoutAsking || if( formatWithoutAsking ||
KMessageBox::questionYesNo( tqparentWidgetToUse(), KMessageBox::questionYesNo( parentWidgetToUse(),
i18n("Found rewritable media in %1 - %2. " i18n("Found rewritable media in %1 - %2. "
"Should it be erased?").tqarg(d->device->vendor()).tqarg(d->device->description()), "Should it be erased?").tqarg(d->device->vendor()).tqarg(d->device->description()),
i18n("Found Rewritable Disk"), i18n("Found Rewritable Disk"),
@ -707,7 +707,7 @@ void K3bEmptyDiscWaiter::prepareErasingDialog()
{ {
// we hide the emptydiskwaiter so the info dialog needs to have the same tqparent // we hide the emptydiskwaiter so the info dialog needs to have the same tqparent
if( !d->erasingInfoDialog ) if( !d->erasingInfoDialog )
d->erasingInfoDialog = new K3bProgressDialog( TQString(), tqparentWidget() ); d->erasingInfoDialog = new K3bProgressDialog( TQString(), parentWidget() );
// //
// hide the dialog // hide the dialog
@ -719,13 +719,13 @@ void K3bEmptyDiscWaiter::prepareErasingDialog()
} }
TQWidget* K3bEmptyDiscWaiter::tqparentWidgetToUse() TQWidget* K3bEmptyDiscWaiter::parentWidgetToUse()
{ {
// we might also show dialogs if the discwaiter widget is not visible yet // we might also show dialogs if the discwaiter widget is not visible yet
if( d->dialogVisible ) if( d->dialogVisible )
return this; return this;
else else
return tqparentWidget(); return parentWidget();
} }
@ -744,7 +744,7 @@ bool K3bEmptyDiscWaiter::questionYesNo( const TQString& text,
const TQString& yesText, const TQString& yesText,
const TQString& noText ) const TQString& noText )
{ {
return ( KMessageBox::questionYesNo( tqparentWidgetToUse(), return ( KMessageBox::questionYesNo( parentWidgetToUse(),
text, text,
caption, caption,
yesText.isEmpty() ? KStdGuiItem::yes() : KGuiItem(yesText), yesText.isEmpty() ? KStdGuiItem::yes() : KGuiItem(yesText),

2
src/k3bemptydiscwaiter.h
Unescape View File

@ -130,7 +130,7 @@ class K3bEmptyDiscWaiter : public KDialogBase, public K3bJobHandler
void finishWaiting( int ); void finishWaiting( int );
void prepareErasingDialog(); void prepareErasingDialog();
TQWidget* tqparentWidgetToUse(); TQWidget* parentWidgetToUse();
class Private; class Private;
Private* d; Private* d;

4
src/k3bfiletreeview.cpp
Unescape View File

@ -319,7 +319,7 @@ K3bDeviceTreeToolTip::K3bDeviceTreeToolTip( TQWidget* tqparent, K3bFileTreeView*
void K3bDeviceTreeToolTip::maybeTip( const TQPoint& pos ) void K3bDeviceTreeToolTip::maybeTip( const TQPoint& pos )
{ {
if( !tqparentWidget() || !m_view ) if( !parentWidget() || !m_view )
return; return;
K3bDeviceBranchViewItem* item = dynamic_cast<K3bDeviceBranchViewItem*>( m_view->itemAt( pos ) ); K3bDeviceBranchViewItem* item = dynamic_cast<K3bDeviceBranchViewItem*>( m_view->itemAt( pos ) );
@ -328,7 +328,7 @@ void K3bDeviceTreeToolTip::maybeTip( const TQPoint& pos )
K3bDevice::Device* dev = static_cast<K3bDeviceBranch*>( item->branch() )->device(); K3bDevice::Device* dev = static_cast<K3bDeviceBranch*>( item->branch() )->device();
TQFrame* tooltip = new TQFrame( tqparentWidget() ); TQFrame* tooltip = new TQFrame( parentWidget() );
tooltip->setFrameStyle( TQFrame::Panel | TQFrame::Raised ); tooltip->setFrameStyle( TQFrame::Panel | TQFrame::Raised );
tooltip->setFrameShape( TQFrame::StyledPanel ); tooltip->setFrameShape( TQFrame::StyledPanel );
TQGridLayout* lay = new TQGridLayout( tooltip, 2, 2, tooltip->frameWidth()*2 /*margin*/, 6 /*spacing*/ ); TQGridLayout* lay = new TQGridLayout( tooltip, 2, 2, tooltip->frameWidth()*2 /*margin*/, 6 /*spacing*/ );

4
src/k3bflatbutton.cpp
Unescape View File

@ -154,11 +154,11 @@ void K3bFlatButton::drawContents( TQPainter* p )
// if( m_hover ) // if( m_hover )
// p->fillRect( rect, m_foreColor ); // p->fillRect( rect, m_foreColor );
// else if( tqparentWidget() ) { // else if( parentWidget() ) {
// TQRect r( mapToParent( TQPoint(lineWidth(), lineWidth()) ), // TQRect r( mapToParent( TQPoint(lineWidth(), lineWidth()) ),
// mapToParent( TQPoint(width()-2*lineWidth(), height()-2*lineWidth() )) ); // mapToParent( TQPoint(width()-2*lineWidth(), height()-2*lineWidth() )) );
// tqparentWidget()->tqrepaint( r ); // parentWidget()->tqrepaint( r );
// } // }
p->save(); p->save();

2
src/k3bmediacontentsview.cpp
Unescape View File

@ -133,7 +133,7 @@ void K3bMediaContentsView::slotMediumChanged( K3bDevice::Device* dev )
{ {
// FIXME: derive a K3bContentsStack from TQWidgetStack and let it set an active flag // FIXME: derive a K3bContentsStack from TQWidgetStack and let it set an active flag
// to replace this hack // to replace this hack
if( TQWidgetStack* stack = dynamic_cast<TQWidgetStack*>( tqparentWidget() ) ) if( TQWidgetStack* stack = dynamic_cast<TQWidgetStack*>( parentWidget() ) )
if( stack->visibleWidget() != this ) if( stack->visibleWidget() != this )
return; return;

2
src/k3bmediaselectioncombobox.cpp
Unescape View File

@ -54,7 +54,7 @@ K3bMediaSelectionComboBox::ToolTip::ToolTip( K3bMediaSelectionComboBox* box )
void K3bMediaSelectionComboBox::ToolTip::maybeTip( const TQPoint& pos ) void K3bMediaSelectionComboBox::ToolTip::maybeTip( const TQPoint& pos )
{ {
if( !tqparentWidget() || !m_box ) if( !parentWidget() || !m_box )
return; return;
TQListBoxItem* item = m_box->listBox()->itemAt( pos ); TQListBoxItem* item = m_box->listBox()->itemAt( pos );

8
src/k3bstatusbarmanager.cpp
Unescape View File

@ -112,9 +112,9 @@ void K3bStatusBarManager::update()
else else
m_labelFreeTemp->setText(i18n("No info")); m_labelFreeTemp->setText(i18n("No info"));
if( path != TQToolTip::textFor( m_labelFreeTemp->tqparentWidget() ) ) { if( path != TQToolTip::textFor( m_labelFreeTemp->parentWidget() ) ) {
TQToolTip::remove( m_labelFreeTemp->tqparentWidget() ); TQToolTip::remove( m_labelFreeTemp->parentWidget() );
TQToolTip::add( m_labelFreeTemp->tqparentWidget(), path ); TQToolTip::add( m_labelFreeTemp->parentWidget(), path );
} }
} }
@ -153,7 +153,7 @@ void K3bStatusBarManager::clearActionStatusText()
bool K3bStatusBarManager::eventFilter( TQObject* o, TQEvent* e ) bool K3bStatusBarManager::eventFilter( TQObject* o, TQEvent* e )
{ {
if( e->type() == TQEvent::MouseButtonDblClick ) { if( e->type() == TQEvent::MouseButtonDblClick ) {
if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_labelFreeTemp->tqparentWidget()) ) if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_labelFreeTemp->parentWidget()) )
m_mainWindow->showOptionDialog( 0 ); // FIXME: use an enumeration for the option pages m_mainWindow->showOptionDialog( 0 ); // FIXME: use an enumeration for the option pages
else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_versionBox) ) else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_versionBox) )
if( KAction* a = m_mainWindow->action( "help_about_app" ) ) if( KAction* a = m_mainWindow->action( "help_about_app" ) )

2
src/k3bsystemproblemdialog.cpp
Unescape View File

@ -210,7 +210,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* tqparent,
// Since kernel 2.6.8 older cdrecord versions are not able to use the SCSI subsystem when running suid root anymore // Since kernel 2.6.8 older cdrecord versions are not able to use the SCSI subsystem when running suid root anymore
// So far we ignore the suid root issue with kernel >= 2.6.8 and cdrecord < 2.01.01a02 // So far we ignore the suid root issue with kernel >= 2.6.8 and cdrecord < 2.01.01a02
// //
// Kernel 2.6.16.something seems to introduce another problem which was aptqparently worked around in cdrecord 2.01.01a05 // Kernel 2.6.16.something seems to introduce another problem which was apparently worked around in cdrecord 2.01.01a05
// //
if( K3b::simpleKernelVersion() >= K3bVersion( 2, 6, 8 ) && if( K3b::simpleKernelVersion() >= K3bVersion( 2, 6, 8 ) &&
k3bcore->externalBinManager()->binObject( "cdrecord" )->version < K3bVersion( 2, 1, 1, "a05" ) && k3bcore->externalBinManager()->binObject( "cdrecord" )->version < K3bVersion( 2, 1, 1, "a05" ) &&

6
src/k3btooltip.cpp
Unescape View File

@ -47,7 +47,7 @@ K3bToolTip::~K3bToolTip()
void K3bToolTip::tip( const TQRect& rect, const TQString& text, int effect ) void K3bToolTip::tip( const TQRect& rect, const TQString& text, int effect )
{ {
TQLabel* label = new TQLabel( text, tqparentWidget() ); TQLabel* label = new TQLabel( text, parentWidget() );
label->setMargin( 6 ); label->setMargin( 6 );
if( K3bTheme* theme = k3bappcore->themeManager()->currentTheme() ) { if( K3bTheme* theme = k3bappcore->themeManager()->currentTheme() ) {
label->setPaletteBackgroundColor( theme->backgroundColor() ); label->setPaletteBackgroundColor( theme->backgroundColor() );
@ -59,7 +59,7 @@ void K3bToolTip::tip( const TQRect& rect, const TQString& text, int effect )
void K3bToolTip::tip( const TQRect& rect, const TQPixmap& pix, int effect ) void K3bToolTip::tip( const TQRect& rect, const TQPixmap& pix, int effect )
{ {
TQLabel* label = new TQLabel( tqparentWidget() ); TQLabel* label = new TQLabel( parentWidget() );
label->setMargin( 6 ); label->setMargin( 6 );
if( K3bTheme* theme = k3bappcore->themeManager()->currentTheme() ) { if( K3bTheme* theme = k3bappcore->themeManager()->currentTheme() ) {
label->setPaletteBackgroundColor( theme->backgroundColor() ); label->setPaletteBackgroundColor( theme->backgroundColor() );
@ -134,7 +134,7 @@ void K3bToolTip::hideTip()
bool K3bToolTip::eventFilter( TQObject* o, TQEvent* e ) bool K3bToolTip::eventFilter( TQObject* o, TQEvent* e )
{ {
if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(tqparentWidget()) ) { if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(parentWidget()) ) {
switch( e->type() ) { switch( e->type() ) {
case TQEvent::MouseButtonPress: case TQEvent::MouseButtonPress:
case TQEvent::MouseButtonRelease: case TQEvent::MouseButtonRelease:

2
src/k3btooltip.h
Unescape View File

@ -35,7 +35,7 @@ class K3bToolTip : public TQObject
K3bToolTip( TQWidget* widget ); K3bToolTip( TQWidget* widget );
~K3bToolTip(); ~K3bToolTip();
TQWidget* tqparentWidget() const { return m_parentWidget; } TQWidget* parentWidget() const { return m_parentWidget; }
public slots: public slots:
/** /**

18
src/k3bwidgetshoweffect.cpp
Unescape View File

@ -70,7 +70,7 @@ void K3bWidgetShowEffect::show( bool effectOnly )
m_timerId = startTimer( 1000 / 30 ); m_timerId = startTimer( 1000 / 30 );
} }
else { else {
m_widget->move( 0, m_widget->tqparentWidget()->height() ); m_widget->move( 0, m_widget->parentWidget()->height() );
m_timerId = startTimer( 6 ); m_timerId = startTimer( 6 );
} }
@ -97,18 +97,18 @@ void K3bWidgetShowEffect::dissolveMask()
{ {
if( m_bShow ) { if( m_bShow ) {
m_widget->tqrepaint( false ); m_widget->tqrepaint( false );
TQPainter tqmaskPainter(&m_tqmask); TQPainter maskPainter(&m_tqmask);
m_tqmask.fill(TQt::black); m_tqmask.fill(TQt::black);
tqmaskPainter.setBrush(TQt::white); maskPainter.setBrush(TQt::white);
tqmaskPainter.setPen(TQt::white); maskPainter.setPen(TQt::white);
tqmaskPainter.drawRect( m_tqmask.rect() ); maskPainter.drawRect( m_tqmask.rect() );
m_dissolveSize += m_dissolveDelta; m_dissolveSize += m_dissolveDelta;
if( m_dissolveSize > 0 ) { if( m_dissolveSize > 0 ) {
tqmaskPainter.setRasterOp( TQt::EraseROP ); maskPainter.setRasterOp( TQt::EraseROP );
int x, y, s; int x, y, s;
const int size = 16; const int size = 16;
@ -121,7 +121,7 @@ void K3bWidgetShowEffect::dissolveMask()
if( s < 0 ) if( s < 0 )
break; break;
tqmaskPainter.drawEllipse(x - s / 2, y - s / 2, s, s); maskPainter.drawEllipse(x - s / 2, y - s / 2, s, s);
} }
} }
} }
@ -153,7 +153,7 @@ void K3bWidgetShowEffect::dissolveMask()
void K3bWidgetShowEffect::slideMask() void K3bWidgetShowEffect::slideMask()
{ {
if( m_bShow ) { if( m_bShow ) {
m_widget->move( 0, m_widget->tqparentWidget()->height() - m_offset ); m_widget->move( 0, m_widget->parentWidget()->height() - m_offset );
m_offset++; m_offset++;
if( m_offset > m_widget->height() ) { if( m_offset > m_widget->height() ) {
@ -167,7 +167,7 @@ void K3bWidgetShowEffect::slideMask()
} }
else { else {
m_offset--; m_offset--;
m_widget->move( 0, m_widget->tqparentWidget()->height() - m_offset ); m_widget->move( 0, m_widget->parentWidget()->height() - m_offset );
if( m_offset < 0 ) { if( m_offset < 0 ) {
// finally hide the widget // finally hide the widget

2
src/option/base_k3bcddboptiontab.ui
Unescape View File

@ -551,7 +551,7 @@
<tabstop>m_checkManualCgiPath</tabstop> <tabstop>m_checkManualCgiPath</tabstop>
<tabstop>m_editManualCgiPath</tabstop> <tabstop>m_editManualCgiPath</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>

2
src/option/base_k3bmiscoptiontab.ui
Unescape View File

@ -273,7 +273,7 @@
<data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082</data> <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082</data>
</image> </image>
</images> </images>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kurlrequester.h</includehint> <includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

2
src/option/base_k3bpluginoptiontab.ui
Unescape View File

@ -83,7 +83,7 @@
<data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082</data> <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082</data>
</image> </image>
</images> </images>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>k3blistview.h</includehint> <includehint>k3blistview.h</includehint>
</includehints> </includehints>

2
src/option/base_k3bthemeoptiontab.ui
Unescape View File

@ -201,7 +201,7 @@
</widget> </widget>
<customwidgets> <customwidgets>
</customwidgets> </customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
</includehints> </includehints>

6
src/option/k3bexternalbinwidget.cpp
Unescape View File

@ -259,7 +259,7 @@ void K3bExternalBinWidget::save()
while( progIt.current() ) { while( progIt.current() ) {
if( K3bExternalBinViewItem* bV = dynamic_cast<K3bExternalBinViewItem*>( progIt.current() ) ) { if( K3bExternalBinViewItem* bV = dynamic_cast<K3bExternalBinViewItem*>( progIt.current() ) ) {
if( bV->isDefault() ) if( bV->isDefault() )
bV->tqparentProgramItem()->program()->setDefault( bV->bin() ); bV->parentProgramItem()->program()->setDefault( bV->bin() );
} }
++progIt; ++progIt;
@ -290,9 +290,9 @@ void K3bExternalBinWidget::slotSetDefaultButtonClicked()
K3bExternalBinViewItem* item = dynamic_cast<K3bExternalBinViewItem*>( m_programView->selectedItem() ); K3bExternalBinViewItem* item = dynamic_cast<K3bExternalBinViewItem*>( m_programView->selectedItem() );
if( item ) { if( item ) {
// remove all default flags // remove all default flags
K3bExternalBinViewItem* bi = (K3bExternalBinViewItem*)item->tqparentProgramItem()->firstChild(); K3bExternalBinViewItem* bi = (K3bExternalBinViewItem*)item->parentProgramItem()->firstChild();
TQListViewItemIterator it( bi ); TQListViewItemIterator it( bi );
while( it.current() && it.current()->tqparent() == item->tqparentProgramItem() ) { while( it.current() && it.current()->tqparent() == item->parentProgramItem() ) {
((K3bExternalBinViewItem*)it.current())->setDefault(false); ((K3bExternalBinViewItem*)it.current())->setDefault(false);
++it; ++it;
} }

2
src/option/k3bexternalbinwidget.h
Unescape View File

@ -88,7 +88,7 @@ class K3bExternalBinWidget::K3bExternalBinViewItem : public K3bListViewItem
K3bExternalBinViewItem( K3bExternalBin* bin, K3bExternalProgramViewItem* tqparent ); K3bExternalBinViewItem( K3bExternalBin* bin, K3bExternalProgramViewItem* tqparent );
K3bExternalBin* bin() const { return m_bin; } K3bExternalBin* bin() const { return m_bin; }
K3bExternalProgramViewItem* tqparentProgramItem() const { return m_parent; } K3bExternalProgramViewItem* parentProgramItem() const { return m_parent; }
bool isDefault() const { return m_default; } bool isDefault() const { return m_default; }
void setDefault( bool b ); void setDefault( bool b );

2
src/projects/base_k3badvanceddataimagesettings.ui
Unescape View File

@ -184,7 +184,7 @@
<tabstop>m_checkRockRidge</tabstop> <tabstop>m_checkRockRidge</tabstop>
<tabstop>m_checkJoliet</tabstop> <tabstop>m_checkJoliet</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
<includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint>

2
src/projects/base_k3baudiocdtextallfieldswidget.ui
Unescape View File

@ -261,7 +261,7 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

2
src/projects/base_k3baudiocdtextwidget.ui
Unescape View File

@ -214,7 +214,7 @@
<slot access="protected" specifier="pure virtual">slotCopyComposer()</slot> <slot access="protected" specifier="pure virtual">slotCopyComposer()</slot>
<slot access="protected" specifier="pure virtual">slotCopySongwriter()</slot> <slot access="protected" specifier="pure virtual">slotCopySongwriter()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

2
src/projects/base_k3baudiotrackwidget.ui
Unescape View File

@ -322,7 +322,7 @@ This does not mean that K3b adds an additional gap of silence to the track. This
<tabstop>m_checkPreemphasis</tabstop> <tabstop>m_checkPreemphasis</tabstop>
<tabstop>m_checkCopyPermitted</tabstop> <tabstop>m_checkCopyPermitted</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

2
src/projects/base_k3bbootimageview.ui
Unescape View File

@ -387,7 +387,7 @@
<Q_SLOTS> <Q_SLOTS>
<slot access="protected">slotOptionsChanged()</slot> <slot access="protected">slotOptionsChanged()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
</includehints> </includehints>

2
src/projects/base_k3bdataimagesettings.ui
Unescape View File

@ -270,5 +270,5 @@ Example: 'my good file.ext' becomes 'my_good_file.ext'</string>
<tabstops> <tabstops>
<tabstop>m_editReplace</tabstop> <tabstop>m_editReplace</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

2
src/projects/base_k3bdatavolumedescwidget.ui
Unescape View File

@ -366,5 +366,5 @@
<tabstop>m_editSystem</tabstop> <tabstop>m_editSystem</tabstop>
<tabstop>m_editApplication</tabstop> <tabstop>m_editApplication</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

2
src/projects/base_k3bmovixoptionswidget.ui
Unescape View File

@ -326,7 +326,7 @@
<slot>setDisabled(bool)</slot> <slot>setDisabled(bool)</slot>
</connection> </connection>
</connections> </connections>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint>
<includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint>

4
src/projects/k3baudiotrackaddingdialog.cpp
Unescape View File

@ -91,7 +91,7 @@ K3bAudioTrackAddingDialog::~K3bAudioTrackAddingDialog()
int K3bAudioTrackAddingDialog::addUrls( const KURL::List& urls, int K3bAudioTrackAddingDialog::addUrls( const KURL::List& urls,
K3bAudioDoc* doc, K3bAudioDoc* doc,
K3bAudioTrack* afterTrack, K3bAudioTrack* afterTrack,
K3bAudioTrack* tqparentTrack, K3bAudioTrack* parentTrack,
K3bAudioDataSource* afterSource, K3bAudioDataSource* afterSource,
TQWidget* tqparent ) TQWidget* tqparent )
{ {
@ -102,7 +102,7 @@ int K3bAudioTrackAddingDialog::addUrls( const KURL::List& urls,
dlg.m_urls = extractUrlList( urls ); dlg.m_urls = extractUrlList( urls );
dlg.m_doc = doc; dlg.m_doc = doc;
dlg.m_trackAfter = afterTrack; dlg.m_trackAfter = afterTrack;
dlg.m_parentTrack = tqparentTrack; dlg.m_parentTrack = parentTrack;
dlg.m_sourceAfter = afterSource; dlg.m_sourceAfter = afterSource;
dlg.m_infoLabel->setText( i18n("Adding files to project \"%1\"...").tqarg(doc->URL().fileName()) ); dlg.m_infoLabel->setText( i18n("Adding files to project \"%1\"...").tqarg(doc->URL().fileName()) );

2
src/projects/k3baudiotrackaddingdialog.h
Unescape View File

@ -66,7 +66,7 @@ class K3bAudioTrackAddingDialog : public KDialogBase, public K3bJobHandler
static int addUrls( const KURL::List& urls, static int addUrls( const KURL::List& urls,
K3bAudioDoc* doc, K3bAudioDoc* doc,
K3bAudioTrack* afterTrack = 0, K3bAudioTrack* afterTrack = 0,
K3bAudioTrack* tqparentTrack = 0, K3bAudioTrack* parentTrack = 0,
K3bAudioDataSource* afterSource = 0, K3bAudioDataSource* afterSource = 0,
TQWidget* tqparent = 0 ); TQWidget* tqparent = 0 );

4
src/projects/k3baudiotrackview.cpp
Unescape View File

@ -208,8 +208,8 @@ TQDragObject* K3bAudioTrackView::dragObject()
TQListViewItem* item = *it; TQListViewItem* item = *it;
// we simply ignore open track items to not include files twice // we simply ignore open track items to not include files twice
// we also don't want the invisible source items // we also don't want the invisible source items
TQListViewItem* tqparentItem = K3bListView::tqparentItem(item); TQListViewItem* parentItem = K3bListView::parentItem(item);
if( !item->isOpen() && ( !tqparentItem || tqparentItem->isOpen() ) ) { if( !item->isOpen() && ( !parentItem || parentItem->isOpen() ) ) {
if( K3bAudioDataSourceViewItem* sourceItem = dynamic_cast<K3bAudioDataSourceViewItem*>( item ) ) { if( K3bAudioDataSourceViewItem* sourceItem = dynamic_cast<K3bAudioDataSourceViewItem*>( item ) ) {
if( K3bAudioFile* file = dynamic_cast<K3bAudioFile*>( sourceItem->source() ) ) if( K3bAudioFile* file = dynamic_cast<K3bAudioFile*>( sourceItem->source() ) )
urls.append( KURL::fromPathOrURL(file->filename()) ); urls.append( KURL::fromPathOrURL(file->filename()) );

14
src/projects/k3bdatadirtreeview.cpp
Unescape View File

@ -231,8 +231,8 @@ void K3bDataDirTreeView::slotItemAdded( K3bDataItem* item )
// should only be emitted once for every item // should only be emitted once for every item
// //
K3bDirItem* dirItem = static_cast<K3bDirItem*>( item ); K3bDirItem* dirItem = static_cast<K3bDirItem*>( item );
K3bDataDirViewItem* tqparentViewItem = m_itemMap[dirItem->tqparent()]; K3bDataDirViewItem* parentViewItem = m_itemMap[dirItem->tqparent()];
K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, tqparentViewItem ); K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, parentViewItem );
m_itemMap.insert( dirItem, newDirItem ); m_itemMap.insert( dirItem, newDirItem );
} }
} }
@ -456,18 +456,18 @@ void K3bDataDirTreeView::checkForNewItems()
TQMapIterator<K3bDirItem*, K3bDataDirViewItem*> itDirItem = m_itemMap.tqfind( dirItem ); TQMapIterator<K3bDirItem*, K3bDataDirViewItem*> itDirItem = m_itemMap.tqfind( dirItem );
if( itDirItem == m_itemMap.end() ) { if( itDirItem == m_itemMap.end() ) {
K3bDataDirViewItem* tqparentViewItem = m_itemMap[dirItem->tqparent()]; K3bDataDirViewItem* parentViewItem = m_itemMap[dirItem->tqparent()];
K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, tqparentViewItem ); K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, parentViewItem );
m_itemMap.insert( dirItem, newDirItem ); m_itemMap.insert( dirItem, newDirItem );
} }
else { else {
// check if tqparent still correct (to get moved items) // check if tqparent still correct (to get moved items)
K3bDataDirViewItem* dirViewItem = itDirItem.data(); K3bDataDirViewItem* dirViewItem = itDirItem.data();
K3bDataDirViewItem* tqparentViewItem = (K3bDataDirViewItem*)dirViewItem->tqparent(); K3bDataDirViewItem* parentViewItem = (K3bDataDirViewItem*)dirViewItem->tqparent();
K3bDataDirViewItem* dirParentViewItem = m_itemMap[dirItem->tqparent()]; K3bDataDirViewItem* dirParentViewItem = m_itemMap[dirItem->tqparent()];
if( dirParentViewItem != tqparentViewItem ) { if( dirParentViewItem != parentViewItem ) {
// reparent it // reparent it
tqparentViewItem->takeItem( dirViewItem ); parentViewItem->takeItem( dirViewItem );
dirParentViewItem->insertItem( dirViewItem ); dirParentViewItem->insertItem( dirViewItem );
} }
} }

2
src/projects/k3bdatafileview.cpp
Unescape View File

@ -330,7 +330,7 @@ void K3bDataFileView::setupActions()
m_actionRename = new KAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()), m_actionRename = new KAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()),
actionCollection(), "rename" ); actionCollection(), "rename" );
m_actionParentDir = new KAction( i18n("Parent Directory"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT(slotParentDir()), m_actionParentDir = new KAction( i18n("Parent Directory"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT(slotParentDir()),
actionCollection(), "tqparent_dir" ); actionCollection(), "parent_dir" );
m_actionOpen = new KAction( i18n("Open"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpen()), m_actionOpen = new KAction( i18n("Open"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpen()),
actionCollection(), "open" ); actionCollection(), "open" );

4
src/projects/k3bdataurladdingdialog.cpp
Unescape View File

@ -763,7 +763,7 @@ bool K3bDataUrlAddingDialog::addHiddenFiles()
{ {
if( m_iAddHiddenFiles == 0 ) { if( m_iAddHiddenFiles == 0 ) {
// FIXME: the isVisible() stuff makes the static addUrls method not return (same below) // FIXME: the isVisible() stuff makes the static addUrls method not return (same below)
if( KMessageBox::questionYesNo( /*isVisible() ? */this/* : tqparentWidget()*/, if( KMessageBox::questionYesNo( /*isVisible() ? */this/* : parentWidget()*/,
i18n("Do you also want to add hidden files?"), i18n("Do you also want to add hidden files?"),
i18n("Hidden Files"), i18n("Add"), i18n("Do Not Add") ) == KMessageBox::Yes ) i18n("Hidden Files"), i18n("Add"), i18n("Do Not Add") ) == KMessageBox::Yes )
m_iAddHiddenFiles = 1; m_iAddHiddenFiles = 1;
@ -778,7 +778,7 @@ bool K3bDataUrlAddingDialog::addHiddenFiles()
bool K3bDataUrlAddingDialog::addSystemFiles() bool K3bDataUrlAddingDialog::addSystemFiles()
{ {
if( m_iAddSystemFiles == 0 ) { if( m_iAddSystemFiles == 0 ) {
if( KMessageBox::questionYesNo( /*isVisible() ? */this/* : tqparentWidget()*/, if( KMessageBox::questionYesNo( /*isVisible() ? */this/* : parentWidget()*/,
i18n("Do you also want to add system files " i18n("Do you also want to add system files "
"(FIFOs, sockets, device files, and broken symlinks)?"), "(FIFOs, sockets, device files, and broken symlinks)?"),
i18n("System Files"), i18n("Add"), i18n("Do Not Add") ) == KMessageBox::Yes ) i18n("System Files"), i18n("Add"), i18n("Do Not Add") ) == KMessageBox::Yes )

2
src/projects/k3bdataview.cpp
Unescape View File

@ -92,7 +92,7 @@ K3bDataView::K3bDataView(K3bDataDoc* doc, TQWidget *tqparent, const char *name )
toolBox()->addButton( actionClearSession ); toolBox()->addButton( actionClearSession );
toolBox()->addButton( actionEditBootImages ); toolBox()->addButton( actionEditBootImages );
toolBox()->addSeparator(); toolBox()->addSeparator();
toolBox()->addButton( m_dataFileView->actionCollection()->action("tqparent_dir") ); toolBox()->addButton( m_dataFileView->actionCollection()->action("parent_dir") );
toolBox()->addSeparator(); toolBox()->addSeparator();
addPluginButtons( K3bProjectPlugin::DATA_CD ); addPluginButtons( K3bProjectPlugin::DATA_CD );

8
src/projects/k3bfillstatusdisplay.cpp
Unescape View File

@ -285,7 +285,7 @@ public:
} }
void maybeTip( const TQPoint& ) { void maybeTip( const TQPoint& ) {
tip( tqparentWidget()->rect(), tip( parentWidget()->rect(),
KIO::convertSize( m_doc->size() ) + KIO::convertSize( m_doc->size() ) +
" (" + KGlobal::locale()->formatNumber( m_doc->size(), 0 ) + "), " + " (" + KGlobal::locale()->formatNumber( m_doc->size(), 0 ) + "), " +
m_doc->length().toString(false) + " " + i18n("min") + m_doc->length().toString(false) + " " + i18n("min") +
@ -597,7 +597,7 @@ void K3bFillStatusDisplay::slotDetermineSize()
bool canceled = false; bool canceled = false;
K3bDevice::Device* dev = K3bMediaSelectionDialog::selectMedium( d->showDvdSizes ? K3bDevice::MEDIA_WRITABLE_DVD : K3bDevice::MEDIA_WRITABLE_CD, K3bDevice::Device* dev = K3bMediaSelectionDialog::selectMedium( d->showDvdSizes ? K3bDevice::MEDIA_WRITABLE_DVD : K3bDevice::MEDIA_WRITABLE_CD,
K3bDevice::STATE_EMPTY|K3bDevice::STATE_INCOMPLETE, K3bDevice::STATE_EMPTY|K3bDevice::STATE_INCOMPLETE,
tqparentWidget(), parentWidget(),
TQString(), TQString(), &canceled ); TQString(), TQString(), &canceled );
if( dev ) { if( dev ) {
@ -608,10 +608,10 @@ void K3bFillStatusDisplay::slotDetermineSize()
update(); update();
} }
else else
KMessageBox::error( tqparentWidget(), i18n("Medium is not empty.") ); KMessageBox::error( parentWidget(), i18n("Medium is not empty.") );
} }
else if( !canceled ) else if( !canceled )
KMessageBox::error( tqparentWidget(), i18n("No usable medium found.") ); KMessageBox::error( parentWidget(), i18n("No usable medium found.") );
} }

4
src/projects/k3bprojectburndialog.cpp
Unescape View File

@ -223,9 +223,9 @@ void K3bProjectBurnDialog::slotStartClicked()
K3bJobProgressDialog* dlg = 0; K3bJobProgressDialog* dlg = 0;
if( m_checkOnlyCreateImage && m_checkOnlyCreateImage->isChecked() ) if( m_checkOnlyCreateImage && m_checkOnlyCreateImage->isChecked() )
dlg = new K3bJobProgressDialog( tqparentWidget() ); dlg = new K3bJobProgressDialog( parentWidget() );
else else
dlg = new K3bBurnProgressDialog( tqparentWidget() ); dlg = new K3bBurnProgressDialog( parentWidget() );
m_job = m_doc->newBurnJob( dlg ); m_job = m_doc->newBurnJob( dlg );

2
src/rip/base_k3baudiorippingoptionwidget.ui
Unescape View File

@ -274,7 +274,7 @@ file will contain all tracks one after the other.
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
</connection> </connection>
</connections> </connections>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kurlrequester.h</includehint> <includehint>kurlrequester.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

2
src/rip/base_k3bcddbpatternwidget.ui
Unescape View File

@ -172,7 +172,7 @@
<tabstop>m_checkBlankReplace</tabstop> <tabstop>m_checkBlankReplace</tabstop>
<tabstop>m_editBlankReplace</tabstop> <tabstop>m_editBlankReplace</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kurllabel.h</includehint> <includehint>kurllabel.h</includehint>
<includehint>kurllabel.h</includehint> <includehint>kurllabel.h</includehint>

2
src/rip/k3baudioprojectconvertingdialog.cpp
Unescape View File

@ -194,7 +194,7 @@ void K3bAudioProjectConvertingDialog::slotStartClicked()
if( encoder ) if( encoder )
thread->setFileType( m_optionWidget->extension() ); thread->setFileType( m_optionWidget->extension() );
K3bJobProgressDialog progressDialog( tqparentWidget() ); K3bJobProgressDialog progressDialog( parentWidget() );
K3bThreadJob job( thread, &progressDialog, TQT_TQOBJECT(this) ); K3bThreadJob job( thread, &progressDialog, TQT_TQOBJECT(this) );

2
src/rip/k3baudiorippingdialog.cpp
Unescape View File

@ -254,7 +254,7 @@ void K3bAudioRippingDialog::slotStartClicked()
++i; ++i;
} }
K3bJobProgressDialog ripDialog( tqparentWidget(), "Ripping" ); K3bJobProgressDialog ripDialog( parentWidget(), "Ripping" );
K3bAudioEncoder* encoder = m_optionWidget->encoder(); K3bAudioEncoder* encoder = m_optionWidget->encoder();
K3bAudioRipJob* job = new K3bAudioRipJob( &ripDialog, TQT_TQOBJECT(this) ); K3bAudioRipJob* job = new K3bAudioRipJob( &ripDialog, TQT_TQOBJECT(this) );

12
src/rip/k3bvideocdview.cpp
Unescape View File

@ -470,17 +470,17 @@ void K3bVideoCdView::enableInteraction( bool b )
actionCollection()->action( "start_rip" )->setEnabled( b ); actionCollection()->action( "start_rip" )->setEnabled( b );
} }
void K3bVideoCdView::buildTree( TQListViewItem *tqparentItem, const TQDomElement &tqparentElement, const TQString& pname ) void K3bVideoCdView::buildTree( TQListViewItem *parentItem, const TQDomElement &parentElement, const TQString& pname )
{ {
VideoTrackViewItem * thisItem = 0; VideoTrackViewItem * thisItem = 0;
TQDomNode node = tqparentElement.firstChild(); TQDomNode node = parentElement.firstChild();
while ( !node.isNull() ) { while ( !node.isNull() ) {
if ( node.isElement() && node.nodeName() == "folder" || node.nodeName() == "file" ) { if ( node.isElement() && node.nodeName() == "folder" || node.nodeName() == "file" ) {
if ( tqparentItem == 0 ) if ( parentItem == 0 )
thisItem = new VideoTrackViewItem( m_trackView, thisItem ); thisItem = new VideoTrackViewItem( m_trackView, thisItem );
else else
thisItem = new VideoTrackViewItem( tqparentItem, thisItem ); thisItem = new VideoTrackViewItem( parentItem, thisItem );
TQString txt = node.firstChild().toElement().text(); TQString txt = node.firstChild().toElement().text();
thisItem->setText( 0, txt); thisItem->setText( 0, txt);
@ -492,10 +492,10 @@ void K3bVideoCdView::buildTree( TQListViewItem *tqparentItem, const TQDomElement
buildTree( thisItem, node.toElement(), pname ); buildTree( thisItem, node.toElement(), pname );
} }
} else if ( node.isElement() && node.nodeName() == "segment-item" || node.nodeName() == "sequence-item" ) { } else if ( node.isElement() && node.nodeName() == "segment-item" || node.nodeName() == "sequence-item" ) {
if ( tqparentItem == 0 ) if ( parentItem == 0 )
thisItem = new VideoTrackViewItem( m_trackView, thisItem ); thisItem = new VideoTrackViewItem( m_trackView, thisItem );
else else
thisItem = new VideoTrackViewItem( tqparentItem, thisItem ); thisItem = new VideoTrackViewItem( parentItem, thisItem );
thisItem->setText( 0, node.toElement().attribute( "src" ) ); thisItem->setText( 0, node.toElement().attribute( "src" ) );

2
src/rip/k3bvideocdview.h
Unescape View File

@ -79,7 +79,7 @@ class K3bVideoCdView : public K3bMediaContentsView
void initActions(); void initActions();
void updateDisplay(); void updateDisplay();
void enableInteraction( bool ); void enableInteraction( bool );
void buildTree( TQListViewItem *tqparentItem, const TQDomElement &tqparentElement, const TQString& pname = TQString() ); void buildTree( TQListViewItem *parentItem, const TQDomElement &parentElement, const TQString& pname = TQString() );
K3bDevice::Toc m_toc; K3bDevice::Toc m_toc;

2
src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
Unescape View File

@ -706,7 +706,7 @@
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
</connection> </connection>
</connections> </connections>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
<includehint>kurlrequester.h</includehint> <includehint>kurlrequester.h</includehint>

2
src/rip/videodvd/k3bvideodvdrippingdialog.cpp
Unescape View File

@ -611,7 +611,7 @@ void K3bVideoDVDRippingDialog::slotStartClicked()
} }
// start the job // start the job
K3bJobProgressDialog dlg( tqparentWidget() ); K3bJobProgressDialog dlg( parentWidget() );
K3bVideoDVDRippingJob* job = new K3bVideoDVDRippingJob( &dlg, &dlg ); K3bVideoDVDRippingJob* job = new K3bVideoDVDRippingJob( &dlg, &dlg );
job->setVideoDVD( m_dvd ); job->setVideoDVD( m_dvd );
job->setTitles( titles ); job->setTitles( titles );

Write Preview
Loading…
Cancel
Save